diff --git a/Manifest b/Manifest
index e6d6cbb11472..96394c8b1457 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28820 BLAKE2B 117e7a334312275e39c3c3435d5e36f835a9667c067e61da6f89db87aafad03d025c39ca23c7f0bbb4de7eb29595fb8d77c20f7b4ef52536a6afa7025da5e352 SHA512 88656f7bce70d7345889139dc21f92ad2d64848f5048df1ff89fb8fc33b5ba27c9cd6ef3f3427f9d8ed772ecfdfc60199784cfd21b5790bc31c33464ea66617a
-TIMESTAMP 2019-01-16T05:08:50Z
+MANIFEST Manifest.files.gz 28827 BLAKE2B 392a2762cce85ed0e41d9fb0356013f500005b03490affb6b85c4f786b84632b3de07f6e8f237f2bc464b97c7794ed829f9206b7b509ceafa85ad5e6e484ccc9 SHA512 0b5a7fc7466c8046a6fa7c9756475afa1087531953caa31aea6127dbb24dc3557e539a34226310ed67ebb34a7d2a91b9790d98d98282c4dc49759b6eceaf2ee7
+TIMESTAMP 2019-01-16T21:08:47Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlw+vGJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlw/nV9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDNdRAAoSea+LrQQDpz6tUXqPj171yw/Q8bLqcKN72A550N0g/MGLlE0p1eO3zt
-yUDC3QZIWHZyv1J5b/MhAgWCjS5X9QnnmK5g6Smaxww8nmeaRG/camYlAMlfqtRV
-lSj43F8r6/qgm9NlcK2IjMUOOmRJLp6Kmb6Q8xm6NMxUPoOR3RGi6mKAboidhHds
-HjOEQyetWU3lf89yzvJ1ctV1IlBE0p1QUdyUz4TXjs69oIVe0r//VV9Wq1FKRKkL
-1QcibRY8hGrgrA1JgryHUvKV7Rmcj0zw8KHjafxjSLZnfoPUUkMqv6eYFRCOuBYW
-80sMcOg3YA7REZOEo3xLuzUF3GxMWiCEwzTpUj241uNBt5CaQw7/pHECYdPo0cI2
-hvG8g45LQMNRyBCWnhYtP1EhKlI86SJ1mwq3hwdOEMMrhZy7adJvoBHMNVxh+Aif
-NcUM7tklVBx+zN/WKpXcQhH4E70HXphgmwzV2c34en2rxQRpLIPfR76iUpQnf4bf
-4PzBYg+9lCg+blOfiunvTmX3dwuxGasq0uGXO2ZdLP4UZfRLJy47NX2ReZJqaefM
-bJulHtdYtBwKFK35rLiYSViWgSoDbRyWDvAr7b2JJemszootHZ2w3GErND4ekXpS
-3JVJ8awm7eOTuW5YYKr/5i5sMiF3nKjdOCcnY8w/PhGQme69+mA=
-=NFmm
+klBdAg/+MuLQpsuXXaXqZPq17mg7z2WXnq47GayeVqyV8x5ajiNp16H4Bqo9ugwm
+Ed8YtYMzo2x+CRUQgJ30gsgMfSZLHq2EjbvHMv1sSEtmAWMDOg4evqUNR3jo8nbR
+QLkAHSOWSQ+JGpelvT0DZeiPL9s2X+PA3IU5XGcZJJlZzAtR9KZiRxN/upLNglbG
+DosADIcT5n6ZMtANAOvqpX7Ouz61V68TZlcnCVS1K1sDuhhNqUl0GsxRwrAWO0He
+zG8pwkNabVpY1FoPnunhjsSh8ZdDGZXOufxgNuqbBGDogf3kd1r/AbpLvvvkj4a/
+9JSshaAmv4Tx4qX0P+upd7O4inTK8UETEPXkCPXr2Trp5o9bjzyjtA5tg99pH5jt
+oBU1uJcie+x4bOrsKMl7rjPFP6t9aPzPYoSw2jx5irzCH+LIn8cAWQmBk0mv2l/R
+8JNiFnFhh0ElsFdtGpmvyBugDnyZg7Nqw0VtGzaZPKXIMP+c9hgk82r0oE20TXL4
+l0i9BHz++ZjJJR2w4qngq5viXeBxxNnmKmaZX4ddQegrm8wP1bpsEdOtWtP66+fR
+dvtAO/uoPeEdkHibRon+ChtFeTkBPosu88MoKWEXqJeNaY/ekKoE0v88j4YBPrR1
+/j9wInkouy+tDaeuGDefkweJwqkzZR3o8KBiX554J6VzcsDeI5g=
+=LFEx
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 6b6b0824116a..789663b091ed 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 1816483657bd..270c6f76440c 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index dd8acfd5f40f..eebc767fa6ff 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,10 +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.11.4.tar.gz 25456828 BLAKE2B 35ed79e8474c4fffb046b5163bfd7115ca4ffe3c3560732d9f73349a1187417a288c30985d7ac450b86f682aa7a1d5318634c1be60e5bffce04137e32f2ad13d SHA512 99e592d679d65d75d62812e2d0ae9a652342a97f4934a2ca00a9ac044cdc92b35e7108296cf1a700ed36818a504fcaf155f8f61d7b10d84933932bdab00a9f7e
 DIST vault-0.11.5.tar.gz 25459691 BLAKE2B 9f77e90b71629e1ed341d03830a0376b6731d85189dde0205148c7c8002556521538144cbf1b7bc425253cc55de6ab3d48cbcc1d270165e5804f7f632d06523b SHA512 b290523ee94199d241bbd2477ca686076f645804953181996aefe2a425bc5114db3d375fd5c832d1fa257a790947544406f50777317e854ccf2d4d4477ab6ffd
 DIST vault-1.0.1.tar.gz 25817507 BLAKE2B c4882341fbcea2051c8685dfff85739f11898d0406d12611cdda36f19d7badae69e88060d593ba03c333b151d4402b7bfc520f34c0663fe00a77998aa662f161 SHA512 b644e419faa8dc1f8a347f7b522ccafbdea9f849de9ad1ca085214d21e50bd2ec6eb868b4eb0abff65537abc4fba93c3e4ffd424afa90ca049068e6eccc99999
-EBUILD vault-0.11.4.ebuild 1620 BLAKE2B 7130a0a55407c092d96c3e22b216bdfab9d2e0168176539745afda5563808efbec06051adaa66fbf644a530ae91ac6f21fa7d58f78f57aab3f8b19dc65812399 SHA512 5d22bb29b0a7bffe7410af9b9cb07ab6957ca78aa0d82016341327eb739011799f330bc1f2eacc8d3509eb52f445ccb1f04ecb5332fd8d2601bfb2ba8d36486c
 EBUILD vault-0.11.5.ebuild 1620 BLAKE2B 7130a0a55407c092d96c3e22b216bdfab9d2e0168176539745afda5563808efbec06051adaa66fbf644a530ae91ac6f21fa7d58f78f57aab3f8b19dc65812399 SHA512 5d22bb29b0a7bffe7410af9b9cb07ab6957ca78aa0d82016341327eb739011799f330bc1f2eacc8d3509eb52f445ccb1f04ecb5332fd8d2601bfb2ba8d36486c
 EBUILD vault-1.0.1.ebuild 1620 BLAKE2B 4cfe3ee73464ce3f1c53c9f1afc42022e8feef5312e678630b4e52abe2298baae67824f63b058341680c953713e94c715f9caa773312563588e2ec712eb7bef1 SHA512 9a1ff9ac7f1b15acda152467f7d9f041681f570eda71848c05c62643dc155c7fcacccd8dd3aac4bafe51ace6a9522cf847d5a47ce8fdef7677d8ff24cf605b82
 MISC metadata.xml 306 BLAKE2B 882a83701d71a45cdc6fc00ba3da98ff7d7439c9f81ef0aa1655c49bd5e79b3e625858d33f4ac6d5157df6ef74c5dd00a2b8efb1fd5ee45f9a0ed785c90d8ebc SHA512 d1fc4040379fb33c7f193f37a1c044000408e47c9df8b17771ed7cb5194f9d8b8c062b8a6804e72fb5a666683a8d5b49ec5a6328394870d9bdc1b7f3e0e4e787
diff --git a/app-admin/vault/vault-0.11.4.ebuild b/app-admin/vault/vault-0.11.4.ebuild
deleted file mode 100644
index 52a7f68b449b..000000000000
--- a/app-admin/vault/vault-0.11.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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.10:=
-	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
-	# The fmt target may need to be executed if it was previously
-	# executed by an older version of go (bug 665438).
-	emake fmt
-	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-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 3855670b76cb..ebdbb4ee8375 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index 5564155f8c58..78ec55e6ca29 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -1,11 +1,13 @@
 DIST keybase-2.10.1.tar.gz 38275486 BLAKE2B 0c99c3bc9aad0610473f43bfefb467d2be5aca8af95207a2ecbb60c99bf8a5d87004c54e8af9e5c2f6068a03fc3c980c7d910f20a2ee0bc5f39937ff63c86a47 SHA512 f4acf70b0fceaeb6a2a7da89661c7c2a59fc8ccf10a6aafbbc75d43af04295250237845b4de06170287b5edcc2366d1390b5b7038ecfcbaa501753b41fd22911
 DIST keybase-2.11.0.tar.gz 38490645 BLAKE2B 58771d880a412e2cd0bc585ff2d2922092d49a132d4526de91796fccca95351a2422a45e63296b1fb8d502087c17147727e8c406b8d13884da538ab308b88d5e SHA512 b150184e692c81243a8f83b828ec8ef4f6b324a6cbd0b1cb9cf5e89eebbec7a6183a2af3b8d26c663ab677aa38753c328e190b46035c3815af8373d8ff4b26fa
+DIST keybase-2.13.1.tar.gz 41319007 BLAKE2B e29cc87822086936510c83f0678cd85e89960c82bd7bbca784d17cfcb06d3f650c7d7bd0934381b6868d67490e8868c7df2df6abc7ddd7275fcdc4e92996b7f0 SHA512 c0cad522f14cf39f08c841ff90f96662f3f5d9fe3c8e8156755a8805757c5d206991410a2511315b8c00dcafcc5e23e5449d37d13f399e6692e0c6d4fb1c0b61
 DIST keybase-2.6.0.tar.gz 34597277 BLAKE2B 3380cf081ed4e0c211ca47164a5d813e0ca647b004d8e54aae4ec51d24f0cd26437008dbdb2e81cf5372c943c2181e424918425cf11687b0629dae8df5020ada SHA512 25515e69e86c870b45852e93957ec37c7af9bbe3a4a8f8f2cb1ab9f4d02236b9de57fc6294b93aa4f6378ee8d33e03a2773aa445db5d8a34c3fbfe34eed256fe
 DIST keybase-2.7.3.tar.gz 34648144 BLAKE2B 6da664847640c35b1028868651e31b99fd154520942cb9fc3922565906b288c9b808c7368199ec3a37216e1b2c6930f2951b58cee543a72fb69d96006bbb33fa SHA512 0b3fc5f7830862ffdddd70606bbe2fd2b5dd2e5e4fb24349dc57ed0e8f2bd0cc9a9aba0f00b8080f910d877db5f092757d209f01de83f7113ed9d99aed68342d
 DIST keybase-2.8.0.tar.gz 34545469 BLAKE2B 53b348d4956542e51f19b5d4209cdcdc2b1873421153cf62f376f733207131c4d82c5cccf162b8a98909406e49bee3972e1deac478e006571ebcd5a94d20ede5 SHA512 01319ee36d50d928e195d854a3c332d7f327cabd8cdf930f643f3d373a6bd644634a56137f5f02477c15fc261cee3c01cb87efbb80333b7c7299a2048d9f1be1
 DIST keybase-2.9.0.tar.gz 34703406 BLAKE2B ec8bd076d07eeb40ecd978c049f57f0df0ae858fa966d90a521685838fb3c1a01b38a7cc584ecfde174ea51b3cca06440ae7c53074fd58151af1621144f431b8 SHA512 01938d83806260e6c7a1065b73ae4d8f82f776d3a81d70d9c8b2e8df9fd4f05dcbf45e23a78ca34573cca8a11b0592dae6c4aa1b20e4777c9ba69af0af5f3e41
 EBUILD keybase-2.10.1.ebuild 1306 BLAKE2B 298b5302aa97f4216d73eabab9585bd9352de3a18bf844a53fb522dfd6f95030dfdc8ae2776a71bb9c5250b341202f6042c4e31ae3b17d6a1471e884bcf623fb SHA512 e310ac6ed6d1601b7a8e5a8720075f66705b64302aadc4c8487fcad5532462146ae720d11d858fdf70486ef578f101ec2b5627a000197205b8c78e7ebf8aea67
 EBUILD keybase-2.11.0.ebuild 1305 BLAKE2B 29acf15d150fc08ccb39337e771a51e475d38ce546c7c5212dee2b488f7021db8ab585295f9c4844452ee6953be263f5095cae91056da9720ab2372b413788e0 SHA512 478d0e83bc45797d444ca387880d811a14b0c24139f2ac0ae9a57ee8c28a6fc6feb8d369ef40b63d176c9dff73aaa76b679a67adf660220bdfc2998cdcc14ad5
+EBUILD keybase-2.13.1.ebuild 1306 BLAKE2B c6607f27d1433f6405e605cb66efcfd8198bc6c5de194748c2620609d11c22541128a96d16eb561a57015f586cc2219e0cd3070dd62b71c75f0dc71495433513 SHA512 54a92ee6235461d3c8ef8293d8334a9b89c94fffc71373cf95d25c47be6e8cf977f642b54e86a21a8e809f5cebd00afb6d7651baa080185b460f2680f18d414d
 EBUILD keybase-2.6.0.ebuild 1308 BLAKE2B aff38992386c18fb94a38b9c0bebb721f4a1dcdb5d82800c96c54d7522fbd3439dbdc6f7b8ccd16fb24fd1e5f5d5bf6a3e67c92675fbab5142c9506ade483255 SHA512 ccbc238edf9fd8beec372828ab3e34c71b27a2e66fcd4709be87e968d16c9b890dfd08e2d005b944704a4b6961e12d5b7292c108d1a7d8ea5a49a58f0f20a287
 EBUILD keybase-2.7.3.ebuild 1305 BLAKE2B fe25947ce4516417eaaf427eacc71513b6839e53e31e440298e75f4427108a7c6f6d0fcbc0e9e5b388a305a2f7149a7ff58ef1ee7b32a7eaf17d16e0bb6fcf86 SHA512 36496057ccfe5cb5aa103122c3681136d1950bbe6de331496298730e116f021d7552cdb2030d3cbfd124d6d77f20478bd7beb30c432ff3ec7f64a4ae05ae2bd3
 EBUILD keybase-2.8.0.ebuild 1305 BLAKE2B a7fdda95b324d7d65ca9d66c67d872059fa5734965bd24a0d4b40d86590a6d17a4809491490055141948040be0e199aac499e9af6fa6916e2aae48d7c94dcb12 SHA512 b3fd771e61c9ce8fb141253fce08762c2056916e4d7281e4bf27274c5c889632a34e9d69e1ced5439dd7ef97953d97c2a186c8652cb2ff57cdb1c4190713be16
diff --git a/app-crypt/keybase/keybase-2.13.1.ebuild b/app-crypt/keybase/keybase-2.13.1.ebuild
new file mode 100644
index 000000000000..f2abdbb420ff
--- /dev/null
+++ b/app-crypt/keybase/keybase-2.13.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	~app-crypt/kbfs-2.11.0"
+RDEPEND="
+	app-crypt/gnupg"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	ln -vs "client-${PV}" "${P}" || die
+	mkdir -vp "${S}/src/github.com/keybase" || die
+	ln -vs "${S}" "${S}/src/github.com/keybase/client" || die
+}
+
+src_compile() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \
+		golang-build_src_compile
+}
+
+src_test() {
+	EGO_PN="github.com/keybase/client/go/keybase" \
+		golang-build_src_test
+}
+
+src_install() {
+	dobin "${T}/keybase"
+	dobin "${S}/packaging/linux/run_keybase"
+	systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
+	dodir "/opt/keybase"
+	insinto "/opt/keybase"
+	doins "${S}/packaging/linux/crypto_squirrel.txt"
+}
+
+pkg_postinst() {
+	elog "Start/Restart keybase: run_keybase"
+	elog "Run the service:       keybase service"
+	elog "Run the client:        keybase login"
+	ewarn "Note that the user keybasehelper is obsolete and can be removed"
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 3ec00a64af16..88515cb18bf4 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index 207176eeb4cf..28cdd0b600c9 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -5,6 +5,5 @@ AUX kile-2.9.92-no-empty-filename.patch 964 BLAKE2B c540d8cb219590bc5b9083e713fa
 AUX kile-2.9.92-nodocfiles.patch 769 BLAKE2B 7eb69764dddea17ef0fbcd989dcc3d2631f0bb95e462ac6729027c2a07630a40d6648525833dd3bde7ab1981ac4bbcd4018efffaf528920816a2ef3a007f8e9f SHA512 4823047cd7bc820c9366275ef76faef72e223fc2f86e3e3e145c3c8e926b00d7778b4a4b147e587bbeb96ef6a55c4a5282aef486cfba1b752e5809fb93def21b
 AUX kile-2.9.92-viewtab-crash.patch 3460 BLAKE2B fe9af35f51633644709e70b5b09abf094ce8515909b62a81575931c40ba7dd09f84f618416e640839cfcdf46003c55c1e672f541309b0a3f08433438a618152b SHA512 e8a64a7820749c18cc75a9002ccdc539b22e5e0fa3ebf18ca3edd011508ba887db58c38e3d8823baf32887da0435938606c40e9b2e7bfd9d6c1164a926b1dcbd
 DIST kile-2.9.92.tar.bz2 8556142 BLAKE2B dd18ece7394439de3c0037fbea7c66316c5ee457bd4ad8c35f8519713f917e1c1641c806290303c26dd9e31e2f39346bc35091b211ca23a2d342332388d18c3f SHA512 e3af0c2cb1a0970428e2d772ef5025ead67aee94cdc03b6ec173de5628e8d4619f74296a1734eac8241939d40a05b805b8bd33bb4c27a1c19ad47fb35087cf7d
-EBUILD kile-2.9.92-r1.ebuild 1737 BLAKE2B 161d0db06635a2368cebdd4e27c2dc8c0edb8523aed2d5496330b0e65fd463162509ec2cb20552ba07cefef3434f8f1424c6ca119bbaed874f04ad87402fdb17 SHA512 729562668506ff534327ca71b2d97189760003f5812bf6a74e1b6867fd1d9d44cb55a405adf7c1f682dd15142c7d0289b1bd53f5de4c0382bf13bf06a9bf1e22
-EBUILD kile-2.9.92.ebuild 1641 BLAKE2B 0befdeaff3e43df7ce23a97d8fc6b4f0ead7792fd9c3df8b370d6264edc4856ab52307bbfcaabb95d69f8ee69242431d6cb296a04520fe5081de43359e372fe0 SHA512 65994d27678afa75af8d66acc8ffac5e1a1fa887839fff251f5dfc70634a432a785125b45058f610bc8f4bf78f5e6f9d2903dd6da39f90bdabc90ad3019d33e0
+EBUILD kile-2.9.92-r1.ebuild 1736 BLAKE2B cc21311bc1eecc1a205a9904988d15aa94f3f4b3420ca0c6defd20d236f39574244f2d38dc5d8e6f24089b1638cd74bd59f4561903a5dc7629233754a27f1d66 SHA512 b11c895a24fbce815299af82430737c0122ff9f0977ff4b015c91e517e01087ad331c3a8e5635297024204d5188ec924090d5ecd8a88a2b05b4441c90dcd5ec9
 MISC metadata.xml 476 BLAKE2B a152c0446aad3c66df2574332dc89f6797a16db142daafc82c3845f159b68bfcb922615f5912429d9965141ede27945512e5af1f5811ccbfa761026cc105b4b3 SHA512 82eaa93d944622e571887200fc50166b34ad4098ca2612749e72fff4e80f9f3fa07736cb8cd171fe3258fcd18209f7e60b01c859ad3cf20e4e238eab9dc3e486
diff --git a/app-editors/kile/kile-2.9.92-r1.ebuild b/app-editors/kile/kile-2.9.92-r1.ebuild
index 9a53d47e9c72..97b4fd675bfc 100644
--- a/app-editors/kile/kile-2.9.92-r1.ebuild
+++ b/app-editors/kile/kile-2.9.92-r1.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/kile/kile-2.9.92.ebuild b/app-editors/kile/kile-2.9.92.ebuild
deleted file mode 100644
index 30c5495c7917..000000000000
--- a/app-editors/kile/kile-2.9.92.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
-HOMEPAGE="https://kile.sourceforge.io/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-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-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 2b5ee23274f7..40b3393291fc 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 65cb2c97c66f..7ffce3e18fc7 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,5 +1,9 @@
 DIST VBoxGuestAdditions_5.2.22.iso 58013696 BLAKE2B 196f0048b685200328bcf753f3df23eac6477ce863885e93a54951795368bf62bdaa497589001ec203d75809b1f74ebbaa80419406d26bc7db43a131f5b9d698 SHA512 b320174b2f2ef796ac2c9c920579be38f0cedaa037d21992863ac355ecf6e99ae2aea56c70fb2034e9e03afac2cd7297f7717b447a6981701755593110164d37
+DIST VBoxGuestAdditions_5.2.24.iso 58429440 BLAKE2B ee5b2751238da4372c4164c02e96c5bc6a1dbfb6670f7cd8912415680e99118e65c8f4c765c7d5f9dcf521644a011540e289357fe38e715d6264fa84b5d7ef1b SHA512 e05f75f3a5974efba6f64606d255a03ddf104deec3c300a9369c06d603aa3cbf70b73cdfeda2ce1fcd1c36da472bc190da0ed4e908bd6dbcf857104c99a61b05
 DIST VBoxGuestAdditions_6.0.0.iso 79245312 BLAKE2B 413501b62bb6c8a0b1cef8255c631d4bc6c919b3a9c15e0fd780f6196e299f72ede083d51ca8f32bb83ec6d9384f1959c619bc5df67495a23bce503cf45c39e8 SHA512 4064bab634e8ebd75bc80c47ebd9a2596701505e15ebe872e1b599a42588ece307f90febfd474e429cd7e5e4ecf063bc7e37d666c6ae369f8f97b36a0e0ed81d
+DIST VBoxGuestAdditions_6.0.2.iso 85905408 BLAKE2B c5ce6d2cc3c15032f5d6733df72f938f2e5b0e996d467464e0229cfd8b8a2ba57f4f3878d94f769f0dfda48b14e426815925d883add6934a2c3f72ac1a41d6cb SHA512 53e82fbec7f1e04f473f0add3a0e03e2abfb9e88b57d7501d28310c36ae26af835d52a76104b31a8a4dc69ff31b6826c7c391622cdf3977df7ab7c4181d0e7dd
 EBUILD virtualbox-additions-5.2.22.ebuild 710 BLAKE2B 1dfdfb7943723926e5d78af8a313f1faa238b1fe09a097ae2ba9b722d78fc205d0928817d416a3012b92ceb32e269d348f3b778b562c07f82a55d3518ff2b8de SHA512 0b0506759c3a98953082ae8babd433522454ade47af62984eefffb1cd37b860ca3423e04386cef219533bd01fd8109c2b2b1ec29aacc82a8228115717e49e8ae
+EBUILD virtualbox-additions-5.2.24.ebuild 712 BLAKE2B b5aec1c104906135655ac4a467d65620e52bc081143a40846649c693942624c944efcfc56e05dedc846070aa84032ac2dbcc2c9d7a28c33d96037d954d0728cc SHA512 42d1e17e8170e48bf493efebcbb7b9b0c0441c102af20b25b9f27c0823029d0b98f521dc47844825302f1d17c822104c83598619920cc063df6d83a4e8e87422
 EBUILD virtualbox-additions-6.0.0.ebuild 768 BLAKE2B 5f69263610ef425399c0fab670ec4341c642b25cc572f3282177958c299d2587b01a0ce85aa5b358dd57deb7a5485ddb92b3783c28f0e30b0fbf91359c5c3dc7 SHA512 aaea93c1a095efa4ad23b9bbc2e9b08b4f0280ada15c69828a2cb740bb355435684388b2d48a73984dab9ef1003ed6dc059d69e42c1a813086248eb714fd2877
+EBUILD virtualbox-additions-6.0.2.ebuild 768 BLAKE2B 892da0a6f97f633f7df332d486850cdb20e4177680c3bd7650c4d78a5ae393dffe0dd3eebbe5a50851d89e72a73930ea61681e6b51db0b2855521a149d3a3164 SHA512 21b86b35c8c5cf002801321258bba06c9880e3f7271acc9fdeee795b00d2627453a861494dd20018f87adc0fcf238f62a0c6698dd62ca6be3c853e6080429e57
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.24.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.24.ebuild
new file mode 100644
index 000000000000..6faf7e7e8a0d
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.24.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.2.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.2.ebuild
new file mode 100644
index 000000000000..5124a818a150
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=VBoxGuestAdditions
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="CD image containing guest additions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /usr/share/${PN/-additions}
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 7886d8b64b3b..0cb4fa4ea8d8 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -5,12 +5,21 @@ AUX virtualbox-bin-3-wrapper 2931 BLAKE2B bb8a72f749996b945d42a3d94ab895ee5b234b
 AUX virtualbox-bin-config 28 BLAKE2B 86d452db92ceb19e9389ca83c800955066b84f4c3a289ff56cd0d7638a0a3d47891e670e070be9f3bcc30d730982237fc9211d1a9bbdbf8429c7ca80d25fbcc1 SHA512 8086ef107aff0aa3e17f5fcb8ee5de4dd8a24cb119c3523e3e3a302819eb4258328adead1b6f40b96706539f4e1c43dbd5c055a16a304ac29f7f302ebf2e4c4c
 AUX virtualbox-bin.desktop-2 205 BLAKE2B cb0ab2e87d0e82e88656f3288eb4af255fd1c9f732dbd6e1aa545d30d4176526fa38aebd3eccb4acb46c638056504be37231dc042fa030fcb04020e00d7d401c SHA512 7e9555aaa317e1cb551e5ff591b9d20bbb76a738f9e923c13d206e02c1e6bfc8f4eb17b498b235ac0aa2062e4acbd5f24d2522de2da3cff2e12c264875bc476d
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.22-126460.tar.gz 19640932 BLAKE2B 162ab40da6b2cd30d00e020666a1f4fb026e29af2ca9d6c36c294e5fa299b61ab8fd147f24d2b500426c768808db2c7693c30e88519e695d7759f8eedf1c52c5 SHA512 85b8552668b6580bea24f051ad861c82b9ba32177fb7fa37fe2980d8bab32a84325d02bfa9c8f55c2021a4000ef2546d8996ca8b99ca7fc19f8281a92108dfb0
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.24-128163.tar.gz 19683939 BLAKE2B ce05e159172e34e1d520b3783d77db06aa8f91067cc743beb1eeafaf01508e830f5fe9501cb1f3a6d99492e3046ec2dd2fec94ffd39a237ef4679352492aaa1a SHA512 035103e420d773201ad24093910d7175a5d548f19de4a58900e78e2ebfac711851c99375977ba9fd47fced234346437164d226592b7070a867a1d13fd534a3b5
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.0-127566.tar.gz 23284806 BLAKE2B 4b34e1640ac74be3acc4cddc6140f77a2e5456ec29c6523fc2fe27c5e7c4652dd28f523b85a6cb17aab52e3594e68ee64cbe2c4cb8edd68f7deda05ed8b9e05d SHA512 cd8cd82bf9cea29f50101c8cccd0b8f699dcc4c4e7e720fe80df82154339b787d154a6376adc9d0f4a3015ec1ee2d67d6575ac5197dfda63af3f758294c165b8
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.2-128162.tar.gz 23289693 BLAKE2B 13e1ad30b40676ed2e11cf26957377696a9f30a7a92bda0ca5f69039ffebe4abf3bb0224844609a29ac217b227e4d1906c70cd404d3967a26dc0ace3bf4d2ccd SHA512 29b682bf8130f73b25a82e97053847077d9eb48f0510db7fb0cf2e817e1e6b9a6e7ded54ede7447c56aa7b219d32a2d6ee19cb0efbe5c7e0a984c5e137fada51
 DIST VirtualBox-5.2.22-126460-Linux_amd64.run 88821201 BLAKE2B 1b0433844247ee9531af915dcbb740183fa29fb296f8c78b4165cc3b48300da71f7d329026983da581ffff0d7b8976a2e5e32d5e948861a557ddfa2437813ea0 SHA512 22b20a68884a114818fcdfe9a459a7c3b1b3598526a74cc66407f5bcdc6eb6bcbe022b820477ccdc081e22349777b73fac9d6126585ee3c8fa0d3d24624006f3
 DIST VirtualBox-5.2.22-126460-Linux_x86.run 87817677 BLAKE2B 5f11e5f92386c9524869082cf1a5af413c69fe5b36b1ace58887076000c7b928267eb7c3be22282885d6871ccdcee981ec79a526c71f281f0e8ada5858194851 SHA512 32d44b6d691e33a1ee1426cb7a3cb3648722709c588d177951b8be802546faadfd612567981bbbfed3d782b18260e6e638e7879813f3b06bb5a8387b052b0227
+DIST VirtualBox-5.2.24-128163-Linux_amd64.run 89282001 BLAKE2B affd8768878cf25209b7a53dc024ff1798d2c2e007031d40b39c5245df608cc09fdb19c216075b0ec7a4fd63ff580731b1b04838d5d6dc81bd126fed005ea355 SHA512 f22e3c71e5c3f923edc14fbae0191a5d1262426166984e19c784e2b0a332296f949d2a9eeca6972c1f16a0f9573c1f9807c556d4dab2bd500d5b73e22485c7e1
+DIST VirtualBox-5.2.24-128163-Linux_x86.run 88391118 BLAKE2B ffc44c55f664e4bc2c2e8bf09d95fda3631541b4b4b1dca7735dd5fcbf12da8258065fa13466ce23229126fb84b0193eee7cd794cf09f631ce124c4fd6558f16 SHA512 a7350a8266c6b3522be91158d765ce31b69acbfd67b6056a96361e0cb48926cee115c8f3df4d1965fd7b082d3f487f9f655253620a8357dbfadfbd2320ad6a3b
 DIST VirtualBox-6.0.0-127566-Linux_amd64.run 148766154 BLAKE2B 2e23341dc798aabc1fd696422073516b6f2f70b9bee525ef22528b72abf38acf24599442e5c56d52c24af48f5ae6e2e6cdee981293fc644fac965cc34041a101 SHA512 19b11f7cf62288624739547755a7732b7d355ba61040c7e951ecbaf0ce75252075e8168aa41054e31fa36d45998f1ae1136b65d09981475a3052c4da7fd3021b
+DIST VirtualBox-6.0.2-128162-Linux_amd64.run 155114954 BLAKE2B 0159383d2bd3ed0e454e03db61d7466e06b63222da364ae8c8964ac418c2a5de6b78c320c989bc497e6fc98051434d3e480d1bd16e0f92f8ac2fde8a60af088e SHA512 10b0971b81158f80de918f5ae9e0261eaec23ac7b5b3a8117c7d757a3044559648860b70d5688b58bcda1d0bdd36b1df70d5d0c8c1a65c53e1a65112beba1fff
 DIST VirtualBoxSDK-5.2.22-126460.zip 10154660 BLAKE2B e0a0106f695ca7198d4b2ac5c62bb435fe7934858115dcb3aed57b40d82655bd54cbbae63b279132c23762a227c53affe68131a0bf9452c69dcaf2162b1e4ebf SHA512 1d34b8f7f32602b5656fdb6184e6c35cc54d6ecb36bc41d7df3e154f18c27ea5938635969feb69defe86a53897eee87792514967f15810224ee89e8e523d2b29
+DIST VirtualBoxSDK-5.2.24-128163.zip 10153218 BLAKE2B e0a86462396eaa3fb9aa475ab40ee810874f61d3e9f37050b4aba36e6b5150e3699303b7f9989e32e794b9f67de4340ff008fa67339a3c45678005d126a17c27 SHA512 fbc12076ee968a6066f6ac81ff1555e10710d10d7821be24a4b4371a4f4b0409bed2d209904daa2b3f98a7998357558ca158bd76b87c5449815843312b669627
 DIST VirtualBoxSDK-6.0.0-127566.zip 10749531 BLAKE2B 98a9d1d85a5d835e9a6d1ed121f6650d795a695bf40fb05af235eba6454237a79487f801d6351f3c446b523001271faac8cc09880522f97cae73360c1179edf5 SHA512 1f25b9249c5e1e0a7caee867b1508f517e16afd23055decfe27a513d1199ebc72bfcd391a8e750403ddb80a4087df7cfd928604b827976d7075829c7e3d82e00
+DIST VirtualBoxSDK-6.0.2-128162.zip 10753904 BLAKE2B 52824830e3d816df57932d8812a959dc3590eeabe8b7ba1dc8927d7eac7bea0c4584e0f2d62b405fdb8d5833fc93792dfcd7c2cfc2714237ecb8dbf26be36f11 SHA512 d7d1d60c7ffc4022de16dccc7786bbc4d481cef26e105932158955cc4350d65a6ac5bffa01a319baee5a64f4ae7d016ba50f82128bef6e11e54e72e82e73c168
 EBUILD virtualbox-bin-5.2.22.126460.ebuild 8327 BLAKE2B 02bf2b29c01c69a3e8321964f494c274c0d22fd1e360235a919ebdc0a0d4c716a51540c51ff85aec6ea7f5a7cc4bb4b4625eca877e23458bb8e57fdf2c5e300b SHA512 b9a91b54c1d0a368b98a021cd24af53c452cc5731fb3495dc7f6e26578bab84d297cc7dd4e0847e8ecf696aa0057c103e1b241fa90d0dfdb11954ea15786438f
+EBUILD virtualbox-bin-5.2.24.128163.ebuild 8329 BLAKE2B 73fca46eb9e117a760c3de9bfe0fc4f58f1a2dbf27c4cab46f9d2db1f2d0114b580f8f5537ffeb7c570c0dfa15d25098236543f17cb8f0b0698de7f7d8a1e40c SHA512 bfcd05d67c9573dff6c7b90287938bfb69c11020e236e8bda0de32c37b571833b57e9f6d8e44cfac2ec792b54526544f3bd208124927efa12212932faadcf538
 EBUILD virtualbox-bin-6.0.0.127566.ebuild 8371 BLAKE2B 04269efd0113942d4c242c89ec49f30377581573cfabbf1d8b21ae7d77498a02721c5db27ccc0f83261bdca465c997b27718233b54a61ed2c00ce5bbd8ca8cde SHA512 28c2cf733bb6ac9e7304927d54804c03143b86eea98718919ca04637c137aca8e70e3bb896e4995fe96164c3f2e57f39dc5d7ed89ad9240029a80aa6c598c717
+EBUILD virtualbox-bin-6.0.2.128162.ebuild 8371 BLAKE2B 04269efd0113942d4c242c89ec49f30377581573cfabbf1d8b21ae7d77498a02721c5db27ccc0f83261bdca465c997b27718233b54a61ed2c00ce5bbd8ca8cde SHA512 28c2cf733bb6ac9e7304927d54804c03143b86eea98718919ca04637c137aca8e70e3bb896e4995fe96164c3f2e57f39dc5d7ed89ad9240029a80aa6c598c717
 MISC metadata.xml 599 BLAKE2B 2af2e738880f4fb9b684baa124df483d90548177fc8f5a8223dc13a5c96a3bf7f84754a41c4d2bd5821140dd2479874b4d7c8b99b04a83febc5027f4370fb70f SHA512 4306caf88c97be9f63238727dd70ad834011dc33650aa809eaf4ac285febecd7604dc030b285a31167ecb338434fc68eff011528533cda53acdd72ad6a5b5aa0
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.24.128163.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.24.128163.ebuild
new file mode 100644
index 000000000000..e4f534871c4c
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.24.128163.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5)"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(ver_cut 4)"
+VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
+MY_P="VirtualBox-${VBOX_PV}-Linux"
+# needed as sometimes the extpack gets another build ID
+EXTP_PV="${VBOX_PV}"
+EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
+EXTP_P="${EXTP_PN}-${EXTP_PV}"
+# needed as sometimes the SDK gets another build ID
+SDK_PV="${VBOX_PV}"
+SDK_P="VirtualBoxSDK-${SDK_PV}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
+	x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
+	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
+
+LICENSE="GPL-2 PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
+RESTRICT="mirror"
+
+if [[ "${PV}" != *beta* ]] ; then
+	SRC_URI+="
+		sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
+	IUSE+=" sdk"
+fi
+
+DEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="!!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${MAIN_PV}
+	!headless? (
+		dev-libs/glib
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/libpng
+		media-libs/libsdl[X]
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		chm? ( dev-libs/expat )
+	)
+	dev-libs/libxml2
+	sys-fs/lvm2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/VirtualBox/*"
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	mkdir "${S}"/${EXTP_PN} || die
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	unpack ${EXTP_P}.tar.gz
+	popd &>/dev/null || die
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		unpack VirtualBoxSDK-${SDK_PV}.zip
+	fi
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+	if ! use headless ; then
+		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+
+		# set up symlinks (bug #572012)
+		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
+
+		local size ico icofile
+		for size in 16 24 32 48 64 72 96 128 256 ; do
+			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
+			if [[ -f "virtualbox.png" ]] ; then
+				doicon -s ${size} virtualbox.png
+			fi
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="virtualbox-${ico}.png"
+				if [[ -f "${icofile}" ]] ; then
+					doicon -s ${size} ${icofile}
+				fi
+			done
+			popd &>/dev/null || die
+		done
+		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
+		insinto /usr/share/pixmaps
+		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
+	fi
+
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+	popd &>/dev/null || die
+	rm -rf "${S}"/${EXTP_PN}
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		doins -r sdk
+	fi
+
+	if use additions; then
+		doins -r additions
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use rdesktop-vrdp; then
+		doins rdesktop-vrdp
+		doins -r rdesktop-vrdp-keymaps
+		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
+	# The compile phase makes VBoxPython2_7.so.
+	# py3 support would presumably require a binary pre-compiled by py3.
+	use python && doins VBoxPython.so VBoxPython2_7.so
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
+		VBoxPython?_*.so
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
+	fi
+
+	doins -r * || die
+
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	local each
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
+	fperms 4750 /opt/VirtualBox/VBoxNetDHCP
+	fperms 4750 /opt/VirtualBox/VBoxNetNAT
+
+	if ! use headless ; then
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} VirtualBox; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
+		done
+
+		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${ED%/}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	local udevdir="$(get_udevdir)"
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die
+	# move udev scripts into ${udevdir} (bug #372491)
+	mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${udevdir} || die
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	gnome2_icon_cache_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
+	elog "an overview about the different features of ${PN}"
+	elog "and virtualbox-ose"
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.2.128162.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.2.128162.ebuild
new file mode 100644
index 000000000000..871816079601
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.2.128162.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	KEYWORDS="~amd64" #~x86
+fi
+VBOX_BUILD_ID="$(ver_cut 4)"
+VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}"
+MY_P="VirtualBox-${VBOX_PV}-Linux"
+# needed as sometimes the extpack gets another build ID
+EXTP_PV="${VBOX_PV}"
+EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack"
+EXTP_P="${EXTP_PN}-${EXTP_PV}"
+# needed as sometimes the SDK gets another build ID
+SDK_PV="${VBOX_PV}"
+SDK_P="VirtualBoxSDK-${SDK_PV}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run )
+	https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz"
+	#x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run )
+
+LICENSE="GPL-2 PUEL"
+SLOT="0"
+IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
+RESTRICT="mirror"
+
+if [[ "${PV}" != *beta* ]] ; then
+	SRC_URI+="
+		sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )"
+	IUSE+=" sdk"
+fi
+
+DEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="!!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${MAIN_PV}
+	!headless? (
+		dev-libs/glib
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/libpng
+		media-libs/libsdl[X]
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		chm? ( dev-libs/expat )
+	)
+	dev-libs/libxml2
+	sys-fs/lvm2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/VirtualBox/*"
+
+PYTHON_UPDATER_IGNORE="1"
+
+src_unpack() {
+	unpack_makeself ${MY_P}_${ARCH}.run
+	unpack ./VirtualBox.tar.bz2
+
+	mkdir "${S}"/${EXTP_PN} || die
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	unpack ${EXTP_P}.tar.gz
+	popd &>/dev/null || die
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		unpack VirtualBoxSDK-${SDK_PV}.zip
+	fi
+}
+
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+
+	if ! use headless ; then
+		newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
+
+		# set up symlinks (bug #572012)
+		dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml
+
+		local size ico icofile
+		for size in 16 24 32 48 64 72 96 128 256 ; do
+			pushd "${S}"/icons/${size}x${size} &>/dev/null || die
+			if [[ -f "virtualbox.png" ]] ; then
+				doicon -s ${size} virtualbox.png
+			fi
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="virtualbox-${ico}.png"
+				if [[ -f "${icofile}" ]] ; then
+					doicon -s ${size} ${icofile}
+				fi
+			done
+			popd &>/dev/null || die
+		done
+		doicon -s scalable "${S}"/icons/scalable/virtualbox.svg
+		insinto /usr/share/pixmaps
+		newins "${S}"/icons/48x48/virtualbox.png ${PN}.png
+	fi
+
+	pushd "${S}"/${EXTP_PN} &>/dev/null || die
+	insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+	popd &>/dev/null || die
+	rm -rf "${S}"/${EXTP_PN}
+
+	insinto /opt/VirtualBox
+	dodir /opt/bin
+
+	doins UserManual.pdf
+
+	if [[ "${PV}" != *beta* ]] && use sdk ; then
+		doins -r sdk
+	fi
+
+	if use additions; then
+		doins -r additions
+	fi
+
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use rdesktop-vrdp; then
+		doins rdesktop-vrdp
+		doins -r rdesktop-vrdp-keymaps
+		fperms 0750 /opt/VirtualBox/rdesktop-vrdp
+		dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+	fi
+
+	if ! use headless && use chm; then
+		doins kchmviewer VirtualBox.chm
+		fowners root:vboxusers /opt/VirtualBox/kchmviewer
+		fperms 0750 /opt/VirtualBox/kchmviewer
+	fi
+
+	# This ebuild / package supports only py2.7.  When py3 comes is unknown.
+	# The compile phase makes VBoxPython2_7.so.
+	# py3 support would presumably require a binary pre-compiled by py3.
+	use python && doins VBoxPython.so
+
+	rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
+		vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
+		webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
+		90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
+		VBoxPython?_*.so
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox{,VM} VBoxKeyboard.so
+	fi
+
+	doins -r * || die
+
+	# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
+	dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+	dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+	dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+	dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+	dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
+
+	local each
+	for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,TestOGL,ExtPackHelperApp} VirtualBox ; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
+	done
+	# VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case..
+	for each in VBoxNet{AdpCtl,DHCP,NAT} VirtualBoxVM ; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 4750 /opt/VirtualBox/${each}
+		pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
+	done
+
+	if ! use headless ; then
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		for each in VBox{SDL,Headless} ; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 4510 /opt/VirtualBox/${each}
+			pax-mark -m "${ED%/}"/opt/VirtualBox/${each}
+		done
+
+		dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
+		dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
+	else
+		# Hardened build: Mark selected binaries set-user-ID-on-execution
+		fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
+		fperms 4510 /opt/VirtualBox/VBoxHeadless
+		pax-mark -m "${ED%/}"/opt/VirtualBox/VBoxHeadless
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh"
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+	dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+	dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	local udevdir="$(get_udevdir)"
+	insinto ${udevdir}/rules.d
+	doins "${FILESDIR}"/10-virtualbox.rules
+	sed "s@%UDEVDIR%@${udevdir}@" \
+		-i "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die
+	# move udev scripts into ${udevdir} (bug #372491)
+	mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${udevdir} || die
+	fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	gnome2_icon_cache_update
+
+	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
+
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Please visit http://www.virtualbox.org/wiki/Editions for"
+	elog "an overview about the different features of ${PN}"
+	elog "and virtualbox-ose"
+	if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 10cc8023e358..75c5ee819b63 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,5 +1,9 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.22-126460.tar.gz 19640932 BLAKE2B 162ab40da6b2cd30d00e020666a1f4fb026e29af2ca9d6c36c294e5fa299b61ab8fd147f24d2b500426c768808db2c7693c30e88519e695d7759f8eedf1c52c5 SHA512 85b8552668b6580bea24f051ad861c82b9ba32177fb7fa37fe2980d8bab32a84325d02bfa9c8f55c2021a4000ef2546d8996ca8b99ca7fc19f8281a92108dfb0
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.24-128163.tar.gz 19683939 BLAKE2B ce05e159172e34e1d520b3783d77db06aa8f91067cc743beb1eeafaf01508e830f5fe9501cb1f3a6d99492e3046ec2dd2fec94ffd39a237ef4679352492aaa1a SHA512 035103e420d773201ad24093910d7175a5d548f19de4a58900e78e2ebfac711851c99375977ba9fd47fced234346437164d226592b7070a867a1d13fd534a3b5
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.0-127566.tar.gz 23284806 BLAKE2B 4b34e1640ac74be3acc4cddc6140f77a2e5456ec29c6523fc2fe27c5e7c4652dd28f523b85a6cb17aab52e3594e68ee64cbe2c4cb8edd68f7deda05ed8b9e05d SHA512 cd8cd82bf9cea29f50101c8cccd0b8f699dcc4c4e7e720fe80df82154339b787d154a6376adc9d0f4a3015ec1ee2d67d6575ac5197dfda63af3f758294c165b8
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.2-128162.tar.gz 23289693 BLAKE2B 13e1ad30b40676ed2e11cf26957377696a9f30a7a92bda0ca5f69039ffebe4abf3bb0224844609a29ac217b227e4d1906c70cd404d3967a26dc0ace3bf4d2ccd SHA512 29b682bf8130f73b25a82e97053847077d9eb48f0510db7fb0cf2e817e1e6b9a6e7ded54ede7447c56aa7b219d32a2d6ee19cb0efbe5c7e0a984c5e137fada51
 EBUILD virtualbox-extpack-oracle-5.2.22.126460.ebuild 1005 BLAKE2B b351b31f86d398933afbb8961b07050c9c1d4915eb1679a2a01db45dd6d55bc88ff832add19e2bb1b71731022a180e46830458a18489c0bfed9b9828ea438cbc SHA512 c3aadd73eaefa8c3283eb84a10c53da0d9ebb0e03e86baaea25170f9728b131f093cc14a531d83180072c4692cf62d55ffc7be073bdff03b16d69d37430a2784
+EBUILD virtualbox-extpack-oracle-5.2.24.128163.ebuild 1007 BLAKE2B 6b77c2fb22452f5ba431afdc6a13653eda458b71c94e464bb868cdd77017ca75f69b0eacd4cee788a731ebf5593a091cb9c8b3aa5c466beed5142cbf6fdcf8b7 SHA512 2759daac5078c490ace6d25070f72dd0bfc672146980631e207d5886ab80da24c67eb6972f6b314c473c3c635f2d2e2e2aea15564b4ea1e90a51defa1524571b
 EBUILD virtualbox-extpack-oracle-6.0.0.127566.ebuild 1065 BLAKE2B 5aa610967f7fff026a9dc48d093376fdf6df0d8fb330faf9604eb8799149ae33a8c7a85071236be49285a05f618a59819d16a8a8f977da897433c44eb7e1cf33 SHA512 17910c0b5fdc745a3013fdcb791fd4f99cf7b5b85fceda8a116fe4f75a02de3087d28ded850de257ec55e6252d68f27a337fb4fa2a993755bc2184d2e98e5a6e
+EBUILD virtualbox-extpack-oracle-6.0.2.128162.ebuild 1065 BLAKE2B 83a4e3f497988899b19922a2b89c3bb056f04f4e739ca685e76e15f3e9b19a6e69b7124d65d522b13b3f992e9b66bd54f52b1db358b578030cad822512a61ed7 SHA512 110a0179f35ab854400d8c08a8ec361ca0c92e275865c76342d41475cd9bfa798ae57a8b750df9aea4de91ac0b2851a8daba3c1d1700559694197110d33ad989
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.24.128163.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.24.128163.ebuild
new file mode 100644
index 000000000000..e598ba638113
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.24.128163.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5)"
+	DEP_PV="${MY_PV}"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	DEP_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(ver_cut 4)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+
+RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.2.128162.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.2.128162.ebuild
new file mode 100644
index 000000000000..a260ead1a63b
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.2.128162.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+MAIN_PV="$(ver_cut 1-3)"
+if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
+	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
+	DEP_PV="${MY_PV}"
+	MY_PV="${MY_PV/beta/BETA}"
+	MY_PV="${MY_PV/rc/RC}"
+else
+	MY_PV="${MAIN_PV}"
+	DEP_PV="${MAIN_PV}"
+fi
+VBOX_BUILD_ID="$(ver_cut 4)"
+MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
+MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
+
+DESCRIPTION="PUEL extensions for VirtualBox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
+
+LICENSE="PUEL"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror strip"
+
+RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
+
+src_install() {
+	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
+	doins -r linux.${ARCH}
+	doins ExtPack* PXE-Intel.rom
+}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 6c371782ecd2..02bfc3695e3f 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -5,9 +5,13 @@ AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e
 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
 DIST VirtualBox-5.2.22.tar.bz2 118757134 BLAKE2B be795cdbfb09d3d443f63e190b63898239622f5a57aefdd90f382d9a849d09cc1abc2624071fbc60b2c04a12f33376184540cc362c19225733f99a3bcc8ff6a3 SHA512 4f6c4611a3114778f45419587dc1519ca07410c1ea6474cdb18ecd3b068639a4fdac3f25146fe9b8e006e30f19eba134ce9f665182008b033f6f78497e1ea722
+DIST VirtualBox-5.2.24.tar.bz2 118369194 BLAKE2B 2073ec85a641ae80113d41e8363401da5afaf6ea442c2a3c537341f39e06a03a7175463605133e642988f72c4adde4f987905c08f4ba58460953af7169cb4ca0 SHA512 2de5a19ff6aff56a4f7e7b9d7d39b3e787d2ac30d448e3313e915b1cde4b2eedccab44c7a195412efb9e9a6de3c1fb3ee96bde57af93f9ef8f317ffa8b7d4410
 DIST VirtualBox-6.0.0.tar.bz2 154322106 BLAKE2B 952e857e5bd6f612272b7bc399af5596d4eb4f13c429c93be7f9e6c4b58e535fe0492806fd51fd5a3f22653f0a42abb2a25ce6b67b5b4712d7e88e34b68eb8cf SHA512 fbe193a3c4dfef943bd75e894452cc684e794e5fa2b25d0292f7fb3e84d5f1a890fe0a3a91dbae9a9b90ec87f12cb3d868457e1767a5841964568cf13a189561
+DIST VirtualBox-6.0.2.tar.bz2 155125777 BLAKE2B 2d902fd1963305883eebba85daa03bd17fe8a9ba20e7a6482508879068a809ee80c4a5caffeb26acd0fd4ad29f6f60cf963e1d314e4b01f137ede5b589a74cb9 SHA512 9cfc03eae073ada47c050d2a5eeefa6f724ad2094f2bc3717aa010553ab0dd5af0ed0860bf120727491c7798cdff9219e53cdc3d629f61e3cd12c55068e7401b
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
 DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
 EBUILD virtualbox-guest-additions-5.2.22.ebuild 6010 BLAKE2B fdf621c8d0f93220553c81b877571144c1bb2fdf000db0a45350fbc98f0cf96b703029874459fc56cec303d7c63c2046a1225a964b58fb45c234a4a679829e11 SHA512 acda6a782e5ebc605ff37c7c814192f87f607a67fba5ac49bdab201faf7326352c4153c0f74bd4431789763641879d781631d5c52cf23c1b583d91da4c9e2ebe
+EBUILD virtualbox-guest-additions-5.2.24.ebuild 6087 BLAKE2B 8155389688f6454ffbe0f105524652570ee82cc0d36141aa5524ef1565785dad2fdd4ad4f69e4fbb888d30970849207c66f51cad34b9a57e47986c3336ade3de SHA512 6f188396d8b7d3cd758c4fc0432eac43dc100104413db144de34b3d0733f67e55ca06d011214127c5231084a31bcdaa2bf82e0758f8e7579548032a4ce924c17
 EBUILD virtualbox-guest-additions-6.0.0.ebuild 6073 BLAKE2B 5190c5b2f7bb43768c5c383946fc32c8ab558a4695b431706baa31fe32f17643daa6915c4cb2a3d76abc006dbd463eb3d32f1ad0036c7d00dbc62dd75e33ea51 SHA512 827bb031a87b240a0da583d077839afe834947c25c6f03dbd54cc18b494524522a1a65a8bee56d5533c2a6fb1f2dff53d2be313b5b1d736ada7694272a93db9e
+EBUILD virtualbox-guest-additions-6.0.2.ebuild 6139 BLAKE2B 4d9a0a2ada7b0f88f4b8edd46720c6c43315ec64f7a8b8e64339424cbfb2bf8b8eee457ade3c72ddf014cf7b15df970a240c7d5a896ca0d309605033dc903eb7 SHA512 93ea063d27b7a4a321b1875923d1e4749690d4fa320802abab67d908f999e8aed33f16f5092d4642a2b8a5c2f35464f85d4e1f9061eaf9df2a0a6d2809728e27
 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.24.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.24.ebuild
new file mode 100644
index 000000000000..5780804c8c4e
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.24.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod systemd user toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P="VirtualBox-${MY_PV}"
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	X? ( x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM
+		x11-libs/libICE )
+	sys-apps/dbus
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/pam
+	sys-power/iasl
+	x11-base/xorg-proto
+"
+PDEPEND="
+	X? ( x11-drivers/xf86-video-vboxvideo )
+"
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/src/VBox/Additions/linux/export_modules.sh "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	cd "${S}"
+	rm -rf kBuild/bin tools
+}
+
+src_prepare() {
+	# PaX fixes (see bug #298988)
+	pushd "${WORKDIR}" &>/dev/null || die
+	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+	# stupid new header references...
+	local vboxheader mdir
+	for vboxheader in {product,revision,version}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
+		done
+	done
+
+	# Remove pointless GCC version check
+	sed -e '/^check_gcc$/d' -i configure || die
+
+	rm "${WORKDIR}/patches/008_virtualbox-4.3.14-missing_define.patch" || die
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	MAKE="kmk" \
+	emake TOOL_YASM_AS=yasm \
+	VBOX_ONLY_ADDITIONS=1 \
+	KBUILD_VERBOSE=2
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
+			|| die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	insinto /usr/share/doc/${PF}
+	doins "${FILESDIR}"/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_preinst() {
+	enewgroup vboxguest
+	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
+	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+	enewgroup vboxsf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if ! use X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "Also make sure you use the Mesa library for OpenGL:"
+	elog "    eselect opengl set xorg-x11"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.2.ebuild
new file mode 100644
index 000000000000..1cda2a1f29f4
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.2.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod systemd user toolchain-funcs
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P="VirtualBox-${MY_PV}"
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.0_beta2-patches-01.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	X? ( x11-apps/xrandr
+		x11-apps/xrefresh
+		x11-libs/libXmu
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM
+		x11-libs/libICE )
+	sys-apps/dbus
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/pam
+	sys-power/iasl
+	x11-base/xorg-proto
+"
+PDEPEND="
+	X? ( x11-drivers/xf86-video-vboxvideo )
+"
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Create and unpack a tarball with the sources of the Linux guest
+	# kernel modules, to include all the needed files
+	"${S}"/src/VBox/Additions/linux/export_modules.sh "${WORKDIR}/vbox-kmod.tar.gz"
+	unpack ./vbox-kmod.tar.gz
+
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	cd "${S}"
+	rm -rf kBuild/bin tools
+}
+
+src_prepare() {
+	# PaX fixes (see bug #298988)
+	pushd "${WORKDIR}" &>/dev/null || die
+	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	popd &>/dev/null || die
+
+	# Disable things unused or splitted into separate ebuilds
+	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+	# stupid new header references...
+	local vboxheader mdir
+	for vboxheader in {product,revision,version}-generated.h ; do
+		for mdir in vbox{guest,sf} ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/${mdir}/${vboxheader}"
+		done
+	done
+
+	# Remove pointless GCC version check
+	sed -e '/^check_gcc$/d' -i configure || die
+
+	rm "${WORKDIR}/patches/010_virtualbox-5.2.12-qt511.patch" || die
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+src_configure() {
+	# build the user-space tools, warnings are harmless
+	local cmd=(
+		./configure
+		--nofatal
+		--disable-xpcom
+		--disable-sdl-ttf
+		--disable-pulse
+		--disable-alsa
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--target-arch=${ARCH}
+		--with-linux="${KV_OUT_DIR}"
+		--build-headless
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die "configure failed"
+	source ./env.sh
+	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+	MAKE="kmk" \
+	emake TOOL_YASM_AS=yasm \
+	VBOX_ONLY_ADDITIONS=1 \
+	KBUILD_VERBOSE=2
+
+	# Now creating the kernel modules. We must do this _after_
+	# we compiled the user-space tools as we need two of the
+	# automatically generated header files. (>=3.2.0)
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
+
+	insinto /sbin
+	newins mount.vboxsf mount.vboxsf
+	fperms 4755 /sbin/mount.vboxsf
+
+	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
+
+	insinto /usr/sbin/
+	newins VBoxService vboxguest-service
+	fperms 0755 /usr/sbin/vboxguest-service
+
+	insinto /usr/bin
+	doins VBoxControl
+	fperms 0755 /usr/bin/VBoxControl
+
+	# VBoxClient user service and xrandr wrapper
+	if use X ; then
+		doins VBoxClient
+		fperms 0755 /usr/bin/VBoxClient
+
+		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
+			|| die
+		newins 98vboxadd-xclient VBoxClient-all
+		fperms 0755 /usr/bin/VBoxClient-all
+		popd &>/dev/null || die
+	fi
+
+	# udev rule for vboxdrv
+	local udev_rules_dir="/lib/udev/rules.d"
+	dodir ${udev_rules_dir}
+	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		>> "${ED%/}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+		|| die
+
+	# VBoxClient autostart file
+	insinto /etc/xdg/autostart
+	doins "${FILESDIR}"/vboxclient.desktop
+
+	# sample xorg.conf
+	insinto /usr/share/doc/${PF}
+	doins "${FILESDIR}"/xorg.conf.vbox
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_preinst() {
+	enewgroup vboxguest
+	enewuser vboxguest -1 /bin/sh /dev/null vboxguest
+	# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+	enewgroup vboxsf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	if ! use X ; then
+		elog "use flag X is off, enable it to install the"
+		elog "X Window System video driver."
+	fi
+	elog ""
+	elog "Please add users to the \"vboxguest\" group so they can"
+	elog "benefit from seamless mode, auto-resize and clipboard."
+	elog ""
+	elog "The vboxsf group has been added to make automount services work."
+	elog "These services are part of the shared folders support."
+	elog ""
+	elog "Please add:"
+	elog "/etc/init.d/${PN}"
+	elog "to the default runlevel in order to start"
+	elog "needed services."
+	elog "To use the VirtualBox X driver, use the following"
+	elog "file as your /etc/X11/xorg.conf:"
+	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
+	elog ""
+	elog "Also make sure you use the Mesa library for OpenGL:"
+	elog "    eselect opengl set xorg-x11"
+	elog ""
+	elog "An autostart .desktop file has been installed to start"
+	elog "VBoxClient in desktop sessions."
+	elog ""
+	elog "You can mount shared folders with:"
+	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
+	elog ""
+	elog "Warning:"
+	elog "this ebuild is only needed if you are running gentoo"
+	elog "inside a VirtualBox Virtual Machine, you don't need"
+	elog "it to run VirtualBox itself."
+	elog ""
+}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index c74f18bb5377..daa577b92677 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -4,7 +4,11 @@ AUX virtualbox-modules-5.1.30-udp.patch 1239 BLAKE2B d49d96894bae2fdedc2b8a825c8
 AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8cea08a6dbe78f75dd89aa072ac2ac0d745e598e8195ef321eaee53d31bedf52013d94efc046863e65c9fac0d61a507b292b04c7fb9 SHA512 600fd557992efb1fb5db9db64914becd5a86f81a42d70bbc3823533df941881f2289a6ccf630adb8346419499dd48b84ed43c21d0aba183a780daa99fcafddbd
 AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1f0dc755a9162f7c2efed32d8f9c98fcc1e36d48067471085d5b038c6e8b3118508fbaaaab3790f7 SHA512 63eba0963b3344ea7e7a0035560406899d878a0761cddef9853bec95deb9812b221e98f446f240070d6448d61d6ecbcf7a990bcd52863660e8f21cf9a98c0e1d
 DIST vbox-kernel-module-src-5.2.22.tar.xz 638492 BLAKE2B 71aba29b056bb3dfeffbf4632fbf7f15d89b988267ba24c766b78b1d9c50a4d27fb1b8e699108b973af68024f9f77ca0a8ad787355d7342fe1400f14189487ff SHA512 3361bb536af8e8d490377be04d1b1b9af478538e23ec409d3e0205ad930c16e5228c57ae7d92d214ac533ae64298d9eaff3c9284ff9bb308108d1ad7d69fb507
+DIST vbox-kernel-module-src-5.2.24.tar.xz 642124 BLAKE2B fbf077b1d94f0b2f6ccb1a9a9f2e9b6f2b02153659f60a28bf3905bbd9aca762bcdbbe1a96ff602048a4d43eb61b8195c1c511bea7248d0593efd7972a17fc5b SHA512 ba0dc0ba4964eb17c421f624e321369a96564f08daa7e6949db9cbde2a182cd29a51f7b0a3215938789bb61e2427cbd38e318e5d909fd54d243ef764f51eb0e4
 DIST vbox-kernel-module-src-6.0.0.tar.xz 666352 BLAKE2B 51309dd9fddb1e26e8fce55bae018d96569a28ce1d6850e2b13b47829d0336671d23962191ff4eda0f846c073a94a1d30fa67bb5e5b73f1fda63b6f06acc1225 SHA512 c0c26f2544580e16c525db997a5a3b2cbe1b84b0418cf099d12c67bc72ff7c79b30fe74793d10c710db6a03640ccb5935fbb9df55c2d8aea435beafe0de94385
+DIST vbox-kernel-module-src-6.0.2.tar.xz 665352 BLAKE2B 703291334afb8662211dfc5223d66dafa496612ca917637b2d34f6d38475287a1eed00e484965c670da236fdfcc558e0c7ebd081be1f6674603af2c0b6bda549 SHA512 c05f3e89b2fc5a504e77f0617dbe9ccde8de6d9b06e4c2f6d59d90f362b2d5a8207d64b16a8c767e63066a04236934664dfd452b23f4c5a2c4a3b301e07212c9
 EBUILD virtualbox-modules-5.2.22.ebuild 1187 BLAKE2B e6e3307a1b856612c589f498f536d1ae864a3ba22dfe97845f8d596f6f8d7a80b82c9e6173392d56962b62e745b0881a8cdda1146f7529187d8d1fd6c0c05708 SHA512 7d35b69bc75414c7195161531bc065e788e3f8fcb79e89fe8df2138339735571fef79ba0fc25ac39b954842995b22af9ea6fa28166027da2a8d39439cf33930f
+EBUILD virtualbox-modules-5.2.24.ebuild 1189 BLAKE2B 5edbc0952960db33bfa7f3d22266fac6785b6d01591e625e88818845667051e2a090ee34e7265dca082434d2da85dd84930bc71fab7e878f12dececa6320f0db SHA512 5701d91ab3bee88cfa0422f9d22c073f92faad72bbb8beb0ecee96ce78cdd51ef3b59c072c924b3ce267e31cbc4bcefc89376fe273de9dc35d508f3fbd6d59be
 EBUILD virtualbox-modules-6.0.0.ebuild 1245 BLAKE2B d6196f90bf25c7faf01fcd6830c8f036642b4cd0c9a624121faabb45868119fe4fe4d7967442875a6bb96240aca4244440311d33c56532001866f9cc7e149d7f SHA512 0c44aba646f7639b99ef8bd774978ab2027118a6b158161e0df7d7a0383d0e153658ed7de68e48ec75f37747dfa362266455094c4e5005239b0fdce2140cbc97
+EBUILD virtualbox-modules-6.0.2.ebuild 1245 BLAKE2B d604b453e51b534c7437a56d50ca248ac61362a27c782cb909c905061064859994c2a8fed83e36d43139c848ed494d30506af040e1fd4abd6685b8c50f146c34 SHA512 cc7e6095ca1d2d32e74d32ccf2a1d419b9a68aa8a9699cf7db60f5264f7515c5d17451801014776bdf6ebdf99183c66f82ef3ca304c3d586d0f79729b6078c9c
 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.24.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.24.ebuild
new file mode 100644
index 000000000000..c4b01a1b3f96
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.24.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=7
+
+inherit linux-mod user
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	enewgroup vboxusers
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
+
+src_prepare() {
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	doins "${FILESDIR}"/virtualbox.conf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.2.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.2.ebuild
new file mode 100644
index 000000000000..7257cb3b5812
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=7
+
+inherit linux-mod user
+
+MY_P="vbox-kernel-module-src-${PV}"
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel"
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S="${WORKDIR}"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+
+pkg_setup() {
+	enewgroup vboxusers
+	linux-mod_pkg_setup
+	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
+}
+
+src_prepare() {
+	if use pax_kernel && kernel_is -ge 3 0 0 ; then
+		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
+	fi
+
+	default
+}
+
+src_install() {
+	linux-mod_src_install
+	insinto /usr/lib/modules-load.d/
+	doins "${FILESDIR}"/virtualbox.conf
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index e2bb0e9748ff..cc06cd3ad299 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -5,14 +5,19 @@ AUX vboxwebsrv-initd 646 BLAKE2B d71673a3afea56aea69ab1d795d8b265bb5fc62296e35d6
 AUX virtualbox-4-config 38 BLAKE2B 8eab341f3264a056a89633fe43dd58f274d0d877602156d97a4dcc6260dd8e446509173742988fa40346e62b1fe9368ff3fc9a97e3316cb919962d9a03340d52 SHA512 5455b70b8ac6f25365bae776b78c3ef5710ae2d5a9e939c7013d72c35f65f178268966ebd291a42666913e45f43c7196f8953331be0b0cc88eba66df39205b08
 AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c444637c19ea55ae7f0e34583a048b20ea4049e83ef3714a51e44545c50922b1f2758210145319f9881ca71b7d561d4 SHA512 1ec62f872a19ad76ce7d10ed70ee0503c65e817e123d82c20753e6ae4ac7d2ceb4e236da6be1fe3d63b0b104dd355de2cffd6e9d0ec0603c82fbf89662eeb34b
 AUX virtualbox-5.2.8-paxmark-bldprogs.patch 2732 BLAKE2B a3966e0f1a990c648cba0dfd245229d66040294f068f5fa3f52d7cd55f56819fa1ed505465bc6e524c147f958af3460ecc9e4c3b1628dcb456067181521b7ef5 SHA512 2c436dd64ff3135ce31dc7ab2c05a38fe0b1b1a2b2cc687b1f58fa09f7de2384a6f067ff67c0ab4ecb5ddd42a94a9379517e1901a085e3cb7f43c38a07c28a16
+AUX virtualbox-6.0.0-libressl.patch 1249 BLAKE2B f638df39f05212e5cbb2998de97ef4c02bfc0f5cbfeee89811b3640a3c74cc9340ce50c6cc45ebc881bb5dbb6ab49b6768ee5d72014f086322e64ea9fda99d2c SHA512 496e26b2610531f3c690a2bf78360e0c5ed4dd0b2390ebee0c7fa6f41b777ea7d88cbeda69deaaeed62ae8ae2011a7f68e15a16073b52ba09853a5af1ee884b2
 AUX virtualbox-ose-5-wrapper 3405 BLAKE2B 92001ed3397a22abb5955617451bfb78d1f1f62f9be99cf87c57c42d118abb42b9436a0a83736d882b34360c9f8e67f9a8adaeffe7e9a3456c4ddc93a7850e53 SHA512 96f9ab8e2a83b5aebbb66916cbca0a7af0e2d69285296fe87869f096149791e0491dec2408f21f7249b68d928eebe396ab710a4ec6b6d6bc9c67120d323effa0
 AUX virtualbox-ose-6-wrapper 3573 BLAKE2B 733b250badff6473b6ee18f82c151be7db8ceaa6bcf325d6563d1662f3bc6f4b5bfddb74d9ec611522430735ecdeb7144ce4205145e6fe63d92533e13948684b SHA512 7cf444d5bc9da4cf50805fef1acdc0126b53103a626ac3490ad1b1d8d633d50fd882e7c2799bc4ea78b5e74686e94978643d16e9c13efcb52cf932e5f206ab81
 AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-5.2.22.tar.bz2 118757134 BLAKE2B be795cdbfb09d3d443f63e190b63898239622f5a57aefdd90f382d9a849d09cc1abc2624071fbc60b2c04a12f33376184540cc362c19225733f99a3bcc8ff6a3 SHA512 4f6c4611a3114778f45419587dc1519ca07410c1ea6474cdb18ecd3b068639a4fdac3f25146fe9b8e006e30f19eba134ce9f665182008b033f6f78497e1ea722
+DIST VirtualBox-5.2.24.tar.bz2 118369194 BLAKE2B 2073ec85a641ae80113d41e8363401da5afaf6ea442c2a3c537341f39e06a03a7175463605133e642988f72c4adde4f987905c08f4ba58460953af7169cb4ca0 SHA512 2de5a19ff6aff56a4f7e7b9d7d39b3e787d2ac30d448e3313e915b1cde4b2eedccab44c7a195412efb9e9a6de3c1fb3ee96bde57af93f9ef8f317ffa8b7d4410
 DIST VirtualBox-6.0.0.tar.bz2 154322106 BLAKE2B 952e857e5bd6f612272b7bc399af5596d4eb4f13c429c93be7f9e6c4b58e535fe0492806fd51fd5a3f22653f0a42abb2a25ce6b67b5b4712d7e88e34b68eb8cf SHA512 fbe193a3c4dfef943bd75e894452cc684e794e5fa2b25d0292f7fb3e84d5f1a890fe0a3a91dbae9a9b90ec87f12cb3d868457e1767a5841964568cf13a189561
+DIST VirtualBox-6.0.2.tar.bz2 155125777 BLAKE2B 2d902fd1963305883eebba85daa03bd17fe8a9ba20e7a6482508879068a809ee80c4a5caffeb26acd0fd4ad29f6f60cf963e1d314e4b01f137ede5b589a74cb9 SHA512 9cfc03eae073ada47c050d2a5eeefa6f724ad2094f2bc3717aa010553ab0dd5af0ed0860bf120727491c7798cdff9219e53cdc3d629f61e3cd12c55068e7401b
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
 DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
 EBUILD virtualbox-5.2.22.ebuild 13857 BLAKE2B 2b27ee756ccb7b3dc03228c236768d2c07a282ae04d18184ebf523c5846edbf68f035546c3bc93720e3e5647d5334a2326455718cb98ea2ebcd6d356f6f822b7 SHA512 dd9d340c9f438f1f7d7d10fdbefea54dc2e38c5a40bb8d02739a38fb5098700805950bb3dc45418ea99ff04fe4f05d019d4dfbea99044eec4e231d44f9ccd7af
-EBUILD virtualbox-6.0.0.ebuild 14049 BLAKE2B 830cc7ab3bbb3642ce149f1487140bb074aa0010c84c8a488cdc5b32e660eee5ee8f3e2a4892ff2f48cc5aac7e71fd51b091dd779d204c17b6daca4e01553615 SHA512 dc26b9ec71828c244cfdd169e40adc157a77b219938d2ff05359781306f6c1f98d05c011255e08fa1f9a7214daf098556e3b94d486d14abcca16c60dbda46132
+EBUILD virtualbox-5.2.24.ebuild 13953 BLAKE2B ecfd06ec1542ce65a71189538204c439dfd6fe289d7fb099af6bac5e82b61732db9e77f55e46a30182508cf65e88a4cc987ebb437576e66a507aed8cb6ef55a9 SHA512 185d0d8b25ce396d8103eac7d5596d6e53140b4c345f37ad1b0f9aaccd718d7b6034b88539a9b5d391d037c63dc266bf01190ca9dff2db08616c942bcdbe39b2
+EBUILD virtualbox-6.0.0.ebuild 14118 BLAKE2B 9d34c59bee5eca14c2510c17d053750e1f3204f81811ef8a7f5c3aefc93ccf75e5c5ef41c50d76a81b9d5b33edff3aebb8272018f9ca68c78a9ab117fcec493a SHA512 734b823426626a93961a01c4e2a872431e0bc6e9d6ecc29c22e0a25883c3282cff1b8fd803af930c4377992ca0ba889187ec4284658566e49e974d7dd31c3e00
+EBUILD virtualbox-6.0.2.ebuild 14203 BLAKE2B 342d89df9490c33664c49997c1eb472d2ee76d92e3b64750ffc498297c72b9b294734688e0e2c808f22ecb0d17406e3eca878da64921018a60459c6f03bd66ed SHA512 c674bbdf752b56051bc9d05197588b106832fd9eccd8842d46394ee7b72025b72c87341432b0b6e69b1b0608f1ff31089618f5d237c6568815e775ea5f0ad54c
 MISC metadata.xml 715 BLAKE2B 76ee0065ae39b8775af3837eea940291bfd584ddc92b03629c138013d342c8e388ed61fe2dc6f22caaec093f1aa5dabddb6b8c3ae5f7e07150dd063a1e567b47 SHA512 8997ad296ccb4100bc34551601b5361b8ac0d4f2f863bb5a85f55d5b6eeb6b3fcc3dee9c91bd731f52009a2892936e170db8674bf453b59fe4768a5a1c94b2b2
diff --git a/app-emulation/virtualbox/files/virtualbox-6.0.0-libressl.patch b/app-emulation/virtualbox/files/virtualbox-6.0.0-libressl.patch
new file mode 100644
index 000000000000..a79ae1ddf683
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-6.0.0-libressl.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/673800
+
+diff --git a/src/VBox/Runtime/common/crypto/ssl-openssl.cpp b/src/VBox/Runtime/common/crypto/ssl-openssl.cpp
+index e6d58b75..b2422983 100644
+--- a/src/VBox/Runtime/common/crypto/ssl-openssl.cpp
++++ b/src/VBox/Runtime/common/crypto/ssl-openssl.cpp
+@@ -271,7 +271,7 @@ RTDECL(int) RTCrSslCreateSessionForNativeSocket(RTCRSSL hSsl, RTHCINTPTR hNative
+             pSession->pBio = BIO_new_socket(hNativeSocket, BIO_NOCLOSE);
+             if (pSession->pBio)
+             {
+-# if OPENSSL_VERSION_NUMBER >= 0x10100000
++# if (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)) || LIBRESSL_VERSION_NUMBER >= 0x2070000f
+                 BIO_up_ref(pSession->pBio); /* our reference. */
+ # endif
+                 SSL_set_bio(pSession->pSsl, pSession->pBio, pSession->pBio);
+@@ -319,7 +319,7 @@ static int rtCrSslSessionDestroy(RTCRSSLSESSIONINT *pThis)
+     ASMAtomicWriteU32(&pThis->u32Magic, ~RTCRSSLSESSIONINT_MAGIC);
+     SSL_free(pThis->pSsl);
+     pThis->pSsl = NULL;
+-# if OPENSSL_VERSION_NUMBER >= 0x10100000
++# if (OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)) || LIBRESSL_VERSION_NUMBER >= 0x2070000f
+     BIO_free(pThis->pBio);
+ # endif
+     pThis->pBio = NULL;
diff --git a/app-emulation/virtualbox/virtualbox-5.2.24.ebuild b/app-emulation/virtualbox/virtualbox-5.2.24.ebuild
new file mode 100644
index 000000000000..4464ccc84a0a
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-5.2.24.ebuild
@@ -0,0 +1,480 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.16-patches-02.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib:=
+	!headless? (
+		media-libs/libsdl:0[X,video]
+		x11-libs/libX11
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? ( virtual/opengl media-libs/freeglut )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	lvm? ( sys-fs/lvm2 )
+	opus? ( media-libs/opus )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	!headless? ( x11-libs/libXinerama )
+	java? ( >=virtual/jdk-1.6 )
+	pam? ( sys-libs/pam )
+	pax_kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? ( dev-qt/linguist-tools:5 )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_pretend() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something less stupid.
+	# This is needed for the qt5 version check.
+	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \
+		-i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	# Only add nopie patch when we're on hardened
+	if  gcc-specs-pie ; then
+		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
+	fi
+
+	# Only add paxmark patch when we're on pax_kernel
+	if use pax_kernel ; then
+		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
+	fi
+
+	rm "${WORKDIR}/patches/008_virtualbox-4.3.14-missing_define.patch" || die
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--disable-dbus
+		--disable-kmods
+		$(usex alsa '' --disable-alsa)
+		$(usex debug --build-debug '')
+		$(usex doc '' --disable-docs)
+		$(usex java '' --disable-java)
+		$(usex lvm '' --disable-devmapper)
+		$(usex opus --build-libopus '')
+		$(usex pulseaudio '' --disable-pulse)
+		$(usex python '' --disable-python)
+		$(usex vboxwebsrv --enable-webservice '')
+		$(usex vnc --enable-vnc '')
+	)
+	if ! use headless ; then
+		myconf+=(
+			$(usex opengl '' --disable-opengl)
+			$(usex qt5 '' --disable-qt)
+		)
+	else
+		myconf+=(
+			--build-headless
+			--disable-opengl
+		)
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+	# not an autoconf script
+	doecho ./configure ${myconf[@]}
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	local binpath="release"
+	use debug && binpath="debug"
+	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED%/}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	# *.rc files for x86_64 are only available on multilib systems
+	local rcfiles="*.rc"
+	if use amd64 && ! has_multilib_profile ; then
+		rcfiles=""
+	fi
+	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${fwfile} 0644
+	done
+	popd &>/dev/null || die
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED%/}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		if use qt5 ; then
+			vbox_inst VirtualBox 4750
+			pax-mark -m "${ED%/}"${vbox_inst_path}/VirtualBox
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			for each in virtualbox VirtualBox ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+			doins -r UnattendedTemplates
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${ED%/}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED%/}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
+			> "${T}"/10-virtualbox.rules || die
+		doins "${T}"/10-virtualbox.rules
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
+
+	if ! use headless && use qt5 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/virtualbox/virtualbox-6.0.0.ebuild b/app-emulation/virtualbox/virtualbox-6.0.0.ebuild
index 09faed602e03..b97352140e89 100644
--- a/app-emulation/virtualbox/virtualbox-6.0.0.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -195,6 +195,7 @@ src_prepare() {
 	fi
 
 	eapply "${WORKDIR}/patches"
+	eapply "${FILESDIR}"/${PN}-6.0.0-libressl.patch #673800
 
 	eapply_user
 }
@@ -302,7 +303,7 @@ src_install() {
 	if use amd64 && ! has_multilib_profile ; then
 		rcfiles=""
 	fi
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} *so *r0 ${rcfiles} iPxeBaseBin rdesktop-vrdp ; do
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} *so *r0 ${rcfiles} iPxeBaseBin ; do
 		vbox_inst ${each}
 	done
 
@@ -338,6 +339,7 @@ src_install() {
 	doenvd "${T}/90virtualbox"
 
 	if ! use headless ; then
+		vbox_inst rdesktop-vrdp
 		vbox_inst VBoxSDL 4750
 		pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxSDL
 
diff --git a/app-emulation/virtualbox/virtualbox-6.0.2.ebuild b/app-emulation/virtualbox/virtualbox-6.0.2.ebuild
new file mode 100644
index 000000000000..32183eb05b9f
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-6.0.2.ebuild
@@ -0,0 +1,485 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.0.0_beta2-patches-01.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib:=
+	!headless? (
+		media-libs/libsdl:0[X,video]
+		x11-libs/libX11
+		x11-libs/libxcb:=
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? ( virtual/opengl media-libs/freeglut )
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtprintsupport:5
+			dev-qt/qtwidgets:5
+			dev-qt/qtx11extras:5
+			opengl? ( dev-qt/qtopengl:5 )
+			x11-libs/libXinerama
+		)
+	)
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	lvm? ( sys-fs/lvm2 )
+	opus? ( media-libs/opus )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998.3127
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	doc? (
+		app-text/docbook-sgml-dtd:4.4
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	!headless? ( x11-libs/libXinerama )
+	java? ( >=virtual/jdk-1.6 )
+	pam? ( sys-libs/pam )
+	pax_kernel? ( sys-apps/elfix )
+	pulseaudio? ( media-sound/pulseaudio )
+	qt5? ( dev-qt/linguist-tools:5 )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_pretend() {
+	if ! use headless && ! use qt5 ; then
+		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
+	elif use headless && use qt5 ; then
+		einfo "You selected USE=\"headless qt5\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Replace pointless GCC version check with something less stupid.
+	# This is needed for the qt5 version check.
+	sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \
+		-i configure || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	# Only add nopie patch when we're on hardened
+	if  gcc-specs-pie ; then
+		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
+	fi
+
+	# Only add paxmark patch when we're on pax_kernel
+	if use pax_kernel ; then
+		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
+	fi
+
+	rm "${WORKDIR}/patches/010_virtualbox-5.2.12-qt511.patch" || die
+	eapply "${WORKDIR}/patches"
+	eapply "${FILESDIR}"/${PN}-6.0.0-libressl.patch #673800
+
+	eapply_user
+}
+
+doecho() {
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	local myconf=(
+		--with-gcc="$(tc-getCC)"
+		--with-g++="$(tc-getCXX)"
+		--disable-dbus
+		--disable-kmods
+		$(usex alsa '' --disable-alsa)
+		$(usex debug --build-debug '')
+		$(usex doc '' --disable-docs)
+		$(usex java '' --disable-java)
+		$(usex lvm '' --disable-devmapper)
+		$(usex opus '' --disable-libopus)
+		$(usex pulseaudio '' --disable-pulse)
+		$(usex python '' --disable-python)
+		$(usex vboxwebsrv --enable-webservice '')
+		$(usex vnc --enable-vnc '')
+	)
+	if ! use headless ; then
+		myconf+=(
+			$(usex opengl '' --disable-opengl)
+			$(usex qt5 '' --disable-qt)
+		)
+	else
+		myconf+=(
+			--build-headless
+			--disable-opengl
+		)
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+	# not an autoconf script
+	doecho ./configure ${myconf[@]}
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	local binpath="release"
+	use debug && binpath="debug"
+	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the correct libdir
+	sed \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		-i "${ED%/}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	# *.rc files for x86_64 are only available on multilib systems
+	local rcfiles="*.rc"
+	if use amd64 && ! has_multilib_profile ; then
+		rcfiles=""
+	fi
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} *so *r0 ${rcfiles} iPxeBaseBin ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	for each in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${each} 0644
+	done
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${ED%/}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	if use pam ; then
+		# VRDPAuth only works with this (bug #351949)
+		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+	fi
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst rdesktop-vrdp
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		if use qt5 ; then
+			vbox_inst VirtualBox
+			vbox_inst VirtualBoxVM 4750
+			for each in VirtualBox{,VM} ; do
+				pax-mark -m "${ED%/}"${vbox_inst_path}/${each}
+			done
+
+			if use opengl ; then
+				vbox_inst VBoxTestOGL
+				pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL
+			fi
+
+			#for each in virtualbox{,vm} VirtualBox{,VM} ; do
+			for each in virtualbox VirtualBox ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+			doins -r UnattendedTemplates
+
+			domenu ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
+		for size in 16 24 32 48 64 72 96 128 256 512 ; do
+			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
+				icofile="${PN}-${ico}-${size}px.png"
+				if [[ -f "${icofile}" ]] ; then
+					newicon -s ${size} ${icofile} ${PN}-${ico}.png
+				fi
+			done
+		done
+		popd &>/dev/null || die
+	fi
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${ED%/}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${ED%/}/${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
+			> "${T}"/10-virtualbox.rules || die
+		doins "${T}"/10-virtualbox.rules
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	if use doc ; then
+		dodoc UserManual.pdf
+	fi
+
+	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
+
+	if ! use headless && use qt5 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 7b342dfd9f41..9cefbed47777 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 5db516ff4545..f0e7ba263025 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -5,10 +5,9 @@ AUX calligra-3.1.0-plan-qt-5.11.patch 3818 BLAKE2B 1a1f619a491cbc3440ec8db091a1a
 AUX calligra-3.1.0-poppler-0.69.patch 2963 BLAKE2B 8fac1f298d414ac52073dfdb645d00eab1f2c71f876eea08feb8d9057f33b3ff5dbf69abe10984aa15717ef505522b07153341e846ace24a5f80f175dfed4600 SHA512 b408f1333af40c7270a2f14fa5f9069ec16baeceac7e2b91be2e9759d095d6df92a16b33e0b7c6897dbb15f01ae789436f8864cd1dd38ff009c1a77501e32083
 AUX calligra-3.1.0-poppler-0.71.patch 6868 BLAKE2B 3787bcc3564598450ec14b9bd4e63559af6ebd3a92f9c80560812f7b9a8f94681987ca6dfa49faee7ed3985d09a7f49d2a2499f9c6acfb5a96a0f8c86d7b8484 SHA512 1376ac7940e6ca0e9615445dc9c16f5ff75db547944dc8a5006520ff30b9d34eced1e5fa679a82535ceb581ae96352d1b6c039b54038290973f456de4d792917
 AUX calligra-3.1.0-poppler-0.72.patch 2053 BLAKE2B 1a69315b986aeb2464a57c5fdb63e2d0c33cb256be64c868af666169ab693109c45ad0ed15f35639020e2e1eb707592694b07896dced4f364e0cff817ce3190a SHA512 216eb134eb24f10492581a30dacd7e7b8259cdac3d6f21423cc773b1752a8464eabb15c6263c5bbe4e8e741cf1e02db07e854b4f2113399773ad6c56025fe1b9
+AUX calligra-3.1.0-poppler-0.73.patch 1342 BLAKE2B e36495c1f1f6c546666f30473fea46dfbdf47906ee61c2fed325a27117c14d3899703c6ca4667b3185ab9cacf3a5aa79a0c829777100d3088711f8fa359f5752 SHA512 ef5710d4f7fcc8015ce725b6f2f26ae1a8cd9bfe2e857633662696453104661f154309f0d0cc5e30b15b868bb43549d5ab8f81ee4cde31f0465cf795d453d233
 AUX calligra-3.1.0-qt-5.11.patch 3537 BLAKE2B 25aa9f832eb49876e0ee28d3af945658f9e93610fa894cb73dc274083febf5d62c97de427c10277f07aa7ef8054f4e0c811c70d4b0c4068cd018a3475c9a7e80 SHA512 f895ee2b9999ab4ff6dae523e4f4ea6f72bd05a8f8163a33f05401b63c08cc3c987a1207d1008ae808db0564c0036194e3d6ab5806c681b793c5191f9e585a7e
 AUX calligra-3.1.0-stage-qt-5.11.patch 656 BLAKE2B 1a4d8f005fd03395617ba0b225302e40b4aaf75c2a838a3009a3b3b6df7e75afdc798f27f08e76b7ad0ea60766612912d06eebe87c209ad9cab45db4bb3ccf54 SHA512 685bfca658404dc9920c805b97832b0a481a0ec0614bf142978c4ae03329e5e93b28d5af09d021b53c6d7a1316404f87612ab316f6a47c3f174572b50c65989b
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
-DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
-EBUILD calligra-3.1.0-r2.ebuild 6841 BLAKE2B 08d6ba5579bec64f7fe865ecd47678cec0d85829063f4e8578792bf79a5a288943a6bd42fead2a557c8dc594676a8c04afe07f75762b40bc6de12957a9b3072b SHA512 1e0fdf8cc1a2b75320671be47eea2982aefaf108d158fa998d1b1a3a07e1e3332bd671075df281aa0ae34eb22fd2bc8c55f591f49fc7dec3f8b78b58555273f1
-EBUILD calligra-3.1.0-r3.ebuild 5736 BLAKE2B 9e641845bb93ece21d0534b308f231dee31874af1115c12a8f04f6a1935bb136a9493c4646e3821604796732a8fbca881af1d7b9fc05f9e155f7f15ad681f19b SHA512 7c4e88f3f00d718002e2bdb13b1226eda357f0402e6e254fe2fdeab935dda47896aaf916bd68576858858a34ec5acdfb7d20dfa8f1ceabe97d8900e8d83eea5e
+EBUILD calligra-3.1.0-r3.ebuild 5775 BLAKE2B 50f09e292397a68ccea880521cff3c8521e5da05617b6b465b23289cc7c10c5dfb756dc3cc1c881e24cfbf99885e893c8cdc3760c138539ebaa54fe469b69083 SHA512 73e72d5e9cfadd295113cb3c79bc9f29b8c33a5bc565528f8d3c21384b1ae5b93637a5c6e6dafcb57545660e2a93f218099533da2f8644ab6d11f639541f89d0
 MISC metadata.xml 1108 BLAKE2B 266bc6539219906527f6e8692cfac1a4c894164466e01bd3ddc290ed665d19af6419ae1a8939002a4ccc719826def4038264ecdd65fca3aef8627106114c804b SHA512 61655e86072fdb828475b721492c3029b834931126af3cd015b2de87f3e7d56a866707d04b04dc36319f45f77fe5f3b650131c1e82a4e65d094288d8effe1893
diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild
deleted file mode 100644
index e2a76aa73c6f..000000000000
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_APPS_MINIMAL="17.12.0"
-KDE_DOC_DIR="xxx" # contains no language subdirs
-KDE_HANDBOOK="forceoptional"
-KDE_PO_DIRS="po plan/po"
-KDE_TEST="forceoptional"
-inherit check-reqs kde5 versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="https://www.calligra.org/"
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
-		calligra_features_plan? ( mirror://kde/stable/${PN}/${PV}/${PN}plan-${PV}.tar.xz )"
-
-LICENSE="GPL-2"
-
-[[ ${KDE_BUILD_TYPE} == release ]] && \
-KEYWORDS="amd64 x86"
-
-CAL_FTS=( karbon plan sheets words )
-
-IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
-	phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})
-	calligra_experimental_features_stage"
-
-# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
-# Required for the matlab/octave formula tool
-# FIXME: Disabled by upstream for good reason
-# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled in plan
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(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 kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-lang/perl
-	sys-libs/zlib
-	virtual/libiconv
-	activities? ( $(add_frameworks_dep kactivities) )
-	crypt? ( app-crypt/qca:2[qt5(+)] )
-	fontconfig? ( media-libs/fontconfig )
-	gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
-	gsl? ( sci-libs/gsl )
-	import-filter? (
-		$(add_frameworks_dep khtml)
-		app-text/libetonyek
-		app-text/libodfgen
-		app-text/libwpd:*
-		app-text/libwpg:*
-		>=app-text/libwps-0.4
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	lcms? (
-		media-libs/ilmbase:=
-		media-libs/lcms:2
-	)
-	openexr? ( media-libs/openexr )
-	pdf? ( app-text/poppler[qt5] )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	spacenav? ( dev-libs/libspnav )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-	calligra_experimental_features_stage? (
-		$(add_qt_dep qtwebkit)
-		okular? ( $(add_kdeapps_dep okular) )
-	)
-	calligra_features_plan? (
-		$(add_frameworks_dep khtml)
-		$(add_frameworks_dep kholidays)
-		dev-libs/kdiagram:5
-		pim? (
-			$(add_kdeapps_dep kcalcore)
-			$(add_kdeapps_dep kcontacts)
-		)
-	)
-	calligra_features_sheets? ( dev-cpp/eigen:3 )
-	calligra_features_words? (
-		dev-libs/libxslt
-		okular? ( $(add_kdeapps_dep okular) )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	x11-misc/shared-mime-info
-	test? ( $(add_frameworks_dep threadweaver) )
-"
-RDEPEND="${COMMON_DEPEND}
-	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
-	!app-office/calligra:4
-	!app-office/calligra-l10n:4
-"
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-arch-detection.patch
-	"${FILESDIR}"/${P}-doc.patch
-	"${FILESDIR}"/${P}-qt-5.11.patch
-	"${FILESDIR}"/${P}-stage-qt-5.11.patch
-)
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	kde5_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	if use calligra_features_plan && [[ ${KDE_BUILD_TYPE} == release ]]; then
-		mv ../${PN}plan-${PV} plan || die
-		sed -e "/add_subdirectory(plan)/s/#//" \
-			-e "/^calligra_disable_product(APP_PLAN/s/^/#/" \
-			-i CMakeLists.txt || die
-
-		eapply "${FILESDIR}"/${P}-plan-qt-5.11.patch
-	fi
-	kde5_src_prepare
-
-	if ! use test; then
-		sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
-			-i libs/pigment/CMakeLists.txt || die
-	fi
-
-	# Unconditionally disable deprecated deps (required by QtQuick1)
-	punt_bogus_dep Qt5 Declarative
-	punt_bogus_dep Qt5 OpenGL
-
-	if ! use calligra_experimental_features_stage; then
-		punt_bogus_dep Qt5 WebKitWidgets
-		punt_bogus_dep Qt5 WebKit
-	fi
-
-	# Hack around the excessive use of CMake macros
-	if use okular && ! use calligra_features_words; then
-		sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
-			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
-	fi
-
-	if use okular && ! use calligra_experimental_features_stage; then
-		sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
-			extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
-	fi
-}
-
-src_configure() {
-	local cal_ft myproducts
-
-	# applications
-	for cal_ft in ${CAL_FTS[@]}; do
-		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
-	done
-
-	use calligra_experimental_features_stage && myproducts+=( STAGE )
-
-	use lcms && myproducts+=( PLUGIN_COLORENGINES )
-	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
-
-	local mycmakeargs=(
-		-DPACKAGERS_BUILD=OFF
-		-DRELEASE_BUILD=ON
-		-DWITH_Iconv=ON
-		-DPRODUCTSET="${myproducts[*]}"
-		$(cmake-utils_use_find_package activities KF5Activities)
-		-DWITH_Qca-qt5=$(usex crypt)
-		-DWITH_Fontconfig=$(usex fontconfig)
-		$(cmake-utils_use_find_package gemini Libgit2)
-		$(cmake-utils_use_find_package gemini Qt5QuickWidgets)
-		-DWITH_GSL=$(usex gsl)
-		-DWITH_LibEtonyek=$(usex import-filter)
-		-DWITH_LibOdfGen=$(usex import-filter)
-		-DWITH_LibRevenge=$(usex import-filter)
-		-DWITH_LibVisio=$(usex import-filter)
-		-DWITH_LibWpd=$(usex import-filter)
-		-DWITH_LibWpg=$(usex import-filter)
-		-DWITH_LibWps=$(usex import-filter)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package pim KF5CalendarCore)
-		$(cmake-utils_use_find_package pim KF5Contacts)
-		-DWITH_LCMS2=$(usex lcms)
-		-DWITH_Okular5=$(usex okular)
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_Poppler=$(usex pdf)
-		-DWITH_Eigen3=$(usex calligra_features_sheets)
-		-DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage)
-		-ENABLE_CSTESTER_TESTING=$(usex test)
-		-DWITH_Freetype=$(usex truetype)
-	)
-
-	kde5_src_configure
-}
diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild
index 329a851fea6d..24ca06bcb3ab 100644
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild
@@ -121,6 +121,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-poppler-0.69.patch
 	"${FILESDIR}"/${P}-poppler-0.71.patch
 	"${FILESDIR}"/${P}-poppler-0.72.patch # not upstreamable
+	"${FILESDIR}"/${P}-poppler-0.73.patch
 	"${FILESDIR}"/${P}-no-webkit.patch
 )
 
diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch
new file mode 100644
index 000000000000..727f6edf3f12
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.73.patch
@@ -0,0 +1,35 @@
+From a1ddd91e6c354e8f0dda40f8a522053c3fa19c39 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Tue, 15 Jan 2019 22:24:08 +0100
+Subject: Guchar -> unsigned char
+
+It was just a typdef and it's now gone
+---
+ filters/karbon/pdf/SvgOutputDev.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 80f01a5..1a5aa30b 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -496,7 +496,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+     if (maskColors) {
+         for (int y = 0; y < height; y++) {
+             dest = (unsigned int *)(buffer + y * 4 * width);
+-            Guchar * pix = imgStr->getLine();
++            unsigned char * pix = imgStr->getLine();
+             colorMap->getRGBLine(pix, dest, width);
+ 
+             for (int x = 0; x < width; x++) {
+@@ -515,7 +515,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+     } else {
+         for (int y = 0; y < height; y++) {
+             dest = (unsigned int *)(buffer + y * 4 * width);
+-            Guchar * pix = imgStr->getLine();
++            unsigned char * pix = imgStr->getLine();
+             colorMap->getRGBLine(pix, dest, width);
+         }
+ 
+-- 
+cgit v1.1
+
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 797779a8d925..dd8b61cc51a0 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,6 +4,7 @@ AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba343
 AUX libreoffice-6.2.0.1-poppler-0.71-1.patch 8113 BLAKE2B 731f0a7622da871d901d7392ca2be3ffe4d397e8cb9127bbb5393de9bd861cddef0d99db8b037d5b6e841e1339ad7f815e6a10f5d892741af4971a4d95870244 SHA512 f657e1c31f8734ea646010012c094d2d9508dba7bc6ea9ffa5e02613066f8f75720474c02079148461930cc8dfd1b9c52a2544b0ef888760af790c1f62b3580f
 AUX libreoffice-6.2.0.1-poppler-0.71-2.patch 2654 BLAKE2B a0455e8eec3f221e418e24fb81fad849d5908c5239ca0a61ea329edfeddba91b06ca45ee324284a9fcab53dc88d4f290846c66bc1615030446dc588d6453e3ae SHA512 49ffc37d6ce484f9b601831518052fa09c925b51bfebe6965c3bffe3bdf19e2093d3859dcb57e13d6468fd1c5da7512f3164f4309832afd9ed591ab0541dde1d
 AUX libreoffice-6.2.0.1-poppler-0.72.patch 1667 BLAKE2B b24a61ecdd7560d5e89ecbebb2cf81ba0d3845bba40603455e549715ea3baaf0cdb9c9999d8c8efc22c4c516ba7239e6a6b8bbf29791ac76cabf1b683e2f866b SHA512 d9b300ff2493f2c1563d60babf2f7ff2620d059e9dadbbd0461d3b8c243130d7e458ba747df5abfa3e8e674a7751279a72be52e46b8077b4132cd46167bfe2ab
+AUX libreoffice-6.2.0.2-poppler-0.73.patch 4173 BLAKE2B 929e01c5a597d13be3ae05d93adafe256db39fdfae38bc4373caf5f47b790ef5574d4e97376c7b9fca91bf7467b3ded288550c03c8bdfb1e995c5e5a2bb51c85 SHA512 144e914f57672303baa0473ec049b61c31dd3376fec5b6dc7a791eaeb5e422bde7a0bf500a455651e8d4b1bcd5f4516363deccc098c482a41b4975b33cf54602
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
@@ -15,7 +16,7 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd234
 DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab
 DIST libreoffice-help-6.2.0.2.tar.xz 16186468 BLAKE2B 3846172642023633420ba83f3c65430dd7c1e5b4fc652e758081175d6b52c412822acd2af1dc31ebcc5344bd4f4b5ba6d49beb4f43f997fd99cbe1ecd69a9f96 SHA512 43c99f3db3d773d3f724600a875b964a65ae3dcab4ab7348289828cf860475a036cd6ba2d54d57cfec4ca259c085932fa479d465475591919e86108c56ed5feb
 EBUILD libreoffice-6.1.4.2.ebuild 16800 BLAKE2B 9bd5e46e7e599f9f916d49f5d72aaa0934257a2b46301c74fb61d0e78c7b93eb0297a7bfca5d99b56d8909e5d289d18fc520f290c2f7512962cf940fe774a950 SHA512 df15098dc1693424aee0db6bda394cc001f5370ee0b841befc040f1e1376bc87287f4f507540d5270442c66cdbe2aacf65571039458ab1a426b89037de22c1e8
-EBUILD libreoffice-6.2.0.2.ebuild 16977 BLAKE2B da9afade6f0175e61cc0ea4fe9078b02ad7986c844052a8da6e5ad5bf6821a2b2c239d6da14a8013a6d8994a8e47b7f2d7983895747719b2db908d58013c14d1 SHA512 ae994bb4750f9f3c5a3ab3d5e8b4bb848fc014071998430cd43e184e7d617b6bf50ce78b0002f3a1ddb9d06a1e98ee1bce4b57cb32a09e6fd18ddc86db181858
-EBUILD libreoffice-6.2.9999.ebuild 16963 BLAKE2B 0c37f62ada78a98b86fb4e79583e1badcf6a29d7c6797bc4675de6863b3c524976216c3dd1523b392e42c4041b848fd4966f5f65d136daa2b2e1248d62e3ed91 SHA512 d661ba2c44c6c1a251a08b630414b9cd0c3877a1d8be97df50362b87da35aba50a8d91a2055011a55ffb9d3c4d0e1ffcb0ab8c96f0476b0577ad59f079ff401c
+EBUILD libreoffice-6.2.0.2.ebuild 17013 BLAKE2B 6d6313ac4eff9670e834b9cef896dc19f824506588ffc6d5af797815ae3c3c8fd534cfe5c48819234c14ea83c919bf41e054c8a482553515a3ac8a0aa9a7f5d9 SHA512 2bcff6e4a7b9e7a28cac697f951ace175002dcce6bf4dbbfedb63e2b633a3590336e7be2aa09162996a77c68ddc4780d46baec8a80bfbfbd1ced517ec1c20baa
+EBUILD libreoffice-6.2.9999.ebuild 16843 BLAKE2B 84b5daffc2391948810fd2c57243944e644ec1a56cb76d02419827bbfd78a0293c6866fe742cc9cd15ec6a285db4e02058122ae95004649ad47bcef76445fe99 SHA512 fa28f5a2c0a7f3f9e2baffada4046a3e919e0834fcb47e11fd04e8e051c9f10b8f0cd42b74a043e14d7b6974e548ba91173c1af2d7cece21cf6f1959ff9e134a
 EBUILD libreoffice-9999.ebuild 16843 BLAKE2B 164d3dcff010af3b9c8544c61c1f767dbd3ce998fac34379e2c431d9ce6d08f9a34d436005108b505b370e632cab6ffc0d3715a0999fab0c80a365ca05f9b69d SHA512 827da528559c43600afdfe96cb44c267abed25d29d5661399cfdcf86204e95d566827ece053f5dbd3c4d6279636f479c988b526f1998988c8d9d39ef57d7afcb
 MISC metadata.xml 1008 BLAKE2B 62a25f90e9b01f8fd924e861b0ddf1789e3124474cf73e2fad217e54e0324e38ad5bf37ff703b37bb5946d66e5de8711ff5e9b53a15e0ad368ebb3d04a3a05a3 SHA512 146662ca1c1dd7eb49c00b927657329befd3ee58ac0226ebb5fe81aefe90d7bf66ed6113cbe93774c0b917377eef8c1821a9ede278c9ba791a3ab544a2eaf2c7
diff --git a/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch b/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch
new file mode 100644
index 000000000000..fb9112bc3981
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.2.0.2-poppler-0.73.patch
@@ -0,0 +1,101 @@
+From 9e1522ad1d2c2bd775fa50c2b142eb110a56af72 Mon Sep 17 00:00:00 2001
+From: Michael Stahl <Michael.Stahl@cib.de>
+Date: Mon, 14 Jan 2019 15:08:42 +0100
+Subject: sdext: fix build with poppler 0.73
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+... which has removed Guchar, Gushort, Guint, Gulong...
+
+Change-Id: Ia54ad378031f167f6779f6ffe574b85c1e72f26d
+Reviewed-on: https://gerrit.libreoffice.org/66305
+Tested-by: Jenkins
+Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
+(cherry picked from commit 50d371ae08c66648d9f32f633b2245e1746e2bb6)
+Reviewed-on: https://gerrit.libreoffice.org/66356
+Reviewed-by: Caolán McNamara <caolanm@redhat.com>
+Tested-by: Caolán McNamara <caolanm@redhat.com>
+---
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++--
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 6 +++++-
+ sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx      | 6 +++---
+ 3 files changed, 10 insertions(+), 6 deletions(-)
+
+(limited to 'sdext/source/pdfimport/xpdfwrapper')
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index 575a90a..35490a0 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -298,7 +298,7 @@ static void writePpm_( OutputBuffer&     o_rOutputBuf,
+     o_rOutputBuf.resize(header_size);
+ 
+     // initialize stream
+-    Guchar *p;
++    unsigned char *p;
+     GfxRGB rgb;
+     std::unique_ptr<ImageStream> imgStr(
+         new ImageStream(str,
+@@ -401,7 +401,7 @@ static void writeImage_( OutputBuffer&     o_rOutputBuf,
+                 oneColor = { byteToCol( 0xff ), byteToCol( 0xff ), byteToCol( 0xff ) };
+         if( colorMap->getColorSpace()->getMode() == csIndexed || colorMap->getColorSpace()->getMode() == csDeviceGray )
+         {
+-            Guchar nIndex = 0;
++            unsigned char nIndex = 0;
+             colorMap->getRGB( &nIndex, &zeroColor );
+             nIndex = 1;
+             colorMap->getRGB( &nIndex, &oneColor );
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index da021a2a..443e757 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -267,9 +267,13 @@ extern FILE* g_binary_out;
+ 
+ // note: if you ever change Output_t, please keep in mind that the current code
+ // relies on it being of 8 bit size
+-typedef Guchar Output_t;
++typedef unsigned char Output_t;
+ typedef std::vector< Output_t > OutputBuffer;
+ 
++#if !POPPLER_CHECK_VERSION(0, 73, 0)
++static_assert(std::is_same<Guchar, unsigned char>::value, "unexpected typedef");
++#endif
++
+ #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX
+ 
+ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
+index 4d9e3bb..b582856 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
+@@ -242,7 +242,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
+     appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image
+ 
+     // initialize stream
+-    Guchar *p, *pm;
++    unsigned char *p, *pm;
+     GfxRGB rgb;
+     GfxGray alpha;
+     std::unique_ptr<ImageStream> imgStr(
+@@ -328,7 +328,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
+     appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image
+ 
+     // initialize stream
+-    Guchar *p;
++    unsigned char *p;
+     GfxRGB rgb;
+     std::unique_ptr<ImageStream> imgStr(
+         new ImageStream(str,
+@@ -374,7 +374,7 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
+     {
+         for( int x = 0; x < maskWidth; ++x )
+         {
+-            Guchar aPixel = 0;
++            unsigned char aPixel = 0;
+             imgStrMask->getPixel( &aPixel );
+             int nIndex = (y*height/maskHeight) * (width*4+1) + // mapped line
+                          (x*width/maskWidth)*4 + 1  + 3        // mapped column
+-- 
+cgit v1.1
+
diff --git a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
index 91afb2dd0204..e2865fbd55d9 100644
--- a/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.0.2.ebuild
@@ -253,9 +253,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 
-	# master branch
+	# 6.2 branch
 	"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch
 	"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch
+	"${FILESDIR}"/${P}-poppler-0.73.patch
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index d1351356c1eb..dbeed62a746f 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -251,10 +251,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
-	# master branch
-	"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.71-{1,2}.patch
-	"${FILESDIR}"/${PN}-6.2.0.1-poppler-0.72.patch
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 94fb102f1dbd..ba2f34bfcbcf 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,6 +1,6 @@
 AUX scribus-1.5.3-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063
 AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
-AUX scribus-1.5.5_pre20190113-poppler-0.73.patch 782 BLAKE2B 08549869fea1ea4793752de335bdc63af52627e7aac05e2baa50fda2ec1f214f8e7e16c2eac250a78535043f7f46e66ad07c87ad3392501bb476376e11062695 SHA512 4c2619bd44207e5f910695fe3bd14c9295ef14be55841bf5d9659a534162e5f27c7cba070251aeb5b9fcf7b603f65db3412060303326d1741026a4e85833c218
+AUX scribus-1.5.5_pre20190113-poppler-0.73.patch 935 BLAKE2B c4f7e44a3d4a5a4fc2ab34aa164516757f8a76081a7644b100af0f104b4697ea4578495e06fcf74fc9b62226b28ce9b7b08aea29b1bce67b70a3e169c7be7149 SHA512 890868cacc52337e3593a35d80cc9958d7d039275c5f1c21694b22c738d7707893b49db43acf49672d8259a60809c2987fca415f4d0802f115d7c8d3a8dd0623
 DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669 SHA512 4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568
 DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403
 DIST scribus-1.5.5_pre20190113.tar.gz 84927002 BLAKE2B ff515bbd66267493e4558fa2cbdca57fb3e9514940c3c7cc48e435e5d78349674f57bdbeeeb0574c7e7e2d1a2d2482a5b16ccc48c62281f2d11c28a5cc38f915 SHA512 1ed9bd3add1a62234b8e26f10a31a015f3a224da588b7b72c854209a45faae61ee949d2986980700132f9d573a426c1283f4e375c25d7ea63ce6b04260a863bb
diff --git a/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch b/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch
index af98da7050c3..f63f4c6d1eed 100644
--- a/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch
+++ b/app-office/scribus/files/scribus-1.5.5_pre20190113-poppler-0.73.patch
@@ -1,24 +1,24 @@
-From 5a3255ac6dd1f19fb5fb5ab17452083bfe573f42 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 14 Jan 2019 23:58:59 +0100
-Subject: [PATCH] Drop obsolete header, does not exist in poppler-0.73
+From d34e59bfe495250ba023ba0f99e672ee32300a27 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali@libertysurf.fr>
+Date: Wed, 16 Jan 2019 00:30:35 +0000
+Subject: [PATCH] #15537: changes in poppler 0.73.0 cause build failure
 
+git-svn-id: svn://scribus.net/trunk/Scribus@22806 11d20701-8431-0410-a711-e3c959e3b870
 ---
- scribus/plugins/import/pdf/slaoutput.h | 1 -
- 1 file changed, 1 deletion(-)
+ scribus/plugins/import/pdf/slaoutput.h | 2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index c46448b..83e010c 100644
+index c46448b80a..4dac7c3983 100644
 --- a/scribus/plugins/import/pdf/slaoutput.h
 +++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -28,7 +28,6 @@ for which a new license (GPL+exception) is in place.
+@@ -28,7 +28,9 @@ for which a new license (GPL+exception) is in place.
  #include "selection.h"
  #include "vgradient.h"
  
--#include <poppler/goo/gtypes.h>
++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 73, 0)
+ #include <poppler/goo/gtypes.h>
++#endif
  #include <poppler/Object.h>
  #include <poppler/OutputDev.h>
  #include <poppler/Gfx.h>
--- 
-2.20.1
-
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 2718d3c90fce..376abbfd15db 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index c5e0ab0b23ca..15220bf0278e 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -371,7 +371,6 @@ EBUILD bash-4.1_p17.ebuild 4142 BLAKE2B 5d8f2b031eb26211ff1f778629cfb8d9255b357e
 EBUILD bash-4.2_p53.ebuild 4344 BLAKE2B 5565a97a0aa9465fd8eef2de0b78434c04096d84c988cdbb663af4b529e1207cc68d0030fa4d88e4028fa7bef08847df170a274ccba316213cceb7401163ed00 SHA512 d3cae3853f6c3b735dd9083b9f7d16bd96aac1ba29ba49e8d5e62140ebdb97f4c9d36e3bc36fcd96f32685236fe6bb80d53015b9dbb20a829968aa535a949a3f
 EBUILD bash-4.3_p48-r2.ebuild 5642 BLAKE2B f5d114b98272cf7e6a900707e0abc4798cc1b85bf509f3260487959dad69a35a0badae19e1522e4746bb74c06f00a767a50c6a3199339c42036f3d92924722af SHA512 e83786756c9e65c08e78137396b393e04a7950d9393c6206491d7d7b13eb46fb4504fe34335706aa0835b6abc651e9578bf6157d6248de8e7fc2dc1a90cba927
 EBUILD bash-4.4_p12.ebuild 7127 BLAKE2B a5909b73ff2daa32a6e3af1f25f15b3bf1d9cb0dc1a176a8826f2d47d370367ec91731b062f1916f664edca442cdc91971fee227ff51f0a80d53d1ad146011de SHA512 92233876cf54b44c82ee67e4b56089a83b589a5c2570f3a1d53b1b647e29ba498c5a7128bf7b1b6efc9384c8ebb0afe7843373a57a016066260de546d8d90eba
-EBUILD bash-4.4_p23-r1.ebuild 7393 BLAKE2B ef6e2bcdd208b33105ca93c0899809e475de3749ab0b7fedebe491ad9b1daa00d9e75f5da047dc22d9e010be222f977d4c2c79024516e23b4c0ea08bfd708017 SHA512 6f7182d473b92168812325ced713172fa36f531b66fd569dedd71bc93836c0984eb67c32eddb610ba55cae5954a00f424a924d8853ecdbfa5ba88435434a5980
-EBUILD bash-4.4_p23.ebuild 7332 BLAKE2B 993cc0f3f3bf04a4e30f32bc42b2e8b4117d8e2618d19bd06a3d8b1cae6ce64eb271cc9b77c6b05a0b729b36a5395b29f84d1c194cdc62f55509dc5d7534d043 SHA512 c30d5a98507f1ff53b4489ca4d15ac257a5653094fb8466f4e346a149ba05ede0c945db0cef045b92b7f353cab9e349905a41e97684b739f384a509005d440da
+EBUILD bash-4.4_p23-r1.ebuild 7392 BLAKE2B d2ecb88de045cc50a77036c38645272d2849f36c5324619540016517a0c4b0535b50860f77cf6756115c88356884c62a2ac26fd8a38412221f55909b610e42c5 SHA512 c7be83be7698f1a2020ff2063a76ac4ab43503afd5a407c381cef270e275ccd5d41143308adb05abe7393f01a71187322dbb3d9c455b70b0273c074ba66e02c6
 EBUILD bash-5.0.ebuild 7332 BLAKE2B 267bed85678ff687485811fd399403d4224874b41873c27ac1af9ec84b79c7f74e7cea281dd9e90f1ec5537b77c59849a909991f17897cff30b7558886949eea SHA512 d48a77249bf2173242dc81fa37ee933b34a574c129dfa0a3fdda9c5fd405004c8b29b731f331fbb8c456b012c4e9fa4fe4658ad8323665ffc1bedb77c5f2d369
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-4.4_p23-r1.ebuild b/app-shells/bash/bash-4.4_p23-r1.ebuild
index a2e53425d183..2eef8d044044 100644
--- a/app-shells/bash/bash-4.4_p23-r1.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r1.ebuild
@@ -46,7 +46,7 @@ fi
 
 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 ~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="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-shells/bash/bash-4.4_p23.ebuild b/app-shells/bash/bash-4.4_p23.ebuild
deleted file mode 100644
index acd7bdd38469..000000000000
--- a/app-shells/bash/bash-4.4_p23.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 ~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="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
-"
-# 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/fzy/Manifest b/app-shells/fzy/Manifest
index 6443e90c8f63..acb1799d3dbe 100644
--- a/app-shells/fzy/Manifest
+++ b/app-shells/fzy/Manifest
@@ -1,6 +1,6 @@
 AUX fzy-0.9-cflags.patch 299 BLAKE2B 61685e7180741ec77449b5de6fa711b4939faedd94dfcfd84ec86be0ef963b13d5a5308e294f4f22e83682982671a528b64446979fe41e112aeb8c5d143e865e SHA512 f3ea9b90a75f0a013466ef00190dbca451b22015e0a3c3f7e823f61dc2e4ef7d64f90a9685fec311675fb6c5bc788bb7436da2fd89f4f6baade4dfbee8318635
 AUX fzy-add-utf-8-support.patch 2642 BLAKE2B bdece2ab5d9122c9c2f306271b1c795c1130c145e3a434d4b831dd680bbdc09e5241763391fc2efa16a6af50cfbaf49b3fe98364f5f56a25b2d78af8fcba8a1b SHA512 203c0e8e7a9583661cd7d85cc094016eed2149a82fb55a578075e5d2fe513cbe2f7241ea76660e5990efd6b5f573f584ab3345ae832439fbea80950c64f7803b
 DIST fzy-1.0.tar.gz 47432 BLAKE2B 5fef7061c797e63dabc3f77daf3dbc8a58671c257430dc8ba4680363a9ace5722562fc7e0aba618d53820e703b261dbe0182638f16223d1202080450a6c21ec2 SHA512 de5ed1af035260f4ae550c53b08c4ff302c978350784cbfd2981d1691f55d9c0f26b9333c74adea939b3f4578dd47e66ee99112e10afc5497c64011827d19dbc
-EBUILD fzy-1.0.ebuild 1096 BLAKE2B f37e48527a082e6199da3bac52291e0e75c6ac12f96b4b9602601ebd6670856d2c5690b63ac51ba1b324d372f91601254bd99d9b50e1ac41591f9a2dfaf12786 SHA512 8a7ddbaaf91fa98265fcd6f186fe801edb1db2191bdcdfd1c74ea57683c5b65f0c628b62c8804ffe4ae1197dfee25a1f2f678444d26bb63f7abce899c2b49217
-EBUILD fzy-9999.ebuild 1098 BLAKE2B 47fe52b38c6cb903178d0316d3a8504e22158213a19ef0d0f86602e9dceb33e998117d178268898a85869f13f30aaaf97ed0aac8dc4014f6b6052f8c381ad008 SHA512 e6958bf9a1ef90be991f7b23119ed9a879a57c050263df540726b4b9f0afb7d65c88541ae52274acc01a0821f025190c45954ddb3f4f625a6017ecb4623d4a10
+EBUILD fzy-1.0.ebuild 1101 BLAKE2B 6b372014004fff32821dc8e3dcb72fa38b7a628c8d3dff506102d30a8a986d691c360d2c9bf5fd9db2d3475b13dd785a5f9d59b53bf9147cab3d14497c69d1e4 SHA512 b589016e38dc18e2cca44744b6d6817b49a720e3485b5adb235f6c47850b887072444493ee5e148224e1c4348740362fb74e99ff2161228e970229d72e54f10e
+EBUILD fzy-9999.ebuild 1101 BLAKE2B 6b372014004fff32821dc8e3dcb72fa38b7a628c8d3dff506102d30a8a986d691c360d2c9bf5fd9db2d3475b13dd785a5f9d59b53bf9147cab3d14497c69d1e4 SHA512 b589016e38dc18e2cca44744b6d6817b49a720e3485b5adb235f6c47850b887072444493ee5e148224e1c4348740362fb74e99ff2161228e970229d72e54f10e
 MISC metadata.xml 892 BLAKE2B 3182bda5d04463762d724265d2ff3644eef1615dfbd2db92ad7ab5e1bf3b9e5f0f727dc55939e0c0902ed16ac78d4a39ae331d22902ec7f7f10d53a7e65a59ba SHA512 202ff3dc44543bf072b32addfc5e1ad627ec6fa16585d9ff9ddbe68bfaa784aa0319ed152621215cd60f1c2a688bb0e3ca227b78fc6b62f5dca4f39b2ad8a55b
diff --git a/app-shells/fzy/fzy-1.0.ebuild b/app-shells/fzy/fzy-1.0.ebuild
index 5789831aab17..5ae58b36b8b6 100644
--- a/app-shells/fzy/fzy-1.0.ebuild
+++ b/app-shells/fzy/fzy-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
 else
 	SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="Fuzzy text selector (interactive grep) for console"
diff --git a/app-shells/fzy/fzy-9999.ebuild b/app-shells/fzy/fzy-9999.ebuild
index f3986538cc79..5ae58b36b8b6 100644
--- a/app-shells/fzy/fzy-9999.ebuild
+++ b/app-shells/fzy/fzy-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
 else
 	SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="Fuzzy text selector (interactive grep) for console"
diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index 9bc6ce7b0cf1..d444adda17e8 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -1,3 +1,3 @@
 DIST loksh-6.4.tar.gz 250475 BLAKE2B 061538766834038677019ca8f1ccd16c77245855f0d666ec5af78fc24995e74b22637ccb29d92d6c436c377d21c1a9449dcb79568ab5ccf7f141e8f0b6040d99 SHA512 74cce1428346820331fb8bce8acf275077b05a3c46081bce5c35e8e0d47704446bb93ce3e457dbf2e379d5d9656844b78c736b1190b2fe39ee92717863adb86c
-EBUILD loksh-6.4.ebuild 608 BLAKE2B c8e27b05cd194c18726e558032cc39845e2eccc5699ad3305fa9f0b80c1050c961d53970d7edcba3da99b1e4f664ca0d3f0c7dd16820d244d3671a09121a9884 SHA512 f78deb3b21e539c2f87f7ee01993ff2baaecc23dae39c948ee17c1f83212aa0d855b9d7e2295f09767e99b3a2222aa7d2652b6cbbbe725488267a5fb73111ce2
+EBUILD loksh-6.4.ebuild 613 BLAKE2B e3d3677ccb7a0dfbdc1f089e48b568da0ff2be45385d948aeb35bef7b1f6ae3fbc272f7b51098af9083339180e81e313d2c10e7792016de0351648b7eff36462 SHA512 0a63c2ba6be2e9ce194796abadde741238f8a18695386ef4a884f8d9d7137b6cf58486e86a2a7600f4be61697d017cd976cb0522a9f94a0be4e7ab5a2e4e9231
 MISC metadata.xml 446 BLAKE2B 0a875fdcc5daa79b15353c9cabae32697f435edfd153759193cfca0fd17ca3c76f649b27cc32bae132a1270c99faad5ca91475ebb6a51f0bd04eba6cd95373a0 SHA512 4e987382f9f5fab554e34afdf016fa59550f64831b8dbfeecc30029a6e0eacf42d14e22117c47bb183abf584ba549d24e3d8dac7e0101e78e2e30ef7a9020069
diff --git a/app-shells/loksh/loksh-6.4.ebuild b/app-shells/loksh/loksh-6.4.ebuild
index 24cedba7c6b3..1e5d4a69359b 100644
--- a/app-shells/loksh/loksh-6.4.ebuild
+++ b/app-shells/loksh/loksh-6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dimkr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 8f6243c39347..cf384639a348 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index 0f94d927a761..c83ba54f841b 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,7 +1,9 @@
 DIST master-pdf-editor-5.1.30_qt5.amd64.tar.gz 16150271 BLAKE2B dfbdacb6df75d268c57cc5d7f6c949c796abecd09394a80694dfc05b5e666c4e836f636b5af6a17a309625ed243e88c1871347e8f7162b6e3f8c47fc27d83e26 SHA512 3cc0a85e9518e75581cfdc05ac8dbdbd534fa11b4f4cfb490a0e9b411b84c073d52e9a5a3aa620507c88117cc04e033f5e860e335b37aef49eec95f2352e9b21
 DIST master-pdf-editor-5.1.36_qt5.amd64.tar.gz 16149439 BLAKE2B 882f399bfb5cf7b2a39c8174f541a1124953df5bc3bf5ded27bba1eec3ebc966e1b5c0174219759995d939ff203426a2004be61989fa7d062c26dc64320769b5 SHA512 934e9d856476e412a7b40858365e843a8350f638b48a9b593faeab12cd9032243042fd11929e826a294a29ab3810110c40fdd07f56e8c5d0fb6fa2f957a36c21
 DIST master-pdf-editor-5.1.42_qt5.amd64.tar.gz 16150053 BLAKE2B bd536d34621d79dae596127418b23495ea2daa2906668ee006ed2ba32e61d8cd71fa1471e90496e615ae67108cd90e072c01f6dbf53671d3f0d783421e63c06c SHA512 c1c53af9235a4f31cd108643fcafab9265de56ffe1a0949af1a39aaf0df8dec50cd8f5bd426fbd1750d6e59323628bd626c0acd7a788324c81b01e6793e0f5f3
+DIST master-pdf-editor-5.2.00_qt5.amd64.tar.gz 16173634 BLAKE2B a29d1bcb1d0497a33cad98394c7d0b6a2f057d58eb9b403b02907bd6d436413aa01a5dbfc59d79771622af9c4acee43500b36f18cc74a00ba52f8bd61b251f90 SHA512 7d97c97dc744310e8af10e54ee10cca73ad4712bcb566165684dbe89f28f32f5b947b8fab715260280960a65c1f260675c075c21638367697f69a461cf88c0ef
 EBUILD master-pdf-editor-5.1.30.ebuild 1186 BLAKE2B 7cdad5f7b3ddd475afe443a8311a975fb5923f31305ef115745bdebeeaccc0bde057cdc5689d58159b774ad8247a98890108555faf315c1fd4e6026f8b1a9945 SHA512 9840b21b297e7913f628d0acda4804e73ad5bd46847e14862da07aca13b9cdca4747e66de079c426dca7213abf758d950fc48127a71dd3a32280d9b053f5e4e8
 EBUILD master-pdf-editor-5.1.36.ebuild 1186 BLAKE2B 7cdad5f7b3ddd475afe443a8311a975fb5923f31305ef115745bdebeeaccc0bde057cdc5689d58159b774ad8247a98890108555faf315c1fd4e6026f8b1a9945 SHA512 9840b21b297e7913f628d0acda4804e73ad5bd46847e14862da07aca13b9cdca4747e66de079c426dca7213abf758d950fc48127a71dd3a32280d9b053f5e4e8
 EBUILD master-pdf-editor-5.1.42.ebuild 1186 BLAKE2B 7cdad5f7b3ddd475afe443a8311a975fb5923f31305ef115745bdebeeaccc0bde057cdc5689d58159b774ad8247a98890108555faf315c1fd4e6026f8b1a9945 SHA512 9840b21b297e7913f628d0acda4804e73ad5bd46847e14862da07aca13b9cdca4747e66de079c426dca7213abf758d950fc48127a71dd3a32280d9b053f5e4e8
+EBUILD master-pdf-editor-5.2.00.ebuild 1177 BLAKE2B acce9fa227bcc1e20afd6fa128a302b7a1b56e6a19b419f448a8cdb1b4d26fe5395b090dc8d2b11c969b87240196c2194e94bae8aebef9dc6d2450d0c0df7ccc SHA512 554c44f2fc4bc6be2359dc7e8a72d859417a1359f94aef7ec277d9af645a9e7c17947949548c5fe77fb462a00ac71d23f29d2b6baadf145fadddfc88b385ec07
 MISC metadata.xml 367 BLAKE2B 8636a0f12f2f2a38aaa943268b978e9269877950e8ec447f4d012e9c1833c474cff5b1d7f53a99f2ec29315858812068e7ab7f42df60127944c8edcda3a5746e SHA512 d54bf635e54008ebabde5039e2527297b8f80204138c90c7744d928041445ca667232a92e6b7ca357f844f2c8ada6b80f13b7de4ae4768e30ec676b55ae73156
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.2.00.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.2.00.ebuild
new file mode 100644
index 000000000000..e7b7b1117c30
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.2.00.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils desktop
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="https://code-industry.net/public/${P}_qt5.amd64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.4.1:5
+	>=dev-qt/qtgui-5.4.1:5
+	>=dev-qt/qtnetwork-5.4.1:5
+	>=dev-qt/qtprintsupport-5.4.1:5
+	>=dev-qt/qtsvg-5.4.1:5
+	>=media-gfx/sane-backends-1.0
+"
+
+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/zathura/Manifest b/app-text/zathura/Manifest
index f27a17fbe5d5..9f9dab7b097f 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,5 +1,7 @@
 AUX zathura-find-libm.patch 896 BLAKE2B f28a1a967d274b0840f64bc94b7179bbcc5cfcb025b8450604c2e928cd4199e78a190e7766a33dd5b513d128f6567be45e667c75605397892745997b97c3b9ce SHA512 664440b3ca4e241f4d2072be5dbc52b00d962c264d5698649d7843e5ea54479a114a8c6ce731f4471fd600603898f4e571d23979aecd0447f592f0d3ebc51f2a
 DIST zathura-0.4.1.tar.xz 148592 BLAKE2B c6fc495ce6413057dc86be95272e8178f32649c68f95052b2db00526b7805b1f6772c628902409af66ba88983171b5456f4cd26c77fcbe32023bf99d1081a55d SHA512 370e7fa12a3a3a2a973870a99f7b2b910c808d6932c1de9093630d7e8bd7d97feb4b7df713e9ac33c7927849b63174a899ce6eaa60db89b1c47d6e13ef181ad6
+DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
 EBUILD zathura-0.4.1-r2.ebuild 1450 BLAKE2B 8e24dbd957d937983f1fcab3fb2f3ee0f26bde6a842ab90d89feaed077ed26443f2d81d7ca5d92bbafb4becb2bb3787109410fca39d8876f7c7a54a34103d491 SHA512 28cc323afcde7d575b1ec468d56f9db4a3e9dddb560f8d638d6a3dcde96bde3184b2b1e9c7bb3a4b217d5010dddf29929e8b2748802dd242b136494ea506813b
+EBUILD zathura-0.4.3.ebuild 1366 BLAKE2B 4dc9fb186ab66254a840c6d6e46daa044f1e17ef04156e986b9963bdbf01ccda684a2b4d7fc80003e1d11040983a10968d5670399a9816a2b2c363647c7c7332 SHA512 99dad94cf9d9215a65becf6e113b8e2a2711ae7f15d46e2100998ac9b59446817fb5b738a522aaa6fad541eb1ba4e2a862f5f54b0af558405c5d90987764f1de
 EBUILD zathura-9999.ebuild 1404 BLAKE2B 39ec6014b09175029fe05023a1896ae44a20f48497b61ae9b1120770b52e22de28929d0a922ced1690b48a27de3acb769616f19e52ecc9785b8918bf5340e2e6 SHA512 072cdae46c679f6f0453e881baa83b3474f2458e8a5d9a9298cfe6d9165ff232cbd246a33166d21aac19d3c9c3fb17f1d96a8b30b61085f4d0e242766a69632c
 MISC metadata.xml 827 BLAKE2B ce7ca0240a5fc4caca62988ca9d849aa2c010ff36f9ca542f45c49d47a04669e66cd6e1c891f3ef1c36b5eed690d7a6bc134d7130be7ee7e0ee987a428eaeecf SHA512 fba70c39e525376da98422f05601a327e68cb7bc904688ebb3b17854b1123e8baf066cae45d82d3c91d9ccf24b64241a6541484cfcd342fecb2a5f7ca44af02f
diff --git a/app-text/zathura/zathura-0.4.3.ebuild b/app-text/zathura/zathura-0.4.3.ebuild
new file mode 100644
index 000000000000..498fcc32ef94
--- /dev/null
+++ b/app-text/zathura/zathura-0.4.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc +magic seccomp sqlite synctex test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-libs/girara-0.3.2
+	>=dev-libs/glib-2.50:2
+	>=sys-devel/gettext-0.19.8
+	x11-libs/cairo[X]
+	>=x11-libs/gtk+-3.22:3
+	magic? ( sys-apps/file )
+	seccomp? ( sys-libs/libseccomp )
+	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
+	synctex? ( app-text/texlive-core )"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="doc? ( dev-python/sphinx )
+	test? ( dev-libs/appstream-glib
+		dev-libs/check )
+	virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		--libdir=/usr/$(get_libdir)
+		-Dconvert-icon=disabled
+		-Dmagic=$(usex magic enabled disabled)
+		-Dmanpages=$(usex doc enabled disabled)
+		-Dseccomp=$(usex seccomp enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsynctex=$(usex synctex enabled disabled)
+		)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index f49ca23ffff1..d8ab04422805 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 7421132835d2..e055f055a7c3 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -2,5 +2,5 @@ AUX aws-2016-gentoo.patch 1255 BLAKE2B a2b2d944a131d83b789fe91a1b31b062f039b2f6b
 DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35
 DIST aws-gpl-2018-src.tar.gz 4193276 BLAKE2B 31fa99fc3324f2514799a33cbd282f68a26d133da14ee2a70d3f5091c3670e82a7b77f9f941e593e914a755dd54d5a1e352d201a9dc097991b7bd50aa9f54b3b SHA512 62b85f70dd722148bbf3ad85bfd6cde2d0ab1d8029f673eb7ee42b0890c3dbf0f023c321e96eca99ccd2f0b235347ab577cfb558e7d81993d166683ec815dbe4
 EBUILD aws-2017.ebuild 1025 BLAKE2B f7b86bf4a470b5376061b4ce47263889f66d68cde383136312d979959d9c1f59e96d8367d242e44ec750bf6e006d7144f1fb337bbdcac6f95f2a42b82b3e0756 SHA512 23a477b56590afe16de4fc6707fc776daf431a0f576d002bbf0ab5305694b2d0f701bb5d4c85ca622bb4b13f3f3c7c7760820457688b5ee6bb78984558a68df5
-EBUILD aws-2018.ebuild 998 BLAKE2B 965b47d7df98215f94177dcf663075ad56f83365591289a15501b26b1d3db5ca17412956a80a3f1d727ede8713aaf3bd28623e1f84c2d4f2bff39da0f2aac481 SHA512 21ef1dca5d430bf12cfd643343bcd99c020cb4a215e66dc86e497a8ee21b4f6903c5082947be8dffd07cfd82387590b46525b4d522232746aafee2d507667f39
+EBUILD aws-2018.ebuild 1004 BLAKE2B 54fe0f8d215f2f4e48deecf0439fa38c9a6ea33691e12378e39722413f7615e6650af2e4f14aebe2003f242f2128c97013bb8b035d9ab088377a653f2b50ef25 SHA512 0f61677a688267efc153d69ba68f9e9f12140cc5883f955894c896dacc1b9a1b24c045a476250834e74de12476223fc98e393b7f25038bcb75bab9cd95c7f74d
 MISC metadata.xml 910 BLAKE2B 32c65b10f1286c68aaf8c4eb5d5078dca8b09a451ec02d1a845282124b71cac7363e8f068910fe6908befcf49d9e476f30f53b78bd66d6269cb7cb38f5d69597 SHA512 e3b9b10331c66b3e3ce4bb0b74a1c426656d33ffb37936a433fad3f7fc2e64de233c7d18158c5eea409d406ebe1edcf77135e7b490bec40387adc8b0928cad5a
diff --git a/dev-ada/aws/aws-2018.ebuild b/dev-ada/aws/aws-2018.ebuild
index a9c134543f61..877e8c4fc1e0 100644
--- a/dev-ada/aws/aws-2018.ebuild
+++ b/dev-ada/aws/aws-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ IUSE="gnat_2016 gnat_2017 +gnat_2018"
 RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=]
 	dev-ada/xmlada[shared,static-libs]"
 DEPEND="${RDEPEND}
-	dev-ada/asis[gnat_2016=,gnat_2017=,gnat_2018(-)=]
+	dev-ada/asis[gnat_2016(-)=,gnat_2017(-)=,gnat_2018(-)=]
 	dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=]"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index efc2d510195e..175f3ba8338b 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index dafab1f574c0..921355aa4a36 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,6 +1,7 @@
 AUX fontconfig.properties 11196 BLAKE2B 31abb25a488c4680ee6a276d4c4fd0f0c8da5572a923cc1f755a6baf6ef007453c1cda4fb280fa108ae124c888a5b36b05658a9695dc5311f859742fbf9e7a79 SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9
 AUX oracle-jdk-bin-9.env.sh 497 BLAKE2B 281d53c547c2067359af307846c29f31683cd18c8d7b305de278398eed254d0c3cdcd153b9ae67edfea7f09190f1da5d26f26026c0c4125b5ecbf8a730c9c433 SHA512 e9eee113974c0d570cccaed0a71917dd12d806248db128bafa1fcf744838ff9181f5b53b791e726e178e2164da1b2d901a43eefc37b25a3776288c137231b2d8
 AUX oracle-jdk-bin.env.sh 833 BLAKE2B 2e8254aff8d35795f073fb599c1c51dcd2ecb0356b4e90977577b9cd41376c3517a72e634bfb1420c37c8149af89044f48aa374480b26a19c875d4c1b78390eb SHA512 8d41679b4631016dbe98b15368ed027df9e6f4d96db17133c56bbf16b9a81be908d139617bc5350aa6b0e51bddc56bb1ce1abc5a8a4fad74868172cfdde6ffd8
+DIST jdk-11.0.2_linux-x64_bin.tar.gz 179635903 BLAKE2B 238487802fb91986a8a37c5c0f52ffc6c54bc2d4c1313c913be0aba53b19d021a38ca94801bf575d23cb6d1517b47588ce5f823974f358ca4fcf72a84fa91583 SHA512 8a699d24d863ffea557cc8f3ea326cbdd550cb0c604a9326ebb39ffda384f67b4dfe8ed34cb876aa9f63f417b82a408bcce49a1af32d9bec79bd5871e2759df8
 DIST jdk-8u181-linux-arm32-vfp-hflt-demos.tar.gz 9508321 BLAKE2B cd9b5990ab3faf6b2e1bcee6e141062b1996ec56b468370263fd60d908e0fa944eb3565c375dc2d543b63ed4e5552e226461d2834a2eaf26ad0af15d7acf5312 SHA512 6f7a563a7816019db2120f1e1cadfbd7d6098fa3556470ad2c38b04abf1d86a07f893bf369437ec65c031871c071bf678b51eac012537be26bf8437f7458a8a2
 DIST jdk-8u181-linux-arm32-vfp-hflt.tar.gz 76488796 BLAKE2B 444c0c510bcb88a135f3c271e5b224dd1c5d37c42d59afafaef7065090f243649dfb271ce43f0eafd8127f64bda8af7862b821ab6c5cdea1fbf6bef8aa376b53 SHA512 14befd089eeea35cefff6209a57022621431320cf2c4556208cec372a06ca51a6444c42f1fca2322ae8fa5d59cb955778ed20f96f4ba540f9052d1fb84259632
 DIST jdk-8u181-linux-arm64-vfp-hflt-demos.tar.gz 9490529 BLAKE2B 0b4c8385c6cfd0c1e86bafed9195ef76cfcba7368b9f719fcd72e7ed2789b7d9f519d60a6d62cfa3992bed4ffd61f424a6691f3828134f28aca1b22533365a9f SHA512 c4647f4f1ad5147fca48f9a37689517a772894d0bc30279208ae93bd11431196272cad3aff36b15116ce174bd8fa16a88ed5f4b0e264ef48a163f7a2b781c517
@@ -34,5 +35,6 @@ DIST jdk-9.0.4_osx-x64_bin.dmg 400672048 BLAKE2B 0bcc3643ccbc72cd98aca71823e06fd
 DIST jdk-9.0.4_solaris-sparcv9_bin.tar.gz 217025485 BLAKE2B 6b3d4f4701ff3349f8acce727fcfcb06ce420e54dd32d2e6b91b71aa898a8d6a293375ec2cb0c66f14a5df77a6f5b7016160572b995ad84a593e9d5c6c928184 SHA512 9418a725a33dfbedf7f692abfb92550f23fca594fa8c1b85934d601284261339f177a32af7440e0b09233b2e99b2fd7cef835c54252cec6a645ea322a389de14
 EBUILD oracle-jdk-bin-1.8.0.181.ebuild 8502 BLAKE2B 2eecdd0539ad7080ab396b1f5af53fa256ba856d454c88bb6b5af80b8a062467ae3d3adf23987c8476bcb4d21c8a6683237535d74e33dea4549586f6903a68d3 SHA512 35d1b8277cd384a29818f3dd2a08e037c3e3ab1634c02f3f5a52564c86569648c824258dadd16ddfe35f79b85acc71579567e8e2fa4876fc54a15a4c03f454c2
 EBUILD oracle-jdk-bin-1.8.0.192.ebuild 8499 BLAKE2B b0d6aec6ef4111cfb45e26dd2c53d7f673a1253dc2ad61cfb6d11d5aca5fef7533d7ab2e704b2269f75398978da4551774bbec98fc93c4d86abe7c17a0cbd606 SHA512 311006a218f6b65627943a9eaa2db29f1feaf4d90747a7481e6c492f7ab19e651bf07595772ad97e696732d02ab6bdb9326c8d67ccc4a7ebeda0fc54baa41fb1
+EBUILD oracle-jdk-bin-11.0.2.ebuild 6921 BLAKE2B ea5ed5d866f51767aad5781cd9b34dd5ed2490afe815e1139b80dc6b6940f27c799269aea4eecd69e5586750611de92a8114fd52982bdd839b1d1ad60cbb69ad SHA512 5132b1fd4a3b0de6c4caa1f3c2e1446c0db28c7177d3599a733214e3ff49da756208d1782ccec4e36013a6887f8a7a7409510273d3ceb17cbe52da3ce0b31a72
 EBUILD oracle-jdk-bin-9.0.4-r2.ebuild 6803 BLAKE2B 8318572886e47fee4b4c94bf795a26203da64746c9a8f5c55f7c6a46305ac8b31792c784bb9d7e17160de8133a60b8a85e4ef5f5c9be89fa050d74e357df5fc8 SHA512 bbe8631108b393c382777df2651c0212efb8a1c532745ae584625a6bc6c918408bafa7bb27de2ec67982c8c33cb20d078de99b79752afed44bfab857afec1556
 MISC metadata.xml 1132 BLAKE2B 6029eb0374ee0cfeb6f83c56dc8fd5206e297cfad6a799626ccdd2df7cac20e9c97eb7008a3ca210da474a78a26c9052d97b85f04b38aad7367d83ce78bc1c24 SHA512 eeae92c31db1c935fc4b248342428f5a34138e3b6f558927aa75c7f2c9f42ab574083e00b234752a6dcc685e9bd5f1daa2a15571d73a1a7576a35860df90e903
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-11.0.2.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-11.0.2.ebuild
new file mode 100644
index 000000000000..ffbe55324092
--- /dev/null
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-11.0.2.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils java-vm-2 prefix
+
+KEYWORDS="-* ~amd64 ~x64-macos ~sparc64-solaris"
+KEYWORDS="-* ~amd64"
+
+declare -A ARCH_FILES
+ARCH_FILES[amd64]="jdk-${PV}_linux-x64_bin.tar.gz"
+ARCH_FILES[sparc64-solaris]="jdk-${PV}_solaris-sparcv9_bin.tar.gz"
+ARCH_FILES[x64-macos]="jdk-${PV}_osx-x64_bin.dmg"
+
+for keyword in ${KEYWORDS//-\*} ; do
+	SRC_URI+=" ${keyword#\~}? ( ${ARCH_FILES[${keyword#\~}]} )"
+done
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+LICENSE="Oracle-BCLA-JavaSE"
+SLOT="${PV%%.*}"
+IUSE="alsa commercial cups doc +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux source"
+REQUIRED_USE="javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )"
+RESTRICT="fetch preserve-libs strip"
+QA_PREBUILT="*"
+
+# NOTES:
+#
+# * cups is dlopened.
+#
+# * libpng is also dlopened but only by libsplashscreen, which isn't
+#   important, so we can exclude that.
+#
+# * We still need to work out the exact AWT and JavaFX dependencies
+#   under MacOS. It doesn't appear to use many, if any, of the
+#   dependencies below.
+#
+RDEPEND="!x64-macos? (
+		!headless-awt? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXi
+			x11-libs/libXrender
+			x11-libs/libXtst
+		)
+		javafx? (
+			dev-libs/atk
+			dev-libs/glib:2
+			dev-libs/libxml2:2
+			dev-libs/libxslt
+			media-libs/freetype:2
+			x11-libs/gdk-pixbuf
+			x11-libs/libX11
+			x11-libs/libXtst
+			x11-libs/libXxf86vm
+			x11-libs/pango
+			virtual/opengl
+
+			gtk2? (
+				x11-libs/cairo
+				x11-libs/gtk+:2
+			)
+			gtk3? (
+				x11-libs/cairo[glib]
+				x11-libs/gtk+:3
+			)
+		)
+	)
+	!prefix? (
+		dev-libs/elfutils
+		sys-libs/glibc:*
+	)
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	doc? ( dev-java/java-sdk-docs:${SLOT} )
+	fontconfig? ( media-libs/fontconfig:1.0 )
+	selinux? ( sec-policy/selinux-java )"
+
+pkg_nofetch() {
+	einfo "Please download ${ARCH_FILES[${ARCH}]} and move it to"
+	einfo "your distfiles directory:"
+	einfo
+	einfo "  https://www.oracle.com/technetwork/java/javase/downloads/jdk11-downloads-5066655.html"
+	einfo
+	einfo "If the above mentioned URL does not point to the correct version anymore,"
+	einfo "please download the file from Oracle's Java download archive:"
+	einfo
+	einfo "  https://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase11-5116896.html"
+	einfo
+}
+
+src_unpack() {
+	if use x64-macos ; then
+		S="${WORKDIR}/Contents/Home"
+		mkdir -p "${T}"/dmgmount || die
+		hdiutil attach "${DISTDIR}/${A}" -mountpoint "${T}"/dmgmount || die
+		( cd "${T}" &&
+		  xar -xf "${T}/dmgmount/JDK ${PV}.pkg" \
+		  jdk${PV//.}.pkg/Payload ) || die
+		zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die
+		hdiutil detach "${T}"/dmgmount || die
+	else
+		S="${WORKDIR}/jdk-${PV}"
+		default
+	fi
+}
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+
+	# Create files used as storage for system preferences.
+	mkdir .systemPrefs || die
+	touch .systemPrefs/.system.lock || die
+	touch .systemPrefs/.systemRootModFile || die
+
+	if ! use alsa ; then
+		rm -vf lib/libjsoundalsa.* || die
+	fi
+
+	if ! use commercial ; then
+		rm -vfr jmods/*.jfr.* lib/jfr* \
+			lib/missioncontrol || die
+	fi
+
+	if use headless-awt ; then
+		rm -vf lib/lib*{[jx]awt,splashscreen}* \
+		   bin/{appletviewer,javaws,policytool} || die
+	fi
+
+	if ! use javafx ; then
+		rm -vf lib/lib*{decora,fx,glass,prism}* \
+		   lib/libgstreamer-lite.* lib/*fx* \
+		   bin/javapackager jmods/javafx* || die
+	else
+		if ! use gtk2 ; then
+			rm -vf lib/libglassgtk2.* || die
+		elif ! use gtk3 ; then
+			rm -vf lib/libglassgtk3.* || die
+		fi
+	fi
+
+	if ! use nsplugin ; then
+		rm -vf lib/libnpjp2.* || die
+	else
+		local nsplugin=$(echo lib/libnpjp2.*)
+		local nsplugin_link=${nsplugin##*/}
+		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
+		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
+	fi
+
+	if ! use source ; then
+		rm -v lib/src.zip || die
+	fi
+
+	# Even though plugins linked against multiple ffmpeg versions are
+	# provided, they generally lag behind what Gentoo has available.
+	rm -vf lib/libavplugin* || die
+
+#       # Prune all fontconfig files so that libfontconfig will be used.
+#       rm -v lib/fontconfig.* || die
+
+	# Install desktop file for the Java Control Panel. Using
+	# ${PN}-${SLOT} to prevent file collision with JRE and other slots.
+	if [[ -d lib/desktop/icons ]] ; then
+		local icon
+		pushd lib/desktop/icons >/dev/null || die
+		for icon in */*/apps/sun-jcontrol.png ; do
+			insinto /usr/share/icons/"${icon%/*}"
+			newins "${icon}" sun-jcontrol-${PN}-${SLOT}.png
+		done
+		popd >/dev/null || die
+		make_desktop_entry \
+			"${dest}"/bin/jcontrol \
+			"Java Control Panel for Oracle JDK ${SLOT}" \
+			sun-jcontrol-${PN}-${SLOT} \
+			"Settings;Java;"
+	fi
+
+	dodir "${dest}"
+	cp -pPR bin conf include jmods lib "${ddest}" || die
+
+	# Only install Gentoo-specific fontconfig if flag is disabled.
+	# https://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
+	if ! use fontconfig ; then
+		insinto "${dest}"/lib/
+		doins "$(prefixify_ro "${FILESDIR}"/fontconfig.properties)"
+	fi
+
+	# Needs to be done before CDS, bug #215225.
+	java-vm_set-pax-markings "${ddest}"
+
+	# See bug #207282.
+	einfo "Creating the Class Data Sharing archives"
+	# "${ddest}/bin/java" -server -Xshare:dump || die
+	"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
+
+	# Remove empty dirs we might have copied.
+	find "${D}" -type d -empty -exec rmdir -v {} + || die
+
+	if use x64-macos ; then
+		local lib
+		for lib in lib{decora_sse,glass,prism_{common,es2,sw}}.dylib ; do
+			ebegin "Fixing self-reference of ${lib}"
+			install_name_tool \
+				-id "${EPREFIX}${dest}"/lib/${lib} \
+				"${ddest}"/lib/${lib} || die
+			eend $?
+		done
+	fi
+
+	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-9.env.sh
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postinst
+
+	if ! use headless-awt && ! use javafx ; then
+		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
+		ewarn "require this and they may fail with a confusing error message."
+	fi
+
+	if use gentoo-vm ; then
+		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
+		ewarn "recognised by the system. This will almost certainly break things."
+	else
+		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
+		ewarn "will not be recognised by the system. For example, simply calling"
+		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
+		ewarn "fully supports Java 9. This JDK must therefore be invoked using its"
+		ewarn "absolute location under ${EPREFIX}/opt/${P}."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	java-vm-2_pkg_postrm
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 909110c1c647..6d36e879fd74 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 17dd093b70ba..e26505ae87ae 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -11,5 +11,5 @@ EBUILD swi-prolog-7.6.3.ebuild 3395 BLAKE2B 6445c399d7a7518bcd4ce05b9ea0bf50c7d0
 EBUILD swi-prolog-7.6.4.ebuild 3456 BLAKE2B 55d9eb2b52f47dc7fd5df9f2743775e7aabd4f070d93e31f51b038f278604909f1f48dbb4cbd12ba96614f8619923712c465d424eb224874ba158f1670d615d5 SHA512 cf64a47e39b21557915fcd6e88ac5bb01fc56bb26afebf81dedaa087ac12a3c5952383a55594dbe22de8885c6a3afd47858963a4c0c68f705be20045a518d12d
 EBUILD swi-prolog-7.7.24.ebuild 2427 BLAKE2B 71e2150b40422e03dbc34fa9d37e59b8cb568359a583ca4948d33aeddbcc4c52b9085f58c2cd397bb488d2cccc5155246bde8415db6393bbe62093a0a49d8698 SHA512 7151cddf87753b74e68ee7c02d9cfbf92a988d0457a58e60b6956db28e41bdd9585964a1ef188a79fb9d60a9d44c14a2324a1651784041dfbf41570098b52d66
 EBUILD swi-prolog-7.7.25.ebuild 2427 BLAKE2B 71e2150b40422e03dbc34fa9d37e59b8cb568359a583ca4948d33aeddbcc4c52b9085f58c2cd397bb488d2cccc5155246bde8415db6393bbe62093a0a49d8698 SHA512 7151cddf87753b74e68ee7c02d9cfbf92a988d0457a58e60b6956db28e41bdd9585964a1ef188a79fb9d60a9d44c14a2324a1651784041dfbf41570098b52d66
-EBUILD swi-prolog-8.0.0.ebuild 2428 BLAKE2B 6825e257de0925f054c043c511f946d484e840eaefcc0ae88b2fdfd49471e0b3e3f1d42f5fdff4ddb00c2027bbb48185ba67df457a3d585e95aaa062213bc6af SHA512 0335f74cab802c5efc110d1cdbb3984870742dc29ba710f459870f827d7d1cd3980a7e04a58e1c0ccff05cee57ec5d07c276ac685c62fc9097a7aa8e86ab47e3
+EBUILD swi-prolog-8.0.0.ebuild 2443 BLAKE2B 5222733cc4284e29641317bf9405ec272c4f550a1de1401225826a4e4dc1a7746b54a6ca35309a16e0cadc88adf4c5d390c647588c97189fc153811e38437a6c SHA512 577575e582ecf97f33634932d3290ba5c0ac4537d5db70d8e50367b03b993c5dadb5146148e9176757c10b025c60365f41e6f3f43946c15992b83aa5c4c49f40
 MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3
diff --git a/dev-lang/swi-prolog/swi-prolog-8.0.0.ebuild b/dev-lang/swi-prolog/swi-prolog-8.0.0.ebuild
index 9290fbb3f4fa..2bb109789c64 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.0.0.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.0.0.ebuild
@@ -74,7 +74,7 @@ src_configure() {
 	mycmakeargs=(
 		-DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
 		-DUSE_GMP=$(usex gmp)
-		-DINSTALL_DOCUMENTATION=$(usex doc)
+		-DINSTALL_DOCUMENTATION=$(use doc && usex archive)
 		-DSWIPL_PACKAGES_BASIC=$(usex !minimal)
 		-DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
 		-DSWIPL_PACKAGES_ODBC=$(usex odbc)
diff --git a/dev-libs/Ice/Ice-3.6.4.ebuild b/dev-libs/Ice/Ice-3.6.4.ebuild
index d51d28604856..39a11bd852c4 100644
--- a/dev-libs/Ice/Ice-3.6.4.ebuild
+++ b/dev-libs/Ice/Ice-3.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	doc? ( http://download.zeroc.com/Ice/$(ver_cut 1-2)/${P}.pdf )"
 LICENSE="GPL-2"
 SLOT="0/36"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="doc examples libressl +ncurses mono php python ruby test debug"
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index defaac83cc22..6a1a3c363b0d 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -6,5 +6,5 @@ DIST Ice-3.6.3.tar.gz 5512741 BLAKE2B 7219cd263ccf6207c0d1e788358004744bd53717bb
 DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0
 DIST Ice-3.6.4.tar.gz 5523841 BLAKE2B 4e50dcf0f004f14a38c173f181cabb97fdc201786c338800b9750dc0cf6ce9b1397ea26b4357de1f6e1ac6b4e69abbe2bf464a5f9c2926f6ae45abbf5a69803b SHA512 fdb412ce591bca7aede2ac7d70600184f3b67279e8ffdfee3649f517d5531d2dfee54b37d0cc6de2ef5de8ecd281c39d6c951781b68f9a36316a7607cefb9e57
 EBUILD Ice-3.6.3-r1.ebuild 9438 BLAKE2B c1e2831c78f8f34027f51dfecdaa23f3ae0fb5f84c2bb970124242c363b1bf68d57a1af66c865969617fc448c6df0c1c8f753b477dfa37c1e2eaf6431969ded7 SHA512 21ddf1a8d4f441dcfd5316f7cf5c12b2980ee2e6d3cdcf54ff6a677e5ab6a7aa63c582dcf5c4f3aab7d49a9ef626c5c8f27e21f49ffd34de90e7dfe161f7aceb
-EBUILD Ice-3.6.4.ebuild 9415 BLAKE2B c47d4a6d2bcfe4efae2c47563ddc9aec4997ceb05172cceadc8f5f195ee323eb36e763fee57c01483494a1512e3909f4ce02df96a6be9fca200db8f91a10e230 SHA512 4296a430b1b1a841301650eb7653b3ddb7ee8fe19a83d2ee49464935cfbe2fa443d6435e8ecb62384fcb8698b02126810d7247733954c8ef23da82af38ce64dd
+EBUILD Ice-3.6.4.ebuild 9414 BLAKE2B 036f590336c7c868253d74c68841aad8e10f630127b979e970288748dcddc43c17eab4168be22a467764f49d1f23c690b05905a3dc7247b68396ea725bbea6fc SHA512 8e126b002363e0ea6397d52f3955b69b8397e732af32f8125e36d408a095f08735685f2410ac7c436c0488c681c8468637b528e2b8229c9947677fd24907a429
 MISC metadata.xml 520 BLAKE2B f2658367fc9c7720a8b6338c8c79cc88ce7687bbcd58d61e50efa3e452c6bbfe2eaf71563895a1de22bfd8513adeb0439fd4c2674c370199fb37cb7a86c25ace SHA512 8958293c1fbc414bd911848999b0414dc64befc865b012c4c5c40350dce69f366e329c6aac793877eca8cf5e4b8bd477df3055a0ce7481d3c6d9ae1a4b76dfe5
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 75664333f9c3..de59e8fd3fea 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index fbf1db0e5ece..61033d01eac6 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -9,5 +9,5 @@ DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f
 DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
 EBUILD icu-60.2.ebuild 3710 BLAKE2B 11a56611d570980031040391168bd5c18ca2000c30e9e56edf2662b9ead959c684cada13656726e5e868803ab9c4f81309b51f3b65693175298cb163417f32b0 SHA512 65919063056eb718f860664d42f466278da3bf5d78e54e4ad24b22768b244c76c81053ead55871fefd2d185dfcdfb065e93c38ccc4515000996d7ef307d4a1cb
-EBUILD icu-63.1-r1.ebuild 3323 BLAKE2B 83e6bbaeb18beb010f77e84ab91414aeea009dddd6c4f390ac17f5dc94e6da7a6bb50a046765f31cd37b8cdf4b8218b173991b9678a94741bc6140d4be281778 SHA512 97b245465c3e6fbcb0c968762799ac8692fc8a7f453feee1fc1d4b35bce5f49497b21b43e425ede308e30c00603ad3ee1cd038478cac5f2ffa82ba7d170c2e9e
+EBUILD icu-63.1-r1.ebuild 3322 BLAKE2B 33029709ceccf6d6aac2688acb033b55b53b11a97c0b7ff166bdb17beb7c5f65b751ee0769afb8ee929d611628af2e274f29ddb71359fca0e5970e08216233d3 SHA512 784c35220bdbcaaea099f6eb0abd69530f843a18f9e9bc0c8bb103567a90b0fa9f1d9d4e19e375b121e8aaca9d4b51b4a6aab71ffca4af3d8abc94f496eae7e4
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-63.1-r1.ebuild b/dev-libs/icu/icu-63.1-r1.ebuild
index 410ca96652f5..447f23db0cc1 100644
--- a/dev-libs/icu/icu-63.1-r1.ebuild
+++ b/dev-libs/icu/icu-63.1-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 DEPEND="
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 33a4e0dc9c24..54db6b199a74 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,4 +1,4 @@
 AUX libutf8proc-1.3.1_p2-overrun.patch 1358 BLAKE2B 4583a42923db3ad30cd407ee736b6758151e4060a2aed528a54a61ca012d0bf7113ec68994805039a725958ac5bdf15bb9b482d7ff0ab53af2188bea2d4c816e SHA512 e897917e6346f3a0c539d3e2a762a37fc553bda17c64327249835f6f64e981cd9e98c627ffc95e5b36bc54837254cbc43fe9192e7671308f18b7167f0d6cbf6b
 DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ffee97e735a8cb309d5522df1b5ecd5f313a6d0c681209adb066c16ac65573c9c1edaa336b52de1b057a4b74ed6a7e9ca2671 SHA512 eedaafb2fdb3b6bd47da002a48043c26c1cd3c6b96c447a02f2fea19954c1689dcdb5f64b7c662dd8c5de4f971d75b2d69c8483bd29d49675ef47b362ad0c9ad
-EBUILD libutf8proc-2.2.0_p1-r1.ebuild 735 BLAKE2B 76a33dfb95fe091ef4c9ee736fac987758d7081e5710362756db303d0f00f859894ed09b3c83e0948d084bbf7cc45bf63987ba0f2592e983c4267a94530a8141 SHA512 cd2e7660ceb6f153b65f050378d40fb16fe4610096709c51e5156920ac8f09e3fb79ebca31a34ef4cd403d9344f93c2317a11dcd0f7ca99ee95685b08253f5f3
+EBUILD libutf8proc-2.2.0_p1-r1.ebuild 734 BLAKE2B 450809b20a3ba0c051e171569804abda5ce41c601b402fec8355e4916e0529adc4ae37ec6b90f78b7b8beaa024876edcc2429da3a3f4a31ced196dbf38608f77 SHA512 49fade7f2e58141baac48c5e639d1fd8e3731ca547c84f6f90d0d1e8f9b5915dc50685e3c17c7c31c54069da6b309ce9ad078150027f0997842cb6b3db839cb0
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
index 1819b1faf427..639611b7958e 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="dev-util/netsurf-buildsystem"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 41f656bc983b..ff684822cffd 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 4a25e7f8c61b..b3d9fface7ef 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -7,5 +7,6 @@ EBUILD llvm-ocaml-5.0.2.ebuild 2984 BLAKE2B 723a1e859c8e35f2ece65cc8dd6fdd4ef130
 EBUILD llvm-ocaml-6.0.1.ebuild 3148 BLAKE2B 08a61098a9782694f57d4a56dd450200abdc1fb117ff327e4005c8f81d1b5cb861bba0fdadb19e94e3d4c409b1431a5ce361bc77b0ce590c69b855b1d866e1f5 SHA512 b0cc43ae38254cf01688e4a5b375452c8d17e9a8cae89a43ea1635383516d217850f16e605de3c45c8cef993ec9c95fbcf98f4333e27770000cae6899615e631
 EBUILD llvm-ocaml-7.0.1.ebuild 3145 BLAKE2B f44a8f4a741085912c7e89e6d5c892e0e7d004e9d2a2023016fef717392c2e0437c16ea8904443253f36a2bd16a1224b66309c462ebc43a9383f083542f89603 SHA512 717075157b6d130b9997fba55728a1071a6f4d490266e3e5fc9828dea180423158790b16f94262c94425667c242f7c4217e4b640fbac532ff9b2af2fcb80c62d
 EBUILD llvm-ocaml-7.0.9999.ebuild 3160 BLAKE2B b87ef20af15615aa962f44423b376e54f3c034a3c4e65a9683122f58646303182a71ba7dcaccd5d1c11820171dda1572f21c29cd03cce307cf847de60b350706 SHA512 c62ee53ef2e03f28d5c1ff70ae68f415dcde714481ff0615f276a6a370f193e2682f01dd9add191ed8266ad308a0115cb610197202bda8bb5229305bf546c88f
+EBUILD llvm-ocaml-8.0.9999.ebuild 3157 BLAKE2B 16ef8ac673332d268b27d7f3762d9201b1f57fecab95f28a6d0f76020cb5bb1ada1fc262026c9e7a8bb596f796e7bc8e6202030e4642e8c19b56a450e19d56d0 SHA512 90ea92899bd20841c53e356d1213aeb4beb23c694ebfef057b5df2692b3deef55c0d4f3574a3a4eb4d1a322915ce4b313a486f5019ffcf3e3725b12b51501ee9
 EBUILD llvm-ocaml-9999.ebuild 3386 BLAKE2B a935bebd7fccdf631999ba3be52a70072c5cccf1fdceaf48c72a584f0409afa82c0956913d3682eefed4d01f35afe1b91dd323721bfe0599cdf8f2fdabd3a8b3 SHA512 01fbc7546f9da6aea63888b3b1fb65971555a323dee902611e1c240145d91ce60e46aaed7331797ffde6f7864d0bc270bb9ef8ab3cbaa16dfcff92414aac0e2f
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-8.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-8.0.9999.ebuild
new file mode 100644
index 000000000000..1857f99418c1
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-8.0.9999.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils git-r3 llvm multiprocessing python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
+	https://github.com/llvm-mirror/llvm.git"
+EGIT_BRANCH="release_80"
+
+# Keep in sync with sys-devel/llvm
+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="UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[${LLVM_TARGET_USEDEPS// /,},debug?]
+	!sys-devel/llvm[ocaml(-)]"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-ml/findlib
+	test? ( dev-ml/ounit )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Python is needed to run tests using lit
+	python_setup
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DWITH_POLLY=OFF
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 5ef8f7bef8e5..ab650186d93e 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/PEAR-Archive_Tar/Manifest b/dev-php/PEAR-Archive_Tar/Manifest
index 133ae673f6aa..c258cb536330 100644
--- a/dev-php/PEAR-Archive_Tar/Manifest
+++ b/dev-php/PEAR-Archive_Tar/Manifest
@@ -1,3 +1,5 @@
 DIST Archive_Tar-1.4.3.tgz 20682 BLAKE2B a2e840087178fb55719634198852d191aef24139f819e3c478883fd007f6e72f523700617c7ff2c3d92a3ebe36a237b0eb7544dfe86dec394587ee0b3743520f SHA512 62e60d59266c5d19b131f769f4d71d4cee6bf8964b0c6610c4f1381500ced582865bff26c608479b2678dda1e7407ba39a7ec84b31fed13e3875f1947ce5bd6c
+DIST Archive_Tar-1.4.5.tgz 20919 BLAKE2B 506b2fae8f99634cf40ecff9c5ec695c101f4e14ae867795851a7e238a62c2611581aaab1cc0e9a9354184b20ba141f29ae3998881e7ebf777c596e5dc251577 SHA512 7a7e16e37b0c7112a77333ed2c4d0a0ae57cc1e971191c79b1858227b46f967aee915757a81bdfef3a9487a53b81a99bfbe84f78a346671fe44ac9f1f203a358
 EBUILD PEAR-Archive_Tar-1.4.3.ebuild 748 BLAKE2B 858d771c358ca260ff3c7959c4bc98276cca443fe32be23fd63d05af1ffc28d94acf34dfd66e97a05ef6b2f8b4eb6874053048fefa393af03adbe4e1034d410b SHA512 392afcb0ffb84e99c0993523d4e148cc6f34c23caa72ea3fd18fb296e98ce745fff911c5308ed76b6058707d98202243202421705c15482df3d8793cd49be9aa
+EBUILD PEAR-Archive_Tar-1.4.5.ebuild 753 BLAKE2B 327ed4a2cf4891e6fbc83a2ce762f25afeec0450ddf2361a53c161e0f5e082a412cec11a82dba0c26485a864dc99ffad0edaf748ba6f17e699841257f84a54dd SHA512 f786a2652788578c05c7023d0574a47d24b9aaec01eb4216106ea4685d4d2615cb6862e4f6e47cacbade87e9c00db1fb60e0b6244b202587106c7fd823bbf0cd
 MISC metadata.xml 313 BLAKE2B 96717f88c6747b4b6dc814ffee022a1bfe7965ca71f0d1dff4acae773d37ba43d21b92343993b19c753360651ae63c7e0cea16d51c12d4fee03d6852a50be7ff SHA512 189683deca6b9b76a4ca070938afa484580b57a8c799f49f26e9b123165d545ab6aec31bc2b96400cfc5390f3837477a8d58b461e317ab14bf1152292880ece1
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild
new file mode 100644
index 000000000000..dd94437d9083
--- /dev/null
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tar file management class"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+# bzip2 and zlib are needed for compressed tarballs, and there's one
+# call to preg_match to test paths against a pattern of files and
+# directories that will be ignored.
+RDEPEND="dev-lang/php:*[bzip2,pcre(+),zlib]"
+PDEPEND="dev-php/PEAR-PEAR"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/share/php
+	doins -r Archive
+
+	dodoc docs/*
+}
diff --git a/dev-php/pecl-apcu_bc/Manifest b/dev-php/pecl-apcu_bc/Manifest
index 7338924965c5..1aba692f733b 100644
--- a/dev-php/pecl-apcu_bc/Manifest
+++ b/dev-php/pecl-apcu_bc/Manifest
@@ -1,5 +1,4 @@
-DIST apcu_bc-1.0.3.tgz 7245 BLAKE2B cf3a632568218a3dead69c251aac67a3e1c9c03e0bef0b57184bb1e85c60aadc09dcbcf49f2703869783128949a9aa2f4e5eb660d9ca88f800e85ce0692847b1 SHA512 b1faf811316bbba25354b9b28d5c13c69ae93913b90eb36d1904ef4d9ca35000e1d83f8204ab4500813cb8858feccebb262523f42b3116b85c59c6a796affe67
 DIST apcu_bc-1.0.4.tgz 7406 BLAKE2B c7099f13bfe589c9752fb7fa8454f16094a13d63924ceef614db1fef11d37265673e745383241836685dcabca8ae83af3c71ba2f2d8a77b4ab213db209924f12 SHA512 633ae74c4be3ee0c2c98540f696dc440f3f345c52811e856cb46c65c6b6fa8fa9f06ecb1d784cd990cf8b5219b65e14a29b97e57828dc6e7aa6b91d2475e6a0e
-EBUILD pecl-apcu_bc-1.0.3-r1.ebuild 738 BLAKE2B 3a84093f3a30dc29947a13c78a2e8a0f05817789ae4f4ce57aaf86ad0f56d149613276168918d7c1ea2d85b5ce1283e7964243c3afa7b0cc6a1847a751c44030 SHA512 c82072c2bf7f501479cc92d379bcb53ed83e99b1da929feb1ca8a15455a01c3b48dd48f778641f091c76f13f12fe92c85a14175332f5e9a0a263a7ceb499f9fc
+EBUILD pecl-apcu_bc-1.0.4-r1.ebuild 1156 BLAKE2B 7fdf5cd9441b17f937644a326f6039d25c7fea9f651a7959d51fc1adb1b92c00a404c2c531e885b0f3e288150c5cabb73b67ca67bf9c9741b9222ff6a72cabae SHA512 9458838b228b4b0cfb7930b4d2f288dd40a1c0613ac5a8e12a1d41348b6d34dead4c7b8f80cffb5d0e132bda8a47080dc38d55bf0e0b9ee9496d414b8b73d6d1
 EBUILD pecl-apcu_bc-1.0.4.ebuild 1154 BLAKE2B 1cd0dde4480b764156c1ce0dfbf43a8ef9854301b403047a720b4408bcbb12b189623766f76d315c5c1326171e0ee121e78884f9ab3cbad348c1f61bfeb4d7ba SHA512 8624329b8c1bf082c2bfd5f9f4e4f04230d995fd46a6f0adf801e40152a2a550f3c2a962cf77274a271b8f7a2dbaab74aedc6ff4bda54ac48ddd7445a225add6
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.3-r1.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.3-r1.ebuild
deleted file mode 100644
index 4cc807e6da9b..000000000000
--- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.3-r1.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
-
-PHP_EXT_NAME="bc_apc"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_EXTRA_ECONF=""
-DOCS=( README.md )
-
-USE_PHP="php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="Provides APC backwards compatibility functions via APCu"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?]"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	# Rename the apc.so to match the ini file loading requirement
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		mv "modules/apc.so" "modules/${PHP_EXT_NAME}.so" || die
-	done
-	php-ext-pecl-r3_src_install
-}
diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4-r1.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..e9ed00d7cc4e
--- /dev/null
+++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_INI_NAME="bc_apc"
+PHP_EXT_NAME="apc"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_EXTRA_ECONF=""
+DOCS=( README.md )
+
+USE_PHP="php7-1 php7-2 php7-3"
+
+inherit php-ext-pecl-r3 multilib
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Provides APC backwards compatibility functions via APCu"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-php/pecl-apcu:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?]"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# This fixed version is necessary to have apcu load
+	# from the install before the tested apc.
+	# It is intentional to specify phpoptions twice.
+	# This mimics the Makefile.
+	local slot phpoptions
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		ln -s "${EXT_DIR}/apcu$(get_libname)" \
+			"modules/" || die
+		phpoptions=( -n -d extension_dir="${PHP_EXT_S}/modules"
+			-d extension=apcu$(get_libname)
+			-d extension=apc$(get_libname)  )
+		NO_INTERACTION="yes" TEST_PHP_EXECUTABLE="${PHPCLI}" \
+			"${PHPCLI}" "${phpoptions[@]}" \
+			run-tests.php "${phpoptions[@]}" || die
+	done
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 75a9f6d9fa7c..59c83d39390f 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index f42246764106..6ff1e49c65eb 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -7,5 +7,6 @@ EBUILD clang-python-5.0.2.ebuild 1079 BLAKE2B deb802fba226c098e138775a71fb5a4926
 EBUILD clang-python-6.0.1.ebuild 1097 BLAKE2B c1af92b85dbe2d5060fea49d3352c8151058b8f86c478c347842a1e46255f313a4ad0985b13543e34bba2214f0b17fde35a449779cccf41367a2b1776b6ed130 SHA512 d88877fc98ee9c631d7139e734a87d0a3f998963951602d5e1717b6158b2caaf79fcac4fa699a35131aa58885c3d01a8eb9106183118fc9a4783164e3be1be49
 EBUILD clang-python-7.0.1.ebuild 1103 BLAKE2B 880675335893e206636b121e60d025df935a8ac0c08d77c2b9d399f1152e8067f7fa4a95a06487aa51bc5ca53254ec8d661ebaa68c03286e19f1eaa2f26cb6e8 SHA512 a12d2a01febd8cab4e04350e897aeb59865f2a4a891a7aaddfe38f7bb2556595d6e367a9463bd4478b3aa691e41c031e8323c0bc36130c4d96449c0a84999e5c
 EBUILD clang-python-7.0.9999.ebuild 1059 BLAKE2B 1ab0d9234fbebea281bf2235f870e6cd468063f2ec5c20f7af3b797e6135aa6730ccea8cbde5ae5993394da1563897f5b45adba1d644257f6bc300b6da5500f9 SHA512 23882089855c9485ccf23129542f3b6a5e891776cf422c9b16a0e534e4084f59d5bfe4526d2510cc094ce8cab311ec141dc76ee45cbee7d43665aaef58c9fec2
+EBUILD clang-python-8.0.9999.ebuild 1056 BLAKE2B 9f18a22421c36ba3796b6fe759e05d5ee5b8ca449e292145c7eda6733c614ffe012f40d0e12ce336ef496a9889463f090fb96180c146975052adc73d8cacd690 SHA512 39239de81290208b734fcd8035a9b8dbc75a0ae9a9cbcfbb7432be5f83b71f2254389ddd139b1c0c9ad59eda86269932a720a02f6dc277ee15178298fbf49a1d
 EBUILD clang-python-9999.ebuild 1034 BLAKE2B 3a56c0e391daf98889ba3959f8aa5c944c9930ac482c8beca5f814978507f9869a213384224c6965ade96a3f0b17f83aff9924f07d5ad2d03ed7df8660a54df6 SHA512 bff0eee11762f352ab6616086b19506a2ea0530284f50da24538eb8078d2c04af1d1aa2a8616adecb6bdeab8853728b2f4b5c3133fa15810f00a64855182c486
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-8.0.9999.ebuild b/dev-python/clang-python/clang-python-8.0.9999.ebuild
new file mode 100644
index 000000000000..180856dc03bb
--- /dev/null
+++ b/dev-python/clang-python/clang-python-8.0.9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+inherit git-r3 python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/clang.git
+	https://github.com/llvm-mirror/clang.git"
+EGIT_BRANCH="release_80"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}/bindings/python
+
+src_unpack() {
+	git-r3_fetch
+	git-r3_checkout '' '' '' bindings/python
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 9f7cde337b98..dfc86e3b42f6 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -9,5 +9,6 @@ EBUILD lit-5.0.2.ebuild 904 BLAKE2B 74ccf4ce59c6aba63fec1f0dfed1e49bf751abf8cf61
 EBUILD lit-6.0.1.ebuild 1014 BLAKE2B 549c00ba1da9265ef26ea04d574d139f1fbab99f79ed60f270ff960f940df4507376fe31d48776241ecf4a4cb84f134abec61c000a27756ba057083527cd6607 SHA512 729a2b96a49758b18e59ec9df38ddff9890953283185cbae0abeef1cf4f11c2680485f26ffa70a85b326a389a3230e459700366b06f6bcee5a4be9854afeef62
 EBUILD lit-7.0.1.ebuild 1017 BLAKE2B f901810a470fdf95f71bb19e6be4a1321e7abe84054bb529541750dea272ffb33c4eda1e131d2b9984225f25d28036876b56d8bb0c9a76a623f7d678098b4932 SHA512 ddb2c555b404d838b4717506a3bdbd40fe5a8d1490175ff65c12601ab1805882b48eb585a1ea1ed761638469145d1e5ecd0696bb01c4ff3d83c5e817a99d5c9f
 EBUILD lit-7.0.9999.ebuild 963 BLAKE2B afea4754348b5b93f93ef1723974f218ccf92bcceb342ba5f453e8d82399358689b4bb30d04e65e63de761ccc92bd2c776d6233c618a12abaf4fda1a770974ff SHA512 dab5c3d116a590f677a9d3773d5652e7a676d26a4477ed10a4f8248f93297881ec1bd9cd6fbca6c06546d0926bdd5aedc9f478736550114bdb777c61ccaf5bca
+EBUILD lit-8.0.9999.ebuild 960 BLAKE2B 3c1be7024e1f32c6c1c73e03f6a909d1f16cbc0750a4dec454806dc39c2fadf32f006045cbf71272a0a35c471a68daa142e96683610573627d82b81fdbc7751c SHA512 d1d2099ef259dc024f91074b5fe5cc6f9d1fa834f8922823dad0b67c8cb92f454e9694aee0b325762ad6aac2ca1b47c497e25027c1c82a186bf937b56c2d95cf
 EBUILD lit-9999.ebuild 938 BLAKE2B fb5fe20c62d06e44e847f6e9f16429e9814d2872281295eb12ea25baf2448be889ec3bac37ec4350971b44c6785aafe9795fd68cbfda1b2cb299f41f28a254fd SHA512 a21a7a2935e8d8c82f319bf65e1b01e135448c2d342baea28b05451f4f9de938b52d3a8e63d544ec35cf4e7ae7bc9bf432eea3f4a44d044631c9ae7ea6fbfdcf
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-8.0.9999.ebuild b/dev-python/lit/lit-8.0.9999.ebuild
new file mode 100644
index 000000000000..27b4c0f19d5c
--- /dev/null
+++ b/dev-python/lit/lit-8.0.9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+inherit distutils-r1 git-r3 multiprocessing
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
+	https://github.com/llvm-mirror/llvm.git"
+EGIT_BRANCH="release_80"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${P}/utils/lit
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_unpack() {
+	git-r3_fetch
+	git-r3_checkout '' '' '' utils/lit
+}
+
+python_test() {
+	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
+		-vv tests || die
+}
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index 569ea304b346..fe179dfe5e25 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -2,8 +2,10 @@ DIST os-brick-1.15.5.tar.gz 161371 BLAKE2B 0fdfb5978cb1d1ca635d64f98b75210b03353
 DIST os-brick-2.3.1.tar.gz 166518 BLAKE2B d58acd3ffffa6a5ca328eda9f74f4e9897846b047fc96777fb438c5e5a2fbef642e1672bd7f216acddef29138543627ef79fb6e6fc01e9e7cb34ee59663bedd8 SHA512 243d574289a95a07c43b112f9c00372a8b95560628f1d86f3ea750755b4026ef9426864a216a459c159b7275218a08df585aaf0f4f3c973d63af5a59083a6b2b
 DIST os-brick-2.3.3.tar.gz 166088 BLAKE2B d5bdb748f8cb00ceef7649198470be3beb58bc9824ce74d8781c65ad87125b5480dc22fa978817fb89842ed347fbe7f0d1a3b5c94642ca418b7c6a694423d56d SHA512 8373641ee102eb7e522da400dcd960672341828ce252610bc65b042e5d0e614ec8af29d8fc87564a29b62615d71aa8b1074b4155c8f70cf35232fb2b37105f94
 DIST os-brick-2.5.3.tar.gz 172125 BLAKE2B 3809301fad05883bd81510452189506a05561bdd1d95706df9690a5d0bcd3165ed9c55b06cbe4b3f24a4ee62877c784209b38348f224e6c82e5683133cc13d73 SHA512 b2f0b75f90ce973569c25ea18fd3b1372209a4f49572644fe1b99bf295edf8e1346624ce95eaebaa37653b7753169b42a054e5f9ea4763c35ade5003b8ef47b2
+DIST os-brick-2.5.4.tar.gz 173675 BLAKE2B 9e1906f718b79ed3b0b332864fc6263af7d3c9ef0da2d93b2b099e48faf805a0250c525589280b9416897d3751d01d0331867c10ee971ccd849b60f34ac2cea5 SHA512 bf6a696ee48591e49ff6e1eea7d74eb4acd0457257c7733ae649059f307170f4f7bd4154ada3498a801c4e54675c802eb9df096d44063b018a2628bc654ae17f
 EBUILD os-brick-1.15.5.ebuild 1636 BLAKE2B efa6611d1e5a4aff93de21ac1620ae1197cb4f279c364d3f0fc0f7938fa5039b460eafa99894003d49a82dafd75fd0bcfe34ad7f2f412e67fd78278ae8fb2151 SHA512 f2f08b712035ef08499f19d4ee4526d6549faa0a0826d9398a8ea67985cca6d570c84d2ac667a279bb411301f33e1082180fa19e71c2c65c7aee2cb0ce0daeb5
 EBUILD os-brick-2.3.1.ebuild 1473 BLAKE2B 6ec89785e32cd5a19ef533cf6400444025c7bf3804057bc9b96ab60ebd3e5983a43c32d669027cd711ef0534f963228d3dea7922952056cfd4f687ca6152c64f SHA512 4b768d5f4a052c409b48298d3a832bfae5540bf7ab814353b67ec1697e089e929c8f8048b225363881c58b799c00bad6992ac214b05433b592fd9174b4ad4a0f
 EBUILD os-brick-2.3.3.ebuild 1475 BLAKE2B 481cc3d60132a46dbfd27ab84799ee954a9ef79bde0ad972fc3e0691e65667520ca662e6b8590894530d9e08629262e696d974d2593c13a89383791f51a613b5 SHA512 aa6d2bf01e0386c73ba64a1b344ede2127da0bb115252301bded3d799255783ab50e205ad7e8682d727a57e8e81b12c117123313712610836774e17a4a59848b
 EBUILD os-brick-2.5.3.ebuild 1473 BLAKE2B a352ffdc7033f6f941764fe47a7e8aa03b8850ac4de2c1dd512191f8f9ff8de60e2d23fd37bc58fad1bab71976e523205bcd9368f872272a595b2f0d6502970a SHA512 0b93bc60af329f9bb25e52134f50c34210b1996a2f4217b6a921813d0720193476485f769f336621d62787c3e2637323e9122547d5d0fa39af60966658bbd52c
+EBUILD os-brick-2.5.4.ebuild 1472 BLAKE2B 86d05a04e24382895c43b44dba2f0763b9b4aa135e08050a974cccbf066558fe280c528fe6f4dfe126b27ee68448bae9ad7284950b904dca0f0f39b67e92927b SHA512 a08588a63e9515bcaa03056e82a3289b07b54cfd41d0e334c5edfd1aa41a34cd898ab85966180110ac85aeab5888afd76017973fbc1c3111be33bc1ad7c442a7
 MISC metadata.xml 381 BLAKE2B 6d5a168e81b27c1e9a5ada920a182616c150d5f5ca204e334067f4bcce2878b19152810391d0506b9e4bf1dd287bc56fda035d576c5fee64a9ff2fecfb7b39c3 SHA512 b3cdc328f38ade8cd2ebb44c533ec0c79fbd1c187999bcf6c9c04104ba7c29136f0a0d6d57016aa6c7b607e66bfc511eaeff90c6d1a9708c494f4358b324f3b9
diff --git a/dev-python/os-brick/os-brick-2.5.4.ebuild b/dev-python/os-brick/os-brick-2.5.4.ebuild
new file mode 100644
index 000000000000..0229d3350c19
--- /dev/null
+++ b/dev-python/os-brick/os-brick-2.5.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="https://github.com/openstack/cinder"
+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-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.23.0[${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/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index e9dd3189ffc7..002866209cc7 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-cache-1.28.0.tar.gz 52015 BLAKE2B 897e54008ea99f367f373291d874736287dfd3d480046bdee0ab2b54969e8681144677713794ff32682b1ef65547618d5fcf403e9ae24b57768905daf7ae7f5e SHA512 44deabf9dbe3c24afd04d09f91f95d902221995130559e7895045eed98356ed9e085f5ee9b7e2bd0b4581df563a67707121b7571b0b7f822f0bb5a55b6dedafe
+DIST oslo-cache-1.30.1.tar.gz 53406 BLAKE2B 1b518c7f7af4b95fc71f76567f8742de7c7ab520cf4a1943fc7ed7bd9f3dcfd4150f83774e507d4135c7b567e53c3beb79a0cf6295c23e23d88a49d9ce63d2ed SHA512 8ee8ef32d07e8112aa7280f541446d13b3bba90fc7314eee60972180b0382a413e02cfcffbdd5bf4313aa394a25265665579f43f702a4b3754dc00f50441ca38
 EBUILD oslo-cache-1.28.0.ebuild 1045 BLAKE2B 5a476016a4a20177ffdafa93bd970a2da0e87fa07a50b7ee493f5a3292f66a727849f33fbae9dbc2d5b36d6b2bf8727d8d75e7be82e25cf331d7349cf1fe0746 SHA512 6b2078d289a99f5fd9db6c7c658064ebcea2cceff76ffe6572e1a44fbe31873378b99450274f431b162e5de8bb5c329707036aef50f3fff871b2a05cc7210495
+EBUILD oslo-cache-1.30.1.ebuild 1044 BLAKE2B 79d39645f2b468e0d1329808882ae4b62acea6eb3fcf7aa2ba205d6892c25c8cc0aae7117bda7798d06d036e5047a0025c38a518769e2c3592b09b328b9d8e4c SHA512 d0a630a8c4426db273533583efeff4590fb8eea5339075484002418d2c85b71f02a0caa21e1af7e1071c279400eaf34184a6f95705dd4c1c8fa02c902533edc5
 MISC metadata.xml 457 BLAKE2B 09e44ecf9952f5bfd930616506874014a267d8622daf6c22b3da4856d9f4bbedcb3e4e72285972da026f310c47973c0bb70c222292caf877d4f9ab6d5166955a SHA512 f98547e9de8c502afabf7c53409df90ec687159b5160c8ff2166acff4d6bce0fe69c8eec78d50f52919cd75733f44f82dea5f9cde362d22ed69200d332b9d6b7
diff --git a/dev-python/oslo-cache/oslo-cache-1.30.1.ebuild b/dev-python/oslo-cache/oslo-cache-1.30.1.ebuild
new file mode 100644
index 000000000000..71b251dd4d54
--- /dev/null
+++ b/dev-python/oslo-cache/oslo-cache-1.30.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Caching around dogpile.cache"
+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 ~amd64-linux ~x86-linux"
+
+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/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.31.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index db74ca37818a..dd5e05298588 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,5 +1,7 @@
 DIST oslo.service-1.29.0.tar.gz 74957 BLAKE2B b56869cb28704718952c5e151eaf0442b1a4295b8e25a422d91baa241a990d031cd408474e44bd5ea2af2b7451e0c13ec491ed4c2ccf0b07c78b65a81bec4527 SHA512 84f1b8e6abc7c8c95433da53b1a1992570695b80e182f5cb7d87ab394857d8d47c0ef0528b7a45221c897eb4c5c13112d86b8a929efc2988d22844a4c712a340
 DIST oslo.service-1.31.5.tar.gz 71865 BLAKE2B 2ad5ff5124e1b33a216510d39e7d37f3371257281cda9ebe0263a3dc741762d8c737478772cb89000a01bcbb7d9647a3cc3bbeaa62949f4957d1f2eb7ff0ba1e SHA512 9c6ebcfc9683601bfd4a54dfa8eeb3d687ea813a5081550092845350fb178fb9f609ff9f3caca6f0cd48ca6280ec71b4587741ed5a836ca38bbc6958aa521fb3
+DIST oslo.service-1.31.7.tar.gz 72069 BLAKE2B 8a40608ba3b4ab8c78cc48f89607af5db3e493aaec48e4b33d917fd5ea32478dc04a0ccb2f1aec524acc900a13d9880d8bd51e49bd3b2eab787d7b7c55872e47 SHA512 18bd558cbbf67441438f62a212ca61affd625597a02cbe8948bf055e61887a0e1b21dfc18e7450ec21951377daabcda8e5e7f57b39f5dcaa1b1d635df13f8e21
 EBUILD oslo-service-1.29.0.ebuild 2027 BLAKE2B 5c9eaa83c83e38b744f34bccbde1cf493d3e8a986c52202759913d8c22aa7b2f5879aab02ce695686589159a2ac726ef8c487dfb2a2a30990b311886fe04a2bc SHA512 de0398cc0721e39adb1e20143725fd7d7b113ef11bb41279dead12b1697a4615648d50287fbe6a460306ce1236bce5b013b072a3e0ea695c9b505ee2d4b842e3
 EBUILD oslo-service-1.31.5.ebuild 2117 BLAKE2B fc227fc56866d82d9df62a0e25f8c7937409690c252c531b196641161397df3eb3d0ae57c7c49d64ca6cf3667fa3415cd402d828b9772295dbbf119600f22bf0 SHA512 43e8ab766cc75352d68c1cd2bb6bae3c9782544c54c84e6d09e5dc857ad1d2950267a87040bd59362b5916f1e87b33db0af2e08122f57e6ba66778e91ba04a0d
+EBUILD oslo-service-1.31.7.ebuild 2119 BLAKE2B 1b4dd17ccf34e3453b22886932a5a2df2ba944998ae99af18c53b7b6045d7c1761646a8da9b75540b04dab5b8d156e7308d334a1acaf88635bea73877f5d5cc6 SHA512 4540be244187b0c0a9201d824be3bab18138c767d868d3ae036571aadc8a3dc142d357437d64e5d44c171c03e906cdd08ef0437b25f83c0303447861eafcbe53
 MISC metadata.xml 329 BLAKE2B 2ef43d1bf3df7be8c2e2b08bf7cca10d1bc23235111bc74bf0b23ef6f9c5ac3ad05a1243b518c0d8b703e4815ec7fc92ad01c907baa77d9c4dbb622a1288aaf2 SHA512 c02f0b4e37e3dabe1dbc10ca6b5e08627d8e7df5fee71573cda34338249508586bf068c56711521aa20bf80a1fdcf94a1e89df5d17cb5eb21a07b996a071d1ae
diff --git a/dev-python/oslo-service/oslo-service-1.31.7.ebuild b/dev-python/oslo-service/oslo-service-1.31.7.ebuild
new file mode 100644
index 000000000000..2a0093adb6f1
--- /dev/null
+++ b/dev-python/oslo-service/oslo-service-1.31.7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Library for running OpenStack services"
+HOMEPAGE="https://pypi.org/project/oslo.service/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
+S="${WORKDIR}/oslo.service-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="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/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=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/doc8-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/ovsdbapp/Manifest b/dev-python/ovsdbapp/Manifest
index 1366620eccd8..4582b83acc1d 100644
--- a/dev-python/ovsdbapp/Manifest
+++ b/dev-python/ovsdbapp/Manifest
@@ -1,5 +1,7 @@
 DIST ovsdbapp-0.10.0.tar.gz 71376 BLAKE2B 3f8c79b57b68da303c11d4b963367f9c9322bda1c9a02c0f7e28d57572c3056b89ae6f859592e955a81acbfe16725504163a1d799ef4d23b0ca1d77ce9eb044e SHA512 321e3efefad6ac87f9b64ad22c3d1241d6839de8dba556f2aabdecc99209457a35b082f5d62cfba4ae67f50b265e8c6a55717fc2270470a7a1b0a1fe601bb3e6
+DIST ovsdbapp-0.12.2.tar.gz 78135 BLAKE2B bd0e0b209352af0bc2939a98d2ef52aa4d610471669d9eb3e9050dccdaa093ea9c922a588e6709defc0182cc991cd38883a9a9780f03cf7350a08eee5b99d424 SHA512 ef2b4080e600c585e23e5e9fa80fd684b42a1f2209db7ff00ec59a751e47c887d296339958d2805be0d359bb30dfab35271cea1b750039170c7bbf719ccc9d6e
 DIST ovsdbapp-0.4.0.tar.gz 35790 BLAKE2B ae41b173787b761eca330e159ce3f1ac2c953c18edb706cdc72a556d680c591cf0540d20b65035c6dcfacbf43768bac81a69b95f4ba5dfde968011fa0c22b46e SHA512 6eaa98745c2c438f43bfc9ce3fe00b100689a2df7564e487bf9c2abce81a725490813d969ddd9ad56b4933f0822d6d8801297e8b6a0c81db2ccff562c1ca62ec
 EBUILD ovsdbapp-0.10.0.ebuild 741 BLAKE2B 53b677a655b02135535267c42ce4146e19e796445a52d10eac45b7e8fb58d69d406d8acabc1f0c85e4b685ff161bd320401594d8edf2f84c1d8a229ff036f931 SHA512 cbd194e6cf0878bc8450e120ebe3bf1c07bbeac74db8bf65dade2d6c1f7a8dad2ca2095b07f7e86c773e3d2edf05c847cd9ed3baa8e656a9e48036e8971c1350
+EBUILD ovsdbapp-0.12.2.ebuild 740 BLAKE2B 1c25af658074f88fadf3d3a26d61de49ab8977521f647e800fd84ce4a8f185130f2ad5182e80175530cf7e6d56ace35dfb511beb27f0415c300d95711e8d7355 SHA512 11f9e8e6b2250760a68933d6a076238784eac40c7f36bc2f2a56ad8d12afa4f2f851f396f45ddfe9151dd5054707a17eec05341db1920e6f44952202db8dc11b
 EBUILD ovsdbapp-0.4.0.ebuild 655 BLAKE2B c0786fbcf260aeeab56df42a7807e13625a3ab1c56e452e64e2e66b43ef436ffa21a3276a209686b9d60c849d2261a9b8f0790e73324b577dfb782dee77b6add SHA512 2c4605eeff18c4dce326426f8ddc694b06ca85bf8ed6b1117b6edbf345b9c6b2192b890b49aa0579d836d1820713ebb2af8ef96bc69a40de566f894b46e2e686
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild b/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild
new file mode 100644
index 000000000000..c4a2f23537a0
--- /dev/null
+++ b/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 library for creating OVSDB applications"
+HOMEPAGE="http://bugs.launchpad.net/ovsdbapp"
+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-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index f3a1d6f234bd..4d587f54805f 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -2,8 +2,10 @@ DIST pymysql-0.7.11.tar.gz 82213 BLAKE2B 45ef3b4c8f4d9a9d3cb5b706f68a52b860bc212
 DIST pymysql-0.8.0.tar.gz 82975 BLAKE2B c1345ff6d266d5a3670d8bb1d7d7becad218ed294ab912f3f28e49163851e2e36fc1bb5a13a5d0f62ba753d264f736a6a87e11d290cc4fd604714fe1d4f9569d SHA512 41597d3955a35283656b5cbc137b0cb63eb48658dc61f0ba1fc0c207bad07472896e557b2996e52fbc2646163bce69e7d2fed81349355e72368cf395f51e2916
 DIST pymysql-0.8.1.tar.gz 83887 BLAKE2B 0181970d714d45db644636b57105bba1ea8d8d3ded537555ab1ae5afdc0cad308dbdfe6a67c50905ba1a2ea8cd5302bac8f997f64f0b6874436e4b90a3ea8a78 SHA512 0a58bb6a74281aaec5d23c4e59407ff1d7f3fd379285a21a39f14ad18008303d79aa87b99ebfe2536775f8b369875b15907ae6653d038a2d44589cf47ac0a2b9
 DIST pymysql-0.9.2.tar.gz 86913 BLAKE2B fc1cd695a75c9f52c4da231f7caae58f902002f38a39a1702f19d23b46bdb1a4753aea98d90e051ec56a5721999149a13b028e1614efdfcac23c76c8382a8d33 SHA512 110306477c167d0b497700b7b22c186c001c803800975b4b4e26e98116f47589b0a4bb7e02d502a62beed6d7dc1ae3fe8a817824c1f3a5caee0898b5f5d21734
+DIST pymysql-0.9.3.tar.gz 86715 BLAKE2B 0ed09f7f5c47bd1fae52dd9d0ff0790367962d8e4b89d3933704b8b8d838e1f48b68455a9a3916318bf3c1c1f102fa11b4e1e3401d021f8a2d6137612a4affb9 SHA512 d906b7a6612d91db7d4f7f2d85a9375477e6655c568e0d1e7281ad0263d4a78f0ac4e80263605723f99e12db04c80f51c5c8ed79ed6f209a7afeb4b45bf40648
 EBUILD pymysql-0.7.11.ebuild 691 BLAKE2B d2fa29a9623b07e0613e83c345be814412f5149e9089bced2d2f350ec3452b3c13cbced81720973e58cd6de38e380f912ad74390e3efeb2eba5bd7a7589dcad4 SHA512 b31309b0a30a479c494221f36c816db3bbeb66d3e373069ea6193a0163f5962f95ea612e0006a8e05cd6c633e7fe641376f8415ec4b8df6991fff858ee59a9d0
 EBUILD pymysql-0.8.0.ebuild 693 BLAKE2B 1736b3c63ca463e590692d522e6f33f0c68b645ac7a7aee6f53e784724d253eea4f4446413a9947b9eefffb68bf061a064faa5c733883d91a4e43e189a62b36e SHA512 3eaad8a2b7746a224e1c0097b5e4d2e003b4af0bcffb2e96a613f8a8e467fafbc4d6f2a0105148abe7f8268a104862bc3ac219b42f62259790cdfe1f101e5014
 EBUILD pymysql-0.8.1.ebuild 693 BLAKE2B 1736b3c63ca463e590692d522e6f33f0c68b645ac7a7aee6f53e784724d253eea4f4446413a9947b9eefffb68bf061a064faa5c733883d91a4e43e189a62b36e SHA512 3eaad8a2b7746a224e1c0097b5e4d2e003b4af0bcffb2e96a613f8a8e467fafbc4d6f2a0105148abe7f8268a104862bc3ac219b42f62259790cdfe1f101e5014
 EBUILD pymysql-0.9.2.ebuild 695 BLAKE2B c12d622287be4fe63a595fd5a67daa4c89e3f4313b7fa7a06b8e5a59758be3a3bfd5384097f1087e0c58077e10be6ce4c0d6cd80a4309df6d30b8bc24d665499 SHA512 03a15396e305524c9808046be906f2f36d118abc9d42f568ead343f19157d9e1b41081b55cd8cab7bdcc1eb11f06cacd4dc5c4c8ffbce05198d84b95d410d2d7
+EBUILD pymysql-0.9.3.ebuild 692 BLAKE2B 9131b00ececfedd06bb3578f364d1b9bee8bdc501965405c20d04c9f69dca562a043f7f3bd724bfe069828b0abbb13060cf5c12a2dd21f6703a49a15b14bb8f3 SHA512 96f73855cbaf58516ad3b9e4578579053b9dd63041853abd88148c592e49b7aa35f0d298384c0952554e554988becea30381be113b609abe5e6f580a2b1fa60e
 MISC metadata.xml 553 BLAKE2B a3f93a6e059fcb457326fe8ca880b1a268be1d5d847a0bd8648156036428a5e2f6cbe47adda3e3cb220c236b4307bb0dba8ea616842437e2408407fae01c16bb SHA512 3799a369db7d62654ead99e579ea2b7f19e33c35654fb4f721e37a46f4a449d67f1173f45abf8e34b330e87a872c0182d7a47dcda97a6d2c40e78ebfab6841bd
diff --git a/dev-python/pymysql/pymysql-0.9.3.ebuild b/dev-python/pymysql/pymysql-0.9.3.ebuild
new file mode 100644
index 000000000000..ad3b57902a23
--- /dev/null
+++ b/dev-python/pymysql/pymysql-0.9.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="PyMySQL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pure-Python MySQL Driver"
+HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# While tests exist, they require an unsecure server to run without manual config file
+RESTRICT="test"
+
+python_test() {
+	${PYTHON} runtests.py || die
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index cd668315486c..132bb56923ec 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index c26a2929ee48..eb14ae07e098 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,10 +1,8 @@
-DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.6.1.tgz 6143808 BLAKE2B 40949c4598af98e177bab19aea809a724135a56aaec66bfdfd820412794f548da195597461d5bd7b6e07bf60a5b6aee330a0a5fdf90bc0b0361b94a80d0684b4 SHA512 118798424ba249c3a7eed3e7174ed4a25d2fb81b8f521e165b2aef995956da7c085084be3dad9961e57e67a685ec3d527c3bfa91730d1053951cdd81b7e511ff
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 DIST rails-5.2.1.1.tgz 8795521 BLAKE2B 93b30ba7b9127d2fc4dae6c7e7884f0a4ab36805b440c37ca8e2b81a5ba2b9ccaa4d30e65599cfb036befc4ec58942d3eba71ba9683becb535e8a822d3a8422e SHA512 bd2c13f06d524a03547341acee3422a58a306a1c33a896073648e4ddcac296a8e397bd73fd5928dae1e66ba3b4a42ac4ea5f0a7cca1f73b2e773b8ece24a76d0
 DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 DIST rails-5.2.2.tgz 8794009 BLAKE2B ee6af6990d6b3dc12171fa2a1baf0f975481dc31711ae2caed27b79d1c5b514d1959492c5cced5b0202b46fc18e4a8178703a91b5f1f65df4ea46f193e9d48d5 SHA512 ecca752baa52ee7f11ef21a919bbba370d9ca76a0b428305143e86ebabbd7218978cdeefc919bfb1c0e0e71fc555869dcf917bda219f89e7e41e17dfe983b792
-EBUILD actioncable-5.0.7.ebuild 941 BLAKE2B 76bbd65b75a57abeb351ab20ae1f1ee0a5481a4a4e9efcb98c279d8ef85914f5596fb22bf2835ce55522de0e96db4849be7c3c58da1d77d48cca7af9160aa909 SHA512 2e5d199f6e444f35796a84027e701601abe5d9d4c70ed712b01e59303a6d7f679b0f9dd3e9e64bcf2fff18ef5fae980edf458288cf5fffc9ede53a4d387b5be3
 EBUILD actioncable-5.1.6.1.ebuild 990 BLAKE2B e6e3331dbdc8b98fdfaaaf8940301dadd7103e7275ac3c935ca5d673a01d20bfa2eebb91825110e298bc7484dcc5bd832a2fa34ee67f4090a64fd97c59efd142 SHA512 76a311d8b88b1f290b9c68dbf00e152058a39c678739e3806d38cba230e8f21234cecb0c45da4bde22bde71b5a887e4aa2eecf770b3987aaff751d5ca0530d35
 EBUILD actioncable-5.2.0.ebuild 968 BLAKE2B 2c9d685d823e7ca51dace7de0ec7d17881bf19f32e9c1018df840ad179f7dcc34960695adb0ced45cb6784f56642e34350832238f6471b5b78d550321db98374 SHA512 57abbe3ab5d7671fd9dbdcbef2410730367c411c7368d8ed692aea9a0d169cd49ec71c63428342ee72f742530fbcd9bd7ba21694e26ba493d300ea0b225dbbb4
 EBUILD actioncable-5.2.1.1.ebuild 943 BLAKE2B 6f0d8b26bc980faae7e59e18774b3c1506b570a5a2d374c58e8bc5c6277c8ecbd238f990b83c66f3598c08adac5c935c54ff8ba1cb66974c60a3d7716f93d107 SHA512 dd94d3c2671b3f90d0c5558e5a5d15f595d21931a072a946dc310c47d2f16cb7ff1f2357567f3b3677fa7b09b1df3c8d9c46047031b21ba4aabcfe09b49c1722
diff --git a/dev-ruby/actioncable/actioncable-5.0.7.ebuild b/dev-ruby/actioncable/actioncable-5.0.7.ebuild
deleted file mode 100644
index 220bca44c465..000000000000
--- a/dev-ruby/actioncable/actioncable-5.0.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
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	>=dev-ruby/nio4r-1.2:0
-	>=dev-ruby/websocket-driver-0.6.1:0 =dev-ruby/websocket-driver-0.6*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index d9c837aca191..df19af78029a 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,12 +1,10 @@
 DIST rails-4.2.11.tgz 4080621 BLAKE2B 97f22f887255a1d8321d26040a9896cc87e0e7e50db208d3c0f96a74d926cfe9bb516641e06f7bfd92649b91427094f729d2d6b24df811ff0481c03950d3185b SHA512 df31ac9cff0b6b07113f6066b0459b40b7263356c40a722636091b75c7443691625153d8e2d7e01324e98321d757f67ba3b9318d4229a3c1a0cea5af65b6b470
-DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.6.1.tgz 6143808 BLAKE2B 40949c4598af98e177bab19aea809a724135a56aaec66bfdfd820412794f548da195597461d5bd7b6e07bf60a5b6aee330a0a5fdf90bc0b0361b94a80d0684b4 SHA512 118798424ba249c3a7eed3e7174ed4a25d2fb81b8f521e165b2aef995956da7c085084be3dad9961e57e67a685ec3d527c3bfa91730d1053951cdd81b7e511ff
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 DIST rails-5.2.1.1.tgz 8795521 BLAKE2B 93b30ba7b9127d2fc4dae6c7e7884f0a4ab36805b440c37ca8e2b81a5ba2b9ccaa4d30e65599cfb036befc4ec58942d3eba71ba9683becb535e8a822d3a8422e SHA512 bd2c13f06d524a03547341acee3422a58a306a1c33a896073648e4ddcac296a8e397bd73fd5928dae1e66ba3b4a42ac4ea5f0a7cca1f73b2e773b8ece24a76d0
 DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 DIST rails-5.2.2.tgz 8794009 BLAKE2B ee6af6990d6b3dc12171fa2a1baf0f975481dc31711ae2caed27b79d1c5b514d1959492c5cced5b0202b46fc18e4a8178703a91b5f1f65df4ea46f193e9d48d5 SHA512 ecca752baa52ee7f11ef21a919bbba370d9ca76a0b428305143e86ebabbd7218978cdeefc919bfb1c0e0e71fc555869dcf917bda219f89e7e41e17dfe983b792
 EBUILD actionmailer-4.2.11.ebuild 1667 BLAKE2B d830d5755a0aac3b39f37198d9b3438f1ca6218395873208a3d227461dfef61669ee89dd86efb231dca11b0df3a99555e181d2b70364f03123c3a7e5930ea2f6 SHA512 ec77024af2d75a454e3c9df55b51e60da9122b73b6d9cf58595e5b14f228f4c2c9cabc5b633aaf72df8ca528c703dc534af43f5c1d01672555201268b68f1568
-EBUILD actionmailer-5.0.7.ebuild 1341 BLAKE2B 2a17605f8210edb2253fe3914d267f32c1bd2ad0cc0f744b835b20e61a19eb4ed65328bdf28e4e835efa558155fb97d26fc6269dd172e4515aa15cb3c6c804bb SHA512 1ec9190bb29c931be32dec90015c68af783b4d9f26bde51e7df2195ec605e7a61b8374c423ea83533b15a51721f5d62f804095542fd294e49a6cb4d2e7dea4a6
 EBUILD actionmailer-5.1.6.1.ebuild 1369 BLAKE2B 2d912788a75a0caac46797c68ececc395f6b8ec33f3b3911545b08f652685d8a026677badb235e10f859cc6753aad90d824a226990f0da29dab896edf7a0dffe SHA512 dd87b2fcc42d6248975c1ccf1d3902c9fcdc60d30f922542457c3930bb0678b780fe95f64e1d39f41761cd4369349b14021418eaf787f72f9ec9ef6b957081f0
 EBUILD actionmailer-5.2.0.ebuild 1316 BLAKE2B fac377956e157d869078e2142ccdd7afdb0977ed06046109b71c4f745cbf96977ee0f4961dccd2a970c1b72e696524f25b2fb9c10e9517e30ec3d5003c254ce8 SHA512 7c0fd6e1568849cb44d6a127d03a14c34631f766f282074d7a6dfae6ebc6b7497d99966285dfe78b518135dd7e517c77c94f4ef41bf68270513ed2f984779483
 EBUILD actionmailer-5.2.1.1.ebuild 1291 BLAKE2B facbe845db352c0317475d3b41f5e8a6d9f0075abc69c144adb6e3d90433a3a0f5e24cef7c6fc5bb1023fe6a3008a9bbeaefa5447f51669fe21b8f707eaa7fa1 SHA512 492465eb627a9ecc7b8ab3539f5ef014af63f7d8f1b6d75a56b660bbdd76efe07b414a496bef836ede768dd80c7c937750531781e42512f73540baf5e733f65d
diff --git a/dev-ruby/actionmailer/actionmailer-5.0.7.ebuild b/dev-ruby/actionmailer/actionmailer-5.0.7.ebuild
deleted file mode 100644
index 54b101336651..000000000000
--- a/dev-ruby/actionmailer/actionmailer-5.0.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
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha:0.14
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '1igem "actionpack", "~>5.0.0"; gem "activejob", "~>5.0.0"; gem "railties", "~>5.0.0"' test/abstract_unit.rb || die
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 236fa9ca7ec5..c9a30281308e 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,12 +1,10 @@
 DIST rails-4.2.11.tgz 4080621 BLAKE2B 97f22f887255a1d8321d26040a9896cc87e0e7e50db208d3c0f96a74d926cfe9bb516641e06f7bfd92649b91427094f729d2d6b24df811ff0481c03950d3185b SHA512 df31ac9cff0b6b07113f6066b0459b40b7263356c40a722636091b75c7443691625153d8e2d7e01324e98321d757f67ba3b9318d4229a3c1a0cea5af65b6b470
-DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.6.1.tgz 6143808 BLAKE2B 40949c4598af98e177bab19aea809a724135a56aaec66bfdfd820412794f548da195597461d5bd7b6e07bf60a5b6aee330a0a5fdf90bc0b0361b94a80d0684b4 SHA512 118798424ba249c3a7eed3e7174ed4a25d2fb81b8f521e165b2aef995956da7c085084be3dad9961e57e67a685ec3d527c3bfa91730d1053951cdd81b7e511ff
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 DIST rails-5.2.1.1.tgz 8795521 BLAKE2B 93b30ba7b9127d2fc4dae6c7e7884f0a4ab36805b440c37ca8e2b81a5ba2b9ccaa4d30e65599cfb036befc4ec58942d3eba71ba9683becb535e8a822d3a8422e SHA512 bd2c13f06d524a03547341acee3422a58a306a1c33a896073648e4ddcac296a8e397bd73fd5928dae1e66ba3b4a42ac4ea5f0a7cca1f73b2e773b8ece24a76d0
 DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 DIST rails-5.2.2.tgz 8794009 BLAKE2B ee6af6990d6b3dc12171fa2a1baf0f975481dc31711ae2caed27b79d1c5b514d1959492c5cced5b0202b46fc18e4a8178703a91b5f1f65df4ea46f193e9d48d5 SHA512 ecca752baa52ee7f11ef21a919bbba370d9ca76a0b428305143e86ebabbd7218978cdeefc919bfb1c0e0e71fc555869dcf917bda219f89e7e41e17dfe983b792
 EBUILD actionpack-4.2.11.ebuild 1857 BLAKE2B 7d320158bce563efa5dda45668424cf923d71a9865abdaae146d4b8a508f067fcb71d2aaea91f9b13a05154b413df3fc76cd58ac6ca460c928b0c26715f2470c SHA512 737af7ced6b674d86572e188512aa6a55c95d8e3dd891433e24849330f96359cb2cd059755dff2b29db401367c2215d33cd7f1c2d6b50f2c49711e19038e05c8
-EBUILD actionpack-5.0.7.ebuild 2095 BLAKE2B 90e1cc87ff932dcb868e0c75479adce4137e9d6472ad1520e00d324242cbff1a2462ff8579fb5a435525ea94586f8458899b382ad4ed0bcce2452ec68ff4145a SHA512 b1be51877b60e2b359d6bdfe7e37cf84af47dff1024f96fee9e8bb71f09e403a9d7eefba007de52d535c8726739160f6416b72dc740853438fdcc07e891b4948
 EBUILD actionpack-5.1.6.1.ebuild 1717 BLAKE2B 8d508ffe2ee5e151bcce10d77f08bc530c92d1822d06466d22ca22f8185af0b5c9db501c2730a38c223d2dc9b3f17ad67ccfd6fc6593deb7a6bbdc3424f3b127 SHA512 7b5309daef2984e9f0583d2cc6203a2c81c121e6e0b846bf70bc9220aaf5811889094b4bc9781e3a9b90ae38c0057a832671fb96bfa27e841aa97375f1de3600
 EBUILD actionpack-5.2.0.ebuild 1598 BLAKE2B f1b2b9f4823bc2122b1a4ed973406a05feecad21e58cc2c543dbe28be6f5442e6863d0f6bc3dcc2c2c19f1d988d4a3d20e2a92f90b59ff0aa889c50b9a9c8ce7 SHA512 fa8a005d7899fcf3f7bfba6d7930a843e3131edaf04b7b84d615e176709f5da7dd242cf33a73b1220df8007e77697db1b6e71f3e9c5ff8f743e84f8f966971be
 EBUILD actionpack-5.2.1.1.ebuild 1573 BLAKE2B 37c3ea491a4e8443f9ea3f9f73c790461a7727d02b51a340545cdad77ce9bb5eaf0142aa8c657e90a885a28c25db94543cc02fcbcad5df725d429353de0c391b SHA512 003fe1889b745fb499b17e85c61f8e4df44186da276b74c6de8070bd2db16d59a26f83f380177cd553fb77710f11daa5bdb8d1596b84d1cdb342213d101bb6f1
diff --git a/dev-ruby/actionpack/actionpack-5.0.7.ebuild b/dev-ruby/actionpack/actionpack-5.0.7.ebuild
deleted file mode 100644
index 1bf769932432..000000000000
--- a/dev-ruby/actionpack/actionpack-5.0.7.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
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.0
-	>=dev-ruby/rack-test-0.6.3:0.6
-	>=dev-ruby/rails-html-sanitizer-1.0.2:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		~dev-ruby/railties-${PV}
-		~dev-ruby/activerecord-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e '1igem "railties", "~>5.0.0"; gem "activerecord", "~>5.0.0"' test/abstract_unit.rb || die
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Skip a failing test related to security updates in 4.2.5.1. Let's
-	# assume that this is not a bug but a test lagging a security
-	# measure.
-	sed -i -e '/test_dynamic_render_with_file/,/^  end/ s:^:#:' \
-		test/controller/render_test.rb || die
-
-	# Skip brittle test depending on mime type registration order (fixed upstream)
-	sed -i -e '/parse application with trailing star/,/^  end/ s:^:#:' \
-		test/dispatch/mime_type_test.rb
-}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 18cfb2eb9ee5..35e1e38711b1 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,12 +1,10 @@
 DIST rails-4.2.11.tgz 4080621 BLAKE2B 97f22f887255a1d8321d26040a9896cc87e0e7e50db208d3c0f96a74d926cfe9bb516641e06f7bfd92649b91427094f729d2d6b24df811ff0481c03950d3185b SHA512 df31ac9cff0b6b07113f6066b0459b40b7263356c40a722636091b75c7443691625153d8e2d7e01324e98321d757f67ba3b9318d4229a3c1a0cea5af65b6b470
-DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.6.1.tgz 6143808 BLAKE2B 40949c4598af98e177bab19aea809a724135a56aaec66bfdfd820412794f548da195597461d5bd7b6e07bf60a5b6aee330a0a5fdf90bc0b0361b94a80d0684b4 SHA512 118798424ba249c3a7eed3e7174ed4a25d2fb81b8f521e165b2aef995956da7c085084be3dad9961e57e67a685ec3d527c3bfa91730d1053951cdd81b7e511ff
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 DIST rails-5.2.1.1.tgz 8795521 BLAKE2B 93b30ba7b9127d2fc4dae6c7e7884f0a4ab36805b440c37ca8e2b81a5ba2b9ccaa4d30e65599cfb036befc4ec58942d3eba71ba9683becb535e8a822d3a8422e SHA512 bd2c13f06d524a03547341acee3422a58a306a1c33a896073648e4ddcac296a8e397bd73fd5928dae1e66ba3b4a42ac4ea5f0a7cca1f73b2e773b8ece24a76d0
 DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 DIST rails-5.2.2.tgz 8794009 BLAKE2B ee6af6990d6b3dc12171fa2a1baf0f975481dc31711ae2caed27b79d1c5b514d1959492c5cced5b0202b46fc18e4a8178703a91b5f1f65df4ea46f193e9d48d5 SHA512 ecca752baa52ee7f11ef21a919bbba370d9ca76a0b428305143e86ebabbd7218978cdeefc919bfb1c0e0e71fc555869dcf917bda219f89e7e41e17dfe983b792
 EBUILD actionview-4.2.11.ebuild 1584 BLAKE2B e85e24bea146d7caf421ca1b264e0c6ca550d6b9741c06139e607283f80cb9952e310388d81893543d86c7546372f5b088bf1aa9c83f4cdc725692af3f5230f9 SHA512 6397e25f4b74404d0cf85563a4ad718f1d1e7163bd8de517ab142f4f9708c2d8f0e05efd8da8b0ae5ff2c1be764f32eb3bec15354896103731e6f6340a050294
-EBUILD actionview-5.0.7.ebuild 1839 BLAKE2B 766842730ddb8927b3be2fb39382ec1689e558a8df29ad66e5ca9757d5cd822fe5ffa40ab558cd7f2d608c346359966deb61bd9bf10d78f22690d3d2a0320f79 SHA512 5db463c1aeb7c227b2fc260b6f9a053281809541614db067edcaeb192cb5b361aa9297d36f1862770efad3f4b9bffbb10fa6796814d5f1a9800a9b47cf6b95a2
 EBUILD actionview-5.1.6.1.ebuild 1877 BLAKE2B 055fbd154fc2be4b386c495245d4981b9383ad25b273c14d38fd885b5011bcff74576efe6703f44d4b2da723fa5559d561a098f5f7e9013b0c3c9251c543ef10 SHA512 8887207f24bb59cff2258630c43aaf8319a059d3f97b45ab7e80408f44d2d4255e240c6fb662bbf959284425e34891edc58c28f70aa729ab25dc9ffaa3d86de1
 EBUILD actionview-5.2.0.ebuild 1752 BLAKE2B f5df1ae26919c1671d24396e870ffa22615a082e843794e17be6da618aadac44af1615d4c41e28b13633ce634eabc18e6b67c92a5d94345e51b678f55f4ef0c0 SHA512 b95cfb9bb71c5ed58286b2b4dd0dd19be223c954cf2e689f48117f5c4fd0c1da0e0b4b17b2792542acc0bf883f6564758cde5377d7041cb90e584fd2f274dd52
 EBUILD actionview-5.2.1.1.ebuild 1727 BLAKE2B 0efc6a38d1b5cbe394111db9d54678bfa93b8b636b371fb3569c7851809f98142ea4a89ce01fae7c369e5428c3cba6871685acaf3bba726cecf53070be069613 SHA512 dbc4670112326c66dcf96f4ead9a62a448e2def0af0d315d2558761e7646c2cd9d16b4a83db78a319a04dd492b641cb4c735e82839e5f8eb09730561a4bbc550
diff --git a/dev-ruby/actionview/actionview-5.0.7.ebuild b/dev-ruby/actionview/actionview-5.0.7.ebuild
deleted file mode 100644
index 671fde0cad4a..000000000000
--- a/dev-ruby/actionview/actionview-5.0.7.ebuild
+++ /dev/null
@@ -1,56 +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_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubis-2.7.0
-	>=dev-ruby/rails-html-sanitizer-1.0.3:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		~dev-ruby/railties-${PV}
-		~dev-ruby/activerecord-${PV}
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e '1igem "railties", "~>5.0.0"; gem "activerecord", "~>5.0.0"' test/abstract_unit.rb || die
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 8706420f5f51..24cb43aa55e8 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,12 +1,10 @@
 DIST rails-4.2.11.tgz 4080621 BLAKE2B 97f22f887255a1d8321d26040a9896cc87e0e7e50db208d3c0f96a74d926cfe9bb516641e06f7bfd92649b91427094f729d2d6b24df811ff0481c03950d3185b SHA512 df31ac9cff0b6b07113f6066b0459b40b7263356c40a722636091b75c7443691625153d8e2d7e01324e98321d757f67ba3b9318d4229a3c1a0cea5af65b6b470
-DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.6.1.tgz 6143808 BLAKE2B 40949c4598af98e177bab19aea809a724135a56aaec66bfdfd820412794f548da195597461d5bd7b6e07bf60a5b6aee330a0a5fdf90bc0b0361b94a80d0684b4 SHA512 118798424ba249c3a7eed3e7174ed4a25d2fb81b8f521e165b2aef995956da7c085084be3dad9961e57e67a685ec3d527c3bfa91730d1053951cdd81b7e511ff
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 DIST rails-5.2.1.1.tgz 8795521 BLAKE2B 93b30ba7b9127d2fc4dae6c7e7884f0a4ab36805b440c37ca8e2b81a5ba2b9ccaa4d30e65599cfb036befc4ec58942d3eba71ba9683becb535e8a822d3a8422e SHA512 bd2c13f06d524a03547341acee3422a58a306a1c33a896073648e4ddcac296a8e397bd73fd5928dae1e66ba3b4a42ac4ea5f0a7cca1f73b2e773b8ece24a76d0
 DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 DIST rails-5.2.2.tgz 8794009 BLAKE2B ee6af6990d6b3dc12171fa2a1baf0f975481dc31711ae2caed27b79d1c5b514d1959492c5cced5b0202b46fc18e4a8178703a91b5f1f65df4ea46f193e9d48d5 SHA512 ecca752baa52ee7f11ef21a919bbba370d9ca76a0b428305143e86ebabbd7218978cdeefc919bfb1c0e0e71fc555869dcf917bda219f89e7e41e17dfe983b792
 EBUILD activejob-4.2.11.ebuild 1070 BLAKE2B e2735b7af04653800cb3d46ade54f628803730bc64d5c0ea09ebd4be17f710ee2280e8ac61c519b9c5a73d92c7824b0866f0e78fb3377ad9adc3d1f16cf3ca6a SHA512 cf84fde67733236d131f4404f92372ae79f270a4a81e22cd496644ff71f649d2430b07d8aeea4ef292020753263cad2690f6ace42c468fb9d6b33bb4398059ea
-EBUILD activejob-5.0.7.ebuild 1129 BLAKE2B d5cc088a44ce42427940b892e0f8a560ef2b587ee12ee5f3d07cef82369025d921bf2d1e0a2ac091e95c2f251bf0f7788d61a13c5b51b0db2052c3afc7d7dea2 SHA512 9c19395298377b1653cdfc2cfafdbcccf396b77787a8bb0dffe12564aa26c1ccf7f3bc447edc21f1eecb128ccef550143edbc1f4f482c966ebaa8384e58d2d52
 EBUILD activejob-5.1.6.1.ebuild 1092 BLAKE2B c40697bf5bdfcb6e29501184a4992876a944ba71fe100dd42c40ba79fac3b91817038a5117e39173261b025548638b2c3da8b6914b850bb934795a35e0563d00 SHA512 142e387515d8bdceea168be6e81eb2f909b300e843aa5ebe35238e26d80b59d12a60d50af724aba4301838ed862b6a538e46337a0f44bc9e8b567e2b95a63270
 EBUILD activejob-5.2.0.ebuild 1113 BLAKE2B c53eebc5d1de92a1db17b442c17d73d7c918993c132c54551a6f6fff07313ba897f7098cf08f09c1f14a1be6595b7da484421eadabeac046e6f32ba25d2670aa SHA512 a5f77cf5db3997cadead0cf8390f3b58876b809273851476618cb11b92c952efeed50d83f066f835cd5d1500336f3d904f78fdbe45cc269d30cc88a9fbf7ec2d
 EBUILD activejob-5.2.1.1.ebuild 1088 BLAKE2B b22f176b21db5e1bdf0e01e1fd96efc975d2964bef5e96c155612a85440014e3361e706cbdc38f4e651b1e90299ac4915907d3ea966b891526d95ace8dbd6031 SHA512 227ae2621aa24dd5f9e99236c5975db682c6dc876e95ae5241d57423213df81a1c79ca66be35887d1ddc38815824da6b924db887d40b24019e33940489086050
diff --git a/dev-ruby/activejob/activejob-5.0.7.ebuild b/dev-ruby/activejob/activejob-5.0.7.ebuild
deleted file mode 100644
index 0e0f7623e0d0..000000000000
--- a/dev-ruby/activejob/activejob-5.0.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=5
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '1igem "activesupport", "~>5.0.0"' test/helper.rb || die
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/delayed_job que queue_classic resque sidekiq sneakers sucker_punch backburner//' Rakefile || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true ${RUBY} -S rake test || die
-}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 56ccce47dda4..aef5aebd213f 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,12 +1,10 @@
 DIST rails-4.2.11.tgz 4080621 BLAKE2B 97f22f887255a1d8321d26040a9896cc87e0e7e50db208d3c0f96a74d926cfe9bb516641e06f7bfd92649b91427094f729d2d6b24df811ff0481c03950d3185b SHA512 df31ac9cff0b6b07113f6066b0459b40b7263356c40a722636091b75c7443691625153d8e2d7e01324e98321d757f67ba3b9318d4229a3c1a0cea5af65b6b470
-DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.6.1.tgz 6143808 BLAKE2B 40949c4598af98e177bab19aea809a724135a56aaec66bfdfd820412794f548da195597461d5bd7b6e07bf60a5b6aee330a0a5fdf90bc0b0361b94a80d0684b4 SHA512 118798424ba249c3a7eed3e7174ed4a25d2fb81b8f521e165b2aef995956da7c085084be3dad9961e57e67a685ec3d527c3bfa91730d1053951cdd81b7e511ff
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 DIST rails-5.2.1.1.tgz 8795521 BLAKE2B 93b30ba7b9127d2fc4dae6c7e7884f0a4ab36805b440c37ca8e2b81a5ba2b9ccaa4d30e65599cfb036befc4ec58942d3eba71ba9683becb535e8a822d3a8422e SHA512 bd2c13f06d524a03547341acee3422a58a306a1c33a896073648e4ddcac296a8e397bd73fd5928dae1e66ba3b4a42ac4ea5f0a7cca1f73b2e773b8ece24a76d0
 DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 DIST rails-5.2.2.tgz 8794009 BLAKE2B ee6af6990d6b3dc12171fa2a1baf0f975481dc31711ae2caed27b79d1c5b514d1959492c5cced5b0202b46fc18e4a8178703a91b5f1f65df4ea46f193e9d48d5 SHA512 ecca752baa52ee7f11ef21a919bbba370d9ca76a0b428305143e86ebabbd7218978cdeefc919bfb1c0e0e71fc555869dcf917bda219f89e7e41e17dfe983b792
 EBUILD activemodel-4.2.11.ebuild 1635 BLAKE2B 01665ec30ee027c567ad4a7ca97643a0fc565144c547421ca398ffcaf47ac61ef4e6751cbd70d4a088e3d0074b9f15956895c56f488229ab7114292149ef6bb4 SHA512 3d857c86927ce92724318fae3fa53a0fd8b4b263ff23cd8cce560305a329cb317443ceebdcbfcb1cd01fcb43f0780e68ed8030c02368c4595cb38b89f7d57311
-EBUILD activemodel-5.0.7.ebuild 1049 BLAKE2B c9c18543ca2671932e46098cd7baf12b29059ad74e3785a0c174296c93a693e9e09b5955c71e7d7b1f3f67dd92f2025df337dfad31eee953fd738324fad547ce SHA512 3c6c3121f4eeb2f5770366924883dc312d0413ddba3de490d4eb44822d7cd6d2e5f815ab93b38992ba48de2e9ce6e4a681c9e98ef7cf33031a07c5bbfc510d50
 EBUILD activemodel-5.1.6.1.ebuild 1125 BLAKE2B 1960973cfc9e6f994e19f652f2d7e8aff17974911fbebff2e2b03ca34025a09f82d835b0ea39f336285a59e88623c70caf99cd57da44ab05f2729544542b9195 SHA512 58c17e55c11429da6bb6e0626dac793f9a06d473217684c59eb6f791133b9d11302f8381da617e60605de46f2705489c070e0d1a766d5b379acf627fa889be01
 EBUILD activemodel-5.2.0.ebuild 1059 BLAKE2B 70b0fc0b667b918a04486d26eacd0b46a6797b9ab50396752ab35d7de908a348638d66e5519f711f12676aeb61cbfb1534fa95c2557ddd8012ec57c68ca09f17 SHA512 8e17729197e212eaf4efd6f56e1ae1d350be6560f36677d8f417db63fbc4a47421c0cd36186e2f18f469cddfe2a5c10e5cdcf8a7380d967e3a38f7550d82837a
 EBUILD activemodel-5.2.1.1.ebuild 1034 BLAKE2B a427f3286029b23c69df86e65d800ff7764c6d3d1fcc1c54bbddd16368936c914a6fcb62ad8edc85141dbd113964cc4ccba05cdab1e606710968157f12a52549 SHA512 8874c2053e996017d829711995535253ab5dddb6feb6f635090c7b70124fe745f5372a505b2909afce6a10bc4756b770fcde757c4b4ca27e3723fd617a4a0603
diff --git a/dev-ruby/activemodel/activemodel-5.0.7.ebuild b/dev-ruby/activemodel/activemodel-5.0.7.ebuild
deleted file mode 100644
index a7adb554db31..000000000000
--- a/dev-ruby/activemodel/activemodel-5.0.7.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
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/railties:5.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-		>=dev-ruby/bcrypt-ruby-3.1.7
-		dev-ruby/bundler
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "activesupport", "~>5.0.0"; gem "railties", "~>5.0.0"' test/cases/helper.rb || die
-}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index ba55282cd3f5..3f5148259a27 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,12 +1,10 @@
 DIST rails-4.2.11.tgz 4080621 BLAKE2B 97f22f887255a1d8321d26040a9896cc87e0e7e50db208d3c0f96a74d926cfe9bb516641e06f7bfd92649b91427094f729d2d6b24df811ff0481c03950d3185b SHA512 df31ac9cff0b6b07113f6066b0459b40b7263356c40a722636091b75c7443691625153d8e2d7e01324e98321d757f67ba3b9318d4229a3c1a0cea5af65b6b470
-DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.6.1.tgz 6143808 BLAKE2B 40949c4598af98e177bab19aea809a724135a56aaec66bfdfd820412794f548da195597461d5bd7b6e07bf60a5b6aee330a0a5fdf90bc0b0361b94a80d0684b4 SHA512 118798424ba249c3a7eed3e7174ed4a25d2fb81b8f521e165b2aef995956da7c085084be3dad9961e57e67a685ec3d527c3bfa91730d1053951cdd81b7e511ff
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 DIST rails-5.2.1.1.tgz 8795521 BLAKE2B 93b30ba7b9127d2fc4dae6c7e7884f0a4ab36805b440c37ca8e2b81a5ba2b9ccaa4d30e65599cfb036befc4ec58942d3eba71ba9683becb535e8a822d3a8422e SHA512 bd2c13f06d524a03547341acee3422a58a306a1c33a896073648e4ddcac296a8e397bd73fd5928dae1e66ba3b4a42ac4ea5f0a7cca1f73b2e773b8ece24a76d0
 DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 DIST rails-5.2.2.tgz 8794009 BLAKE2B ee6af6990d6b3dc12171fa2a1baf0f975481dc31711ae2caed27b79d1c5b514d1959492c5cced5b0202b46fc18e4a8178703a91b5f1f65df4ea46f193e9d48d5 SHA512 ecca752baa52ee7f11ef21a919bbba370d9ca76a0b428305143e86ebabbd7218978cdeefc919bfb1c0e0e71fc555869dcf917bda219f89e7e41e17dfe983b792
 EBUILD activerecord-4.2.11.ebuild 2477 BLAKE2B ad9b83d26554c17e91bed1eb1cc3de771631b7508d4aa4be93473e5e6f552f5d0ea3e7650b63806bf28f99f58e8426ef5405898c0e8b3e7e32ada4142fac055a SHA512 953a89194a5f5c8085e4c578ca26000e700798ef8ceb689e071215b8c980121b5903c62d2801988c140aa60f6164c1e4839cd5a16afa5ecc1c3cf22531910bd9
-EBUILD activerecord-5.0.7.ebuild 2732 BLAKE2B 52ff7f3e27a3c9bfbdb82884c6a70408e3cac330ad79c0e26e9ab5cfd360cd3f2d55f5ed637f3e60880c260a6c73fb06896e1b647d9a0b3d470fa64d8a1b9d13 SHA512 29fbf0ba49971b440999f9e8ab2bf74574ce166933990d2bd2e83e6c6da98d56cee2460391ef8b14b5a534cc041f304dc0493de60500b624eb8430250bade393
 EBUILD activerecord-5.1.6.1.ebuild 2611 BLAKE2B b3b4c55a19f602ab36785257df7e871a6632203beee75c156b7029b7f802cfad0bbafb68412fdb497686f67f45bb682ed4c6cb873d6393ca791444c0fba5a0ec SHA512 34393c3d191043bead70a637e2ce88c0ec3331f298b115a4f1151950e466e4bb513dbd59a2db3484efcbf66ce508e4bcdbc463e9c47ba179d6a59e112ed85acd
 EBUILD activerecord-5.2.0.ebuild 2649 BLAKE2B 71e66f664e4117625dff7aa5e3153948d3ed4bd8423a375ebf721794750640cd84185007c9434074b0009edaad23cd1953e05fec094ce6fc4de9e201f7cd7465 SHA512 fdc2b4070a4e3904850d04126e1c4e3394488a774b395d05b90d7188434d6e26564e5c6b683d8b0909671675cfe5bba00b19f2029996b0addfb11e38dcb715c2
 EBUILD activerecord-5.2.1.1.ebuild 2624 BLAKE2B d553fa31029fd24d2b088e982bcd8a2dfc83c1764eb94e64120ac7733d82ed395af6d6925b1f94a4155fff1df071affe2a29be5b658dff53e22931643d15ab16 SHA512 199683cbbb87db830674e4bc27b5f1ed55024592048b5bd54ec28dbee6af8157751c270306d2d94d3b43ccee32a67ef01143430bc590da9a6b4c5ae6d589c402
diff --git a/dev-ruby/activerecord/activerecord-5.0.7.ebuild b/dev-ruby/activerecord/activerecord-5.0.7.ebuild
deleted file mode 100644
index 399aa51c243d..000000000000
--- a/dev-ruby/activerecord/activerecord-5.0.7.ebuild
+++ /dev/null
@@ -1,80 +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"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	dev-ruby/arel:7.0
-	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( || ( dev-ruby/mysql2:0.4 >=dev-ruby/mysql2-0.3.18:0.3 ) )
-	postgres? ( >=dev-ruby/pg-0.18.0 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/actionmailer-${PV}
-		>=dev-ruby/sqlite3-1.3.6
-		dev-ruby/mocha:0.14
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e '1igem "activemodel", "~>5.0.0"; gem "railties", "~>5.0.0"' test/cases/helper.rb || die
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single test using mysql dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 1d1b4b8970a1..626029225487 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,12 +1,10 @@
 DIST rails-4.2.11.tgz 4080621 BLAKE2B 97f22f887255a1d8321d26040a9896cc87e0e7e50db208d3c0f96a74d926cfe9bb516641e06f7bfd92649b91427094f729d2d6b24df811ff0481c03950d3185b SHA512 df31ac9cff0b6b07113f6066b0459b40b7263356c40a722636091b75c7443691625153d8e2d7e01324e98321d757f67ba3b9318d4229a3c1a0cea5af65b6b470
-DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.6.1.tgz 6143808 BLAKE2B 40949c4598af98e177bab19aea809a724135a56aaec66bfdfd820412794f548da195597461d5bd7b6e07bf60a5b6aee330a0a5fdf90bc0b0361b94a80d0684b4 SHA512 118798424ba249c3a7eed3e7174ed4a25d2fb81b8f521e165b2aef995956da7c085084be3dad9961e57e67a685ec3d527c3bfa91730d1053951cdd81b7e511ff
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 DIST rails-5.2.1.1.tgz 8795521 BLAKE2B 93b30ba7b9127d2fc4dae6c7e7884f0a4ab36805b440c37ca8e2b81a5ba2b9ccaa4d30e65599cfb036befc4ec58942d3eba71ba9683becb535e8a822d3a8422e SHA512 bd2c13f06d524a03547341acee3422a58a306a1c33a896073648e4ddcac296a8e397bd73fd5928dae1e66ba3b4a42ac4ea5f0a7cca1f73b2e773b8ece24a76d0
 DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 DIST rails-5.2.2.tgz 8794009 BLAKE2B ee6af6990d6b3dc12171fa2a1baf0f975481dc31711ae2caed27b79d1c5b514d1959492c5cced5b0202b46fc18e4a8178703a91b5f1f65df4ea46f193e9d48d5 SHA512 ecca752baa52ee7f11ef21a919bbba370d9ca76a0b428305143e86ebabbd7218978cdeefc919bfb1c0e0e71fc555869dcf917bda219f89e7e41e17dfe983b792
 EBUILD activesupport-4.2.11.ebuild 2385 BLAKE2B 9e44c08dcbebfb1c203effc65a12e7d5a5ca8ac4325078f635415bedcaedec88357d05f225fa6d8c1a194426e7dac78474d5641c23f8ec7ea0d605cc713c4988 SHA512 652812c37ad003a2affb9d0830460dd6a1e3d05e414e6511500a00d513dea994342a50353299ab68ed8c6ed1345cb72277322fb8523582e2e4ec43125849f1c2
-EBUILD activesupport-5.0.7.ebuild 2646 BLAKE2B 8a5b75824494c5f25b43e9196b38ce5ce4a1e7dd6398345b70e028198afc73c92ef8b83effc12abbbcfe30325f44df4e7ca89f52cf986b55439b9fb35d807d9b SHA512 6b7242961eb6b2a4e5070925193d8c03ff7ad95275922ae52b86d5017262059e918c462381d5655479868203f0fe634b3231376a24e6db64fb5b219aab818500
 EBUILD activesupport-5.1.6.1.ebuild 2317 BLAKE2B edb4f60b2ebe5cfec4f4c337d89c6a962b17fb62f54b2cfb0b9d79a42b841d3b331da585396b7e3e2169395cf1733686e0ed99ee8841d39a305f87162f7268e9 SHA512 6cc5b12c16c8525c8e720a88bf807ae0f2cee631a9063b70e939e923de4a55d9f0a6b618601e6446c54c320db49d29d0c3fe8e6a0b9000e6c72383bbc3ff3f2a
 EBUILD activesupport-5.2.0.ebuild 2535 BLAKE2B 68f3dbf317ff7f7dcc4a744c1d3c7c502a41bfe31dd8a5957884c6f22349eaca05b02f8b66d6536cfcb1950dbbc31d751bdb86ceda585c7a75270896d8675c55 SHA512 379fd25deea457cd5f69fb65015ca7cd7972cbe732c8262acdf6d4a01515c221289186f0ef991f03c4aedc687d76ae5dad34b1133bd0ef9caa987192e54a67cf
 EBUILD activesupport-5.2.1.1.ebuild 2511 BLAKE2B e871542e743ae23305ed078d14a157da7007aa41d3ce688d91fe3e92f58bdf3ffc7bee5a63da978f73bb4e94d92f530bd232732877761c88d42a74851a79fa17 SHA512 6d60d13ad7ddb0136257be6d8a30bdb7919160ef2d7a03d107107e639395df60cc65c42bf85be678b3948fafe60c69d7a92868835a376bf0894fedab83e1ab6b
diff --git a/dev-ruby/activesupport/activesupport-5.0.7.ebuild b/dev-ruby/activesupport/activesupport-5.0.7.ebuild
deleted file mode 100644
index bb434f435694..000000000000
--- a/dev-ruby/activesupport/activesupport-5.0.7.ebuild
+++ /dev/null
@@ -1,74 +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_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-0.7:* <dev-ruby/i18n-1:*
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha:0.14
-	<dev-ruby/minitest-5.4
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid test not working within portage
-	sed -i -e '/test_messing_with_either_encrypted_values_causes_failure/askip "gentoo"' test/message_encryptor_test.rb || die
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/caching_test.rb || die
-
-	# Avoid tests failing since test_order cattr is also seen as a test
-	# method
-	rm -f test/xml_mini/libxml{,sax}_engine_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions. This might be
-	# fixed upstream in 7bd41994480c17db71fdc07e3447ade929eaa386
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid tests which make network connections
-	rm -f test/multibyte_{grapheme_break,normalization}_conformance_test.rb || die
-}
diff --git a/dev-ruby/bluecloth/Manifest b/dev-ruby/bluecloth/Manifest
index fe57ba81204c..16128c057f2b 100644
--- a/dev-ruby/bluecloth/Manifest
+++ b/dev-ruby/bluecloth/Manifest
@@ -1,3 +1,3 @@
 DIST bluecloth-2.2.0.gem 94208 BLAKE2B e2fd3eaeebbbe365ebe076c3027ba1528c11e036eada18c9b6aecc2f0b1f389aa23c4072fbeba6ac2d86831943e3d6710308ad9d26d7c29a9ab571a7b5c52b98 SHA512 498ffc9eddd47ded1df5c60e8ae8647de1e0376c7787c42dad2450c15a237b01a734bd0a2742c56cb59831cddc5b35c88e954abc0a087fc803ce4890c07c2852
-EBUILD bluecloth-2.2.0-r3.ebuild 1183 BLAKE2B 13e37432b524a547d4002fe0815c84d0108ec2c8dd220d78314b193e5b149644535eba2c32d2516c41135ac837a2c45a018b10c895f396d8064c3e7c86571062 SHA512 c088969e68e64a6c1ff840227f060d8389f1d66f3e7fc8f109084a035dc5600169018c3f686a73ccab8875c88e3e641e1abaf0737af73488e633e0207e4ce7fe
+EBUILD bluecloth-2.2.0-r3.ebuild 1166 BLAKE2B 373011ffa964da6e9551f24e6227f9e22122cbcf8e87cc2f3b2be6336face65f3b0cbbe80e42e215cd212b1b4b9f4b6bfd912faacfbdfe82a6638422c4fbc8ce SHA512 b0dd8fda86be6e99ceb257fb0c11d2820cb80b03ca977145a9502edbcfd09284514800dc25c2fffadfee70d28f8939257c610d6e1330ec574ca9f0b48ef828b1
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/bluecloth/bluecloth-2.2.0-r3.ebuild b/dev-ruby/bluecloth/bluecloth-2.2.0-r3.ebuild
index 210f75c76e43..8d0b57d3d8d8 100644
--- a/dev-ruby/bluecloth/bluecloth-2.2.0-r3.ebuild
+++ b/dev-ruby/bluecloth/bluecloth-2.2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,6 @@ IUSE="test"
 DEPEND+=" doc? ( dev-lang/perl )"
 
 ruby_add_bdepend "
-	dev-ruby/hoe
 	test? (
 		dev-ruby/diff-lcs
 		dev-ruby/tidy-ext
diff --git a/dev-ruby/classifier/Manifest b/dev-ruby/classifier/Manifest
deleted file mode 100644
index c6a8cd4ffc35..000000000000
--- a/dev-ruby/classifier/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST classifier-1.3.4.gem 26112 BLAKE2B 61f7ac90dd4432f171abbf20ed822e5f553863e3bf487b4e97ab307df3e1c2212c129cc759a4d1647efa31fad00af7abb81fabf99c48da6df5c2e77778e40462 SHA512 b59fe17f7fe508d5f26584e14d5cd89eed8f77756b75a65adf2512116d0a67b716d14c2f742270fd14765567079a88264f5e1afe49d3865403814c4bdaf8f2f1
-EBUILD classifier-1.3.4.ebuild 990 BLAKE2B 28836fac04f1a0df9a03e8dde2b7cab6c0a95a1e2776a7ae70c833ce466342a02540d8a3bc21a9a202289662ab2619092a803a8ca990bdd9668338855dec90ea SHA512 acab34ab2bf50af1a9a65f683e4b9141d839609e45f29149fd34288430c1a1a12d83c689663dfa393feb64fcfd8807ecd54529b6867ace911fe67c6043f4e5e4
-MISC metadata.xml 346 BLAKE2B b0a975c5fa5219c578a2eb542744792cd5db4cc158e636ceafb0f4e04c460d8338499b3622f7cae014a1fc11259697adb3ac7a30d72449e28abeac1f55a5bf14 SHA512 01d4931bce6d5e0fe7fd5e6c84773420a3eeca9e98f9457872d1dd4ca24bddbdbc7bc96077d41858f155538e60c6bc2a997730612386caa6dea3c12434d77b10
diff --git a/dev-ruby/classifier/classifier-1.3.4.ebuild b/dev-ruby/classifier/classifier-1.3.4.ebuild
deleted file mode 100644
index 3aecb200988c..000000000000
--- a/dev-ruby/classifier/classifier-1.3.4.ebuild
+++ /dev/null
@@ -1,34 +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_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Module to allow Bayesian and other types of classifications"
-HOMEPAGE="http://rubyforge.org/projects/classifier  https://github.com/cardmagic/classifier"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gsl"
-
-ruby_add_rdepend ">=dev-ruby/fast-stemmer-1.0.0
-	!!dev-ruby/classifier-reborn
-	gsl? ( dev-ruby/rb-gsl )"
-
-all_ruby_prepare() {
-	sed -i -e "s/PKG_VERSION/\"${PV}\"/" \
-		-e '/rubyforge/ s:^:#:' \
-		-e "s#PKG_FILES#FileList[ \"lib/**/*\", \"bin/*\", \"test/**/*\", \"[A-Z]*\", \"Rakefile\", \"Gemfile\", \"html/**/*\"]#" Rakefile
-	if use !gsl; then
-		sed -e 's/$GSL = true/$GSL = false/' -i lib/${PN}/lsi.rb || die
-		rm test/lsi/lsi_test.rb || die
-	fi
-	# Remove failing test for now
-	rm test/extensions/word_hash_test.rb || die
-}
diff --git a/dev-ruby/classifier/metadata.xml b/dev-ruby/classifier/metadata.xml
deleted file mode 100644
index 04461dc7b70a..000000000000
--- a/dev-ruby/classifier/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>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">cardmagic/classifier</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/hike/Manifest b/dev-ruby/hike/Manifest
deleted file mode 100644
index c1359a7ebe42..000000000000
--- a/dev-ruby/hike/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hike-1.2.3.tgz 9010 BLAKE2B 1f413b0b11c0f562458aaa7b334a334d42afc706eb448a555534eb4021ef453a98f1ee05221ec9ac152d74e04ca543efb13a339b0b074354920e9dee4ee65b4f SHA512 0d7a35c0f9b4f5f1f99d4b2b753244cb712ebc24cc54b366c60ac6094a2ec693df86443e0b4499358cdd4f6411347ad80e0fc90b5fb7f4dd9b627832b645adcd
-DIST hike-2.1.2.tgz 9111 BLAKE2B 025e54e3348384d5a5d12d58014cea797a3cc5183450a2cda6cb7568406939f4437f8a574db25457840dd20a6264c5d0b6584702dbbed595f6984ba9f501c034 SHA512 fc05b6ec5676d5b6d12273688b0f98cd01784e201947293c5af92c637adcd9cd788fa9a696d6439efcc9097e540160fb96133dffd85289e498042acce8ca0c97
-EBUILD hike-1.2.3-r1.ebuild 721 BLAKE2B c0a7f666ccdf8bdd5ee8bbeca77561e39ec6dc250dfb5fecab80025c635328b82ec6e741b0d3b08df7bed6c1a1dec1381b7883716673fa4f4e4df7e908a829b4 SHA512 1e75e4eb8c80dcce370c53043d220bc5374aa9f2705fb7b24af21fbbe2228aa696c5dd1398e2513ec43f1c8916c2db7200dd74b67e78ec5ca50ecb72605f4886
-EBUILD hike-2.1.2.ebuild 707 BLAKE2B c4ba2f4f1229dc7ec5f928ff7e66a521f74748ce765192eebda3fbd544d42dd315e4febf905c84c18d281fb623237d85c218b4f373c52bad5e2554a642445ea0 SHA512 1d6ab22385ea085b53647423edd2d6beafd511fe886467a9fe2c4101e199b7813b15a34d226c45a4e5dc348c0db05c9416ba5b3478ac51be6dea821a6d542a3f
-MISC metadata.xml 342 BLAKE2B 2d306b1aefc0f9366ebadca5d80610660f5496f08e56ff8a274ddf697c047df6caf4dee3da960c5fe2698d06c57e6cccf4777d5b34ea215c4aea427feb37bc9b SHA512 dd5487fc10b2007c292d8d61bf67da2726f4b1af009c364935fe13caee59b55bf9440beb1a1f6e0810e130392db9f60360b0ef31fc4d6ab250bec344d536fd7c
diff --git a/dev-ruby/hike/hike-1.2.3-r1.ebuild b/dev-ruby/hike/hike-1.2.3-r1.ebuild
deleted file mode 100644
index 9f52891f5c56..000000000000
--- a/dev-ruby/hike/hike-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,25 +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 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hike is a Ruby library for finding files in a set of paths"
-HOMEPAGE="https://github.com/sstephenson/hike"
-LICENSE="MIT"
-SRC_URI="https://github.com/sstephenson/hike/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-each_ruby_test() {
-	${RUBY} -Ilib:test -S testrb-2 test || die
-}
diff --git a/dev-ruby/hike/hike-2.1.2.ebuild b/dev-ruby/hike/hike-2.1.2.ebuild
deleted file mode 100644
index 096102046e86..000000000000
--- a/dev-ruby/hike/hike-2.1.2.ebuild
+++ /dev/null
@@ -1,23 +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 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hike is a Ruby library for finding files in a set of paths"
-HOMEPAGE="https://github.com/sstephenson/hike"
-LICENSE="MIT"
-SRC_URI="https://github.com/sstephenson/hike/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="2"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/hike/metadata.xml b/dev-ruby/hike/metadata.xml
deleted file mode 100644
index e86074341d3d..000000000000
--- a/dev-ruby/hike/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>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">sstephenson/hike</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/launchy/Manifest b/dev-ruby/launchy/Manifest
index 5e974dae0604..d4b54e736f32 100644
--- a/dev-ruby/launchy/Manifest
+++ b/dev-ruby/launchy/Manifest
@@ -1,4 +1,4 @@
 AUX launchy-2.4.2-drop-failing-test.patch 1033 BLAKE2B 77de99bf447ca68eb16bc10300f9e8f37ecb65720d3726a423b4554e76599992fdb3396933ea689e52348780fddbdf1d9d4fa0c7e22d92efc6a72ac029bae168 SHA512 395fb705f490d06867eea7ee89fdd72b5b7c9dd472bb06b268804d0bd100aa08b99a840024a976bacf120776b44a878bd5b08e7a3fa18f6f2abe1ec2c58da649
 DIST launchy-2.4.3.gem 29184 BLAKE2B d6e8e26f37a811fc994ee762791ea9ddb424dc99d23790905f80416734677535aa8b2087eab233dc1535556c240f260c5995185e10642cd682bbe508e3e30654 SHA512 7c3e0377c9a310b2e7a4d1544b4790f6f959d24b6aba91660e979eb943f4bee641e0b5a44687b693ffe99304ceb96a9a6cf9fed142e231af01135bd2b73321d6
-EBUILD launchy-2.4.3-r2.ebuild 1094 BLAKE2B 48642fbc8380b64d492e5c5c016c223cf2b35c2428bbad20c747f05c53eee13b648e145df8df3f66b93ab611436a25d2cf744a0c458840df1cce6dc940465f89 SHA512 b7c3162dd4a0f728074b2d03e6c8de2000b92933fee0562a843a5e530c85abe797c3dbfc4e482ee84908ac2e57788831868f28dcb03d9dd1433fc77169a32157
+EBUILD launchy-2.4.3-r2.ebuild 1098 BLAKE2B 75dd785ed55971e0184afa0128dd38ef722fd3d30cb11ad0d490f370ea39ba0bc2153fc91c91c97ee21a6f19052b0e5ce89b6bb7a44381c2ba1f20325e508a64 SHA512 c954f1f045b0c18e25a204ddaa15e1f6e137b80cf1e0b7db0c91b87ddb5a8bc53aca0f0b919a8f6854520851187535329ffeb6f21544c05f147bad6155808c3a
 MISC metadata.xml 339 BLAKE2B c85b0f849da61909275e94498530be54787a75c970cc607b0f6ac006f67bafeaa459c7704a92a22622e63912fb07f186e3a6e743df8e34ade2d55f56e2c63225 SHA512 bef54e2c7dcd8eb6a6e353b29380cfc53e842a729b584b6a6f6cd423651f390fb8005941c18c005bece74b3de4e68a0201b59151970badf3280e479e9f5e9ec3
diff --git a/dev-ruby/launchy/launchy-2.4.3-r2.ebuild b/dev-ruby/launchy/launchy-2.4.3-r2.ebuild
index d59aa0a0f8e4..061b8cfc357f 100644
--- a/dev-ruby/launchy/launchy-2.4.3-r2.ebuild
+++ b/dev-ruby/launchy/launchy-2.4.3-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
 
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index cf0d4fe7788d..e745e4ecfe1f 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -2,8 +2,10 @@ DIST mocha-0.10.5.gem 73728 BLAKE2B 334bb5f3fb0f2248362f43bf2efaa879294fb46b2984
 DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11324a0574c707bea3219d51edb9ab40635378c16b46ad826ec7eff42434a27cd61113a6f40251fa2e6930 SHA512 918e45f2ee761c7dc399c7958e4d406f9e186c90f479fd01a421aa542944b47e9b2c5e938f4fc5292a7da345726447b2d47dc5f417e114201f8a4d9893c4d461
 DIST mocha-1.4.0.gem 92672 BLAKE2B 8b8640038da40f2577431630ffbc773f5a9474a3a872a5f6c26d53b41d2827da59f32f6c7abab78cbf491bb6d58cabe0834e4b1706869cedd1e72f116817537a SHA512 54953d815cddf52deccdddcebc9a9880fa2f14cab9f4ee1e164bfa3afe095d56b409312149341d1bf84fb336ed23512e7acce371135f8a2a1bb16f1de7acff1d
 DIST mocha-1.7.0.gem 96768 BLAKE2B d6b2f14bb1277473c3393b06e2f4830331bcf4f2d02fa918a006eeb65a340e1f8bf25e354910bff1cdc3abae9b98bd53de272c628cec7bb59e30c5b02dc8ffc6 SHA512 b3fd656523e6ec1eb81e941cd43fe402254b6b15a00cdb459a900c94df02bd20f7ca8aafc796e418c6ba3e3b71c5bdc74a97e380f1c106e2831e78d9aaa7887e
+DIST mocha-1.8.0.gem 223744 BLAKE2B 625f38d6ec53cbf549cbace873172b8511f2e6a2ccb5d7fd4133c3d9a67a8e5d55626fead7a70de363c8564b687530d3e0515ed7fc167a65091d9e17d89dde47 SHA512 b0abd6234f34dfd92d44019001e97914dff80ece5fbe2b53ccc91192f99f06a79f9c96cdb136b2a389a1a1b7038076fce688d8d8ee8645538d3c58f73e345fe4
 EBUILD mocha-0.10.5-r2.ebuild 1189 BLAKE2B e2f7ad7e9a1427076462906dd1a56dbca10d2de77aa5092a2249301319ed29b6fac9f563f5549dcdbafb82d1d062c1d25a9f25813f8006a24f75639551cea219 SHA512 6e2e346028954787b176dc3de5188c852cfa0231bc442b902059d014780011b52bf7d079b63e826d3da76efc87669b2cc74df9a983ad45417f153bbaa7e67bf3
 EBUILD mocha-0.14.0.ebuild 891 BLAKE2B b985c2344c88447f1ea966e5ba5d979acfb23bf754565476709b8ae2c46400d3f7beb86f6feaf05d8ce21d3e5577702bdc86c6ea762b5799e461f3822f0217c5 SHA512 d6020b9bd76a59d65d517a5abb52bf1502f05528255905c4d7ab29c544399f03efbc0365ac2ffb9b2801be579892f3e434242738487cf1d1c7cfcf5f861ad8d9
 EBUILD mocha-1.4.0.ebuild 861 BLAKE2B 577b11e5c25898995a4c746eafd1ee94759441a4a8a587294bc4e6dcaa47e124e880cbfc111cac87090d92a6158830245c41bb0e1d76fec24bdfebab1d472a53 SHA512 8a5b83231eb7e8d1a77eb4257121ef157b86c7fd08801d97f6ff483e03735f0179ce51e73a74b8ea232f037bcb711143cb663779358a616c89cba7bf608bb156
 EBUILD mocha-1.7.0.ebuild 881 BLAKE2B 6c4a23c2fde8e6ba217d09aeff94837bec6a2b8d2199d7e08e4f98f7ecc87167d2115b3aa42cd1092739e873cd054fc7bbcfef3516d0e26be4fd972e98a6b620 SHA512 eab51b5cb550081d3f2c9077a3a6f3e02372a0d8303c90642a443763a776a748dd17e6508d03b089e98a9e2a113ad5026b5d60d26d826883ae42900948a898bb
+EBUILD mocha-1.8.0.ebuild 875 BLAKE2B 78c98438d98d940b6d72d3d955e6262e063975096300e3b5b7d9fefefef2322300ecf8874e267ab6095ae01557f4c8eb397106f7c5f03b3bee1aa1b4393e5439 SHA512 a30ebaafa14aabd2cf70e38a90ce66d97211072a1a1a96c4d56131f3178de6554a88d97b9f82583eaeb803c4bd39a002cc993dd0d301bca27bcd81b9cdae305c
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/mocha/mocha-1.8.0.ebuild b/dev-ruby/mocha/mocha-1.8.0.ebuild
new file mode 100644
index 000000000000..6a986edc6390
--- /dev/null
+++ b/dev-ruby/mocha/mocha-1.8.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
+HOMEPAGE="https://mocha.jamesmead.org/"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
+
+ruby_add_rdepend "=dev-ruby/metaclass-0.0*"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
+}
+
+each_ruby_test() {
+	export MOCHA_NO_DOCS=true
+	each_fakegem_test
+}
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index 0c12c4307bd3..2a4563b95703 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -1,8 +1,6 @@
-DIST net-ssh-git-2.10.0.tgz 172885 BLAKE2B 6b5c9928191fe40afe289fc2639d12e56160522c85553cba13393347c8ef02bbe6206dbefc23b65c04980cf9761b2b40a364d8e3e13e4073950736cf53fbf480 SHA512 f66db6465667baf0c253868cc15aab3261675a8c15ca4b244c3cd587ae5e8b7a273959b97d5fc498ff1b19e1f06f51ea571573d243366a59ef56faf41c2ae347
 DIST net-ssh-git-4.2.0.tgz 197417 BLAKE2B 5714185d9b83d3010e6b9baa07ac541e9227379cbfecc3a506d870d8d9fa528f59b605df4ff02ae6bfc16893bfb22734395096a77fcbe19fb939ecc1a343a9b5 SHA512 0a3609590d797a8cb4732e8cf743606a4919f57475b6eb2447a3db0c28f1bd405804fdc47a4062e503acdd4b785a1de9794a6db433cabb884105166eff6a8c5b
 DIST net-ssh-git-5.0.2.tgz 206757 BLAKE2B ac9a317dc238f7e3e794e4d8fcccc063d5d34dbe2e50a142e701957ad5c754985523624e97ca0b7d5773d2fefc3f10f3d61b2976997abd29511cd3934ea0e0bd SHA512 6e96d4b3cb2f4f14aa046af72b70a5e3b218153db40dc64996ad0061ea89cc9ac0dc0510a4231734c7385c03436d4116dfe4c9ac4b313c9fc5b029fc8a6c04d6
 DIST net-ssh-git-5.1.0.tgz 208940 BLAKE2B f4661bb8d0071717d342521126c0b8a834ab7775b67ad21b3d381205fc74aa1bb39f0cb406f0b90815be13c430eb5f69af2a86fe10214ec8db7829425e9c0399 SHA512 49f8f749f5e711af8002c8eb281505eb249362d58f870aabe55e8043bb8d1e94b1428246bd488508b58ec2fe089aeaf46ef758625af0573201e2ae830846525d
-EBUILD net-ssh-2.10.0.ebuild 858 BLAKE2B c2780b2cdb45c313638ef427dbdfd588e121449df679d5f1b7423dc489964681cb440dd7e1b54bd5cc131eb9f40e8dae05095b82a3a73edb1dda884bec2dad3a SHA512 7b5630727ba7547c4a6f86e89547270064b77ec874eff574bb724ec8347994e3e4f38e01d1f981da67b187942e7cf648c09681d6a046b0a4a27fa623f2381087
 EBUILD net-ssh-4.2.0.ebuild 1104 BLAKE2B 556ce9b0f7f9ea235cc941523115a2993c9b5a49006dca84905ea5770dff126525e6143dc532bd27904cc2b4929fee68845bcd2137f307152e1988986d8a56a6 SHA512 e96ab8dac95646c95bc48216dc4872a3842571bc1c24eeb0bf4366159784468740292b6ecda68a59334137bef1e130942d06d0baab366e23703de4f0918483fb
 EBUILD net-ssh-5.0.2.ebuild 1029 BLAKE2B a7ea50d44f796f95ff8d1c093d3731d413a51dc87971f3ff347b563971a10af023db84d6a4d869cafe8968b7cb2288176e378431cfaca1945e17d4626d5c8933 SHA512 00c875a3d6ced5dcbeee64bf7e2674f9399eba003e2bd532ad43cab1285c40029e6eb0a6f5b3eda795aacd38d720203d52f7bb5c8fa7d6d3902aa38392fd626b
 EBUILD net-ssh-5.1.0.ebuild 1029 BLAKE2B a7ea50d44f796f95ff8d1c093d3731d413a51dc87971f3ff347b563971a10af023db84d6a4d869cafe8968b7cb2288176e378431cfaca1945e17d4626d5c8933 SHA512 00c875a3d6ced5dcbeee64bf7e2674f9399eba003e2bd532ad43cab1285c40029e6eb0a6f5b3eda795aacd38d720203d52f7bb5c8fa7d6d3902aa38392fd626b
diff --git a/dev-ruby/net-ssh/net-ssh-2.10.0.ebuild b/dev-ruby/net-ssh/net-ssh-2.10.0.ebuild
deleted file mode 100644
index 718cda0972f0..000000000000
--- a/dev-ruby/net-ssh/net-ssh-2.10.0.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
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-ssh"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="2.6"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend "virtual/ruby-ssl"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/test_all.rb || die "Tests failed."
-}
diff --git a/dev-ruby/pusher-client/Manifest b/dev-ruby/pusher-client/Manifest
index 33759087116e..3eccc0683f62 100644
--- a/dev-ruby/pusher-client/Manifest
+++ b/dev-ruby/pusher-client/Manifest
@@ -1,3 +1,3 @@
 DIST pusher-client-0.6.2.gem 138240 BLAKE2B d9692cd09bff5ac093e7f340d82676f57f299e669c86526a04dbef0ad6d33410647e4163f51c855284fe73aae82115dd959fc4bfedef246e384c98f09116a46b SHA512 1d4a81027f08065c840c89098d562787c73c0f39fa986152bf22ee43fb222b8a26782fc4be3cf01acb9a62c5237cccb8515d2bfc6c4a4d9d1dc53b853599a30d
-EBUILD pusher-client-0.6.2.ebuild 557 BLAKE2B 939c586f223995be5986a0173303b076e7367be7408a02914479d18b5645b7b1df1a6ce3b24dc2d8174c850cbb53a3351947f9f4102195e05eb3e33d3d85d2f5 SHA512 c4ca1e888f41c2a28462562a846b69f55131de82830061cd25494239d81f60820fa54b1718e56ecd491eb5e740da16bda2d1f49d8baa25037d001936f6859abc
+EBUILD pusher-client-0.6.2.ebuild 562 BLAKE2B 011e5574f8fdfa0dac54339ef9639f5567a7d646c283fe7076b38a598185e516b1058bf54e5b054e10bbe1157cb48133441f82d0d15174d0ced2ea92a4cea6de SHA512 6787c9de85bc60e6ed429e930217aa705a233f1337cb333888c7712f3f8ef4376b8fcc2b6e7dc73cddf366866fd7810852683be32cc84e90e86ca9ead93b2b2e
 MISC metadata.xml 354 BLAKE2B 8a8fedc2fd71f30ddfa79101a2f71d00a96ff1b7d4c06b0e2032fc66e948b5943f192951ae6c56ab552e6919dae4cc388fc0e13a07f634903e2f205e3181819a SHA512 46cd1f0d6caf0cd628dfc7d950b120f3644d93cc3174ec80399b134c1b3a091319abc5b853714a66cf4e4f283b5f762eaff83bc319f815246c4d7822074badd1
diff --git a/dev-ruby/pusher-client/pusher-client-0.6.2.ebuild b/dev-ruby/pusher-client/pusher-client-0.6.2.ebuild
index 76f70a68af86..c5cef72939f2 100644
--- a/dev-ruby/pusher-client/pusher-client-0.6.2.ebuild
+++ b/dev-ruby/pusher-client/pusher-client-0.6.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index d5d0f8710286..34b24b0774db 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,12 +1,10 @@
 DIST rails-4.2.11.gem 1476096 BLAKE2B 779111be1f18747c30b74f22f4b9ded1048d540197f82b1ef33201d114e3a052e1e0c8459d7757bba1ac2dc85932a3c601f6bfc84448d0f2e23d6a89c53a3569 SHA512 e3e035f0fc63058fd64c254a0b779699a28c558ad80fae374889a8ec1c21e1d90ebf9400832eb37e47ee75b38d46d8095455bf02a93b760732496bbb4c7597ff
-DIST rails-5.0.7.gem 6144 BLAKE2B 7fa6cd84e6ce8714ea051991403c098291cf6fb946e09cdb520cdf0fd38541b9e0720e28cf4d19ff5191ed7199d3ce68da6c1ca0640b5776ed7b8f0132e53a38 SHA512 3480d8e5aee024a22819fb40610d78a41c56b89195f432d35c086f519d7530655a2a77ea09a40eeba19764adf2a06401749e7f763f945ee87321d95dd94df67f
 DIST rails-5.1.6.1.gem 6656 BLAKE2B a83ba0fcc1209f712ef8225d74a2081e7fe852b20c0f3d01e12f1070164f89813ab55ad34ca2c9858bcb889636364b5f538c91fc26546c1cf4723f2304258fe1 SHA512 58d4e3b13a7588a0881f4c40ecac2c269ba0afee7a67fe800f3372cbe54f45b25f49c968867b365193c254c360bafcd95f6cddb941557226b8f81f74ec8b87a5
 DIST rails-5.2.0.gem 6656 BLAKE2B f436d571ba9bb3866ad0568d3514b46fecdc26019b2237b111089df9473ec9706e52aaa00a1d8787523847cd5bd2e6fc3f470257f347fb5f37ce293d570859e8 SHA512 323b82b0b6a8451d37097925299624814f54a1f7896563bb23d34df37a1d41bf1ee50164211569fd9859ed55a6323af13310f9ad267d130fd3341acd71275558
 DIST rails-5.2.1.1.gem 6656 BLAKE2B 08b08a8993ee4ad5e395da8ba59b46d896d926603a545f73aa3aacab8f59235867945ff1042511ddba7d568e0f0a5a80abd8c5d40b9dc9172bccb3c6731367dc SHA512 f7d87e722100c1bbea0eb77c8d3aa337a9359293d3f0f372611bb330904c935a997c15f07a28ca70587fbd1706b39de5b9ca9821512e6f34a1898f29d80772fd
 DIST rails-5.2.1.gem 6656 BLAKE2B 0ed8e5d0ccfd0d41d2574f0acf02ce67f068108780f4bff27ac1ac2c5f103ee3fbf566db92b85b3b590549837ec31c3f22ce1d11ecd24e64fe6fea692ad088d7 SHA512 1c90b91bfcd064f06e93a00e22e8a73f371390640ef4c59e5552ea802e68b2f1f04cc735aa618c7c7839d160df0e7175f60f1bd97c9ead4ad56393a7121db990
 DIST rails-5.2.2.gem 6656 BLAKE2B dca2be740c34c679ec18be460e78516391f91fa3c0cf348e582c26b3079e00aab86154dbe1cce3a01eb269202bbcf7fff5a7da20238c2018f96057a1fe67c247 SHA512 3777757c658a2d3775e709acdf41b5690e34900badddea6d4c0013bfcec86b75120d33a45ee9eff28b5a990a3304ef20061c9bebb9e557b53df69dd7311ed07e
 EBUILD rails-4.2.11.ebuild 1107 BLAKE2B b4f93f2ac7fbb95c2bf3d1530692ef07e81e07cce05872e9d11d63655de8411bf413daf5c906fd1cc4fd22a040df834d265ac60cfcbd657115e833278ca8b824 SHA512 3d87448452d0d70122e847f1c59f880f54e52fd35882a0ca73825c511121d70f4bcba104179849b979e74a943c1ca59eaa73c3414102f5cf7243c8cefa67bda6
-EBUILD rails-5.0.7.ebuild 1071 BLAKE2B b70df468058ba620fd44049ee714350e04450a15688ae8e5171bb5222b2e90346ba6b54cdf4cf89348844d923bc79e4158d9a0b40e3d1feb2bf965ece8a3d79c SHA512 cbdb54c6799b1b25dc3d927c332a6137f7106c5f982442cc407e119d96bc63d892cc884c0ac139ccee904c0d45ee92db0898f95a2d612a54a1005f295b2e55ae
 EBUILD rails-5.1.6.1.ebuild 1068 BLAKE2B 6d9717910eb65eb4ad98d45a8af392ebad1344468a434e81202b4bef685c6cf1854ef84a3cd74ea0ec64d9a538fd02b22a5fa796c42cab7e95d7179d5ddc2e07 SHA512 6c5329b9c29469714c093db46bf72ee6a1c837b9ac183792cd0eb71d2db83c6988b266058130b65c03950a44a724ec1fedb4aaab71fd5270b95dbe6ad01dd42d
 EBUILD rails-5.2.0.ebuild 1093 BLAKE2B 565cdf5ba187f011d2745d4a457c9199537b554547f0e99a1a20ebfdbd43123de7c7109bc3211e2ae912a08c3fb57a50da3697d230d96255059442386fe2cfb6 SHA512 3446b65c0940e5499760a5c08467ef709ea309ba6343e6d02bb42ac5fc139a8c204c0c41b6ecd7b09740c30e9ea27c750892b860f3c4750ece4511691a3112ef
 EBUILD rails-5.2.1.1.ebuild 1066 BLAKE2B 93c95f0f1e77d2d822a2ee8d624b0fc203dd4d7d9a4951d64b88adeafb775c93e329ed82f90f4c83a102eea4f1d2b79c8bec73f9274b61a0145c52adb26b6be3 SHA512 a29170896a3a67e4cf04e11d895efad7b1e2da256353bae71ce6b4fef6dff3d32c25d52bb4150c19e8a56d62cd0d7c0557de6e45b5faaa6bb0c6d290b2375cc1
diff --git a/dev-ruby/rails/rails-5.0.7.ebuild b/dev-ruby/rails/rails-5.0.7.ebuild
deleted file mode 100644
index d9de98a24596..000000000000
--- a/dev-ruby/rails/rails-5.0.7.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
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="http://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
-
-IUSE="+asset-pipeline"
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3 =dev-ruby/bundler-1*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-	asset-pipeline? (
-		dev-ruby/jquery-rails:*
-		>=dev-ruby/sass-rails-5.0:5.0
-		>=dev-ruby/uglifier-1.3.0:*
-		>=dev-ruby/coffee-rails-4.1.0:*
-	)"
-
-# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index f235ff0a800d..8ed849ed2265 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,12 +1,10 @@
 DIST rails-4.2.11.tgz 4080621 BLAKE2B 97f22f887255a1d8321d26040a9896cc87e0e7e50db208d3c0f96a74d926cfe9bb516641e06f7bfd92649b91427094f729d2d6b24df811ff0481c03950d3185b SHA512 df31ac9cff0b6b07113f6066b0459b40b7263356c40a722636091b75c7443691625153d8e2d7e01324e98321d757f67ba3b9318d4229a3c1a0cea5af65b6b470
-DIST rails-5.0.7.tgz 6051560 BLAKE2B d5090b2e6c3fb9b7ca460c7439a94d6633ab7bad3cef42ab23851b0127d6b8cf6a34eb3b967c7c9b7ba5bd1d10e483f4c76a60fc06772d567a258b237a449fe6 SHA512 c3f1b882f4679967597c7ecfa3469e8f1dc52f618d26324b292bcd0ed8c854ec93a7570e12cab8becfb9a7ce04bb7e08f9ad353d35f8cfb954bc2144bf093e55
 DIST rails-5.1.6.1.tgz 6143808 BLAKE2B 40949c4598af98e177bab19aea809a724135a56aaec66bfdfd820412794f548da195597461d5bd7b6e07bf60a5b6aee330a0a5fdf90bc0b0361b94a80d0684b4 SHA512 118798424ba249c3a7eed3e7174ed4a25d2fb81b8f521e165b2aef995956da7c085084be3dad9961e57e67a685ec3d527c3bfa91730d1053951cdd81b7e511ff
 DIST rails-5.2.0.tgz 9233349 BLAKE2B 8b237f7b039baed6d2a3f19d138f5985443d8543247b01ba316668052fede66820894e3f5ef76a953a4bdb54febecb6299692899556ea029ebfcbcebbaba9409 SHA512 0d7fdbc05a69f7a7b5ce612c0ec8e5dcd51ffb63891d97ca08036d07b3fb3267699dd4a209fd698e5eb2ca8f6c7f4539e86044c3bd15d0c614feda16892d3d85
 DIST rails-5.2.1.1.tgz 8795521 BLAKE2B 93b30ba7b9127d2fc4dae6c7e7884f0a4ab36805b440c37ca8e2b81a5ba2b9ccaa4d30e65599cfb036befc4ec58942d3eba71ba9683becb535e8a822d3a8422e SHA512 bd2c13f06d524a03547341acee3422a58a306a1c33a896073648e4ddcac296a8e397bd73fd5928dae1e66ba3b4a42ac4ea5f0a7cca1f73b2e773b8ece24a76d0
 DIST rails-5.2.1.tgz 8795554 BLAKE2B 712fba696aeb8600dcd3b031b84a7ec164aa4d8ec386576ff367d5d45b3effd48515c9b8ef36ea93642776220685a1d8eec6909f705e62a80a06cf151fc42b43 SHA512 4484981845f9bba8882db6b4d1e0c4600b54baeda5cf1825fda7cbbb04cfdcf35e4caa19355cb843d1b96fc67801f28902d79d763dae71446db515691a32742e
 DIST rails-5.2.2.tgz 8794009 BLAKE2B ee6af6990d6b3dc12171fa2a1baf0f975481dc31711ae2caed27b79d1c5b514d1959492c5cced5b0202b46fc18e4a8178703a91b5f1f65df4ea46f193e9d48d5 SHA512 ecca752baa52ee7f11ef21a919bbba370d9ca76a0b428305143e86ebabbd7218978cdeefc919bfb1c0e0e71fc555869dcf917bda219f89e7e41e17dfe983b792
 EBUILD railties-4.2.11.ebuild 1707 BLAKE2B 01900e40dff50c14f65a57243930d2a65e188232d4a5e962174ab5831f9ea30f8e66dc83b9585e09608aa25eababf6e8ef259489ccd9f2b6791bd96385210be9 SHA512 65d85da8304766cfa716b8b9e033a32e82006bc23fe3736c9ee7d833fb369f5c0f963f619f25935b31bd159c1079fd1af55479bf2bb6e348fd55a3a168056e97
-EBUILD railties-5.0.7.ebuild 1847 BLAKE2B cde912bbfe97eb8897785c6e7d1767b3ee6132bf2160c292f1c7e1dc9b273a09f67f5e807bc0801a685094ac11eb915b6a024550a3dc33746b5848089585eca6 SHA512 920393642215f96bf98b0d2ba3a18a5d323dd1cb109e9780f39e8de43d287b793d160c519f9d9cbc23cf031ace33fe283632d57941d8a30921fc0201bae54d2f
 EBUILD railties-5.1.6.1.ebuild 1660 BLAKE2B ad2f749dd2a2c39ef07aed406b1d72f873341498a2a06d943e35b4abf929b92d5210fe73c646f434a4b060b2d43de53195f3c1c287aaf14cbae0e0aa46e563e9 SHA512 015e94248877dbd61f6b94973733fff3e821bfb3c98380499c679282f1e96038499f35f7dfc3a81a993f7842ff944bd4c39e1ac888e776bdba776edae7c6a04e
 EBUILD railties-5.2.0.ebuild 1671 BLAKE2B cd775122965ad69f2f595b01d2d97b129ffeec30a5b2e91d50b750e11f52136f2df82453e6b0fca737a5bb0f2177061b4f13a7458ac84219066568bd2cc811cf SHA512 9e843354fa41e19161b989a102e3e2b7f4f2d50c90536edaadaf9276cd8f69a021566d381ff527c17174e945ff9940be54b4d82524be16fe4e79a4825c54bb52
 EBUILD railties-5.2.1.1.ebuild 1646 BLAKE2B 8accc21da45e4506d19271ccb3108eb71712c08b6ae9bc1ba14dcd5ea057a6ab3753bec20b965fd4048d5a785326eb979f259f4305d13079b86c61c38ecdcca2 SHA512 67cf467a128a3b66746baea6b6f76767c3db3106abf5771be42f8f7c7da5dcb7e34544cd4f5e45a07242a6040e2beab54bfef0be18dac249045d8db9e87f58f3
diff --git a/dev-ruby/railties/railties-5.0.7.ebuild b/dev-ruby/railties/railties-5.0.7.ebuild
deleted file mode 100644
index 82547a65b623..000000000000
--- a/dev-ruby/railties/railties-5.0.7.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
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.22"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	>=dev-ruby/thor-0.18.1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-
-	# Also allow rdoc 4.x
-	sed -i -e 's/~> 3.4/>= 3.4/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Also install rails in bin to let our binwrapper work
-	mkdir bin || die
-	cp -f exe/rails bin/ || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/rest-client/Manifest b/dev-ruby/rest-client/Manifest
index 272411d1762a..63fd11eee1e9 100644
--- a/dev-ruby/rest-client/Manifest
+++ b/dev-ruby/rest-client/Manifest
@@ -1,5 +1,3 @@
-DIST rest-client-1.8.0.gem 124928 BLAKE2B e7ec09b6d91b1bb97f0a6ab9add98c696e5b2b0dbdd08b3bdd7e6ec9ff1b07dd356d4f3a84a485c7c9be58dd389b73920bfbf28d8d1e22ee3bf2f9f618bc28bd SHA512 d4c03b2d2807ae963b116e8c977411305b55836e4129b18ce2e88ea5795838c448bece151f6b57aa03920ea21d9120835159a7e9c4bc5c9998beb3705d1f2bfd
 DIST rest-client-2.0.2.gem 149504 BLAKE2B 839003255545ad8d67b0fd896f56b628d647a90fdf9eaf4e27f6c5d0179f15a1c17683e81ff7f288ffac55dcd523f5b01b4217a277b6c260bf45df8cef3998e2 SHA512 c132518a9ff0029e79826cf90de442b01f6f422b464e04914947c2f757cb7046b96c915f0248a82172f7980519fa9fe5f7bcb9dcfe28889abc62dbb48cee1030
-EBUILD rest-client-1.8.0-r3.ebuild 794 BLAKE2B d3efc607838448cf2bc2a28aaeb25e8173a98a05f9dc550c05e73c54ee5f9e006c997386b83bbd8aa8514213c09fefa26a11c5063fb338f805e847fc947904eb SHA512 7bc7ded2dd6b63e012bd20135a5305810d17dbf61698bd4e53c4a210b7017f5b2615cfd264baef617d9a7df72194ee08e26dbbb310ebf8f3476879c10732f8c5
 EBUILD rest-client-2.0.2.ebuild 872 BLAKE2B c1ac8c5aacf30599e6a94070a4259ce11fe01d5d5958e55513a20b40df7c80937885062085cc51e22b28c156d86b87b0ea240d6ea1a4c1d016bbea8802938a98 SHA512 29a78a9088f88a119b118805df52cf5a8d6644ea42f68caa2f5bc8d52d3bc594e1e28a815d0aadc362de4a4a530a67f7c7897e4570c8fc779009fe8f8379b460
 MISC metadata.xml 348 BLAKE2B fe9d706faa604067ae6a773bcb6f1738aea6003905ba97c7d1b2c01847013a71a7e6293a4e0eb01371ec70fbc6d62ffd2220c8d63f0741d9d53a5517b817bbc0 SHA512 333b578a89b557f43afab3b52f1e14cc9ecc4985c2909f046c9dbb9f9e333ad9ad7ce30af72141348f6205fa3b9e213143974e05aa8cb269ff17712c0fce5757
diff --git a/dev-ruby/rest-client/rest-client-1.8.0-r3.ebuild b/dev-ruby/rest-client/rest-client-1.8.0-r3.ebuild
deleted file mode 100644
index 5a08972d49c6..000000000000
--- a/dev-ruby/rest-client/rest-client-1.8.0-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="history.md README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple Simple HTTP and REST client for Ruby"
-HOMEPAGE="https://github.com/archiloque/rest-client"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/webmock )"
-
-ruby_add_rdepend "
-	>=dev-ruby/http-cookie-1.0.2:0
-	>=dev-ruby/mime-types-1.16
-	>=dev-ruby/netrc-0.7:0"
-
-all_ruby_prepare() {
-	sed -e '/bundler/I s:^:#:' \
-		-e '/namespace :windows/,/^end/ s:^:#:' -i Rakefile || die
-
-	# Remove spec that requires network access.
-	rm spec/integration/request_spec.rb || die
-}
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index a8c30ec3dcfc..1c0bacc64414 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -3,5 +3,5 @@ DIST tilt-2.0.8.gem 54784 BLAKE2B 14b067227a1c81060b4627d39fadcae00300fa30c3b474
 DIST tilt-2.0.9.gem 55296 BLAKE2B dd181295d2317ef591e9b89a0a4cf29680a05403c89c33680f563459ebbfc675bfaef14c864f8c8834103fc2ea069b33dc928f2b804d911eec21b09427f7c619 SHA512 522b2b40ca1eefc7df66cb421c66734699a2ffb1e7d1797181c2718f7ca018d3376c1a2b3617b5d3549115af69108db4c3c4632e2682329d5baf24bfdae92b42
 EBUILD tilt-2.0.5.ebuild 1476 BLAKE2B 06c6e022c0a989f69995a62e893b0a4abd25f03ed9dc5d8daaaa8a6f02aa9856ede7e4e6e49624f88a0a6a11cf45ba27e99b3b4576fbe6a1a0dead5440d787db SHA512 89e0fcaf8fa663e5868f36b2b85192b0922e27ca0c9a3c82ced87c8b31d8d456dc994f67304a2c2908e07062ee225527cbef2c79d83a3e7fbe3b865e875353bb
 EBUILD tilt-2.0.8.ebuild 1459 BLAKE2B 249675a6168a130385e08d0bf51760b99c53b63b39a61a3d800c3c0e11ddbcdca605f4f9d615b42da6611374d51f9cd2ba9f1c62d55e5087a09ff72570dbc0f0 SHA512 b7c940a530b0a7fd6471c868637da36434f51986997ad9e044ad1f610c72f6e8b1028a9ce984d3ef3d61473c45348eddf95928149792ae92c7f8b7b86b0eeebc
-EBUILD tilt-2.0.9.ebuild 1449 BLAKE2B 4c543ad860e0b43a1497e2ddc5f520100a693fc9a48d5a4c50eafe981d4bb68634056536fab80a9675c2a9354c49e7ee2d2c7b0ba11b464024f082140e0ce813 SHA512 695acfd1de9b445b98da7c5849fabf6455e979de664b88b80c364bd04ff12dccc69650718c7ec53d4e42f030639d1ec5d3b76279f98d90b743242e6279c0364d
+EBUILD tilt-2.0.9.ebuild 1436 BLAKE2B 3cad9af19343b674c3453bb6dd51c6ec9a1cc8384e882faf6e81f39300e359e422c9720431d383143b1426af6f61fd213a9b10774f52e696c6eaccf97fb3956b SHA512 c5fff48391c14735b8ef0016549a4ee13bc79a4df7ab10e29974aec7a0262321fb770065c0d0408b0b881ccf20ee882cd867c5f665e360ee301aeb23d91f4512
 MISC metadata.xml 339 BLAKE2B d8712c61994758c250248bbd14842a7b64d7808008e3d18fac9330bdc03dcbc6e721ffbb2cb813dea148036bcc40a60c4d8b1588b937a02712eb65c312ddb2db SHA512 f9ee61c88fa51f3fed6864d91c8f77bdcb492befce86f260a49faf141d6c11fc4563e57e1b35511571ec02a41cdb8f2111bb7ee76474d1bc65d81bbace15b730
diff --git a/dev-ruby/tilt/tilt-2.0.9.ebuild b/dev-ruby/tilt/tilt-2.0.9.ebuild
index efb26b7ad062..7c15d083a41f 100644
--- a/dev-ruby/tilt/tilt-2.0.9.ebuild
+++ b/dev-ruby/tilt/tilt-2.0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/TEMPLATES.md"
@@ -22,7 +22,6 @@ IUSE=""
 # are optional for the test suite, and we don't want to depend on all of
 # them to faciliate keywording and stabling.
 ruby_add_bdepend "test? (
-	dev-ruby/bluecloth
 	dev-ruby/coffee-script
 	dev-ruby/erubis
 	dev-ruby/nokogiri
diff --git a/dev-ruby/timers/Manifest b/dev-ruby/timers/Manifest
index bfd6904734f0..58c31549f6d6 100644
--- a/dev-ruby/timers/Manifest
+++ b/dev-ruby/timers/Manifest
@@ -1,5 +1,5 @@
 DIST timers-4.1.2.gem 15360 BLAKE2B 2480b6051825e26c9c30418e4acd7f9d8d0173d21038349ff16c086a2712eff7e9349720d270ed6505d8f90b14fc4dc99cf06d948922a222196d338b7933b5a8 SHA512 8c43f6ab09b918fc047056de20e85371929cd6841d7e26dedf54d565585eba040e23cef83c8747eb0ec43df8c9d9cf5915b5ea0ac6f6d551a0b086de3a9f3499
 DIST timers-4.2.0.gem 14848 BLAKE2B 0d3c1b70e6b4dade1664eac6951dfa1ff876098747d2f6eab21a2dff2f334cd614ac2c73e0651b93e92b3850c7933445a14bc4f43b50adbf1895b49c05d9507d SHA512 c5516c45e47bcd35bb5f16be0ddb31a2b1370bf06ee833c50b3121a7c36437fb418c58986b0d71979cd01af47bceb1ccd2ff50b1472592868175c4271c85e15c
 EBUILD timers-4.1.2.ebuild 799 BLAKE2B 7987723613746413a08b27ab26bf1905df37aeac417cfc6fd138759adfffc8cd2f0826153bc982c17613e5b4cda947d8527ea8f7b19dfea7a3732cdefcfc07fc SHA512 9ad952a071e71579a131d97af99e2b3b55db6a640eb412d079aceb5695fecf324701e7dfed7776c5d7e29a8283f3cb74f1ec05fa2137c97ad5cb06fa92abcfad
-EBUILD timers-4.2.0.ebuild 967 BLAKE2B f730e43889597b3e4f9ccd7ac1a3c17470e202ab25bd652430c51514a03f448a40fa6e15b71e4302bec8730788fd15266a30f67a9ac2bda6cd1a128c5b781ee7 SHA512 d763c67a5498940cd442b00c3df19fa076682eb31c9eb6c31f4efcb0cdf0abb5a59cbdba0c3cab752d58e0d9e4eaa171292163539cad2b249993eefcc6aaabf6
+EBUILD timers-4.2.0.ebuild 937 BLAKE2B f4036237d491ccf5b15e976b46bd9fd977e9f1f4213c3b6160f817410f35e71a05b623cd68e9a5a4b7b80b0d202075e45112210fcf853706f113d6c9442432cb SHA512 1abd084f2571c4279a7dba710f5a1f98350902c8a99069d2645f0d8a2ef9be216871cbbd2b69214c354ccb63b1c005b389c2efdc3b184e00d3f3ddc809d49022
 MISC metadata.xml 341 BLAKE2B dfe2c9228e7b666d6b7acb9d9f0cdaa70263a6d5960ecbb144699e62c94ded1b613a8d22f82e5125f6a2e954901a65da57bd432823d922d17164e273b809d8a9 SHA512 b863e101e06e7a8827cd6166688dbfdf77c5bc84203294d0ab63315fe5b5b03fe1898d02b9f219bbbb3f3cddd3d5185c34d9e4079bd993631cc849eae9ac9be1
diff --git a/dev-ruby/timers/timers-4.2.0.ebuild b/dev-ruby/timers/timers-4.2.0.ebuild
index 25acc7e22960..0af0501f6ee2 100644
--- a/dev-ruby/timers/timers-4.2.0.ebuild
+++ b/dev-ruby/timers/timers-4.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -19,8 +19,6 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_rdepend "dev-ruby/hitimes"
-
 all_ruby_prepare() {
 	rm Gemfile || die
 	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
diff --git a/dev-ruby/tokyocabinet/Manifest b/dev-ruby/tokyocabinet/Manifest
index 049e6e8c6a3a..55e53489fcff 100644
--- a/dev-ruby/tokyocabinet/Manifest
+++ b/dev-ruby/tokyocabinet/Manifest
@@ -1,3 +1,3 @@
 DIST tokyocabinet-1.32.0.gem 18944 BLAKE2B d55ebba43bfb904dfe2b18bc0c22e92b30ced4cdbda8025f7e4d9088da03a2c8486f210473bd05be13fa8d8448830a8f11fc9dc9c34b9803514fd8fc5cce984c SHA512 274a72e166bfb776b66379f587a141c8d0407dec7aa17bcd2e1ce2a401784f52433e72bc356140f69dcca651351edb22d5c9da6fec09b1b1fcfd53cb5af666f3
-EBUILD tokyocabinet-1.32.0.ebuild 582 BLAKE2B 64fa40aa38e17a6cbea8b87fa09ea1940e220b6d42033456dd825406624aab3c9e316d545d6c51e5f3ed407810439487291c899cb5414c268d82109e9c621ae5 SHA512 ec4789846e6bceb532766cfe2f8f653f7074b1121dc2cff754e3ebb5d31c198e4560b1e898cc6f3e27f966f2270112275062db4f17eff41c705f1d787e8af9bd
+EBUILD tokyocabinet-1.32.0.ebuild 579 BLAKE2B c2bbe4bdb0d3d596240b30cd7fc14b9a90e98429932917050dd3a18615bf03279773c69f6f68a03a86cb882ae87f8a2eaf02e5ab41abd89572bf6f312371dbd9 SHA512 1b78c8e0e98bf648dd8823c5351cae1310cc0274438582a7468743c9c0782880edaed76ae07d4a005372fc3ea12474ba1b94c5c00729f7bdc79ddc0d2f65ecc1
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
index 0d9f0771410b..684621f05a57 100644
--- a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
+++ b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/tomlrb/Manifest b/dev-ruby/tomlrb/Manifest
index d219406f2ded..62ac3298d0ab 100644
--- a/dev-ruby/tomlrb/Manifest
+++ b/dev-ruby/tomlrb/Manifest
@@ -1,5 +1,5 @@
 DIST tomlrb-1.2.6.tar.gz 15642 BLAKE2B 4f9d19fd66a88a049360f6d3636fcaf6caa7164149a543db5a162ee48c8fb301a4a884dc77d183a9c9f190d6f9e9e92bca66179c250f240d7014791f11f7a600 SHA512 ada1d801ceda014d4ef9d3c973a14b970ad592323c259dfe0e851c00b554551d59010bb65ee64f8acbf5521132d2fdb4de14306c1a2dd6bf5307035bca100fcf
 DIST tomlrb-1.2.8.tar.gz 15897 BLAKE2B 536eaf3a2cb2b7e54e91aac28032b95900f53c0c9b10fb48129bd963e0efab1711848cefeb20c5df3bb5ea367dc375188db57b79990daf3e62f8b781477ea30e SHA512 a6f8a7ae5db02a8efca8ae75fc1a680d26016d221ec238e4f5ecd59bead4efff7cfe14f541a0be17ea6790699aeb7621d9a4d1b7e38a40828f8f66424fc9fb94
 EBUILD tomlrb-1.2.6.ebuild 581 BLAKE2B 61059027118b812396281212148a6afbc0fa38a2640d6a0497e9afe166e50d23b7bf6e579349f0c38ae289dcc127e74b8221c937238a86c22aca5a4e82fad79c SHA512 49d9b31b9fd777c564ba72470bc757b8c8223dfd75684b90e130d8e75fb248fae1ecf465ea08ff4e16d83f31bcaac6d866e22797bd2549809f2aab68544a18cb
-EBUILD tomlrb-1.2.8.ebuild 578 BLAKE2B caf5a5b3c38b16e41b0f12cdea41f7c72ab0a4f16a035fbe08b855f16035587d95d2e4c5e46ceccd694c70bc3089828ea51aa9204c21a2de21b11130fec4181f SHA512 365c2498d5927ec8cde416ac894ba2c0604954a76c3f589a7454e9180901ac7187e778c89bc7789915eff2995fb66b7434d2519a773e0ebbbcc82ef6d645b003
+EBUILD tomlrb-1.2.8.ebuild 585 BLAKE2B 24422dac80cb5b003793735d85c73af8d2067c60685c9994f9205e8bee75513d44072247d650fc8e1575cd78c2ae5eb8a1396023c323c4c7d540c620d917952e SHA512 1c1aaecfbfc24302d7598afe84d81215f3b83fd28f665b980fa9d2713d79a2c35123934126834150740ee07cba76c855a3439fff855c4c68c95aeb27fd98b072
 MISC metadata.xml 341 BLAKE2B c6a4acddf424e345fc8c0b852b8be8ebf595948ff538a2b6367aed370499c9b4caa963c3f077189c7cc10946bc32e71cf3cb8e4fe9ea7a274f888cb47880cf7d SHA512 3316b67122f7447128fb5aabb66af7f0fd1d7d3d896d8e27708c345297d41aee16383c6012ca3c6b3eb8e2ec78a6343b68cd082ab2db4fb54a5b09d10a39a3b2
diff --git a/dev-ruby/tomlrb/tomlrb-1.2.8.ebuild b/dev-ruby/tomlrb/tomlrb-1.2.8.ebuild
index 19408d011cad..426771e5fc6c 100644
--- a/dev-ruby/tomlrb/tomlrb-1.2.8.ebuild
+++ b/dev-ruby/tomlrb/tomlrb-1.2.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 6c283f734ea7..e76802f284dc 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index f7d0e8459b0d..37ea330b1241 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,6 +1,6 @@
 AUX cmocka-1.1.3-fix-doxygen.patch 1138 BLAKE2B 44ded90b04bcc9eae14f7332a840713767106039d6916479c8d0cfe502ccff60c08011be1c711dcdb827a391deb7976706d37c2ed3d3b3941370fa6b6481cc24 SHA512 63c00e774c3078ba784685887cd46790375b37bb957800951ecd1a82f5d2f29ec7c0fe77da8f4c7e9ff0a7860e801598b9dd231d43adcd460ca1d1c68a7a3f05
 DIST cmocka-1.1.1.tar.xz 85648 BLAKE2B de888cb0dace6ee598bbdf4521b909c7fd2e02702829793efd7bac5cebd581cfb5cc79015b39f33be0ad3af218575f47abf6b2b6a146dc5e21a491442fa557ff SHA512 801c4a3e1bb9047241b1cb5a90c1cbdee1b0aff5e3d0a84ec8b2dbaee79274618c24fbe5e9fedbf0b3ee18c6c98b55d93e135d037ac33ab872edc7665af41577
 DIST cmocka-1.1.3.tar.xz 78744 BLAKE2B 5043a496afab08837a73c2e0ff9c9b3c3880a2fd394a768b1f8b51d2fec517a5527e93b7e660f8dcc73af79aaf88e224f4e2869c7e31540f8e54c76481905ff6 SHA512 b1a2ce72234256d653eebf95f8744a34525b9027e1ecf6552e1620c83a4bdda8b5674b748cc5fd14abada1e374829e2e7f0bcab0b1c8d6c3b7d9b7ec474b6ed3
-EBUILD cmocka-1.1.1.ebuild 1099 BLAKE2B 52977ce6645176f20b7c1359e6f34f2cae15f815f4af86f520a4c6174e8e364f081fdbe3ec6f5bab78897bed97319df95d3ae7e5f922de19a6d3eb6a532b5e7d SHA512 367a29b47190f086a336a774450b59a18e762fa2090ce1bab742adc83e6f8e114a2b31ec89c75b12f6acb90d97d93cf80edd64c4cb6e32a05b8a5885ee63d8e6
+EBUILD cmocka-1.1.1.ebuild 1095 BLAKE2B 4f7d129d14ceed9431bb912ee006c7bb5cb5b553a092db59e4f0c4db322719795c87bd4bbf55e8828a3fc3b690e7dd6b62fd9c7af2d93ac0a7623381cdb2545c SHA512 25c81f57cee7f851e84cdece68206b5fcd28604698622037f900438a5a740312928dbd75417b4b112759ed1f8f5fb7aeece936b0b7bfc63c5221016256f5996d
 EBUILD cmocka-1.1.3.ebuild 1157 BLAKE2B 608ba23220624edb55ab18552ab34bbf434ef7d0eefe7988e38af37baa52fbf391c81e23b017d2f9cea939c3e1ffc17a3fb076e20bbf54de1fff2ca8125745dc SHA512 3b45a507eb49c1180169846f4eea24bbf38ba0091ebc26c4d89422eafc2c3f5641cfd5189e97110f7e77666ceb1d05b6956bd935947d737de38bda8a153b9dad
 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 41a99bde71d1..82d5e18c4b88 100644
--- a/dev-util/cmocka/cmocka-1.1.1.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index b1185c81e99b..8f75ca334b79 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -5,6 +5,6 @@ DIST cppcheck-1.85.tar.gz 2150637 BLAKE2B 73a1d4e1fb0770103c8163f35b9e710a586356
 DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B 8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001 SHA512 59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655
 EBUILD cppcheck-1.81.ebuild 2199 BLAKE2B 1eb2f1a4a41981bb77cbb125baca20ced0c3cbbaab514fba64183780f80dfb148cf6c84a4471c20f276a11a79954b52adf7f0d3861e172ec2eea32440b14470d SHA512 b62076fa8e84ddf38a61ed396fab9d4ee91cdc668e8b9ad8ede52f8f7e8451e3e8d38293adb221585baad7caf2ea810dd8add22ce200b9bda499aaf71495a581
 EBUILD cppcheck-1.85.ebuild 2342 BLAKE2B 10d7a73365ce28ca07efb5f7af20dfd80fa9b2e0394c22715a223c965dae227c68a5b837d8f9eb6517da03b943d768dbce32462dd51b3cbb8c34e71a5ef5a80b SHA512 154ef48eaa5bd91d3efadd39e2c44df88b4f10b29ce365bbac256d1c1f8ec68020fc952aac7354d56e3a5f52e5a8dd9ecce57a1b771c51eb22905ed9f646d195
-EBUILD cppcheck-1.86.ebuild 2339 BLAKE2B 453ea3e5775928f7919e3528f9b4d15ebee3e91d20c6d0322c686205ce47f724ee02be5ea91c6b4a2c8b08cd3cd4c47c60c268898f7b2676ee8f095ebc1c0fc1 SHA512 6f8f66ceaa041b1bd722d133504a814ebfeea6c5217ae3faaa1a2d17f0e023c36b776e8651ea9a57f2016e8650c0fa7d7382f6cf692d0bf60d0f84f455f4457a
+EBUILD cppcheck-1.86.ebuild 2338 BLAKE2B 947fb16aa205056962eaa1f6075ad0f6fe1517422fa40dc22e030333a159a7724f62bf01a2c3d335972318b3a2176c0114f97aadafb4546bd6b5ee07fd5fff1c SHA512 1452020f80f9baa07e08793f45b7186938877f033a74ff290760005f671117acd21a2a8e03a6725e6669a8b7e22ca4659f56bf8aa0b90bd570c61f20053bf1b0
 EBUILD cppcheck-9999.ebuild 2276 BLAKE2B fae2869f37c66579e943a6d9ba6cf76fe8cee7fff3da469b0a56b2bcd04d36fe1fbc9054642f2e3cfd5f2a4cba6de8fc9fe1000bacd327e27d8909fe1396d2b9 SHA512 71f7c9dc55fda1199755f4826c4d070abb52b4e9f7bb090fbb9801dfaf37d3c54fb480e32e674b67dc6089a4a6a0f58df00cd26c2447f57787fee3f912fe92d3
 MISC metadata.xml 321 BLAKE2B d5a81f7f1cafc279c08bc120e0feef7d74e2aa5f791a0c11df2a55738b18e35a4eac03f508501ffaf82e23c6f14aae441d2861a7b62bc5a3d8801941aa391b12 SHA512 c28c3db16b406dce013d82f8745530f7970a03738f89b418b0fae2a6cf0056dad078b77d5acf976403efa71315a33eccc8ab5973aa04512c41cab6c4e9f6ad79
diff --git a/dev-util/cppcheck/cppcheck-1.86.ebuild b/dev-util/cppcheck/cppcheck-1.86.ebuild
index 1bdbc10acd3f..1e364b3e5fbe 100644
--- a/dev-util/cppcheck/cppcheck-1.86.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.86.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 hppa ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc64 sparc x86"
 IUSE="htmlreport pcre qt5"
 
 RDEPEND="
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index bc401bf4b768..9911bb3691b7 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,8 +1,8 @@
 DIST debootstrap_1.0.111.tar.gz 75503 BLAKE2B 96489f3ea8af07b00c685b7454ea255354ea8c08e01ded40a14e9431287c6b7f347cb0960107588ecb583ddac675dd0cb92cfb876d08f91436e0015bbd5b4504 SHA512 554ad9c1b5426dcb9e1d89fff35d08c1048beabb882362b1d0b86eef76169c0fc72ccaa235717614abbacc739443dc4c8dd84119ee4cf186aa5b8f2f3cfe713b
-DIST debootstrap_1.0.112.tar.gz 75438 BLAKE2B adc84e3e97e4d592a714347e4a41ef190906e25635c179dca2bd4012e486e701a74f34ac299db7c1f08e6c78d92b8cee3b28dd151cf81c501ed412dbf9dc800c SHA512 67dcf401ffc3c0e4698d351dbb9a2b5acbee40bc810b0c7b46eb2410fbac7597662fde3ac03905e6914bde7418de6b5b93d17c98fa8a60a1aed1a3e322b35efe
+DIST debootstrap_1.0.114.tar.gz 75613 BLAKE2B e080ed62bceb4a37b5340357160f8364ee12377f6b0b0fc7ca517d786760061f8091dba4040984b6fc4d6a9b9c50639e851e04db2d8c1ed5a7dfc60e306d9188 SHA512 3eb6c3d50a403c6edde229a2da3840117f603e3e9c211f89c8b1aa759bdcf8001b5f115ddcd345601087886b6ee838972f377f3f244cf26879ca87445d2a895a
 DIST debootstrap_1.0.89.tar.gz 69020 BLAKE2B 9175d0936b6c9a28a29ee1b24bd835c41aaf807bc24a029201aaa45d07789206ee06e38b0a70c1e507ab448a3ec9c0fded2838bfb868334270b5159b34cbe9eb SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
 EBUILD debootstrap-1.0.111.ebuild 1198 BLAKE2B c9f7add824f8c5b8e765dcbb7cd8d1ae456f3308673da0b5a0e58e0edfd09314e5e38d28f3cf44dbab3a4b1ebee17459a542e1a50b31fa6fea39928219b76d05 SHA512 557b46429de974712fceb1012c6887bb7b4085588caeada14d20b472c340f6ee23924d1ba3e8cffc874ad2b3e8eb94e41de33bdb786a4db5b8e2d540f1291c18
-EBUILD debootstrap-1.0.112.ebuild 1179 BLAKE2B 481b0f80142e00e44ded4c051b4370f6d3ee36586346ff143efa42db547895cd507b98764ebc4db9eccc7cfbeb1b3596bf5c46c174f82cfb007732535b7ea1fa SHA512 0fd5460c8744da66aa94bfcef8e5a9f72990733baa72df714fbb52d9b4916bd00195ee402d7948fc687de5c8bd776fdca9bd02aadbab828bdcb29913a30325c5
+EBUILD debootstrap-1.0.114.ebuild 1198 BLAKE2B bae17c6b5280b0980acec1796b4d3974f7dc8b4be709642379cb53eeea1d9dc98de059109ab30501ab0510e617af9c2d467a1aef01114af1b71be1134e06b868 SHA512 1f9a40f3fd3a275da0184488833e3161fc017eaf439aed8a50b2c6a14ffa8218e0ab1ad90d0094fbec5f46f712a0b150a26abfbe774e3a2905ccab025af9f1c0
 EBUILD debootstrap-1.0.89.ebuild 1193 BLAKE2B cc444d24b614d76a8e57d1cb9fbadf86c2d541d3426fd68e75306bce4e4326905200a46a580c355e38cf3ebf45fd74c02325a36123abe193c6d37213ffe15cea SHA512 495eb8eaaee17ee6766b6e9ab5a6021c055be48cd2798baab428ff98ce4ee72171714d39f28e1a8d6a983677a1a849a925958a469fe18e05d40fd4a5cb163b7a
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.112.ebuild b/dev-util/debootstrap/debootstrap-1.0.114.ebuild
similarity index 95%
rename from dev-util/debootstrap/debootstrap-1.0.112.ebuild
rename to dev-util/debootstrap/debootstrap-1.0.114.ebuild
index 6ace46fd199f..32d6ffccafb9 100644
--- a/dev-util/debootstrap/debootstrap-1.0.112.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.114.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,6 +19,7 @@ RDEPEND="
 	sys-devel/binutils
 "
 DOCS=( TODO debian/changelog )
+S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${PN}_${PV}.tar.gz
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 724a31325985..e53022e4d634 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,6 +1,6 @@
 DIST glslang-7.10.2984.tar.gz 2439082 BLAKE2B f736f0e1c7be39531360de97d0bfb64681fee32dfd324d48082ff286b0a0355f313fe71ddcbac380e48213ba5433e4d0a95fa65a7f0f99c3cdef603e9722ad73 SHA512 4b96ee59745f4ba91e8e89a9a926e93f00db11dba9c74c4997efae5c9252c4e04a0a2cad0c6b8fc2dcbf7d690887486ee59db930628f3284545f89d3d7a3293c
 DIST glslang-7.9.2888.tar.gz 2370459 BLAKE2B 9dc5550dce1fd718a8050cec81ad94195b19cc36cc4321fe5def48051dd66de4f9c651b6c34a7363701b52afba9f8c6cd4c2264f38416bc911fd2dcdf5a88ca4 SHA512 9a067a5006596bf61cd20f09173e2d22db37a10413bba1b1bb6e5ad3ecf46701786977961e2da8bfa32b19ccb2cc0a04d765f65ae01b80148e9b3f52dbfa8737
-EBUILD glslang-7.10.2984.ebuild 498 BLAKE2B 35e49b22f515ae046d0f135075910572094af310007251bf7c4d31a262953a172c64419859dd60e8159935bf5578c1d2c8d79c8600332e0787f971d7eb489548 SHA512 a8a7cc0b63bdc91a3f36a50cf4518f44435f90855a9e3c41226b75126bd169cdc712b4a515d7010a646d2cf9f739b43e2887713e018adac26fa745ecda1deb4d
+EBUILD glslang-7.10.2984.ebuild 497 BLAKE2B 54c82fca49e1f7384efb55844e06ca04f35cbb5a6fb90ddc5a9c410a493583c5c2b683f8d9fefcef9cc0079f459c4899cd97cd86d7b16c38ecb465c5faba0d68 SHA512 29aba720c137737bf5b5b5f71a6ab50412af9808f7b9932ba4ed7341cc6088372d6fa161f50f98f753126ca18c54aab4877427de1b518966fd514c11bcb42b07
 EBUILD glslang-7.9.2888.ebuild 500 BLAKE2B 024680e8b2825053fa6a451db25f29ba89e3722f17efbf656122e6374316254799432a911afbf0e444e7a287097dce7901887771e870c0a1e0851439fe0a0c53 SHA512 2cec8ba89e087df453109f240c3b29deaf01c791ef59b167637521cae5a06c18a24f54ba79781ac862c18e793ba2dbb91fc24f14f0b5b86ff219ee7564bca610
 EBUILD glslang-9999.ebuild 418 BLAKE2B 43bc0590620b8b5f35703369d49aa19b54883e7fcbb4c7953e79bd7fb9a1e65277c35c3f227823707bf2ab87608b6ffa07b9d0c2a732d70873155f5bc5d0495f SHA512 00a9eac76b47c375c755424814315e9227f235f7255945dc3be69c7049d4ddb7acf3dd97ab4f4a47ab080a688b941d79119374034292864c6e8b047c888fb662
 MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
diff --git a/dev-util/glslang/glslang-7.10.2984.ebuild b/dev-util/glslang/glslang-7.10.2984.ebuild
index d4e70d8b409c..72965c4eb218 100644
--- a/dev-util/glslang/glslang-7.10.2984.ebuild
+++ b/dev-util/glslang/glslang-7.10.2984.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit cmake-multilib cmake-utils vcs-snapshot
 
 SNAPSHOT_COMMIT="7.10.2984"
 SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
 HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 1cc4ced81cd7..6503c45084c7 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,5 +2,6 @@ DIST lldb-7.0.1.src.tar.xz 19384628 BLAKE2B 4720aa85afb90b84264f53736ca8a225bfc8
 DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
 EBUILD lldb-7.0.1.ebuild 3010 BLAKE2B 9d82e23d83a5726a5c966d14e4660e7199e03716597c2be0bf2adf33037c1fb4cd459fda2ab44230e18efc681690f16e25753de7b3bca2932b1081e6feff887a SHA512 92a937daf00ab27650045dad8fae9e7a1e9e2b014b37ee9e13c8452f25fa58a78196711b0e5a41a65f12947a1a9fd85ddbf9c360c4036478a699417501c2c02f
 EBUILD lldb-7.0.9999.ebuild 2963 BLAKE2B fe0d92eb2b0ffc41662b7a53ea4ac8893b629e4140be0f03917b2422b894a0c744dfc8f8f3c8de9ca0fef9e82c0ba01ea481c7182e778fba0ab8fabcfdd318e6 SHA512 b5a489457346477a38c2d8e6bad8c54407452ff44777fc63d404a64eb5bdb77fdbcd3f693868362ca195dbac269dab8dbf28590ba47eb4a8310f0e63643ed1d0
+EBUILD lldb-8.0.9999.ebuild 2960 BLAKE2B 39990504c70cab7761ae1e465bf257558488f3c90b5e07fcaa72e9b4c6e874e62e4d15ddadcb0fdb3924af3aaecec8f14b1747e1e3cf837c0b77b77b1b44f906 SHA512 68d1ff044126076e1962eb1a09eb0621a313ed92a7ba2fff6a9959f00f39b219ac6478113c641f0c55f3b687ea9ce7cf23ac7c6ebaad51788f162f639598fc94
 EBUILD lldb-9999.ebuild 2914 BLAKE2B e3a93e6587132df4ab3dd5def2f42df76842c0c0c10ca5509f4aa9637cf864fadc7cf7c49b19794a5c588788f1d6389214583ad13a26c5fbd63aae6a38a7f2d2 SHA512 f75c95ce2ed842b8c132ee192cdde8aab6bbba63089888774f5f4827e2f557e7ddcb0782477a580140806d6b3b62be98684cec66d5c5db74337f888a38653c5a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-8.0.9999.ebuild b/dev-util/lldb/lldb-8.0.9999.ebuild
new file mode 100644
index 000000000000..d16b057b1e95
--- /dev/null
+++ b/dev-util/lldb/lldb-8.0.9999.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \
+	toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/lldb.git
+	https://github.com/llvm-mirror/lldb.git"
+EGIT_BRANCH="release_80"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit ncurses python test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? ( dev-python/six[${PYTHON_USEDEP}]
+		${PYTHON_DEPS} )
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if use test; then
+		# needed for patched gtest
+		git-r3_fetch "https://git.llvm.org/git/llvm.git
+			https://github.com/llvm-mirror/llvm.git"
+	fi
+	git-r3_fetch
+
+	if use test; then
+		git-r3_checkout https://llvm.org/git/llvm.git \
+			"${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest
+	fi
+	git-r3_checkout
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
+		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
+		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make check-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# oh my...
+	if use python; then
+		# remove custom readline.so for now
+		# TODO: figure out how to deal with it
+		# upstream is basically building a custom readline.so with -ledit
+		# to avoid symbol collisions between readline and libedit...
+		rm "${D}$(python_get_sitedir)/readline.so" || die
+
+		# byte-compile the modules
+		python_optimize
+	fi
+}
diff --git a/dev-util/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest
index a951c88c8af5..82b3947633a1 100644
--- a/dev-util/netsurf-buildsystem/Manifest
+++ b/dev-util/netsurf-buildsystem/Manifest
@@ -1,4 +1,4 @@
 AUX gentoo-helpers.sh 286 BLAKE2B 8f8ed2932cb2a0c954851804f727f1099bf3f0acd4b2ece892f08edbbedf49be7b9953afdc923aa1fc50a115e01dec03a3d06fcf9a69bcda4d896c8a40560a3e SHA512 51fdfb9330a2d5bec9bcad9e91635a5fc245b3c02527ab70c0f9285cae0bb4266ba1ffaca26eaf6c4f9caf66a151bca776df36a0de2c4862e5d18d9417555502
 DIST buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
-EBUILD netsurf-buildsystem-1.7.ebuild 674 BLAKE2B 671c26d1e15e6eb9fbc777c70c173a18279377e183d9ea7d79e4b98d87e8ed76d3abe6a80726188752d1e83dafb51670d2d19f8c1ee76f6bec4ef3f2736c6787 SHA512 832bbb8d79a3d5d12c28b90a6cea0376c4562bf955d492aa37d6221bba2f6a1001de16c7a28c584e84da55cfee29d86464c15546c6791918280684a81edb29c5
+EBUILD netsurf-buildsystem-1.7.ebuild 673 BLAKE2B 056d04e21360ae5acc3159d1363e01dea4deba70744ead833e7ec76d816aa8905bc533dc8c3981c17e19660b37af7ecec44d2da16b4c8f1a989ef0f9946ff3b3 SHA512 3fb2159a06634bc0519bca8565f66be6327d33b54f29a25d4c95f9278cdd75a02f25448e0884e1dca8421b01b93bfa67c7b965f5506544e5410667d9da0fc70c
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
index 99c9acce4a50..f4a68d8444ec 100644
--- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~m68k-mint"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~m68k-mint"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/shellcheck-bin/Manifest b/dev-util/shellcheck-bin/Manifest
index ea81337eacf4..5cb1e34241d3 100644
--- a/dev-util/shellcheck-bin/Manifest
+++ b/dev-util/shellcheck-bin/Manifest
@@ -1,5 +1,6 @@
 DIST shellcheck-v0.5.0.linux.x86_64.tar.xz 3231336 BLAKE2B 5d94ed2e61fd363f645259eac94905cc4eed839b523c4392dd6a775f466e85a2164036c34cf0e1d993a43486fbbe0c7e64df2943d0748bee6e7bb25a5e3d0500 SHA512 475e14bf2705ad4a16d405fa64b94c2eb151a914d5a165ce13e8f9344e6145893f685a650cd32d45a7ab236dedf55f76b31db82e2ef76ad6175a87dd89109790
+DIST shellcheck-v0.6.0.linux.armv6hf.tar.xz 2488420 BLAKE2B 5b5265845c596d82938d7bc7009d0e5736cf380b9686fc3f900130f859122bb4fb6e2ad9eba7ac2a06d32a0065cf97bed473af085712b9c1da5c57d46df5daa1 SHA512 ac60323430e7febfeaaf5f8b6e3c5500e173871757e46643f1a944eea67f6918bbc49869a63fb7089329a2090307d8364dbeabb390a5e42c094147f530589f81
 DIST shellcheck-v0.6.0.linux.x86_64.tar.xz 1484496 BLAKE2B 2f0d40b53a59dea15ae6bd972387071aea4e1d0f44bc1b7f74180d8744befd539a2e7e7aa4d5b78b65c82f8b94dc224b0730a9351a4fb1db1988c024fd85feac SHA512 6335d8888848a6fd351867c4f9732446b33c6b5e46343aebdbf1efa14ae99804d1e5af5b186b6ceba161d23b221b53d2a12e3a695231f8ac8f9ef46e2db9182b
 EBUILD shellcheck-bin-0.5.0.ebuild 527 BLAKE2B f4bdcf6460b48eb6fb401ba24158595cca5ed376e9e9d2dfc4daba71092e64440219abfa36946cdf5ba470f42d0a226306aaf8ab47cd8b189b859d0c5b6bc8ec SHA512 3f05dfc02e5c64866b38f59a59b99584d5582316782e851ee93fd786e21456ae33f1cd4b9ad7b866434a5c04db026f918976bd80dc3b778c4389539d6eac51b7
-EBUILD shellcheck-bin-0.6.0.ebuild 528 BLAKE2B bd8b23b3134b07bbe02d34dfd3147f8fa1a35cd1103cbb5688548fb661568021880e34809a5e30e2ea5225a4efbcae81522a187719673553a6fc2845af974a6e SHA512 1f6173ec7b569be874d60b126d0059f1c5a7777251fec25e2c83471ef704a6c9a725e28212e0e905e6536c15351656c48a6b2eb481eace03e70ca13c718e5604
+EBUILD shellcheck-bin-0.6.0.ebuild 633 BLAKE2B f822a45382a505abcd59572d39a0d6296cec646035b14291a15f13da4e4c0d64eb022992f5fe4dd7adaa4d08af8bcb0a90c55439f09da4680a566a0367695428 SHA512 66e316ed5eea9c11dfdd951bcd5dfa42ba2be60d3d34581fed1fd684beedd381b4f31f463f83412e70340ea2894defe0bf0762e5d62ab115e614567a69150b1c
 MISC metadata.xml 469 BLAKE2B 639f0079f57c613dff06b282358be8cdd287fbf2d361b053ebc62ede4efa2f4c17d9b27f420e97cde73f085446ded30d488e6f7efdec2584384688d68781ff34 SHA512 296cd96c77ffd3e87877ca773954954a08723d274ef91e7a292fc95f0b5a8d10f1d981a9c9ba2ed7c239347e3cd8eb47df2984071a58274a452e10abc2a58ad2
diff --git a/dev-util/shellcheck-bin/shellcheck-bin-0.6.0.ebuild b/dev-util/shellcheck-bin/shellcheck-bin-0.6.0.ebuild
index 633eb0107655..77b8ddc5654e 100644
--- a/dev-util/shellcheck-bin/shellcheck-bin-0.6.0.ebuild
+++ b/dev-util/shellcheck-bin/shellcheck-bin-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,11 +7,14 @@ MY_PN=${PN/-bin/}
 
 DESCRIPTION="Shell script analysis tool (binary package)"
 HOMEPAGE="https://www.shellcheck.net/"
-SRC_URI="https://storage.googleapis.com/${MY_PN}/${MY_PN}-v${PV}.linux.x86_64.tar.xz"
+SRC_URI="
+	amd64? ( https://storage.googleapis.com/${MY_PN}/${MY_PN}-v${PV}.linux.x86_64.tar.xz )
+	arm? ( https://storage.googleapis.com/${MY_PN}/${MY_PN}-v${PV}.linux.armv6hf.tar.xz )
+"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm"
 
 DEPEND="!dev-util/shellcheck"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index f1b3f2d627c6..1752ace1c349 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -3,7 +3,7 @@ DIST spirv-headers-1.3.1_pre20180710.tar.gz 281382 BLAKE2B 9e38c7779af97cae27c59
 DIST spirv-headers-1.3.4_pre20180917.tar.gz 283733 BLAKE2B 6bf0f5c00ae827f8a4b560dcbbe4c42d810cebefe0beecd3e7a022dc1f04bc2ed77f03ec2c0d0e6bf141ab1e4f058362f307c672cf92d83a8d1ceac2a200e659 SHA512 1fab471d07c9e85e75a3de08dccdd4ff7296ffd2cb265cb6cf7038e654c9d2afd8a2ee923eacfd2c47e02c5b139ab49271e489ce1b94f719b063be8910274598
 DIST spirv-headers-1.3.tar.gz 279415 BLAKE2B 77e36c02d072daa3aff7eceda53a5d6cd060564f494986a9a99c52d833330605e67c6f8ba2968d656b955f188da2c0bea18b11c834d11ed334f5c33eb14b4e9c SHA512 c612c4fcffefc3a277a9713712150c7e6b696eb676737b4968809784ef32c004820d9abd22389082203fc0853a87f920754b7c9b6b43d85131e750d09e267036
 EBUILD spirv-headers-1.3.1_pre20180710.ebuild 498 BLAKE2B 991fb177a5dfc150428d0dbaa50ef27a41aebbf445dc9aa9702b9976377f7ee40437999f1786561414c2b8c2a1436348cb1e82d7a6ae05bb371a35255a711af6 SHA512 e43a9fc792aff6fa5a1f07fff4c940d7829d31d80b3a9447a2da3e6a47157dd8d4777a51afbc8dd060c9b76e426fe4154cdf49d19e5a634935ac6ba7f6494d4f
-EBUILD spirv-headers-1.3.4_pre20180917.ebuild 498 BLAKE2B 9918b0e0640e0edcb016cd6dd34899755bdeca05b1c9c4204fe84629e85489be766825f98ddd13d09933989316d3a8f79b7ac211e9c963af336638f9880b37a5 SHA512 65e8b01c81795be8253e9302d7f34d3e3664672849e3c894b62ba2642a9896b922d09035a91ef083aeb18c1a659690fb2650b412bff2c3b8cd5609dc413ed2a3
+EBUILD spirv-headers-1.3.4_pre20180917.ebuild 494 BLAKE2B 5eb9e3ae23acbf4a9f3ab2564b383e0178129db9a0c96f20373e39aae677f11c3a52fc9aa0569c29cdfa3a335ce8c47fd9b2a4696371648c058cc29f23674cbd SHA512 b3dfe8c08c5de84569d3fc7f4b8855202f92168edca11a7aa3dbc825f61d25137875464eb0fa5763471f90dfff3bd9e5466198b60c31704ea38a668d57e9713b
 EBUILD spirv-headers-1.3.ebuild 562 BLAKE2B b304f69a8b7445e00fb41e162b84256601db218f3a7efd1ea1938d3ee39738a011de48d5fb099b5b8bbabf05cebab6248f3ac33064535da32520d321b8eab8a1 SHA512 0239f7a19a7b9040c33f9b1d4641f7c2fa866c2e5673da98ed20981a8b79b8af3c061c21c2e127a83a58367b2b487d0ad968352c93686df92d1a1c1c6aba8421
 EBUILD spirv-headers-9999.ebuild 358 BLAKE2B 0121eaa0ea8a1706435efeb1e29f81f471774582c4fe3879b3e2cc0e7e36ddaed830e37526660e976bab9710307e57454d460c8fcac1c4e8b19c91ceaffd00db SHA512 c7f16a3613efcd0c34208e7016696c87c7a6ee7761bf4c153e2ef3c0e8ffae98e4f044edc780b24c387eb8521703e2f9900d17c584b4078bd0e84bf119cd6de4
 MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.4_pre20180917.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.4_pre20180917.ebuild
index 9427682b1c40..72a6122d8ce3 100644
--- a/dev-util/spirv-headers/spirv-headers-1.3.4_pre20180917.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.3.4_pre20180917.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 8fe74c2e9830..eab590bfa86d 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-tools-2018.4.tar.gz 1327904 BLAKE2B 1ed01edf0dd5e8c3ac0d1a866d27f2e2ef377e9c082579291f8e755592ff3ea4f44a597e3e7694977500b9434889b0f741e03d566e777bb0f9af5e2e59374d61 SHA512 6b982efb30529e7f7776d7702f563bb4f874b9be3a7b0d838d77a15813f4177da99c152f40f11854fc3d60791ecf4026e006ff25a216bb44194dfd921c50920d
 DIST spirv-tools-2018.5.tar.gz 1354299 BLAKE2B a2f74ac52cbcb3881009274c41cf8be48ae91d2d62d9e687d28719e65bb7cd5c0a5104a967e995fc5da066c1e6a278df4bf285fa9bf617660072bd0ee535b9bb SHA512 068a39e15111f24ad2a6b27e7ada786b3124b239aa8b13e187a4d512044db57a8e6a0fccadd0451155e1f57c96c8dec91a2338996c59fc883007cf7be07f2cad
 EBUILD spirv-tools-2018.4.ebuild 1034 BLAKE2B 891188fa617878fd86b7847dc32cefeb69801fa89594763b212891018bd0e251fb64401fed9a4520ab82685843916f3b1f4f94017937fc1adaad4bf8bd847bc5 SHA512 78784487fe26c9a5562d8d7aff69b45e40c13b3850319b1f45b48ab84bfdb1ce90ebab3edcc112935bc3a64b63603e8505c2fc3ee7393d5541c2bc2587c51b0d
-EBUILD spirv-tools-2018.5.ebuild 1034 BLAKE2B 3270c8df1b2cab7bfda4d32d53455e707d5aaa9247f8fd985c2bcae77d3dfd27d51b07ecc984cc8440120b4ad27c98000ae6cf42e7db29ca0642485cb5df29fa SHA512 af8d8c0693873395f030d8fcf2557da979b5732bae9332d2a1ac9269110ad2e31f343ccae1976c0e9f14bdd5132997e787ee90ab36d5b7c56e3eba2ec89b5206
+EBUILD spirv-tools-2018.5.ebuild 1033 BLAKE2B 43041e0dcf349d1626cf0e247d9078870291527663cf5a689e2a77cf0b5d1b02007534a1a56f7d13fcb39c11c81ad10b92aac7e69db0105f85fae9675c316219 SHA512 06c008fcaf213eddabcd0a507a97219a711c2cc9d0c0b6994a2b8f096894266229732c18625b8d14e5b3f885b5078a1348f496321d08faccfc7ee1cfb3929344
 EBUILD spirv-tools-9999.ebuild 989 BLAKE2B 7eef54cb0af6249e2d86ace4ed2eb5cde0b23f46987c08b04bbf032363f3cdaeda5daf231bc3457282dcd4c3731b9a2190396de481bc492bed8427ac065d8625 SHA512 7c30383d141631e25430f6148d0bc6c816447de8c6b202279b0fb0a276621dae12c0fbfd227d83d2d2b28c33c8eb4ceb83e37fada15165cabc2b640974c5cab9
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2018.5.ebuild b/dev-util/spirv-tools/spirv-tools-2018.5.ebuild
index 3e991702fdfa..296d5999232a 100644
--- a/dev-util/spirv-tools/spirv-tools-2018.5.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2018.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 # Tests fail upon finding symbols that do not match a regular expression
 # in the generated library. Easily hit with non-standard compiler flags
 RESTRICT="test"
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index fd7603af9a12..331e634fbb07 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-headers-1.1.82.0.tar.gz 472739 BLAKE2B 323635c02909e1713973787812ea94cf14e9d6bbb16359594e2ac3910bab1a8de383674157575ef82f7fe100d78fdfdf1b6e82d75bed5d63abc7d38af555a6ab SHA512 9236db6d3e5c24687ae4ee01237190e4594657e6c6f00b3e859dbf34f6bfccea37a4d56fa7112d3d982c4fdabc1967e96c0fbbd07cc835591e4f48f00518ddb7
 DIST vulkan-headers-1.1.92.0.tar.gz 541278 BLAKE2B f1743a376d18185bed136acd11cab0f8cdea2146ae4f9d389332b1afd83a29a32f2dc2a66f441cdb07f99a24c68d8743710762716cc3d0baf8f10933a3db0351 SHA512 61e47eec60ca713e958cbe2fe80241afe699a7853a0ca2b7f866aa37de064115df8418226b2ace22def12fdf97531f2301a92756b6ebe7862a11004d2f1d93c4
 EBUILD vulkan-headers-1.1.82.0.ebuild 723 BLAKE2B 33252fa10738ff3e3f1c88c2078a442e8bd10d48113facc91c51dbea0e8b79c6348d82aa3dcaa557d3310ecaeab92469c3f5a2c033cce385db622a92d16fac68 SHA512 063f32f1dc417f6386f0f68d90e3e27d37f57268ed3d56b1ff1758fa7d6c8997c90d060b347dcc1649437b8f9b152969c33e19acf509ed88851339af40f730c9
-EBUILD vulkan-headers-1.1.92.0.ebuild 720 BLAKE2B 83d2f9bdd309902116ea9a09d4584edf35a561fc3340071686ec972132c2cebf4ea332a817b4271d55513c60190f28b5d3bd213ca63c6f3c7e1229e003ad53ae SHA512 4170a3dc578d6ea744c3d053a5289b8484e4af6ef7afe10b7ef1c6459894fd233f42d20c674dd575d047228a4928d07d8422b5b41edb81c8176671f7b18a3a0a
+EBUILD vulkan-headers-1.1.92.0.ebuild 719 BLAKE2B 96be71fd80089081a6b2f8b1bf2de8a470029654125df7655fbdbd66ac824d411b57f5deca3196b5d18e19b322f3b92227f5bc2a6f99dcda26376b46cbbafd90 SHA512 bd1a2273d4191b60a46811f74073310618933339305aa81bbcce08d9a54880c85fdd18e44ed4f68042fdf76b5455e9bfe27976abaf58c077bf0df671daaa37c2
 EBUILD vulkan-headers-9999.ebuild 723 BLAKE2B 6754a5857b67a4dacd6d90e356f47b3beecebab79b73a646d5aad3f5f9c02076cc58bde8bc42af9e9bc4d5049992f6bb755ceb56892bce8e248c60c5c3ccb3db SHA512 c21e42db4c3ee0e745c8ede00478ea319004899b44211ea0ed1e3e530aec30e290fb8f1b83b624fe5087f779813eaa612efc88c3893363812d9b24bb469265ba
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild
index 7c9c247d495e..990f33299dca 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="114c3546e195819bd53a34b39f5194b2989a5b12"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
 fi
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index e2cbfe1b4804..76e08342e788 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index e897ef6124d8..d49b5a7a8cdf 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -9,7 +9,7 @@ DIST subversion-1.11.0.tar.bz2 8490744 BLAKE2B 27b2172e1ebae5641fc2bc73fd77f4792
 DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01c9866352f1c54b5468804e81c1eadb895cbe9e33783a9e7d4a7f54dfa3b25b762015b9ca4886a14628c434254995c77 SHA512 2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d
 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.3.ebuild 15341 BLAKE2B 024a9cb2bbf3d638f35d095b2390b7bf44da8e6a5940e508fe8e138dcca8898cc2e014bfe326ab908499795d7adecbee63038d91d5cdb8df368644ddbec8f105 SHA512 61ea0460e79d84a40dd8e4fd1bc10b9969ed0096f5ac286267fe3d52ee7e4fdca1385980244928259a120380ddce345c140baf5382e8057224eaca0a0da6ac10
+EBUILD subversion-1.10.3.ebuild 15340 BLAKE2B 6b6e64ff2c8372718d8c6dfecfb12d681348860eb56aa75e447827e7ae5ab519f44518bc604ed47ff21ac150df060faabe175dd961dda37c0a9b688c776f16ae SHA512 3f3ef60f46e5ef3b09e6a1090c4ac66d3683fdcde66f14d562bdeea1254e4087637485c64c18fbec05ce7a9d32a4ac41055a039822d13cdbfe7b573b2d713c23
 EBUILD subversion-1.11.0.ebuild 15335 BLAKE2B 1a370f57d9da2f53cc892f3656d1c15a9f2ca283e6e468d36af908262a2d979e37297b2684a48662221bb5fb3edf59a70583636693b6b4789b206b4983ec91d3 SHA512 42f0e36713135baa87380083395127f9d29d003384882276b27e1b8fedfa5452eb0d067763975a53b3a7ee583fa6e0e67cdd5a79706aa542a7004934a00680e7
 EBUILD subversion-1.11.1.ebuild 15335 BLAKE2B d90a9d6f6cc38edc3679c269d8f03da6cba1f529b2e7e37a06123c8610d9051e87f23871ff4667963b42778c32d7fecac6576c966c8fcbcffc06741ae94c26ad SHA512 87270e8d071a6995d308b21deb86f936aca09531b4fb8590cb222c641ace7ed4d49e36d563113d3b74da7179c0b8ddfdc4fa2d0ea553fd91fe95eba9efca47dc
 EBUILD subversion-1.9.7-r1.ebuild 15804 BLAKE2B 1231e2ab2ba1b776ef43f3b543b57ff127cf59c52a3eb42e131789b2493388aa93f17f2d9760f110081c86a464dc559cce580ffd1641c146086a426bfe09b623 SHA512 bf0969059cb64b5ddea51c7423e5a8177b5e7ba4a821014799b933eb01f0d10f84d498cb11affd218009fc4e4721aa10f69a8e03dc61aabbfda373511bd143a3
diff --git a/dev-vcs/subversion/subversion-1.10.3.ebuild b/dev-vcs/subversion/subversion-1.10.3.ebuild
index fe7f8f537a0a..e5d3c5f00043 100644
--- a/dev-vcs/subversion/subversion-1.10.3.ebuild
+++ b/dev-vcs/subversion/subversion-1.10.3.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Subversion GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 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/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index c32dd9af8f82..6001b0180c71 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 7497fb121da7..2a26737b598d 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,7 +1,6 @@
 AUX kio-5.52.0-sendfile.patch 3571 BLAKE2B ef2ce58c2e0c00a6982c52462f0124bfa3396d5f75174ee646fa99023d1d580cf6bf4f5fbee051b2358406e2dd6da863c1b757dcabdfa5e919c1bc0130598023 SHA512 694dc4f737b52a5b1f014a824aea7c97e0f50886db9e53152e3d42359f974ae1a2abada6cc1ab41816149b410e548e705fd46f1fd11e148e8ecf027c8ec7e990
-AUX kio-5.54.0-elapsedtime.patch 1202 BLAKE2B 0074dfb3c504288f58109756d3dc540e1cca7e79520122115b73095dbed342e9dd78a5a2ec41aa6b0d6695c31869f2850bed3cd2bda7efe540fb281a3cd60391 SHA512 36e03672af0fd8703be89a3e1b3dc5cc88c47b0cc63e75fcdce1e0f5126537a216da4f7ce103ddb423224e3ef51d5a136eced1d2239f85bdda46905932e374cd
 DIST kio-5.52.0.tar.xz 3159632 BLAKE2B 4be5993157b6ee08be4cb2f40b5669353079fe2174e6204fbe2e375cfa71fb6121b4a2ca0783f3e4f45205cd3ae4bde36823e9543005a1124ac43fe7ecb189bc SHA512 b5a91c9eedc91eb933f16874163b2882986975c67ef329497b2ae936926292241d05f4dae022054d5db673e195e80159ad1cb70a26a5c23a192223bbe6b28c36
-DIST kio-5.54.0.tar.xz 3150624 BLAKE2B 0dbca930cfd82e079f5f7d138d9342f701a23d9f7de99847e2371cd9c137b198c55f6dc61c8b9f78e30b7ecfaee3ff3ed52c88d01e4369434045cc0e02979476 SHA512 163929bd8e6e4d3be5390090511cafd11213e476a0460e5fdcffde15181332545380ef25f6350e465dbc7f9872a6b771e891f5302af64bd3ced162b2a94a8c6d
+DIST kio-5.54.1.tar.xz 3150348 BLAKE2B c72f2e798f50605ac18778204615181013bfba8f33960f5cb78991a8df0e3b1484e6d7b94c74cea088318f7ace00950222ef70e5c854c35b60475f18c7d6d9b7 SHA512 750508355265f1ec68049a36c6b6fba0afcd55f2d787a6fb199d6b0fd933da6db420218fa8504a66fbe90cbf29be78c5a3d22d1771eb5aaa284d0c9120ebb059
 EBUILD kio-5.52.0-r1.ebuild 2000 BLAKE2B ab775c026509590e2459340293666fba63d963d391217e344fee45f283327874f326aea670280bf25670d617ac1a3f8eaa0130e134487f1ac03193fead1b2e71 SHA512 59fa067468a6048af3e0151a4b4522afd6ea5afbcd155b3c20e18c1926fa9f9cfd027b2b41ecb5b3433bec6b2f13466ae7e67124c1c93a894b5092ba5b6b0af4
-EBUILD kio-5.54.0.ebuild 2073 BLAKE2B 804e180f11b84d7e58af5570f02cf712f250cda50ad5766ec531719a1733c98094e4d1780b02ec4cd8c74ac60609b5994a6c99250ac38f8ca645885362083ba6 SHA512 034184d34c18909ac61a2f7058dfc90a66bfb306143644073c7c14a3e445ef1a47deccccf60253e1c1ce6e49dcc7baa574e969f9f5b5fa7c92db0652ca95cca7
+EBUILD kio-5.54.1.ebuild 2023 BLAKE2B 51aa9c3a04c16d3fae0a27fc996e5e650f5a6b45808bb25bab8cbd21ee7ba7d8e867c273d611a2e17029557245695911ed1b74f46a8bc11ffec8ee5decb79e24 SHA512 933b22c5823e97e9d70e8cf5c6cb3771cb40fed4303951a4083f33d2db94d2fc35354ff48bed0fd25fb140878c1c6a1a2c2de25dddf84be1b01e6f4a5470089e
 MISC metadata.xml 389 BLAKE2B e0f1cc136204ab865eef4b3051c40b136fb2659f402148b8f7e48b80bd9c7156f0811a7fe80bda4a16ccf671e69d076afc6179dae6d34db695672534a0b9de5f SHA512 ae0874c02b207fad481d7f26a01186787d39e015dca650c4515b419f5d703ead48dd3250e3d0dc5d23660be9afe33e226d393c4d88246eba7e313763e6546820
diff --git a/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch b/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch
deleted file mode 100644
index d18347fb63d4..000000000000
--- a/kde-frameworks/kio/files/kio-5.54.0-elapsedtime.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From cd2f67c39b25de026390bfe2bc1c7aa269f78ccb Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Thu, 10 Jan 2019 16:03:06 +0000
-Subject: Fix elapsed time check
-
-Summary:
-To match the code it was refactored from it should be checking the code
-since the last time we checked calcSpeed, not since the job started.
-
-CCBUG: 402665
-
-Subscribers: kde-frameworks-devel
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D18158
----
- src/core/slaveinterface.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/slaveinterface.cpp b/src/core/slaveinterface.cpp
-index 6eb2b08..d79b498 100644
---- a/src/core/slaveinterface.cpp
-+++ b/src/core/slaveinterface.cpp
-@@ -103,7 +103,9 @@ void SlaveInterface::calcSpeed()
-     // using first and last item from the list.
- 
-     const qint64 elapsed_time = d->elapsed_timer.elapsed();
--    if (elapsed_time >= 900) {
-+    const qint64 last_time = d->transfer_details.isEmpty() ? 0 : d->transfer_details.last().time;
-+
-+    if (elapsed_time - last_time >= 900) {
-         if (d->transfer_details.count() == max_count) {
-             d->transfer_details.removeFirst();
-         }
--- 
-cgit v1.1
-
diff --git a/kde-frameworks/kio/kio-5.54.0.ebuild b/kde-frameworks/kio/kio-5.54.1.ebuild
similarity index 97%
rename from kde-frameworks/kio/kio-5.54.0.ebuild
rename to kde-frameworks/kio/kio-5.54.1.ebuild
index 3256957d5aad..e10f37ff9d3e 100644
--- a/kde-frameworks/kio/kio-5.54.0.ebuild
+++ b/kde-frameworks/kio/kio-5.54.1.ebuild
@@ -68,8 +68,6 @@ PDEPEND="
 # tests hang
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${P}-elapsedtime.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package acl ACL)
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 6f6cbd326cad..b31b883c696e 100644
Binary files a/kde-misc/Manifest.gz and b/kde-misc/Manifest.gz differ
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index 5ee4dafd2ec1..36b6be83d0a1 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1,5 +1,3 @@
-DIST wacomtablet-3.1.0.tar.xz 722436 BLAKE2B 97469b71d5139e67e4f3de27ed5c6beaa32abdcc159453206da98250d9b68b47c6a1022264a5faf1ac2e0283d0aff3465dad38cadacc52e6ed970261b6157a3d SHA512 763eddaca5471f62fb18e8c9f24d1be2a91e49eeaec4ce0b0ab6c89f1d85b9a6bcf32c67e79dee2e958dfba5bd354b4f4685a080ac06d461150a5da3a78a8915
 DIST wacomtablet-3.1.1.tar.xz 724176 BLAKE2B 062f05067b9ca423527f1fbbc498d3228fba9333f96e918493a00c3ceb669a23c3ab9297bf6c2d3d161559f1d9cf6ccff8f502971718e71a360f3db2e7d9bd67 SHA512 91f8ab9326b8307d63e09c7d75d613553f16c6cb93837cc404cb251aeda93078011b0c5aa0fc20ca4613d82421d73804cc55fa71a688bf4dd0f1d616733ade97
-EBUILD wacomtablet-3.1.0.ebuild 1155 BLAKE2B 2cc5eaff737465906ceb7cae385e96ff9133c0abf97ad7bf7016f09de99680e1d3c5e0eecfcf09983f6d16412836a580415358e78fe6e341ded747dd21be2fff SHA512 0b2d548d8050086e1c495fd7a36e094ba4c172209413850187c088f2f5756459b3e8043babbb5643c744a607095f89c4a48f2319ab6a9265ebee8593e0d3dd6e
-EBUILD wacomtablet-3.1.1.ebuild 1152 BLAKE2B e635697c3a6d30d71ab4ac0b70e4e23018057a63e6990f9b7bf7f13a723581f9e40f7d4ed3e53ac8e8eaa4fe4e804b23b443763aeed6601d13ee9fc2ffd57e57 SHA512 6c151a1c93dbbac3a9d3beceda5eef8bbc6c37fac4d4a88ba6d0d969f745052208b83801153e2acae611c439ccc2d43d52bbdece45e762162d1af85fc5b2a35f
+EBUILD wacomtablet-3.1.1.ebuild 1276 BLAKE2B 18ff83bbc4cc3fd8bb8b8c9debe44670a05c8933fe1deac788f1987631bd2f6af033d926e6928636840f40f3b727b2c3ebd738b1959c3536fe51413af3d173ab SHA512 3c69db91261f68739aaf79a23ed985dabc19fba8a3b2aee757dd50bf335d98e792ed0c4645b67519bece7b7869c3cc982adcdfcedf0a6ebdefdc5c0d25cbda51
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/wacomtablet/wacomtablet-3.1.0.ebuild b/kde-misc/wacomtablet/wacomtablet-3.1.0.ebuild
deleted file mode 100644
index 9d61407dacb4..000000000000
--- a/kde-misc/wacomtablet/wacomtablet-3.1.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=6
-
-KDE_HANDBOOK="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KControl module for Wacom tablets"
-HOMEPAGE="https://www.linux-apps.com/content/show.php?action=content&content=114856"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=dev-libs/libwacom-0.30
-	>=x11-drivers/xf86-input-wacom-0.20.0
-	x11-libs/libXi
-	x11-libs/libxcb
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	x11-base/xorg-proto
-	x11-libs/libX11
-"
-RDEPEND="${CDEPEND}
-	!kde-misc/wacomtablet:4
-"
diff --git a/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild b/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
index 2b5715f2b226..296d3c160272 100644
--- a/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
+++ b/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
@@ -45,3 +45,12 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	!kde-misc/wacomtablet:4
 "
+
+src_test() {
+	# test needs DBus, bug 675548
+	local myctestargs=(
+		-E "(Test.KDED.DBusTabletService)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-misc/yakuake/Manifest b/kde-misc/yakuake/Manifest
index d3e8b32b0c59..417b65d6f43b 100644
--- a/kde-misc/yakuake/Manifest
+++ b/kde-misc/yakuake/Manifest
@@ -1,5 +1,4 @@
 DIST yakuake-3.0.5-patches.tar.xz 4996 BLAKE2B 0ffef1bf066b962c73ef6a28251d9abf3df66b28cf324bcd2d4f49c7038ba64dd3554490534cb0b001a589c42309253a0cf77683b4f97661d0fbfc17c96e5be0 SHA512 6c66043e22e98d65230de566e4594f4c1bfdcccc229ab8b66d604bf6fa666964f8b05746eb914f65d1e52fa850010aa5016a26b629f8eec09b67548dd2b00251
 DIST yakuake-3.0.5.tar.xz 347412 BLAKE2B 964b5abdbc377b2ff3c1c37ebf4cb2537dde00d8c4178bc7db1785701dee82c600cd775a38896d8ad8976cbe14427df094c4db0c425355b0330d2e8b4fbe23cd SHA512 17640590bb87b7c27e1e336cb82141b986103af95cfae2da129b69537d89a78eb0e21a6f5fb9ab26ed9e572f9edad055264f642afee6012e1a5a5c55d9dc2d22
-EBUILD yakuake-3.0.5-r1.ebuild 1655 BLAKE2B 382fd33b423152abadcd9e4fbc4aa6b194cf1f5c3b609b0854dbb878c6d2d80c2d19241e21d3c0dc0f3901e020387cbddc62e2722e1a1e2132b967e2837290b2 SHA512 247510683deaf2eed37583d19ad019cec5c79d50eda21a3c96848dcb552a5327842282299657d8f0675e56f48c3fd0a7b6c8d691f1ed7a5d0adc59b262739dd1
-EBUILD yakuake-3.0.5.ebuild 1214 BLAKE2B 795fdc5b109297743f947b585ba3cf5e10e1d8401933ca706ef99b68690071c3ce15594b929725cd52b0219bce3216efff979b2d3059015850be043ae1afef82 SHA512 f0e56b25047da712af7094963d03a16d4ed4355c5f56c4e70cbb6dc0932ed056048bb7e047ad290cbbcdea08deff39d362c2658d83b569756236e291af0011b3
+EBUILD yakuake-3.0.5-r1.ebuild 1654 BLAKE2B e517125e4b2dab8e7bab29bff3be8ec2478663ec4efe7a04ac2a70a3f342f58dd2068481be31cf360498e5aaee34f88db90eb280080f893f61fa5fdcd2bf0cae SHA512 ce12fc3b99780d4c37153ac1f804212b5e00c6ae1defc5df44b70f3ce00d8549e113d14dfaec77626c361c51e34359197b0cbd6575ce593ef86bdebe5160e052
 MISC metadata.xml 661 BLAKE2B c0ff7bbfa76614ec0d6ed52ca7af363bf4c441cc06343c613ba6100a68269915d71dea39329d02fc95384ce71331bb367d4cddfdc0c560ea2748843ea7c31c8a SHA512 a842fdcbb48892a13e74eacd0aca111cbba02bd4c43fb9544ed4e4a9c72d122a3190f0090e8b7f63cceba1d449fb7bf629954a9e60dd541e40908818478fcb13
diff --git a/kde-misc/yakuake/yakuake-3.0.5-r1.ebuild b/kde-misc/yakuake/yakuake-3.0.5-r1.ebuild
index fe2f31a5ddb3..53cb9758ae62 100644
--- a/kde-misc/yakuake/yakuake-3.0.5-r1.ebuild
+++ b/kde-misc/yakuake/yakuake-3.0.5-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://yakuake.kde.org/"
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz
 	https://dev.gentoo.org/~asturm/distfiles/${P}-patches.tar.xz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2"
diff --git a/kde-misc/yakuake/yakuake-3.0.5.ebuild b/kde-misc/yakuake/yakuake-3.0.5.ebuild
deleted file mode 100644
index eadf4031c325..000000000000
--- a/kde-misc/yakuake/yakuake-3.0.5.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 kde5
-
-DESCRIPTION="Quake-style terminal emulator based on konsole"
-HOMEPAGE="https://yakuake.kde.org/"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep konsole)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	!kde-misc/yakuake:4
-"
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 4eb2dc6742b3..6d965adedaf1 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 314283ded32c..7a5c82af3847 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,8 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
+AUX kinfocenter-5.14.5-hwids.patch 1727 BLAKE2B 771c4c771c6926cc044cc512b7c1ebe5b528be50a7bcd9fc2d6f56675a26261c6c6cb5bae20c7992efd67581a7067b4ed09f21984d72a94ea1ce664234eb4c39 SHA512 cd348c2339528993795c292c99d9befd01033d4a80487bc1487013ba3db7879fbffb3ab5b1ef3125580ad0bed8a8827cfde366cfca770e71c5aca440742a744d
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.14.3.tar.xz 1322480 BLAKE2B 447de617a858fee4cb807cf776a945207387317c5e8be6cc41c445f3ea8647620ab30b2495d26c3446ace3447fb3693e6ed7e385874bca34b8118658bca608c1 SHA512 6d07299cb2145cfe172dc79cfe849b03000fe770e397fd050b053b2f40f09dec5d5ffa9336223320597b965a0c612c0b09333e20fb54c3edb41773d473f9998a
 DIST kinfocenter-5.14.5.tar.xz 1323212 BLAKE2B cf248445aec1320e18f11e58d9e02a95b1535446bc207ed75b76d18ca81af12feac221cf847bf73ecb4e0036432e6055c2801b34b9673ae289330468b2184c94 SHA512 df38b40eef89d4b4a6e7f6e5e72325122c5ed924fa01dd59e6d99ffef61a9bcd89e11dac8412ea0a95ecc0b68469cad6921ad529a247b59aaab3dc7a7d09a04c
 EBUILD kinfocenter-5.14.3.ebuild 2484 BLAKE2B 6893355e5e305ac324fdfd5c7277b83d105286826c3aade3605f3662e7805c9effcad153a7ff26b357e1e254631567560067443fb1684648e321f8aa64288e8d SHA512 ca0dcbe3eac5131c437ec38730650a753cc0928d24253f292dd5976c13992b980222782e83376dcd6e3567e208db5681a700d87bceaa0bc1ebab172a9c498653
-EBUILD kinfocenter-5.14.5.ebuild 2557 BLAKE2B 5968095aa0fed5cab2e05ed31635abb1d3b373ff9a9539646d9b197cde30a0a86bb54a267f41cee786118476591c371f3a4512a0bcc8e78a422d1d22728e09b7 SHA512 58e4f3bfe83a22eb3bcdd1bb644d7cabba64fd38b2452d66d2beb6106cf17fd81bae32692350d3416e0684d8fdd64a7af127d0806b8f339ef2f6cda7e8ad838a
+EBUILD kinfocenter-5.14.5-r1.ebuild 2665 BLAKE2B b8f306777bd784c381d519e090f5d38ecd615ba0a2bc127085ffbac7bd494dda44df204a608f08c9a48e2d87252afd8782b7fcf4aae27bf18f3ae2393457b722 SHA512 546afb05345e012dad2ff57b6d334e7f2bad22092d3a7cb24198f249466cff606f9599b205cf0a1993cb1ef3d0391df7505fee22aaccc55ed6f2da858b9fecaf
 MISC metadata.xml 390 BLAKE2B a47af94b17ade0ad2f4b4a44bac8ac1245c29a6551a059c95967ce2d5cd4420a975210bf0e4658c2152aaf5a894f934cac0d35aae015368bf1f8f8b1cbbbb069 SHA512 4ea690f0f5ac41b58d840949297d462e0fa7433bdece54d63b08a913d8a9001bf6d144e28d5e672712abf35e784c2b17faf31f0a879d6109417ce95ccdc0ef3b
diff --git a/kde-plasma/kinfocenter/files/kinfocenter-5.14.5-hwids.patch b/kde-plasma/kinfocenter/files/kinfocenter-5.14.5-hwids.patch
new file mode 100644
index 000000000000..a29f71f7786b
--- /dev/null
+++ b/kde-plasma/kinfocenter/files/kinfocenter-5.14.5-hwids.patch
@@ -0,0 +1,52 @@
+From e556c25c888a6e16e818945ac5bc81e455ddd4bc Mon Sep 17 00:00:00 2001
+From: Alexandre Ferreira <alexandref75@gmail.com>
+Date: Tue, 15 Jan 2019 13:29:25 +0000
+Subject: Fix USB view
+
+Summary:
+Fix
+BUG: 402949
+
+Reviewers: #plasma, cfeck, davidedmundson
+
+Reviewed By: #plasma, davidedmundson
+
+Subscribers: asturmlechner, davidedmundson, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D18032
+---
+ Modules/usbview/usbdb.cpp      | 3 +++
+ Modules/usbview/usbdevices.cpp | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Modules/usbview/usbdb.cpp b/Modules/usbview/usbdb.cpp
+index 2c62f16..e68d5c0 100644
+--- a/Modules/usbview/usbdb.cpp
++++ b/Modules/usbview/usbdb.cpp
+@@ -21,6 +21,9 @@
+ USBDB::USBDB() {
+ 	QString db = QStringLiteral("/usr/share/hwdata/usb.ids"); /* on Fedora and Arch*/
+ 	if (!QFile::exists(db)) {
++		db = QStringLiteral("/usr/share/misc/usb.ids"); /* on Gentoo */
++	}
++	if (!QFile::exists(db)) {
+                 //cannot use locate(AppDataLocation) as the app is kinfocenter
+ 		db = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kcmusb"), QStandardPaths::LocateDirectory);
+                 if (!db.isEmpty())
+diff --git a/Modules/usbview/usbdevices.cpp b/Modules/usbview/usbdevices.cpp
+index 1fb32e7..7b6fe1c 100644
+--- a/Modules/usbview/usbdevices.cpp
++++ b/Modules/usbview/usbdevices.cpp
+@@ -103,7 +103,7 @@ void USBDevice::parseSysDir(int bus, int parent, int level, const QString& dname
+ 			continue;
+ 
+ 		USBDevice* dev = new USBDevice();
+-        dev->parseSysDir(bus, ++level, _device, dname + QLatin1Char('/') + *it);
++        dev->parseSysDir(bus, _device, ++level, dname + QLatin1Char('/') + *it);
+ 	}
+ }
+ 
+-- 
+cgit v1.1
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.14.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.14.5-r1.ebuild
similarity index 95%
rename from kde-plasma/kinfocenter/kinfocenter-5.14.5.ebuild
rename to kde-plasma/kinfocenter/kinfocenter-5.14.5-r1.ebuild
index 18e67662aa0e..6523f277be2b 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.14.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.14.5-r1.ebuild
@@ -35,6 +35,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	sys-apps/hwids[pci,usb]
 	x11-libs/libX11
 	ieee1394? ( sys-libs/libraw1394 )
 	opengl? (
@@ -59,6 +60,8 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/kinfocenter:4
 "
 
+PATCHES=( "${FILESDIR}/${P}-hwids.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package ieee1394 RAW1394)
@@ -79,6 +82,8 @@ src_configure() {
 src_install() {
 	kde5_src_install
 
+	rm -r "${D}"/usr/share/kcmusb || die
+
 	insinto /etc/xdg
 	doins "${FILESDIR}"/kcm-about-distrorc
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b2be66759ba7..0a93f991f12f 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index a68a98c999ca..67932c6b1908 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -3,6 +3,6 @@ DIST gphoto2-2.5.14.tar.bz2 784442 BLAKE2B 185bd0d18e0b8d280c0ec366738850bd1fe2d
 DIST gphoto2-2.5.15.tar.bz2 790513 BLAKE2B e8a22d014ebd33f5e0976d72c5df8373e29106def5da575b69d21f2a58e9408c6ce399476135909e57111196d6e61ead953f66a00c9f440b7cf92e0da0f4a0f6 SHA512 46058a12a81379f3311911e103cf934b6eb616d7f81180615b385d01e855bf6ce998eb12811b9d032328ebed6acfc4456f3a383cfedb93c6967c9699654d4f40
 DIST gphoto2-2.5.20.tar.bz2 790065 BLAKE2B 6e10aa468696bc3eff51aaa3e886ad2373997f91597e42b33777ac56bf668f918c2fa0cb8b70eb8f7cb45507e67c9cfc3a46a7408449ad35cc3b743daf74859d SHA512 0350c38c264e5ba858ee14952fbf6ad271e7fef05e3f5f8eb3d45102099ae435fec63b09881efa99af60d4e086a9c2f69be92a7e49617643ab13146a5e4655f3
 EBUILD gphoto2-2.5.14.ebuild 1392 BLAKE2B d9dad5be797d3f5e2f789c42060c62499d59f8f8aa5129608eea7f023b0257a38d1d3e2d54b4889128f0a867368a3abcac4e3f47bddf98c675049f0b9f24f314 SHA512 6ef5220aaf64e480a95e71d5596093179a41d93912c1d17614034e4814832ba8788a1e282a8711096482eb94c284a65365fb85c67a748fb060a38ef921349a8c
-EBUILD gphoto2-2.5.15.ebuild 1390 BLAKE2B f932004b8728e3bc850d93e4bdb95bf181f4396961919634683b0524e1f02e4e576703d9438b5ba82c390c3e697ca6f8e7a97935939ac755f7094d9ee30703c8 SHA512 3668c7919a7f32273797172b331d83d9dcbf3fcd8fb4d6aae90f8fe49bfef26b4160819112a963f75ae630411fb47a4393c6756a26a34cdee64079fed4b24182
+EBUILD gphoto2-2.5.15.ebuild 1389 BLAKE2B dfdf84cdcd5c2305ee92572633308fd7f861677dfa98fe708b76b4ca6983014854e27f8c21456a9b1db806d2a160a0f45fe4bea13b5227290c0d6edeed444b1d SHA512 353294fbc29fb2c3f948e51906b91f5214948e2c6172a171a0a9a6ae19d318b215865bea8212c63cbfcfd5d54134acd9ab35b7cf8eba8c6677c9727833fd6ad0
 EBUILD gphoto2-2.5.20.ebuild 1331 BLAKE2B 89ef478df066b8824503bea7a1dcbad7257974b22731080a6eeadb16ef45885c72edeef77b600c6088a72ee4007bbf54a28befce6f536f400cc7c10cfdd9e7e9 SHA512 31d763dd83771ad375011cab0d9a8ff563b47654677db787f1b953a239b7d977a70ca412a5ba8bc85bb847c2019fe322a79cbe1b2a794ed6f51788071d450825
 MISC metadata.xml 449 BLAKE2B 324e2ea46a0f8199033bf628d6719a51968a02af01fa3e8abcd1caaf7a4dcd892bfb6b8347a030edf4b2e8529aba47d7103789103a3b03adaa538338ab2ec91f SHA512 f938819a203e0119b1d81aa1dc812717d6ef02c3012f8ed667db452c7712bb7b142cee36d519ec33f4cf65ebcba7a660e2f67f6b66087ec6be832a4987e10c53
diff --git a/media-gfx/gphoto2/gphoto2-2.5.15.ebuild b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
index 7fb110bd99d0..f3f04bd08f16 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index e0f649076e9a..8ba0ccb49638 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -5,7 +5,7 @@ AUX inkscape-0.91_pre3-sk-man.patch 362 BLAKE2B adfe363332dcf46297d01feb986ffaf4
 AUX inkscape-0.92.1-automagic.patch 5421 BLAKE2B 0885e9f785b7884e10659c1f8aace9a843113b5d1c059251c75297ef828eb7c704815798c861e03060c89c02e36cb45edf566065234d330c1757e8f2bcc89688 SHA512 c6bc791c8e0a4302f2b21c1ad4d39e8e880017f4cdcf8b23d7749498a0f0a1d2460abeab3216e9eeb6b87a300e17451ace86c738c58a174e92946cb280ef43b9
 AUX inkscape-0.92.1-desktop.patch 919 BLAKE2B c9952613e8d8dca1cd11146afd4d8db210be0f65f61b1a674cf5443dfaed3422e7082667cb93e183589d1e840ac3b55c7e70d03f44c0302b8c7db8ae621a976d SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2
 AUX inkscape-0.92.3-freetype_pkgconfig.patch 948 BLAKE2B 4a21ed3ef6c002a6fd756b31989d531f94f0bbf2c9bad2ac5fdb453f8a1a5c169e71d7ef5d71ca55072f76fd31646589a62c06b5d44809f6ef873cbe1edca1f9 SHA512 95a265b0e7e9fda74a9bcf31eb6d23afead4c71567126ca893b75c0dcc87f5b03e38c30e2917b4278dbf4fcaf35c2b3fe7a1b509a43b19212c814a2a2b9de53d
-DIST inkscape-0.92.3-poppler-patches.tar.xz 7508 BLAKE2B afb639e9149256d0a7d534c28f3c51cb6adf0bfdb458be1c729475f235cd363e3e6b50033f7d377eaeae9f564b33e710ac01fc323821f5b4a97ffc73edc342a5 SHA512 0011ca503e786520c756ff4578c0db55aadf907bf6479837fa35e7a035695ff7e0aaf8f878f5354730ac75808d36c5e34ae15d32a1af37134ce881edd810c4a5
+DIST inkscape-0.92.3-poppler-patches-1.tar.xz 7000 BLAKE2B a7658d592806df7580ab587c677907588678222f53bc8305b9adf399b8237e8ac3e169a22a39e33a50f5e517ea4122d736134dfaf5bd675fb34e5c168eb42e30 SHA512 8254d5cc0651bc6ed389f4610aac5ed9451b8c662e82b5c0f9aa221be748f4cd2075a41234c2516a98159cbd3e23c9ada3d519edbe69f05bab418d2fb1af2ffa
 DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
-EBUILD inkscape-0.92.3-r1.ebuild 4181 BLAKE2B 2d5fa7b8383efe738659803d9bbbacaf4f633143ae4fd05e8b08b9878521930dfa404e34c05be48b83bd011449c0889c504979ca1eb144677ead6fdddc9f3483 SHA512 51fed179cbb906be5deb6e75ed28c4c5da47ea8db5215634cf687c952c31beae3149e2e3a9084ca75a6690e387dae6e5866b3070c38769f46f3f0a517a09f74f
+EBUILD inkscape-0.92.3-r1.ebuild 4183 BLAKE2B 074d57b407abdc33e616d7d6229b9b7db12fc6ed6c5278797bd62296403815d6900081c5fd5adaf20ba4a12bdaf083314531ecb8f10212f51e9ae8293d113ada SHA512 09ec9080cc60458b98deaeda24ec08b27200db024f3f34270264576b4edb9d3a6beb241de0c0a2ff5d019e072538c7279385b0a242dae007d41395de5032a6c9
 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b
diff --git a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
index 82f1004b75f5..7e552f52df9d 100644
--- a/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
@@ -12,7 +12,7 @@ MY_P="${P/_/}"
 DESCRIPTION="SVG based generic vector-drawing program"
 HOMEPAGE="https://inkscape.org/"
 SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2
-	https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-patches.tar.xz"
+	https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-patches-1.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index 49ad7dfa3723..76c4d5cfdf80 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -2,5 +2,5 @@ AUX photoqt-1.7.1-cmake.patch 358 BLAKE2B ecadfc9f5ff6cac0535f5db36efc87f37705e7
 DIST photoqt-1.5.1.tar.gz 1596831 BLAKE2B 306beaf97cb9e81a2a219e9549abba35eecfaa0f2ad79d769095014d73708f525d5efa3ff4d83f75e89e0f9971a3a46da8b98ca7259b3666e27fc9addc9e836a SHA512 ccb4ada12e76b611475ec66ceaa2ad3a15f92311d2b7c22aa8b94cd145a062bf502af6ff40fa9bb681c5dad97b2941c2a8203da4ac937c8d86c34d805084ec7c
 DIST photoqt-1.7.1.tar.gz 1324774 BLAKE2B b739508511cdc34b6de5736260692c48186a49d0cf62d8283238ee274d2fdf73716589277fa602f86c8c15fff87b49d1700202d260480e002dfa18380b47d328 SHA512 50cee1a77a5e69d05f19a8f1ac8ab18d1ef420962b05f3a76e12ce0f3202db7037c894bbd7631674504f0e51c2be690aff4248ed343d0da2dc8a1ccce2d8e078
 EBUILD photoqt-1.5.1-r1.ebuild 1133 BLAKE2B 3b5bf5a7baff887bc09653a2799c3372713252c9668f3d95650e2dfbdcba77dd82e637d9a9a3688039d305e8ec154e7d0a53351dbe8774f45f4f9feb204a6417 SHA512 991c545c015dc3fb89fc3311472e5fa46433015311ae7b8b26e704d910ca3fb8a405dc69241fe2074ed23339f7b185f070e31ccc0d238880e9b7cf43cd08960a
-EBUILD photoqt-1.7.1.ebuild 1412 BLAKE2B a06a7833c31cda115dd5d0cb9005947e3a2bb44f3a45f7412751fa4cf0b365b6766a06488f4a7596c878f2872cca2e306e4d563e461b18277077a05e5d653a2b SHA512 cee04e12943c117d3a5cbe8932a65d7f691ea8fb5f1b8b33cc72a598f81ec4f6a38291be127b683b052935dacfaa945e4c8bd63aef2221b79da81f7bd828403f
+EBUILD photoqt-1.7.1.ebuild 1411 BLAKE2B 3e9d31303859cda721e5929022824df652be69b8f634807513f024d7ed9fc4e9a7523a26b3930f850971696cd837cc89c480e85512e168b8966489cd8aa8166f SHA512 0f8b88e6bcc2d1003d453153635f168bd923c3d3784547ef32af1a3a3f0203760e845e17d259468c4ceedd14485c36426ab59623ff540e40f8afbf533c8b3b9f
 MISC metadata.xml 474 BLAKE2B 44114be5222dc1c0ad5a926fc6ff85da5b284a929a0991795632896c0f56ad24021591260c899549eda9b36557dc251363d17eef52928930afaaafebdf29bcf3 SHA512 50c4bf4437dec5d9919e3a16fdc4e429e3fdbc8d23656ecca57ae7674bc90bd6e8e33949191d7c15d49cbfe5451e72155e1bf441f020a44ab98b35115a29b6e0
diff --git a/media-gfx/photoqt/photoqt-1.7.1.ebuild b/media-gfx/photoqt/photoqt-1.7.1.ebuild
index 9abea34299ff..fc23fddb9b72 100644
--- a/media-gfx/photoqt/photoqt-1.7.1.ebuild
+++ b/media-gfx/photoqt/photoqt-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://photoqt.org/pkgs/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="devil exif freeimage graphicsmagick pdf raw"
 
 RDEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 8977a73c8141..744394bd7466 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 39119a3d92b5..5fa8151309b0 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,7 +1,8 @@
 AUX gexiv2-0.10.10-meson-fixup.patch 1718 BLAKE2B 0460652424a8314eeba8f0d677b5dff5b0efc9165079c9232824bbfffb2a13a1ca2acef89ae066bc13ec4c40baef4ac4b1c66c02d4365b999fdd4f54858ea7af SHA512 06f7b13502b9397770b0d9ab20dd70d902feb7d70fd42381cda53183859db15102bbf16d0e4ce5f9b124de99c58c8e4cb0ec85ca1c6f60e3e5287cafcdfadd64
+AUX gexiv2-0.10.10-vala-fixup.patch 1785 BLAKE2B d82ec357f2ee7d50b79fa1c82bd9c4b6d0a528561fcacc08e966c73f9d89daf3c2ce2e2712f69e246507e14e0f10a0a5470c830e43aeeb06fdceffc3484cbc0e SHA512 e9708245ddee0fb88939ae26987e4e5859fd5e13efb03f01d276eeb77d4361832eac11b2873e73984ef25dbdcf502f2f3a82a78330f3c7b57b2e186cfb49395f
 DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
 DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
-EBUILD gexiv2-0.10.10.ebuild 1778 BLAKE2B 8c3bdd09c48b1337049a4f971fefa9060ae1b572e884a7911dad8b7bf87ea5cf7fe7afaa0afaa92a3a76df71d16603f6ea1e3f2c93f02cdf6b7e06ce3b77ac75 SHA512 45eaf8081a3d45f7232a284c75a09ab34c4e4ec28fb73ead465a6b1c634999a444c234a5cdb4ccd8e8fcf94b88979ea6827a9f91804f82bb7b9a67ab4957c1b2
+EBUILD gexiv2-0.10.10-r1.ebuild 1824 BLAKE2B 524284f047a6cbbfaede824ed246504f8f979166e007d58bfb82faabaccc11a361364deaa031102652b8864bdc9e8d72070eb3bc45828e03770e52909d900513 SHA512 83dcd434159cccef0002a7a13588b69665a905a9326eecec4f6ccd993b29919c249fa33d4346bff4b9c079f8daef54b486df492cad71e3e86778996dfee39af2
 EBUILD gexiv2-0.10.8.ebuild 1527 BLAKE2B 6ddf3a6433cc5d6b566075718011be7ad782186482a3146533fdd1364b5385f2f8977e09a5ec3c73f7624fc929f6f8753d30bacb60ee27f35341c49a68429860 SHA512 2f50314429b7cd4b47bb5172c801490551cae93989a41d919ce7ebf35d6c0005a657507019dbf0356e4ff8f405747492782a95796558e9c4e05e446f043f2ade
-EBUILD gexiv2-9999.ebuild 1621 BLAKE2B fc25baa5039abad251d79ce4ed59ce05eb878604608e833c65e835486f3b6724eff0a90c491eaec438f7405ae1f8401624ef6e7c7f6477c265d180641c08e6c2 SHA512 634213f60b484bbe46395938fc1bf64a13ea01da2b8531de1ea8e0ba0e3328c41b74d6eb945b1af9ad1d4d12bbc77775200963b17d7d765f9b944ca2c056ecd0
+EBUILD gexiv2-9999.ebuild 1621 BLAKE2B 20ec61c95e9cd66dd9a835363a27a439fa7fd70daf50ef79553d17e2e7347913fc7f27755118f109d7f74ea97c9d517e5dab4b30e0f118675d310e8d55771c5b SHA512 48a71d0c0fa913989b741b31810703781a7adbda6031d3030c152d5db25650638ce80de614551f7336b99986d57bfd361a1c743e1063259ffc8ef77eccf0c6ce
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch b/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch
new file mode 100644
index 000000000000..daf72ef3a85b
--- /dev/null
+++ b/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch
@@ -0,0 +1,49 @@
+From: "Marty E. Plummer" <hanetzer@startmail.com>
+Date: Sun, 13 Jan 2019 13:33:32 -0600
+Subject: [PATCH] meson.build: improve handling of vapi
+
+As it currently stands the vapi files are not generatable on linux
+distros which do not provide unversioned valac/vapigen. Use instead
+meson's add_languages function to handle detection of existing vala
+toolchain, which will check the VALAC and VAPIGEN env vars.
+
+Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
+
+--- a/meson.build
++++ b/meson.build
+@@ -6,11 +6,9 @@ exiv2 = dependency('exiv2', version : '>
+ gobject = dependency('gobject-2.0', version : '>= 2.38.0')
+ 
+ gir = find_program('g-ir-scanner', required: false)
+-vapigen = find_program('vapigen', required: false)
+-vala = find_program('valac', required: false)
+ 
+ introspection_available = gir.found() and get_option('introspection')
+-vapi_available = introspection_available and vapigen.found() and get_option('vapi')
++vapi_available = introspection_available and add_languages('vala', required: false) and get_option('vapi')
+ 
+ subdir('gexiv2')
+ 
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -17,15 +17,11 @@ regression_test = executable('gexiv2-reg
+ test('regression', regression_test, env : test_env)
+ 
+ if vapi_available
+-  valac = find_program('valac')
+-  if valac.found()
+-    add_languages('vala')
+-    executable('gexiv2-dump',
+-               'gexiv2-dump.vala',
+-               include_directories : include_directories('..'),
+-               dependencies : [gobject, vapi],
+-               link_with : gexiv2)
+-  endif
++  executable('gexiv2-dump',
++             'gexiv2-dump.vala',
++             include_directories : include_directories('..'),
++             dependencies : [gobject, vapi],
++             link_with : gexiv2)
+ endif
+ 
+ if python2_available
diff --git a/media-libs/gexiv2/gexiv2-0.10.10.ebuild b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
similarity index 97%
rename from media-libs/gexiv2/gexiv2-0.10.10.ebuild
rename to media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
index ad4135f9b2a5..d0fea160c649 100644
--- a/media-libs/gexiv2/gexiv2-0.10.10.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
 	# renames meson options to current git HEAD's names, current naming scheme
 	# is rather awkward
 	"${FILESDIR}"/${PN}-0.10.10-meson-fixup.patch
+	"${FILESDIR}"/${PN}-0.10.10-vala-fixup.patch
 )
 
 src_prepare() {
diff --git a/media-libs/gexiv2/gexiv2-9999.ebuild b/media-libs/gexiv2/gexiv2-9999.ebuild
index 2547c6a9ca91..1c6c54fc4d10 100644
--- a/media-libs/gexiv2/gexiv2-9999.ebuild
+++ b/media-libs/gexiv2/gexiv2-9999.ebuild
@@ -57,8 +57,8 @@ src_configure() {
 		$(meson_use gtk-doc gtk_doc)
 		# prevents installation of python modules (uses install_data from meson
 		# which does not optimize the modules
-		-Dpython2-girdir=no
-		-Dpython3-girdir=no
+		-Dpython2_girdir=no
+		-Dpython3_girdir=no
 	)
 	meson_src_configure
 }
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 8c2869ab846f..0adad81b9d23 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,9 +2,9 @@ DIST harfbuzz-2.0.2.tar.bz2 4322171 BLAKE2B c844a623de5c2be7b6fb4a2cf0d38e689a6e
 DIST harfbuzz-2.1.3.tar.bz2 4429069 BLAKE2B d00b5e4f83e9e4b8032cd4f0a8c00d3f88176118458026de69a68f1932bf437358dcd0ecea89f40a4f610816b1709f3b0784c9a619141fa459297754d934f42d SHA512 9bf5f7b857424037a3b3ea5c286e6ba8440c265fa663cf6b6c22cc08d36d84badfed8bdc46816ad982fc810677ebecccdb669ea98a021207e1858c8c355dbf19
 DIST harfbuzz-2.2.0.tar.bz2 4506619 BLAKE2B e2ff32f4490e408a7f67b4e1dd12f266e31a8b58f4960643be45ac9574ce20da8f26e0d7261a9710114621b7f6928df030fa30c3a7672ab5e2b9d1b5c0369d2d SHA512 5e8f35c0d7634afc6f623a91d56bfde46b2a1030d439e5dec196001d49a58e409a1bf66c7f9c15a04e030dab4fe2fe2c928061839b1e985459d4f8379b8a0818
 DIST harfbuzz-2.3.0.tar.bz2 17909479 BLAKE2B 32ea08ac60ca3c6b91a41b17d857bcabfd6f13785b674ceaf7006cd0616e1799d1d5f390f5b8d37e2bb22ac5506f00a6fc5c9a6a5263c23760ffe0e0677fe44e SHA512 830c5b96384554fb6d2502713e9b2eff384dbe6aa3feb08830226944bcb07c8fb55237f389e1e6416d0942e3efba8b1ed54a49ff8c4762fec230f2404095e85a
-EBUILD harfbuzz-2.0.2-r1.ebuild 2936 BLAKE2B bbf09e1b29358bffcdd9f92061186e46c78250cc9c8fc49b0a8f57030f668498e42086c17755a8567e5b1c768bc8bbcd686e1da6897005e86f9adb38a467c3e7 SHA512 7cd5c9434c88abbd8eb9c34872c0c0cae32a05bc125ab39fab505e60b7221dbe412cbd1dd11dc96773da82282648746223eaa49e77c89ea3e5b432d607e05935
-EBUILD harfbuzz-2.1.3-r1.ebuild 2947 BLAKE2B 05da7518a96f2faddd40b3dbc4a8b06398fcae7c95f0d910641306cdb0eaf58217628f37a39d1e2ec5522d0c2b6554d76ece90e39fcf127d9591bdcc2976c20c SHA512 22b10b36d27ba87cc3a78ecb3f5bdaf52791dba839df4545593c06b45ba487998bc3144a37d841bfce27f28d92c77aedb9790143db0da961f4b64b24a7be478d
-EBUILD harfbuzz-2.2.0-r1.ebuild 2947 BLAKE2B 05da7518a96f2faddd40b3dbc4a8b06398fcae7c95f0d910641306cdb0eaf58217628f37a39d1e2ec5522d0c2b6554d76ece90e39fcf127d9591bdcc2976c20c SHA512 22b10b36d27ba87cc3a78ecb3f5bdaf52791dba839df4545593c06b45ba487998bc3144a37d841bfce27f28d92c77aedb9790143db0da961f4b64b24a7be478d
-EBUILD harfbuzz-2.3.0-r1.ebuild 3003 BLAKE2B 240506e10bb21cf0488f8eada75af0200ee67fd360cca7ac615e9cc0b65efee43953089a9c6e27b5a7e866c0265399bb590ff3755db8ba37ef8151184388881c SHA512 c44f6bf8ef4931117d1f8c6a7370645d3fad53b74555e40521bd98881fc88525ad8f6d59166b816277dbc91c4c4a4ccfb17d723332e95da8aac2b4cac341d085
+EBUILD harfbuzz-2.0.2-r1.ebuild 2967 BLAKE2B a4521347729a2533a10ef6e28c54d91c93a93198db6f1199fc3534503780a74e6888fb370b59f85df07c057dc4d51983c54fc3cac86e1f18031ad3302fbdf2ea SHA512 6f824127087d1e5dfbc3f13dc23b06292feae1ade55715e5318ce6329ff15f087ac7cb0d69606f77408a3616df5f35ed08f9d2f8faa0beb0a58974519a9ce807
+EBUILD harfbuzz-2.1.3-r1.ebuild 2978 BLAKE2B 28da2f568845f63ec69230c6a986b3c305b81c365ffcb53e3ab372ea70991adc4482a1d797f1e814ac7e444941902a377e1ab72994c0827d2ff1e1cb575ee048 SHA512 e5943083ac65035cb0017f6df360fc0b9b119412aae6ef4a2642cd565c592d90c057b7a5d53f52c1653d2f93375d6687ecb926a4c66844e4430b894fcad7555b
+EBUILD harfbuzz-2.2.0-r1.ebuild 2978 BLAKE2B 28da2f568845f63ec69230c6a986b3c305b81c365ffcb53e3ab372ea70991adc4482a1d797f1e814ac7e444941902a377e1ab72994c0827d2ff1e1cb575ee048 SHA512 e5943083ac65035cb0017f6df360fc0b9b119412aae6ef4a2642cd565c592d90c057b7a5d53f52c1653d2f93375d6687ecb926a4c66844e4430b894fcad7555b
+EBUILD harfbuzz-2.3.0-r1.ebuild 3034 BLAKE2B 83bf6f358e3799d0cdff7e5c7becbdd00c3fb34466552d427c42b9129c379990064b917d0ffa9d7b40d3e68a1730b5b2059052dadc2f1af2607cf841adc03f3c SHA512 158d7bbb98b60a8ce9a860538671a4fa64e1c9620b91da68126b0db0ab19658a668de4f2d436c22056b193e0b2256cba9ae66dfc14f7a71f4e19913b4bfc6063
 EBUILD harfbuzz-9999.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
 MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-2.0.2-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.0.2-r1.ebuild
index b8600d818ded..2cfc66808b22 100644
--- a/media-libs/harfbuzz/harfbuzz-2.0.2-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.0.2-r1.ebuild
@@ -86,6 +86,7 @@ multilib_src_configure() {
 	# harfbuzz-gobject only used for instrospection, bug #535852
 	local myeconfargs=(
 		--without-coretext
+		--without-fontconfig #609300
 		--without-uniscribe
 		$(use_enable static-libs static)
 		$(multilib_native_use_with cairo)
diff --git a/media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild
index 10bc7d68e303..9223739ba804 100644
--- a/media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild
@@ -86,6 +86,7 @@ multilib_src_configure() {
 	# harfbuzz-gobject only used for instrospection, bug #535852
 	local myeconfargs=(
 		--without-coretext
+		--without-fontconfig #609300
 		--without-uniscribe
 		$(use_enable static-libs static)
 		$(multilib_native_use_with cairo)
diff --git a/media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild
index 10bc7d68e303..9223739ba804 100644
--- a/media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild
@@ -86,6 +86,7 @@ multilib_src_configure() {
 	# harfbuzz-gobject only used for instrospection, bug #535852
 	local myeconfargs=(
 		--without-coretext
+		--without-fontconfig #609300
 		--without-uniscribe
 		$(use_enable static-libs static)
 		$(multilib_native_use_with cairo)
diff --git a/media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild b/media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild
index f2bf9692ac9b..08348f2ec48e 100644
--- a/media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild
@@ -86,6 +86,7 @@ multilib_src_configure() {
 	# harfbuzz-gobject only used for instrospection, bug #535852
 	local myeconfargs=(
 		--without-coretext
+		--without-fontconfig #609300
 		--without-uniscribe
 		$(use_enable static-libs static)
 		$(multilib_native_use_with cairo)
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index fdde75373675..0cb72da8cb89 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -2,6 +2,6 @@ DIST libgphoto2-2.5.14.tar.bz2 6992238 BLAKE2B 6173ada55f032ae2b630db5324c87ad9b
 DIST libgphoto2-2.5.16.tar.bz2 7006551 BLAKE2B 79082e691d4d9061cc35c35cabd7d0d16407764df43f8abbc7ff80f7a2b734da78a2a74a17ec2e014d9050c75235c700f3de90b61ca9fb0d68fdcc7dde64269e SHA512 7863192c2959ffc8d771eca294adc54090192e3207cf8d3a9bf143e50034c3f1248e7fe41cad75f758ab2ad09c9258d50967b921adf3223d7c74370faa110a9e
 DIST libgphoto2-2.5.20.tar.bz2 7290524 BLAKE2B 0b616863fa74430f16d96a37955f655620a88fb2df2220fbe9337eb0f61b7babd9d36e1f1d58f45ca617c57feab93e9714228eae54c742385c3e4b0fc3667ff5 SHA512 13364a8fdfe137a21ebf04dfd2b30b20c7fb652e11e1b98cd06176e9a1576ef8f67121523111395100ed39d1d3e6e5d6d458b86d58502f7056a1c06a5623640a
 EBUILD libgphoto2-2.5.14.ebuild 6227 BLAKE2B 8190fdd390cd567388bf0648ce593e50c38778f5006a096bb0f8bcec061b9f1c7b7c7d369dffebb0bb98229c1c588c592f8d9ba2948c81de1b0efb97ed28b037 SHA512 361a169bc125a3833c2c6f795c908a7c3cce8ecc21d3961d4a8e556048be3d588b5776134900bd16eeaaeae032966fc4b20f55f1c3c5d289ced3c7029af391d3
-EBUILD libgphoto2-2.5.16.ebuild 6225 BLAKE2B 84fea70c074baf5e3327ae394b2d63e9198fb7782f5e07a1a7b4cbcd5b38dd7b24f69359665971e6799271bbd65396af6c772eb6bf3847c81ad4c1e4fbc56c37 SHA512 b5ef7e46b153fc0626cfd7623e3d95b721315776be4a26c5e52b4f59fd095ba61b4af16701e1825676509e1f9eccd65a4a19ded9b1f0440ee8c382c9a290f8db
+EBUILD libgphoto2-2.5.16.ebuild 6224 BLAKE2B 1476fe208ddb0d72622e532722173f743aad470b19bf2e7bfc6d0fbd3dfcbe0da994f15297a79f95d457e7d5d48f676cb1a265b75ae5a555554273ca5e2f2bc5 SHA512 4129d67158d3f443a407e979d11fbe563b7c759e5c742e1f6fec79edbadc085e482e54e5c6152ab45e7998149ac4dc8b2c73dd29d697b5d384428403c7924dc3
 EBUILD libgphoto2-2.5.20.ebuild 6233 BLAKE2B c87d500b7401ccf5d140eb5fc42deb98a2d6a96d6d4c0c0b777620c03183fb424d82221ce5307574344ed369f155d6aa53cb7c70016a5c69f28176f15cc0ddb9 SHA512 8aa7c58e779b1a4bc548ef2400f707c9e5aca4954232279e6435c79f44f357df8dbee6da906a0f57d806d79a2727cd7a208109ced955d0184ad5b533566165da
 MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
index 82b2906c70cd..2575e4781e8c 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index c6f15d91ae14..bfd9456eac13 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,15 +1,12 @@
 DIST libpng-1.2.59.tar.xz 657424 BLAKE2B a64a8e5c914a20b1f16a219b508b06d12ff28903083792cf07dae841ad13b3636b9d715d9bbfc459a134dfdf2a9b37bac1fbcff14a91c214340325ba8266431e SHA512 bfdc51eca72a76697f1396611a08aa4ce6a169837197699c55d845fdef17850e8f7665b7b81ba815c277453737f12eeb41409ff9c7eca1ac0c0d134c44492a6e
 DIST libpng-1.5.30-apng.patch.gz 10272 BLAKE2B 335b99e30a476b358483b0ca44d895580bddad05d18ab7f47b4cfa383a04c53c1db7d5773919445c281b0b0921485b946cb67c36db07aad494f051d4db19e4e1 SHA512 1c06e2e1b2420580d4399b7b752df9ed193c81febcc9983351fc72ce3900dc43a433780e7a0184b612b7723d8870a514db7398ec0c081dabe6cb4ea824880236
 DIST libpng-1.5.30.tar.xz 756992 BLAKE2B 02813c7cf06e61d429fe963ae2c1e68bfb390b8eeea52147f582729b4a86c73055c2c79eb3d0b533587dd5a16dc0abf7afd986794c01ec59ae0a7dfe3333a989 SHA512 8716c6720c1ddbb38f439df42dbb472d37490fd207efe59bd872ce9adec7359025dc84544efddd19c8e339ecc28389a746e6987ff41ac6e76915c1e1d2c6f20d
-DIST libpng-1.6.34-apng.patch.gz 10411 BLAKE2B 4f6a5f7c2dcdc47e88a4687063958b18ae29c6f5168a339aa1f47abd8859126ea6d658ebc6645a8163b4127a5c0237f4b858fd0979781147fdd5fd23c0bb1098 SHA512 d4088399d2e9a2e2e40d5bd5dfb478dbd11c7065600287734aee7b3bf13a9574d17d3890e705c82705275fd0c11848155fbf960acd2e8eb890a7656b4140340c
-DIST libpng-1.6.34.tar.xz 997968 BLAKE2B 4cd0c46d11097cdeb0e419f1363cb9632ceaf56729a2d11e78361292568dce5c33f8fd24c56a5c5a007f419b8bc14fdaecff6db05ac2acea51b2374a1f57b848 SHA512 89407c5abc1623faaa3992fc1e4a62def671d9a7401108dfceee895d5f16fe7030090bea89b34a36d377d8e6a5d40046886991f663ce075d1a2d31bf9eaf3c51
 DIST libpng-1.6.35-apng.patch.gz 10396 BLAKE2B 5f69db106909f690f3fc96dc14db3c7281c3abb0ea9cd119fcf0cb6584eb1eb5f244d57e4ec7198614f3df5f9b302c0de2b447ed0cbacaa7b15821c2e3c23cf7 SHA512 40cda24d003089c31786b70fd581cdd960f338ae89535646a2188bc8e25e603a6ad2080406017bd45edb298442a88dd60ada1ec650b001596d216e8194a3dda1
 DIST libpng-1.6.35.tar.xz 1014320 BLAKE2B 2c1d8a4a1af8d5c67c8c18414fc1c32ad41b81e5300b3fe72c2bb89afece764087c7829308243e5eb24e7d685c56ba6c151b66ef64603528ac0406d89dd4cc4d SHA512 b69152bc7869e98536effa8e45e2dac7bffee26aa9e31fc90b37506a702256919bcf4dd9cadc42fa4e45143bc023ffd7c637742367e58707e8c2226b3a09eee0
 DIST libpng-1.6.36-apng.patch.gz 10329 BLAKE2B 8c97da493a1eed697d8bbba96dea992b17360f5e4844b8d43c63a73684f09094d28d0032a8311e39f633c449674e7aec7bab0e923d9df8ff2a7e17caaccdef5d SHA512 1c82e2399dd6dea14955a4e8da8d3f50bbcee42676dda5d7abdd36f27d1228924b0107d0174258adeb2eec8ba74b267d8a778b72b72f6dcef176608d5ff7c912
 DIST libpng-1.6.36.tar.xz 1012544 BLAKE2B 6b89e39e5a301e9e4d7fe93d97e4b8695a214b5b102cc1b21455baea2608b99003110f6f20beb3464e1cf62762a35917bdc07f31ba5aa041776601cc9651809c SHA512 a86ee977df69748e5039fb0ead883f1d3f88b8a701fa24cf8e62dd77c5871bb46397d794fa33ec1d0be1ac488246832ad79d0e6117ac093bdce1b2a1cfcb2bb0
 EBUILD libpng-1.2.59.ebuild 873 BLAKE2B e19aeca3f3b0595193b7b6ae55d0c9d4f8aa63a4475d305f764870ffa45cf7adf2b18c9203794d4516b2acbe1f10b7a1856fd09203078ee922bc60aceb559a61 SHA512 8b178d6afd6588e14225260442d63082aec001ad187e6acc9a8192140b5e8dac321ac3ea18d36f2194c885120b3c5a71a6daaa1d020a270bb1cd5199f918321f
 EBUILD libpng-1.5.30.ebuild 1644 BLAKE2B 059c2e421bc2955c6ebe7ca95b173f5e85e1fadd8721eb23d0964f786a5497751ee8c01de67370351e4a0b5ca99fda3dfe157d2489e194e145ed636134ef05b4 SHA512 64e8f007c376d46f9d7314b7d4bc322a9c25ca9e470f52fa607175f95e05e2c00f932a406daeab634710b0825a5a5714b4401d2e1285b3b23f0da1435142eebf
-EBUILD libpng-1.6.34.ebuild 1360 BLAKE2B 11d1403fff7fd1bba30a01824ec30a7753bcfefa033a06836d4002acd282af289b5ffe33e2b38e82f866043080671c965c605e46cc3ed059d3af9adbaf468a3a SHA512 666bb4b039a0c61289d9d2b37de6cfeabda2d44254b0a9a9d3c9a432abedf47371cf543ef9e5781dad8979b5fc77d83a26d36aa6ce15657230230e2307364256
-EBUILD libpng-1.6.35-r1.ebuild 1365 BLAKE2B af5ac1a2d6b23f8d719d10d40f261c6c4e1813a7397fcaecb42b2461d49c6090eb00268afb81e4a602e2826044e2b6c25a5c7db9404318c4f95dfdf7e7baca7f SHA512 a468177bff85f61a1373c508c0001e5a9746d46e17a1a29ea3bf17ec731598d6927c31e42878955ef15becf214e34e4d3258e139c870ec067e59196141f61841
+EBUILD libpng-1.6.35-r1.ebuild 1364 BLAKE2B faddeabf1a0aee8ee88b124800bec19063239e02e78eb159328df92bc2f2f85572ebe9e30a44283f9bbac831a7c1216b4d213c6bb6314813cc469bf2862ca45d SHA512 59f6e5f5761d3d6ebd7070e2e11d6d722522b1aa0daeba61facb045f9c6e420bba5f2e0187d89fb6d5cc4860653524665c02a4d69b06d6e20b52ac7f39fad251
 EBUILD libpng-1.6.36.ebuild 1375 BLAKE2B 1e4df515db793d7fc7e7dbecb3a9b07c56a3214ce337573a9f91fd010ce20c52504d0d6367122418cfb2d21fea4f6f289036737b9fad3b52a6a0e1d6113f9788 SHA512 19f546997b31fbd6dbdf4fb4bc2cc113abda654d7c8a933e140acfd33f6627377e75bdfc7897fed5af3466a7c02ca8a63540643c7e1f8f7a655d5c1a06c03583
 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
deleted file mode 100644
index 0aab745e74e0..000000000000
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune multilib-minimal
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
-
-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 ~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}]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-src_prepare() {
-	default
-	if use apng; then
-		eapply -p0 "${WORKDIR}"/${PN}-*-apng.patch
-		# Don't execute symbols check with apng patch wrt #378111
-		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
-	fi
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable cpu_flags_x86_sse intel-sse)
-		$(use_enable static-libs static)
-		--enable-arm-neon=$(usex neon)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
-	einstalldocs
-	prune_libtool_files --all
-}
diff --git a/media-libs/libpng/libpng-1.6.35-r1.ebuild b/media-libs/libpng/libpng-1.6.35-r1.ebuild
index f1f841336979..442c01532f55 100644
--- a/media-libs/libpng/libpng-1.6.35-r1.ebuild
+++ b/media-libs/libpng/libpng-1.6.35-r1.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 ~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 ~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/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 62f1352fbce5..1657fc00212d 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -4,5 +4,5 @@ AUX libsdl2-2.0.8-wayland-headers.patch 1014 BLAKE2B 72070a3710635a3402e9fd5f6fd
 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
 DIST SDL2-2.0.9.tar.gz 5246942 BLAKE2B 901ccb36301d7c9a76bb9f645ff3bc642ff101b969cfb0eff065db9de25a9ed3e80a0392b76dabf414e8f18298485304e45a9501786166709e31014e795bef03 SHA512 a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10
 EBUILD libsdl2-2.0.8-r2.ebuild 5260 BLAKE2B 14ec9cbb2e0ef3718139dc4c206dd23ade81bca016150f555a937f5e527b4df9576f98c4834d418ab3c90b30dfd429e2cf9ed1152c39103a59b9001af7c3f05f SHA512 6802c880e54e7b5e961ccc996fd09ce3f9501142c4363097ec17b82dd00f400c312d58db34969307256951146d3c4158dd7a67b002f6d39938bf7fbc5cb4d040
-EBUILD libsdl2-2.0.9.ebuild 5316 BLAKE2B 5bbeea9a2eaa0f14fa8cdd5a7f20a503698a6d1d725a13db96d7680d2898d82d9ba13e989fcf0e7c874f9466735b3143f1eb7250b4edf31e5d476e495ab81331 SHA512 de264a5f0be83efb964e4c4917b372bc2f935a7b184ba65182efe7445ab1b81bfc4c31c50f16f8339d0575a06b554defcdbb7fb236f3a0235bac0946db5000cc
+EBUILD libsdl2-2.0.9.ebuild 5403 BLAKE2B 7e1ef3bba616ace2fab58c328a508583cde5eb66d390acc8633a2bd1eff137acb51b1e3803598c6e270aebe799cf3e212f65d8b2a8e7d0d81d13639aab1842ba SHA512 35dd2ff114582a033b4d7028c7fdfd22d14faac5c092d0aeee9aec1d61bb4c12a0c02cfb496e248f5ffcefef60806d03ac4201fff2a3fb5345a163c4b229e463
 MISC metadata.xml 1653 BLAKE2B 37ded083266a7086c89e02ecf5a79ea7c56c85ef50474d200035a96f425345c5882288c594c0d7ede0de4edc0f2b570fcaee60f98e64b45d152af1964486be38 SHA512 9af14f6cbf34ade124c668374929122f37badcbbeec765cda4a68a9475d6eb4e5159e71607d82aa2c664c6049d24077d1ab58f163858104a86367f3ef51a33b3
diff --git a/media-libs/libsdl2/libsdl2-2.0.9.ebuild b/media-libs/libsdl2/libsdl2-2.0.9.ebuild
index f8a5627c9eae..ebecd611b4c6 100644
--- a/media-libs/libsdl2/libsdl2-2.0.9.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools flag-o-matic ltprune toolchain-funcs multilib-minimal
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
 
 MY_P="SDL2-${PV}"
 DESCRIPTION="Simple Direct Media Layer"
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
@@ -181,6 +181,9 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
 	dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md
 }
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index a7088bb1ae0c..4a1f68a6e2d7 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -6,29 +6,13 @@ AUX opencv-2.4.3-gcc47.patch 835 BLAKE2B 2e0f71fff77a23c2db9747d8bb7f9301de18acd
 AUX opencv-2.4.8-javamagic.patch 1165 BLAKE2B 0f12fd471145e1e303a517e5bc704fb5abc5ac5731fb1eadf08ef61e618bd70f9348c9c7a23296eefeb37826fd6701baaab0fc475ad0c441302b20516cf9bb9a SHA512 fd8a0d33997889c9316c0a4474c836b2528b676cd26bbb0e6ee2262377e45c5a0c465534831bd7fec3c0aa9cb198bc792a53f958b05a5217009314b678076d64
 AUX opencv-2.4.9-cuda-pkg-config.patch 373 BLAKE2B 389a27607926170c38c69cba955e91e0dfde65a51ee88dd0aec315056ba0f36a303ef2d4b95e226f323e92c59a251b93e9deae5cb3822ad69d257e1cb3cb1f34 SHA512 5b8f931758c6c8edfc3cae35a16d1c8674f17716f13b424ee0510eb313f06ed334b80205262e6bfcce22db235467cad81fddfa96e0cf669972794cc8524f6937
 AUX opencv-3.0.0-gles.patch 481 BLAKE2B 3eecd8c754abd9fdbfc2878b8b5a8b5ac3c6410342eb0756162ac901fe0903f7e1236bf2cc6e2ec5c7eeb638037f0dfad2b5aa9ebc905c485c4084936daed24e SHA512 37cac226bc39b91a87e4891e1d58169a0c2723240215670ebaecbfaf9b066b571296041fc5140aff7274cc44ca132b6f1b3bd4cf6d6dd23b950cac6eca548ad9
-AUX opencv-3.1.0-find-libraries-fix.patch 2056 BLAKE2B 5527e02dfe9545b7d3959ef98f1f6402c199115bb337c1f3f3d7228ea5d640a74bb41c1866a60826d689e341b40fcaad56f9fe25ffdeee96f4642b5747d19938 SHA512 3246a866f347f5f9715edf1ae759ef7097bc2fe54dab84838cf1e229bcbcc33d5c97224a13ab20546615cee03d4475b3ec1b44ee894676808b7212f1b4b45bd2
-AUX opencv-3.1.0-java-magic.patch 2302 BLAKE2B c380c7563dff740ff4105a8c50f298939596c5a2d787f2de1c9a9d77d8e2c3acfa971791426138869d8e9dde2b1235d7217e35e78e535d8e43b6d44846d2e391 SHA512 ee10c3fd6897ab1a8c4e006994b15a53d3d3ba7fc40975b67fc0a4104daa4473e4edabe9b7cdf1b82f87b14500d6db29485a1ee197aa7381551f030a7ba23a22
-AUX opencv-3.2.0-contrib_xfeatures2d-autodownload.patch 626 BLAKE2B a505fc9a45cbb783c2eb43b6f54f4be8c00b54a85f8bee7d1294ddbb54b02b34a03185773e24e3d5b4cc9d2ed1f61f65609430b4a205f34a18da6171124d0beb SHA512 74d21eb562a6b1bf28d20bad4221b3d158ed76925a255498f548726b83fa0c9d4e234ba7df8c58deaf662744a5e9da82d2635ea60048ef90f63a97e76fc10a02
-AUX opencv-3.2.0-cpu-mno-sse2.patch 383 BLAKE2B dff2ca26a8c0055afc82e04ed4131baadcbb895519c4d311f8f896e5ffcd2bb4bced791cb7455ad4039ceb3d112df2958e05af07780303ebe73924fb4e53dcad SHA512 139a4e0bad15b3e0a8856716d4621d5e7d49a0ba1338d16bd32e27eb881849a43ed22fdcc6d1502a295e023abc325835677e8683aac35f6d561c4a04ce46e978
-AUX opencv-3.2.0-fix_ussage_cpu_instructions.patch 1931 BLAKE2B 7a4764d8b0a6d5f50042e4435bf046a1d139dd041942fc6064b7758f3c0d6f531ec7b16ecd4099356b6e545bdcc5ce3ed80ddb8b4afafa729321c9572d5d624f SHA512 6d041966540c9fadb98d13cf3c3302bd800268fd03ebdf38e5da79fde604f3839244c78e7989e8e354ff7e265636f27ebcaabed4f9e0d57f46e3ced988182f01
-AUX opencv-3.2.0-gcc-6.0.patch 407 BLAKE2B 41f4f6416f1cf8418a397dd37ba489780ba9488365837a0cc3df945b0392b00ddf3295208d79a413d27ee76a846ffcea1e5f11bb1a46d46c05d2cffd78bd5ee9 SHA512 2615d79b237df196425628838bbfeead2a9410e3c05d83f134e2f5a1ed6d1225236ad7e2e5797e96d4a0d28743e2ac5a441e385461c3b872c726a6a37bedb4b1
-AUX opencv-3.2.0-vtk.patch 857 BLAKE2B 4fcf3ed98bbf1a566d1af1f16e7dd8eef7734ee9dcb33323ae6c1849313df6c7ad404f93bee7d53906ded46d35ac8d90e25297fc9a4abb361f8e9da52b41c09d SHA512 c4c1f232b1814e7bcd93980a886b9c40b84c3ed41864e102f3a13c2272ab45bda8e488f21f5b1e25137a70533c0c24c83a3cb6355285bab5234ee083ff412d5b
-AUX opencv-3.3.0-contrib-xfeatures2d.patch 1038 BLAKE2B 19b304148474a5baab14c23148ef28e7eccfccf524ef5649d6a03452d02647413b681e095d21dc4c010c3aac12f93e67aacf36a78705fecac47b0d9bf081dcbf SHA512 fbcd3fd68203d9bf865528c97aa69d69e41645d3549e6202d369047840d024aec1cf229f0dfb10e71d78b9433014611bf53673d6f36d60c02a643454955a9e8c
-AUX opencv-3.3.0-cuda9-cmake.patch 4676 BLAKE2B 9de3c4b988720a0b5fad1674d3967271def339c9fe45bd733b0843bede6da9ecc24b6f58b41a8f329f7f97a11e6c9ce6eacb33d9819d046d16acf257486fd4c2 SHA512 a526c9b0b248dac465da67adfd2260c9edd24ad3c335e060af134fa8700c7fb4e4a0ca0450b666966f917fb73ef2f168254a31488ce2bb74262f915d67225f90
-AUX opencv-3.3.0-cuda9-compute20.patch 775 BLAKE2B 7a818042ba9c75fd835b7fc8f6c0793aab8fef6f72964e9b57738e164c67ca16f885a8ad362360065b13bd35d4045e9c1a2683b59cc5d2b4162dc7794558a542 SHA512 00468ac115865acaba15efcf3791a927d6434ee54e37af3dd78bae3485868108ce4d1068ce94739a4d92b1673dd2111ebc30831446d69db4c999b95c5454c9cf
-AUX opencv-3.3.0-cuda9-saturate.patch 1075 BLAKE2B 9e7af021924e84d0f12e8f9b764630dbd35e8d732550f2c16d7f812e9cbd4d4a1499182d7239b266985d39061a8a3f3e95b65e876c8dd339de9f1b764e769089 SHA512 e19b95957c282af846d08d2d6a7d8290c32692af165bc9c627a3d2e42319775d5128a832a4f639915b1331f8db979f2b88c1528e6059aeb78159a8f5409e1644
 AUX opencv-3.3.0-remove-tiny-dnn-autodownload.patch 1138 BLAKE2B 0bf85ca7a0e3759a4de14a844f2929120a47f9c0c212992d078b19cc7a602e157d5233ebc30d7eb6dcfa8c5a9606e3acea15e5a96717842fa80d2d8b3fa3189c SHA512 6824c3fc193491d0d776a7a904d71515309a5b67b0dfa1790bbd402c40b68e813c9fdfc3037a60f31893341ea78553d97470d152e90f34485004e0e50e6d66f6
 AUX opencv-3.4.0-disable-download.patch 1050 BLAKE2B 6f39f61588d9231cc8d877624538a49654ec8cf63091f8d0251cd01cc14684f2f5264c295a149c4a5754a9336e1ad4d1760cc26471fd85a6f571404f7c8d540d SHA512 95f2043c286a7de33fb4718fc1e2ded1fd943b20a5c4cc0c3d7af84fc317e53e3aa6358a33e4781195f8a80904d6bc615171142cde5d30a83d16045d36f85826
 AUX opencv-3.4.1-compilation-C-mode.patch 2077 BLAKE2B 78f55e49bd51ac4377a1db37125da6ca1ddfb9d723243eca7ef3df9d6d7b3922329cdd1c5915d480a9264af623c2953b4edaf81fd53afc950dc19cd49f04ea6f SHA512 203a4376728df6aa3dcaab147654139ebfd296a98d83847ac3ab0184dba828cf2ee298fedf7e7c2c64e1e8965237172fa6f1d5c7a4f6be5165a384d21b6875e7
 AUX opencv-3.4.1-cuda-add-relaxed-constexpr.patch 707 BLAKE2B 743a9c259c59fc4e3017539faef0723e0a80fb9c4bbde94811f32b3e6ae271b3db39fd35487d75078cfbe9e596604c4e37fb5c6c18619ed524c52683219dd8af SHA512 b37ce78495a3bbc439f203d9db81d9bff3e7f980c01ef5187dee537dd9c1025c5163ec3760b48d91a099a2fafb60526c9fe83f7183fc605fb3cc0f5c7a65f6bf
 AUX opencv-3.4.1-python-lib-suffix-hack.patch 723 BLAKE2B bc4b1c68f2c73b40d20372ce4e3232b2db3b414ce2da16a8d84710fc53902211f17585c7ce6daf2d54025b53c04aa74f0c3eb3a30f26bfbc9af24e246f56b71a SHA512 54d2c8189fc1ff06ee1cacf5f375ea976faf339563ee804085feb0ec1f55cdbe10eea7335a786706b6a6152b6f9145156b3e74ce802c3d15b5a23014b25044b8
 AUX opencv-3.4.1-remove-git-autodetect.patch 1549 BLAKE2B 0ed44deddea20d5a57dded6a51d40645e5376411d9c055995fdbdbfbf4252817eaa9158925276661e4958f894898122ec273a352491be53511207345a481db52 SHA512 8496677542981c64ba9763f0d494885f71747884ae3e02de0bc8f96c1802356d917dcc7aed84ddfc2af093456c250bf2fafbdd06f7789aae8c720f5a412c07a0
-DIST imgcodecs-opencv-3.3.0.tar.gz 7724 BLAKE2B 0e1c931a6dd796a7fa8e4a958f9a959d3bbba9bfa636a74a22d839b2919a8e1d0843765bcb69c5fbff7156efad0db2e5b3b70a2fc6e1911c0317ba46142cc130 SHA512 9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37
 DIST opencv-2.4.13.tar.gz 91669572 BLAKE2B 7f6be39e29c0db5d005cb14215fdf5955fa69c34d72c4f1e1fa8bf8de1e748a0d2fe5febb43296ef529c57e4dec8d1b6739c0c4df9e64657b9550ed382fbc4b9 SHA512 efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
-DIST opencv-3.2.0.tar.gz 78861546 BLAKE2B 6d44263792b9cd2d009c7eeaddc2ef87acb01482cc9d36f2fe7717f981ff85a4e5007e4018d3ae15f383f6c3b1a0e009049f319bde0bce98575f04ccd6062cd8 SHA512 a338f4b4cdebfc2dcd763427b9c9632b3a3b0d072117b8e6367c73ea1ac21f7148553a23c7afbb44b01a48be3be95520789c2de1d6ae230b7b414ee713d3606d
-DIST opencv-3.2.0_contrib.tar.gz 54765210 BLAKE2B 6c5bcb1c18da937751f234cc1edaae58416ab9ab5a3407a2ab2c22f4e174ffeb800396d34fe489f424b288fbd608e106cd5f5b458a06a509cea5f7d8e23a67a7 SHA512 eadb6a8a3625235b0c71e29c36d15d9342278aaf9148ef6a7e1aa80f4db0491aaf30b6df16bfd0cd358402b2a3059b6acbce23fb5fe2c0c57150a733ffbbff5a
-DIST opencv-3.3.0.tar.gz 81238534 BLAKE2B 9eac7de8eefbcc9981a249343052c2dcada4e73c3406d545a89b9e6a054a7c7153933537d123f227caf51f23196fcaaed4135229db195e9c4139f2977e034e34 SHA512 13dee5c1c5fec1dccdbb05879d299b93ef8ddeb87f561a6c4178e33a4cf5ae919765119068d0387a3efea0e09a625ca993cffac60a772159690fcbee4e8d70fb
-DIST opencv-3.3.0_contrib.tar.gz 54848519 BLAKE2B 53615af19426bf7a1540a6f23c7803276d6de594260b0d87b06b6b12c9e20326925a275e31e017784e8e876e30df7b8f326e192a75c5300252ae09f50d0d9a8b SHA512 ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e
 DIST opencv-3.4.0-face_landmark_model.tar.gz 63299830 BLAKE2B 58f08cd8c030ee1c8b66e76a561fd625e112face427d001185f8d7c0eaace55adbd8474663021841a1382bfe393a210e64c51223441713cdb9156fac866a845c SHA512 2cd29ce42c08b2966db3ef4a2bc217ab3d07051819757ec6de8f3deea29e28f60abab39f101dba03f766f17018598e411bd687a7eaab0c681c113e10a2de2b23
 DIST opencv-3.4.0-res10_300x300-caffeemodel.tar.gz 10036604 BLAKE2B 2a2de48fc420f13e7be146ac88f311901c5b4e409c30e466152e33cae1f8afd87dcb6d758af447c268d90bd67989c8798cd80cab172b10499a6ad5224509dbdf SHA512 96fee9f447d5739bc01a5cab37c453cf7237457dfb5d2bf93ac37f8e5aa557ac222316f449cd58e37e856abe4d8e9d4a7820daaba32f0b22cbcde8e340287d4b
 DIST opencv-3.4.1.tar.gz 87051748 BLAKE2B 87c83ab9b3d7fb048263f047aa5d6e95b153e1a28f3e34cc885eff7eb080a2258cfa1aa494cd56b32f1098ab158c17c23fc8464fcbe70642a3a1842f2fd1b4ac SHA512 e1fc14285090c6fe9e26e721f2d67d7096650c523147e925567426ef76aa7f4c6f12035d6f6ce3ec7991a75a6828a810fd4f9b75f78ed5fcccecefbadd79944b
@@ -36,8 +20,5 @@ DIST opencv-3.4.1_contrib.tar.gz 57126844 BLAKE2B 63d9d5cb088371754eb132607789c8
 DIST tiny-dnn-1.0.0a3.tar.gz 12885646 BLAKE2B 85c0715ab6c692b77522487775e70b0db645528baed1830c83c9f44d2b67a5207e4f7ea1709b35c6a4217d287199549304e9be19f4a5cec9a1183b0b5dccc562 SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 EBUILD opencv-2.4.13-r3.ebuild 5972 BLAKE2B e8cf37172bb279877c88e4a25564d58f0cc39e46ea185587033922083ff6f34c774f2d9dd0220831db040b8f3654f95a0cb6e28aef0cf3893392000f45c10bba SHA512 2ee9f1749172d504dafb927b9310c30c92300b9ecc19999421e0e891bc0dfb436871ad7fb35466f84275370877240a222aa71d1f6f47808726d5ba1875606e3b
-EBUILD opencv-3.2.0-r4.ebuild 12121 BLAKE2B 5e51542c1c2111c8fbd42d6fdfcbfbb357043ed7e9f831cf77e04a2b054482ad7d3f361eaf631abf73939ddb0cb364adfd80c8b8577eb036bb51e0bfa30f11ea SHA512 c6b131a0f9e2b241b03525ced8794b9199ce302082601c2ed63031fd6d5c487e65c06a96e27763fae8ae3c69c54da66f071a6b0a2936458e247a7b14b271a773
-EBUILD opencv-3.3.0-r6.ebuild 17046 BLAKE2B e16eed6639efabe26576e172bbd4d6b255dffbc30f3b611b83c62cafb7e63ab00373587def86a6612fd7125d04400343b99a6c1ccefa142b4e8dbea5348cf841 SHA512 381ac07e5a44d53faaa7532e0c2dabea2699a64f14c353b044e1d24cf291f744336803ccd12714ebd32309456adc962883bce1f549911e5517ec12855c95d843
-EBUILD opencv-3.4.1-r2.ebuild 18421 BLAKE2B 1afb2b6c5bd5d473a3d88e0a1af39d57c9154e1d42c79580296c887642ecaa58d7c848b3d5b7f59c1b2ed24d106dc0f08b24e84234e3524d5e9a0b6c86de0f92 SHA512 246feed33adb601adb515b7e121b16186c501c07be5497a6cddf0a8fc859b251aad806502689848185df6472f4b294a3069ff35c565f4ea624f01dffdf732bba
-EBUILD opencv-3.4.1-r5.ebuild 18541 BLAKE2B a7f33eb8f78c9df1a08c108cfeeac0550650354d754ff1b0e66bfe3a47db5c91c944da995d514b3fb1a1e07019d1a6682835adbf70ad14e91c9f581c5639c3a0 SHA512 39f486f4e264cf182a06824a061a3cf035f62b717944bd567b05a588fb9013d391ec57118e4410790f6c5d975c810222caa6841a71005075cd9a178ce2cf67d4
+EBUILD opencv-3.4.1-r5.ebuild 18539 BLAKE2B ad5c2f36ebd23f7d1f4cb1106b9d2059a871e3b8010fcc98d69f649dcaa01688863928b1df25eaad402ac681e9aa7872833c02b94c230d62b1c71b6f6807848b SHA512 d1627f494caf25088d18413d8003bee9aabc84feaee0118a74dc3a7e4ea8439e31afff20c1d168deeac75d4e6c528706390d1480fa8260d5f9802b97333beee8
 MISC metadata.xml 2401 BLAKE2B 3d37ef4879324890e702119fffaaf075021fb22ee0b9393a58df46cf937a60403f0f48f90483bfc078079cb9f1177f866cfcee63d592ba93915fa96a438d064c SHA512 691287c588e60df6158ea070f61100214dc54c267f9f2c7ffbeabb75595e72641ced7cc33f119fed9bbf98df8832f977557fb4a1017eb65d9081ac1350d783b8
diff --git a/media-libs/opencv/files/opencv-3.1.0-find-libraries-fix.patch b/media-libs/opencv/files/opencv-3.1.0-find-libraries-fix.patch
deleted file mode 100644
index 52f4db6b3113..000000000000
--- a/media-libs/opencv/files/opencv-3.1.0-find-libraries-fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -purN a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
---- a/cmake/OpenCVFindLibsGrfmt.cmake	2015-12-18 15:02:16.000000000 +0000
-+++ b/cmake/OpenCVFindLibsGrfmt.cmake	2016-11-07 13:18:04.567340791 +0000
-@@ -18,7 +18,7 @@ endif()
- if(NOT ZLIB_FOUND)
-   ocv_clear_vars(ZLIB_LIBRARY ZLIB_LIBRARIES ZLIB_INCLUDE_DIRS)
- 
--  set(ZLIB_LIBRARY zlib)
-+  set(ZLIB_LIBRARY z)
-   add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/zlib")
-   set(ZLIB_INCLUDE_DIRS "${${ZLIB_LIBRARY}_SOURCE_DIR}" "${${ZLIB_LIBRARY}_BINARY_DIR}")
-   set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
-@@ -40,7 +40,7 @@ if(WITH_TIFF)
-   if(NOT TIFF_FOUND)
-     ocv_clear_vars(TIFF_LIBRARY TIFF_LIBRARIES TIFF_INCLUDE_DIR)
- 
--    set(TIFF_LIBRARY libtiff)
-+    set(TIFF_LIBRARY tiff)
-     set(TIFF_LIBRARIES ${TIFF_LIBRARY})
-     add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libtiff")
-     set(TIFF_INCLUDE_DIR "${${TIFF_LIBRARY}_SOURCE_DIR}" "${${TIFF_LIBRARY}_BINARY_DIR}")
-@@ -79,7 +79,7 @@ if(WITH_JPEG)
-   if(NOT JPEG_FOUND)
-     ocv_clear_vars(JPEG_LIBRARY JPEG_LIBRARIES JPEG_INCLUDE_DIR)
- 
--    set(JPEG_LIBRARY libjpeg)
-+    set(JPEG_LIBRARY jpeg)
-     set(JPEG_LIBRARIES ${JPEG_LIBRARY})
-     add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjpeg")
-     set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}")
-@@ -136,7 +136,7 @@ if(WITH_JASPER)
-   if(NOT JASPER_FOUND)
-     ocv_clear_vars(JASPER_LIBRARY JASPER_LIBRARIES JASPER_INCLUDE_DIR)
- 
--    set(JASPER_LIBRARY libjasper)
-+    set(JASPER_LIBRARY jasper)
-     set(JASPER_LIBRARIES ${JASPER_LIBRARY})
-     add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjasper")
-     set(JASPER_INCLUDE_DIR "${${JASPER_LIBRARY}_SOURCE_DIR}")
-@@ -169,7 +169,7 @@ if(WITH_PNG)
-   if(NOT PNG_FOUND)
-     ocv_clear_vars(PNG_LIBRARY PNG_LIBRARIES PNG_INCLUDE_DIR PNG_PNG_INCLUDE_DIR HAVE_LIBPNG_PNG_H PNG_DEFINITIONS)
- 
--    set(PNG_LIBRARY libpng)
-+    set(PNG_LIBRARY png)
-     set(PNG_LIBRARIES ${PNG_LIBRARY})
-     add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libpng")
-     set(PNG_INCLUDE_DIR "${${PNG_LIBRARY}_SOURCE_DIR}")
diff --git a/media-libs/opencv/files/opencv-3.1.0-java-magic.patch b/media-libs/opencv/files/opencv-3.1.0-java-magic.patch
deleted file mode 100644
index 96a0e7e7053f..000000000000
--- a/media-libs/opencv/files/opencv-3.1.0-java-magic.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -purN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2015-12-18 15:02:16.000000000 +0000
-+++ b/CMakeLists.txt	2016-06-06 17:15:48.006020666 +0100
-@@ -209,6 +209,7 @@ OCV_OPTION(WITH_OPENCLAMDFFT   "Include
- OCV_OPTION(WITH_OPENCLAMDBLAS  "Include AMD OpenCL BLAS library support"     ON   IF (NOT ANDROID AND NOT IOS AND NOT WINRT) )
- OCV_OPTION(WITH_DIRECTX        "Include DirectX support"                     ON   IF (WIN32 AND NOT WINRT) )
- OCV_OPTION(WITH_INTELPERC      "Include Intel Perceptual Computing support"  OFF  IF (WIN32 AND NOT WINRT) )
-+OCV_OPTION(WITH_JAVA           "Include Java support"                        ON)
- OCV_OPTION(WITH_IPP_A          "Include Intel IPP_A support"                 OFF  IF (MSVC OR X86 OR X86_64) )
- OCV_OPTION(WITH_MATLAB         "Include Matlab support"                      ON   IF (NOT ANDROID AND NOT IOS AND NOT WINRT))
- OCV_OPTION(WITH_VA             "Include VA support"                          OFF  IF (UNIX AND NOT ANDROID) )
-@@ -562,20 +563,25 @@ endif(BUILD_DOCS)
- include(cmake/OpenCVDetectPython.cmake)
- 
- # --- Java Support ---
--include(cmake/OpenCVDetectApacheAnt.cmake)
--if(ANDROID)
--  include(cmake/OpenCVDetectAndroidSDK.cmake)
-+If(WITH_JAVA)
-+  include(cmake/OpenCVDetectApacheAnt.cmake)
-+  if(ANDROID)
-+    include(cmake/OpenCVDetectAndroidSDK.cmake)
- 
--  if(NOT ANDROID_TOOLS_Pkg_Revision GREATER 13)
--    message(WARNING "OpenCV requires Android SDK tools revision 14 or newer. Otherwise tests and samples will no be compiled.")
-+    if(NOT ANDROID_TOOLS_Pkg_Revision GREATER 13)
-+      message(WARNING "OpenCV requires Android SDK tools revision 14 or newer. Otherwise tests and samples will no be compiled.")
-+    endif()
-+  else()
-+    find_package(JNI)
-   endif()
--else()
--  find_package(JNI)
--endif()
- 
--if(ANDROID AND ANDROID_EXECUTABLE AND ANT_EXECUTABLE AND (ANT_VERSION VERSION_GREATER 1.7) AND (ANDROID_TOOLS_Pkg_Revision GREATER 13))
--  SET(CAN_BUILD_ANDROID_PROJECTS TRUE)
-+  if(ANDROID AND ANDROID_EXECUTABLE AND ANT_EXECUTABLE AND (ANT_VERSION VERSION_GREATER 1.7) AND (ANDROID_TOOLS_Pkg_Revision GREATER 13))
-+    SET(CAN_BUILD_ANDROID_PROJECTS TRUE)
-+  else()
-+    SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
-+  endif()
- else()
-+  SET(ANT_EXECUTABLE "")
-   SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
- endif()
- 
diff --git a/media-libs/opencv/files/opencv-3.2.0-contrib_xfeatures2d-autodownload.patch b/media-libs/opencv/files/opencv-3.2.0-contrib_xfeatures2d-autodownload.patch
deleted file mode 100644
index f03c57d425cc..000000000000
--- a/media-libs/opencv/files/opencv-3.2.0-contrib_xfeatures2d-autodownload.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/modules/xfeatures2d/CMakeLists.txt	2017-02-28 13:10:56.470000000 +0100
-+++ b/modules/xfeatures2d/CMakeLists.txt	2017-02-28 13:11:03.970000000 +0100
-@@ -1,5 +1,5 @@
- set(the_description "Contributed/Experimental Algorithms for Salient 2D Features Detection")
- ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d opencv_shape opencv_highgui opencv_videoio opencv_ml
-                   OPTIONAL opencv_cudaarithm WRAP python java)
--include(cmake/download_vgg.cmake)
--include(cmake/download_boostdesc.cmake)
-+#include(cmake/download_vgg.cmake)
-+#include(cmake/download_boostdesc.cmake)
diff --git a/media-libs/opencv/files/opencv-3.2.0-cpu-mno-sse2.patch b/media-libs/opencv/files/opencv-3.2.0-cpu-mno-sse2.patch
deleted file mode 100644
index a73456411f27..000000000000
--- a/media-libs/opencv/files/opencv-3.2.0-cpu-mno-sse2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/OpenCVCompilerOptions.cmake	2017-07-22 13:26:51.178960091 +0200
-+++ b/cmake/OpenCVCompilerOptions.cmake	2017-07-22 13:27:47.238961469 +0200
-@@ -176,8 +176,6 @@
-   endif()
-   if(ENABLE_SSE2)
-     add_extra_compiler_option(-msse2)
--  elseif(X86 OR X86_64)
--    add_extra_compiler_option(-mno-sse2)
-   endif()
-   if(ARM)
-     add_extra_compiler_option("-mfp16-format=ieee")
diff --git a/media-libs/opencv/files/opencv-3.2.0-fix_ussage_cpu_instructions.patch b/media-libs/opencv/files/opencv-3.2.0-fix_ussage_cpu_instructions.patch
deleted file mode 100644
index 7b88216f329a..000000000000
--- a/media-libs/opencv/files/opencv-3.2.0-fix_ussage_cpu_instructions.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/cmake/OpenCVCompilerOptions.cmake
-+++ b/cmake/OpenCVCompilerOptions.cmake
-@@ -164,8 +164,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-   # Other optimizations
-   if(ENABLE_OMIT_FRAME_POINTER)
-     add_extra_compiler_option(-fomit-frame-pointer)
--  else()
--    add_extra_compiler_option(-fno-omit-frame-pointer)
-   endif()
-   if(ENABLE_FAST_MATH)
-     add_extra_compiler_option(-ffast-math)
-@@ -195,8 +193,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-   if(NOT MINGW)
-     if(ENABLE_AVX)
-       add_extra_compiler_option(-mavx)
--    elseif(X86 OR X86_64)
--      add_extra_compiler_option(-mno-avx)
-     endif()
-     if(ENABLE_AVX2)
-       add_extra_compiler_option(-mavx2)
-@@ -210,26 +206,18 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-     if(NOT OPENCV_EXTRA_CXX_FLAGS MATCHES "-mavx")
-       if(ENABLE_SSE3)
-         add_extra_compiler_option(-msse3)
--      elseif(X86 OR X86_64)
--        add_extra_compiler_option(-mno-sse3)
-       endif()
- 
-       if(ENABLE_SSSE3)
-         add_extra_compiler_option(-mssse3)
--      elseif(X86 OR X86_64)
--        add_extra_compiler_option(-mno-ssse3)
-       endif()
- 
-       if(ENABLE_SSE41)
-         add_extra_compiler_option(-msse4.1)
--      elseif(X86 OR X86_64)
--        add_extra_compiler_option(-mno-sse4.1)
-       endif()
- 
-       if(ENABLE_SSE42)
-         add_extra_compiler_option(-msse4.2)
--      elseif(X86 OR X86_64)
--        add_extra_compiler_option(-mno-sse4.2)
-       endif()
- 
-       if(ENABLE_POPCNT)
-@@ -238,16 +226,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
-     endif()
-   endif(NOT MINGW)
- 
--  if(X86 OR X86_64)
--    if(NOT APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 4)
--      if(OPENCV_EXTRA_CXX_FLAGS MATCHES "-m(sse2|avx)")
--        add_extra_compiler_option(-mfpmath=sse)# !! important - be on the same wave with x64 compilers
--      else()
--        add_extra_compiler_option(-mfpmath=387)
--      endif()
--    endif()
--  endif()
--
-   # Profiling?
-   if(ENABLE_PROFILING)
-     add_extra_compiler_option("-pg -g"
diff --git a/media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch b/media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch
deleted file mode 100644
index 457d3595e49b..000000000000
--- a/media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/OpenCVPCHSupport.cmake	2017-06-06 15:05:09.180022719 +0200
-+++ b/cmake/OpenCVPCHSupport.cmake	2017-06-06 15:05:50.775022684 +0200
-@@ -14,7 +14,7 @@
- 
- IF(CMAKE_COMPILER_IS_GNUCXX)
- 
--    IF(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.2.0")
-+    IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0")
-         SET(PCHSupport_FOUND TRUE)
-     ENDIF()
- 
diff --git a/media-libs/opencv/files/opencv-3.2.0-vtk.patch b/media-libs/opencv/files/opencv-3.2.0-vtk.patch
deleted file mode 100644
index 1e3daec8aa30..000000000000
--- a/media-libs/opencv/files/opencv-3.2.0-vtk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/OpenCVDetectVTK.cmake	2017-03-20 10:43:28.401962910 +0100
-+++ b/cmake/OpenCVDetectVTK.cmake	2017-03-20 10:43:09.127963906 +0100
-@@ -8,7 +8,7 @@
-   IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var.
-       find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport vtkIOGeometry NO_MODULE)
-   ELSE(VTK_RENDERING_BACKEND)
--      find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
-+      find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL2 vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
-   ENDIF(VTK_RENDERING_BACKEND)
- ENDIF(VTK_FOUND)
- 
diff --git a/media-libs/opencv/files/opencv-3.3.0-contrib-xfeatures2d.patch b/media-libs/opencv/files/opencv-3.3.0-contrib-xfeatures2d.patch
deleted file mode 100644
index 26e4ac767c37..000000000000
--- a/media-libs/opencv/files/opencv-3.3.0-contrib-xfeatures2d.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/modules/xfeatures2d/CMakeLists.txt	2017-09-16 14:28:38.440000000 +0200
-+++ b/modules/xfeatures2d/CMakeLists.txt	2017-09-16 14:27:21.350000000 +0200
-@@ -2,11 +2,11 @@
- 
- ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_shape opencv_cudaarithm WRAP python java)
- 
-+#include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_vgg.cmake)
-+#include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_boostdesc.cmake)
-+#set(DOWNLOAD_DIR "${OpenCV_BINARY_DIR}/downloads/xfeatures2d")
-+#download_boost_descriptors("${DOWNLOAD_DIR}" boost_status)
-+#download_vgg_descriptors("${DOWNLOAD_DIR}" vgg_status)
--include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_vgg.cmake)
--include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_boostdesc.cmake)
--set(DOWNLOAD_DIR "${OpenCV_BINARY_DIR}/downloads/xfeatures2d")
--download_boost_descriptors("${DOWNLOAD_DIR}" boost_status)
--download_vgg_descriptors("${DOWNLOAD_DIR}" vgg_status)
- if(NOT boost_status OR NOT vgg_status)
-   ocv_module_disable(xfeatures2d)
- endif()
diff --git a/media-libs/opencv/files/opencv-3.3.0-cuda9-cmake.patch b/media-libs/opencv/files/opencv-3.3.0-cuda9-cmake.patch
deleted file mode 100644
index 270c599d708c..000000000000
--- a/media-libs/opencv/files/opencv-3.3.0-cuda9-cmake.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/cmake/FindCUDA.cmake b/cmake/FindCUDA.cmake
-index 678b450ab..c2a58bd00 100644
---- a/cmake/FindCUDA.cmake
-+++ b/cmake/FindCUDA.cmake
-@@ -283,7 +283,38 @@
- #   CUDA_nppc_LIBRARY     -- NVIDIA Performance Primitives lib (core).
- #                            Only available for CUDA version 5.5+.
- #   CUDA_nppi_LIBRARY     -- NVIDIA Performance Primitives lib (image processing).
--#                            Only available for CUDA version 5.5+.
-+#                            Only available for CUDA version 5.5+ and was split up
-+#                            in CUDA version 8.0+ and doesn't exist in combined
-+#                            form in CUDA version 9.0+.
-+#   CUDA_nppial_LIBRARY   -- NVIDIA Performance Primatives library (arithmetic and
-+#                            logical operation functions). Only available for CUDA
-+#                            version 8.0+.
-+#   CUDA_nppicc_LIBRARY   -- NVIDIA Performance Primatives library (color conversion
-+#                            and sampling functions). Only available for CUDA version
-+#                            8.0+.
-+#   CUDA_nppicom_LIBRARY  -- NVIDIA Performance Primatives library (JPEG compression
-+#                            and decompression functions). Only available for CUDA
-+#                            version 8.0+.
-+#   CUDA_nppidei_LIBRARY  -- NVIDIA Performance Primatives library (data exchange and
-+#                            initialization functions). Only available for CUDA
-+#                            version 8.0+.
-+#   CUDA_nppif_LIBRARY    -- NVIDIA Performance Primatives library (filtering and
-+#                            computer vision functions). Only available for CUDA
-+#                            version 8.0+.
-+#   CUDA_nppig_LIBRARY    -- NVIDIA Performance Primatives library (geometry
-+#                            transformation functions). Only available for CUDA
-+#                            version 8.0+.
-+#   CUDA_nppim_LIBRARY    -- NVIDIA Performance Primatives library (morphological
-+#                            operation functions). Only available for CUDA version
-+#                            8.0+.
-+#   CUDA_nppist_LIBRARY   -- NVIDIA Performance Primatives library (statistics and
-+#                            linear transform). Only available for CUDA version
-+#                            8.0+.
-+#   CUDA_nppisu_LIBRARY   -- NVIDIA Performance Primatives library (memory support
-+#                            functions). Only available for CUDA version 8.0+.
-+#   CUDA_nppitc_LIBRARY   -- NVIDIA Performance Primatives library (threshold and
-+#                            compare operation functions). Only available for CUDA
-+#                            version 8.0+.
- #   CUDA_npps_LIBRARY     -- NVIDIA Performance Primitives lib (signal processing).
- #                            Only available for CUDA version 5.5+.
- #   CUDA_nvcuvenc_LIBRARY -- CUDA Video Encoder library.
-@@ -522,6 +553,16 @@ macro(cuda_unset_include_and_libraries)
-   unset(CUDA_npp_LIBRARY CACHE)
-   unset(CUDA_nppc_LIBRARY CACHE)
-   unset(CUDA_nppi_LIBRARY CACHE)
-+  unset(CUDA_nppial_LIBRARY CACHE)
-+  unset(CUDA_nppicc_LIBRARY CACHE)
-+  unset(CUDA_nppicom_LIBRARY CACHE)
-+  unset(CUDA_nppidei_LIBRARY CACHE)
-+  unset(CUDA_nppif_LIBRARY CACHE)
-+  unset(CUDA_nppig_LIBRARY CACHE)
-+  unset(CUDA_nppim_LIBRARY CACHE)
-+  unset(CUDA_nppist_LIBRARY CACHE)
-+  unset(CUDA_nppisu_LIBRARY CACHE)
-+  unset(CUDA_nppitc_LIBRARY CACHE)
-   unset(CUDA_npps_LIBRARY CACHE)
-   unset(CUDA_nvcuvenc_LIBRARY CACHE)
-   unset(CUDA_nvcuvid_LIBRARY CACHE)
-@@ -787,7 +828,22 @@ if(NOT CUDA_VERSION VERSION_LESS "3.2")
-     find_cuda_helper_libs(nvcuvid)
-   endif()
- endif()
--if(CUDA_VERSION VERSION_GREATER "5.0")
-+if(CUDA_VERSION VERSION_GREATER "7.5")
-+  # In CUDA 8.0 NPP was splitted onto 12 separate libraries.
-+  find_cuda_helper_libs(nppc)
-+  find_cuda_helper_libs(nppial)
-+  find_cuda_helper_libs(nppicc)
-+  find_cuda_helper_libs(nppicom)
-+  find_cuda_helper_libs(nppidei)
-+  find_cuda_helper_libs(nppif)
-+  find_cuda_helper_libs(nppig)
-+  find_cuda_helper_libs(nppim)
-+  find_cuda_helper_libs(nppist)
-+  find_cuda_helper_libs(nppisu)
-+  find_cuda_helper_libs(nppitc)
-+  find_cuda_helper_libs(npps)
-+  set(CUDA_npp_LIBRARY "${CUDA_nppc_LIBRARY};${CUDA_nppial_LIBRARY};${CUDA_nppicc_LIBRARY};${CUDA_nppicom_LIBRARY};${CUDA_nppidei_LIBRARY};${CUDA_nppif_LIBRARY};${CUDA_nppig_LIBRARY};${CUDA_nppim_LIBRARY};${CUDA_nppist_LIBRARY};${CUDA_nppisu_LIBRARY};${CUDA_nppitc_LIBRARY};${CUDA_npps_LIBRARY}")
-+elseif(CUDA_VERSION VERSION_GREATER "5.0")
-   # In CUDA 5.5 NPP was splitted onto 3 separate libraries.
-   find_cuda_helper_libs(nppc)
-   find_cuda_helper_libs(nppi)
-
-
diff --git a/media-libs/opencv/files/opencv-3.3.0-cuda9-compute20.patch b/media-libs/opencv/files/opencv-3.3.0-cuda9-compute20.patch
deleted file mode 100644
index 384630002d98..000000000000
--- a/media-libs/opencv/files/opencv-3.3.0-cuda9-compute20.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/cmake/OpenCVDetectCUDA.cmake	2018-01-02 11:57:50.358147518 -0500
-+++ b/cmake/OpenCVDetectCUDA.cmake	2018-01-02 12:48:44.108965500 -0500
-@@ -104,7 +104,7 @@
-       if(${CUDA_VERSION} VERSION_LESS "8.0")
-         set(__cuda_arch_bin "2.0 3.0 3.5 3.7 5.0 5.2")
-       else()
--        set(__cuda_arch_bin "2.0 3.0 3.5 3.7 5.0 5.2 6.0 6.1")
-+        set(__cuda_arch_bin "3.0 3.5 3.7 5.0 5.2 6.0 6.1")
-       endif()
-     endif()
-   endif()
-@@ -209,7 +209,7 @@ if(CUDA_FOUND)
-     endif()
-
-     if(UNIX OR APPLE)
--      set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -fPIC)
-+      set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -fPIC --expt-relaxed-constexpr)
-     endif()
-     if(APPLE)
-       set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -fno-finite-math-only)
-
diff --git a/media-libs/opencv/files/opencv-3.3.0-cuda9-saturate.patch b/media-libs/opencv/files/opencv-3.3.0-cuda9-saturate.patch
deleted file mode 100644
index 43e2a0833cae..000000000000
--- a/media-libs/opencv/files/opencv-3.3.0-cuda9-saturate.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/var/tmp/portage/media-libs/opencv-3.3.0-r4/work/opencv-3.3.0/modules/cudev/include/opencv2/cudev/util/saturate_cast.hpp b/./saturate_cast.hpp
-index ec9804c..4359d18 100644
---- a/modules/cudev/include/opencv2/cudev/util/saturate_cast.hpp
-+++ b/modules/cudev/include/opencv2/cudev/util/saturate_cast.hpp
-@@ -47,6 +47,9 @@
- #define OPENCV_CUDEV_UTIL_SATURATE_CAST_HPP
- 
- #include "../common.hpp"
-+#if __CUDACC_VER_MAJOR__ >= 9
-+#include <cuda_fp16.h>
-+#endif
- 
- namespace cv { namespace cudev {
- 
-@@ -274,15 +277,25 @@ template <typename T, typename D> __device__ __forceinline__ D cast_fp16(T v);
- 
- template <> __device__ __forceinline__ float cast_fp16<short, float>(short v)
- {
-+#if __CUDACC_VER_MAJOR__ >= 9
-+  return float(*(__half*)&v);
-+#else
-     return __half2float(v);
-+#endif
- }
- 
- template <> __device__ __forceinline__ short cast_fp16<float, short>(float v)
- {
--    return (short)__float2half_rn(v);
-+#if __CUDACC_VER_MAJOR__ >= 9
-+  __half h(v);
-+  return *(short*)&v;
-+#else
-+  return (short)__float2half_rn(v);
-+#endif
- }
- //! @}
- 
- }}
- 
- #endif
-+
diff --git a/media-libs/opencv/opencv-3.2.0-r4.ebuild b/media-libs/opencv/opencv-3.2.0-r4.ebuild
deleted file mode 100644
index 31102b464abf..000000000000
--- a/media-libs/opencv/opencv-3.2.0-r4.ebuild
+++ /dev/null
@@ -1,369 +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 toolchain-funcs python-r1 java-pkg-opt-2 java-ant-2 \
-	cmake-multilib
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	contrib? ( https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-${PV}.tar.gz ) )"
-LICENSE="BSD"
-SLOT="0/3.2" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_hdf contrib_sfm contrib_xfeatures2d"
-
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it without the user knowing, which defeats the
-# purpose of the opengl use flag.
-REQUIRED_USE="
-	cuda? ( tesseract? ( opencl ) )
-	gflags? ( contrib )
-	glog? ( contrib )
-	contrib_cvv? ( contrib qt5 )
-	contrib_hdf? ( contrib )
-	contrib_sfm? ( contrib eigen gflags glog )
-	opengl? ( || ( gtk qt5 ) )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tesseract? ( contrib )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	gtk? ( !qt5 )
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contrib_hdf? ( sci-libs/hdf5 )
-	ffmpeg? (
-		libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
-		!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	)
-	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
-	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-	)
-	gtk? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] )
-	)
-	ieee1394? (
-		media-libs/libdc1394[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	)
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
-	lapack? ( virtual/lapack )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-	)
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qttest:5
-		dev-qt/qtconcurrent:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	tesseract? ( app-text/tesseract[opencl=] )
-	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
-	vtk? ( sci-libs/vtk[rendering] )
-	webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
-	xine? ( media-libs/xine-lib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	eigen? ( dev-cpp/eigen:3 )
-	java?  ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/opencv2/cvconfig.h
-	/usr/include/opencv2/opencv_modules.hpp
-	# [contrib_cvv]
-	/usr/include/opencv2/cvv.hpp
-	/usr/include/opencv2/cvv/call_meta_data.hpp
-	/usr/include/opencv2/cvv/cvv.hpp
-	/usr/include/opencv2/cvv/debug_mode.hpp
-	/usr/include/opencv2/cvv/dmatch.hpp
-	/usr/include/opencv2/cvv/filter.hpp
-	/usr/include/opencv2/cvv/final_show.hpp
-	/usr/include/opencv2/cvv/show_image.hpp
-	# [contrib_hdf]
-	/usr/include/opencv2/hdf.hpp
-	/usr/include/opencv2/hdf/hdf5.hpp
-	# [vtk]
-	/usr/include/opencv2/viz.hpp
-	/usr/include/opencv2/viz/types.hpp
-	/usr/include/opencv2/viz/viz3d.hpp
-	/usr/include/opencv2/viz/vizcore.hpp
-	/usr/include/opencv2/viz/widget_accessor.hpp
-	/usr/include/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-gles.patch"
-	"${FILESDIR}/${PN}-3.1.0-java-magic.patch"
-	"${FILESDIR}/${PN}-3.1.0-find-libraries-fix.patch"
-	"${FILESDIR}/${P}-vtk.patch"
-	"${FILESDIR}/${P}-gcc-6.0.patch"
-	"${FILESDIR}/${PN}-3.2.0-fix_ussage_cpu_instructions.patch"
-	"${FILESDIR}/${P}-cpu-mno-sse2.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled stuff
-	rm -rf 3rdparty || die "Removing 3rd party components failed"
-	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
-		-i CMakeLists.txt cmake/*cmake || die
-
-	if use contrib && use contrib_xfeatures2d; then
-		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		eapply "${FILESDIR}/${P}-contrib_xfeatures2d-autodownload.patch"
-		mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
-	fi
-
-	java-pkg-opt-2_src_prepare
-
-	# this really belongs in src_prepare() too
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-}
-
-multilib_src_configure() {
-	# please dont sort here, order is the same as in CMakeLists.txt
-	GLOBALCMAKEARGS=(
-	# Optional 3rd party components
-	# ===================================================
-		-DWITH_1394=$(usex ieee1394)
-	#	-DWITH_AVFOUNDATION=OFF 	# IOS
-		-DWITH_VTK=$(multilib_native_usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF     		# Video windows support
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
-		-DWITH_GTK=$(usex gtk)
-		-DWITH_GTK_2_X=$(usex gtk)
-		-DWITH_IPP=OFF
-		-DWITH_JASPER=$(usex jpeg2k)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_WEBP=$(usex webp)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENVX=OFF
-		-DWITH_OPENNI=OFF 		# Not packaged
-		-DWITH_OPENNI2=OFF 		# Not packaged
-		-DWITH_PNG=$(usex png)
-		-DWITH_GDCM=OFF
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_ARAVIS=OFF
-		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
-		-DWITH_WIN32UI=OFF		# Windows only
-	#	-DWITH_QUICKTIME=OFF
-	#	-DWITH_QTKIT=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_PTHREADS_PF=ON
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF		# Not packaged
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-		-DWITH_DSHOW=ON			# direct show supp
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF 		# Windows only
-		-DWITH_XINE=$(multilib_native_usex xine)
-		-DWITH_CLP=OFF
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCL_SVM=OFF
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_DIRECTX=OFF
-		-DWITH_INTELPERC=OFF
-		-DWITH_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
-		-DWITH_IPP_A=OFF
-		-DWITH_MATLAB=OFF
-		-DWITH_VA=$(usex vaapi)
-		-DWITH_VA_INTEL=$(usex vaapi)
-		-DWITH_GDAL=$(multilib_native_usex gdal)
-		-DWITH_GPHOTO2=$(usex gphoto2)
-		-DWITH_LAPACK=$(multilib_native_usex lapack)
-	# ===================================================
-	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
-	# ===================================================
-		-DWITH_CUDA=$(multilib_native_usex cuda)
-		-DWITH_CUBLAS=$(multilib_native_usex cuda)
-		-DWITH_CUFFT=$(multilib_native_usex cuda)
-		-DWITH_NVCUVID=OFF
-#		-DWITH_NVCUVID=$(usex cuda)
-		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
-	# ===================================================
-	# OpenCV build components
-	# ===================================================
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_opencv_apps=
-		-DBUILD_DOCS=OFF # Doesn't install anyways.
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(multilib_native_usex testprograms)
-		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
-	#	-DBUILD_WITH_STATIC_CRT=OFF
-		-DBUILD_WITH_DYNAMIC_IPP=OFF
-		-DBUILD_FAT_JAVA_LIB=$(multilib_native_usex java)
-	#	-DBUILD_ANDROID_SERVICE=OFF
-		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
-		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
-	# ===================================================
-	# OpenCV installation options
-	# ===================================================
-		-DINSTALL_CREATE_DISTRIB=OFF
-		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
-		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
-		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
-	#	-DINSTALL_ANDROID_EXAMPLES=OFF
-		-DINSTALL_TO_MANGLED_PATHS=OFF
-	# ===================================================
-	# OpenCV build options
-	# ===================================================
-		-DENABLE_CCACHE=OFF
-		-DENABLE_PRECOMPILED_HEADERS=$(usex pch)
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-		-DENABLE_OMIT_FRAME_POINTER=OFF
-		-DENABLE_FAST_MATH=OFF
-		-DENABLE_SSE=OFF
-		-DENABLE_SSE2=OFF
-		-DENABLE_SSE3=OFF
-		-DENABLE_SSSE3=OFF
-		-DENABLE_SSE41=OFF
-		-DENABLE_SSE42=OFF
-		-DENABLE_POPCNT=OFF
-		-DENABLE_AVX=OFF
-		-DENABLE_AVX=OFF
-		-DENABLE_AVX2=OFF
-		-DENABLE_FMA3=OFF
-		-DENABLE_NEON=OFF
-
-		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
-		-DENABLE_NOISY_WARNINGS=OFF
-		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
-		-DENABLE_IMPL_COLLECTION=OFF
-		-DENABLE_INSTRUMENTATION=OFF
-		-DGENERATE_ABI_DESCRIPTOR=OFF
-		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-	# ===================================================
-	# things we want to be hard off or not yet figured out
-	# ===================================================
-		-DBUILD_PACKAGE=OFF
-		-DENABLE_PROFILING=OFF
-	# ===================================================
-	# things we want to be hard enabled not worth useflag
-	# ===================================================
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-	)
-
-	# ===================================================
-	# OpenCV Contrib Modules
-	# ===================================================
-	if use contrib; then
-		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=OFF
-			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF)
-			-DBUILD_opencv_hdf=$(multilib_native_usex contrib_hdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
-		)
-
-		if multilib_is_native_abi; then
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
-			)
-		else
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
-			)
-		fi
-	fi
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
-		-DPYTHON_EXECUTABLE=OFF
-		-DINSTALL_PYTHON_EXAMPLES=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-python_module_compile() {
-	local BUILD_DIR=${orig_BUILD_DIR}
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
-	# Set all python variables to load the correct Gentoo paths
-	mycmakeargs+=(
-		# cheap trick: python_setup sets one of them as a symlink
-		# to the correct interpreter, and the other to fail-wrapper
-		-DPYTHON2_EXECUTABLE=$(type -P python2)
-		-DPYTHON3_EXECUTABLE=$(type -P python3)
-		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-	)
-
-	# Regenerate cache file. Can't use rebuild_cache as it won't
-	# have the Gentoo specific options.
-	rm -rf CMakeCache.txt || die "rm failed"
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_install
-
-	# Remove compiled binary so new version compiles
-	# Avoid conflicts with new module builds as build system doesn't
-	# really support it.
-	rm -rf modules/python2 || die "rm failed"
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# Build and install the python modules for all targets
-	if multilib_is_native_abi && use python; then
-		local orig_BUILD_DIR=${BUILD_DIR}
-		python_foreach_impl python_module_compile
-	fi
-}
diff --git a/media-libs/opencv/opencv-3.3.0-r6.ebuild b/media-libs/opencv/opencv-3.3.0-r6.ebuild
deleted file mode 100644
index f911f83e57ed..000000000000
--- a/media-libs/opencv/opencv-3.3.0-r6.ebuild
+++ /dev/null
@@ -1,465 +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 toolchain-funcs python-r1 java-pkg-opt-2 java-ant-2 cmake-multilib
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-TINY_DNN_PV="1.0.0a3"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~amynka/snap/imgcodecs-${P}.tar.gz
-	contrib? ( https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v${TINY_DNN_PV}.tar.gz -> tiny-dnn-${TINY_DNN_PV}.tar.gz )
-		contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) ) "
-LICENSE="BSD"
-SLOT="0/3.3" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d"
-
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it without the user knowing, which defeats the
-# purpose of the opengl use flag.
-REQUIRED_USE="
-	cuda? ( tesseract? ( opencl ) )
-	gflags? ( contrib )
-	glog? ( contrib )
-	contrib_cvv? ( contrib qt5 )
-	contrib_dnn? ( contrib )
-	contrib_hdf? ( contrib )
-	contrib_sfm? ( contrib eigen gflags glog )
-	contrib_xfeatures2d? ( contrib cuda )
-	java? ( python )
-	opengl? ( || ( gtk qt5 ) )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tesseract? ( contrib )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	gtk? ( !qt5 )
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contrib_hdf? ( sci-libs/hdf5 )
-	ffmpeg? (
-		libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
-		!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	)
-	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
-	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-	)
-	gtk? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] )
-	)
-	ieee1394? (
-		media-libs/libdc1394[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	)
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
-	lapack? ( virtual/lapack )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-	)
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qttest:5
-		dev-qt/qtconcurrent:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	tesseract? ( app-text/tesseract[opencl=] )
-	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
-	vtk? ( sci-libs/vtk[rendering] )
-	webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
-	xine? ( media-libs/xine-lib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	contrib_dnn? ( dev-libs/cereal )
-	eigen? ( dev-cpp/eigen:3 )
-	java?  ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/opencv2/cvconfig.h
-	/usr/include/opencv2/opencv_modules.hpp
-	# [contrib_cvv]
-	/usr/include/opencv2/cvv.hpp
-	/usr/include/opencv2/cvv/call_meta_data.hpp
-	/usr/include/opencv2/cvv/cvv.hpp
-	/usr/include/opencv2/cvv/debug_mode.hpp
-	/usr/include/opencv2/cvv/dmatch.hpp
-	/usr/include/opencv2/cvv/filter.hpp
-	/usr/include/opencv2/cvv/final_show.hpp
-	/usr/include/opencv2/cvv/show_image.hpp
-	# [contrib_hdf]
-	/usr/include/opencv2/hdf.hpp
-	/usr/include/opencv2/hdf/hdf5.hpp
-	# [vtk]
-	/usr/include/opencv2/viz.hpp
-	/usr/include/opencv2/viz/types.hpp
-	/usr/include/opencv2/viz/viz3d.hpp
-	/usr/include/opencv2/viz/vizcore.hpp
-	/usr/include/opencv2/viz/widget_accessor.hpp
-	/usr/include/opencv2/viz/widgets.hpp
-	# [cudev]
-	/usr/include/opencv2/cudaarithm.hpp
-	/usr/include/opencv2/cudabgsegm.hpp
-	/usr/include/opencv2/cudacodec.hpp
-	/usr/include/opencv2/cudafeatures2d.hpp
-	/usr/include/opencv2/cudafilters.hpp
-	/usr/include/opencv2/cudaimgproc.hpp
-	/usr/include/opencv2/cudalegacy.hpp
-	/usr/include/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
-	/usr/include/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
-	/usr/include/opencv2/cudalegacy/NCV.hpp
-	/usr/include/opencv2/cudalegacy/NCVPyramid.hpp
-	/usr/include/opencv2/cudalegacy/NPP_staging.hpp
-	/usr/include/opencv2/cudaobjdetect.hpp
-	/usr/include/opencv2/cudaoptflow.hpp
-	/usr/include/opencv2/cudastereo.hpp
-	/usr/include/opencv2/cudawarping.hpp
-	/usr/include/opencv2/cudev/block/block.hpp
-	/usr/include/opencv2/cudev/block/detail/reduce.hpp
-	/usr/include/opencv2/cudev/block/detail/reduce_key_val.hpp
-	/usr/include/opencv2/cudev/block/dynamic_smem.hpp
-	/usr/include/opencv2/cudev/block/reduce.hpp
-	/usr/include/opencv2/cudev/block/scan.hpp
-	/usr/include/opencv2/cudev/block/vec_distance.hpp
-	/usr/include/opencv2/cudev/common.hpp
-	/usr/include/opencv2/cudev/expr/binary_func.hpp
-	/usr/include/opencv2/cudev/expr/binary_op.hpp
-	/usr/include/opencv2/cudev/expr/color.hpp
-	/usr/include/opencv2/cudev/expr/deriv.hpp
-	/usr/include/opencv2/cudev/expr/expr.hpp
-	/usr/include/opencv2/cudev/expr/per_element_func.hpp
-	/usr/include/opencv2/cudev/expr/reduction.hpp
-	/usr/include/opencv2/cudev/expr/unary_func.hpp
-	/usr/include/opencv2/cudev/expr/unary_op.hpp
-	/usr/include/opencv2/cudev/expr/warping.hpp
-	/usr/include/opencv2/cudev/functional/color_cvt.hpp
-	/usr/include/opencv2/cudev/functional/detail/color_cvt.hpp
-	/usr/include/opencv2/cudev/functional/functional.hpp
-	/usr/include/opencv2/cudev/functional/tuple_adapter.hpp
-	/usr/include/opencv2/cudev/grid/copy.hpp
-	/usr/include/opencv2/cudev/grid/detail/copy.hpp
-	/usr/include/opencv2/cudev/grid/detail/histogram.hpp
-	/usr/include/opencv2/cudev/grid/detail/integral.hpp
-	/usr/include/opencv2/cudev/grid/detail/minmaxloc.hpp
-	/usr/include/opencv2/cudev/grid/detail/pyr_down.hpp
-	/usr/include/opencv2/cudev/grid/detail/pyr_up.hpp
-	/usr/include/opencv2/cudev/grid/detail/reduce.hpp
-	/usr/include/opencv2/cudev/grid/detail/reduce_to_column.hpp
-	/usr/include/opencv2/cudev/grid/detail/reduce_to_row.hpp
-	/usr/include/opencv2/cudev/grid/detail/split_merge.hpp
-	/usr/include/opencv2/cudev/grid/detail/transform.hpp
-	/usr/include/opencv2/cudev/grid/detail/transpose.hpp
-	/usr/include/opencv2/cudev/grid/histogram.hpp
-	/usr/include/opencv2/cudev/grid/integral.hpp
-	/usr/include/opencv2/cudev/grid/pyramids.hpp
-	/usr/include/opencv2/cudev/grid/reduce.hpp
-	/usr/include/opencv2/cudev/grid/reduce_to_vec.hpp
-	/usr/include/opencv2/cudev/grid/split_merge.hpp
-	/usr/include/opencv2/cudev/grid/transform.hpp
-	/usr/include/opencv2/cudev/grid/transpose.hpp
-	/usr/include/opencv2/cudev.hpp
-	/usr/include/opencv2/cudev/ptr2d/constant.hpp
-	/usr/include/opencv2/cudev/ptr2d/deriv.hpp
-	/usr/include/opencv2/cudev/ptr2d/detail/gpumat.hpp
-	/usr/include/opencv2/cudev/ptr2d/extrapolation.hpp
-	/usr/include/opencv2/cudev/ptr2d/glob.hpp
-	/usr/include/opencv2/cudev/ptr2d/gpumat.hpp
-	/usr/include/opencv2/cudev/ptr2d/interpolation.hpp
-	/usr/include/opencv2/cudev/ptr2d/lut.hpp
-	/usr/include/opencv2/cudev/ptr2d/mask.hpp
-	/usr/include/opencv2/cudev/ptr2d/remap.hpp
-	/usr/include/opencv2/cudev/ptr2d/resize.hpp
-	/usr/include/opencv2/cudev/ptr2d/texture.hpp
-	/usr/include/opencv2/cudev/ptr2d/traits.hpp
-	/usr/include/opencv2/cudev/ptr2d/transform.hpp
-	/usr/include/opencv2/cudev/ptr2d/warping.hpp
-	/usr/include/opencv2/cudev/ptr2d/zip.hpp
-	/usr/include/opencv2/cudev/util/atomic.hpp
-	/usr/include/opencv2/cudev/util/detail/tuple.hpp
-	/usr/include/opencv2/cudev/util/detail/type_traits.hpp
-	/usr/include/opencv2/cudev/util/limits.hpp
-	/usr/include/opencv2/cudev/util/saturate_cast.hpp
-	/usr/include/opencv2/cudev/util/simd_functions.hpp
-	/usr/include/opencv2/cudev/util/tuple.hpp
-	/usr/include/opencv2/cudev/util/type_traits.hpp
-	/usr/include/opencv2/cudev/util/vec_math.hpp
-	/usr/include/opencv2/cudev/util/vec_traits.hpp
-	/usr/include/opencv2/cudev/warp/detail/reduce.hpp
-	/usr/include/opencv2/cudev/warp/detail/reduce_key_val.hpp
-	/usr/include/opencv2/cudev/warp/reduce.hpp
-	/usr/include/opencv2/cudev/warp/scan.hpp
-	/usr/include/opencv2/cudev/warp/shuffle.hpp
-	/usr/include/opencv2/cudev/warp/warp.hpp
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-gles.patch"
-	"${FILESDIR}/${PN}-3.1.0-java-magic.patch"
-	"${FILESDIR}/${PN}-3.1.0-find-libraries-fix.patch"
-	"${WORKDIR}/${P}-imgcodecs-gcc.patch" # bug 627958 and https://github.com/opencv/opencv/pull/9376
-	"${FILESDIR}/${P}-cuda9-cmake.patch"
-	"${FILESDIR}/${P}-cuda9-saturate.patch"
-	"${FILESDIR}/${P}-cuda9-compute20.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled stuff
-	rm -rf 3rdparty || die "Removing 3rd party components failed"
-	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
-		-i CMakeLists.txt cmake/*cmake || die
-
-	if use contrib && use contrib_dnn; then
-		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		eapply "${FILESDIR}/${P}-remove-tiny-dnn-autodownload.patch"
-	fi
-
-	if use contrib && use contrib_xfeatures2d; then
-		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		eapply "${FILESDIR}/${P}-contrib-xfeatures2d.patch"
-		mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
-	fi
-
-	java-pkg-opt-2_src_prepare
-
-	# this really belongs in src_prepare() too
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-}
-
-multilib_src_configure() {
-	# please dont sort here, order is the same as in CMakeLists.txt
-	GLOBALCMAKEARGS=(
-	# Optional 3rd party components
-	# ===================================================
-		-DWITH_1394=$(usex ieee1394)
-	#	-DWITH_AVFOUNDATION=OFF # IOS
-		-DWITH_VTK=$(multilib_native_usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF # Video windows support
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
-		-DWITH_GTK=$(usex gtk)
-		-DWITH_GTK_2_X=$(usex gtk)
-		-DWITH_IPP=OFF
-		-DWITH_JASPER=$(usex jpeg2k)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_WEBP=$(usex webp)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENVX=OFF
-		-DWITH_OPENNI=OFF	# Not packaged
-		-DWITH_OPENNI2=OFF	# Not packaged
-		-DWITH_PNG=$(usex png)
-		-DWITH_GDCM=OFF
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_ARAVIS=OFF
-		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
-		-DWITH_WIN32UI=OFF		# Windows only
-	#	-DWITH_QUICKTIME=OFF
-	#	-DWITH_QTKIT=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_PTHREADS_PF=ON
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF		# Not packaged
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-		-DWITH_DSHOW=ON			# direct show supp
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF	# Windows only
-		-DWITH_XINE=$(multilib_native_usex xine)
-		-DWITH_CLP=OFF
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCL_SVM=OFF
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_DIRECTX=OFF
-		-DWITH_INTELPERC=OFF
-		-DWITH_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
-		-DWITH_IPP_A=OFF
-		-DWITH_MATLAB=OFF
-		-DWITH_VA=$(usex vaapi)
-		-DWITH_VA_INTEL=$(usex vaapi)
-		-DWITH_GDAL=$(multilib_native_usex gdal)
-		-DWITH_GPHOTO2=$(usex gphoto2)
-		-DWITH_LAPACK=$(multilib_native_usex lapack)
-		-DWITH_ITT=OFF # 3dparty libs itt_notify
-	# ===================================================
-	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
-	# ===================================================
-		-DWITH_CUDA=$(multilib_native_usex cuda)
-		-DWITH_CUBLAS=$(multilib_native_usex cuda)
-		-DWITH_CUFFT=$(multilib_native_usex cuda)
-		-DWITH_NVCUVID=OFF
-#		-DWITH_NVCUVID=$(usex cuda)
-		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
-	# ===================================================
-	# OpenCV build components
-	# ===================================================
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_opencv_apps=
-		-DBUILD_DOCS=OFF # Doesn't install anyways.
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(multilib_native_usex testprograms)
-		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
-	#	-DBUILD_WITH_STATIC_CRT=OFF
-		-DBUILD_WITH_DYNAMIC_IPP=OFF
-		-DBUILD_FAT_JAVA_LIB=$(multilib_native_usex java)
-	#	-DBUILD_ANDROID_SERVICE=OFF
-		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
-		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
-	# ===================================================
-	# OpenCV installation options
-	# ===================================================
-		-DINSTALL_CREATE_DISTRIB=OFF
-		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
-		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
-		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
-	#	-DINSTALL_ANDROID_EXAMPLES=OFF
-		-DINSTALL_TO_MANGLED_PATHS=OFF
-	# ===================================================
-	# OpenCV build options
-	# ===================================================
-		-DENABLE_CCACHE=OFF
-		-DENABLE_PRECOMPILED_HEADERS=$(usex pch)
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-
-		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
-		-DENABLE_NOISY_WARNINGS=OFF
-		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
-		-DENABLE_IMPL_COLLECTION=OFF
-		-DENABLE_INSTRUMENTATION=OFF
-		-DGENERATE_ABI_DESCRIPTOR=OFF
-		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-	# ===================================================
-	# things we want to be hard off or not yet figured out
-	# ===================================================
-		-DBUILD_PACKAGE=OFF
-	# ===================================================
-	# Not building protobuf but update files bug #631418
-	# ===================================================
-		-DBUILD_PROTOBUF=OFF
-		-DPROTOBUF_UPDATE_FILES=ON
-	# ===================================================
-	# things we want to be hard enabled not worth useflag
-	# ===================================================
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-	)
-
-	# ===================================================
-	# OpenCV Contrib Modules
-	# ===================================================
-	if use contrib; then
-		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=$(usex contrib_dnn ON OFF)
-			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
-			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF)
-			-DBUILD_opencv_hdf=$(multilib_native_usex contrib_hdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
-		)
-
-		if multilib_is_native_abi; then
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
-			)
-		else
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
-			)
-		fi
-	fi
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
-		-DPYTHON_EXECUTABLE=OFF
-		-DINSTALL_PYTHON_EXAMPLES=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-python_module_compile() {
-	local BUILD_DIR=${orig_BUILD_DIR}
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
-	# Set all python variables to load the correct Gentoo paths
-	mycmakeargs+=(
-		# cheap trick: python_setup sets one of them as a symlink
-		# to the correct interpreter, and the other to fail-wrapper
-		-DPYTHON2_EXECUTABLE=$(type -P python2)
-		-DPYTHON3_EXECUTABLE=$(type -P python3)
-		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-	)
-
-	# Regenerate cache file. Can't use rebuild_cache as it won't
-	# have the Gentoo specific options.
-	rm -rf CMakeCache.txt || die "rm failed"
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_install
-
-	# Remove compiled binary so new version compiles
-	# Avoid conflicts with new module builds as build system doesn't
-	# really support it.
-	rm -rf modules/python2 || die "rm failed"
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# Build and install the python modules for all targets
-	if multilib_is_native_abi && use python; then
-		local orig_BUILD_DIR=${BUILD_DIR}
-		python_foreach_impl python_module_compile
-	fi
-}
diff --git a/media-libs/opencv/opencv-3.4.1-r2.ebuild b/media-libs/opencv/opencv-3.4.1-r2.ebuild
deleted file mode 100644
index 5da1df041fd6..000000000000
--- a/media-libs/opencv/opencv-3.4.1-r2.ebuild
+++ /dev/null
@@ -1,497 +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 java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-TINY_DNN_PV="1.0.0a3"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	dnn_samples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
-	contrib? (
-		https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
-		contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v${TINY_DNN_PV}.tar.gz -> tiny-dnn-${TINY_DNN_PV}.tar.gz
-			       https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz
-		)
-		contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
-	)"
-
-LICENSE="BSD"
-SLOT="0/3.4.1" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it Wwithout the user knowing, which defeats the
-# purpose of the opengl use flag.
-REQUIRED_USE="
-	cuda? ( tesseract? ( opencl ) )
-	dnn_samples? ( examples )
-	gflags? ( contrib )
-	glog? ( contrib )
-	contrib_cvv? ( contrib qt5 )
-	contrib_dnn? ( contrib )
-	contrib_hdf? ( contrib )
-	contrib_sfm? ( contrib eigen gflags glog )
-	contrib_xfeatures2d? ( contrib cuda )
-	java? ( python )
-	opengl? ( || ( gtk qt5 ) )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tesseract? ( contrib )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	gtk? ( !qt5 )
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	dev-libs/protobuf:=[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	cuda? ( dev-util/nvidia-cuda-toolkit:0= )
-	contrib_hdf? ( sci-libs/hdf5 )
-	ffmpeg? (
-		libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
-		!libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
-	)
-	gdal? ( sci-libs/gdal:= )
-	gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
-	glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2[${MULTILIB_USEDEP}] )
-	gstreamer? (
-		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
-	)
-	gtk? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-		opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] )
-	)
-	ieee1394? (
-		media-libs/libdc1394[${MULTILIB_USEDEP}]
-		sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	)
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
-	lapack? ( virtual/lapack )
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
-	openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
-	opengl? (
-		virtual/opengl[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}]
-	)
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qttest:5
-		dev-qt/qtconcurrent:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	tesseract? ( app-text/tesseract[opencl=] )
-	threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-	v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
-	vtk? ( sci-libs/vtk[rendering] )
-	webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
-	xine? ( media-libs/xine-lib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	contrib_dnn? ( dev-libs/cereal )
-	eigen? ( dev-cpp/eigen:3 )
-	java?  ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/opencv2/cvconfig.h
-	/usr/include/opencv2/opencv_modules.hpp
-	# [contrib_cvv]
-	/usr/include/opencv2/cvv.hpp
-	/usr/include/opencv2/cvv/call_meta_data.hpp
-	/usr/include/opencv2/cvv/cvv.hpp
-	/usr/include/opencv2/cvv/debug_mode.hpp
-	/usr/include/opencv2/cvv/dmatch.hpp
-	/usr/include/opencv2/cvv/filter.hpp
-	/usr/include/opencv2/cvv/final_show.hpp
-	/usr/include/opencv2/cvv/show_image.hpp
-	# [contrib_hdf]
-	/usr/include/opencv2/hdf.hpp
-	/usr/include/opencv2/hdf/hdf5.hpp
-	# [vtk]
-	/usr/include/opencv2/viz.hpp
-	/usr/include/opencv2/viz/types.hpp
-	/usr/include/opencv2/viz/viz3d.hpp
-	/usr/include/opencv2/viz/vizcore.hpp
-	/usr/include/opencv2/viz/widget_accessor.hpp
-	/usr/include/opencv2/viz/widgets.hpp
-	# [cudev]
-	/usr/include/opencv2/cudaarithm.hpp
-	/usr/include/opencv2/cudabgsegm.hpp
-	/usr/include/opencv2/cudacodec.hpp
-	/usr/include/opencv2/cudafeatures2d.hpp
-	/usr/include/opencv2/cudafilters.hpp
-	/usr/include/opencv2/cudaimgproc.hpp
-	/usr/include/opencv2/cudalegacy.hpp
-	/usr/include/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
-	/usr/include/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
-	/usr/include/opencv2/cudalegacy/NCV.hpp
-	/usr/include/opencv2/cudalegacy/NCVPyramid.hpp
-	/usr/include/opencv2/cudalegacy/NPP_staging.hpp
-	/usr/include/opencv2/cudaobjdetect.hpp
-	/usr/include/opencv2/cudaoptflow.hpp
-	/usr/include/opencv2/cudastereo.hpp
-	/usr/include/opencv2/cudawarping.hpp
-	/usr/include/opencv2/cudev/block/block.hpp
-	/usr/include/opencv2/cudev/block/detail/reduce.hpp
-	/usr/include/opencv2/cudev/block/detail/reduce_key_val.hpp
-	/usr/include/opencv2/cudev/block/dynamic_smem.hpp
-	/usr/include/opencv2/cudev/block/reduce.hpp
-	/usr/include/opencv2/cudev/block/scan.hpp
-	/usr/include/opencv2/cudev/block/vec_distance.hpp
-	/usr/include/opencv2/cudev/common.hpp
-	/usr/include/opencv2/cudev/expr/binary_func.hpp
-	/usr/include/opencv2/cudev/expr/binary_op.hpp
-	/usr/include/opencv2/cudev/expr/color.hpp
-	/usr/include/opencv2/cudev/expr/deriv.hpp
-	/usr/include/opencv2/cudev/expr/expr.hpp
-	/usr/include/opencv2/cudev/expr/per_element_func.hpp
-	/usr/include/opencv2/cudev/expr/reduction.hpp
-	/usr/include/opencv2/cudev/expr/unary_func.hpp
-	/usr/include/opencv2/cudev/expr/unary_op.hpp
-	/usr/include/opencv2/cudev/expr/warping.hpp
-	/usr/include/opencv2/cudev/functional/color_cvt.hpp
-	/usr/include/opencv2/cudev/functional/detail/color_cvt.hpp
-	/usr/include/opencv2/cudev/functional/functional.hpp
-	/usr/include/opencv2/cudev/functional/tuple_adapter.hpp
-	/usr/include/opencv2/cudev/grid/copy.hpp
-	/usr/include/opencv2/cudev/grid/detail/copy.hpp
-	/usr/include/opencv2/cudev/grid/detail/histogram.hpp
-	/usr/include/opencv2/cudev/grid/detail/integral.hpp
-	/usr/include/opencv2/cudev/grid/detail/minmaxloc.hpp
-	/usr/include/opencv2/cudev/grid/detail/pyr_down.hpp
-	/usr/include/opencv2/cudev/grid/detail/pyr_up.hpp
-	/usr/include/opencv2/cudev/grid/detail/reduce.hpp
-	/usr/include/opencv2/cudev/grid/detail/reduce_to_column.hpp
-	/usr/include/opencv2/cudev/grid/detail/reduce_to_row.hpp
-	/usr/include/opencv2/cudev/grid/detail/split_merge.hpp
-	/usr/include/opencv2/cudev/grid/detail/transform.hpp
-	/usr/include/opencv2/cudev/grid/detail/transpose.hpp
-	/usr/include/opencv2/cudev/grid/histogram.hpp
-	/usr/include/opencv2/cudev/grid/integral.hpp
-	/usr/include/opencv2/cudev/grid/pyramids.hpp
-	/usr/include/opencv2/cudev/grid/reduce.hpp
-	/usr/include/opencv2/cudev/grid/reduce_to_vec.hpp
-	/usr/include/opencv2/cudev/grid/split_merge.hpp
-	/usr/include/opencv2/cudev/grid/transform.hpp
-	/usr/include/opencv2/cudev/grid/transpose.hpp
-	/usr/include/opencv2/cudev.hpp
-	/usr/include/opencv2/cudev/ptr2d/constant.hpp
-	/usr/include/opencv2/cudev/ptr2d/deriv.hpp
-	/usr/include/opencv2/cudev/ptr2d/detail/gpumat.hpp
-	/usr/include/opencv2/cudev/ptr2d/extrapolation.hpp
-	/usr/include/opencv2/cudev/ptr2d/glob.hpp
-	/usr/include/opencv2/cudev/ptr2d/gpumat.hpp
-	/usr/include/opencv2/cudev/ptr2d/interpolation.hpp
-	/usr/include/opencv2/cudev/ptr2d/lut.hpp
-	/usr/include/opencv2/cudev/ptr2d/mask.hpp
-	/usr/include/opencv2/cudev/ptr2d/remap.hpp
-	/usr/include/opencv2/cudev/ptr2d/resize.hpp
-	/usr/include/opencv2/cudev/ptr2d/texture.hpp
-	/usr/include/opencv2/cudev/ptr2d/traits.hpp
-	/usr/include/opencv2/cudev/ptr2d/transform.hpp
-	/usr/include/opencv2/cudev/ptr2d/warping.hpp
-	/usr/include/opencv2/cudev/ptr2d/zip.hpp
-	/usr/include/opencv2/cudev/util/atomic.hpp
-	/usr/include/opencv2/cudev/util/detail/tuple.hpp
-	/usr/include/opencv2/cudev/util/detail/type_traits.hpp
-	/usr/include/opencv2/cudev/util/limits.hpp
-	/usr/include/opencv2/cudev/util/saturate_cast.hpp
-	/usr/include/opencv2/cudev/util/simd_functions.hpp
-	/usr/include/opencv2/cudev/util/tuple.hpp
-	/usr/include/opencv2/cudev/util/type_traits.hpp
-	/usr/include/opencv2/cudev/util/vec_math.hpp
-	/usr/include/opencv2/cudev/util/vec_traits.hpp
-	/usr/include/opencv2/cudev/warp/detail/reduce.hpp
-	/usr/include/opencv2/cudev/warp/detail/reduce_key_val.hpp
-	/usr/include/opencv2/cudev/warp/reduce.hpp
-	/usr/include/opencv2/cudev/warp/scan.hpp
-	/usr/include/opencv2/cudev/warp/shuffle.hpp
-	/usr/include/opencv2/cudev/warp/warp.hpp
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-gles.patch"
-	"${FILESDIR}/${PN}-3.4.0-disable-download.patch"
-	"${FILESDIR}/${P}-compilation-C-mode.patch" # https://bugs.gentoo.org/656530
-	"${FILESDIR}/${P}-python-lib-suffix-hack.patch"
-	"${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled stuff
-	rm -rf 3rdparty || die "Removing 3rd party components failed"
-	sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
-		-i CMakeLists.txt cmake/*cmake || die
-
-	if use dnn_samples; then
-		mv  "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
-	fi
-
-	if use contrib; then
-		cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
-		eapply "${FILESDIR}/${PN}-3.3.0-remove-tiny-dnn-autodownload.patch"
-
-		if use contrib_xfeatures2d; then
-			mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
-		fi
-	fi
-
-	java-pkg-opt-2_src_prepare
-
-	# this really belongs in src_prepare() too
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-}
-
-multilib_src_configure() {
-	# please dont sort here, order is the same as in CMakeLists.txt
-	GLOBALCMAKEARGS=(
-	# Optional 3rd party components
-	# ===================================================
-		-DENABLE_DOWNLOAD=OFF
-		-DWITH_1394=$(usex ieee1394)
-	#	-DWITH_AVFOUNDATION=OFF # IOS
-		-DWITH_VTK=$(multilib_native_usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF # Video windows support
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF	# Don't want this
-		-DWITH_GTK=$(usex gtk)
-		-DWITH_GTK_2_X=$(usex gtk)
-		-DWITH_IPP=OFF
-		-DWITH_JASPER=$(usex jpeg2k)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_WEBP=$(usex webp)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENVX=OFF
-		-DWITH_OPENNI=OFF	# Not packaged
-		-DWITH_OPENNI2=OFF	# Not packaged
-		-DWITH_PNG=$(usex png)
-		-DWITH_GDCM=OFF
-		-DWITH_PVAPI=OFF
-		-DWITH_GIGEAPI=OFF
-		-DWITH_ARAVIS=OFF
-		-DWITH_QT=$(multilib_native_usex qt5 5 OFF)
-		-DWITH_WIN32UI=OFF		# Windows only
-	#	-DWITH_QUICKTIME=OFF
-	#	-DWITH_QTKIT=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_PTHREADS_PF=ON
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF		# Not packaged
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-		-DWITH_DSHOW=ON			# direct show supp
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF	# Windows only
-		-DWITH_XINE=$(multilib_native_usex xine)
-		-DWITH_CLP=OFF
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCL_SVM=OFF
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_DIRECTX=OFF
-		-DWITH_INTELPERC=OFF
-		-DWITH_IPP_A=OFF
-		-DWITH_MATLAB=OFF
-		-DWITH_VA=$(usex vaapi)
-		-DWITH_VA_INTEL=$(usex vaapi)
-		-DWITH_GDAL=$(multilib_native_usex gdal)
-		-DWITH_GPHOTO2=$(usex gphoto2)
-		-DWITH_LAPACK=$(multilib_native_usex lapack)
-		-DWITH_ITT=OFF # 3dparty libs itt_notify
-	# ===================================================
-	# CUDA build components: nvidia-cuda-toolkit takes care of GCC version
-	# ===================================================
-		-DWITH_CUDA=$(multilib_native_usex cuda)
-		-DWITH_CUBLAS=$(multilib_native_usex cuda)
-		-DWITH_CUFFT=$(multilib_native_usex cuda)
-		-DWITH_NVCUVID=OFF
-#		-DWITH_NVCUVID=$(usex cuda)
-		-DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
-	# ===================================================
-	# OpenCV build components
-	# ===================================================
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_opencv_apps=
-		-DBUILD_DOCS=OFF # Doesn't install anyways.
-		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(multilib_native_usex testprograms)
-		-DBUILD_WITH_DEBUG_INFO=$(usex debug)
-	#	-DBUILD_WITH_STATIC_CRT=OFF
-		-DBUILD_WITH_DYNAMIC_IPP=OFF
-		-DBUILD_FAT_JAVA_LIB=$(multilib_native_usex java)
-	#	-DBUILD_ANDROID_SERVICE=OFF
-		-DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
-		-DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
-	# ===================================================
-	# OpenCV installation options
-	# ===================================================
-		-DINSTALL_CREATE_DISTRIB=OFF
-		-DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
-		-DINSTALL_TESTS=$(multilib_native_usex testprograms)
-		-DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
-	#	-DINSTALL_ANDROID_EXAMPLES=OFF
-		-DINSTALL_TO_MANGLED_PATHS=OFF
-		# opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
-		# to set its destination libdir
-		-DLIB_SUFFIX=
-	# ===================================================
-	# OpenCV build options
-	# ===================================================
-		-DENABLE_CCACHE=OFF
-		-DENABLE_PRECOMPILED_HEADERS=$(usex pch)
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-
-		-DHAVE_opencv_java=$(multilib_native_usex java YES NO)
-		-DENABLE_NOISY_WARNINGS=OFF
-		-DOPENCV_WARNINGS_ARE_ERRORS=OFF
-		-DENABLE_IMPL_COLLECTION=OFF
-		-DENABLE_INSTRUMENTATION=OFF
-		-DGENERATE_ABI_DESCRIPTOR=OFF
-		-DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
-	# ===================================================
-	# things we want to be hard off or not yet figured out
-	# ===================================================
-		-DBUILD_PACKAGE=OFF
-	# ===================================================
-	# Not building protobuf but update files bug #631418
-	# ===================================================
-		-DBUILD_PROTOBUF=OFF
-		-DPROTOBUF_UPDATE_FILES=ON
-	# ===================================================
-	# things we want to be hard enabled not worth useflag
-	# ===================================================
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-	# ==================================================
-	# cpu flags, should solve 633900
-	#===================================================
-		-DCPU_DISPATCH=
-		-DENABLE_SSE=$(usex cpu_flags_x86_sse)
-		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
-		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
-		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3)
-		-DENABLE_SSE41=$(usex cpu_flags_x86_sse4_1)
-		-DENABLE_SSE42=$(usex cpu_flags_x86_sse4_2)
-		-DENABLE_POPCNT=$(usex cpu_flags_x86_popcnt)
-		-DENABLE_AVX=$(usex cpu_flags_x86_avx)
-		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
-		-DENABLE_FMA3=$(usex cpu_flags_x86_fma3)
-	)
-
-	# ===================================================
-	# OpenCV Contrib Modules
-	# ===================================================
-	if use contrib; then
-		GLOBALCMAKEARGS+=(
-			-DBUILD_opencv_dnn=$(usex contrib_dnn ON OFF)
-			-DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
-			-DBUILD_opencv_dnns_easily_fooled=OFF
-			-DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d ON OFF)
-			-DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF)
-			-DBUILD_opencv_hdf=$(multilib_native_usex contrib_hdf ON OFF)
-			-DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
-		)
-
-		if multilib_is_native_abi; then
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
-			)
-		else
-			GLOBALCMAKEARGS+=(
-				-DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
-			)
-		fi
-	fi
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
-		-DPYTHON_EXECUTABLE=OFF
-		-DINSTALL_PYTHON_EXAMPLES=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
-	# TODO patch ocv_download to copy files into destination dirs
-	if use contrib_dnn; then
-		mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-		cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
-	fi
-
-}
-
-python_module_compile() {
-	local BUILD_DIR=${orig_BUILD_DIR}
-	local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
-	# Set all python variables to load the correct Gentoo paths
-	mycmakeargs+=(
-		# cheap trick: python_setup sets one of them as a symlink
-		# to the correct interpreter, and the other to fail-wrapper
-		-DPYTHON2_EXECUTABLE=$(type -P python2)
-		-DPYTHON3_EXECUTABLE=$(type -P python3)
-		-DINSTALL_PYTHON_EXAMPLES=$(usex examples)
-		-DLIBPY_SUFFIX=64
-	)
-
-	# Regenerate cache file. Can't use rebuild_cache as it won't
-	# have the Gentoo specific options.
-	rm -rf CMakeCache.txt || die "rm failed"
-	cmake-utils_src_configure
-	cmake-utils_src_compile
-	cmake-utils_src_install
-
-	# Remove compiled binary so new version compiles
-	# Avoid conflicts with new module builds as build system doesn't
-	# really support it.
-	rm -rf modules/python2 || die "rm failed"
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# Build and install the python modules for all targets
-	if multilib_is_native_abi && use python; then
-		local orig_BUILD_DIR=${BUILD_DIR}
-		python_foreach_impl python_module_compile
-	fi
-}
diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild
index 569397d8555d..4b41ad5b7501 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/3.4.1" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
 # OpenGL needs gtk or Qt installed to activate, otherwise build system
 # will silently disable it Wwithout the user knowing, which defeats the
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index 15aa07ba0851..5caf4d338089 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,7 +1,6 @@
 AUX phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch 998 BLAKE2B 6f659a6a6aad157ad708934a165f17ca4766dec3baf3cdd03e5b10b41201751f17008b43b6183df9afeba7303603fc9c1fcc413bb16a2e97cd571196ce2e6905 SHA512 c97a88e86ef3f56fdcdb12d3256afce34381ec1072ebbeda7c427db7a9c000feecab5f84a44d9a86fd099b26cda6a8a50a0a4c20139167e4e8b96c96368feddb
 AUX phonon-gstreamer-4.9.0-qt-5.11.patch 2144 BLAKE2B a11065fab61037e11f54ab2b3a41f55231ac2175372077b302b033bbf7483030e763e50e8dce00886394ce94feb205b75d3bf5f4ea4b0c11f3e0c0fba42f14f3 SHA512 b13fe80bf493d33ef942babf084f823e9d6314f489496007dd43e9c0efba4c8e354067cba5ccae53806156d631a8bbf115b84e654052086aeb1d5d32f15b6f08
 DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe
-EBUILD phonon-gstreamer-4.9.0-r2.ebuild 1112 BLAKE2B d89617cbae84c6cfc8aada90399857bb9da793b1eb5e9521c0dbc2bd98c1510b5e1c9a34a013180070898713290b343ed7dffd697a608df7b3a513321882bffc SHA512 d57323dda5dd554e8ac0b6fae3bb3fad57b255b3d4f396eb70765a8088b509f0f34ddf10b3723fb048feb7aa0c1eddc4463e37513ffcd0268e8cf31adfb33599
 EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1169 BLAKE2B 7781a9243077c4d290ddd3f62e0400b905ac7f925ec250f920b1d86b53b5de073e40c56056a0bfbfec16315430b008b5ec0c9e8662c57439d6a01405c90b3f91 SHA512 b4329bfe0c963bd91fc9d8a9c682bb5ca14db62454d406fb0535bfb56a4f6007f951d66ef33372862b158d8415fa4c9cf55dd44fe36245c6b82d7eebc681cd82
 EBUILD phonon-gstreamer-9999.ebuild 1076 BLAKE2B cc052d97bd49ea217e9cd98c7dd716f34e21088ac9f76c0a1816198a70a3431bec3c9e78de843523e23fa23e5eb947734b38b5958bf99393d54ad05fbe0d43db SHA512 a591c829bbbaa09bddb724956605fcb65528113769837d0232a87feb057a4f15825c7b7a0fdad7e65fd457a756c96ad372aa0ec0baf54b12d7e800c3d25ecb4d
 MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild
deleted file mode 100644
index ace0c03d2dc7..000000000000
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="phonon-backend-gstreamer"
-MY_P=${MY_PN}-${PV}
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
-else
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	inherit git-r3
-fi
-
-inherit cmake-utils
-
-DESCRIPTION="Phonon GStreamer backend"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="alsa debug +network"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/phonon-4.10.0
-	media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
-	virtual/opengl
-	network? ( media-plugins/gst-plugins-soup:1.0 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_configure() {
-	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
-	cmake-utils_src_configure
-}
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 4becce42553a..1a5fb6c44ab6 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,7 +1,5 @@
 AUX phonon-vlc-0.10.1-qt-5.11.patch 998 BLAKE2B e182ed8a038577c48c8798e6769b992a3099930a8332c0cdf146af699f7ca5020df3e9d2f072cf83f43e5570307f90558b2facdf526d216c423a705fa6121d4b SHA512 2bc6f4e08693ff8d02eab9a1aad9ef1f425ced736b7cb11ebfadbe33c111ec053dc60bd48220130f4a80cc117a08fb53e3fd5789554bd0e57f81a61203d2ba9c
-DIST phonon-backend-vlc-0.10.1.tar.xz 61096 BLAKE2B 5124d43a68af5a1ecac46c591e8b727868096e07156e6bc277c94199b6138433c826febf46cf5ffc7776c936fa6373d5ac2114c7a730a6b89380014c44e581fe SHA512 fa94298a8236c29f792285d3f288140d244e0eacba02511a32ee56b5bace50f92a93a714b5c44dc5bafb15b2a9d5ae792231e78dce8ca1a45ab3a328492911df
 DIST phonon-backend-vlc-0.10.2.tar.xz 60568 BLAKE2B 7ee5ea6cc627ec2bd872b4c60f9c915f383e9b2826b30c4b0db96e8348b1a26ea4f710076b68892c28c73d45dae118f06a315093b6e954d48967891f1e31eec4 SHA512 3c4e7c60582d7871b209f4b38b139f43ab5f97618399164ecc649cd0e077a1d4c7848bc5c5c213d747cf7e5f1252ff53ded745880dfd36247494479840789ba5
-EBUILD phonon-vlc-0.10.1.ebuild 841 BLAKE2B 90482c1985f84edca55bca9dfc488d84472045d44ee4046e7044afd9258a0179c45ed604f4e985b6cdd6bbcc7c9d541d0ec531b917a9bbbe334e3c16ab37bb2a SHA512 8f6e296b8a8eac9b8738cd53a38f30855f84a33b916ca40b2653d631f416ec52eb41dc88e698436f7893ea4701d532f633dd52f81b5aeae797d28ac27b6a9cf9
 EBUILD phonon-vlc-0.10.2.ebuild 888 BLAKE2B a6886cc21e6937c26ade888dc11bfdc4b01772920e804646f5eebcfcb1bfa8c924dd66da919276574fb07a82809d1669c967d9ea19e0fd6e0a2cd413dd678081 SHA512 ef63ea128df69ac4f75a3b79f445293a3c10f9fc3622debfc0f431b7ccf3dd21128b48e606577609abc8c1952a83d6f91defe3483086353defccd22ad31f42e3
 EBUILD phonon-vlc-9999.ebuild 805 BLAKE2B 68dea701bda421326ea0b2fadd1c8b212442855e9c4a4fbd12d43e058dcb823a04b53b13a654102e58df26877dfea82cbed1c6735e78bd1076992ac5d83ff2e9 SHA512 608dbbd83aba883b269ea53ecf7eb816cd5bc9fa482c4bc9759f19cd7f51cde1940c3b9b157323b413eede37a8a1a9c458a0cdac0fd4ad5bd177486e0e23c172
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild
deleted file mode 100644
index 13ad0d371f84..000000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.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=6
-
-MY_PN="phonon-backend-vlc"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-else
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	inherit git-r3
-fi
-
-inherit cmake-utils
-
-DESCRIPTION="Phonon VLC backend"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	>=media-libs/phonon-4.10.0
-	media-video/vlc:=[dbus,ogg,vorbis]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_configure() {
-	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
-	cmake-utils_src_configure
-}
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index feae4f8d5341..8bc50ff363eb 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,6 +1,4 @@
-DIST phonon-4.10.1.tar.xz 322100 BLAKE2B 0040bcc82e68a52cb8056c29b5008daddfd8b985f95113e17f1c18d1b5bf1f81222a34ae45b2ee5bd3bc0f104614551638642a85e1770fc218cbe7e2209b5a0e SHA512 a1cc0960c587d09a2fb0f43ae82147df133c34cba7bf01f5720b4b27aca4dda1d83444e89e40fb2f25828d152f89ccfff56d2d4649007c57b7df9eca8c64c007
 DIST phonon-4.10.2.tar.xz 322176 BLAKE2B a73fa78e732ba56745e0791559a1ab195e9a5d867d368935ebc779cc1705a405dfd8302f6b5d92678098da8b6fdb52ec4cc2d553c361c3fefc738d502e3c38b6 SHA512 205c2f41691ed37a2b24aa5e900f7720ba024d2046ea4bf0a9b9c46235ffd72dfb4010287ccf753b13e395f84c2a202cbb76454806de3519faf52c3ac7001c4e
-EBUILD phonon-4.10.1.ebuild 1316 BLAKE2B 4f5bc7ee24bc83bd5a015a95a39b33fd04d5dfd4fc005b9066f66a811e7ebac9cd2342ca8404bb581f78e66f4a4419845ca7462d1cb77a1c163ba45a5fa87d49 SHA512 a74bd9738dc1d27e9d58dce0088fe1c0c6696d0d19a17ac31a38a41c4966a16def6a5f84be108e70c37ecca233fa11d86010ec67f41ec69ff1c255e72b7e61cc
 EBUILD phonon-4.10.2.ebuild 1324 BLAKE2B 6ef0d20a4dbb85e7a3e79dd79912bd9cf1fadf976299b6da7d5afc99435bc887daa72dc454b7bad35380e616593527e67966bade83b8287781c1484e309064b2 SHA512 d2ec58720805baffc45efd4eb073e2237a04307a3131c87b000421b2f322a315d820b47f3e88c207dcdb6c0e1e107f229490323a16bb93f40c8988f477598d1f
 EBUILD phonon-9999.ebuild 1326 BLAKE2B 7c6d2b1dc638e0caaa10c788fcb50a56f2aabbcdf1ce4107713b5aac3b89efdbb49fdaebbd18f8c6e6728751db0387bba79f3df91dbee99d503308d83d97bf97 SHA512 88475f68ad0c6ebee1cea8783990d1bd3d269ac4834495094773dca906bb094e37c37abeb64b300584baa6049d273e73954f7e2009d36c2257e67736807275b0
 MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6
diff --git a/media-libs/phonon/phonon-4.10.1.ebuild b/media-libs/phonon/phonon-4.10.1.ebuild
deleted file mode 100644
index 58820d1003c0..000000000000
--- a/media-libs/phonon/phonon-4.10.1.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
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
-else
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	inherit git-r3
-fi
-
-inherit cmake-utils qmake-utils
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug designer gstreamer pulseaudio +vlc"
-
-RDEPEND="
-	!!dev-qt/qtphonon:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-0.9.21[glib]
-	)
-"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig
-"
-PDEPEND="
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] )
-	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPHONON_BUILD_PHONON4QT5=ON
-		-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
-		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
-		-DWITH_GLIB2=$(usex pulseaudio)
-		-DWITH_PulseAudio=$(usex pulseaudio)
-		-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)"/qmake
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 8cf101fa5206..d42209ca5990 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -2,6 +2,6 @@ AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B
 DIST vulkan-layers-1.1.82.0.tar.gz 962993 BLAKE2B 6fe541116f8d4d4370cb5a0b2a98c07139577edf20653359f9f149b503c3d2e9aa98e95af14582c80033b535cc4cec5cc5f148396f472aaf75a8767579978a61 SHA512 c34b691a340830462b917890c97dd86c66eac097ba284183d8bf148267b1a881c909b89c6f9ab78ddd03a60cc884c982bc578cc67e4fbaf37d044004b006a65a
 DIST vulkan-layers-1.1.92.0.tar.gz 955136 BLAKE2B 8a039c17a231cda732aafd947c01a658c72932048307b81777254236eb6a2945e287cd098c2ee1fa264c21477b30e48ba83bfd0af4fb5f5bcb0adc502cc45a03 SHA512 09b32635bf26cdf3c1f18e57f7c7348a72c25de37c7afe03c0508cf5d3c6f39779d4a819eb92b2bf4f9300d80e757e8aaf9ec2164d7fd9f523f2926a497c08f6
 EBUILD vulkan-layers-1.1.82.0.ebuild 1499 BLAKE2B 2f2b35c2ea64ea2ed34ab92a191cccf4892d8d5716d9420d09f3a23649d6d2a5007d1fb259abe059512dde226daf76b759c6bf62bd45d408b8d2211d5f38605b SHA512 6425c3c3b6f1caa8acc61b60c2252a9b2860d965e7938321919aed8298146063aedc7ae63acf0c51598948b0fed0d512e83dfa306d79e0f0031a03dd04e6abdb
-EBUILD vulkan-layers-1.1.92.0.ebuild 1382 BLAKE2B 612d1b274013fda74869ad7f3889bb68510fb8e837f0d1be37a03d66de56e6ad3a93ba299addda562e493e0c4cc381bf2542174cdb69a536ad033be3c63373eb SHA512 3d0e10fb745567b45542e7970cf0d6964a4e34e642ab9f370a37069203bfb0d73a67c994bb0a4595c4f8f220d912ba90ba2e9bba9007d53fe4fc347fa0da5f59
+EBUILD vulkan-layers-1.1.92.0.ebuild 1381 BLAKE2B c91d8ec63a26db099e5a251422e786cb816378a99c91ec08947790a34e6ff55d5d00ef4b994b1e81ecec7bd694a37d434b0c82a29eb16f139f8c62eb939c971e SHA512 ed34962e991fbfdb9404e78424818159211e33cd1828631afbb054bdc40b4a06735e1126e30ab9f0a44a54965b986a19658f154dcfdaf645aaa41601c80f1f0c
 EBUILD vulkan-layers-9999.ebuild 1382 BLAKE2B 4085c6efe3f7fef3c784ed51818914adf7851a4d0c2b2c1e6b83cb0ce744e1fd89548533141f38d006f5ca455722cd7f2ac588fbfec8f97b7c78902f8457322f SHA512 5721d495b9d79c3aa846fe274fa76122e59c3aa415f8d2544a6570716014ade2bbc940b7a7117d5e10841330b0b5094e512ef12480cb2876fa4903303bbc5a6f
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild
index 4d66e6776c6f..648e31fd8100 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="6e6da6ccab8931f7c30815966ef839b1155e5bec"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
 fi
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 1ad32f2735b0..8e7ecbd064ad 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-loader-1.1.82.0.tar.gz 1342427 BLAKE2B 4b2c589e2c1edaa29e13e892cc839f2d7af5bbadf7dda3f50eca2543c1877af175e9640545b886ffe3e8b1c51373502ee272829ddb15c07629ea08ece697e5b9 SHA512 624e493454e622e29bc0de5fdf1c425691b3c98f317660847e95aee6bc42dafa0b4d8caa9de52e8f3229b7e743afa475485cd3affbdb295e16ba49d30d1eb19e
 DIST vulkan-loader-1.1.92.1.tar.gz 1346712 BLAKE2B 60d29c38e72ff234261a3e75934d44de08c334c475e715066c210844ea672f0e2db3ebc8826df7d72392e3c2a0bbd0604b8770c0b35ddd8f72ed875234bae15d SHA512 c29d1fb43a2bdd0f291860dee0ffe7ec23a34c9431aeb76a46f8df0ec2f70601ccd3e96280f94d881f5550e3c9f07fe478f94eebcfd2aaf123045c7281313aac
 EBUILD vulkan-loader-1.1.82.0.ebuild 1579 BLAKE2B 05f92e8a778677a99ae5779bb6081a210502e39040705b5223365d4b6757d4f72de9a79017173181039b2c7dd096fe827b782dfe2cc673b3491f987f06536941 SHA512 a2f86faefe1870778c5232c50451dedf5e4b959f4cf9c1983ffb0a42065fcbd74429a06c12832325ab318cfa3dabd235a5680c6d34d5cdf982e8642826e543ab
-EBUILD vulkan-loader-1.1.92.1.ebuild 1544 BLAKE2B cd565e06eb8c163e34d940ba3dfa9415168347555f6d3f9e58a5f8abcb77d9589c0a5118596b9d8e13972813ee52e3827ee5398214e7b0d0dcdebc36d5f572bc SHA512 8dca894c3896dc593367632e9fbd6757169cec98121caeebf64f603e6f9100bdf1227967f517d34eeccbd4c6ba2a02ec263f2c47685fc7912e499a0af5e4b3b2
+EBUILD vulkan-loader-1.1.92.1.ebuild 1543 BLAKE2B c0d6c78fdf83fad0fe0bd75a873962f2d2121d5bbd8d29b8e8e219928935d26f48ba767e9c2cf236d97faab69c5e6bc39f3adad957c6978b3f809fcd540aaa1e SHA512 258c4fa187f4c86ec3ac8bb75458cfa1ef3f5497ef28db1ab4cffc3250dfb7995fd31b5144174653e372ed69cc490cff3203afa63aa3beed22f8f750e3585f1e
 EBUILD vulkan-loader-9999.ebuild 1544 BLAKE2B b1cbf1e197db3080f9c1d2a7c14cd7e68adadd19639148a0e4ba42b17aa9c57cf237a62b659554d5072f8c84d59dd58b15112726c1a521df10e0a6c0f6cb87b9 SHA512 af081aa47ef8fc799e5c558e89d8dfc2c8ca472ede7d167842776e06b8b50b5c325d496a35467c64b84b2785e200ddbb13781d440bf6e63410c893ff35e5f695
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild
index c0dda1e94306..cddf66da355a 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	EGIT_COMMIT="4cd7e44fc1ca6c4d8361720b43a3588ddf9fc4b6"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Loader-${EGIT_COMMIT}"
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index e0d7c9d5ba47..0abd2009df83 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/kodi-pvr-hts/Manifest b/media-plugins/kodi-pvr-hts/Manifest
index 0146749ba9ce..c22632dbd4c0 100644
--- a/media-plugins/kodi-pvr-hts/Manifest
+++ b/media-plugins/kodi-pvr-hts/Manifest
@@ -1,9 +1,11 @@
 DIST kodi-pvr-hts-3.4.24.tar.gz 201592 BLAKE2B ad4db20f002c006f9c5dbeec65b136287fe6f7b6d973794e90c1e7c2edb3d13717db077edc91172a94c709afc623ce5fc29ccfa88ff34e8c6694b164a9223497 SHA512 66d0c0f090a1c22f748a2cf70a9790dc1fa74c05bbb3ad478cce92b2a116c8f2c25dbc72a9d6f2269a19da94c0ea9f7123bfffeebb9d2d6f29dd17411410fe16
 DIST kodi-pvr-hts-4.4.10.tar.gz 160286 BLAKE2B 598dab8413f14511b63159a034e233397e2b75018cd8d8f3702a5461c663a39eb9ef2c3088692f7c08b5ec9380c18477e95eaa044c6549ba53c5f3eaccaedc7a SHA512 c5a5a493ea38c6ec5427991b674c7b405e9dda5330e2f2df062a6b77b57afd8326eb03763d40701569dd11c2ad902bdbfea390ad6cce8cb39ac1b6f0450527bd
+DIST kodi-pvr-hts-4.4.11.tar.gz 160336 BLAKE2B 229096b80953cc2e757a2aa34eccf557a77e32250f5bed5a1dc242f70d54b017e1433efb869d9a8132ced1f5c40b22b5020440c10ab2db250bf62838761c415c SHA512 1e80e4d4683c46bc2f135464e017b39b637ef15958210513e6237b1d51d851f8178c55e06cb73b6a49978a48d4da43185e4c3e9bcfa848f3413f5f2a6a35a8a9
 DIST kodi-pvr-hts-4.4.2.tar.gz 159871 BLAKE2B 56d054e934367225809409960ecc629ebeb92ac95845c10f82cc3942cbcc7e4cf7c32ebfec18a90f2bc3c09f62fcb5cc020fa2a66584ce6891e4012c1342e812 SHA512 ab0e1cee6eb5e8b0810b78bc4af70481f061ae5b8144c5a06370b6fc4c9a1a7713531de144ccdabc9d21cef659e7909bd49f89dfcf377f3520f20be5cd738e9e
 DIST kodi-pvr-hts-4.4.6.tar.gz 159925 BLAKE2B f4dc1e27a91164521aeb9c2f9969c5248ebc62e81211f552b151c5ddec082bb1c7ed8d44ff0ea5fe88ad7f8b592fbe0110d52cdebcbf579bc8198cb56a1935e2 SHA512 c9cba9a967d2ef3fc89277ae3f01c9045cc309dfce92747619a513b0b289f8b7ee68d589bb44655c1dc48a9020943e66e1b8e6e5ee3271cb7efb0d050a551459
 EBUILD kodi-pvr-hts-3.4.24.ebuild 727 BLAKE2B 3b4ffb79aa912e1ec28482085cfda46969140da62410bb2c6698aaa6176b76b980aada914920dc2dafd170d155ab6ab586ef43c7f16c2629763b90561809b787 SHA512 469accb72b3fbf8085cd1d0d823c20a837442ac44d748bf352cadf5706952a9c3af4948753a236ac78bfc0f430d340710ff657f39fe65bbcd8b3c7ab3a58ac13
 EBUILD kodi-pvr-hts-4.4.10.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
+EBUILD kodi-pvr-hts-4.4.11.ebuild 721 BLAKE2B 6c0f27c40208e8d4734f9dc79a7cd59bbf7b38335957815ebbab26f322c669f0f29a6562206973d65c276ab8bfaa885f0770db96bccc3eeb32256fdc414fae8a SHA512 cb3f4940a9617fec746d3977022c347060ef2c038218d2f3520f2546b1d7c000fce3f3a776d7575884e02e09e8b1c8f2367a5c389c7971ad1cbb88633c990ec3
 EBUILD kodi-pvr-hts-4.4.2.ebuild 721 BLAKE2B 6ad7ded19a2c0ab3051822e8e067d05a6ea3d100ad8754acd92f95b2f74f43f9dec304ec032278351ee85456f1b6144cc815ac11963648773bde999b9a3b7e12 SHA512 f92d1b10fd874708862855d1c3baa28d509c1ca9e096643d9545b8a25b4153e2323657976e4dc2d4da3c1d39993303c72f9d4fe9026d800baeb1e01fcdc624a5
 EBUILD kodi-pvr-hts-4.4.6.ebuild 721 BLAKE2B 6ad7ded19a2c0ab3051822e8e067d05a6ea3d100ad8754acd92f95b2f74f43f9dec304ec032278351ee85456f1b6144cc815ac11963648773bde999b9a3b7e12 SHA512 f92d1b10fd874708862855d1c3baa28d509c1ca9e096643d9545b8a25b4153e2323657976e4dc2d4da3c1d39993303c72f9d4fe9026d800baeb1e01fcdc624a5
 EBUILD kodi-pvr-hts-9999.ebuild 723 BLAKE2B c40ccaf825c6162a565463bfe008d827e96ee2663422904ad086eed69f239a240133e4d10ac889e2acaa640c800e4d37edf3e44763b89381e7ff80729a7642a5 SHA512 ca35fceee8d9d6a8f8d622dd6bc6b5e1fc06043522954f6e36656d420b3983b345865ebe3e417f6f0cba50850332356b03e5c16c84fab521ac2531ac4bc4f03b
diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-4.4.11.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-4.4.11.ebuild
new file mode 100644
index 000000000000..5b0620a24709
--- /dev/null
+++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-4.4.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
+SRC_URI=""
+
+if [[ ${PV} == 9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.hts.git"
+	inherit git-r3
+else
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.hts/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.hts-${PV}-${CODENAME}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=dev-libs/libplatform-2*
+	=media-libs/kodi-platform-18*
+	=media-tv/kodi-18*
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-pvr-nextpvr/Manifest b/media-plugins/kodi-pvr-nextpvr/Manifest
index f2dccc808fb0..bdf1e84d3407 100644
--- a/media-plugins/kodi-pvr-nextpvr/Manifest
+++ b/media-plugins/kodi-pvr-nextpvr/Manifest
@@ -1,10 +1,12 @@
 DIST kodi-pvr-nextpvr-2.4.11.tar.gz 111677 BLAKE2B ce1279641f4ed1bd5e1a0731198775c2ca6358ac8de846bc57588988eb415bfbaf9fe069b84717368eafb9fa01b232b833888c8580bdd886d1331618c369faab SHA512 2c9e98cb6b99aca8c582d4751096c7ef445f97b09fb6d51c798767c7a7b54632bd4e5c7fb2d723b023eeb335daa73e53ba455156bd8e8ea863c3a98659e5e906
 DIST kodi-pvr-nextpvr-2.4.13.tar.gz 111692 BLAKE2B 5199c9fb8b767eeaf116ed87abafe0d5f0e1e252fae945589413c002b313a222090c9cc12db02e927f168f6217c2fcff55f20adef984e54bceed92755e9922a5 SHA512 314217bca4ce7bf43900e8572fca158874c90bba50ca78b7541e804a3b00216bb39ef7624a270ceb4407f33d85b2711c7b58ea9b4ec1a0386d3d7697cac29c2a
 DIST kodi-pvr-nextpvr-3.3.11.tar.gz 119455 BLAKE2B 1a1eaedaada67267ac63776e0ff4c668a6f2484c73e37ce94cc825ac07507fec3a4d4970b556bff1ab8a0a74231b38525773492b91cd4ed4bba98b213a15b9ea SHA512 145c71c0eeb7b9cea03b1fa1c4c18f6b69e6d775519e1565160efd32a38642eb351b608fb54f285281a36ee4841e8242e1ff7c2aa384dbee17dabfe8ba13bd65
+DIST kodi-pvr-nextpvr-3.3.12.tar.gz 119592 BLAKE2B 6522790e6bb6dabecd010d34fdd1ee9590b541e8fd5a539f586cb81635f5f3729f813514355306042180e7482d0e1c350639d285ce591fc1c35d560e50f903e2 SHA512 bda38c256a9d49f72ec6c8ac9942670942edd8ac095c5f6eee120f52189a9d5466c28f2a7dcb525987da5df05d5ebc4e3b2d93778807370c8d16ac936c616293
 DIST kodi-pvr-nextpvr-3.3.8.tar.gz 118717 BLAKE2B ea72f205121b050355fcd194fc8c28a2bce62504187372128b7397841f03a411d9ae1419aa1cee36acf391e098fed04b58f3312a74cf3dadf48726cd72da59bb SHA512 3cf8de69091946c9678c73f0254be9d49b51ecffe8153f675e62198aa97fa952bc5c1b5a4ccabbf7de5c05e8ca9e0c01d1ee5fd5988504430acec37a5b2edf3e
 EBUILD kodi-pvr-nextpvr-2.4.11.ebuild 708 BLAKE2B cd6f8a585a17a0d94015dfc76680e1e204b4624fb829c892cd1adbd0bf977386badc5d709e28f129b833e8fe5578b58e711b837ac7830c0b6f241c64f6e1fcb4 SHA512 4066099029ac535ecb90d98617e396d5138286298d48cb7b13b5d0641add49e220ab1cc28ca9438cb92c39ca08f64938d87b1925adcaac948c1f965fc8b2ee9a
 EBUILD kodi-pvr-nextpvr-2.4.13.ebuild 708 BLAKE2B cd6f8a585a17a0d94015dfc76680e1e204b4624fb829c892cd1adbd0bf977386badc5d709e28f129b833e8fe5578b58e711b837ac7830c0b6f241c64f6e1fcb4 SHA512 4066099029ac535ecb90d98617e396d5138286298d48cb7b13b5d0641add49e220ab1cc28ca9438cb92c39ca08f64938d87b1925adcaac948c1f965fc8b2ee9a
 EBUILD kodi-pvr-nextpvr-3.3.11.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
+EBUILD kodi-pvr-nextpvr-3.3.12.ebuild 702 BLAKE2B 797a4cb29b87021004a4c4bdaf8fccaea26676981e8868f95fbdc73720c4bfebbd879c8dd53fabb8c59a1321bc87af2c2dba10d4c1143e89c3f51b277132c4de SHA512 d7172c5b1643404e6822cbc6ea8473a312b708a28d3a9ee8c3d1d50ec4555858f359b5c76ff796e243558514b51fb5eac7c396d7f703fe59ed903be0a1d4b4bc
 EBUILD kodi-pvr-nextpvr-3.3.8.ebuild 702 BLAKE2B 6d087756fb0b2e5bef01e78f2e986fddfb4f02c2dfbd8803410d3fb0d1b0e260a2370bc8034737d31ae1e2df2ffcd119fd5d02127b383e1518f674a8b9b87943 SHA512 d5d8320f1fa4f1e3baf3a7cda383d6453a44ca4e1816926212818469d01161f3348ca634ad5a7c95c148fc491fec9ce3e4f2b507b2cf4d07b4cf99960cda4e18
 EBUILD kodi-pvr-nextpvr-9999.ebuild 704 BLAKE2B 9bfe109a644ca55ceadedcbbb6cd8a48679afd67ffd9128eccbe9081bcf611aa5da06f1ec3b3d0d2bc59b279f2c8bbc90aa7e0b190868dcadb622625a60e4596 SHA512 dfe5613b50d14ab632d80dda8041ec11f7a7bf5996a8cd824b56f51490f9fc1678ef914f68f9e2f4f58def0af50f23d143069d622cc3b861e97d1c6cfba97294
 MISC metadata.xml 430 BLAKE2B 60ef7af47e0cd7d264fd19275a356b83cd9fd4e5ed4e237658c47152315d4abcf807377bd8c94d88ec3088530a5fd9ab2d9482336328eeb9ff380963364644a9 SHA512 b0bd41b39d6e1379e1b3c36124432716cb222205ed587246523a8a48c42e2d9922b1b24c87ef601bf5f7452cfb874710c1ec7b558b9224c95c921b80967e02e3
diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.12.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.12.ebuild
new file mode 100644
index 000000000000..be53994bd0ff
--- /dev/null
+++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.12.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's NextPVR client addon"
+HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.nextpvr.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/pvr.nextpvr-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	=media-libs/kodi-platform-18*
+	dev-libs/tinyxml
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 16feb875a074..dd93908dcd5b 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 63f03109d1d5..dd29884c5483 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,6 +1,6 @@
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
 DIST pulseeffects-4.4.6.tar.gz 1053954 BLAKE2B b88922c591ff24a886d9b66363e5757ad68fe683e7de88d32146a26f8f86aa5a5feb322b75471cec45dae159125f80aab1470503a73a59be4259c96b6c66ce80 SHA512 35eb6c3e750a77c8fcf8de6da0c34ad6d6bcb72b0ee81d5b719aba37a71271b72195bb4d3e1123b4f82ce07ab7d8917c5fe52f5e40e884595d5982e95cff4bec
 EBUILD pulseeffects-3.2.3-r1.ebuild 1563 BLAKE2B 0228023ea1073377071fde4a8ff29f64d0cecb278443131b2b0e96c190be3cee576a7f46e8ae9c293c2c0a1ff4ba0e64cb2c3e4a26bfa36da29ffaa10eb3f6ea SHA512 542c6256cada65c39c22f7066b3f0520faaea3a0426c1baf91e21587793202df5561a4a30d07ff44ec5d77b7d83cb1dcaefc32eca350dbed3cac36780db782e8
-EBUILD pulseeffects-4.4.6.ebuild 1683 BLAKE2B cc9e039515f7f34748011c3c49172b53dccf74695a52e503a8699569004b3f1c65c8597d2c097eab0bba9569ca2ff5cdfad1b24e409b54e0c753b9b6affdae00 SHA512 a8e592deb929763b537e1f7eb261664cb0567cef369ae82ad77dba2ca196ef8a984b8110e685067958f688322abcab066be31fddb8ad83149cd179289e402309
+EBUILD pulseeffects-4.4.6.ebuild 1709 BLAKE2B 42a798d0059e6692d60ef962a1f7fac28f8f982a73d454914cdea8b11ca7176ba1076d21e6490061c7a7145db8516e8737e3c34d50979667cbdd196f140a28b6 SHA512 ee0b4523c7911e3b22715fd000bfb89f46c5b9e361b472d48b075045055cb316f3cdbe1ff130fed9cef518180696330fcd8ade73ac337183d3e3e0a5811e0992
 EBUILD pulseeffects-9999.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.4.6.ebuild b/media-sound/pulseeffects/pulseeffects-4.4.6.ebuild
index fde82461dadf..9d17e2f2278c 100644
--- a/media-sound/pulseeffects/pulseeffects-4.4.6.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.4.6.ebuild
@@ -42,6 +42,7 @@ RDEPEND="
 	rubberband? ( media-libs/rubberband )
 	>=media-libs/zita-convolver-3.0.0
 	media-libs/libebur128
+	media-libs/libsamplerate
 	media-sound/pulseaudio
 	sys-apps/dbus"
 # see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ee16c5b1ab27..276e1d864e9d 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index d093fa122ecb..cf707e9a9b6f 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,4 +1,6 @@
 AUX kaffeine-2.0.15-qt-5.11.patch 40573 BLAKE2B 2e782013fcdc06e3ba19170da714e7565c27f467ec9f2ba7d4c3a352d4b1f0ed8dfe9e562ca4bae6a0f8ed424783f6d2f52f40aaacbf40a7574ad460fc10a963 SHA512 3cdeea289406493b668bf6ff1f48f9fde1efa39fdc92b0eda90942fa79620b2c9b65321c03d63d7e593b1ceaf17b5f03f04d7da572ead71f602c04c8da97c13b
 DIST kaffeine-2.0.15.tar.xz 5988584 BLAKE2B a9361b321a0af13013596c2d06e53053a889a0697fcf5c644195d6bd7e43fb3c108d2c03cf3250c6cb8b14383e10735e883e5ebb17be1b5f9fe5ca81f012dd28 SHA512 d2b21df76710eb79395a0d4e762ecdde4610945de3d1105002a44a56725aea3f10003f4ebefe4cd67f58f561e79aa3f5561639ad5c3afba488146dcb9360f53d
+DIST kaffeine-2.0.16-2.tar.xz 5995824 BLAKE2B a472be60d10be077fd7ab3828e6958b0c3a2a8fef66318d33c0972e08cf3f5f19ce9d99cf42c21fed0aba67e296b639624e78d0e5567a9dc291a342c0ccf9249 SHA512 1b39bf59127c777b34f3076a237c53973af827191d2a279d40e7f14891dcd3d7bba1444b0b456d0e614807bf6bff494568aed958632dfba54515de8de5b06f21
 EBUILD kaffeine-2.0.15.ebuild 1385 BLAKE2B 1b1824ace75e0878cab888e50b3bec8fec65e21f4666aa07914435f9299429189871780237806ece7f6a6a27caa259e68d37d3808a3e7dc66698ef5f8e9ab400 SHA512 c20977403fa0b1d57b4231283b301ccc692aab5b6214e2bc47185254d3438887932fe7499da289f712ba5cda29edcfbbeb9c25adc0b8485374d2c011da83173b
+EBUILD kaffeine-2.0.16.2.ebuild 1350 BLAKE2B 0d8dde77910ffd834deca011942436fedcb3e27a2da6e9110dbf7a87aff91f42a24637f47e9a46da4933c3fe0f365a62d707d582e21f50e30834869bd847c14b SHA512 5a07bf3eeb41e93f561e7c375581697aa637cebe7173045b3795813db61eed4543d075592309a0ec79996b0e432e783547baa5224b1574c080dfc7fce1dde4e4
 MISC metadata.xml 369 BLAKE2B 2ba0f7bed05089f04c57eaeae806308ef4fe560461e5f44b32e05ffcb2cd2ee064d81a07589e1d9ad067acb56f9dd43d0acda9a87cdaf42187aae8cb67306a54 SHA512 f58a7acad05449a5cfc6ee4bc9d52677b06b9d994bb109a279d04e71ff7368cd697b286767b463e4f5d42a1194b268789fb373b17a19e581927c25d64d46a083
diff --git a/media-video/kaffeine/kaffeine-2.0.16.2.ebuild b/media-video/kaffeine/kaffeine-2.0.16.2.ebuild
new file mode 100644
index 000000000000..c5b786cd7f75
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-2.0.16.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://kde/stable/${PN}/${PN}-$(ver_rs 3 -).tar.xz"
+fi
+
+DESCRIPTION="Media player with digital TV support by KDE"
+HOMEPAGE="https://userbase.kde.org/Kaffeine"
+LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
+IUSE="dvb"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-video/vlc[X]
+	x11-libs/libXScrnSaver
+	dvb? ( media-libs/libv4l )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( Changelog NOTES README.md )
+
+S="${WORKDIR}/${PN}-$(ver_rs 3 -)"
+
+src_configure() {
+	# tools working on $HOME directory for a local git checkout
+	local mycmakeargs=(
+		-DBUILD_TOOLS=OFF
+		$(cmake-utils_use_find_package dvb Libdvbv5)
+	)
+
+	kde5_src_configure
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 9d557ef7bda1..a38c8d88d2d4 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index c7a7cbd95a47..cf43854746cc 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 16 Jan 2019 05:08:45 +0000
+Wed, 16 Jan 2019 21:08:42 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index fc2031fcf017..de4633e948b7 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 435197 BLAKE2B 5ef1f755677fba588afa252a22622c045d099b3f39fb6b356786170399bb20e8c58212856a5ddc6f59dc6076e3f84a95376a4dc3b4d5154c7d540151a154c88a SHA512 fb541e904c3c6b5ec17c08e76f9ce1dcd0d8f0b31dee092dd3542b9a34a04890e9a1b1e6b0d78d3523fb451deb84b3316ae6b588a29aec6f4741dfb52941ecc9
-TIMESTAMP 2019-01-16T05:08:49Z
+TIMESTAMP 2019-01-16T21:08:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlw+vGFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlw/nV5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBbMBAAhYt93/VBtUKtuDuzEW15rUzr3eanJxhfkfRFPrE+2ugTWHvTwT0qsAYP
-OC4kWgFmDyc4ZaJHQliLmqmOXZyzex6rTibVNSuFlvPk3W7fOdrS4B3fWJmB4/rc
-0l9ByDwX+uEqpIV/UzXzj46kplrBA/G/P1u8XDTju5tEHuL88k13GGwwvgO4NHNB
-f0kNC/UI49zLoYMcgFSEOJI6mSi0xEGtF10eLmrE22TTYZln2tQS7BhUWnvzohDu
-jGnMGelWcxWdVWAVLRRwjfyzul08c+jIIz8JMMeSdShHVBe3KUITFQLd0iMBBKgF
-1G9MbuZh5gp2hshTP1nSaco7ucgVYF0CA6f2ZAanmr9reFZ+yfLlCYheNayUTz/g
-UoLTqh9SmC0AQY6NSEjjLfJcspSOzu7lbjQ8XeSQ+1DE7qvL9Rnt+0naXW5kUhKI
-Z6HwshhHkBRh/lzYAm9mYwThWTzVkx5wQOf44fc2Y08zAMCnJvzhBvfteuyRCG/7
-DSA82Ja2o/qyYZKgSquINQqQ18mwkrVt9bY4sNBmXE832PwbcX5/n6iQRtUedD+I
-HADekJWeJU9oJUSfgxBMODF8qp04rZyhFwtmp/vU7OK2bNJ4x69e2Rk/jUS8pko0
-WJl89JE5FU1/8DDvOZ6qGz52ow38eOCFbLMOwfdB6d1KzceuziQ=
-=wPYB
+klD8ERAAgknVhYGww3B1rB96uyvadaB0amZm7gQ9tGmUf5MzRlxuoZ15MFJ1LZoG
+5o9N7oENMuyXbIe1jAxo17q+YN9r0FJxdgZueyZQfGw1VE5nU98KFetDoYN2Pe18
+M4WLCfeLLsH0kfYl9t56XB1VgBfWzkS6euEwuMi37LyVB6paK4oRsBvSY0ll0mYC
+tI4jf+Bxoyfj0BoY86bCc4U4VhUr3DrRjPtzTvYkji401Uing3Wtjr9klo6szpPW
+Mh7KrRHBYFga6cWonIJCXQfrX+I+6rCtGgZmM5lTzfMlg8VaN1QWm7+G6NqlrF2t
+fw2+sAYWNmSCaVP86lqqibtlftlJU7Bmqpj0ZehzRHLMyJM41nOG4ZwWi6rbKpGz
+xu8JrKZ/HauJT6BI1fXw9DIUsfvHWI9Iq5gqZzvcVfwEjpOHTPQPU7dOYfx1GsQj
+PrObAXn+ZU4Shy7EHDnw0S8KvYxEqFZfGTRDnUb4gzs/DGx8+6k3mkc7eFyAQBQd
+0z1QxX0Mu9CSDHgKQsckba9+lRQOk6S9qJe81xKjod2GSdbPSXtYH4p7MuJFHGCo
++rkRLm0AH7nNEMok9x5V3cpXBWeL3DIMlCN+au04BcUJ8WcAW++JWNm3Ze9wTjKo
+bCw3LcKum+ZQD9xu0xWMA8Zt0fZxzOaee5op+ECMFgR2a6rV7AU=
+=xKpe
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c7a7cbd95a47..cf43854746cc 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 16 Jan 2019 05:08:45 +0000
+Wed, 16 Jan 2019 21:08:42 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0d8bb6d7785c..5ae5d789bc97 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index a43f29b24334..2b0f580e4dc3 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/vault-0.11.4 b/metadata/md5-cache/app-admin/vault-0.11.4
deleted file mode 100644
index e9f9ff14f3a3..000000000000
--- a/metadata/md5-cache/app-admin/vault-0.11.4
+++ /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.11.4.tar.gz -> vault-0.11.4.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-vcs-snapshot	6f66975a5b570c5e05ed96910c574abc	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=00e15866032e8ea2a5b009d63cf84dd8
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index cec89475236c..5eb7fa17e1c0 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/keybase-2.13.1 b/metadata/md5-cache/app-crypt/keybase-2.13.1
new file mode 100644
index 000000000000..620d0951f20e
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/keybase-2.13.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst test unpack
+DEPEND=~app-crypt/kbfs-2.11.0 >=dev-lang/go-1.9 virtual/pkgconfig
+DESCRIPTION=Client for keybase.io
+EAPI=6
+HOMEPAGE=https://keybase.io/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-crypt/gnupg
+SLOT=0
+SRC_URI=https://github.com/keybase/client/archive/v2.13.1.tar.gz -> keybase-2.13.1.tar.gz
+_eclasses_=golang-base	8e4d7f712ec0e170e2c190c1e3da6501	golang-build	42942532e7429ed9b2efaabf93dc0615	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=e18965877962d6c937718cc4a44136b0
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 10f7b8d605fa..9306729967c4 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/kile-2.9.92 b/metadata/md5-cache/app-editors/kile-2.9.92
deleted file mode 100644
index 93acd073d8a6..000000000000
--- a/metadata/md5-cache/app-editors/kile-2.9.92
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdoctools-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/okular-18.08.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qttest-5.11.1:5 >=dev-qt/qtwidgets-5.11.1: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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1: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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdoctools-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/okular-18.08.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qttest-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 pdf? ( app-text/poppler[qt5] ) !app-editors/kile:4 >=kde-apps/konsole-18.08.3:5 >=kde-apps/okular-18.08.3: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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://sourceforge/kile/kile-2.9.92.tar.bz2
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f1ba6770546e81551f08d66e4e1478bd
diff --git a/metadata/md5-cache/app-editors/kile-2.9.92-r1 b/metadata/md5-cache/app-editors/kile-2.9.92-r1
index 1c4127888527..7a390ca6075c 100644
--- a/metadata/md5-cache/app-editors/kile-2.9.92-r1
+++ b/metadata/md5-cache/app-editors/kile-2.9.92-r1
@@ -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.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdoctools-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kinit-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/ktexteditor-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/okular-18.08.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qttest-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 pdf? ( app-text/poppler[qt5] ) !app-editors/kile:4 >=kde-apps/konsole-18.08.3:5 >=kde-apps/okular-18.08.3: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.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kile/kile-2.9.92.tar.bz2
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=63e12350dcf2d761d82d029ac14980d9
+_md5_=75822d741db7afc1fb3c5bc5f957679f
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index b380702e6e16..5317ae5c3311 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.24 b/metadata/md5-cache/app-emulation/virtualbox-5.2.24
new file mode 100644
index 000000000000..b864d3bf2eca
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.24
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.24 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) 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_python3_7(-),python_single_target_python2_7(+)] >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.24 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.24/VirtualBox-5.2.24.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=6bb7604229cb6fa5b47aa4ed3ddc4566
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.0.0 b/metadata/md5-cache/app-emulation/virtualbox-6.0.0
index b349b3df1bcb..f5150b6337f4 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.0.0
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.0.0
@@ -11,4 +11,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_p
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/6.0.0/VirtualBox-6.0.0.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.0_beta2-patches-01.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5b15dffa4ccce46a60855ac2b6a34777
+_md5_=7d36f1501245b1d788828735c7d455ed
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.0.2 b/metadata/md5-cache/app-emulation/virtualbox-6.0.2
new file mode 100644
index 000000000000..83873088962e
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-6.0.2 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) pam? ( sys-libs/pam ) pax_kernel? ( sys-apps/elfix ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/linguist-tools:5 ) vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) 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_python3_7(-),python_single_target_python2_7(+)] >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-6.0.2 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) python_targets_python2_7
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/6.0.2/VirtualBox-6.0.2.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.0_beta2-patches-01.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	tmpfiles	c8f9ea76ade103890e42d0f339afb64c	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=30c46e9e0160bffe320d5063e1f46e66
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.24 b/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.24
new file mode 100644
index 000000000000..18b6504c1300
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-5.2.24
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
+RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.24/VBoxGuestAdditions_5.2.24.iso
+_md5_=e697797f7cd34a655b887c25856ae439
diff --git a/metadata/md5-cache/app-emulation/virtualbox-additions-6.0.2 b/metadata/md5-cache/app-emulation/virtualbox-additions-6.0.2
new file mode 100644
index 000000000000..37d3c0655cae
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-additions-6.0.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=CD image containing guest additions for VirtualBox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL
+RDEPEND=!app-emulation/virtualbox-bin !=app-emulation/virtualbox-9999
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/6.0.2/VBoxGuestAdditions_6.0.2.iso
+_md5_=7fb05fb584defd089dcca5df3be13f9e
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.24.128163 b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.24.128163
new file mode 100644
index 000000000000..3694a2247cc9
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-5.2.24.128163
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-arch/unzip 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(-)] >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 PUEL
+RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-5.2.24 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp 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=amd64? ( https://download.virtualbox.org/virtualbox/5.2.24/VirtualBox-5.2.24-128163-Linux_amd64.run ) x86? ( https://download.virtualbox.org/virtualbox/5.2.24/VirtualBox-5.2.24-128163-Linux_x86.run ) https://download.virtualbox.org/virtualbox/5.2.24/Oracle_VM_VirtualBox_Extension_Pack-5.2.24-128163.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.24-128163.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/5.2.24/VirtualBoxSDK-5.2.24-128163.zip )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=79dadbe62585534b0491b914139f88d1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.2.128162 b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.2.128162
new file mode 100644
index 000000000000..0df07c988ca1
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-bin-6.0.2.128162
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=app-arch/unzip 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(-)] >=app-portage/elt-patches-20170815 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
+EAPI=6
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=+additions +chm headless python vboxwebsrv rdesktop-vrdp sdk python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-2 PUEL
+RDEPEND=!!app-emulation/virtualbox !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-6.0.2 !headless? ( dev-libs/glib media-libs/fontconfig media-libs/freetype media-libs/libpng media-libs/libsdl[X] x11-libs/libXcursor x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender chm? ( dev-libs/expat ) ) dev-libs/libxml2 sys-fs/lvm2 x11-libs/libXau x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libSM x11-libs/libICE x11-libs/libXdmcp 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=amd64? ( https://download.virtualbox.org/virtualbox/6.0.2/VirtualBox-6.0.2-128162-Linux_amd64.run ) https://download.virtualbox.org/virtualbox/6.0.2/Oracle_VM_VirtualBox_Extension_Pack-6.0.2-128162.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.0.2-128162.tar.gz sdk? ( https://download.virtualbox.org/virtualbox/6.0.2/VirtualBoxSDK-6.0.2-128162.zip )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	acac536f2c3bbcd312ac3faaa3e55e40	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=93f20017b835627aca32358227cf90fb
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.24.128163 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.24.128163
new file mode 100644
index 000000000000..0456b326e302
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.24.128163
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=PUEL
+RDEPEND=~app-emulation/virtualbox-5.2.24
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.24/Oracle_VM_VirtualBox_Extension_Pack-5.2.24-128163.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-5.2.24-128163.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=751667edca637916b127d6edf32f380f
diff --git a/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.2.128162 b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.2.128162
new file mode 100644
index 000000000000..f20d61b618e3
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.2.128162
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=PUEL extensions for VirtualBox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=PUEL
+RDEPEND=~app-emulation/virtualbox-6.0.2
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/6.0.2/Oracle_VM_VirtualBox_Extension_Pack-6.0.2-128162.vbox-extpack -> Oracle_VM_VirtualBox_Extension_Pack-6.0.2-128162.tar.gz
+_eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=5d58e9732f1ac2629bd2814f42da839b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.24 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.24
new file mode 100644
index 000000000000..1c0533efcb41
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.24
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=X kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
+RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/5.2.24/VirtualBox-5.2.24.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=a770a42ad258811deee46a5355322f61
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.2 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.2
new file mode 100644
index 000000000000..2b091551e048
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/pam sys-power/iasl x11-base/xorg-proto kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=VirtualBox kernel modules and user-space tools for Gentoo guests
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=X kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=X? ( x11-drivers/xf86-video-vboxvideo )
+RDEPEND=X? ( x11-apps/xrandr x11-apps/xrefresh x11-libs/libXmu x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM x11-libs/libICE ) sys-apps/dbus kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://download.virtualbox.org/virtualbox/6.0.2/VirtualBox-6.0.2.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.0_beta2-patches-01.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=bded1543cb19b925f9742155c42a61ec
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.24 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.24
new file mode 100644
index 000000000000..be64fbfd615f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=pax_kernel kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-5.2.24.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=c210b247d11681c3ac34a330572aa81d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.2 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.2
new file mode 100644
index 000000000000..a220e5886abf
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel Modules for Virtualbox
+EAPI=7
+HOMEPAGE=https://www.virtualbox.org/
+IUSE=pax_kernel kernel_linux kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!=app-emulation/virtualbox-9999 kernel_linux? ( virtual/modutils )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~polynomial-c/virtualbox/vbox-kernel-module-src-6.0.2.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=6daaa9b032c655fed3eae07cbb451483
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 94fdfc7a77b1..549da655a090 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/calligra-3.1.0-r2 b/metadata/md5-cache/app-office/calligra-3.1.0-r2
deleted file mode 100644
index 390bf6751b43..000000000000
--- a/metadata/md5-cache/app-office/calligra-3.1.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.52.0:5 ) crypt? ( app-crypt/qca:2[qt5(+)] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.11.1:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.52.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.9.1:5 okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 dev-libs/kdiagram:5 pim? ( >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-17.12.0:5 ) ) dev-libs/boost sys-devel/gettext x11-misc/shared-mime-info test? ( >=kde-frameworks/threadweaver-5.52.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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE Office Suite
-EAPI=6
-HOMEPAGE=https://www.calligra.org/
-IUSE=activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf phonon pim spacenav +truetype X calligra_features_karbon calligra_features_plan calligra_features_sheets calligra_features_words calligra_experimental_features_stage debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcodecs-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdelibs4support-5.52.0:5 >=kde-frameworks/kemoticons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/kguiaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kitemmodels-5.52.0:5 >=kde-frameworks/kitemviews-5.52.0:5 >=kde-frameworks/kjobwidgets-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kross-5.52.0:5 >=kde-frameworks/ktextwidgets-5.52.0:5 >=kde-frameworks/kwallet-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/sonnet-5.52.0:5 >=dev-qt/designer-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-lang/perl sys-libs/zlib virtual/libiconv activities? ( >=kde-frameworks/kactivities-5.52.0:5 ) crypt? ( app-crypt/qca:2[qt5(+)] ) fontconfig? ( media-libs/fontconfig ) gemini? ( >=dev-qt/qtdeclarative-5.11.1:5[widgets] ) gsl? ( sci-libs/gsl ) import-filter? ( >=kde-frameworks/khtml-5.52.0:5 app-text/libetonyek app-text/libodfgen app-text/libwpd:* app-text/libwpg:* >=app-text/libwps-0.4 dev-libs/librevenge media-libs/libvisio ) lcms? ( media-libs/ilmbase:= media-libs/lcms:2 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) phonon? ( media-libs/phonon[qt5(+)] ) spacenav? ( dev-libs/libspnav ) truetype? ( media-libs/freetype:2 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) calligra_experimental_features_stage? ( >=dev-qt/qtwebkit-5.9.1:5 okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_plan? ( >=kde-frameworks/khtml-5.52.0:5 >=kde-frameworks/kholidays-5.52.0:5 dev-libs/kdiagram:5 pim? ( >=kde-apps/kcalcore-17.12.0:5 >=kde-apps/kcontacts-17.12.0:5 ) ) calligra_features_sheets? ( dev-cpp/eigen:3 ) calligra_features_words? ( dev-libs/libxslt okular? ( >=kde-apps/okular-17.12.0:5 ) ) calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) !app-office/calligra:4 !app-office/calligra-l10n:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/calligra/3.1.0/calligra-3.1.0.tar.xz calligra_features_plan? ( mirror://kde/stable/calligra/3.1.0/calligraplan-3.1.0.tar.xz )
-_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=497357cd86107413c6617ee8dd31efe4
diff --git a/metadata/md5-cache/app-office/calligra-3.1.0-r3 b/metadata/md5-cache/app-office/calligra-3.1.0-r3
index 11a038763dd8..8759158d6f78 100644
--- a/metadata/md5-cache/app-office/calligra-3.1.0-r3
+++ b/metadata/md5-cache/app-office/calligra-3.1.0-r3
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/calligra/3.1.0/calligra-3.1.0.tar.xz
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5b24986dd9255dc6e7e059913d61aa5f
+_md5_=a9f4a2e30ad16f28debfbd10412cf1ac
diff --git a/metadata/md5-cache/app-office/libreoffice-6.2.0.2 b/metadata/md5-cache/app-office/libreoffice-6.2.0.2
index 5f8476ec2313..a759feabfd0e 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.2.0.2
+++ b/metadata/md5-cache/app-office/libreoffice-6.2.0.2
@@ -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-builds.libreoffice.org/pre-releases/src/libreoffice-6.2.0.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.2.0.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.0//libreoffice-6.2.0.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.2.0//libreoffice-help-6.2.0.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.0.2/src/libreoffice-6.2.0.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.2.0.2/src/libreoffice-help-6.2.0.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	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=05e1a3e3c367b7d36df108e832becb8c
+_md5_=f964754bef5dd1bc86733f412f900762
diff --git a/metadata/md5-cache/app-office/libreoffice-6.2.9999 b/metadata/md5-cache/app-office/libreoffice-6.2.9999
index b5a4a48fbf89..513e5c412a35 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.2.9999
+++ b/metadata/md5-cache/app-office/libreoffice-6.2.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	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1f5074aba3129e97cffafae67ff2330f
+_md5_=ec38ccc3d0495d8e2594806f1135f17d
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 305a7aa8a0cb..8516cf4563a5 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/bash-4.4_p23 b/metadata/md5-cache/app-shells/bash-4.4_p23
deleted file mode 100644
index 4db3a6984703..000000000000
--- a/metadata/md5-cache/app-shells/bash-4.4_p23
+++ /dev/null
@@ -1,13 +0,0 @@
-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 ~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-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
-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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b69428778315017d6d61ea470b420232
diff --git a/metadata/md5-cache/app-shells/bash-4.4_p23-r1 b/metadata/md5-cache/app-shells/bash-4.4_p23-r1
index ebe85f0fb6bd..e86282a528cf 100644
--- a/metadata/md5-cache/app-shells/bash-4.4_p23-r1
+++ b/metadata/md5-cache/app-shells/bash-4.4_p23-r1
@@ -4,10 +4,10 @@ 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 ~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-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
 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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1f5f16e23bc034be80979d52424521bf
+_md5_=a2da7f23186516effe127845ad632f0c
diff --git a/metadata/md5-cache/app-shells/fzy-1.0 b/metadata/md5-cache/app-shells/fzy-1.0
index cae7bd6e9e1b..880eb5988fa1 100644
--- a/metadata/md5-cache/app-shells/fzy-1.0
+++ b/metadata/md5-cache/app-shells/fzy-1.0
@@ -3,9 +3,9 @@ DESCRIPTION=Fuzzy text selector (interactive grep) for console
 EAPI=6
 HOMEPAGE=https://github.com/jhawthorn/fzy
 IUSE=test savedconfig
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/jhawthorn/fzy/releases/download/1.0/fzy-1.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d04928cdaca1850290ef18aebeca3751
+_md5_=6349fda5982e592f11687577ad41f0c2
diff --git a/metadata/md5-cache/app-shells/fzy-9999 b/metadata/md5-cache/app-shells/fzy-9999
index 791f1b54c4ae..b822db2077db 100644
--- a/metadata/md5-cache/app-shells/fzy-9999
+++ b/metadata/md5-cache/app-shells/fzy-9999
@@ -7,4 +7,4 @@ IUSE=test savedconfig
 LICENSE=MIT
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f26ac38d148c5869d33aeae064855ab3
+_md5_=6349fda5982e592f11687577ad41f0c2
diff --git a/metadata/md5-cache/app-shells/loksh-6.4 b/metadata/md5-cache/app-shells/loksh-6.4
index fc57a927e3cf..296fc8c5d63c 100644
--- a/metadata/md5-cache/app-shells/loksh-6.4
+++ b/metadata/md5-cache/app-shells/loksh-6.4
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Linux port of OpenBSD's ksh
 EAPI=7
 HOMEPAGE=https://github.com/dimkr/loksh
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=public-domain
 RDEPEND=sys-libs/ncurses:0= !app-shells/ksh
 SLOT=0
 SRC_URI=https://github.com/dimkr/loksh/archive/6.4.tar.gz -> loksh-6.4.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2e6f3277cebf3d5207d1d96999f049cb
+_md5_=00b964763252285004129456bc914704
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index bda9f35be969..47305a868418 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/master-pdf-editor-5.2.00 b/metadata/md5-cache/app-text/master-pdf-editor-5.2.00
new file mode 100644
index 000000000000..6ec2025a52af
--- /dev/null
+++ b/metadata/md5-cache/app-text/master-pdf-editor-5.2.00
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=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=>=dev-qt/qtcore-5.4.1:5 >=dev-qt/qtgui-5.4.1:5 >=dev-qt/qtnetwork-5.4.1:5 >=dev-qt/qtprintsupport-5.4.1:5 >=dev-qt/qtsvg-5.4.1:5 >=media-gfx/sane-backends-1.0
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://code-industry.net/public/master-pdf-editor-5.2.00_qt5.amd64.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f203d3f758376e0263b0b20dfa6d62b6
diff --git a/metadata/md5-cache/app-text/zathura-0.4.3 b/metadata/md5-cache/app-text/zathura-0.4.3
new file mode 100644
index 000000000000..4319b0378e41
--- /dev/null
+++ b/metadata/md5-cache/app-text/zathura-0.4.3
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/sphinx ) test? ( dev-libs/appstream-glib dev-libs/check ) virtual/pkgconfig >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/girara-0.3.2 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo[X] >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
+DESCRIPTION=A highly customizable and functional document viewer
+EAPI=7
+HOMEPAGE=http://pwmt.org/projects/zathura/
+IUSE=doc +magic seccomp sqlite synctex test test
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=ZLIB
+RDEPEND=>=dev-libs/girara-0.3.2 >=dev-libs/glib-2.50:2 >=sys-devel/gettext-0.19.8 x11-libs/cairo[X] >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://pwmt.org/projects/zathura/download/zathura-0.4.3.tar.xz
+_eclasses_=meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	virtualx	401b718cc14d43a5a7fbe062c4851ba5
+_md5_=61d2bb88ff39ea1b10ffe6eb464d121c
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index f23f4e45c7ee..de3701eb2571 100644
Binary files a/metadata/md5-cache/dev-ada/Manifest.gz and b/metadata/md5-cache/dev-ada/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ada/aws-2018 b/metadata/md5-cache/dev-ada/aws-2018
index 175328b5a669..7edcae7ffc6d 100644
--- a/metadata/md5-cache/dev-ada/aws-2018
+++ b/metadata/md5-cache/dev-ada/aws-2018
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=] dev-ada/xmlada[shared,static-libs] dev-ada/asis[gnat_2016=,gnat_2017=,gnat_2018(-)=] dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=]
+DEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=] dev-ada/xmlada[shared,static-libs] dev-ada/asis[gnat_2016(-)=,gnat_2017(-)=,gnat_2018(-)=] dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018(-)=]
 DESCRIPTION=A complete Web development framework
 EAPI=6
 HOMEPAGE=http://libre.adacore.com/tools/aws/
@@ -10,4 +10,4 @@ RDEPEND=dev-ada/xmlada[gnat_2016=,gnat_2017=,gnat_2018(-)=] dev-ada/xmlada[share
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0819e0c7a447df26c27abd -> aws-gpl-2018-src.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=a1b20856cab77ee1671128370fe60e0c
+_md5_=d02ca020dde6d21b571b795cf20c4704
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index d398ac9f55fc..c6b0bfe91f9b 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-11.0.2 b/metadata/md5-cache/dev-java/oracle-jdk-bin-11.0.2
new file mode 100644
index 000000000000..b1d92242e6b9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-11.0.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst prerm setup unpack
+DEPEND=>=sys-apps/sed-4 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=Oracle's Java SE Development Kit
+EAPI=6
+HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
+IUSE=alsa commercial cups doc +fontconfig +gentoo-vm gtk2 gtk3 headless-awt javafx nsplugin selinux source
+KEYWORDS=-* ~amd64
+LICENSE=Oracle-BCLA-JavaSE
+RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/atk dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl gtk2? ( x11-libs/cairo x11-libs/gtk+:2 ) gtk3? ( x11-libs/cairo[glib] x11-libs/gtk+:3 ) ) ) !prefix? ( dev-libs/elfutils sys-libs/glibc:* ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:11 ) fontconfig? ( media-libs/fontconfig:1.0 ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+REQUIRED_USE=javafx? ( alsa fontconfig ^^ ( gtk2 gtk3 ) )
+RESTRICT=fetch preserve-libs strip
+SLOT=11
+SRC_URI=amd64? ( jdk-11.0.2_linux-x64_bin.tar.gz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	java-vm-2	d31d9bf26555ad0797f6a4f0e97a44d0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	pax-utils	e85f015e815dd463b0c206d781ef45a5	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=5a477bd85fad5940a1c5fc1d498b3401
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 1093ab584774..e7d1a43b5afa 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-8.0.0 b/metadata/md5-cache/dev-lang/swi-prolog-8.0.0
index a0a8c7b7543d..2338806e7c34 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-8.0.0
+++ b/metadata/md5-cache/dev-lang/swi-prolog-8.0.0
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:= sys-libs/zlib archive? ( app-arch/libarchive ) berkdb
 SLOT=0
 SRC_URI=http://www.swi-prolog.org/download/stable/src/swipl-8.0.0.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=45de22006e8fbd5e95758e9436453b73
+_md5_=ef7b2dac920a4ee5c1820bf448671aa5
diff --git a/metadata/md5-cache/dev-libs/Ice-3.6.4 b/metadata/md5-cache/dev-libs/Ice-3.6.4
index f6088dc2dedd..90b7b7424ef2 100644
--- a/metadata/md5-cache/dev-libs/Ice-3.6.4
+++ b/metadata/md5-cache/dev-libs/Ice-3.6.4
@@ -4,7 +4,7 @@ DESCRIPTION=ICE middleware C++ library and generator tools
 EAPI=6
 HOMEPAGE=https://zeroc.com/products/ice
 IUSE=doc examples libressl +ncurses mono php python ruby test debug php_targets_php7-0 python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 elibc_FreeBSD ruby_targets_ruby24
-KEYWORDS=~amd64 ~arm x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/expat-2.0.1 >=app-arch/bzip2-1.0.5 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) || ( sys-libs/db:6.1[cxx] sys-libs/db:5.3[cxx] sys-libs/db:5.1[cxx] sys-libs/db:4.8[cxx] ) dev-cpp/libmcpp 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(-)] ) ruby? ( dev-lang/ruby:2.4 ) mono? ( dev-lang/mono ) php? ( dev-lang/php:7.0 ) !dev-python/IcePy !dev-ruby/IceRuby php? ( php_targets_php7-0? ( dev-lang/php:7.0 ) )
 REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) php? ( || ( php_targets_php7-0 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/36
 SRC_URI=https://github.com/zeroc-ice/ice/archive/v3.6.4.tar.gz -> Ice-3.6.4.tar.gz doc? ( http://download.zeroc.com/Ice/3.6/Ice-3.6.4.pdf )
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=14ce76c39b6c88a276d40b33a01b6889
+_md5_=f3573f4f92203dbeac7f13ee19dc7909
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index c8e6a5a6bd82..42594a9fc0cb 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/icu-63.1-r1 b/metadata/md5-cache/dev-libs/icu-63.1-r1
index 9c69250e4737..06073905645a 100644
--- a/metadata/md5-cache/dev-libs/icu-63.1-r1
+++ b/metadata/md5-cache/dev-libs/icu-63.1-r1
@@ -5,9 +5,9 @@ DESCRIPTION=International Components for Unicode
 EAPI=7
 HOMEPAGE=http://www.icu-project.org/
 IUSE=debug doc 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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-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 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=BSD
 SLOT=0/63.1
 SRC_URI=http://download.icu-project.org/files/icu4c/63.1/icu4c-63_1-src.tgz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2fa2b95cf15154fdb7f01f6cd96162c0
+_md5_=9d1be32fc94581035317f5a41c7af7d6
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1-r1 b/metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1-r1
index 12a697517a3e..ea66b2259da0 100644
--- a/metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1-r1
+++ b/metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1-r1
@@ -3,9 +3,9 @@ DEPEND=dev-util/netsurf-buildsystem
 DESCRIPTION=mapping tool for UTF-8 strings
 EAPI=7
 HOMEPAGE=http://www.netsurf-browser.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 SLOT=0/2.2.0_p1
 SRC_URI=https://download.netsurf-browser.org/libs/releases/libutf8proc-2.2.0-1-src.tar.gz
 _eclasses_=multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=789fd08968a11208bbac2fcf88b2f05a
+_md5_=cd64aa39c5c79ffa880a77f911acc8d4
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 0bcbc39cbb6c..fc51b7b5a988 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-8.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-8.0.9999
new file mode 100644
index 000000000000..b44f86ed9621
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-8.0.9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-8.0.9999:=[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?,debug?] !sys-devel/llvm[ocaml(-)] dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=debug test 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
+LICENSE=UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-8.0.9999:=[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?,debug?] !sys-devel/llvm[ocaml(-)]
+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 )
+RESTRICT=!test? ( test )
+SLOT=0/8.0.9999
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=fdbe7ecffbde3ef7c322311632ecabbf
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 7d7432c496d0..5d2d18a2eda2 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.5 b/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.5
new file mode 100644
index 000000000000..84a4b24d2293
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Tar file management class
+EAPI=7
+HOMEPAGE=http://pear.php.net/package/Archive_Tar
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD
+PDEPEND=dev-php/PEAR-PEAR
+RDEPEND=dev-lang/php:*[bzip2,pcre(+),zlib]
+SLOT=0
+SRC_URI=http://pear.php.net/get/Archive_Tar-1.4.5.tgz
+_md5_=06e07ce7fa3dce96db6d2f81acb999c3
diff --git a/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.3-r1 b/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.3-r1
deleted file mode 100644
index 7788851f3a0b..000000000000
--- a/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?] >=app-portage/elt-patches-20170815 !<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_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=Provides APC backwards compatibility functions via APCu
-EAPI=6
-HOMEPAGE=https://pecl.php.net/apcu_bc
-IUSE=php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=PHP-3.01
-RDEPEND=dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?] php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/apcu_bc-1.0.3.tgz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=1d80e8dfcddfed2d53d11750a69833cd
diff --git a/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.4-r1 b/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.4-r1
new file mode 100644
index 000000000000..4f3444487bdc
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-php/pecl-apcu:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?] >=app-portage/elt-patches-20170815 !<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_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
+DESCRIPTION=Provides APC backwards compatibility functions via APCu
+EAPI=6
+HOMEPAGE=https://pecl.php.net/apcu_bc
+IUSE=php_targets_php7-1 php_targets_php7-2 php_targets_php7-3
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=dev-php/pecl-apcu:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?] php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
+REQUIRED_USE=|| ( php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/apcu_bc-1.0.4.tgz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	378dc4ea30db21411f4d1a32d21a6302	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=9fa9aa37f91a0a121917f2716e883cb7
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index c0fa61ec08aa..7a50eb16b53f 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/clang-python-8.0.9999 b/metadata/md5-cache/dev-python/clang-python-8.0.9999
new file mode 100644
index 000000000000..7a37a43fc168
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-8.0.9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install test unpack
+DEPEND=>=sys-devel/clang-8.0.9999:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Python bindings for sys-devel/clang
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+LICENSE=UoI-NCSA
+RDEPEND=>=sys-devel/clang-8.0.9999:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=3e29931e548e66459c9a663e02f9ba97
diff --git a/metadata/md5-cache/dev-python/lit-8.0.9999 b/metadata/md5-cache/dev-python/lit-8.0.9999
new file mode 100644
index 000000000000..9a28b2985dd7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-8.0.9999
@@ -0,0 +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_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+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 python_targets_python3_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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b9b510faf5b2d94326f5978d5de4bd06
diff --git a/metadata/md5-cache/dev-python/os-brick-2.5.4 b/metadata/md5-cache/dev-python/os-brick-2.5.4
new file mode 100644
index 000000000000..ac5ef4620a94
--- /dev/null
+++ b/metadata/md5-cache/dev-python/os-brick-2.5.4
@@ -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/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? ( >=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=OpenStack Cinder brick library for managing local volume attaches
+EAPI=6
+HOMEPAGE=https://github.com/openstack/cinder
+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-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 >=dev-python/Babel-2.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/Babel-2.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/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/oslo-concurrency-3.26.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-log-3.26.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.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-privsep-1.23.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-service-1.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/oslo-service-1.28.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/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/requests-2.14.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/retrying-1.2.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/retrying-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-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/os-win-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 )
+SLOT=0
+SRC_URI=mirror://pypi/o/os-brick/os-brick-2.5.4.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=110508b7e4b3a550bb851d3778b950bf
diff --git a/metadata/md5-cache/dev-python/oslo-cache-1.30.1 b/metadata/md5-cache/dev-python/oslo-cache-1.30.1
new file mode 100644
index 000000000000..359f1c1e9f32
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-cache-1.30.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(-)] 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 Caching around dogpile.cache
+EAPI=6
+HOMEPAGE=https://launchpad.net/oslo
+IUSE=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=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/dogpile-cache-0.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/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/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-log-3.30.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-utils-3.31.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.cache/oslo.cache-1.30.1.tar.gz -> oslo-cache-1.30.1.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=cf18c75d6f4072eb63c9d637d75c09f4
diff --git a/metadata/md5-cache/dev-python/oslo-service-1.31.7 b/metadata/md5-cache/dev-python/oslo-service-1.31.7
new file mode 100644
index 000000000000..25e2b681dfff
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-service-1.31.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/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/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/requests-2.14.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/stestr-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/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/doc8-0.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/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/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(-)] >=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 OpenStack services
+EAPI=6
+HOMEPAGE=https://pypi.org/project/oslo.service/
+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=>=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/webob-1.7.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/greenlet-0.4.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/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/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/oslo-concurrency-3.25.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/oslo-log-3.36.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/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/pastedeploy-1.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/routes-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/paste-2.0.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 )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.service/oslo.service-1.31.7.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=4d61010be90b035fa840794ca0a21e48
diff --git a/metadata/md5-cache/dev-python/ovsdbapp-0.12.2 b/metadata/md5-cache/dev-python/ovsdbapp-0.12.2
new file mode 100644
index 000000000000..be4f2238b141
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ovsdbapp-0.12.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_targets_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? ( >=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 library for creating OVSDB applications
+EAPI=6
+HOMEPAGE=http://bugs.launchpad.net/ovsdbapp
+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-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 >=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/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/ovs-2.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/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(-)] 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/ovsdbapp/ovsdbapp-0.12.2.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=95abc5acd8ed6c33889066e325e1be25
diff --git a/metadata/md5-cache/dev-python/pymysql-0.9.3 b/metadata/md5-cache/dev-python/pymysql-0.9.3
new file mode 100644
index 000000000000..61c71948ae93
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymysql-0.9.3
@@ -0,0 +1,16 @@
+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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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(-),-python_single_target_python3_7(-)]
+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_targets_python3_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(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Pure-Python MySQL Driver
+EAPI=7
+HOMEPAGE=https://github.com/PyMySQL/PyMySQL
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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_targets_python3_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(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/PyMySQL/PyMySQL/archive/v0.9.3.tar.gz -> pymysql-0.9.3.tar.gz
+_eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=4fcabd6c2b4c44fd56fba79b6b767869
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index bc6ec66c0fef..81b1a6836eb7 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/actioncable-5.0.7 b/metadata/md5-cache/dev-ruby/actioncable-5.0.7
deleted file mode 100644
index 44c57046953e..000000000000
--- a/metadata/md5-cache/dev-ruby/actioncable-5.0.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.0.7:*[ruby_targets_ruby23] >=dev-ruby/nio4r-1.2:0[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby23] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.0.7:*[ruby_targets_ruby24] >=dev-ruby/nio4r-1.2:0[ruby_targets_ruby24] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby24] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/mocha-0.14.0:0.14[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] ) )
-DESCRIPTION=Integrated WebSockets for Rails
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.0.7:*[ruby_targets_ruby23] >=dev-ruby/nio4r-1.2:0[ruby_targets_ruby23] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby23] =dev-ruby/websocket-driver-0.6*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.0.7:*[ruby_targets_ruby24] >=dev-ruby/nio4r-1.2:0[ruby_targets_ruby24] >=dev-ruby/websocket-driver-0.6.1:0[ruby_targets_ruby24] =dev-ruby/websocket-driver-0.6*[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 )
-RESTRICT=test
-SLOT=5.0
-SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9a4c0de1127931df6a6d78ce826224f0
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-5.0.7 b/metadata/md5-cache/dev-ruby/actionmailer-5.0.7
deleted file mode 100644
index 9a7930e7a870..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-5.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby23] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby24] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[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] ) )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby23] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby23] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby23] =dev-ruby/mail-2*:*[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby24] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby24] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby24] =dev-ruby/mail-2*:*[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[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=5.0
-SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=472a9b54fac121779c962cb88dc094f4
diff --git a/metadata/md5-cache/dev-ruby/actionpack-5.0.7 b/metadata/md5-cache/dev-ruby/actionpack-5.0.7
deleted file mode 100644
index 1d04ced2bc48..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-5.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] ~dev-ruby/railties-5.0.7[ruby_targets_ruby23] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby23] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] ~dev-ruby/railties-5.0.7[ruby_targets_ruby24] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby24] >=dev-ruby/rack-cache-1.2:1.2[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] ) )
-DESCRIPTION=Eases web-request routing, handling, and response
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby23] dev-ruby/rack:2.0[ruby_targets_ruby23] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby24] dev-ruby/rack:2.0[ruby_targets_ruby24] >=dev-ruby/rack-test-0.6.3:0.6[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.2:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[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=5.0
-SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=71ff4b044a612fec0e468a4beecbb39c
diff --git a/metadata/md5-cache/dev-ruby/actionview-5.0.7 b/metadata/md5-cache/dev-ruby/actionview-5.0.7
deleted file mode 100644
index 4ca54df96326..000000000000
--- a/metadata/md5-cache/dev-ruby/actionview-5.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby23] ~dev-ruby/railties-5.0.7[ruby_targets_ruby23] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby24] ~dev-ruby/railties-5.0.7[ruby_targets_ruby24] ~dev-ruby/activerecord-5.0.7[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] ) )
-DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] >=dev-ruby/builder-3.1:*[ruby_targets_ruby23] =dev-ruby/builder-3*:*[ruby_targets_ruby23] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby23] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby23] dev-ruby/rails-dom-testing:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] >=dev-ruby/builder-3.1:*[ruby_targets_ruby24] =dev-ruby/builder-3*:*[ruby_targets_ruby24] >=dev-ruby/erubis-2.7.0[ruby_targets_ruby24] >=dev-ruby/rails-html-sanitizer-1.0.3:1[ruby_targets_ruby24] dev-ruby/rails-dom-testing:2[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=5.0
-SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=33e6152bb4dfa01c1864241631797abd
diff --git a/metadata/md5-cache/dev-ruby/activejob-5.0.7 b/metadata/md5-cache/dev-ruby/activejob-5.0.7
deleted file mode 100644
index 340b8bae9e13..000000000000
--- a/metadata/md5-cache/dev-ruby/activejob-5.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/mocha-0.14.0:0.14[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] ) )
-DESCRIPTION=Job framework with pluggable queues
-EAPI=5
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] >=dev-ruby/globalid-0.3.6[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=5.0
-SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3b0f6ddc17beedc593aa1353739e7ab3
diff --git a/metadata/md5-cache/dev-ruby/activemodel-5.0.7 b/metadata/md5-cache/dev-ruby/activemodel-5.0.7
deleted file mode 100644
index 14a2a2230c9c..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-5.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/railties:5.0[ruby_targets_ruby23] dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby23] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/railties:5.0[ruby_targets_ruby24] dev-ruby/test-unit:2[ruby_targets_ruby24] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby24] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby24] dev-ruby/bundler[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] ) )
-DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7:*[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=5.0
-SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6dbea4c0a137c46a279a51ec994bd048
diff --git a/metadata/md5-cache/dev-ruby/activerecord-5.0.7 b/metadata/md5-cache/dev-ruby/activerecord-5.0.7
deleted file mode 100644
index 6131c5ea172d..000000000000
--- a/metadata/md5-cache/dev-ruby/activerecord-5.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby23] dev-ruby/arel:7.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby24] dev-ruby/arel:7.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby24] ) ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.0.7[ruby_targets_ruby23] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] dev-ruby/minitest:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.0.7[ruby_targets_ruby24] >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] dev-ruby/minitest:5[ruby_targets_ruby24] ) ) test? ( >=dev-db/sqlite-3.12.1 ) 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] ) )
-DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails/
-IUSE=mysql postgres sqlite test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby23] dev-ruby/arel:7.0[ruby_targets_ruby23] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby23] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby23] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby23] ) ) postgres? ( >=dev-ruby/pg-0.18.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby24] dev-ruby/arel:7.0[ruby_targets_ruby24] sqlite? ( >=dev-ruby/sqlite3-1.3.6[ruby_targets_ruby24] ) mysql? ( || ( dev-ruby/mysql2:0.4[ruby_targets_ruby24] >=dev-ruby/mysql2-0.3.18:0.3[ruby_targets_ruby24] ) ) postgres? ( >=dev-ruby/pg-0.18.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=5.0
-SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6895c73e76306dba0af238b0b1c9e8da
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.0.7 b/metadata/md5-cache/dev-ruby/activesupport-5.0.7
deleted file mode 100644
index 42bb9736a863..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-5.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby23] <dev-ruby/i18n-1:*[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby24] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby24] <dev-ruby/i18n-1:*[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby23] >=dev-ruby/builder-3.1.0[ruby_targets_ruby23] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby23] dev-ruby/rack[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] <dev-ruby/minitest-5.4[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby24] >=dev-ruby/builder-3.1.0[ruby_targets_ruby24] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby24] dev-ruby/rack[ruby_targets_ruby24] dev-ruby/mocha:0.14[ruby_targets_ruby24] <dev-ruby/minitest-5.4[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] ) )
-DESCRIPTION=Utility Classes and Extension to the Standard Library
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby23] <dev-ruby/i18n-1:*[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby24] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby24] <dev-ruby/i18n-1:*[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[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=5.0
-SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=511f68528413becce79872f533d578ae
diff --git a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3 b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3
index 84dab55b705a..1539ff440c26 100644
--- a/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3
+++ b/metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=doc? ( dev-lang/perl ) ruby_targets_ruby23? ( dev-ruby/hoe[ruby_targets_ruby23] test? ( dev-ruby/diff-lcs[ruby_targets_ruby23] dev-ruby/tidy-ext[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( dev-ruby/hoe[ruby_targets_ruby24] test? ( dev-ruby/diff-lcs[ruby_targets_ruby24] dev-ruby/tidy-ext[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( dev-ruby/hoe[ruby_targets_ruby25] test? ( dev-ruby/diff-lcs[ruby_targets_ruby25] dev-ruby/tidy-ext[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: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] ) )
+DEPEND=doc? ( dev-lang/perl ) ruby_targets_ruby23? ( test? ( dev-ruby/diff-lcs[ruby_targets_ruby23] dev-ruby/tidy-ext[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/diff-lcs[ruby_targets_ruby24] dev-ruby/tidy-ext[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/diff-lcs[ruby_targets_ruby25] dev-ruby/tidy-ext[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: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=A Ruby implementation of Markdown
 EAPI=5
 HOMEPAGE=http://www.deveiate.org/projects/BlueCloth
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/bluecloth-2.2.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=370587eaf79548c68ea9ac61c3858be9
+_md5_=0221f6f31c0e88e8288df628fd912d74
diff --git a/metadata/md5-cache/dev-ruby/classifier-1.3.4 b/metadata/md5-cache/dev-ruby/classifier-1.3.4
deleted file mode 100644
index eb2f95202308..000000000000
--- a/metadata/md5-cache/dev-ruby/classifier-1.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby23] !!dev-ruby/classifier-reborn[ruby_targets_ruby23] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby24] !!dev-ruby/classifier-reborn[ruby_targets_ruby24] gsl? ( dev-ruby/rb-gsl[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] ) )
-DESCRIPTION=Module to allow Bayesian and other types of classifications
-EAPI=5
-HOMEPAGE=http://rubyforge.org/projects/classifier https://github.com/cardmagic/classifier
-IUSE=gsl test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby23] !!dev-ruby/classifier-reborn[ruby_targets_ruby23] gsl? ( dev-ruby/rb-gsl[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/fast-stemmer-1.0.0[ruby_targets_ruby24] !!dev-ruby/classifier-reborn[ruby_targets_ruby24] gsl? ( dev-ruby/rb-gsl[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/classifier-1.3.4.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0c6457a733d82311423c8f279a0ceaf4
diff --git a/metadata/md5-cache/dev-ruby/hike-1.2.3-r1 b/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
deleted file mode 100644
index 272c281de7d2..000000000000
--- a/metadata/md5-cache/dev-ruby/hike-1.2.3-r1
+++ /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? ( 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=Hike is a Ruby library for finding files in a set of paths
-EAPI=5
-HOMEPAGE=https://github.com/sstephenson/hike
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~arm ~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-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/sstephenson/hike/archive/v1.2.3.tar.gz -> hike-1.2.3.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9060757e07a13364c840007b474e99a7
diff --git a/metadata/md5-cache/dev-ruby/hike-2.1.2 b/metadata/md5-cache/dev-ruby/hike-2.1.2
deleted file mode 100644
index 5322029a3511..000000000000
--- a/metadata/md5-cache/dev-ruby/hike-2.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[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=Hike is a Ruby library for finding files in a set of paths
-EAPI=5
-HOMEPAGE=https://github.com/sstephenson/hike
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=~amd64 ~arm ~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-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=https://github.com/sstephenson/hike/archive/v2.1.2.tar.gz -> hike-2.1.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1f0addba51a5db6610f6aae0a1a61fc5
diff --git a/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2 b/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
index 9222d8edcd0e..f3158702d8f9 100644
--- a/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
+++ b/metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] !!x11-misc/launchy[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] !!x11-misc/launchy[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby25] !!x11-misc/launchy[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.0: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/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] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] !!x11-misc/launchy[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] !!x11-misc/launchy[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby25] !!x11-misc/launchy[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby26] !!x11-misc/launchy[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.0:5[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) 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] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Helper class for launching cross-platform applications
 EAPI=5
 HOMEPAGE=https://github.com/copiousfreetime/launchy
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=ISC
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] !!x11-misc/launchy[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] !!x11-misc/launchy[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby25] !!x11-misc/launchy[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 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby23] !!x11-misc/launchy[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby24] !!x11-misc/launchy[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby25] !!x11-misc/launchy[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/addressable-2.3[ruby_targets_ruby26] !!x11-misc/launchy[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/launchy-2.4.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2a5d4aca09d4553b7dc45ac5b5fdf6cb
+_md5_=68a2a8dc9597d0d7c9ca44a3988fec6d
diff --git a/metadata/md5-cache/dev-ruby/mocha-1.8.0 b/metadata/md5-cache/dev-ruby/mocha-1.8.0
new file mode 100644
index 000000000000..c0aac8482f32
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mocha-1.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] dev-ruby/introspection[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] dev-ruby/introspection[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby25] dev-ruby/introspection[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby26] dev-ruby/introspection[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) 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] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
+EAPI=6
+HOMEPAGE=https://mocha.jamesmead.org/
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( =dev-ruby/metaclass-0.0*[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=1.0
+SRC_URI=mirror://rubygems/mocha-1.8.0.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=dfc371756d78d5a7ace8c8b8a1c81f62
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-2.10.0 b/metadata/md5-cache/dev-ruby/net-ssh-2.10.0
deleted file mode 100644
index 0581b2b6db81..000000000000
--- a/metadata/md5-cache/dev-ruby/net-ssh-2.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Non-interactive SSH processing in pure Ruby
-EAPI=5
-HOMEPAGE=https://github.com/net-ssh/net-ssh
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 doc test
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby23? ( virtual/ruby-ssl[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=2.6
-SRC_URI=https://github.com/net-ssh/net-ssh/archive/v2.10.0.tar.gz -> net-ssh-git-2.10.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=51be7af97b28904ff0ffe41e5335bfc3
diff --git a/metadata/md5-cache/dev-ruby/pusher-client-0.6.2 b/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
index 657aa853fcfe..105f78a6e2ca 100644
--- a/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
+++ b/metadata/md5-cache/dev-ruby/pusher-client-0.6.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby23] dev-ruby/json:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby24] dev-ruby/json:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby25] dev-ruby/json:*[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: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] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby23] dev-ruby/json:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby24] dev-ruby/json:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby25] dev-ruby/json:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby26] dev-ruby/json:*[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) 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] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Client for consuming WebSockets from http://pusher.com
 EAPI=5
 HOMEPAGE=https://github.com/pusher-community/pusher-websocket-ruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby23] dev-ruby/json:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby24] dev-ruby/json:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby25] dev-ruby/json:*[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 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby23] dev-ruby/json:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby24] dev-ruby/json:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby25] dev-ruby/json:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/websocket-1:0[ruby_targets_ruby26] dev-ruby/json:*[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/pusher-client-0.6.2.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1f04e003bcd0e636edf78c2953402d71
+_md5_=ef06d0dc2f76bbe528ad26d30267561e
diff --git a/metadata/md5-cache/dev-ruby/rails-5.0.7 b/metadata/md5-cache/dev-ruby/rails-5.0.7
deleted file mode 100644
index 8b2792cb4c85..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-5.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/actioncable-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby23] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby23] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby23] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby23] ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] ~dev-ruby/railties-5.0.7[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actioncable-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby24] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby24] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby24] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby24] ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] ~dev-ruby/railties-5.0.7[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.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] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=6
-HOMEPAGE=http://www.rubyonrails.org
-IUSE=+asset-pipeline test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/actioncable-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionmailer-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby23] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby23] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby23] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby23] ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] ~dev-ruby/railties-5.0.7[ruby_targets_ruby23] >=dev-ruby/bundler-1.3[ruby_targets_ruby23] =dev-ruby/bundler-1*[ruby_targets_ruby23] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby23] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby23] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby23] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby23] >=dev-ruby/coffee-rails-4.1.0:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( ~dev-ruby/actioncable-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionmailer-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionview-5.0.7[ruby_targets_ruby24] ~dev-ruby/activejob-5.0.7[ruby_targets_ruby24] ~dev-ruby/activemodel-5.0.7[ruby_targets_ruby24] ~dev-ruby/activerecord-5.0.7[ruby_targets_ruby24] ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] ~dev-ruby/railties-5.0.7[ruby_targets_ruby24] >=dev-ruby/bundler-1.3[ruby_targets_ruby24] =dev-ruby/bundler-1*[ruby_targets_ruby24] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby24] asset-pipeline? ( dev-ruby/jquery-rails:*[ruby_targets_ruby24] >=dev-ruby/sass-rails-5.0:5.0[ruby_targets_ruby24] >=dev-ruby/uglifier-1.3.0:*[ruby_targets_ruby24] >=dev-ruby/coffee-rails-4.1.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=5.0
-SRC_URI=mirror://rubygems/rails-5.0.7.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8522b2c23ac1b76a0405a38e1ffbe66d
diff --git a/metadata/md5-cache/dev-ruby/railties-5.0.7 b/metadata/md5-cache/dev-ruby/railties-5.0.7
deleted file mode 100644
index e71024df66d0..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-5.0.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] dev-ruby/method_source[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] dev-ruby/method_source[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( ~dev-ruby/actionview-5.0.7[ruby_targets_ruby23] dev-ruby/mocha:0.14[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( ~dev-ruby/actionview-5.0.7[ruby_targets_ruby24] dev-ruby/mocha:0.14[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] ) )
-DESCRIPTION=Tools for creating, working with, and running Rails applications
-EAPI=6
-HOMEPAGE=https://github.com/rails/rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~hppa ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.22 ruby_targets_ruby23? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby23] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby23] >=dev-ruby/thor-0.18.1[ruby_targets_ruby23] >=dev-ruby/rake-0.8.7[ruby_targets_ruby23] dev-ruby/method_source[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/activesupport-5.0.7[ruby_targets_ruby24] ~dev-ruby/actionpack-5.0.7[ruby_targets_ruby24] >=dev-ruby/thor-0.18.1[ruby_targets_ruby24] >=dev-ruby/rake-0.8.7[ruby_targets_ruby24] dev-ruby/method_source[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 )
-RESTRICT=test
-SLOT=5.0
-SRC_URI=https://github.com/rails/rails/archive/v5.0.7.tar.gz -> rails-5.0.7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ce95a0a8c610f47bd1ebcc716d92e3ae
diff --git a/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r3 b/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r3
deleted file mode 100644
index 0c1e9f94cac3..000000000000
--- a/metadata/md5-cache/dev-ruby/rest-client-1.8.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/webmock[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16[ruby_targets_ruby23] >=dev-ruby/netrc-0.7:0[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Simple Simple HTTP and REST client for Ruby
-EAPI=5
-HOMEPAGE=https://github.com/archiloque/rest-client
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 doc test test
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/http-cookie-1.0.2:0[ruby_targets_ruby23] >=dev-ruby/mime-types-1.16[ruby_targets_ruby23] >=dev-ruby/netrc-0.7:0[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/rest-client-1.8.0.gem
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d4bfa732fe6c7e37a9f97687989bb2d3
diff --git a/metadata/md5-cache/dev-ruby/tilt-2.0.9 b/metadata/md5-cache/dev-ruby/tilt-2.0.9
index 789b4fcf792f..4234e8e8fac0 100644
--- a/metadata/md5-cache/dev-ruby/tilt-2.0.9
+++ b/metadata/md5-cache/dev-ruby/tilt-2.0.9
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby23] dev-ruby/coffee-script[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby24] dev-ruby/coffee-script[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bluecloth[ruby_targets_ruby25] dev-ruby/coffee-script[ruby_targets_ruby25] dev-ruby/erubis[ruby_targets_ruby25] dev-ruby/nokogiri[ruby_targets_ruby25] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby25] ) ) test? ( ruby_targets_ruby23? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( !!<dev-ruby/tilt-1.4.1-r2: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] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/coffee-script[ruby_targets_ruby23] dev-ruby/erubis[ruby_targets_ruby23] dev-ruby/nokogiri[ruby_targets_ruby23] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/coffee-script[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/coffee-script[ruby_targets_ruby25] dev-ruby/erubis[ruby_targets_ruby25] dev-ruby/nokogiri[ruby_targets_ruby25] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/coffee-script[ruby_targets_ruby26] dev-ruby/erubis[ruby_targets_ruby26] dev-ruby/nokogiri[ruby_targets_ruby26] !!<dev-ruby/maruku-0.7.2[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby23? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) 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] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Thin interface over template engines to make their usage as generic as possible
 EAPI=6
 HOMEPAGE=https://github.com/rtomayko/tilt
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 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/tilt-1.4.1-r2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( !!<dev-ruby/tilt-1.4.1-r2: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 )
+RDEPEND=ruby_targets_ruby23? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( !!<dev-ruby/tilt-1.4.1-r2:0[ruby_targets_ruby26] ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=2
 SRC_URI=mirror://rubygems/tilt-2.0.9.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b78c2734da33e5d789858bac6d4999e6
+_md5_=6926178f0ce097b6745d800044fa0cb3
diff --git a/metadata/md5-cache/dev-ruby/timers-4.2.0 b/metadata/md5-cache/dev-ruby/timers-4.2.0
index 22941716d250..fc9a850cd2b2 100644
--- a/metadata/md5-cache/dev-ruby/timers-4.2.0
+++ b/metadata/md5-cache/dev-ruby/timers-4.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/hitimes[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hitimes[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hitimes[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] ) )
+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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) 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] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Pure Ruby one-shot and periodic timers
 EAPI=6
 HOMEPAGE=https://github.com/tarcieri/timers
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/hitimes[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/hitimes[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/hitimes[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 )
+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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=4
 SRC_URI=mirror://rubygems/timers-4.2.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4989ef474b32ea6c84dc24f40f0b3335
+_md5_=28744358c8722f10cf4425df7e640c51
diff --git a/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0 b/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
index 973aacc40a75..8b45005ff8f2 100644
--- a/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
+++ b/metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
@@ -1,14 +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? ( 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] ) )
+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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) 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] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Ruby bindings for Tokyo Cabinet
 EAPI=5
 HOMEPAGE=http://fallabs.com/tokyocabinet/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-db/tokyocabinet 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 )
+RDEPEND=dev-db/tokyocabinet 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/tokyocabinet-1.32.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4eea7202faa04558126e0f157d684704
+_md5_=8ac33edd2c02ab68da7ccc491da0f9dc
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-1.2.8 b/metadata/md5-cache/dev-ruby/tomlrb-1.2.8
index daa952fde6d7..50e02707fc42 100644
--- a/metadata/md5-cache/dev-ruby/tomlrb-1.2.8
+++ b/metadata/md5-cache/dev-ruby/tomlrb-1.2.8
@@ -1,14 +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/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] ) )
+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_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) 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] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A racc based toml parser
 EAPI=6
 HOMEPAGE=https://github.com/fbernier/tomlrb/
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 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 )
+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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=1
 SRC_URI=https://github.com/fbernier/tomlrb/archive/v1.2.8.tar.gz -> tomlrb-1.2.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=29c5e4fff651aa2db88a835599bca067
+_md5_=867c0937f085e9016f99916f898de201
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c0d0b1c8aef9..94bca19b9323 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/cmocka-1.1.1 b/metadata/md5-cache/dev-util/cmocka-1.1.1
index d7b95a5b3084..2215eb95969c 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	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d1413e90bac25e9b0c2679443edeb061
+_md5_=726595304a792c15ddce401cfa350445
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.86 b/metadata/md5-cache/dev-util/cppcheck-1.86
index 0221631a32f0..29601fbcde56 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.86
+++ b/metadata/md5-cache/dev-util/cppcheck-1.86
@@ -5,11 +5,11 @@ DESCRIPTION=Static analyzer of C/C++ code
 EAPI=7
 HOMEPAGE=http://cppcheck.sourceforge.net
 IUSE=htmlreport pcre qt5 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 hppa ~ppc64 sparc x86
+KEYWORDS=amd64 ~arm ~arm64 hppa ~ppc64 sparc x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) pcre? ( dev-libs/libpcre ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport: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 ) 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/danmar/cppcheck/archive/1.86.tar.gz -> cppcheck-1.86.tar.gz
 _eclasses_=distutils-r1	71a5ee567fb298e553ce8d1319279151	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=2f9c354d26955dca8664ac2508607e4d
+_md5_=a6371880ff5d9c7f4e7720df69975db2
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.112 b/metadata/md5-cache/dev-util/debootstrap-1.0.114
similarity index 84%
rename from metadata/md5-cache/dev-util/debootstrap-1.0.112
rename to metadata/md5-cache/dev-util/debootstrap-1.0.114
index 72f869712b6f..db167ac3bc5f 100644
--- a/metadata/md5-cache/dev-util/debootstrap-1.0.112
+++ b/metadata/md5-cache/dev-util/debootstrap-1.0.114
@@ -6,6 +6,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64
 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.112.tar.gz mirror://gentoo/devices.tar.gz
+SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.114.tar.gz mirror://gentoo/devices.tar.gz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8
-_md5_=c779ced3b99c6815f8dbee0d62166876
+_md5_=2f3099f6daa01cadd57f8be90fb2e5a5
diff --git a/metadata/md5-cache/dev-util/glslang-7.10.2984 b/metadata/md5-cache/dev-util/glslang-7.10.2984
index 97d7c5d5b4f4..f06cab13a103 100644
--- a/metadata/md5-cache/dev-util/glslang-7.10.2984
+++ b/metadata/md5-cache/dev-util/glslang-7.10.2984
@@ -4,9 +4,9 @@ DESCRIPTION=Khronos reference front-end for GLSL and ESSL, and sample SPIR-V gen
 EAPI=6
 HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
 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
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/glslang/archive/7.10.2984.tar.gz -> glslang-7.10.2984.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b77011b62e2053c646ad720defe6d921	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1b2a6a415d7e796f63dc92770e991906
+_md5_=817af1244a889c78e3541ee8fc9dc1c1
diff --git a/metadata/md5-cache/dev-util/lldb-8.0.9999 b/metadata/md5-cache/dev-util/lldb-8.0.9999
new file mode 100644
index 000000000000..515ac3b80031
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-8.0.9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( 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_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-8.0.9999[xml] ~sys-devel/llvm-8.0.9999 !<sys-devel/llvm-4.0 python? ( >=dev-lang/swig-3.0.11 ) test? ( ~dev-python/lit-8.0.9999[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=The LLVM debugger
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=libedit ncurses python test python_targets_python2_7
+LICENSE=UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( 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_python3_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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ~sys-devel/clang-8.0.9999[xml] ~sys-devel/llvm-8.0.9999 !<sys-devel/llvm-4.0
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=00487d5bd158bdf2c1334b6402bd69c7
diff --git a/metadata/md5-cache/dev-util/netsurf-buildsystem-1.7 b/metadata/md5-cache/dev-util/netsurf-buildsystem-1.7
index 1049c7f02aa6..052aea7c1a83 100644
--- a/metadata/md5-cache/dev-util/netsurf-buildsystem-1.7
+++ b/metadata/md5-cache/dev-util/netsurf-buildsystem-1.7
@@ -2,8 +2,8 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Build system used for netsurf and its libs
 EAPI=7
 HOMEPAGE=https://www.netsurf-browser.org
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~m68k-mint
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~m68k-mint
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz
-_md5_=e798162be120ecda67e2cff1d3f8acc6
+_md5_=77807349d38a84d645ace75b481ffc9d
diff --git a/metadata/md5-cache/dev-util/shellcheck-bin-0.6.0 b/metadata/md5-cache/dev-util/shellcheck-bin-0.6.0
index ba84c1b42510..90bb7c014cce 100644
--- a/metadata/md5-cache/dev-util/shellcheck-bin-0.6.0
+++ b/metadata/md5-cache/dev-util/shellcheck-bin-0.6.0
@@ -3,9 +3,9 @@ DEPEND=!dev-util/shellcheck
 DESCRIPTION=Shell script analysis tool (binary package)
 EAPI=7
 HOMEPAGE=https://www.shellcheck.net/
-KEYWORDS=~amd64
+KEYWORDS=amd64 ~arm
 LICENSE=GPL-3+
 RDEPEND=!dev-util/shellcheck
 SLOT=0
-SRC_URI=https://storage.googleapis.com/shellcheck/shellcheck-v0.6.0.linux.x86_64.tar.xz
-_md5_=0a6cdf6539935e1b2ff9f6e7e3b055a4
+SRC_URI=amd64? ( https://storage.googleapis.com/shellcheck/shellcheck-v0.6.0.linux.x86_64.tar.xz ) arm? ( https://storage.googleapis.com/shellcheck/shellcheck-v0.6.0.linux.armv6hf.tar.xz )
+_md5_=726535e54afec2b62186124cda7ccaa7
diff --git a/metadata/md5-cache/dev-util/spirv-headers-1.3.4_pre20180917 b/metadata/md5-cache/dev-util/spirv-headers-1.3.4_pre20180917
index 362848010ce3..ad7192fbd13a 100644
--- a/metadata/md5-cache/dev-util/spirv-headers-1.3.4_pre20180917
+++ b/metadata/md5-cache/dev-util/spirv-headers-1.3.4_pre20180917
@@ -3,9 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Machine-readable files for the SPIR-V Registry
 EAPI=6
 HOMEPAGE=https://www.khronos.org/registry/spir-v/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/dcf23bdabacc3c54b83b1f9367e7a8adb27f8d87.tar.gz -> spirv-headers-1.3.4_pre20180917.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=29a3321a0d59143bacb56b9e4d08c8c8
+_md5_=6d7b1e2d29b0a845bb35d6bfab716c76
diff --git a/metadata/md5-cache/dev-util/spirv-tools-2018.5 b/metadata/md5-cache/dev-util/spirv-tools-2018.5
index 2edb6359282c..9f05bad13bfb 100644
--- a/metadata/md5-cache/dev-util/spirv-tools-2018.5
+++ b/metadata/md5-cache/dev-util/spirv-tools-2018.5
@@ -4,10 +4,10 @@ DESCRIPTION=Provides an API and commands for processing SPIR-V modules
 EAPI=6
 HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
 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
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/v2018.5.tar.gz -> spirv-tools-2018.5.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ebdf73b80f5a3b70e82bdd5405aae65a
+_md5_=e1b64d022a7e230fcf9daab819b18f10
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.1.92.0 b/metadata/md5-cache/dev-util/vulkan-headers-1.1.92.0
index d3e920b87248..171f989ae532 100644
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.1.92.0
+++ b/metadata/md5-cache/dev-util/vulkan-headers-1.1.92.0
@@ -3,10 +3,10 @@ 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
+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/114c3546e195819bd53a34b39f5194b2989a5b12.tar.gz -> vulkan-headers-1.1.92.0.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bc64e2e38541384bb380db25194b81ae
+_md5_=8d9c2aa3d9bd140073f792463285210b
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index d2cdf1ffde5d..2d896bd3203e 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.10.3 b/metadata/md5-cache/dev-vcs/subversion-1.10.3
index 5bd743c7388c..7c4bda023692 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.10.3
+++ b/metadata/md5-cache/dev-vcs/subversion-1.10.3
@@ -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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Subversion GPL-2
 RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= 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.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 ) 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.10.3.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=41399061a096b93e3a84075c209cbe9b
+_md5_=1ef19e359c9c15a10d822b325f18a6c9
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index a70ecee9a994..c785095dbbd5 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.54.0 b/metadata/md5-cache/kde-frameworks/kio-5.54.1
similarity index 97%
rename from metadata/md5-cache/kde-frameworks/kio-5.54.0
rename to metadata/md5-cache/kde-frameworks/kio-5.54.1
index 93a0993e0f91..99f5bb733b21 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.54.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.54.1
@@ -10,6 +10,6 @@ PDEPEND=>=kde-frameworks/kded-5.54:5
 RDEPEND=>=kde-frameworks/kauth-5.54:5 >=kde-frameworks/karchive-5.54:5 >=kde-frameworks/kbookmarks-5.54:5 >=kde-frameworks/kcodecs-5.54:5 >=kde-frameworks/kcompletion-5.54:5 >=kde-frameworks/kconfig-5.54:5 >=kde-frameworks/kconfigwidgets-5.54:5 >=kde-frameworks/kcoreaddons-5.54:5 >=kde-frameworks/kcrash-5.54:5 >=kde-frameworks/kdbusaddons-5.54:5 >=kde-frameworks/ki18n-5.54:5 >=kde-frameworks/kiconthemes-5.54:5 >=kde-frameworks/kitemviews-5.54:5 >=kde-frameworks/kjobwidgets-5.54:5 >=kde-frameworks/knotifications-5.54:5 >=kde-frameworks/kservice-5.54:5 >=kde-frameworks/ktextwidgets-5.54:5 >=kde-frameworks/kwidgetsaddons-5.54:5 >=kde-frameworks/kwindowsystem-5.54:5 >=kde-frameworks/kxmlgui-5.54:5 >=kde-frameworks/solid-5.54:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5=[ssl] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.54:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.54:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5 doc? ( >=dev-qt/qt-docs-5.11.1:5 )
 RESTRICT=test
 SLOT=5/5.54
-SRC_URI=mirror://kde/stable/frameworks/5.54/kio-5.54.0.tar.xz
+SRC_URI=mirror://kde/stable/frameworks/5.54/kio-5.54.1.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1d15fb5a91fa994ea1d673dd9adcbd7c
+_md5_=1c41fabb7afdf1dfa9ee910a1671a863
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 002c8be6965c..cfd96e74c130 100644
Binary files a/metadata/md5-cache/kde-misc/Manifest.gz and b/metadata/md5-cache/kde-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-3.1.0 b/metadata/md5-cache/kde-misc/wacomtablet-3.1.0
deleted file mode 100644
index 192c7b7ee41b..000000000000
--- a/metadata/md5-cache/kde-misc/wacomtablet-3.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libwacom-0.30 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libXi x11-libs/libxcb sys-devel/gettext x11-base/xorg-proto 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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KControl module for Wacom tablets
-EAPI=6
-HOMEPAGE=https://www.linux-apps.com/content/show.php?action=content&content=114856
-IUSE=test debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/plasma-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libwacom-0.30 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libXi x11-libs/libxcb !kde-misc/wacomtablet:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/wacomtablet/3.1.0/wacomtablet-3.1.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=fa7b1dc0f5f01abd6c83b77c0f48ec09
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-3.1.1 b/metadata/md5-cache/kde-misc/wacomtablet-3.1.1
index e30de414a46c..160259700acc 100644
--- a/metadata/md5-cache/kde-misc/wacomtablet-3.1.1
+++ b/metadata/md5-cache/kde-misc/wacomtablet-3.1.1
@@ -10,4 +10,4 @@ RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0
 SLOT=5
 SRC_URI=mirror://kde/stable/wacomtablet/3.1.1/wacomtablet-3.1.1.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=f67b22098d3680f17e39f7cf5c0dee62
+_md5_=4827c94c671912cf1cc810b438a782ef
diff --git a/metadata/md5-cache/kde-misc/yakuake-3.0.5 b/metadata/md5-cache/kde-misc/yakuake-3.0.5
deleted file mode 100644
index 2ee8b6329fdc..000000000000
--- a/metadata/md5-cache/kde-misc/yakuake-3.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/konsole-18.08.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1: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.52.0:5 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Quake-style terminal emulator based on konsole
-EAPI=6
-HOMEPAGE=https://yakuake.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwayland-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/konsole-18.08.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 !kde-misc/yakuake:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/yakuake/3.0.5/src/yakuake-3.0.5.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9c2079b7dc18d7e96e668dd51e9c2027
diff --git a/metadata/md5-cache/kde-misc/yakuake-3.0.5-r1 b/metadata/md5-cache/kde-misc/yakuake-3.0.5-r1
index dd2386071c6d..a8c8d313ea37 100644
--- a/metadata/md5-cache/kde-misc/yakuake-3.0.5-r1
+++ b/metadata/md5-cache/kde-misc/yakuake-3.0.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Quake-style terminal emulator based on konsole
 EAPI=6
 HOMEPAGE=https://yakuake.kde.org/
 IUSE=absolute-position X debug
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kglobalaccel-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/knewstuff-5.52.0:5 >=kde-frameworks/knotifications-5.52.0:5 >=kde-frameworks/knotifyconfig-5.52.0:5 >=kde-frameworks/kparts-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-apps/konsole-18.08.3:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 absolute-position? ( >=kde-frameworks/kwayland-5.52.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) !kde-misc/yakuake:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/yakuake/3.0.5/src/yakuake-3.0.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/yakuake-3.0.5-patches.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1556314160fad3882a7201fd1621a062
+_md5_=53cee04d67af48f8b53478dcd6de5244
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 146c35b60765..15087cb7d745 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.14.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.14.5-r1
similarity index 68%
rename from metadata/md5-cache/kde-plasma/kinfocenter-5.14.5
rename to metadata/md5-cache/kde-plasma/kinfocenter-5.14.5-r1
index 3a8217559c1b..fcdd66034e92 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.14.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.14.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.11.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.52.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.52.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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-apps/hwids[pci,usb] x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.11.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.52.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.52.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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Utility providing information about the computer hardware
 EAPI=6
 HOMEPAGE=https://www.kde.org/applications/system/kinfocenter/
 IUSE=gles2 ieee1394 +opengl +pci wayland debug +handbook
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.11.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.52.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.14.5:5 >=dev-qt/qtquickcontrols-5.11.1:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/kcmutils-5.52.0:5 >=kde-frameworks/kcompletion-5.52.0:5 >=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kcrash-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/kdeclarative-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kiconthemes-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kpackage-5.52.0:5 >=kde-frameworks/kservice-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-apps/hwids[pci,usb] x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.11.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.52.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.14.5:5 >=dev-qt/qtquickcontrols-5.11.1:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
 REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.14.5/kinfocenter-5.14.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d2a745099038e0f26ebc72ce182ea6f0
+_md5_=62b0d49b0949d2e56227dbaafa9e535b
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 9fefe6e181e7..72c284289c76 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/gphoto2-2.5.15 b/metadata/md5-cache/media-gfx/gphoto2-2.5.15
index b606aa291491..b05b8d4ffefe 100644
--- a/metadata/md5-cache/media-gfx/gphoto2-2.5.15
+++ b/metadata/md5-cache/media-gfx/gphoto2-2.5.15
@@ -4,10 +4,10 @@ DESCRIPTION=Free, redistributable digital camera software application
 EAPI=6
 HOMEPAGE=http://www.gphoto.org/
 IUSE=aalib exif ncurses nls readline
-KEYWORDS=alpha amd64 ~hppa ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/popt >=media-libs/libgphoto2-2.5.10:=[exif?] aalib? ( media-libs/aalib virtual/jpeg:0 ) exif? ( media-libs/libexif ) ncurses? ( dev-libs/cdk:0= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/gphoto/gphoto2-2.5.15.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=9be3682f5a391fb88b412834d99e01ff
+_md5_=e100a712e3f1f4261fde5617d3fa7973
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.92.3-r1 b/metadata/md5-cache/media-gfx/inkscape-0.92.3-r1
index 4f11d847d4e2..e135bef2bf5a 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.92.3-r1
+++ b/metadata/md5-cache/media-gfx/inkscape-0.92.3-r1
@@ -10,6 +10,6 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-
 REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
-SRC_URI=https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.92.3.tar.bz2 https://dev.gentoo.org/~asturm/distfiles/inkscape-0.92.3-poppler-patches.tar.xz
+SRC_URI=https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.92.3.tar.bz2 https://dev.gentoo.org/~asturm/distfiles/inkscape-0.92.3-poppler-patches-1.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6b3359b65e429dc88f5b93acceb720f2
+_md5_=b020c3847b6fb715e866cb8b0cb56fdb
diff --git a/metadata/md5-cache/media-gfx/photoqt-1.7.1 b/metadata/md5-cache/media-gfx/photoqt-1.7.1
index d559b117efed..500c5d2777cc 100644
--- a/metadata/md5-cache/media-gfx/photoqt-1.7.1
+++ b/metadata/md5-cache/media-gfx/photoqt-1.7.1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple but powerful Qt-based image viewer
 EAPI=6
 HOMEPAGE=https://photoqt.org/
 IUSE=devil exif freeimage graphicsmagick pdf raw
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtimageformats:5 dev-qt/qtmultimedia:5[qml] dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 app-arch/libarchive:= app-arch/unrar devil? ( media-libs/devil ) exif? ( media-gfx/exiv2:= ) freeimage? ( media-libs/freeimage ) graphicsmagick? ( >=media-gfx/graphicsmagick-1.3.20:= ) pdf? ( app-text/poppler[qt5] ) raw? ( media-libs/libraw:= )
 SLOT=0
 SRC_URI=https://photoqt.org/pkgs/photoqt-1.7.1.tar.gz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ba57e7210267387840cd5781c7d55538
+_md5_=e1058d75c445bf127830ecaa3c39bf62
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 468ccad94000..1285da4f7946 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.10 b/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
similarity index 98%
rename from metadata/md5-cache/media-libs/gexiv2-0.10.10
rename to metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
index ff01763a94c3..1eee7502b7c3 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.10
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_target
 SLOT=0
 SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.10.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=bf99765c9ba400525ce80deda5b585e0
+_md5_=9e016e0167ca98cc4741ff3ef0e2a570
diff --git a/metadata/md5-cache/media-libs/gexiv2-9999 b/metadata/md5-cache/media-libs/gexiv2-9999
index bb4316815f95..1de8c2734242 100644
--- a/metadata/md5-cache/media-libs/gexiv2-9999
+++ b/metadata/md5-cache/media-libs/gexiv2-9999
@@ -10,4 +10,4 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( python introspection ) vala? ( introspection )
 SLOT=0
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	meson	2780db7405ab6249571d07667ab97ba1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vala	2f3804278870542119da624a5eded505	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=88e8ead68b46cbd2bbcab08fead393f2
+_md5_=0392e116d19318ead2a6b77fe58054c8
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.0.2-r1 b/metadata/md5-cache/media-libs/harfbuzz-2.0.2-r1
index bcb0555ad54b..723bc498fcac 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.0.2-r1
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.0.2-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.0.2.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=00dcbf212940ea53e1e853b91d46f55f
+_md5_=2a0feaceba063d91a8148d0faa26c73e
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.1.3-r1 b/metadata/md5-cache/media-libs/harfbuzz-2.1.3-r1
index 41605416b25f..dbf16a883109 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.1.3-r1
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.1.3-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.1.3.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=104be101ea792fd87e64e6eb47b694f4
+_md5_=1dcebf3cfbfc362c55c3fc43726329a9
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.2.0-r1 b/metadata/md5-cache/media-libs/harfbuzz-2.2.0-r1
index a10423517f44..bb89b5024e37 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.2.0-r1
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.2.0-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.2.0.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=104be101ea792fd87e64e6eb47b694f4
+_md5_=1dcebf3cfbfc362c55c3fc43726329a9
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.3.0-r1 b/metadata/md5-cache/media-libs/harfbuzz-2.3.0-r1
index 3fe036a7d4be..af63c1733db0 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.3.0-r1
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.3.0-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.3.0.tar.bz2
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a83be40a698632872f05264f2eabc714
+_md5_=dc57fb144c560419317f678cf301f957
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.16 b/metadata/md5-cache/media-libs/libgphoto2-2.5.16
index 674392107844..dfdba9c50401 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.16
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.16
@@ -4,10 +4,10 @@ DESCRIPTION=Library that implements support for numerous digital cameras
 EAPI=6
 HOMEPAGE=http://www.gphoto.org/
 IUSE=doc examples exif gd jpeg nls serial +cameras_adc65 +cameras_agfa_cl20 +cameras_aox +cameras_ax203 +cameras_barbie +cameras_canon +cameras_casio_qv +cameras_clicksmart310 +cameras_digigr8 +cameras_digita +cameras_dimagev +cameras_dimera3500 +cameras_directory +cameras_enigma13 +cameras_fuji +cameras_gsmart300 +cameras_hp215 +cameras_iclick +cameras_jamcam +cameras_jd11 +cameras_jl2005a +cameras_jl2005c +cameras_kodak_dc120 +cameras_kodak_dc210 +cameras_kodak_dc240 +cameras_kodak_dc3200 +cameras_kodak_ez200 +cameras_konica +cameras_konica_qm150 +cameras_largan +cameras_lg_gsm +cameras_mars +cameras_mustek +cameras_panasonic_coolshot +cameras_panasonic_l859 +cameras_panasonic_dc1000 +cameras_panasonic_dc1580 +cameras_pccam300 +cameras_pccam600 +cameras_pentax +cameras_polaroid_pdc320 +cameras_polaroid_pdc640 +cameras_polaroid_pdc700 +cameras_ptp2 +cameras_ricoh +cameras_ricoh_g3 +cameras_samsung +cameras_sierra +cameras_sipix_blink2 +cameras_sipix_web2 +cameras_smal +cameras_sonix +cameras_sony_dscf1 +cameras_sony_dscf55 +cameras_soundvision +cameras_spca50x +cameras_sq905 +cameras_st2205 +cameras_stv0674 +cameras_stv0680 +cameras_sx330z +cameras_toshiba_pdrm11 +cameras_topfield +cameras_tp6801 abi_x86_32 abi_x86_64 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 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.9.1-r4: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/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(-)?] >=virtual/libusb-1-r1: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(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-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(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-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(-)?] ) !<sys-fs/udev-201
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.16.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24bf8db5500d53eec722a4aef251ab23
+_md5_=8ff2cb086c271fa84178d8cb973b9b6c
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.34 b/metadata/md5-cache/media-libs/libpng-1.6.34
deleted file mode 100644
index 0b8e18ddeffd..000000000000
--- a/metadata/md5-cache/media-libs/libpng-1.6.34
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=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-arch/xz-utils >=app-portage/elt-patches-20170815
-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 ~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	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=45340c31df2348ac47f36cd11375910a
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.35-r1 b/metadata/md5-cache/media-libs/libpng-1.6.35-r1
index d27e38097dcb..f752e1283bfa 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.35-r1
+++ b/metadata/md5-cache/media-libs/libpng-1.6.35-r1
@@ -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 ~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 ~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.35.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.35-apng.patch.gz )
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=e6d949e1dfbf49fd597db220465a8413
+_md5_=fe2d86d6adf2e22b7710601358ee0e5a
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.9 b/metadata/md5-cache/media-libs/libsdl2-2.0.9
index 43b6e25c3e4c..53d63f5244a6 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.0.9
+++ b/metadata/md5-cache/media-libs/libsdl2-2.0.9
@@ -4,11 +4,11 @@ DESCRIPTION=Simple Direct Media Layer
 EAPI=6
 HOMEPAGE=http://www.libsdl.org
 IUSE=cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver abi_x86_32 abi_x86_64 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 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.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(-)?] ) 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(-)?] ) gles? ( >=media-libs/mesa-9.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(-)?,gles2] ) kms? ( >=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?,gbm] ) libsamplerate? ( media-libs/libsamplerate[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.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(-)?] >=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(-)?] ) opengl? ( >=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(-)?] >=virtual/glu-9.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-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(-)?] ) tslib? ( >=x11-libs/tslib-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(-)?] ) udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,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.0.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(-)?] >=media-libs/mesa-9.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(-)?,egl,gles2,wayland] >=x11-libs/libxkbcommon-0.2.0[abi_x86_32(-)?,abi_x86_64(-)?,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.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/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,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/libXi-1.7.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/libXrandr-1.4.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(-)?] xinerama? ( >=x11-libs/libXinerama-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(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.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(-)?] ) ) vulkan? ( media-libs/vulkan-loader )
 REQUIRED_USE=alsa? ( sound ) gles? ( video ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) vulkan? ( video ) wayland? ( gles ) xinerama? ( X ) xscreensaver? ( X )
 SLOT=0
 SRC_URI=http://www.libsdl.org/release/SDL2-2.0.9.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a6553ce78573b731ca6b768eca80dbf2
+_md5_=96f30d31100618fc2baed3ab32eceffc
diff --git a/metadata/md5-cache/media-libs/opencv-3.2.0-r4 b/metadata/md5-cache/media-libs/opencv-3.2.0-r4
deleted file mode 100644
index fa9d6f565dc9..000000000000
--- a/metadata/md5-cache/media-libs/opencv-3.2.0-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contrib_hdf? ( sci-libs/hdf5 ) ffmpeg? ( libav? ( media-video/libav:0=[abi_x86_32(-)?,abi_x86_64(-)?,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:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer: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(-)?] media-libs/gst-plugins-base: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(-)?] ) gtk? ( dev-libs/glib: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/gtk+: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(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,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/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,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:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( 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(-)?] 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(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
-EAPI=6
-HOMEPAGE=https://opencv.org
-IUSE=contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_hdf contrib_sfm contrib_xfeatures2d python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 elibc_FreeBSD java elibc_FreeBSD abi_x86_32 abi_x86_64 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 ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=BSD
-RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contrib_hdf? ( sci-libs/hdf5 ) ffmpeg? ( libav? ( media-video/libav:0=[abi_x86_32(-)?,abi_x86_64(-)?,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:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer: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(-)?] media-libs/gst-plugins-base: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(-)?] ) gtk? ( dev-libs/glib: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/gtk+: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(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,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/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,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:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( 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(-)?] 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(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) tesseract? ( contrib )
-SLOT=0/3.2
-SRC_URI=https://github.com/opencv/opencv/archive/3.2.0.tar.gz -> opencv-3.2.0.tar.gz contrib? ( https://github.com/opencv/opencv_contrib/archive/3.2.0.tar.gz -> opencv-3.2.0_contrib.tar.gz contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=28b01a5da78713282d6a417cfd58e4e3
diff --git a/metadata/md5-cache/media-libs/opencv-3.3.0-r6 b/metadata/md5-cache/media-libs/opencv-3.3.0-r6
deleted file mode 100644
index 7e2427527475..000000000000
--- a/metadata/md5-cache/media-libs/opencv-3.3.0-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contrib_hdf? ( sci-libs/hdf5 ) ffmpeg? ( libav? ( media-video/libav:0=[abi_x86_32(-)?,abi_x86_64(-)?,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:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer: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(-)?] media-libs/gst-plugins-base: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(-)?] ) gtk? ( dev-libs/glib: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/gtk+: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(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,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/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,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:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( 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(-)?] 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(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] contrib_dnn? ( dev-libs/cereal ) eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
-EAPI=6
-HOMEPAGE=https://opencv.org
-IUSE=contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 elibc_FreeBSD java elibc_FreeBSD abi_x86_32 abi_x86_64 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 ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=BSD
-RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contrib_hdf? ( sci-libs/hdf5 ) ffmpeg? ( libav? ( media-video/libav:0=[abi_x86_32(-)?,abi_x86_64(-)?,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:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer: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(-)?] media-libs/gst-plugins-base: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(-)?] ) gtk? ( dev-libs/glib: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/gtk+: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(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,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/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,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:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( 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(-)?] 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(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_dnn? ( contrib ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) contrib_xfeatures2d? ( contrib cuda ) java? ( python ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) tesseract? ( contrib )
-SLOT=0/3.3
-SRC_URI=https://github.com/opencv/opencv/archive/3.3.0.tar.gz -> opencv-3.3.0.tar.gz https://dev.gentoo.org/~amynka/snap/imgcodecs-opencv-3.3.0.tar.gz contrib? ( https://github.com/opencv/opencv_contrib/archive/3.3.0.tar.gz -> opencv-3.3.0_contrib.tar.gz contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz -> tiny-dnn-1.0.0a3.tar.gz ) contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=74cf371d5f5d6a6efd527e205033cebe
diff --git a/metadata/md5-cache/media-libs/opencv-3.4.1-r2 b/metadata/md5-cache/media-libs/opencv-3.4.1-r2
deleted file mode 100644
index 883e8f177bbd..000000000000
--- a/metadata/md5-cache/media-libs/opencv-3.4.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup test
-DEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contrib_hdf? ( sci-libs/hdf5 ) ffmpeg? ( libav? ( media-video/libav:0=[abi_x86_32(-)?,abi_x86_64(-)?,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:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer: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(-)?] media-libs/gst-plugins-base: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(-)?] ) gtk? ( dev-libs/glib: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/gtk+: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(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,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/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,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:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( 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(-)?] 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(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] contrib_dnn? ( dev-libs/cereal ) eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
-EAPI=6
-HOMEPAGE=https://opencv.org
-IUSE=contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine elibc_FreeBSD java elibc_FreeBSD 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=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=BSD
-RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contrib_hdf? ( sci-libs/hdf5 ) ffmpeg? ( libav? ( media-video/libav:0=[abi_x86_32(-)?,abi_x86_64(-)?,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:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer: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(-)?] media-libs/gst-plugins-base: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(-)?] ) gtk? ( dev-libs/glib: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/gtk+: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(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,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/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,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:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( 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(-)?] 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(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) dnn_samples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_dnn? ( contrib ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) contrib_xfeatures2d? ( contrib cuda ) java? ( python ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) tesseract? ( contrib )
-SLOT=0/3.4.1
-SRC_URI=https://github.com/opencv/opencv/archive/3.4.1.tar.gz -> opencv-3.4.1.tar.gz dnn_samples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/3.4.1.tar.gz -> opencv-3.4.1_contrib.tar.gz contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz -> tiny-dnn-1.0.0a3.tar.gz https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
-_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=555bbb25b4c85d984fdad8be1e7507b4
diff --git a/metadata/md5-cache/media-libs/opencv-3.4.1-r5 b/metadata/md5-cache/media-libs/opencv-3.4.1-r5
index 6a211ceea110..23ab4ad502b2 100644
--- a/metadata/md5-cache/media-libs/opencv-3.4.1-r5
+++ b/metadata/md5-cache/media-libs/opencv-3.4.1-r5
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of algorithms and sample code for various computer visi
 EAPI=6
 HOMEPAGE=https://opencv.org
 IUSE=contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine elibc_FreeBSD java elibc_FreeBSD 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=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=BSD
 RDEPEND=app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,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:=[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:0= ) contrib_hdf? ( sci-libs/hdf5 ) ffmpeg? ( libav? ( media-video/libav:0=[abi_x86_32(-)?,abi_x86_64(-)?,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:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gdal? ( sci-libs/gdal:= ) gflags? ( dev-cpp/gflags[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glog? ( dev-cpp/glog[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer: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(-)?] media-libs/gst-plugins-base: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(-)?] ) gtk? ( dev-libs/glib: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/gtk+: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(-)?] opengl? ( x11-libs/gtkglext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ieee1394? ( media-libs/libdc1394[abi_x86_32(-)?,abi_x86_64(-)?,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/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,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:* ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lapack? ( virtual/lapack ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openexr? ( media-libs/openexr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( 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(-)?] 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(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,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? ( 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/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.8.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(-)?] ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) dnn_samples? ( examples ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_dnn? ( contrib ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) contrib_xfeatures2d? ( contrib cuda ) java? ( python ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) tesseract? ( contrib )
 SLOT=0/3.4.1
 SRC_URI=https://github.com/opencv/opencv/archive/3.4.1.tar.gz -> opencv-3.4.1.tar.gz dnn_samples? ( https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-res10_300x300-caffeemodel.tar.gz ) contrib? ( https://github.com/opencv/opencv_contrib/archive/3.4.1.tar.gz -> opencv-3.4.1_contrib.tar.gz contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz -> tiny-dnn-1.0.0a3.tar.gz https://dev.gentoo.org/~amynka/snap/opencv-3.4.0-face_landmark_model.tar.gz ) contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) )
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-ant-2	6505e8068920164179b7e3926220c89f	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ff51f7e8137c36a616fa0d21ad7c4bd5
+_md5_=79809abd76335a9f5d08bdf294b2cf47
diff --git a/metadata/md5-cache/media-libs/phonon-4.10.1 b/metadata/md5-cache/media-libs/phonon-4.10.1
deleted file mode 100644
index ac529515c71b..000000000000
--- a/metadata/md5-cache/media-libs/phonon-4.10.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!!dev-qt/qtphonon:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] ) kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=KDE multimedia API
-EAPI=6
-HOMEPAGE=https://phonon.kde.org/
-IUSE=debug designer gstreamer pulseaudio +vlc
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-PDEPEND=gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] ) vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
-RDEPEND=!!dev-qt/qtphonon:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] )
-SLOT=0
-SRC_URI=mirror://kde/stable/phonon/4.10.1/phonon-4.10.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2103788b7aeb7b77eafc9f90078d3d8a
diff --git a/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r2 b/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r2
deleted file mode 100644
index ddfd72af9f01..000000000000
--- a/metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/phonon-4.10.0 media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] virtual/opengl network? ( media-plugins/gst-plugins-soup:1.0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Phonon GStreamer backend
-EAPI=6
-HOMEPAGE=https://phonon.kde.org/
-IUSE=alsa debug +network
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd
-LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2:2 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/phonon-4.10.0 media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] virtual/opengl network? ( media-plugins/gst-plugins-soup:1.0 )
-SLOT=0
-SRC_URI=mirror://kde/stable/phonon/phonon-backend-gstreamer/4.9.0/phonon-backend-gstreamer-4.9.0.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8850841c8b910f5223eef26b583b7511
diff --git a/metadata/md5-cache/media-libs/phonon-vlc-0.10.1 b/metadata/md5-cache/media-libs/phonon-vlc-0.10.1
deleted file mode 100644
index 1a9f1560bbc8..000000000000
--- a/metadata/md5-cache/media-libs/phonon-vlc-0.10.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.0 media-video/vlc:=[dbus,ogg,vorbis] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Phonon VLC backend
-EAPI=6
-HOMEPAGE=https://phonon.kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=media-libs/phonon-4.10.0 media-video/vlc:=[dbus,ogg,vorbis]
-SLOT=0
-SRC_URI=mirror://kde/stable/phonon/phonon-backend-vlc/0.10.1/phonon-backend-vlc-0.10.1.tar.xz
-_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=17d86997b4a659d54a1f699d5f5d3e63
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.1.92.0 b/metadata/md5-cache/media-libs/vulkan-layers-1.1.92.0
index ba0f14cb0a19..d2a2caeaf5f9 100644
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.1.92.0
+++ b/metadata/md5-cache/media-libs/vulkan-layers-1.1.92.0
@@ -4,9 +4,9 @@ DESCRIPTION=Vulkan Validation Layers
 EAPI=6
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
 IUSE=X 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
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/6e6da6ccab8931f7c30815966ef839b1155e5bec.tar.gz -> vulkan-layers-1.1.92.0.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d61c181ede7f700146272d267bdec8c0
+_md5_=ccd81eb1ef0450181fc92c566c8c7d63
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.1.92.1 b/metadata/md5-cache/media-libs/vulkan-loader-1.1.92.1
index 772f0fed6b0d..dce8c1dee2e6 100644
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.1.92.1
+++ b/metadata/md5-cache/media-libs/vulkan-loader-1.1.92.1
@@ -4,10 +4,10 @@ DESCRIPTION=Vulkan Installable Client Driver (ICD) Loader
 EAPI=6
 HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
 IUSE=layers wayland 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=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 PDEPEND=layers? ( media-libs/vulkan-layers:=[abi_x86_32(-)?,abi_x86_64(-)?,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/KhronosGroup/Vulkan-Loader/archive/4cd7e44fc1ca6c4d8361720b43a3588ddf9fc4b6.tar.gz -> vulkan-loader-1.1.92.1.tar.gz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=4a2eeea31a5f9467d54a35d1d4be91dd
+_md5_=459e1df629c9ced6b6103c47e248b194
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 6f24301e2dd6..177306c83da5 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.11 b/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.11
new file mode 100644
index 000000000000..b8110f5fb966
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.11
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-libs/libplatform-2* =media-libs/kodi-platform-18* =media-tv/kodi-18* sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Tvheadend Live TV and Radio PVR client addon for Kodi
+EAPI=6
+HOMEPAGE=https://github.com/kodi-pvr/pvr.hts
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-libs/libplatform-2* =media-libs/kodi-platform-18* =media-tv/kodi-18*
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.hts/archive/4.4.11-Leia.tar.gz -> kodi-pvr-hts-4.4.11.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=983eaa88c336c741de6e4f1edf098553
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.12 b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.12
new file mode 100644
index 000000000000..577c9affdfc3
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Kodi's NextPVR client addon
+EAPI=6
+HOMEPAGE=https://github.com/kodi-pvr/pvr.nextpvr
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* dev-libs/tinyxml
+SLOT=0
+SRC_URI=https://github.com/kodi-pvr/pvr.nextpvr/archive/3.3.12-Leia.tar.gz -> kodi-pvr-nextpvr-3.3.12.tar.gz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	kodi-addon	bc015cf49b6539f5f5ef3f0bced1ad62	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=1ee300c1276232058b62e55c7db2fcd0
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index ae8d22374342..bc8b360ee537 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.4.6 b/metadata/md5-cache/media-sound/pulseeffects-4.4.6
index 7c62fc6a2721..66660de73e93 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-4.4.6
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.4.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus virtual/pkgconfig dev-libs/appstream-glib sys-devel/gettext >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-libs/libsamplerate media-sound/pulseaudio sys-apps/dbus virtual/pkgconfig dev-libs/appstream-glib sys-devel/gettext >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
 DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
 EAPI=6
 HOMEPAGE=https://github.com/wwmm/pulseeffects
 IUSE=bs2b calf mda-lv2 rubberband
 KEYWORDS=amd64
 LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
+RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-libs/libsamplerate media-sound/pulseaudio sys-apps/dbus
 SLOT=0
 SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.4.6.tar.gz -> pulseeffects-4.4.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	meson	2780db7405ab6249571d07667ab97ba1	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d79f6410d67ccf81228140ff90eb3944
+_md5_=ca819509062ee152927a14caf22ed7fd
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 06e6beb93e1b..5a27fec47645 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.16.2 b/metadata/md5-cache/media-video/kaffeine-2.0.16.2
new file mode 100644
index 000000000000..eda361181350
--- /dev/null
+++ b/metadata/md5-cache/media-video/kaffeine-2.0.16.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-video/vlc[X] x11-libs/libXScrnSaver dvb? ( media-libs/libv4l ) sys-devel/gettext 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.52.0:5 handbook? ( >=kde-frameworks/kdoctools-5.52.0:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Media player with digital TV support by KDE
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/Kaffeine
+IUSE=dvb debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.3 )
+RDEPEND=>=kde-frameworks/kconfig-5.52.0:5 >=kde-frameworks/kconfigwidgets-5.52.0:5 >=kde-frameworks/kcoreaddons-5.52.0:5 >=kde-frameworks/kdbusaddons-5.52.0:5 >=kde-frameworks/ki18n-5.52.0:5 >=kde-frameworks/kio-5.52.0:5 >=kde-frameworks/kwidgetsaddons-5.52.0:5 >=kde-frameworks/kwindowsystem-5.52.0:5 >=kde-frameworks/kxmlgui-5.52.0:5 >=kde-frameworks/solid-5.52.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-video/vlc[X] x11-libs/libXScrnSaver dvb? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.52.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kaffeine/kaffeine-2.0.16-2.tar.xz
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	kde5	0cf7e831a326c0cae8c370bfeec43d1b	kde5-functions	4e4f4b4466c1c57f287a89f3938f8ba9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	401b718cc14d43a5a7fbe062c4851ba5	xdg	4939e61ae72d18779a8bdac386a7a07e	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=29b762f673a1421a8a89ef815919b36f
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index cef0d134e82b..2b155f1f900c 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/metasploit-4.17.21-r4 b/metadata/md5-cache/net-analyzer/metasploit-4.17.21-r4
index ec0797afb07f..394ab90a8563 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-4.17.21-r4
+++ b/metadata/md5-cache/net-analyzer/metasploit-4.17.21-r4
@@ -4,7 +4,7 @@ DESCRIPTION=Advanced framework for developing, testing, and using vulnerability
 EAPI=6
 HOMEPAGE=http://www.metasploit.org/
 IUSE=development +java nexpose openvas oracle +pcap test test elibc_FreeBSD ruby_targets_ruby24
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 RDEPEND=ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] >=dev-ruby/actionpack-4.2.6:4.2[ruby_targets_ruby24] >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby24] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby24] dev-ruby/backports[ruby_targets_ruby24] dev-ruby/bcrypt-ruby[ruby_targets_ruby24] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby24] dev-ruby/bit-struct[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] dev-ruby/dnsruby[ruby_targets_ruby24] dev-ruby/faker[ruby_targets_ruby24] dev-ruby/filesize:*[ruby_targets_ruby24] dev-ruby/jsobfu:*[ruby_targets_ruby24] dev-ruby/json:*[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/metasploit-concern[ruby_targets_ruby24] <dev-ruby/metasploit-credential-3.0.0[ruby_targets_ruby24] <dev-ruby/metasploit_data_models-3.0.0[ruby_targets_ruby24] dev-ruby/metasploit-model[ruby_targets_ruby24] dev-ruby/metasploit-payloads:1.3.53[ruby_targets_ruby24] dev-ruby/metasploit_payloads-mettle:0.4.2[ruby_targets_ruby24] dev-ruby/mqtt[ruby_targets_ruby24] dev-ruby/msgpack[ruby_targets_ruby24] dev-ruby/net-ssh:*[ruby_targets_ruby24] dev-ruby/ed25519[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] dev-ruby/octokit[ruby_targets_ruby24] dev-ruby/openssl-ccm:1.2.1[ruby_targets_ruby24] dev-ruby/packetfu:1.1.13[ruby_targets_ruby24] dev-ruby/patch_finder[ruby_targets_ruby24] dev-ruby/pdf-reader:*[ruby_targets_ruby24] ~dev-ruby/pg-0.21.0[ruby_targets_ruby24] dev-ruby/railties:*[ruby_targets_ruby24] dev-ruby/rb-readline[ruby_targets_ruby24] dev-ruby/recog:*[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-bin_tools[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-encoder[ruby_targets_ruby24] dev-ruby/rex-exploitation[ruby_targets_ruby24] dev-ruby/rex-java[ruby_targets_ruby24] dev-ruby/rex-mime[ruby_targets_ruby24] dev-ruby/rex-nop[ruby_targets_ruby24] dev-ruby/rex-ole[ruby_targets_ruby24] <dev-ruby/rex-powershell-0.1.78[ruby_targets_ruby24] dev-ruby/rex-random_identifier[ruby_targets_ruby24] dev-ruby/rex-registry[ruby_targets_ruby24] dev-ruby/rex-rop_builder[ruby_targets_ruby24] dev-ruby/rex-socket[ruby_targets_ruby24] dev-ruby/rex-sslscan[ruby_targets_ruby24] dev-ruby/rex-struct2[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] dev-ruby/rex-zip[ruby_targets_ruby24] dev-ruby/ruby-macho[ruby_targets_ruby24] dev-ruby/rubyntlm[ruby_targets_ruby24] dev-ruby/ruby_smb:*[ruby_targets_ruby24] dev-ruby/rubyzip[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] dev-ruby/sshkey[ruby_targets_ruby24] dev-ruby/tzinfo:*[ruby_targets_ruby24] dev-ruby/windows_error[ruby_targets_ruby24] dev-ruby/xdr:2.0.0[ruby_targets_ruby24] dev-ruby/xmlrpc[ruby_targets_ruby24] java? ( dev-ruby/rjb[ruby_targets_ruby24] ) nexpose? ( dev-ruby/nexpose[ruby_targets_ruby24] ) openvas? ( dev-ruby/openvas-omp[ruby_targets_ruby24] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby24] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby24] dev-ruby/network_interface[ruby_targets_ruby24] ) development? ( dev-ruby/fivemat[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] >=dev-ruby/rake-10.0.0[ruby_targets_ruby24] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby24] ) ) dev-db/postgresql[server] || ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal] ) net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 REQUIRED_USE=|| ( ruby_targets_ruby24 )
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=4.17
 SRC_URI=https://github.com/rapid7/metasploit-framework/archive/4.17.21.tar.gz -> metasploit-4.17.21.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=cd0a51807c3ce8ee01b4e5796f0d669a
+_md5_=b12ed99018f9399bd1ea1e1c312dbf24
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index a62775e9b069..66ebb65aa9eb 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.52 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.52
deleted file mode 100644
index c0cdb5e358a5..000000000000
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.52
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls ) test? ( ssl? ( net-misc/curl[ssl] ) )
-DESCRIPTION=Small C library to run an HTTP server as part of another application
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
-IUSE=epoll messages ssl static-libs test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
-SLOT=0/12
-SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.52.tar.gz
-_md5_=76a589fa24494e726aee115e378a7276
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.55 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.55
deleted file mode 100644
index 5dabbda60efc..000000000000
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.55
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls ) test? ( ssl? ( net-misc/curl[ssl] ) )
-DESCRIPTION=Small C library to run an HTTP server as part of another application
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
-IUSE=epoll messages ssl static-libs test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
-SLOT=0/12
-SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.55.tar.gz
-_md5_=cffd3ea76ad59b033ee9786b7415c90d
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.57 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.57
deleted file mode 100644
index 867031108a8c..000000000000
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.57
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls ) test? ( ssl? ( net-misc/curl[ssl] ) )
-DESCRIPTION=Small C library to run an HTTP server as part of another application
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
-IUSE=epoll messages ssl 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
-LICENSE=LGPL-2.1
-RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
-SLOT=0/12
-SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.57.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=bb1f868c746a80a64a0e73956ccf5597
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.58 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.58
deleted file mode 100644
index e65410c33526..000000000000
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.58
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls ) test? ( ssl? ( net-misc/curl[ssl] ) )
-DESCRIPTION=Small C library to run an HTTP server as part of another application
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
-IUSE=epoll messages ssl 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
-LICENSE=LGPL-2.1
-RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
-SLOT=0/12
-SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.58.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=bb1f868c746a80a64a0e73956ccf5597
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.59 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.59
index f0f5530874dc..fc886b1148f4 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.59
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.59
@@ -4,10 +4,10 @@ DESCRIPTION=Small C library to run an HTTP server as part of another application
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
 IUSE=epoll messages ssl 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 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( dev-libs/libgcrypt:0= net-libs/gnutls )
 SLOT=0/12
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.59.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=5ebea7b2e7dca5c9c59b370ff50eeb0e
+_md5_=67f5a11eab437e03facc026309e8eb55
diff --git a/metadata/md5-cache/net-libs/libssh-0.8.5 b/metadata/md5-cache/net-libs/libssh-0.8.5
index 122614512613..949d0dce35f6 100644
--- a/metadata/md5-cache/net-libs/libssh-0.8.5
+++ b/metadata/md5-cache/net-libs/libssh-0.8.5
@@ -4,11 +4,11 @@ DESCRIPTION=Access a working SSH implementation by means of a library
 EAPI=6
 HOMEPAGE=https://www.libssh.org/
 IUSE=debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test 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 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=LGPL-2.1
 RDEPEND=!gcrypt? ( !mbedtls? ( !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(-)?] ) ) ) gcrypt? ( >=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(-)?] ) gssapi? ( >=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(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] )
 REQUIRED_USE=?? ( gcrypt mbedtls ) test? ( static-libs )
 SLOT=0/4
 SRC_URI=https://www.libssh.org/files/0.8/libssh-0.8.5.tar.xz
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=db2439e712f1b47a86f4043f10a3f11a
+_md5_=484520b18831a8e1e35925ae7e90612b
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index e43d5e9b5ad8..1f92f4f8dd15 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/gdal-2.3.1 b/metadata/md5-cache/sci-libs/gdal-2.3.1
index 8e4c7e0fca31..9844596c3f62 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.3.1
+++ b/metadata/md5-cache/sci-libs/gdal-2.3.1
@@ -11,4 +11,4 @@ REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python2_7 python_target
 SLOT=0/2.3
 SRC_URI=https://download.osgeo.org/gdal/2.3.1/gdal-2.3.1.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	71a5ee567fb298e553ce8d1319279151	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=11b8549e7ded4377b4bdc9704fa5fc10
+_md5_=4229f49ec5e44617623f6072488193a9
diff --git a/metadata/md5-cache/sci-libs/indilib-1.6.0 b/metadata/md5-cache/sci-libs/indilib-1.6.0
deleted file mode 100644
index 1a954d35b769..000000000000
--- a/metadata/md5-cache/sci-libs/indilib-1.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 ) sys-kernel/linux-headers test? ( >=dev-cpp/gtest-1.8.0 ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=INDI Astronomical Control Protocol library
-EAPI=6
-HOMEPAGE=http://www.indilib.org/
-IUSE=ogg test
-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	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=43046ef73049d0972c111b5aadfe3cb5
diff --git a/metadata/md5-cache/sci-libs/indilib-1.7.5 b/metadata/md5-cache/sci-libs/indilib-1.7.5
index 34bb7de54162..681b5cb90ba2 100644
--- a/metadata/md5-cache/sci-libs/indilib-1.7.5
+++ b/metadata/md5-cache/sci-libs/indilib-1.7.5
@@ -5,10 +5,10 @@ DESCRIPTION=INDI Astronomical Control Protocol library
 EAPI=7
 HOMEPAGE=https://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://dev.gentoo.org/~asturm/distfiles/indilib-1.7.5.tar.xz
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7dc915fa704af66ae43336a8ee19bab2
+_md5_=3b099e185a344d408e7b1cf4fabceee6
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 09c05a0d9387..21d8f687858c 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/automake-1.16.1-r1 b/metadata/md5-cache/sys-devel/automake-1.16.1-r1
index de1546a90604..9cdc4e428ce2 100644
--- a/metadata/md5-cache/sys-devel/automake-1.16.1-r1
+++ b/metadata/md5-cache/sys-devel/automake-1.16.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Used to generate Makefile.in from Makefile.am
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/automake/
 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 ~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=dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 SLOT=1.16
 SRC_URI=mirror://gnu/automake/automake-1.16.1.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.16.1.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=938c258032a8b4c779d89f4b9376bc2b
+_md5_=3ca0a87b54af026eeb0ddfd2ea3b599e
diff --git a/metadata/md5-cache/sys-devel/clang-8.0.9999 b/metadata/md5-cache/sys-devel/clang-8.0.9999
new file mode 100644
index 000000000000..df57c0e46c38
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-8.0.9999
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-8.0.9999:8=[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-4.7.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(-)?] ) ) 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_python3_7(-),python_single_target_python2_7(+)] doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
+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
+LICENSE=UoI-NCSA
+PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-8.0.9999 default-compiler-rt? ( =sys-libs/compiler-rt-8.0.9999* ) default-libcxx? ( >=sys-libs/libcxx-8.0.9999 )
+RDEPEND=~sys-devel/llvm-8.0.9999:8=[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-4.7.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(-)?] ) ) 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_python3_7(-),python_single_target_python2_7(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
+REQUIRED_USE=python_targets_python2_7 || ( 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 )
+RESTRICT=!test? ( test )
+SLOT=8
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3752c7343f4390b1872fcff32ddf7576
diff --git a/metadata/md5-cache/sys-devel/clang-9999 b/metadata/md5-cache/sys-devel/clang-9999
index 91f8c3b74ff9..5e008782825d 100644
--- a/metadata/md5-cache/sys-devel/clang-9999
+++ b/metadata/md5-cache/sys-devel/clang-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-9999:8=[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?,llvm_targets_AVR?,llvm_targets_Nios2?,llvm_targets_RISCV?,llvm_targets_WebAssembly?,abi_x86_32(-)?,abi_x86_64(-)?,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-4.7.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(-)?] ) ) 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_python3_7(-),python_single_target_python2_7(+)] doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~sys-devel/llvm-9999:9=[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?,llvm_targets_AVR?,llvm_targets_Nios2?,llvm_targets_RISCV?,llvm_targets_WebAssembly?,abi_x86_32(-)?,abi_x86_64(-)?,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-4.7.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(-)?] ) ) 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_python3_7(-),python_single_target_python2_7(+)] doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
 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 llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly abi_x86_32 abi_x86_64 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=UoI-NCSA
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-9999 default-compiler-rt? ( =sys-libs/compiler-rt-9999* ) default-libcxx? ( >=sys-libs/libcxx-9999 )
-RDEPEND=~sys-devel/llvm-9999:8=[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?,llvm_targets_AVR?,llvm_targets_Nios2?,llvm_targets_RISCV?,llvm_targets_WebAssembly?,abi_x86_32(-)?,abi_x86_64(-)?,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-4.7.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(-)?] ) ) 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_python3_7(-),python_single_target_python2_7(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
+RDEPEND=~sys-devel/llvm-9999:9=[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?,llvm_targets_AVR?,llvm_targets_Nios2?,llvm_targets_RISCV?,llvm_targets_WebAssembly?,abi_x86_32(-)?,abi_x86_64(-)?,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-4.7.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(-)?] ) ) 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_python3_7(-),python_single_target_python2_7(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
 REQUIRED_USE=python_targets_python2_7 || ( 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 llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly )
 RESTRICT=!test? ( test )
-SLOT=8
+SLOT=9
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=96001e3ad0d30c6a6581997e583a8d59
+_md5_=c8d6e0c08ff66f8039fbd04871ab03ae
diff --git a/metadata/md5-cache/sys-devel/clang-common-8.0.9999 b/metadata/md5-cache/sys-devel/clang-common-8.0.9999
new file mode 100644
index 000000000000..d146b1294085
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-common-8.0.9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Common files shared between multiple slots of clang
+EAPI=6
+HOMEPAGE=https://llvm.org/
+LICENSE=UoI-NCSA
+PDEPEND=sys-devel/clang:*
+SLOT=0
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=aed4fa6c0fd26eb7fe3915341cc6560e
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-8.0.9999 b/metadata/md5-cache/sys-devel/clang-runtime-8.0.9999
new file mode 100644
index 000000000000..4d3a5a2a256f
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-8.0.9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+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
+LICENSE=metapackage
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-8.0.9999:8.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-8.0.9999:8.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-8.0.9999[abi_x86_32(-)?,abi_x86_64(-)?,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-8.0.9999[abi_x86_32(-)?,abi_x86_64(-)?,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=8.0.0
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=774a2f2cce866c9cdf1ecaaa2cf3c1a6
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-9999 b/metadata/md5-cache/sys-devel/clang-runtime-9999
index 9aacf47d8872..b3da25aa358c 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-9999
+++ b/metadata/md5-cache/sys-devel/clang-runtime-9999
@@ -4,8 +4,8 @@ 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
 LICENSE=metapackage
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-9999:8.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-9999:8.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-9999[abi_x86_32(-)?,abi_x86_64(-)?,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-9999[abi_x86_32(-)?,abi_x86_64(-)?,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=compiler-rt? ( ~sys-libs/compiler-rt-9999:9.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-9999:9.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-9999[abi_x86_32(-)?,abi_x86_64(-)?,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-9999[abi_x86_32(-)?,abi_x86_64(-)?,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=8.0.0
+SLOT=9.0.0
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=55e557f8b4a5b0c7f3120b10aff62bf8
+_md5_=eb7e6d123ea66e3f99320f217e15f9f2
diff --git a/metadata/md5-cache/sys-devel/lld-8.0.9999 b/metadata/md5-cache/sys-devel/lld-8.0.9999
new file mode 100644
index 000000000000..0c85b4f2f0a7
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-8.0.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-8.0.9999 test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-8.0.9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=test
+LICENSE=UoI-NCSA
+RDEPEND=~sys-devel/llvm-8.0.9999
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b69885e1f3b82482750b9861074a2dd3
diff --git a/metadata/md5-cache/sys-devel/llvm-8.0.9999 b/metadata/md5-cache/sys-devel/llvm-8.0.9999
new file mode 100644
index 000000000000..7f609d7d17b4
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-8.0.9999
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/zlib:0= exegesis? ( dev-libs/libpfm:= ) 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(-)?] ) dev-lang/perl || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) kernel_Darwin? ( <sys-libs/libcxx-8.0.9999.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/recommonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) !doc? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Low Level Virtual Machine
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=debug doc exegesis 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
+LICENSE=UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )
+PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-8 )
+RDEPEND=sys-libs/zlib:0= exegesis? ( dev-libs/libpfm:= ) 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
+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 )
+RESTRICT=!test? ( test )
+SLOT=8
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=90a8cdc413d241b906777cdcd0fa8a7d
diff --git a/metadata/md5-cache/sys-devel/llvm-9999 b/metadata/md5-cache/sys-devel/llvm-9999
index 71498c44ddf7..b99ecc71380a 100644
--- a/metadata/md5-cache/sys-devel/llvm-9999
+++ b/metadata/md5-cache/sys-devel/llvm-9999
@@ -5,10 +5,10 @@ EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=debug doc exegesis 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 llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly abi_x86_32 abi_x86_64 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=UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )
-PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-8 )
+PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-9 )
 RDEPEND=sys-libs/zlib:0= exegesis? ( dev-libs/libpfm:= ) 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
 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 llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly )
 RESTRICT=!test? ( test )
-SLOT=8
+SLOT=9
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	e85f015e815dd463b0c206d781ef45a5	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5f41ffc3e61611af456cfe79099e46e5
+_md5_=ee3e2f4e570916c2cb1ebf600fb92855
diff --git a/metadata/md5-cache/sys-devel/llvm-common-8.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-8.0.9999
new file mode 100644
index 000000000000..718b803d0c17
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-8.0.9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=6
+HOMEPAGE=https://llvm.org/
+LICENSE=UoI-NCSA
+RDEPEND=!sys-devel/llvm:0
+SLOT=0
+_eclasses_=git-r3	0d4635eeb5a96cd5315597a47eba25c9
+_md5_=ac1a01143da1bd18c2c9874ad1642e19
diff --git a/metadata/md5-cache/sys-devel/llvmgold-9 b/metadata/md5-cache/sys-devel/llvmgold-9
new file mode 100644
index 000000000000..07a3b9c6a5e9
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvmgold-9
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install
+DESCRIPTION=LLVMgold plugin symlink for autoloading
+EAPI=6
+HOMEPAGE=https://llvm.org/
+LICENSE=public-domain
+RDEPEND=sys-devel/llvm:9[gold] !sys-devel/llvm:0
+SLOT=0
+_md5_=d74c5b58297a683a4d5bda0af34346ba
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 737fed66f51f..d765910b35c8 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-4.15.1 b/metadata/md5-cache/sys-fs/btrfs-progs-4.15.1
deleted file mode 100644
index e2d50b602338..000000000000
--- a/metadata/md5-cache/sys-fs/btrfs-progs-4.15.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) >=app-text/asciidoc-8.6.0 app-text/docbook-xml-dtd:4.5 app-text/xmlto static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
-DESCRIPTION=Btrfs filesystem utilities
-EAPI=6
-HOMEPAGE=https://btrfs.wiki.kernel.org
-IUSE=+convert reiserfs static static-libs +zstd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) zstd? ( app-arch/zstd:0= )
-RESTRICT=test
-SLOT=0/0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.15.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=8f27ab1e83c311783ca271b091511021
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-4.16.1 b/metadata/md5-cache/sys-fs/btrfs-progs-4.16.1
deleted file mode 100644
index ad4432540d49..000000000000
--- a/metadata/md5-cache/sys-fs/btrfs-progs-4.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) 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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) >=app-text/asciidoc-8.6.0 app-text/docbook-xml-dtd:4.5 app-text/xmlto python? ( dev-python/setuptools[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
-DESCRIPTION=Btrfs filesystem utilities
-EAPI=6
-HOMEPAGE=https://btrfs.wiki.kernel.org
-IUSE=+convert python reiserfs static static-libs +zstd 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=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) 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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zstd? ( app-arch/zstd: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 ) )
-RESTRICT=test
-SLOT=0/0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.16.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=f331804cb1c8f2509785f0f3af1f8228
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-4.17.1 b/metadata/md5-cache/sys-fs/btrfs-progs-4.17.1
deleted file mode 100644
index 53eae513fb56..000000000000
--- a/metadata/md5-cache/sys-fs/btrfs-progs-4.17.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) 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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) >=app-text/asciidoc-8.6.0 app-text/docbook-xml-dtd:4.5 app-text/xmlto python? ( dev-python/setuptools[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
-DESCRIPTION=Btrfs filesystem utilities
-EAPI=6
-HOMEPAGE=https://btrfs.wiki.kernel.org
-IUSE=+convert python reiserfs static static-libs +zstd 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=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) 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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) zstd? ( app-arch/zstd: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 ) )
-RESTRICT=test
-SLOT=0/0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.17.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=bec180c6709efdce4035389037ab8d4d
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-4.20_rc1 b/metadata/md5-cache/sys-fs/btrfs-progs-4.20_rc1
new file mode 100644
index 000000000000..1dde4660dacd
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-4.20_rc1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(+)?,python_single_target_python3_7(+)?] ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) >=app-text/asciidoc-8.6.0 app-text/docbook-xml-dtd:4.5 app-text/xmlto python? ( dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(+)?,python_single_target_python3_7(+)?] ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
+DESCRIPTION=Btrfs filesystem utilities
+EAPI=6
+HOMEPAGE=https://btrfs.wiki.kernel.org
+IUSE=+convert python reiserfs static static-libs +zstd python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+LICENSE=GPL-2
+RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(+)?,python_single_target_python3_7(+)?] ) zstd? ( app-arch/zstd:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+RESTRICT=test
+SLOT=0/0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.20-rc1.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	b2f01ad412baf81650c23fcf0975fa33	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
+_md5_=06d008cb48d28014a6c7baa3ff097593
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 2e4f4df5cf30..7f654f572f61 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1 b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
index caeccf13cb3c..f33d04a80dc0 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Linux system headers
 EAPI=6
 HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/
 IUSE=headers-only
-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=GPL-2
 RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.14.tar.xz mirror://gentoo/gentoo-headers-4.14-1.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	97f96577827180eddaa76c6bce3470ee	multilib	b2f01ad412baf81650c23fcf0975fa33	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861
-_md5_=ea519b5c90c4e516ea16f4ecccf8ea74
+_md5_=3efa24638cbbd9b1d3854875dc96b308
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index a72010440e17..157f8d152c66 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-8.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-8.0.9999
new file mode 100644
index 000000000000..de78828fceb1
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-8.0.9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-8.0.9999*:8 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Compiler runtime library for clang (built-in part)
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=+clang test
+LICENSE=|| ( UoI-NCSA MIT )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=8.0.0
+_eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3dd070a13d83b9e2cc5fb388083f834b
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-9999 b/metadata/md5-cache/sys-libs/compiler-rt-9999
index 3a5cb86fd50a..a2e6e0bafec4 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=>=sys-devel/llvm-6 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-9999*:8 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=sys-devel/llvm-6 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-9999*:9 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Compiler runtime library for clang (built-in part)
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=+clang test
 LICENSE=|| ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=8.0.0
+SLOT=9.0.0
 _eclasses_=cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=221e59c4b6dbbdf4ff13be55feac5796
+_md5_=d406b5417cc0c247b2dcf9879a7209e0
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.9999
new file mode 100644
index 000000000000..c7cecc9ff3db
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/lit-5[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-8.0.9999*:8 sys-libs/compiler-rt:8.0.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=+clang +libfuzzer +profile +sanitize test +xray elibc_glibc
+LICENSE=|| ( UoI-NCSA MIT )
+REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=8.0.0
+_eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f919e93fd8c1ff0e8d61686393c84f2a
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999
index 325ebbd5e8c5..1b655fdbe2a0 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=>=sys-devel/llvm-6 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/lit-5[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-9999*:8 sys-libs/compiler-rt:8.0.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=sys-devel/llvm-6 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/lit-5[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-9999*:9 sys-libs/compiler-rt:9.0.0 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
 EAPI=6
 HOMEPAGE=https://llvm.org/
@@ -7,6 +7,6 @@ IUSE=+clang +libfuzzer +profile +sanitize test +xray elibc_glibc
 LICENSE=|| ( UoI-NCSA MIT )
 REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=8.0.0
+SLOT=9.0.0
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=ef6b76fed75309a92ba2a317bf38a7b8
+_md5_=1cf62db79d47405c7aceb2cfac40684c
diff --git a/metadata/md5-cache/sys-libs/libcxx-8.0.9999 b/metadata/md5-cache/sys-libs/libcxx-8.0.9999
new file mode 100644
index 000000000000..423682954f32
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-8.0.9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-8.0.9999[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] ) ) test? ( >=sys-devel/clang-3.9.0 || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) app-arch/xz-utils >=sys-devel/llvm-6 >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.7.0-r1
+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
+LICENSE=|| ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-8.0.9999[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 )
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=37c0ab1db8bf2bb0fe43c2773da70aa0
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-8.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-8.0.9999
new file mode 100644
index 000000000000..62f9407d0e0e
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-8.0.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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(-)?] ) ) >=sys-devel/llvm-6 test? ( >=sys-devel/clang-3.9.0 || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
+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
+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(-)?] ) )
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=b887bfbaa7e227b912803772cc9e411e
diff --git a/metadata/md5-cache/sys-libs/libomp-8.0.9999 b/metadata/md5-cache/sys-libs/libomp-8.0.9999
new file mode 100644
index 000000000000..e8f147df9116
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-8.0.9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=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:= ) ) dev-lang/perl offload? ( virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-devel/clang-6 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
+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 kernel_linux
+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 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=97d96fdbb4a77d657b2eb2b4a1b502ac
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.9999
new file mode 100644
index 000000000000..c043951bc1be
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=sys-devel/llvm-6 test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lit[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/lit[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=C++ runtime stack unwinder from LLVM
+EAPI=6
+HOMEPAGE=https://github.com/llvm-mirror/libunwind
+IUSE=debug +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
+LICENSE=|| ( UoI-NCSA MIT )
+RDEPEND=!sys-libs/libunwind
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	ab10bd85e5d38e2a32077bcd91faa1b6	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	git-r3	0d4635eeb5a96cd5315597a47eba25c9	llvm	01fccd3367b527770b74bfbf59d616c6	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	12114a2a9aab35b93efc037a196b3234	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=7d1270d42e72df5907237844559ee4b5
diff --git a/metadata/md5-cache/sys-libs/readline-7.0_p5 b/metadata/md5-cache/sys-libs/readline-7.0_p5
index 37453d2faf23..7547f2976bd6 100644
--- a/metadata/md5-cache/sys-libs/readline-7.0_p5
+++ b/metadata/md5-cache/sys-libs/readline-7.0_p5
@@ -4,10 +4,10 @@ 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 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-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	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=854a1555ff838de8c5d433fe69c83b53
+_md5_=95fc3d54b5a2b1a0a3eaee0365f6add6
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index c55a6b3196de..d5332c2e12f2 100644
Binary files a/metadata/md5-cache/www-apache/Manifest.gz and b/metadata/md5-cache/www-apache/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apache/passenger-5.3.7 b/metadata/md5-cache/www-apache/passenger-5.3.7
index aa1fb86ee783..4069a4cf066b 100644
--- a/metadata/md5-cache/www-apache/passenger-5.3.7
+++ b/metadata/md5-cache/www-apache/passenger-5.3.7
@@ -4,11 +4,11 @@ DESCRIPTION=Passenger makes deployment of Ruby on Rails applications a breeze
 EAPI=6
 HOMEPAGE=https://www.phusionpassenger.com/
 IUSE=apache2 debug test apache2 elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rake-0.8.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rake-0.8.1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby25] >=dev-ruby/rake-0.8.1[ruby_targets_ruby25] ) >=dev-libs/libuv-1.8.0 net-misc/curl[ssl] apache2? ( www-servers/apache[apache2_modules_unixd(+)] ) apache2? ( =www-servers/apache-2* ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 )
 REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://s3.amazonaws.com/phusion-passenger/releases/passenger-5.3.7.tar.gz
 _eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	java-utils-2	3c52cbe53976e882e4adeaf6bde28de0	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	9ffc1c055a3294fcc48de781c94825f6	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b6eb48ab68d8fb027de29df342da7e9b
+_md5_=08c9008a8a69a039198edecf8a64868c
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 4cd0e00a838a..99c858dd329d 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.137 b/metadata/md5-cache/x11-drivers/nvidia-drivers-304.137
deleted file mode 100644
index a472e4c2a21c..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-304.137
+++ /dev/null
@@ -1,16 +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 x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-libs/pango[X] x11-libs/pangox-compat ) X? ( >=app-eselect/eselect-opengl-1.0.9 ) kernel_linux? ( virtual/linux-sources virtual/pkgconfig ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) 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 multilib kernel_FreeBSD kernel_linux pax_kernel static-libs +tools +X kernel_linux kernel_linux 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-r1
-PDEPEND=X? ( >=x11-libs/libvdpau-0.3-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(-)?] )
-RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-libs/pango[X] x11-libs/pangox-compat ) X? ( >=app-eselect/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) 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(-)?] 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(-)?] x11-libs/libXvMC[abi_x86_32(-)?,abi_x86_64(-)?,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/304
-SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/304.137/NVIDIA-FreeBSD-x86_64-304.137.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/304.137/NVIDIA-Linux-x86_64-304.137.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/304.137/NVIDIA-FreeBSD-x86-304.137.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/304.137/NVIDIA-Linux-x86-304.137.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-304.137.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=70de8182c37e0c65ce5410fb43422cb0
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107 b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107
index 6d9bcb93720a..9f2601c9aa17 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.107
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm p
 DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( >=x11-libs/gtk+-2.4:2 dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/gdk-pixbuf[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 ) app-arch/xz-utils kernel_linux? ( virtual/linux-sources ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) 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 multilib kernel_FreeBSD kernel_linux pax_kernel static-libs +tools +X kernel_linux kernel_linux 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
+HOMEPAGE=http://www.nvidia.com/
+IUSE=acpi multilib kernel_FreeBSD kernel_linux static-libs +tools +X kernel_linux kernel_linux 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? ( >=x11-libs/gtk+-2.4:2 dev-libs/atk dev-libs/glib:2 dev-libs/jansson x11-libs/gdk-pixbuf[X] x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) X? ( <x11-base/xorg-server-1.20.99:= >=x11-libs/libvdpau-0.3-r1 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(-)?] multilib? ( >=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(-)?] ) ) kernel_linux? ( virtual/modutils )
@@ -12,4 +12,4 @@ RESTRICT=bindist mirror
 SLOT=0/340
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/340.107/NVIDIA-FreeBSD-x86_64-340.107.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/340.107/NVIDIA-Linux-x86_64-340.107.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/340.107/NVIDIA-FreeBSD-x86-340.107.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/340.107/NVIDIA-Linux-x86-340.107.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.107.tar.bz2 )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f86bfaa6764a760a55a6f56bfb47df8a
+_md5_=b61a78e369fd9a9cf3827cb5a65112ee
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-375.82 b/metadata/md5-cache/x11-drivers/nvidia-drivers-375.82
deleted file mode 100644
index 4ca4d85bc9b3..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-375.82
+++ /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 ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) 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 kernel_linux 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/375
-SRC_URI=amd64-fbsd? ( https://download.nvidia.com/XFree86/FreeBSD-x86_64/375.82/NVIDIA-FreeBSD-x86_64-375.82.tar.gz ) amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/375.82/NVIDIA-Linux-x86_64-375.82.run ) arm? ( https://download.nvidia.com/XFree86/Linux-32bit-ARM/375.82/NVIDIA-Linux-armv7l-gnueabihf-375.82.run ) x86-fbsd? ( https://download.nvidia.com/XFree86/FreeBSD-x86/375.82/NVIDIA-FreeBSD-x86-375.82.tar.gz ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/375.82/NVIDIA-Linux-x86-375.82.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-375.82.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ee9681054427ee3a7819e066f9686f6e
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1
deleted file mode 100644
index ea86f1c573f6..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1
+++ /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 ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) 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 kernel_linux 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/378
-SRC_URI=amd64-fbsd? ( https://download.nvidia.com/XFree86/FreeBSD-x86_64/378.13/NVIDIA-FreeBSD-x86_64-378.13.tar.gz ) amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/378.13/NVIDIA-Linux-x86_64-378.13.run ) arm? ( https://download.nvidia.com/XFree86/Linux-32bit-ARM/378.13/NVIDIA-Linux-armv7l-gnueabihf-378.13.run ) x86-fbsd? ( https://download.nvidia.com/XFree86/FreeBSD-x86/378.13/NVIDIA-FreeBSD-x86-378.13.tar.gz ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/378.13/NVIDIA-Linux-x86-378.13.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-378.13.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=eb7d7c5181a8530d41eb874049b23731
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1
deleted file mode 100644
index 4214cd1035aa..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1
+++ /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 virtual/libelf ) 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 kernel_linux 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/381
-SRC_URI=amd64-fbsd? ( https://download.nvidia.com/XFree86/FreeBSD-x86_64/381.22/NVIDIA-FreeBSD-x86_64-381.22.tar.gz ) amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/381.22/NVIDIA-Linux-x86_64-381.22.run ) arm? ( https://download.nvidia.com/XFree86/Linux-32bit-ARM/381.22/NVIDIA-Linux-armv7l-gnueabihf-381.22.run ) x86-fbsd? ( https://download.nvidia.com/XFree86/FreeBSD-x86/381.22/NVIDIA-FreeBSD-x86-381.22.tar.gz ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/381.22/NVIDIA-Linux-x86-381.22.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-381.22.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=156ffb9062cf41187cdc0d11c09c0d95
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-384.130 b/metadata/md5-cache/x11-drivers/nvidia-drivers-384.130
deleted file mode 100644
index d3ba517ffe93..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-384.130
+++ /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 virtual/libelf ) 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 kernel_linux 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/384
-SRC_URI=amd64-fbsd? ( https://download.nvidia.com/XFree86/FreeBSD-x86_64/384.130/NVIDIA-FreeBSD-x86_64-384.130.tar.gz ) amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/384.130/NVIDIA-Linux-x86_64-384.130.run ) arm? ( https://download.nvidia.com/XFree86/Linux-32bit-ARM/384.130/NVIDIA-Linux-armv7l-gnueabihf-384.130.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/384.130/NVIDIA-FreeBSD-x86-384.130.tar.gz ) x86? ( https://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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2d109ac96fb9d5229d537dae6e0fd7c3
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-387.34 b/metadata/md5-cache/x11-drivers/nvidia-drivers-387.34
deleted file mode 100644
index ad5657f455e4..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-387.34
+++ /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 virtual/libelf ) 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 kernel_linux 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/387
-SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/387.34/NVIDIA-FreeBSD-x86_64-387.34.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/387.34/NVIDIA-Linux-x86_64-387.34.run ) arm? ( https://download.nvidia.com/XFree86/Linux-32bit-ARM/387.34/NVIDIA-Linux-armv7l-gnueabihf-387.34.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/387.34/NVIDIA-FreeBSD-x86-387.34.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/387.34/NVIDIA-Linux-x86-387.34.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-387.34.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=d8b0099b5442c93f16e8ec8579515dc2
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.87 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.87
index cc3fcea3e32a..6384f2738dbb 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.87
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.87
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm p
 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 virtual/libelf ) 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 kernel_linux 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
+HOMEPAGE=http://www.nvidia.com/
+IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux 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 )
@@ -12,4 +12,4 @@ RESTRICT=bindist mirror
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.87/NVIDIA-FreeBSD-x86_64-390.87.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.87/NVIDIA-Linux-x86_64-390.87.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.87/NVIDIA-Linux-armv7l-gnueabihf-390.87.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.87/NVIDIA-FreeBSD-x86-390.87.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.87/NVIDIA-Linux-x86-390.87.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.87.tar.bz2 )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2bdae40c5ea23ea04b891210adf43064
+_md5_=83b00e2a57274b7d19ec74b2d637ce22
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-396.54 b/metadata/md5-cache/x11-drivers/nvidia-drivers-396.54
deleted file mode 100644
index 2553cdab043b..000000000000
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-396.54
+++ /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 virtual/libelf ) 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 kernel_linux 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? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/396.54/NVIDIA-FreeBSD-x86_64-396.54.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/396.54/NVIDIA-Linux-x86_64-396.54.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-396.54.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=95d74c51f5d315be8a2d6e169788b39a
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-410.93 b/metadata/md5-cache/x11-drivers/nvidia-drivers-410.93
index 690f3582bf1b..00129676af7e 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-410.93
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-410.93
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm p
 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 virtual/libelf ) 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 kernel_linux 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
+HOMEPAGE=http://www.nvidia.com/
+IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux 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 )
@@ -12,4 +12,4 @@ RESTRICT=bindist mirror
 SLOT=0/410
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/410.93/NVIDIA-FreeBSD-x86_64-410.93.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/410.93/NVIDIA-Linux-x86_64-410.93.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-410.93.tar.bz2 )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=0aeac45be8bf175660a909c70657040a
+_md5_=9afe4a0196acfe3f64e4aa6a9bcf03f5
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-415.25 b/metadata/md5-cache/x11-drivers/nvidia-drivers-415.25
index f20cca00c5b7..f5d951fe66e2 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-415.25
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-415.25
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm p
 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 virtual/libelf ) 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 kernel_linux 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
+HOMEPAGE=http://www.nvidia.com/
+IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux 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 )
@@ -12,4 +12,4 @@ RESTRICT=bindist mirror
 SLOT=0/415
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/415.25/NVIDIA-FreeBSD-x86_64-415.25.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/415.25/NVIDIA-Linux-x86_64-415.25.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-415.25.tar.bz2 )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3d1c17116e86345e10ac76651dfa4caf
+_md5_=fafb3ab75b8c4454678ae4991c4074ab
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-415.27 b/metadata/md5-cache/x11-drivers/nvidia-drivers-415.27
index ffc35dd01fd4..09626a883932 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-415.27
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-415.27
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm p
 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 virtual/libelf ) 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 kernel_linux 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
+HOMEPAGE=http://www.nvidia.com/
+IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux 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 )
@@ -12,4 +12,4 @@ RESTRICT=bindist mirror
 SLOT=0/415
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/415.27/NVIDIA-FreeBSD-x86_64-415.27.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/415.27/NVIDIA-Linux-x86_64-415.27.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-415.27.tar.bz2 )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	55aaa148741116aa54ad0d80e361818e	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	4b8528d500d6555ad20763a77b31766c	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	b2f01ad412baf81650c23fcf0975fa33	multilib-build	b42436dc1260f475af229754c165cb6b	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	5b441d2bc890a1d3a9f6997f667386d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	udev	7752f306eec7b286d00bdb47b763e7ac	unpacker	ee2f5086cd7e7b747b061f58db14d89e	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=22fd44d1dc591e5f16293917e480b6d1
+_md5_=d9ac9817fe1b428c51fb5298d7c7afcc
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 84b2e3f8a70c..8d06552eccdd 100644
Binary files a/metadata/md5-cache/xfce-extra/Manifest.gz and b/metadata/md5-cache/xfce-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92 b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92
new file mode 100644
index 000000000000..68c3326cbf12
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A panel plug-in for acpi, lm_sensors and hddtemp sensors
+EAPI=6
+HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin
+IUSE=+acpi hddtemp libnotify lm_sensors video_cards_nvidia
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/gtk+-3.20:3= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.7:= ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+REQUIRED_USE=|| ( hddtemp lm_sensors acpi )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-1.3.92.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	c6060f4ab634aca444c4b2176b0f3877	ltprune	08f9e1d9ee0af8f5d9a7854efbcd8c0e	multilib	b2f01ad412baf81650c23fcf0975fa33	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	f164325a2cdb5b3ea39311d483988861	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=a9d4174cbcd9746207d9c9f3a636fe6e
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 120819f777ae..6aa221447d42 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 20301 BLAKE2B 94e5e08bb1fb06daafae41f3b009e2486b835bd0478950857eac122294511d53866717ddacc70984a676a09a2b97a064b0b9e8ecd5261e58b3a0ec55bd0f3e51 SHA512 b72f3b14f69444a7d849878751dfcf10341f96aea126f20e0209c97c73e22d9421610392df5ee4ceb1577f6541480778b86eba9a821033b7318f43cb04c9b479
-TIMESTAMP 2019-01-16T05:08:49Z
+TIMESTAMP 2019-01-16T21:08:46Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlw+vGFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlw/nV5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAeKA/7BvvktL3bpjDi6sQXTn5SLn7wOq0SimWQXz84JDeQwwKofjG+f1RMdIwJ
-4ctR9MB5LpZX2L9z4LxRRpkfk+Avt3GHx6/GBZv59ZHN0IKm5VaePphl/Vvv41ip
-On0fVsBZ91EDTSpfpMVlqyHzjeqB+Mj3VDvzVLATS0zwC5C76n/Vo4HcYlgag25j
-a7eJUsDZ6JVllLosETiCQwSpg/siZQZIl8hbMuvTIgljj5BRBhF9uvBx1q4/qEqu
-EloTm4+XAPtOuGMrco8l7zUnkD8vfb1GsQZsb0plG3D+9mB8FtecWd1EMsdkezCt
-+D3wpYYaR3J1XUw8h7LK9+QsXdoCMCyd2+PthxGMjEVxKc8Bq85d5+UFGQt8gOUI
-r/5uXvqK1P8YeW0YiJ6j+VV/VC2KAtkCKrfx9jZmKhSqWwHXJ7Wqu2OROY8bx38g
-sBhjuNBwu4MKk0yqN5Dm1SdGGYvqD5ZAY1zElC0EB9z0kEIUl0utmnxF173GBKhU
-qijhCAbDOa0/iHElcDqivQE0almwrqKJqtKJTKxJ6ajiMUb/K1MxXI+hbeDdkENN
-v/uehCKMrg9n18DOp8jFjB6ER/HZLFiYoXZ0dLfug8LIykv4GY2mhf1VtlzQaPwB
-lXgsVwl0zsiLmVxsSOUdodWw0WpC2gyokuYafD6dwxgGlEib74o=
-=GuhF
+klAD1A//TqbN+loUronnCVdyIUkYNIbVSEMfFBMn8VJ3kz05pw0vMnnfockHT8xp
+o8ir4dKqh9iiju499FkxYVgllqai0ZX6xHCEKXUKKz3ZzitaYig+vhPmCMZ+nMwF
+P4PyxBjx6nIimDun787y1VxdVYJK7r4ydCtvCuAbT+YopaL5PcD/qYYYR2Zhhv1R
+ucDpPVBTBj1xmxiFF17c8SksPSF3rBOZHCFUkBKgbA4jJHmrw7ATE2oeUav0pHpE
+RwH1hFX+11w97f2nkCptUStSuXYFI4EsuV+0Df1Vi/lZLg3qdRKHudM1xc6cWLM5
+TKOL48UX8LFUu411C2iaMM9X7392HKjEMlhefwS4glhmFqvClFnKiu4mT6eGYvRl
+rluXqodAXSC+O4VvNsmZ4OflUq0rir+6RHU9nsN2pBFDjwrJ+VtThY6yUm7G5ka9
+1mlm8RATY+R/5I/9kQhmWkRiDXrUc3u7OdDoDdBF/+bTJ7No6stz5b/qvOD+3uMU
+ndMvlOvU+70U2nVpR2xC87k68VU95JRQX/Vq7fprxYGi1x5nzq36vMZrXC4fP9ri
+PiuBemKDmbSj8oErSk1T2cWOdYf4rqnidd1StJtdPTTph3XRDDvizMFM/Ougxv9Z
+0EbMQQiJITJGbgh0hzF8vG4+szm0pQAsh4zkvUZIC8YtgS/JRg4=
+=/xX+
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index c7a7cbd95a47..cf43854746cc 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 16 Jan 2019 05:08:45 +0000
+Wed, 16 Jan 2019 21:08:42 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 715c9c633a49..0a408fe369af 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jan 16 05:08:45 UTC 2019
+Wed Jan 16 21:08:42 UTC 2019
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 8daefa6225b6..e62b7b26b834 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -421,6 +421,7 @@
 1702282250 ./dev-java/c3p0/c3p0-0.9.5.1.ebuild
 1702282250 ./dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
 1804240008 ./dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4-r2.ebuild
+1901170009 ./dev-java/oracle-jdk-bin/oracle-jdk-bin-11.0.2.ebuild
 1810260409 ./dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.192.ebuild
 1808160409 ./dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.181.ebuild
 1802021208 ./dev-java/glassfish-interceptor-api/glassfish-interceptor-api-3.1.ebuild
@@ -1019,6 +1020,7 @@
 1812011609 ./sys-libs/librtas/librtas-2.0.2.ebuild
 1808020009 ./sys-libs/llvm-libunwind/llvm-libunwind-7.0.9999.ebuild
 1812201609 ./sys-libs/llvm-libunwind/llvm-libunwind-7.0.1.ebuild
+1901161809 ./sys-libs/llvm-libunwind/llvm-libunwind-8.0.9999.ebuild
 1806072039 ./sys-libs/llvm-libunwind/llvm-libunwind-5.0.2.ebuild
 1803161238 ./sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
 1712150139 ./sys-libs/llvm-libunwind/llvm-libunwind-4.0.1.ebuild
@@ -1043,11 +1045,12 @@
 1810252239 ./sys-libs/ldb/ldb-1.5.1.ebuild
 1805161809 ./sys-libs/ldb/ldb-1.2.3.ebuild
 1811080239 ./sys-libs/ldb/ldb-1.3.6.ebuild
-1808020009 ./sys-libs/compiler-rt/compiler-rt-9999.ebuild
+1901161809 ./sys-libs/compiler-rt/compiler-rt-9999.ebuild
 1807241309 ./sys-libs/compiler-rt/compiler-rt-6.0.1.ebuild
 1806081109 ./sys-libs/compiler-rt/compiler-rt-5.0.2.ebuild
 1803231238 ./sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild
 1812201609 ./sys-libs/compiler-rt/compiler-rt-7.0.1.ebuild
+1901161809 ./sys-libs/compiler-rt/compiler-rt-8.0.9999.ebuild
 1811042139 ./sys-libs/compiler-rt/compiler-rt-7.0.9999.ebuild
 1702282250 ./sys-libs/libxcrypt/libxcrypt-2.4.ebuild
 1806232139 ./sys-libs/gwenhywfar/gwenhywfar-4.20.0.ebuild
@@ -1059,7 +1062,7 @@
 1812221509 ./sys-libs/binutils-libs/binutils-libs-2.30-r4.ebuild
 1801231609 ./sys-libs/binutils-libs/binutils-libs-2.25.1-r2.ebuild
 1801231609 ./sys-libs/binutils-libs/binutils-libs-2.28.1.ebuild
-1901160139 ./sys-libs/readline/readline-7.0_p5.ebuild
+1901161409 ./sys-libs/readline/readline-7.0_p5.ebuild
 1808310240 ./sys-libs/readline/readline-7.0_p3.ebuild
 1808310240 ./sys-libs/readline/readline-7.0_p3-r1.ebuild
 1801231609 ./sys-libs/readline/readline-5.2_p14.ebuild
@@ -1068,8 +1071,9 @@
 1808310240 ./sys-libs/readline/readline-6.3_p8-r3.ebuild
 1804032308 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
 1806081109 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.2.ebuild
+1901161809 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.9999.ebuild
 1812062239 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-7.0.9999.ebuild
-1812062239 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
+1901161809 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
 1812201609 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-7.0.1.ebuild
 1812062239 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild
 1801231609 ./sys-libs/ncurses/ncurses-5.9-r101.ebuild
@@ -1121,6 +1125,7 @@
 1711012203 ./sys-libs/pwdb/pwdb-0.62-r1.ebuild
 1812201609 ./sys-libs/libcxx/libcxx-7.0.1.ebuild
 1810050039 ./sys-libs/libcxx/libcxx-3.9.1.ebuild
+1901161809 ./sys-libs/libcxx/libcxx-8.0.9999.ebuild
 1810050039 ./sys-libs/libcxx/libcxx-9999.ebuild
 1810050039 ./sys-libs/libcxx/libcxx-7.0.9999.ebuild
 1801190110 ./sys-libs/libcxx/libcxx-3.7.1.ebuild
@@ -1139,6 +1144,7 @@
 1803052039 ./sys-libs/libsmbios/libsmbios-2.4.1.ebuild
 1705292145 ./sys-libs/cracklib/cracklib-2.9.6-r1.ebuild
 1808020009 ./sys-libs/libcxxabi/libcxxabi-7.0.9999.ebuild
+1901161809 ./sys-libs/libcxxabi/libcxxabi-8.0.9999.ebuild
 1707090225 ./sys-libs/libcxxabi/libcxxabi-3.9.1.ebuild
 1806072039 ./sys-libs/libcxxabi/libcxxabi-5.0.2.ebuild
 1812201609 ./sys-libs/libcxxabi/libcxxabi-7.0.1.ebuild
@@ -1166,6 +1172,7 @@
 1808310240 ./sys-libs/tevent/tevent-0.9.36.ebuild
 1808310240 ./sys-libs/tevent/tevent-0.9.31-r1.ebuild
 1811080239 ./sys-libs/tevent/tevent-0.9.37.ebuild
+1901161809 ./sys-libs/libomp/libomp-8.0.9999.ebuild
 1807241309 ./sys-libs/libomp/libomp-6.0.1.ebuild
 1803091109 ./sys-libs/libomp/libomp-9999.ebuild
 1812201609 ./sys-libs/libomp/libomp-7.0.1.ebuild
@@ -1617,7 +1624,7 @@
 1702282250 ./sci-libs/btf/btf-1.2.0.ebuild
 1702282250 ./sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild
 1808151109 ./sci-libs/gdal/gdal-2.3.0-r2.ebuild
-1901122339 ./sci-libs/gdal/gdal-2.3.1.ebuild
+1901162309 ./sci-libs/gdal/gdal-2.3.1.ebuild
 1808131439 ./sci-libs/keras-preprocessing/keras-preprocessing-1.0.2.ebuild
 1811172039 ./sci-libs/keras-preprocessing/keras-preprocessing-1.0.5.ebuild
 1809281339 ./sci-libs/keras-preprocessing/keras-preprocessing-1.0.3.ebuild
@@ -1738,8 +1745,7 @@
 1702282250 ./sci-libs/libccd/libccd-9999.ebuild
 1702282250 ./sci-libs/libccd/libccd-2.0.ebuild
 1702282250 ./sci-libs/starparse/starparse-1.0-r1.ebuild
-1901160139 ./sci-libs/indilib/indilib-1.7.5.ebuild
-1806071339 ./sci-libs/indilib/indilib-1.6.0.ebuild
+1901161909 ./sci-libs/indilib/indilib-1.7.5.ebuild
 1707291219 ./sci-libs/htslib/htslib-1.5.ebuild
 1810282339 ./sci-libs/htslib/htslib-1.9.ebuild
 1702282250 ./sci-libs/tamu_anova/tamu_anova-0.2.1.ebuild
@@ -1946,7 +1952,6 @@
 1807061009 ./dev-ruby/ruby-rsvg/ruby-rsvg-3.1.1.ebuild
 1805212239 ./dev-ruby/request_store/request_store-1.4.1.ebuild
 1708060921 ./dev-ruby/request_store/request_store-1.0.5.ebuild
-1803312138 ./dev-ruby/activejob/activejob-5.0.7.ebuild
 1812071039 ./dev-ruby/activejob/activejob-5.2.2.ebuild
 1811291039 ./dev-ruby/activejob/activejob-5.2.1.1.ebuild
 1808080939 ./dev-ruby/activejob/activejob-5.2.1.ebuild
@@ -1958,7 +1963,6 @@
 1811071039 ./dev-ruby/stringex/stringex-2.8.5.ebuild
 1803072038 ./dev-ruby/podcast/podcast-0.0.4-r2.ebuild
 1811231409 ./dev-ruby/rest-client/rest-client-2.0.2.ebuild
-1704210802 ./dev-ruby/rest-client/rest-client-1.8.0-r3.ebuild
 1712261039 ./dev-ruby/hoe/hoe-3.16.0.ebuild
 1812281439 ./dev-ruby/hoe/hoe-3.17.1.ebuild
 1802041408 ./dev-ruby/highline/highline-1.7.8.ebuild
@@ -2028,7 +2032,7 @@
 1901150909 ./dev-ruby/tdiff/tdiff-0.3.4.ebuild
 1804102338 ./dev-ruby/tdiff/tdiff-0.3.3-r1.ebuild
 1806252209 ./dev-ruby/celluloid-io/celluloid-io-0.17.3.ebuild
-1802201008 ./dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
+1901161039 ./dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
 1808072139 ./dev-ruby/annoy/annoy-0.5.6-r1.ebuild
 1809172239 ./dev-ruby/colorator/colorator-1.1.0.ebuild
 1806270839 ./dev-ruby/async_sinatra/async_sinatra-1.3.0.ebuild
@@ -2122,11 +2126,9 @@
 1805051208 ./dev-ruby/celluloid-essentials/celluloid-essentials-0.20.5.ebuild
 1802022038 ./dev-ruby/color/color-1.8.ebuild
 1901091139 ./dev-ruby/ruby_dep/ruby_dep-1.5.0.ebuild
-1804102338 ./dev-ruby/bluecloth/bluecloth-2.2.0-r3.ebuild
+1901161039 ./dev-ruby/bluecloth/bluecloth-2.2.0-r3.ebuild
 1807071209 ./dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.1.1.ebuild
 1807061009 ./dev-ruby/ruby-atk/ruby-atk-3.1.1.ebuild
-1802041408 ./dev-ruby/hike/hike-2.1.2.ebuild
-1802041408 ./dev-ruby/hike/hike-1.2.3-r1.ebuild
 1809091739 ./dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild
 1812281039 ./dev-ruby/paramesan/paramesan-0.1.1.ebuild
 1812281039 ./dev-ruby/rex-exploitation/rex-exploitation-0.1.20.ebuild
@@ -2301,7 +2303,7 @@
 1809030839 ./dev-ruby/web-console/web-console-3.7.0.ebuild
 1803021308 ./dev-ruby/web-console/web-console-2.3.0.ebuild
 1804270909 ./dev-ruby/tilt/tilt-2.0.8.ebuild
-1812141109 ./dev-ruby/tilt/tilt-2.0.9.ebuild
+1901161039 ./dev-ruby/tilt/tilt-2.0.9.ebuild
 1710010344 ./dev-ruby/tilt/tilt-2.0.5.ebuild
 1806301109 ./dev-ruby/aws-sigv4/aws-sigv4-1.0.3.ebuild
 1709011014 ./dev-ruby/aws-sigv4/aws-sigv4-1.0.2.ebuild
@@ -2314,7 +2316,6 @@
 1802022038 ./dev-ruby/countdownlatch/countdownlatch-1.0.0-r1.ebuild
 1812071039 ./dev-ruby/actionmailer/actionmailer-5.2.2.ebuild
 1812011139 ./dev-ruby/actionmailer/actionmailer-4.2.11.ebuild
-1803312138 ./dev-ruby/actionmailer/actionmailer-5.0.7.ebuild
 1811291039 ./dev-ruby/actionmailer/actionmailer-5.2.1.1.ebuild
 1811301039 ./dev-ruby/actionmailer/actionmailer-5.1.6.1.ebuild
 1808080939 ./dev-ruby/actionmailer/actionmailer-5.2.1.ebuild
@@ -2331,7 +2332,6 @@
 1812281039 ./dev-ruby/rex-arch/rex-arch-0.1.13.ebuild
 1805191109 ./dev-ruby/actionpack/actionpack-5.2.0.ebuild
 1812071039 ./dev-ruby/actionpack/actionpack-5.2.2.ebuild
-1803312138 ./dev-ruby/actionpack/actionpack-5.0.7.ebuild
 1812011139 ./dev-ruby/actionpack/actionpack-4.2.11.ebuild
 1812021039 ./dev-ruby/actionpack/actionpack-5.1.6.1.ebuild
 1808080939 ./dev-ruby/actionpack/actionpack-5.2.1.ebuild
@@ -2347,7 +2347,6 @@
 1812071039 ./dev-ruby/activemodel/activemodel-5.2.2.ebuild
 1808080939 ./dev-ruby/activemodel/activemodel-5.2.1.ebuild
 1812021039 ./dev-ruby/activemodel/activemodel-5.1.6.1.ebuild
-1803312138 ./dev-ruby/activemodel/activemodel-5.0.7.ebuild
 1805191109 ./dev-ruby/activemodel/activemodel-5.2.0.ebuild
 1707170920 ./dev-ruby/dep_selector/dep_selector-1.0.5.ebuild
 1808060009 ./dev-ruby/bogus/bogus-0.1.6.ebuild
@@ -2421,7 +2420,6 @@
 1812011139 ./dev-ruby/activerecord/activerecord-4.2.11.ebuild
 1805191109 ./dev-ruby/activerecord/activerecord-5.2.0.ebuild
 1811291039 ./dev-ruby/activerecord/activerecord-5.2.1.1.ebuild
-1803312138 ./dev-ruby/activerecord/activerecord-5.0.7.ebuild
 1810300909 ./dev-ruby/asciidoctor/asciidoctor-1.5.8.ebuild
 1808310909 ./dev-ruby/asciidoctor/asciidoctor-1.5.7.1.ebuild
 1812131139 ./dev-ruby/sparklines/sparklines-0.5.2-r6.ebuild
@@ -2513,14 +2511,12 @@
 1812300709 ./dev-ruby/xmlrpc/xmlrpc-0.3.0.ebuild
 1811291039 ./dev-ruby/railties/railties-5.2.1.1.ebuild
 1812021039 ./dev-ruby/railties/railties-5.1.6.1.ebuild
-1803312138 ./dev-ruby/railties/railties-5.0.7.ebuild
 1805191109 ./dev-ruby/railties/railties-5.2.0.ebuild
 1808080939 ./dev-ruby/railties/railties-5.2.1.ebuild
 1812071039 ./dev-ruby/railties/railties-5.2.2.ebuild
 1812011139 ./dev-ruby/railties/railties-4.2.11.ebuild
 1812311009 ./dev-ruby/net-ssh/net-ssh-5.1.0.ebuild
 1811262239 ./dev-ruby/net-ssh/net-ssh-4.2.0.ebuild
-1702282250 ./dev-ruby/net-ssh/net-ssh-2.10.0.ebuild
 1811262239 ./dev-ruby/net-ssh/net-ssh-5.0.2.ebuild
 1708250851 ./dev-ruby/rack-ssl/rack-ssl-1.3.4.ebuild
 1708250851 ./dev-ruby/rack-ssl/rack-ssl-1.4.1.ebuild
@@ -2540,7 +2536,7 @@
 1803081008 ./dev-ruby/aws-sdk-core/aws-sdk-core-2.10.134.ebuild
 1807010909 ./dev-ruby/aws-sdk-core/aws-sdk-core-2.11.79.ebuild
 1712091039 ./dev-ruby/aws-sdk-core/aws-sdk-core-2.10.100.ebuild
-1811071039 ./dev-ruby/timers/timers-4.2.0.ebuild
+1901161039 ./dev-ruby/timers/timers-4.2.0.ebuild
 1805010839 ./dev-ruby/timers/timers-4.1.2.ebuild
 1804210808 ./dev-ruby/sexp_processor/sexp_processor-4.11.0.ebuild
 1802241038 ./dev-ruby/sexp_processor/sexp_processor-4.10.1.ebuild
@@ -2689,6 +2685,7 @@
 1808251109 ./dev-ruby/httparty/httparty-0.16.2.ebuild
 1804190738 ./dev-ruby/mocha/mocha-0.14.0.ebuild
 1801222238 ./dev-ruby/mocha/mocha-0.10.5-r2.ebuild
+1901161039 ./dev-ruby/mocha/mocha-1.8.0.ebuild
 1901091139 ./dev-ruby/mocha/mocha-1.7.0.ebuild
 1807310109 ./dev-ruby/mocha/mocha-1.4.0.ebuild
 1806070309 ./dev-ruby/ruby-termios/ruby-termios-1.0.2-r1.ebuild
@@ -2781,13 +2778,11 @@
 1812262109 ./dev-ruby/pkg-config/pkg-config-1.3.2.ebuild
 1805010809 ./dev-ruby/pkg-config/pkg-config-1.3.1.ebuild
 1812311009 ./dev-ruby/uconv/uconv-0.6.1-r2.ebuild
-1802022008 ./dev-ruby/classifier/classifier-1.3.4.ebuild
 1805230809 ./dev-ruby/hiera-eyaml-plaintext/hiera-eyaml-plaintext-0.6-r1.ebuild
 1811291039 ./dev-ruby/rails/rails-5.2.1.1.ebuild
 1811301039 ./dev-ruby/rails/rails-5.1.6.1.ebuild
 1808080939 ./dev-ruby/rails/rails-5.2.1.ebuild
 1901032239 ./dev-ruby/rails/rails-5.2.0.ebuild
-1803312138 ./dev-ruby/rails/rails-5.0.7.ebuild
 1901032239 ./dev-ruby/rails/rails-5.2.2.ebuild
 1812011139 ./dev-ruby/rails/rails-4.2.11.ebuild
 1801211008 ./dev-ruby/diff-lcs/diff-lcs-1.2.5-r1.ebuild
@@ -2834,7 +2829,6 @@
 1812311009 ./dev-ruby/wirble/wirble-0.1.3-r4.ebuild
 1812272109 ./dev-ruby/activesupport/activesupport-4.2.11.ebuild
 1807161309 ./dev-ruby/activesupport/activesupport-5.2.0.ebuild
-1807152209 ./dev-ruby/activesupport/activesupport-5.0.7.ebuild
 1812071039 ./dev-ruby/activesupport/activesupport-5.2.2.ebuild
 1811291039 ./dev-ruby/activesupport/activesupport-5.2.1.1.ebuild
 1808080939 ./dev-ruby/activesupport/activesupport-5.2.1.ebuild
@@ -2891,7 +2885,6 @@
 1804291308 ./dev-ruby/sanitize/sanitize-4.6.4.ebuild
 1706190819 ./dev-ruby/termcolor/termcolor-1.2.2.ebuild
 1812071039 ./dev-ruby/actionview/actionview-5.2.2.ebuild
-1803312138 ./dev-ruby/actionview/actionview-5.0.7.ebuild
 1812011139 ./dev-ruby/actionview/actionview-4.2.11.ebuild
 1811291039 ./dev-ruby/actionview/actionview-5.2.1.1.ebuild
 1812021039 ./dev-ruby/actionview/actionview-5.1.6.1.ebuild
@@ -2927,7 +2920,7 @@
 1809110839 ./dev-ruby/nagios_analyzer/nagios_analyzer-0.0.5-r1.ebuild
 1802070908 ./dev-ruby/minitest-hooks/minitest-hooks-1.4.2.ebuild
 1901101139 ./dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
-1806301309 ./dev-ruby/pusher-client/pusher-client-0.6.2.ebuild
+1901161039 ./dev-ruby/pusher-client/pusher-client-0.6.2.ebuild
 1801211008 ./dev-ruby/riel/riel-1.2.0-r2.ebuild
 1802041408 ./dev-ruby/hitimes/hitimes-1.2.6.ebuild
 1901150909 ./dev-ruby/hitimes/hitimes-1.3.0.ebuild
@@ -3052,7 +3045,7 @@
 1806230909 ./dev-ruby/ruby-progressbar/ruby-progressbar-1.4.2-r1.ebuild
 1805212239 ./dev-ruby/ruby-progressbar/ruby-progressbar-1.9.0.ebuild
 1804270909 ./dev-ruby/tomlrb/tomlrb-1.2.6.ebuild
-1812220909 ./dev-ruby/tomlrb/tomlrb-1.2.8.ebuild
+1901161039 ./dev-ruby/tomlrb/tomlrb-1.2.8.ebuild
 1801021010 ./dev-ruby/curses/curses-1.2.4.ebuild
 1901111039 ./dev-ruby/curses/curses-1.2.7.ebuild
 1901091239 ./dev-ruby/curses/curses-1.2.6.ebuild
@@ -3070,7 +3063,6 @@
 1805191109 ./dev-ruby/actioncable/actioncable-5.2.0.ebuild
 1812071039 ./dev-ruby/actioncable/actioncable-5.2.2.ebuild
 1811291039 ./dev-ruby/actioncable/actioncable-5.2.1.1.ebuild
-1803312138 ./dev-ruby/actioncable/actioncable-5.0.7.ebuild
 1805260809 ./dev-ruby/jwt/jwt-2.1.0.ebuild
 1807310809 ./dev-ruby/jwt/jwt-1.5.6.ebuild
 1807201739 ./dev-ruby/mecab-ruby/mecab-ruby-0.996-r1.ebuild
@@ -3106,7 +3098,7 @@
 1804291308 ./dev-ruby/rex-mime/rex-mime-0.1.5.ebuild
 1806280139 ./dev-ruby/http-cookie/http-cookie-1.0.3.ebuild
 1804250838 ./dev-ruby/ruby-oembed/ruby-oembed-0.12.0.ebuild
-1805070808 ./dev-ruby/launchy/launchy-2.4.3-r2.ebuild
+1901161039 ./dev-ruby/launchy/launchy-2.4.3-r2.ebuild
 1711191419 ./media-video/projectx/projectx-0.91.0.10-r1.ebuild
 1702282250 ./media-video/projectx/projectx-0.91.0.10.ebuild
 1702282250 ./media-video/atomicparsley/atomicparsley-0.9.0.ebuild
@@ -3354,6 +3346,7 @@
 1805012209 ./media-video/mpglen/mpglen-0.1.ebuild
 1805012209 ./media-video/tivodecode/tivodecode-0.2_pre4.ebuild
 1812221609 ./media-video/subtitlecomposer/subtitlecomposer-0.6.6-r1.ebuild
+1901161139 ./media-video/kaffeine/kaffeine-2.0.16.2.ebuild
 1807091809 ./media-video/kaffeine/kaffeine-2.0.15.ebuild
 1806091739 ./media-video/gxine/gxine-0.5.908-r1.ebuild
 1806091739 ./media-video/gxine/gxine-0.5.907-r1.ebuild
@@ -3781,6 +3774,7 @@
 1801011405 ./sys-devel/kgcc64/kgcc64-4.6.4.ebuild
 1807270039 ./sys-devel/kgcc64/kgcc64-8.2.0.ebuild
 1801011405 ./sys-devel/kgcc64/kgcc64-4.1.2.ebuild
+1901161809 ./sys-devel/llvmgold/llvmgold-9.ebuild
 1804300139 ./sys-devel/llvmgold/llvmgold-5.ebuild
 1804211508 ./sys-devel/llvmgold/llvmgold-4.ebuild
 1808020009 ./sys-devel/llvmgold/llvmgold-8.ebuild
@@ -3794,7 +3788,7 @@
 1801231609 ./sys-devel/gettext/gettext-0.19.8.1.ebuild
 1803140308 ./sys-devel/automake/automake-1.16-r2.ebuild
 1803290639 ./sys-devel/automake/automake-1.11.6-r3.ebuild
-1812271139 ./sys-devel/automake/automake-1.16.1-r1.ebuild
+1901160909 ./sys-devel/automake/automake-1.16.1-r1.ebuild
 1801231609 ./sys-devel/automake/automake-1.7.9-r3.ebuild
 1803290639 ./sys-devel/automake/automake-1.13.4-r2.ebuild
 1803140308 ./sys-devel/automake/automake-9999.ebuild
@@ -3810,7 +3804,8 @@
 1812201609 ./sys-devel/clang-runtime/clang-runtime-7.0.1.ebuild
 1806081109 ./sys-devel/clang-runtime/clang-runtime-5.0.2.ebuild
 1811042139 ./sys-devel/clang-runtime/clang-runtime-7.0.9999.ebuild
-1808020009 ./sys-devel/clang-runtime/clang-runtime-9999.ebuild
+1901161809 ./sys-devel/clang-runtime/clang-runtime-9999.ebuild
+1901161809 ./sys-devel/clang-runtime/clang-runtime-8.0.9999.ebuild
 1804032308 ./sys-devel/clang-runtime/clang-runtime-4.0.1-r1.ebuild
 1712150139 ./sys-devel/clang-runtime/clang-runtime-4.0.1.ebuild
 1807241309 ./sys-devel/clang-runtime/clang-runtime-6.0.1.ebuild
@@ -3826,6 +3821,7 @@
 1804211508 ./sys-devel/llvm-common/llvm-common-4.0.1.ebuild
 1807220509 ./sys-devel/llvm-common/llvm-common-5.0.2.ebuild
 1808020009 ./sys-devel/llvm-common/llvm-common-7.0.9999.ebuild
+1901161809 ./sys-devel/llvm-common/llvm-common-8.0.9999.ebuild
 1812201609 ./sys-devel/llvm-common/llvm-common-7.0.1.ebuild
 1711281241 ./sys-devel/llvm-common/llvm-common-9999.ebuild
 1807231239 ./sys-devel/llvm-common/llvm-common-6.0.1.ebuild
@@ -3928,9 +3924,10 @@
 1707090224 ./sys-devel/clang/clang-3.4.2-r100.ebuild
 1812201809 ./sys-devel/clang/clang-6.0.1.ebuild
 1812201809 ./sys-devel/clang/clang-7.0.9999.ebuild
-1901092339 ./sys-devel/clang/clang-9999.ebuild
+1901161809 ./sys-devel/clang/clang-9999.ebuild
 1804111938 ./sys-devel/clang/clang-3.9.1-r100.ebuild
 1807221139 ./sys-devel/clang/clang-4.0.1.ebuild
+1901161809 ./sys-devel/clang/clang-8.0.9999.ebuild
 1709260218 ./sys-devel/binutils-hppa64/binutils-hppa64-2.29.1.ebuild
 1706071733 ./sys-devel/binutils-hppa64/binutils-hppa64-2.28.ebuild
 1708151252 ./sys-devel/binutils-hppa64/binutils-hppa64-2.28.1.ebuild
@@ -3970,9 +3967,10 @@
 1812221409 ./sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild
 1811011309 ./sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r2.ebuild
 1707090224 ./sys-devel/llvm/llvm-3.5.2-r100.ebuild
+1901161809 ./sys-devel/llvm/llvm-8.0.9999.ebuild
 1804201109 ./sys-devel/llvm/llvm-3.9.1-r1.ebuild
 1812301509 ./sys-devel/llvm/llvm-6.0.1-r2.ebuild
-1809271009 ./sys-devel/llvm/llvm-9999.ebuild
+1901161809 ./sys-devel/llvm/llvm-9999.ebuild
 1812201609 ./sys-devel/llvm/llvm-7.0.1.ebuild
 1801082039 ./sys-devel/llvm/llvm-3.4.2-r100.ebuild
 1812142039 ./sys-devel/llvm/llvm-5.0.2.ebuild
@@ -4009,6 +4007,7 @@
 1702282250 ./sys-devel/pmake/pmake-1.111.3.1.ebuild
 1706211326 ./sys-devel/pmake/pmake-1.111.3.3.ebuild
 1807241309 ./sys-devel/clang-common/clang-common-6.0.1.ebuild
+1901161809 ./sys-devel/clang-common/clang-common-8.0.9999.ebuild
 1804042108 ./sys-devel/clang-common/clang-common-9999.ebuild
 1808020009 ./sys-devel/clang-common/clang-common-7.0.9999.ebuild
 1812201609 ./sys-devel/clang-common/clang-common-7.0.1.ebuild
@@ -4022,6 +4021,7 @@
 1805051838 ./sys-devel/lld/lld-5.0.2.ebuild
 1812201609 ./sys-devel/lld/lld-7.0.1.ebuild
 1810021139 ./sys-devel/lld/lld-6.0.1.ebuild
+1901161809 ./sys-devel/lld/lld-8.0.9999.ebuild
 1803090139 ./sys-devel/lld/lld-9999.ebuild
 1711170052 ./sys-devel/lld/lld-4.0.1.ebuild
 1808020009 ./sys-devel/lld/lld-7.0.9999.ebuild
@@ -4412,6 +4412,7 @@
 1809261509 ./app-crypt/keybase/keybase-2.6.0.ebuild
 1812181709 ./app-crypt/keybase/keybase-2.11.0.ebuild
 1810082339 ./app-crypt/keybase/keybase-2.7.3.ebuild
+1901161909 ./app-crypt/keybase/keybase-2.13.1.ebuild
 1806180739 ./app-crypt/keybase/keybase-9999.ebuild
 1811241839 ./app-crypt/keybase/keybase-2.10.1.ebuild
 1810311339 ./app-crypt/keybase/keybase-2.8.0.ebuild
@@ -5138,7 +5139,7 @@
 1705161100 ./net-libs/libgfbgraph/libgfbgraph-0.2.3-r1.ebuild
 1812281339 ./net-libs/libssh/libssh-9999.ebuild
 1812281339 ./net-libs/libssh/libssh-0.8.6.ebuild
-1812151609 ./net-libs/libssh/libssh-0.8.5.ebuild
+1901161039 ./net-libs/libssh/libssh-0.8.5.ebuild
 1810312039 ./net-libs/libssh/libssh-0.8.4.ebuild
 1812230439 ./net-libs/signond/signond-8.59-r1.ebuild
 1805012209 ./net-libs/vanessa-mcast/vanessa-mcast-1.0.0.ebuild
@@ -5167,13 +5168,9 @@
 1705221624 ./net-libs/libetpan/libetpan-1.8.ebuild
 1812231509 ./net-libs/libetpan/libetpan-1.9.2.ebuild
 1809191609 ./net-libs/libetpan/libetpan-1.9.1.ebuild
-1811290039 ./net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild
+1901160909 ./net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild
 1811122239 ./net-libs/libmicrohttpd/libmicrohttpd-0.9.60.ebuild
-1711281840 ./net-libs/libmicrohttpd/libmicrohttpd-0.9.57.ebuild
-1706101806 ./net-libs/libmicrohttpd/libmicrohttpd-0.9.52.ebuild
 1812091639 ./net-libs/libmicrohttpd/libmicrohttpd-0.9.62.ebuild
-1712121239 ./net-libs/libmicrohttpd/libmicrohttpd-0.9.58.ebuild
-1801222139 ./net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild
 1811301739 ./net-libs/libmicrohttpd/libmicrohttpd-0.9.61.ebuild
 1805061738 ./net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
 1805061738 ./net-libs/libnetfilter_queue/libnetfilter_queue-1.0.2.ebuild
@@ -5770,6 +5767,7 @@
 1812230739 ./media-plugins/kodi-pvr-hts/kodi-pvr-hts-4.4.6.ebuild
 1812032239 ./media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
 1707301513 ./media-plugins/kodi-pvr-hts/kodi-pvr-hts-3.4.24.ebuild
+1901161839 ./media-plugins/kodi-pvr-hts/kodi-pvr-hts-4.4.11.ebuild
 1901090809 ./media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.3.ebuild
 1807310409 ./media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.14.1.ebuild
 1808311609 ./media-plugins/vdr-mailbox/vdr-mailbox-0.7.0-r1.ebuild
@@ -5887,6 +5885,7 @@
 1812230739 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.8.ebuild
 1812230739 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
 1707301512 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-2.4.13.ebuild
+1901162309 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.12.ebuild
 1707301512 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-2.4.11.ebuild
 1901090039 ./media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-3.3.11.ebuild
 1808311609 ./media-plugins/vdr-infosatepg/vdr-infosatepg-0.0.12.ebuild
@@ -7585,7 +7584,7 @@
 1806221309 ./dev-libs/zziplib/zziplib-0.13.62-r2.ebuild
 1901031339 ./dev-libs/zziplib/zziplib-0.13.69.ebuild
 1712031839 ./dev-libs/icu/icu-58.2-r1.ebuild
-1901082309 ./dev-libs/icu/icu-63.1-r1.ebuild
+1901161809 ./dev-libs/icu/icu-63.1-r1.ebuild
 1806142239 ./dev-libs/icu/icu-60.2.ebuild
 1812111639 ./dev-libs/folks/folks-0.11.4-r1.ebuild
 1805151608 ./dev-libs/folks/folks-0.11.4.ebuild
@@ -7853,7 +7852,7 @@
 1812310139 ./dev-libs/protobuf/protobuf-3.6.1.ebuild
 1812112109 ./dev-libs/protobuf/protobuf-3.6.1.3.ebuild
 1806272339 ./dev-libs/Ice/Ice-3.6.3-r1.ebuild
-1812292239 ./dev-libs/Ice/Ice-3.6.4.ebuild
+1901161909 ./dev-libs/Ice/Ice-3.6.4.ebuild
 1807181039 ./dev-libs/libpreludedb/libpreludedb-4.1.0.ebuild
 1702282250 ./dev-libs/libpreludedb/libpreludedb-3.0.0.ebuild
 1709081119 ./dev-libs/libpreludedb/libpreludedb-4.0.0.ebuild
@@ -8101,7 +8100,7 @@
 1803201308 ./dev-libs/beignet/beignet-1.3.2.ebuild
 1712101340 ./dev-libs/beignet/beignet-9999.ebuild
 1707301215 ./dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild
-1901160139 ./dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
+1901161839 ./dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
 1810091309 ./dev-libs/newt/newt-0.52.20.ebuild
 1802151738 ./dev-libs/newt/newt-0.52.15.ebuild
 1802151738 ./dev-libs/newt/newt-0.52.18.ebuild
@@ -9401,7 +9400,7 @@
 1808310240 ./sys-kernel/linux-headers/linux-headers-4.17.ebuild
 1810131309 ./sys-kernel/linux-headers/linux-headers-4.18.ebuild
 1810040039 ./sys-kernel/linux-headers/linux-headers-4.16-r2.ebuild
-1901080039 ./sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
+1901161809 ./sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
 1808310240 ./sys-kernel/linux-headers/linux-headers-3.18.ebuild
 1808310240 ./sys-kernel/linux-headers/linux-headers-4.13.ebuild
 1808310240 ./sys-kernel/linux-headers/linux-headers-4.9.ebuild
@@ -9657,7 +9656,7 @@
 1803291008 ./media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
 1712070139 ./media-gfx/gphoto2/gphoto2-2.5.14.ebuild
 1812081909 ./media-gfx/gphoto2/gphoto2-2.5.20.ebuild
-1811241709 ./media-gfx/gphoto2/gphoto2-2.5.15.ebuild
+1901161039 ./media-gfx/gphoto2/gphoto2-2.5.15.ebuild
 1702282250 ./media-gfx/fondu/fondu-20060102-r1.ebuild
 1804220108 ./media-gfx/uniconvertor/uniconvertor-2.0_pre379-r1.ebuild
 1805121208 ./media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
@@ -9903,7 +9902,7 @@
 1812291509 ./media-gfx/libimagequant/libimagequant-2.11.7.ebuild
 1901160639 ./media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild
 1901160639 ./media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
-1901110409 ./media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
+1901162309 ./media-gfx/inkscape/inkscape-0.92.3-r1.ebuild
 1709261623 ./media-gfx/evoluspencil/evoluspencil-2.0.5.ebuild
 1702282250 ./media-gfx/videorbits/videorbits-2.201.ebuild
 1809152139 ./media-gfx/videorbits/videorbits-2.205.ebuild
@@ -9954,7 +9953,7 @@
 1702282250 ./media-gfx/grub-splashes/grub-splashes-20091109.ebuild
 1805290208 ./media-gfx/jp2a/jp2a-1.0.6-r1.ebuild
 1812291639 ./media-gfx/luminance-hdr/luminance-hdr-2.5.1-r1.ebuild
-1812312039 ./media-gfx/photoqt/photoqt-1.7.1.ebuild
+1901161839 ./media-gfx/photoqt/photoqt-1.7.1.ebuild
 1812300109 ./media-gfx/photoqt/photoqt-1.5.1-r1.ebuild
 1707111139 ./media-gfx/argyllcms/argyllcms-1.9.2.ebuild
 1807241639 ./media-gfx/argyllcms/argyllcms-2.0.1.ebuild
@@ -10461,7 +10460,7 @@
 1702282250 ./dev-vcs/easygit/easygit-1.6.5.5.ebuild
 1702282250 ./dev-vcs/git-deploy/git-deploy-6.0.1_p20131024.ebuild
 1702282250 ./dev-vcs/svnmailer/svnmailer-1.0.9-r1.ebuild
-1901160139 ./dev-vcs/subversion/subversion-1.10.3.ebuild
+1901161839 ./dev-vcs/subversion/subversion-1.10.3.ebuild
 1808310239 ./dev-vcs/subversion/subversion-1.9.7-r1.ebuild
 1810311539 ./dev-vcs/subversion/subversion-1.11.0.ebuild
 1901111309 ./dev-vcs/subversion/subversion-1.11.1.ebuild
@@ -11063,8 +11062,7 @@
 1802092008 ./app-editors/vis/vis-9999.ebuild
 1803270108 ./app-editors/vis/vis-0.5.ebuild
 1712101740 ./app-editors/levee/levee-3.5a.ebuild
-1901090439 ./app-editors/kile/kile-2.9.92-r1.ebuild
-1806070239 ./app-editors/kile/kile-2.9.92.ebuild
+1901161839 ./app-editors/kile/kile-2.9.92-r1.ebuild
 1806060538 ./app-editors/vim-core/vim-core-8.1.0034.ebuild
 1806032138 ./app-editors/vim-core/vim-core-8.0.1298.ebuild
 1804120908 ./app-editors/vim-core/vim-core-8.0.1699.ebuild
@@ -11370,7 +11368,7 @@
 1808071039 ./net-firewall/psad/psad-2.4.6.ebuild
 1805061738 ./net-firewall/psad/psad-2.4.5.ebuild
 1812012209 ./kde-plasma/kinfocenter/kinfocenter-5.14.3.ebuild
-1901081639 ./kde-plasma/kinfocenter/kinfocenter-5.14.5.ebuild
+1901161139 ./kde-plasma/kinfocenter/kinfocenter-5.14.5-r1.ebuild
 1812012209 ./kde-plasma/plasma-vault/plasma-vault-5.14.3.ebuild
 1901081639 ./kde-plasma/plasma-vault/plasma-vault-5.14.5.ebuild
 1901081639 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.14.5.ebuild
@@ -11529,7 +11527,7 @@
 1702282250 ./dev-lang/rebol-bin/rebol-bin-3_pre111.ebuild
 1805010009 ./dev-lang/swi-prolog/swi-prolog-7.6.3.ebuild
 1809021739 ./dev-lang/swi-prolog/swi-prolog-7.6.4.ebuild
-1901141709 ./dev-lang/swi-prolog/swi-prolog-8.0.0.ebuild
+1901161809 ./dev-lang/swi-prolog/swi-prolog-8.0.0.ebuild
 1901141139 ./dev-lang/swi-prolog/swi-prolog-7.7.25.ebuild
 1901111739 ./dev-lang/swi-prolog/swi-prolog-7.7.24.ebuild
 1805010009 ./dev-lang/swi-prolog/swi-prolog-7.4.2.ebuild
@@ -12189,6 +12187,7 @@
 1804262239 ./dev-python/babelfish/babelfish-0.5.5-r1.ebuild
 1804262239 ./dev-python/babelfish/babelfish-9999.ebuild
 1806241539 ./dev-python/oslo-service/oslo-service-1.29.0.ebuild
+1901161839 ./dev-python/oslo-service/oslo-service-1.31.7.ebuild
 1809290009 ./dev-python/oslo-service/oslo-service-1.31.5.ebuild
 1811020239 ./dev-python/pytest-datafiles/pytest-datafiles-2.0.ebuild
 1804192239 ./dev-python/robotframework-selenium2library/robotframework-selenium2library-1.8.0.ebuild
@@ -12296,6 +12295,7 @@
 1702282250 ./dev-python/SchemaObject/SchemaObject-0.5.7.ebuild
 1805191109 ./dev-python/SchemaObject/SchemaObject-0.5.8.ebuild
 1707242203 ./dev-python/clang-python/clang-python-4.0.1.ebuild
+1901161809 ./dev-python/clang-python/clang-python-8.0.9999.ebuild
 1806061138 ./dev-python/clang-python/clang-python-5.0.2.ebuild
 1811101409 ./dev-python/clang-python/clang-python-9999.ebuild
 1812201609 ./dev-python/clang-python/clang-python-7.0.1.ebuild
@@ -12747,6 +12747,7 @@
 1702282250 ./dev-python/sh/sh-1.12.9.ebuild
 1709300232 ./dev-python/pymysql/pymysql-0.7.11.ebuild
 1802230038 ./dev-python/pymysql/pymysql-0.8.0.ebuild
+1901161639 ./dev-python/pymysql/pymysql-0.9.3.ebuild
 1806092039 ./dev-python/pymysql/pymysql-0.8.1.ebuild
 1809112239 ./dev-python/pymysql/pymysql-0.9.2.ebuild
 1807282039 ./dev-python/pyenchant/pyenchant-2.0.0.ebuild
@@ -12981,6 +12982,7 @@
 1802221938 ./dev-python/lit/lit-3.9.0.ebuild
 1807241309 ./dev-python/lit/lit-6.0.1.ebuild
 1807220509 ./dev-python/lit/lit-5.0.2.ebuild
+1901161809 ./dev-python/lit/lit-8.0.9999.ebuild
 1808281909 ./dev-python/lit/lit-9999.ebuild
 1812201609 ./dev-python/lit/lit-7.0.1.ebuild
 1808281909 ./dev-python/lit/lit-7.0.9999.ebuild
@@ -14170,6 +14172,7 @@
 1801280738 ./dev-python/os-brick/os-brick-1.15.5.ebuild
 1809290009 ./dev-python/os-brick/os-brick-2.5.3.ebuild
 1808151939 ./dev-python/os-brick/os-brick-2.3.3.ebuild
+1901161839 ./dev-python/os-brick/os-brick-2.5.4.ebuild
 1806241539 ./dev-python/os-brick/os-brick-2.3.1.ebuild
 1711292210 ./dev-python/anyqt/anyqt-0.0.8-r1.ebuild
 1704281825 ./dev-python/pygpgme/pygpgme-0.3-r1.ebuild
@@ -14374,6 +14377,7 @@
 1812082109 ./dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
 1804262239 ./dev-python/pytest-shutil/pytest-shutil-1.2.4.ebuild
 1806241839 ./dev-python/oslo-cache/oslo-cache-1.28.0.ebuild
+1901161839 ./dev-python/oslo-cache/oslo-cache-1.30.1.ebuild
 1804262239 ./dev-python/basemap/basemap-1.0.7-r1.ebuild
 1804262239 ./dev-python/basemap/basemap-1.0.7-r2.ebuild
 1808310239 ./dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
@@ -15088,6 +15092,7 @@
 1706270548 ./dev-python/astroplan/astroplan-0.2.1.ebuild
 1710181835 ./dev-python/sphinxcontrib-documentedlist/sphinxcontrib-documentedlist-0.6.ebuild
 1709300232 ./dev-python/ovsdbapp/ovsdbapp-0.4.0.ebuild
+1901161839 ./dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild
 1806241939 ./dev-python/ovsdbapp/ovsdbapp-0.10.0.ebuild
 1810141639 ./dev-python/whoosh/whoosh-2.7.4.ebuild
 1804192239 ./dev-python/whoosh/whoosh-2.6.0.ebuild
@@ -15524,6 +15529,7 @@
 1812201609 ./dev-ml/llvm-ocaml/llvm-ocaml-7.0.1.ebuild
 1808020009 ./dev-ml/llvm-ocaml/llvm-ocaml-7.0.9999.ebuild
 1805051838 ./dev-ml/llvm-ocaml/llvm-ocaml-5.0.2.ebuild
+1901161809 ./dev-ml/llvm-ocaml/llvm-ocaml-8.0.9999.ebuild
 1706221447 ./dev-ml/lablgl/lablgl-1.05-r1.ebuild
 1709221131 ./dev-ml/lambda-term/lambda-term-1.11.ebuild
 1708061530 ./dev-ml/reason-parser/reason-parser-2.0.0.ebuild
@@ -15826,7 +15832,7 @@
 1801110039 ./app-shells/peco/peco-0.5.2.ebuild
 1707301755 ./app-shells/peco/peco-0.5.1.ebuild
 1801231609 ./app-shells/bash/bash-4.0_p44.ebuild
-1901160139 ./app-shells/bash/bash-4.4_p23-r1.ebuild
+1901161409 ./app-shells/bash/bash-4.4_p23-r1.ebuild
 1801231609 ./app-shells/bash/bash-3.2_p57.ebuild
 1801231609 ./app-shells/bash/bash-3.1_p23.ebuild
 1801231609 ./app-shells/bash/bash-4.2_p53.ebuild
@@ -15834,7 +15840,6 @@
 1801231609 ./app-shells/bash/bash-3.0_p22.ebuild
 1901131439 ./app-shells/bash/bash-5.0.ebuild
 1801231609 ./app-shells/bash/bash-2.05b_p13.ebuild
-1812281339 ./app-shells/bash/bash-4.4_p23.ebuild
 1809191439 ./app-shells/bash/bash-4.4_p12.ebuild
 1801231609 ./app-shells/bash/bash-4.1_p17.ebuild
 1805212238 ./app-shells/rust-zshcomp/rust-zshcomp-1_beta20150411.ebuild
@@ -15877,8 +15882,8 @@
 1702282250 ./app-shells/zsh-completions/zsh-completions-9999.ebuild
 1702282250 ./app-shells/esh/esh-0.8.5-r2.ebuild
 1811140109 ./app-shells/hstr/hstr-2.0.ebuild
-1812010539 ./app-shells/fzy/fzy-1.0.ebuild
-1812010539 ./app-shells/fzy/fzy-9999.ebuild
+1901161139 ./app-shells/fzy/fzy-1.0.ebuild
+1901161139 ./app-shells/fzy/fzy-9999.ebuild
 1702282250 ./app-shells/mksh/mksh-52.ebuild
 1702282250 ./app-shells/mksh/mksh-9999.ebuild
 1812121939 ./app-shells/mksh/mksh-56c.ebuild
@@ -15904,7 +15909,7 @@
 1712261510 ./app-shells/dsh/dsh-0.25.10-r1.ebuild
 1702282250 ./app-shells/heirloom-sh/heirloom-sh-050706-r1.ebuild
 1710211951 ./app-shells/scsh/scsh-0.6.7-r2.ebuild
-1810190539 ./app-shells/loksh/loksh-6.4.ebuild
+1901161139 ./app-shells/loksh/loksh-6.4.ebuild
 1702282250 ./app-shells/shish/shish-0.7_pre3-r1.ebuild
 1702282250 ./app-shells/rssh/rssh-2.3.4_p3.ebuild
 1702282250 ./app-shells/rssh/rssh-2.3.4.ebuild
@@ -16153,8 +16158,8 @@
 1702282250 ./app-office/ical/ical-3.0-r2.ebuild
 1812310509 ./app-office/libreoffice/libreoffice-9999.ebuild
 1901082309 ./app-office/libreoffice/libreoffice-6.1.4.2.ebuild
-1901102239 ./app-office/libreoffice/libreoffice-6.2.0.2.ebuild
-1901091310 ./app-office/libreoffice/libreoffice-6.2.9999.ebuild
+1901161239 ./app-office/libreoffice/libreoffice-6.2.0.2.ebuild
+1901161239 ./app-office/libreoffice/libreoffice-6.2.9999.ebuild
 1804270438 ./app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
 1705171809 ./app-office/hourglass/hourglass-0.7.2-r1.ebuild
 1812021739 ./app-office/gnumeric/gnumeric-1.12.39.ebuild
@@ -16185,8 +16190,7 @@
 1812061409 ./app-office/scribus/scribus-1.5.4-r1.ebuild
 1901110439 ./app-office/scribus/scribus-9999.ebuild
 1901150239 ./app-office/scribus/scribus-1.5.5_pre20190113.ebuild
-1901160139 ./app-office/calligra/calligra-3.1.0-r3.ebuild
-1807151409 ./app-office/calligra/calligra-3.1.0-r2.ebuild
+1901161939 ./app-office/calligra/calligra-3.1.0-r3.ebuild
 1804031838 ./app-office/kraft/kraft-0.80.ebuild
 1612040405 ./app-office/worklog-assistant-bin/worklog-assistant-bin-2.1.3580.ebuild
 1812131839 ./app-office/kmymoney/kmymoney-5.0.2.ebuild
@@ -16512,7 +16516,7 @@
 1809031739 ./net-analyzer/nagios/nagios-4.4.2.ebuild
 1804081408 ./net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild
 1702282250 ./net-analyzer/bwbar/bwbar-1.2.3.ebuild
-1812200539 ./net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
+1901162239 ./net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
 1812200539 ./net-analyzer/metasploit/metasploit-4.14.16-r2.ebuild
 1812200539 ./net-analyzer/metasploit/metasploit-9999.ebuild
 1702282250 ./net-analyzer/tptest/tptest-3.1.7-r2.ebuild
@@ -16851,7 +16855,7 @@
 1811182309 ./dev-ada/libgpr/libgpr-2018.ebuild
 1811101939 ./dev-ada/gnatmem/gnatmem-2018.ebuild
 1811101739 ./dev-ada/aws/aws-2017.ebuild
-1811272239 ./dev-ada/aws/aws-2018.ebuild
+1901161039 ./dev-ada/aws/aws-2018.ebuild
 1811281109 ./dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
 1811072339 ./dev-ada/xmlada/xmlada-2018.ebuild
 1711111431 ./x11-themes/kvantum/kvantum-0.10.5.ebuild
@@ -18053,8 +18057,8 @@
 1804101838 ./dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
 1810030039 ./dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
 1710192149 ./dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
-1702282250 ./dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.3-r1.ebuild
 1810272339 ./dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild
+1901161709 ./dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4-r1.ebuild
 1705041545 ./dev-php/symfony-dependency-injection/symfony-dependency-injection-2.8.20.ebuild
 1702282250 ./dev-php/PEAR-Services_W3C_CSSValidator/PEAR-Services_W3C_CSSValidator-0.2.3.ebuild
 1702282250 ./dev-php/pecl-xrange/pecl-xrange-1.3.2-r2.ebuild
@@ -18125,6 +18129,7 @@
 1702282250 ./dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
 1703191747 ./dev-php/PEAR-PEAR_PackageFileManager_Plugins/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1.ebuild
 1804231808 ./dev-php/PEAR-HTTP_Session2/PEAR-HTTP_Session2-0.7.3-r2.ebuild
+1901161809 ./dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild
 1809191609 ./dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.3.ebuild
 1702282250 ./dev-php/pecl-spl_types/pecl-spl_types-0.4.0-r2.ebuild
 1804271308 ./dev-php/awl/awl-0.59.ebuild
@@ -18564,6 +18569,7 @@
 1702282250 ./app-text/docx2txt/docx2txt-1.4.ebuild
 1809162309 ./app-text/master-pdf-editor/master-pdf-editor-5.1.30.ebuild
 1809162309 ./app-text/master-pdf-editor/master-pdf-editor-5.1.36.ebuild
+1901170009 ./app-text/master-pdf-editor/master-pdf-editor-5.2.00.ebuild
 1809211909 ./app-text/master-pdf-editor/master-pdf-editor-5.1.42.ebuild
 1702282250 ./app-text/dvisvgm/dvisvgm-1.10.ebuild
 1810200039 ./app-text/dvisvgm/dvisvgm-2.6.1.ebuild
@@ -18795,6 +18801,7 @@
 1804131308 ./app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild
 1804100408 ./app-text/editorconfig-core-c/editorconfig-core-c-0.12.2.ebuild
 1811150139 ./app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
+1901161639 ./app-text/zathura/zathura-0.4.3.ebuild
 1812231139 ./app-text/zathura/zathura-9999.ebuild
 1812231139 ./app-text/zathura/zathura-0.4.1-r2.ebuild
 1810160309 ./app-text/pytextile/pytextile-3.0.3.ebuild
@@ -19673,7 +19680,7 @@
 1808262339 ./sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
 1806191609 ./www-apache/passenger/passenger-5.3.2.ebuild
 1812021409 ./www-apache/passenger/passenger-6.0.0.ebuild
-1901160139 ./www-apache/passenger/passenger-5.3.7.ebuild
+1901162309 ./www-apache/passenger/passenger-5.3.7.ebuild
 1901091239 ./www-apache/passenger/passenger-6.0.1.ebuild
 1712020139 ./www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1.ebuild
 1805012209 ./www-apache/mod_depends/mod_depends-0.7.0_p200702041.ebuild
@@ -19851,13 +19858,13 @@
 1806262209 ./dev-util/cram/cram-0.7.ebuild
 1806302039 ./dev-util/icmake/icmake-9.02.08.ebuild
 1804090208 ./dev-util/icmake/icmake-9.02.07.ebuild
-1807110809 ./dev-util/cmocka/cmocka-1.1.1.ebuild
+1901161039 ./dev-util/cmocka/cmocka-1.1.1.ebuild
 1811272339 ./dev-util/cmocka/cmocka-1.1.3.ebuild
 1702282250 ./dev-util/cccc/cccc-3.1.5.ebuild
 1707050056 ./dev-util/vbindiff/vbindiff-3.0_beta4-r1.ebuild
 1802061838 ./dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
 1812010739 ./dev-util/shellcheck-bin/shellcheck-bin-0.5.0.ebuild
-1812030909 ./dev-util/shellcheck-bin/shellcheck-bin-0.6.0.ebuild
+1901161209 ./dev-util/shellcheck-bin/shellcheck-bin-0.6.0.ebuild
 1802182038 ./dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.0.176.ebuild
 1702282250 ./dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.44-r1.ebuild
 1806071409 ./dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88.ebuild
@@ -19888,8 +19895,8 @@
 1810031209 ./dev-util/creduce/creduce-2.8.0_pre20180411.ebuild
 1708130021 ./dev-util/creduce/creduce-9999.ebuild
 1707301237 ./dev-util/creduce/creduce-2.7.0.ebuild
+1901161439 ./dev-util/debootstrap/debootstrap-1.0.114.ebuild
 1812041239 ./dev-util/debootstrap/debootstrap-1.0.111.ebuild
-1812271809 ./dev-util/debootstrap/debootstrap-1.0.112.ebuild
 1803311338 ./dev-util/debootstrap/debootstrap-1.0.89.ebuild
 1702282250 ./dev-util/biew/biew-6.1.0-r3.ebuild
 1901061939 ./dev-util/rr/rr-5.2.0.ebuild
@@ -20171,7 +20178,7 @@
 1801261238 ./dev-util/staruml-bin/staruml-bin-2.8.1.ebuild
 1807120539 ./dev-util/spirv-headers/spirv-headers-1.3.1_pre20180710.ebuild
 1807120539 ./dev-util/spirv-headers/spirv-headers-9999.ebuild
-1809180239 ./dev-util/spirv-headers/spirv-headers-1.3.4_pre20180917.ebuild
+1901161839 ./dev-util/spirv-headers/spirv-headers-1.3.4_pre20180917.ebuild
 1806111309 ./dev-util/spirv-headers/spirv-headers-1.3.ebuild
 1702282250 ./dev-util/obs-service-source_validator/obs-service-source_validator-0.3.ebuild
 1702282250 ./dev-util/egypt/egypt-1.10.ebuild
@@ -20205,6 +20212,7 @@
 1810272339 ./dev-util/oprofile/oprofile-1.3.0.ebuild
 1702282250 ./dev-util/obs-service-download_url/obs-service-download_url-20130318.ebuild
 1808020009 ./dev-util/lldb/lldb-7.0.9999.ebuild
+1901161809 ./dev-util/lldb/lldb-8.0.9999.ebuild
 1803281339 ./dev-util/lldb/lldb-9999.ebuild
 1812201609 ./dev-util/lldb/lldb-7.0.1.ebuild
 1702282250 ./dev-util/bam/bam-0.4.0-r1.ebuild
@@ -20238,14 +20246,14 @@
 1810182009 ./dev-util/Orange/Orange-3.4.5-r3.ebuild
 1810182009 ./dev-util/Orange/Orange-3.14.0.ebuild
 1811251809 ./dev-util/cppcheck/cppcheck-1.85.ebuild
-1901031809 ./dev-util/cppcheck/cppcheck-1.86.ebuild
+1901161909 ./dev-util/cppcheck/cppcheck-1.86.ebuild
 1808111239 ./dev-util/cppcheck/cppcheck-1.81.ebuild
 1811251809 ./dev-util/cppcheck/cppcheck-9999.ebuild
 1810141109 ./dev-util/kdevelop-python/kdevelop-python-5.2.4.ebuild
 1812130239 ./dev-util/kdevelop-python/kdevelop-python-5.3.1.ebuild
 1801281608 ./dev-util/ignition-cmake/ignition-cmake-0.4.0.ebuild
 1801071039 ./dev-util/ignition-cmake/ignition-cmake-0.2.0.ebuild
-1901160139 ./dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
+1901161839 ./dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
 1805012209 ./dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
 1810042239 ./dev-util/cgvg/cgvg-1.6.3.ebuild
 1805012209 ./dev-util/cgvg/cgvg-1.6.2.ebuild
@@ -20260,7 +20268,7 @@
 1702282250 ./dev-util/babeltrace/babeltrace-1.2.3.ebuild
 1702282250 ./dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild
 1809180209 ./dev-util/glslang/glslang-7.9.2888.ebuild
-1811300609 ./dev-util/glslang/glslang-7.10.2984.ebuild
+1901161839 ./dev-util/glslang/glslang-7.10.2984.ebuild
 1803122109 ./dev-util/glslang/glslang-9999.ebuild
 1805012209 ./dev-util/pscan/pscan-20000721-r1.ebuild
 1702282250 ./dev-util/omake/omake-0.10.2.ebuild
@@ -20286,7 +20294,7 @@
 1806302039 ./dev-util/howdoi/howdoi-1.1.12.ebuild
 1811110809 ./dev-util/howdoi/howdoi-1.1.14.ebuild
 1810132109 ./dev-util/spirv-tools/spirv-tools-2018.4.ebuild
-1810132109 ./dev-util/spirv-tools/spirv-tools-2018.5.ebuild
+1901161839 ./dev-util/spirv-tools/spirv-tools-2018.5.ebuild
 1810132109 ./dev-util/spirv-tools/spirv-tools-9999.ebuild
 1702282250 ./dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r2.ebuild
 1702282250 ./dev-util/pkgconfig-openbsd/pkgconfig-openbsd-20130507-r1.ebuild
@@ -20620,7 +20628,7 @@
 1704202347 ./dev-util/waf/waf-1.9.8.ebuild
 1809241509 ./dev-util/gource/gource-0.49.ebuild
 1809180339 ./dev-util/vulkan-headers/vulkan-headers-1.1.82.0.ebuild
-1811300609 ./dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild
+1901161839 ./dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild
 1806240209 ./dev-util/vulkan-headers/vulkan-headers-9999.ebuild
 1805012209 ./dev-util/lsuio/lsuio-0.2.0.ebuild
 1702282250 ./dev-util/gquilt/gquilt-0.25-r1.ebuild
@@ -22465,7 +22473,6 @@
 1710280206 ./app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
 1702282250 ./app-admin/yaala/yaala-0.7.3-r2.ebuild
 1702282250 ./app-admin/yaala/yaala-0.7.3-r1.ebuild
-1810282009 ./app-admin/vault/vault-0.11.4.ebuild
 1901101639 ./app-admin/vault/vault-1.0.1.ebuild
 1811161409 ./app-admin/vault/vault-0.11.5.ebuild
 1702282250 ./app-admin/supernova/supernova-2.2.0.ebuild
@@ -23184,6 +23191,7 @@
 1807101539 ./xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.1.ebuild
 1807101539 ./xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild
 1807101539 ./xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r3.ebuild
+1901161139 ./xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92.ebuild
 1811152009 ./xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0.ebuild
 1810131339 ./xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.98.ebuild
 1810271539 ./xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.90.ebuild
@@ -24130,7 +24138,7 @@
 1811081909 ./media-sound/tomahawk/tomahawk-0.9.0_pre20181030.ebuild
 1812310639 ./media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
 1809260139 ./media-sound/pulseeffects/pulseeffects-9999.ebuild
-1901152039 ./media-sound/pulseeffects/pulseeffects-4.4.6.ebuild
+1901170009 ./media-sound/pulseeffects/pulseeffects-4.4.6.ebuild
 1707301244 ./media-sound/dcadec/dcadec-0.2.0.ebuild
 1804201108 ./media-sound/gsm/gsm-1.0.13-r1.ebuild
 1702282250 ./media-sound/gtick/gtick-0.5.0.ebuild
@@ -24263,11 +24271,8 @@
 1702282250 ./sys-fs/nilfs-utils/nilfs-utils-2.2.2.ebuild
 1702282250 ./sys-fs/nilfs-utils/nilfs-utils-2.1.5-r1.ebuild
 1702282250 ./sys-fs/btrfs-progs/btrfs-progs-4.1.2.ebuild
-1804251108 ./sys-fs/btrfs-progs/btrfs-progs-4.16.1.ebuild
 1810311239 ./sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
-1808072209 ./sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild
 1702282250 ./sys-fs/btrfs-progs/btrfs-progs-3.16.2.ebuild
-1803191708 ./sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild
 1702282250 ./sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild
 1812291409 ./sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
 1802231308 ./sys-fs/btrfs-progs/btrfs-progs-4.10.2.ebuild
@@ -24275,6 +24280,7 @@
 1801060139 ./sys-fs/btrfs-progs/btrfs-progs-4.14.1.ebuild
 1702282250 ./sys-fs/btrfs-progs/btrfs-progs-3.18.2.ebuild
 1812060339 ./sys-fs/btrfs-progs/btrfs-progs-4.19.1.ebuild
+1901161509 ./sys-fs/btrfs-progs/btrfs-progs-4.20_rc1.ebuild
 1604190145 ./sys-fs/cramfs/cramfs-1.1.ebuild
 1807150139 ./sys-fs/mac-fdisk/mac-fdisk-0.1_p16.ebuild
 1805012209 ./sys-fs/mac-fdisk/mac-fdisk-0.1-r7.ebuild
@@ -24633,18 +24639,11 @@
 1805012209 ./sys-boot/colo/colo-1.22.ebuild
 1901040309 ./sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild
 1901050439 ./sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild
-1812251709 ./x11-drivers/nvidia-drivers/nvidia-drivers-340.107.ebuild
-1812141609 ./x11-drivers/nvidia-drivers/nvidia-drivers-381.22-r1.ebuild
-1812141609 ./x11-drivers/nvidia-drivers/nvidia-drivers-304.137.ebuild
-1812251709 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.87.ebuild
-1812141609 ./x11-drivers/nvidia-drivers/nvidia-drivers-387.34.ebuild
-1812141609 ./x11-drivers/nvidia-drivers/nvidia-drivers-375.82.ebuild
-1812141609 ./x11-drivers/nvidia-drivers/nvidia-drivers-396.54.ebuild
-1901152109 ./x11-drivers/nvidia-drivers/nvidia-drivers-415.27.ebuild
-1901152109 ./x11-drivers/nvidia-drivers/nvidia-drivers-410.93.ebuild
-1901080209 ./x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild
-1812141609 ./x11-drivers/nvidia-drivers/nvidia-drivers-384.130.ebuild
-1812141609 ./x11-drivers/nvidia-drivers/nvidia-drivers-378.13-r1.ebuild
+1901161339 ./x11-drivers/nvidia-drivers/nvidia-drivers-340.107.ebuild
+1901161339 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.87.ebuild
+1901161339 ./x11-drivers/nvidia-drivers/nvidia-drivers-415.27.ebuild
+1901161339 ./x11-drivers/nvidia-drivers/nvidia-drivers-410.93.ebuild
+1901161339 ./x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild
 1703112157 ./x11-drivers/xf86-video-nv/xf86-video-nv-2.1.21.ebuild
 1808200809 ./x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild
 1805290709 ./x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
@@ -24838,7 +24837,7 @@
 1812012209 ./kde-frameworks/kded/kded-5.52.0.ebuild
 1901121739 ./kde-frameworks/kglobalaccel/kglobalaccel-5.54.0.ebuild
 1812012209 ./kde-frameworks/kglobalaccel/kglobalaccel-5.52.0.ebuild
-1901121739 ./kde-frameworks/kio/kio-5.54.0.ebuild
+1901162009 ./kde-frameworks/kio/kio-5.54.1.ebuild
 1812012209 ./kde-frameworks/kio/kio-5.52.0-r1.ebuild
 1901121739 ./kde-frameworks/kapidox/kapidox-5.54.0.ebuild
 1812012209 ./kde-frameworks/kapidox/kapidox-5.52.0.ebuild
@@ -32469,11 +32468,10 @@
 1702282250 ./media-libs/quvi/quvi-0.9.4.ebuild
 1702282250 ./media-libs/quvi/quvi-0.2.19.ebuild
 1702282250 ./media-libs/quvi/quvi-0.9.5.ebuild
-1808310239 ./media-libs/libpng/libpng-1.6.34.ebuild
 1812031509 ./media-libs/libpng/libpng-1.6.36.ebuild
 1812070609 ./media-libs/libpng/libpng-1.2.59.ebuild
 1812070609 ./media-libs/libpng/libpng-1.5.30.ebuild
-1901081239 ./media-libs/libpng/libpng-1.6.35-r1.ebuild
+1901161839 ./media-libs/libpng/libpng-1.6.35-r1.ebuild
 1809211109 ./media-libs/libgig/libgig-4.1.0.ebuild
 1702282250 ./media-libs/gmtk/gmtk-1.0.8.ebuild
 1702282250 ./media-libs/gmtk/gmtk-1.0.9.ebuild
@@ -32533,7 +32531,6 @@
 1812272209 ./media-libs/imlib2/imlib2-1.5.1-r1.ebuild
 1805020039 ./media-libs/stk/stk-4.5.1-r1.ebuild
 1812162239 ./media-libs/phonon/phonon-9999.ebuild
-1805260309 ./media-libs/phonon/phonon-4.10.1.ebuild
 1901160139 ./media-libs/phonon/phonon-4.10.2.ebuild
 1809302109 ./media-libs/libopenraw/libopenraw-0.1.2.ebuild
 1811180039 ./media-libs/libopenraw/libopenraw-0.0.9.ebuild
@@ -32548,7 +32545,7 @@
 1812140509 ./media-libs/mesa/mesa-18.2.7.ebuild
 1812072109 ./media-libs/mesa/mesa-18.3.0.ebuild
 1812161709 ./media-libs/vulkan-loader/vulkan-loader-9999.ebuild
-1812161709 ./media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild
+1901161839 ./media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild
 1809180339 ./media-libs/vulkan-loader/vulkan-loader-1.1.82.0.ebuild
 1806262209 ./media-libs/pyliblo/pyliblo-0.10.0.ebuild
 1702282250 ./media-libs/rply/rply-1.01-r1.ebuild
@@ -32714,8 +32711,8 @@
 1805040139 ./media-libs/leptonica/leptonica-1.76.0.ebuild
 1901150009 ./media-libs/leptonica/leptonica-1.77.0.ebuild
 1811080239 ./media-libs/aribb24/aribb24-1.0.3.ebuild
-1901031809 ./media-libs/gexiv2/gexiv2-9999.ebuild
-1901031809 ./media-libs/gexiv2/gexiv2-0.10.10.ebuild
+1901170009 ./media-libs/gexiv2/gexiv2-9999.ebuild
+1901170009 ./media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
 1809212109 ./media-libs/gexiv2/gexiv2-0.10.8.ebuild
 1805120339 ./media-libs/aalib/aalib-1.4_rc5-r7.ebuild
 1805120339 ./media-libs/aalib/aalib-1.4_rc5-r8.ebuild
@@ -32792,11 +32789,11 @@
 1712101340 ./media-libs/libdcp/libdcp-1.4.4.ebuild
 1712101340 ./media-libs/libdcp/libdcp-9999.ebuild
 1704231426 ./media-libs/libdcp/libdcp-1.3.4.ebuild
-1901151609 ./media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild
-1901151609 ./media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild
-1901151609 ./media-libs/harfbuzz/harfbuzz-2.0.2-r1.ebuild
+1901161439 ./media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild
+1901161439 ./media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild
+1901161439 ./media-libs/harfbuzz/harfbuzz-2.0.2-r1.ebuild
 1810182309 ./media-libs/harfbuzz/harfbuzz-9999.ebuild
-1901151609 ./media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild
+1901161439 ./media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild
 1801102209 ./media-libs/avidemux-core/avidemux-core-2.7.0.ebuild
 1710081324 ./media-libs/avidemux-core/avidemux-core-2.6.20-r2.ebuild
 1801102209 ./media-libs/avidemux-core/avidemux-core-9999.ebuild
@@ -32982,7 +32979,7 @@
 1702282250 ./media-libs/fidlib/fidlib-0.9.10.ebuild
 1805261408 ./media-libs/taglib/taglib-1.11.1-r1.ebuild
 1811180239 ./media-libs/taglib/taglib-1.11.1_p20181028.ebuild
-1812161709 ./media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild
+1901161839 ./media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild
 1812161709 ./media-libs/vulkan-layers/vulkan-layers-9999.ebuild
 1811300609 ./media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild
 1702282250 ./media-libs/libclastfm/libclastfm-0.5.ebuild
@@ -32997,7 +32994,7 @@
 1808301209 ./media-libs/rtaudio/rtaudio-4.1.2.ebuild
 1708312135 ./media-libs/rtaudio/rtaudio-5.0.0.ebuild
 1804071508 ./media-libs/lensfun/lensfun-0.3.2-r1.ebuild
-1901160139 ./media-libs/libsdl2/libsdl2-2.0.9.ebuild
+1901161839 ./media-libs/libsdl2/libsdl2-2.0.9.ebuild
 1810101939 ./media-libs/libsdl2/libsdl2-2.0.8-r2.ebuild
 1707291534 ./media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
 1702282250 ./media-libs/libjsw/libjsw-1.5.8.ebuild
@@ -33099,7 +33096,7 @@
 1810021809 ./media-libs/liblscp/liblscp-0.5.8-r1.ebuild
 1901160139 ./media-libs/liblscp/liblscp-0.6.0.ebuild
 1812081909 ./media-libs/libgphoto2/libgphoto2-2.5.20.ebuild
-1811241709 ./media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
+1901161039 ./media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
 1808200209 ./media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
 1901021309 ./media-libs/sdl2-mixer/sdl2-mixer-2.0.4.ebuild
 1809161639 ./media-libs/sdl2-mixer/sdl2-mixer-2.0.2-r1.ebuild
@@ -33163,14 +33160,12 @@
 1704231426 ./media-libs/libasdcp-cth/libasdcp-cth-0.1.2.ebuild
 1704231426 ./media-libs/libasdcp-cth/libasdcp-cth-0.1.3.ebuild
 1808181239 ./media-libs/id3lib/id3lib-3.8.3-r8.ebuild
-1805260309 ./media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild
 1812162239 ./media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
 1901160139 ./media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
 1805041439 ./media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
 1901082209 ./media-libs/libldac/libldac-2.0.2-r1.ebuild
 1805240409 ./media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.7.1.ebuild
 1808261409 ./media-libs/slv2/slv2-0.6.6-r2.ebuild
-1805260309 ./media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild
 1901160139 ./media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
 1812162239 ./media-libs/phonon-vlc/phonon-vlc-9999.ebuild
 1704141927 ./media-libs/a52dec/a52dec-0.7.4-r6.ebuild
@@ -33186,10 +33181,7 @@
 1812121139 ./media-libs/libmediainfo/libmediainfo-18.12.ebuild
 1809091809 ./media-libs/libheif/libheif-9999.ebuild
 1810311709 ./media-libs/libheif/libheif-1.3.2-r1.ebuild
-1811272139 ./media-libs/opencv/opencv-3.3.0-r6.ebuild
-1901150139 ./media-libs/opencv/opencv-3.4.1-r5.ebuild
-1811272139 ./media-libs/opencv/opencv-3.2.0-r4.ebuild
-1811272139 ./media-libs/opencv/opencv-3.4.1-r2.ebuild
+1901161339 ./media-libs/opencv/opencv-3.4.1-r5.ebuild
 1808161839 ./media-libs/opencv/opencv-2.4.13-r3.ebuild
 1708271834 ./media-libs/lib3ds/lib3ds-2.0.0_rc1.ebuild
 1702282250 ./media-libs/lib3ds/lib3ds-1.3.0-r1.ebuild
@@ -33278,12 +33270,10 @@
 1812260039 ./kde-misc/krename/krename-5.0.0-r1.ebuild
 1802042338 ./kde-misc/plasma-active-window-control/plasma-active-window-control-1.7.3.ebuild
 1709241932 ./kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10.ebuild
-1901160139 ./kde-misc/yakuake/yakuake-3.0.5-r1.ebuild
-1805081038 ./kde-misc/yakuake/yakuake-3.0.5.ebuild
+1901161839 ./kde-misc/yakuake/yakuake-3.0.5-r1.ebuild
 1901160139 ./kde-misc/basket/basket-2.49a_p20181205.ebuild
 1804152039 ./kde-misc/basket/basket-2.49a_p20170225-r1.ebuild
-1901160139 ./kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
-1808240639 ./kde-misc/wacomtablet/wacomtablet-3.1.0.ebuild
+1901161939 ./kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
 1702282250 ./kde-misc/gmailfeed/gmailfeed-1.1.ebuild
 1710080011 ./kde-misc/kio-locate/kio-locate-0.5.3-r1.ebuild
 1702282250 ./kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild
@@ -35747,8 +35737,10 @@
 1707301135 ./app-emulation/skopeo/skopeo-0.1.22.ebuild
 1808170609 ./app-emulation/skopeo/skopeo-0.1.31.ebuild
 1709030700 ./app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0.ebuild
+1901161509 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.2.ebuild
 1811280539 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.22.ebuild
 1812222039 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.0.ebuild
+1901161509 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.24.ebuild
 1702282250 ./app-emulation/runc/runc-9999.ebuild
 1901101639 ./app-emulation/runc/runc-1.0.0_rc6_p20181203.ebuild
 1811251739 ./app-emulation/runc/runc-1.0.0_rc6.ebuild
@@ -35880,7 +35872,9 @@
 1901131739 ./app-emulation/gallium-nine-standalone/gallium-nine-standalone-0_p20190113.ebuild
 1901131739 ./app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
 1901031209 ./app-emulation/virtualbox-bin/virtualbox-bin-6.0.0.127566.ebuild
+1901161509 ./app-emulation/virtualbox-bin/virtualbox-bin-5.2.24.128163.ebuild
 1811280539 ./app-emulation/virtualbox-bin/virtualbox-bin-5.2.22.126460.ebuild
+1901161509 ./app-emulation/virtualbox-bin/virtualbox-bin-6.0.2.128162.ebuild
 1805012209 ./app-emulation/vov/vov-2.0.0.ebuild
 1809251609 ./app-emulation/reg/reg-0.15.7.ebuild
 1808062109 ./app-emulation/reg/reg-0.15.4-r2.ebuild
@@ -35938,13 +35932,17 @@
 1811112109 ./app-emulation/wine-staging/wine-staging-3.20.ebuild
 1812300039 ./app-emulation/wine-staging/wine-staging-9999.ebuild
 1806040438 ./app-emulation/dlx/dlx-1.0.0.ebuild
-1812222039 ./app-emulation/virtualbox/virtualbox-6.0.0.ebuild
+1901162309 ./app-emulation/virtualbox/virtualbox-6.0.0.ebuild
 1811280539 ./app-emulation/virtualbox/virtualbox-5.2.22.ebuild
+1901162309 ./app-emulation/virtualbox/virtualbox-6.0.2.ebuild
+1901161509 ./app-emulation/virtualbox/virtualbox-5.2.24.ebuild
 1804131308 ./app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
 1812162239 ./app-emulation/fuse/fuse-1.5.7.ebuild
 1810182309 ./app-emulation/fuse/fuse-1.5.6.ebuild
 1811280539 ./app-emulation/virtualbox-modules/virtualbox-modules-5.2.22.ebuild
+1901161509 ./app-emulation/virtualbox-modules/virtualbox-modules-6.0.2.ebuild
 1812222039 ./app-emulation/virtualbox-modules/virtualbox-modules-6.0.0.ebuild
+1901161509 ./app-emulation/virtualbox-modules/virtualbox-modules-5.2.24.ebuild
 1803221738 ./app-emulation/qt-virt-manager/qt-virt-manager-9999.ebuild
 1807310039 ./app-emulation/lxc-templates/lxc-templates-3.0.1.ebuild
 1901012239 ./app-emulation/lxc-templates/lxc-templates-3.0.3.ebuild
@@ -35952,11 +35950,15 @@
 1804152209 ./app-emulation/virt-manager/virt-manager-1.5.1-r1.ebuild
 1812030609 ./app-emulation/virt-manager/virt-manager-9999.ebuild
 1901021339 ./app-emulation/virt-manager/virt-manager-2.0.0.ebuild
+1901161509 ./app-emulation/virtualbox-additions/virtualbox-additions-5.2.24.ebuild
+1901161509 ./app-emulation/virtualbox-additions/virtualbox-additions-6.0.2.ebuild
 1811280539 ./app-emulation/virtualbox-additions/virtualbox-additions-5.2.22.ebuild
 1812222039 ./app-emulation/virtualbox-additions/virtualbox-additions-6.0.0.ebuild
 1702282250 ./app-emulation/softgun/softgun-0.21.ebuild
 1702282250 ./app-emulation/softgun/softgun-0.22.ebuild
+1901161509 ./app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.24.128163.ebuild
 1812222039 ./app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.0.127566.ebuild
+1901161509 ./app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.2.128162.ebuild
 1811280539 ./app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.22.126460.ebuild
 1804270438 ./app-emulation/gxemul/gxemul-0.6.0-r1.ebuild
 1804270438 ./app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
@@ -36553,6 +36555,7 @@
 1811130041 metadata/md5-cache/dev-java/java-dep-check-0.3-r1
 1811222209 metadata/md5-cache/dev-java/maven-bin-3.0.5
 1811130041 metadata/md5-cache/dev-java/ehcache-1.2.4-r3
+1901170009 metadata/md5-cache/dev-java/oracle-jdk-bin-11.0.2
 1810250041 metadata/md5-cache/dev-java/oracle-jre-bin-9.0.4-r1
 1811130041 metadata/md5-cache/dev-java/antlr-3.5.2
 1901111809 metadata/md5-cache/dev-java/tomcat-native-1.2.19
@@ -36638,7 +36641,7 @@
 1812202039 metadata/md5-cache/dev-java/sun-jms-1.1-r2
 1811130041 metadata/md5-cache/dev-java/cldc-api-1.1-r1
 1811130041 metadata/md5-cache/dev-java/commons-primitives-1.0-r3
-1901141539 metadata/md5-cache/dev-java/Manifest.gz
+1901170009 metadata/md5-cache/dev-java/Manifest.gz
 1811130041 metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
 1811130041 metadata/md5-cache/dev-java/objenesis-1.3
 1811130041 metadata/md5-cache/dev-java/hawtjni-runtime-1.15
@@ -37149,6 +37152,7 @@
 1809280334 metadata/md5-cache/sys-libs/libcxxrt-0.0_p20170515
 1812201609 metadata/md5-cache/sys-libs/compiler-rt-7.0.1
 1809280334 metadata/md5-cache/sys-libs/libtermcap-compat-2.0.8-r3
+1901161809 metadata/md5-cache/sys-libs/compiler-rt-8.0.9999
 1901081309 metadata/md5-cache/sys-libs/openipmi-2.0.22
 1901140209 metadata/md5-cache/sys-libs/tevent-0.9.31-r1
 1812271040 metadata/md5-cache/sys-libs/glibc-2.25-r11
@@ -37182,6 +37186,7 @@
 1812260039 metadata/md5-cache/sys-libs/libcxx-5.0.2
 1812021739 metadata/md5-cache/sys-libs/libosinfo-1.2.0
 1809280334 metadata/md5-cache/sys-libs/lrmi-0.10-r1
+1901161809 metadata/md5-cache/sys-libs/libcxx-8.0.9999
 1809280334 metadata/md5-cache/sys-libs/libudev-compat-186-r1
 1812260039 metadata/md5-cache/sys-libs/libcxxabi-4.0.1
 1809280334 metadata/md5-cache/sys-libs/libstatgrab-0.17
@@ -37218,11 +37223,13 @@
 1812021539 metadata/md5-cache/sys-libs/uclibc-ng-1.0.26
 1901081309 metadata/md5-cache/sys-libs/openipmi-2.0.25
 1901110039 metadata/md5-cache/sys-libs/glibc-2.28-r5
+1901161809 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-8.0.9999
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.6
 1809280334 metadata/md5-cache/sys-libs/ncurses-5.9-r101
 1809280334 metadata/md5-cache/sys-libs/libsemanage-2.8
 1812312139 metadata/md5-cache/sys-libs/musl-1.1.20-r1
 1809280334 metadata/md5-cache/sys-libs/ncurses-6.1-r2
+1901161809 metadata/md5-cache/sys-libs/llvm-libunwind-8.0.9999
 1809280334 metadata/md5-cache/sys-libs/suacomp-0.6.14
 1901140209 metadata/md5-cache/sys-libs/ldb-1.3.6
 1901140209 metadata/md5-cache/sys-libs/talloc-2.1.14
@@ -37260,9 +37267,10 @@
 1812260039 metadata/md5-cache/sys-libs/libomp-4.0.1
 1811130041 metadata/md5-cache/sys-libs/db-4.8.30-r2
 1811261942 metadata/md5-cache/sys-libs/libapparmor-2.12.0
-1812110115 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999
+1901161809 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999
+1901161809 metadata/md5-cache/sys-libs/libomp-8.0.9999
 1809280334 metadata/md5-cache/sys-libs/libixp-0.5_p20110208-r3
-1901160139 metadata/md5-cache/sys-libs/readline-7.0_p5
+1901161409 metadata/md5-cache/sys-libs/readline-7.0_p5
 1809280334 metadata/md5-cache/sys-libs/readline-7.0_p3-r1
 1809280334 metadata/md5-cache/sys-libs/libcxx-3.7.1
 1812260039 metadata/md5-cache/sys-libs/uid_wrapper-1.2.1
@@ -37278,8 +37286,8 @@
 1811130041 metadata/md5-cache/sys-libs/db-5.3.28-r2
 1810030039 metadata/md5-cache/sys-libs/libstdc++-v3-3.3.6-r1
 1809280334 metadata/md5-cache/sys-libs/binutils-libs-2.28.1
-1812110115 metadata/md5-cache/sys-libs/compiler-rt-9999
-1901160139 metadata/md5-cache/sys-libs/Manifest.gz
+1901161809 metadata/md5-cache/sys-libs/compiler-rt-9999
+1901161809 metadata/md5-cache/sys-libs/Manifest.gz
 1901131439 metadata/md5-cache/sys-libs/readline-8.0
 1809280334 metadata/md5-cache/sys-libs/readline-5.2_p14
 1704132239 metadata/md5-cache/sys-libs/csu-79
@@ -37344,6 +37352,7 @@
 1812260039 metadata/md5-cache/sys-libs/libomp-7.0.1
 1812011609 metadata/md5-cache/sys-libs/librtas-2.0.2
 1812011609 metadata/md5-cache/sys-libs/libvpd-2.2.4
+1901161809 metadata/md5-cache/sys-libs/libcxxabi-8.0.9999
 1901140209 metadata/md5-cache/sys-libs/ldb-1.1.29-r1
 1811130041 metadata/md5-cache/sys-libs/db-4.3.29_p1-r1
 1811130041 metadata/md5-cache/sys-libs/db-5.1.29-r1
@@ -37772,7 +37781,7 @@
 1807210139 metadata/md5-cache/sci-libs/szip-2.1-r2
 1809280334 metadata/md5-cache/sci-libs/oc-2.0
 1812110115 metadata/md5-cache/sci-libs/itpp-4.3.1-r1
-1901122339 metadata/md5-cache/sci-libs/gdal-2.3.1
+1901162309 metadata/md5-cache/sci-libs/gdal-2.3.1
 1810271739 metadata/md5-cache/sci-libs/netcdf-cxx-4.2-r300
 1809280334 metadata/md5-cache/sci-libs/ogdi-3.2.0
 1702282331 metadata/md5-cache/sci-libs/monomer-db-5.41
@@ -37886,7 +37895,7 @@
 1809280334 metadata/md5-cache/sci-libs/libcerf-1.3
 1809280334 metadata/md5-cache/sci-libs/libticalcs2-1.1.8
 1811171439 metadata/md5-cache/sci-libs/mkl-10.0.5.025
-1901160139 metadata/md5-cache/sci-libs/Manifest.gz
+1901162309 metadata/md5-cache/sci-libs/Manifest.gz
 1809280334 metadata/md5-cache/sci-libs/lrslib-051
 1809280334 metadata/md5-cache/sci-libs/p4est-1.0
 1812110115 metadata/md5-cache/sci-libs/vtk-8.1.0-r1
@@ -38045,7 +38054,7 @@
 1812110115 metadata/md5-cache/sci-libs/shogun-5.0.0
 1812110115 metadata/md5-cache/sci-libs/hypre-2.11.2
 1809280334 metadata/md5-cache/sci-libs/colpack-1.0.6
-1901160139 metadata/md5-cache/sci-libs/indilib-1.7.5
+1901161909 metadata/md5-cache/sci-libs/indilib-1.7.5
 1811260409 metadata/md5-cache/sci-libs/mumps-5.1.2
 1810201909 metadata/md5-cache/sci-libs/linux-gpib-modules-4.2.0_rc1
 1811171439 metadata/md5-cache/sci-libs/grib_api-1.11.0
@@ -38105,7 +38114,6 @@
 1811171439 metadata/md5-cache/sci-libs/atlas-3.10.2
 1812110115 metadata/md5-cache/sci-libs/armadillo-9.200.5
 1811171439 metadata/md5-cache/sci-libs/hdf-4.2.13
-1812110115 metadata/md5-cache/sci-libs/indilib-1.6.0
 1812110115 metadata/md5-cache/sci-libs/orocos_kdl-9999
 1812110115 metadata/md5-cache/sci-libs/fcl-0.5.0
 1811261942 metadata/md5-cache/sci-libs/Shapely-9999
@@ -38138,7 +38146,7 @@
 1812261140 metadata/md5-cache/dev-ruby/hiera-3.4.5
 1812261140 metadata/md5-cache/dev-ruby/logue-1.0.13-r1
 1812261140 metadata/md5-cache/dev-ruby/method_source-0.9.2
-1812261140 metadata/md5-cache/dev-ruby/tilt-2.0.9
+1901161039 metadata/md5-cache/dev-ruby/tilt-2.0.9
 1812261140 metadata/md5-cache/dev-ruby/actionmailer-5.2.2
 1812261140 metadata/md5-cache/dev-ruby/colored-1.2
 1812261140 metadata/md5-cache/dev-ruby/date_validator-0.9.0
@@ -38255,7 +38263,6 @@
 1812261140 metadata/md5-cache/dev-ruby/exifr-1.3.4
 1812261140 metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.1.1
 1812261140 metadata/md5-cache/dev-ruby/liquid-c-3.0.0
-1812261140 metadata/md5-cache/dev-ruby/hike-2.1.2
 1812261140 metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0-r1
 1812261140 metadata/md5-cache/dev-ruby/ruby2ruby-2.4.0
 1901101339 metadata/md5-cache/dev-ruby/rainbow-3.0.0
@@ -38323,7 +38330,6 @@
 1812261140 metadata/md5-cache/dev-ruby/vcr-2.9.3
 1812261140 metadata/md5-cache/dev-ruby/connection_pool-2.2.1
 1812261140 metadata/md5-cache/dev-ruby/ruby-net-ldap-0.16.1
-1812261140 metadata/md5-cache/dev-ruby/hike-1.2.3-r1
 1812261140 metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.1.1
 1812261140 metadata/md5-cache/dev-ruby/unf-0.1.4
 1812261140 metadata/md5-cache/dev-ruby/tins-1.19.0
@@ -38378,7 +38384,6 @@
 1812261140 metadata/md5-cache/dev-ruby/radius-0.7.4-r4
 1812261140 metadata/md5-cache/dev-ruby/railties-5.2.2
 1812300709 metadata/md5-cache/dev-ruby/json-2.1.0
-1812261140 metadata/md5-cache/dev-ruby/activemodel-5.0.7
 1901131139 metadata/md5-cache/dev-ruby/redcloth-4.3.2-r1
 1812261140 metadata/md5-cache/dev-ruby/capistrano-3.10.2
 1812261140 metadata/md5-cache/dev-ruby/request_store-1.0.5
@@ -38476,7 +38481,6 @@
 1812261140 metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r4
 1812261140 metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.0
 1812261140 metadata/md5-cache/dev-ruby/actioncable-5.2.1.1
-1812261140 metadata/md5-cache/dev-ruby/activesupport-5.0.7
 1812261140 metadata/md5-cache/dev-ruby/ruby-pango-3.1.1
 1812261140 metadata/md5-cache/dev-ruby/bunny-2.9.2
 1901150909 metadata/md5-cache/dev-ruby/nanotest-0.9.4.1
@@ -38547,7 +38551,6 @@
 1812261140 metadata/md5-cache/dev-ruby/metasploit_payloads-mettle-0.4.2
 1812261140 metadata/md5-cache/dev-ruby/erubi-1.7.1
 1812261140 metadata/md5-cache/dev-ruby/metasploit-payloads-1.3.53
-1812261140 metadata/md5-cache/dev-ruby/rails-5.0.7
 1812261140 metadata/md5-cache/dev-ruby/activestorage-5.2.1
 1812261140 metadata/md5-cache/dev-ruby/rubytest-cli-0.2.0
 1812261140 metadata/md5-cache/dev-ruby/pathutil-0.16.2
@@ -38560,11 +38563,10 @@
 1812261140 metadata/md5-cache/dev-ruby/sanitize-4.6.4
 1812261140 metadata/md5-cache/dev-ruby/mechanize-2.7.6
 1812261140 metadata/md5-cache/dev-ruby/git-1.4.0
-1812261140 metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3
+1901161039 metadata/md5-cache/dev-ruby/bluecloth-2.2.0-r3
 1812261140 metadata/md5-cache/dev-ruby/ddmetrics-1.0.0
 1812261140 metadata/md5-cache/dev-ruby/archive-tar-minitar-0.7
 1812261140 metadata/md5-cache/dev-ruby/little-plugger-1.1.4
-1812261140 metadata/md5-cache/dev-ruby/activejob-5.0.7
 1812261140 metadata/md5-cache/dev-ruby/activejob-5.2.0
 1812261140 metadata/md5-cache/dev-ruby/sass-listen-4.0.0
 1812261140 metadata/md5-cache/dev-ruby/arel-9.0.0
@@ -38646,7 +38648,7 @@
 1812261140 metadata/md5-cache/dev-ruby/fattr-2.4.0
 1812302139 metadata/md5-cache/dev-ruby/rubygems-2.7.6-r1
 1901032239 metadata/md5-cache/dev-ruby/activestorage-5.2.0
-1812261140 metadata/md5-cache/dev-ruby/timers-4.2.0
+1901161039 metadata/md5-cache/dev-ruby/timers-4.2.0
 1812261140 metadata/md5-cache/dev-ruby/fast-stemmer-1.0.2-r2
 1812261140 metadata/md5-cache/dev-ruby/liquid-4.0.0
 1812261140 metadata/md5-cache/dev-ruby/ruby-gtksourceview-3.1.1
@@ -38724,7 +38726,6 @@
 1812261140 metadata/md5-cache/dev-ruby/diff-lcs-1.2.5-r1
 1812261140 metadata/md5-cache/dev-ruby/bit-struct-0.16
 1812261140 metadata/md5-cache/dev-ruby/ffaker-2.9.0
-1812261140 metadata/md5-cache/dev-ruby/actionpack-5.0.7
 1812261140 metadata/md5-cache/dev-ruby/rack-test-1.1.0
 1901091139 metadata/md5-cache/dev-ruby/builder-3.2.3
 1812261140 metadata/md5-cache/dev-ruby/compass-core-1.0.3-r1
@@ -38755,7 +38756,6 @@
 1812261140 metadata/md5-cache/dev-ruby/did_you_mean-1.2.1
 1812261140 metadata/md5-cache/dev-ruby/sass-3.4.25
 1812261140 metadata/md5-cache/dev-ruby/power_assert-1.1.3
-1812261140 metadata/md5-cache/dev-ruby/actionview-5.0.7
 1812261140 metadata/md5-cache/dev-ruby/best_in_place-3.1.1
 1812261140 metadata/md5-cache/dev-ruby/fast_gettext-1.7.0
 1812261140 metadata/md5-cache/dev-ruby/sigar-0.7.3
@@ -38773,7 +38773,6 @@
 1901091239 metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
 1812261140 metadata/md5-cache/dev-ruby/ruby-prof-0.17.0
 1812261140 metadata/md5-cache/dev-ruby/actionpack-5.2.0
-1812261140 metadata/md5-cache/dev-ruby/classifier-1.3.4
 1812261140 metadata/md5-cache/dev-ruby/activestorage-5.2.1.1
 1812261140 metadata/md5-cache/dev-ruby/parallel-1.12.1
 1812261140 metadata/md5-cache/dev-ruby/ruby-gtk2-3.1.1
@@ -38781,7 +38780,7 @@
 1812261140 metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
 1901121139 metadata/md5-cache/dev-ruby/hashdiff-0.3.8
 1901121139 metadata/md5-cache/dev-ruby/vcr-1.11.3
-1901152109 metadata/md5-cache/dev-ruby/Manifest.gz
+1901162239 metadata/md5-cache/dev-ruby/Manifest.gz
 1812261140 metadata/md5-cache/dev-ruby/cmdparse-3.0.3
 1812261140 metadata/md5-cache/dev-ruby/sprockets-3.7.2
 1812261140 metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
@@ -38798,7 +38797,7 @@
 1812261140 metadata/md5-cache/dev-ruby/d3_rails-4.1.1
 1901142009 metadata/md5-cache/dev-ruby/plist-3.4.0
 1812261140 metadata/md5-cache/dev-ruby/ox-2.10.0
-1812261140 metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
+1901161039 metadata/md5-cache/dev-ruby/launchy-2.4.3-r2
 1812261140 metadata/md5-cache/dev-ruby/itextomml-1.5.7
 1812261140 metadata/md5-cache/dev-ruby/bsearch-1.5.0-r2
 1812261140 metadata/md5-cache/dev-ruby/twitter-text-2.1.0
@@ -38865,8 +38864,7 @@
 1901101309 metadata/md5-cache/dev-ruby/dotenv-2.5.0-r1
 1812261140 metadata/md5-cache/dev-ruby/shoulda-3.6.0
 1812261140 metadata/md5-cache/dev-ruby/tilt-2.0.8
-1812261140 metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
-1812261140 metadata/md5-cache/dev-ruby/activerecord-5.0.7
+1901161039 metadata/md5-cache/dev-ruby/tokyocabinet-1.32.0
 1812261140 metadata/md5-cache/dev-ruby/i18n-0.7.0-r3
 1812261140 metadata/md5-cache/dev-ruby/ruby-yadis-0.3.4-r2
 1901091239 metadata/md5-cache/dev-ruby/msgpack-1.2.6
@@ -38926,7 +38924,6 @@
 1901051309 metadata/md5-cache/dev-ruby/regexp_property_values-0.3.4
 1901051109 metadata/md5-cache/dev-ruby/rspec-support-3.8.0
 1812261140 metadata/md5-cache/dev-ruby/metasploit-concern-2.0.5
-1812261140 metadata/md5-cache/dev-ruby/actioncable-5.0.7
 1812261140 metadata/md5-cache/dev-ruby/rb-gsl-2.1.0.2
 1812281709 metadata/md5-cache/dev-ruby/sigdump-0.2.4
 1812261140 metadata/md5-cache/dev-ruby/rex-zip-0.1.3
@@ -38983,7 +38980,6 @@
 1812261140 metadata/md5-cache/dev-ruby/cri-2.15.0
 1812261140 metadata/md5-cache/dev-ruby/coffee-rails-4.2.2-r1
 1812261140 metadata/md5-cache/dev-ruby/idn-ruby-0.1.0
-1812261140 metadata/md5-cache/dev-ruby/actionmailer-5.0.7
 1812261140 metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.11
 1812261140 metadata/md5-cache/dev-ruby/rubypants-0.7.0
 1812261140 metadata/md5-cache/dev-ruby/pkg-config-1.2.8
@@ -39073,7 +39069,7 @@
 1812261140 metadata/md5-cache/dev-ruby/rmagick-2.16.0
 1812261140 metadata/md5-cache/dev-ruby/org-ruby-0.9.12
 1812261140 metadata/md5-cache/dev-ruby/http-form_data-1.0.3
-1812261140 metadata/md5-cache/dev-ruby/pusher-client-0.6.2
+1901161039 metadata/md5-cache/dev-ruby/pusher-client-0.6.2
 1812261140 metadata/md5-cache/dev-ruby/archive-tar-minitar-0.6.1-r1
 1812261140 metadata/md5-cache/dev-ruby/elasticsearch-transport-5.0.5
 1812261140 metadata/md5-cache/dev-ruby/spy-0.4.5
@@ -39159,7 +39155,8 @@
 1812261140 metadata/md5-cache/dev-ruby/pdf-reader-1.4.1-r2
 1812261140 metadata/md5-cache/dev-ruby/cmdparse-3.0.4
 1812261140 metadata/md5-cache/dev-ruby/fakefs-0.15.0
-1812261140 metadata/md5-cache/dev-ruby/tomlrb-1.2.8
+1901161039 metadata/md5-cache/dev-ruby/mocha-1.8.0
+1901161039 metadata/md5-cache/dev-ruby/tomlrb-1.2.8
 1812261140 metadata/md5-cache/dev-ruby/curses-1.2.5
 1812261140 metadata/md5-cache/dev-ruby/rack-test-1.0.0
 1812261140 metadata/md5-cache/dev-ruby/spreadsheet-1.1.3
@@ -39245,7 +39242,6 @@
 1812261140 metadata/md5-cache/dev-ruby/rex-exploitation-0.1.19
 1812261140 metadata/md5-cache/dev-ruby/ruby-glib2-3.2.9
 1812261140 metadata/md5-cache/dev-ruby/omniauth-1.9.0
-1812261140 metadata/md5-cache/dev-ruby/rest-client-1.8.0-r3
 1809091739 metadata/md5-cache/dev-ruby/puppetdb-termini-5.2.4
 1812261140 metadata/md5-cache/dev-ruby/selenium-webdriver-3.14.1
 1901150909 metadata/md5-cache/dev-ruby/test_construct-2.0.1-r1
@@ -39297,7 +39293,6 @@
 1812310039 metadata/md5-cache/dev-ruby/did_you_mean-1.0.2
 1812261140 metadata/md5-cache/dev-ruby/simplecov-0.16.1
 1812261140 metadata/md5-cache/dev-ruby/ruby2ruby-2.4.1
-1812261140 metadata/md5-cache/dev-ruby/railties-5.0.7
 1812261140 metadata/md5-cache/dev-ruby/actionmailer-5.2.0
 1812261140 metadata/md5-cache/dev-ruby/mocha-0.14.0
 1812261140 metadata/md5-cache/dev-ruby/syslogger-1.6.5
@@ -39305,7 +39300,6 @@
 1901150909 metadata/md5-cache/dev-ruby/hitimes-1.3.0
 1812261140 metadata/md5-cache/dev-ruby/safe_yaml-1.0.4-r3
 1812261140 metadata/md5-cache/dev-ruby/pg-1.0.0
-1812261140 metadata/md5-cache/dev-ruby/net-ssh-2.10.0
 1812261140 metadata/md5-cache/dev-ruby/sinatra-1.4.8
 1812261140 metadata/md5-cache/dev-ruby/hiredis-0.6.1
 1809280334 metadata/md5-cache/media-video/griffith-0.13-r2
@@ -39353,6 +39347,7 @@
 1812230639 metadata/md5-cache/media-video/ffmpeg-4.1
 1809280334 metadata/md5-cache/media-video/oxine-0.7.1-r2
 1809280334 metadata/md5-cache/media-video/mpeg-tools-1.5b-r4
+1901161139 metadata/md5-cache/media-video/kaffeine-2.0.16.2
 1809280334 metadata/md5-cache/media-video/raspberrypi-omxplayer-0_p20160528-r1
 1901130339 metadata/md5-cache/media-video/vlc-3.0.6
 1809280334 metadata/md5-cache/media-video/vdr2jpeg-0.1.9-r1
@@ -39465,7 +39460,7 @@
 1810030549 metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r1
 1809280334 metadata/md5-cache/media-video/atomicparsley-0.9.0
 1812161939 metadata/md5-cache/media-video/obs-studio-22.0.3
-1901160139 metadata/md5-cache/media-video/Manifest.gz
+1901161139 metadata/md5-cache/media-video/Manifest.gz
 1809280334 metadata/md5-cache/media-video/dvdauthor-0.7.2-r2
 1809280334 metadata/md5-cache/media-video/mjpg-streamer-0_pre20120421
 1809280334 metadata/md5-cache/media-video/ccextractor-0.68
@@ -39970,6 +39965,7 @@
 1809280334 metadata/md5-cache/sys-devel/clang-runtime-4.0.1-r1
 1809280334 metadata/md5-cache/sys-devel/gnuconfig-20161104
 1812092339 metadata/md5-cache/sys-devel/gcc-4.4.7-r1
+1901161809 metadata/md5-cache/sys-devel/clang-8.0.9999
 1809280334 metadata/md5-cache/sys-devel/gdb-8.1-r1
 1809280334 metadata/md5-cache/sys-devel/prelink-20130503
 1812092339 metadata/md5-cache/sys-devel/kgcc64-4.5.4
@@ -40001,9 +39997,10 @@
 1809280334 metadata/md5-cache/sys-devel/automake-9999
 1812092339 metadata/md5-cache/sys-devel/kgcc64-4.7.3
 1812092339 metadata/md5-cache/sys-devel/kgcc64-4.3.5
-1809280334 metadata/md5-cache/sys-devel/clang-runtime-9999
+1901161809 metadata/md5-cache/sys-devel/clang-runtime-9999
 1809280334 metadata/md5-cache/sys-devel/binutils-hppa64-2.26.1
 1809280334 metadata/md5-cache/sys-devel/autogen-5.18.10
+1901161809 metadata/md5-cache/sys-devel/llvmgold-9
 1812092339 metadata/md5-cache/sys-devel/gcc-5.4.0-r4
 1809280334 metadata/md5-cache/sys-devel/qconf-2.3
 1812222139 metadata/md5-cache/sys-devel/autoconf-2.64-r1
@@ -40015,11 +40012,12 @@
 1809280334 metadata/md5-cache/sys-devel/automake-1.16-r2
 1812110115 metadata/md5-cache/sys-devel/lld-5.0.2
 1812092339 metadata/md5-cache/sys-devel/gcc-4.4.7
+1901161809 metadata/md5-cache/sys-devel/clang-common-8.0.9999
 1809280334 metadata/md5-cache/sys-devel/autogen-5.18.4
 1809280334 metadata/md5-cache/sys-devel/binutils-hppa64-2.29
 1809280334 metadata/md5-cache/sys-devel/automake-1.7.9-r3
 1812092339 metadata/md5-cache/sys-devel/gcc-4.9.4
-1812110115 metadata/md5-cache/sys-devel/llvm-9999
+1901161809 metadata/md5-cache/sys-devel/llvm-9999
 1812142039 metadata/md5-cache/sys-devel/llvm-5.0.2
 1809280334 metadata/md5-cache/sys-devel/gdb-7.9.1
 1809280334 metadata/md5-cache/sys-devel/m4-1.4.17
@@ -40068,11 +40066,13 @@
 1901120009 metadata/md5-cache/sys-devel/gcc-config-2.0
 1812231509 metadata/md5-cache/sys-devel/gdb-8.2.1
 1812092339 metadata/md5-cache/sys-devel/gcc-4.0.4-r1
+1901161809 metadata/md5-cache/sys-devel/llvm-common-8.0.9999
 1808010039 metadata/md5-cache/sys-devel/crossdev-20180731
 1809280334 metadata/md5-cache/sys-devel/icecream-1.0.0-r1
 1809280334 metadata/md5-cache/sys-devel/byfl-9999
 1812030609 metadata/md5-cache/sys-devel/gdb-8.2-r1
 1812092339 metadata/md5-cache/sys-devel/kgcc64-7.2.0
+1901161809 metadata/md5-cache/sys-devel/clang-runtime-8.0.9999
 1811011309 metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0-r2
 1804211508 metadata/md5-cache/sys-devel/llvmgold-4
 1809280334 metadata/md5-cache/sys-devel/smatch-1.57
@@ -40083,7 +40083,7 @@
 1809280334 metadata/md5-cache/sys-devel/binutils-apple-6.1-r1
 1809192339 metadata/md5-cache/sys-devel/llvmgold-7
 1809280334 metadata/md5-cache/sys-devel/binutils-2.28.1
-1901092339 metadata/md5-cache/sys-devel/clang-9999
+1901161809 metadata/md5-cache/sys-devel/clang-9999
 1804211508 metadata/md5-cache/sys-devel/llvm-common-4.0.1
 1809280334 metadata/md5-cache/sys-devel/clang-runtime-6.0.1
 1812092339 metadata/md5-cache/sys-devel/gcc-5.4.0-r6
@@ -40102,7 +40102,7 @@
 1812272209 metadata/md5-cache/sys-devel/autoconf-archive-2018.03.13
 1805270804 metadata/md5-cache/sys-devel/slibtool-0.5.19
 1812092339 metadata/md5-cache/sys-devel/kgcc64-4.9.4
-1901120009 metadata/md5-cache/sys-devel/Manifest.gz
+1901161809 metadata/md5-cache/sys-devel/Manifest.gz
 1809280334 metadata/md5-cache/sys-devel/gcc-config-1.9.1
 1809280334 metadata/md5-cache/sys-devel/clang-3.6.2-r100
 1812092339 metadata/md5-cache/sys-devel/gcc-7.4.0
@@ -40178,6 +40178,7 @@
 1809180947 metadata/md5-cache/sys-devel/autoconf-9999
 1812092339 metadata/md5-cache/sys-devel/kgcc64-4.8.3
 1809280334 metadata/md5-cache/sys-devel/clang-3.5.2-r100
+1901161809 metadata/md5-cache/sys-devel/lld-8.0.9999
 1809280334 metadata/md5-cache/sys-devel/clang-runtime-4.0.1
 1809280334 metadata/md5-cache/sys-devel/clang-3.9.1-r100
 1812092339 metadata/md5-cache/sys-devel/kgcc64-6.4.0
@@ -40203,6 +40204,7 @@
 1812092339 metadata/md5-cache/sys-devel/gcc-4.3.6-r1
 1809280334 metadata/md5-cache/sys-devel/clang-runtime-3.9.1
 1812110115 metadata/md5-cache/sys-devel/llvm-3.7.1-r3
+1901161809 metadata/md5-cache/sys-devel/llvm-8.0.9999
 1809280334 metadata/md5-cache/sys-devel/llvm-3.4.2-r100
 1809280334 metadata/md5-cache/sys-devel/byfl-1.6-r1
 1809280334 metadata/md5-cache/sys-devel/flex-2.6.3-r1
@@ -40227,7 +40229,7 @@
 1812110115 metadata/md5-cache/sys-devel/clang-4.0.1
 1801231609 metadata/md5-cache/sys-devel/binutils-config-5-r4
 1702282333 metadata/md5-cache/sys-devel/parity-1.2.5
-1812271139 metadata/md5-cache/sys-devel/automake-1.16.1-r1
+1901160909 metadata/md5-cache/sys-devel/automake-1.16.1-r1
 1809280334 metadata/md5-cache/sys-devel/binutils-hppa64-2.28
 1812201709 metadata/md5-cache/sys-devel/bison-3.2.3
 1812271040 metadata/md5-cache/net-dialup/freeradius-3.0.17
@@ -40363,6 +40365,7 @@
 1812200339 metadata/md5-cache/net-fs/mc-2018.11.06.01.12.20
 1901101239 metadata/md5-cache/net-fs/mc-2019.01.10.00.38.22
 1811261942 metadata/md5-cache/net-fs/s3ql-2.24
+1901161909 metadata/md5-cache/app-crypt/keybase-2.13.1
 1810021239 metadata/md5-cache/app-crypt/af_alg-0.0.1
 1901131109 metadata/md5-cache/app-crypt/certbot-0.28.0
 1812271040 metadata/md5-cache/app-crypt/mit-krb5-1.16.2
@@ -40495,7 +40498,7 @@
 1812190109 metadata/md5-cache/app-crypt/johntheripper-1.7.9-r6
 1809280333 metadata/md5-cache/app-crypt/onak-0.5.0
 1809280333 metadata/md5-cache/app-crypt/jitterentropy-2.1.1
-1901160709 metadata/md5-cache/app-crypt/Manifest.gz
+1901161909 metadata/md5-cache/app-crypt/Manifest.gz
 1808252239 metadata/md5-cache/app-crypt/debian-archive-keyring-2014.3
 1809280333 metadata/md5-cache/app-crypt/libu2f-server-1.1.0
 1809280333 metadata/md5-cache/app-crypt/jetring-0.25
@@ -41294,7 +41297,6 @@
 1809280334 metadata/md5-cache/net-libs/liblockfile-1.14
 1812230010 metadata/md5-cache/net-libs/liboping-1.10.0-r1
 1809280334 metadata/md5-cache/net-libs/libnet-1.0.2a-r5
-1809280334 metadata/md5-cache/net-libs/libmicrohttpd-0.9.58
 1812260039 metadata/md5-cache/net-libs/socket_wrapper-1.1.7
 1809280334 metadata/md5-cache/net-libs/libmbim-1.10.0
 1809280334 metadata/md5-cache/net-libs/nDPI-2.2
@@ -41395,7 +41397,7 @@
 1809280334 metadata/md5-cache/net-libs/enet-1.3.13
 1812260039 metadata/md5-cache/net-libs/socket_wrapper-1.2.1
 1805012209 metadata/md5-cache/net-libs/vanessa-mcast-1.0.0
-1811290039 metadata/md5-cache/net-libs/libmicrohttpd-0.9.59
+1901160909 metadata/md5-cache/net-libs/libmicrohttpd-0.9.59
 1810021239 metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3
 1809280334 metadata/md5-cache/net-libs/libmbim-1.12.2
 1806221439 metadata/md5-cache/net-libs/gloox-1.0.21
@@ -41434,7 +41436,6 @@
 1809280334 metadata/md5-cache/net-libs/quasselc-0_p20170111
 1808310239 metadata/md5-cache/net-libs/rpcsvc-proto-0
 1810241709 metadata/md5-cache/net-libs/libesmtp-1.0.6-r2
-1801222139 metadata/md5-cache/net-libs/libmicrohttpd-0.9.55
 1809280334 metadata/md5-cache/net-libs/libiscsi-9999
 1809280334 metadata/md5-cache/net-libs/libupnp-1.8.2
 1809280334 metadata/md5-cache/net-libs/libtelnet-9999
@@ -41459,7 +41460,7 @@
 1810030549 metadata/md5-cache/net-libs/gupnp-av-0.12.10
 1812091639 metadata/md5-cache/net-libs/libmicrohttpd-0.9.62
 1809280334 metadata/md5-cache/net-libs/libmbim-1.6.0
-1901160409 metadata/md5-cache/net-libs/Manifest.gz
+1901161439 metadata/md5-cache/net-libs/Manifest.gz
 1810091539 metadata/md5-cache/net-libs/nghttp2-1.33.0
 1807061439 metadata/md5-cache/net-libs/wandio-1.0.5
 1811240139 metadata/md5-cache/net-libs/farstream-0.2.8-r2
@@ -41589,7 +41590,6 @@
 1809280334 metadata/md5-cache/net-libs/libpcap-9999
 1811261942 metadata/md5-cache/net-libs/grpc-1.15.0
 1809280334 metadata/md5-cache/net-libs/libasyncns-0.8-r3
-1706101838 metadata/md5-cache/net-libs/libmicrohttpd-0.9.52
 1809280334 metadata/md5-cache/net-libs/libmbim-1.12.4
 1810010409 metadata/md5-cache/net-libs/libbitcoinconsensus-0.16.3
 1809280334 metadata/md5-cache/net-libs/libosip-4.0.0
@@ -41654,7 +41654,6 @@
 1702282329 metadata/md5-cache/net-libs/libpri-1.5.0
 1901160409 metadata/md5-cache/net-libs/grpc-1.18.0
 1901091939 metadata/md5-cache/net-libs/nodejs-8.15.0
-1809280334 metadata/md5-cache/net-libs/libmicrohttpd-0.9.57
 1812110115 metadata/md5-cache/net-libs/libbtbb-2018.08.1
 1810021239 metadata/md5-cache/net-libs/libnetfilter_queue-1.0.2
 1809280334 metadata/md5-cache/net-libs/libosmo-abis-9999
@@ -41669,7 +41668,7 @@
 1812291409 metadata/md5-cache/net-libs/http-parser-2.9.0-r1
 1812271040 metadata/md5-cache/net-libs/phodav-2.2
 1901101910 metadata/md5-cache/net-libs/libktorrent-2.1-r1
-1812260039 metadata/md5-cache/net-libs/libssh-0.8.5
+1901161039 metadata/md5-cache/net-libs/libssh-0.8.5
 1812292309 metadata/md5-cache/net-libs/gnome-online-accounts-3.24.5
 1809280334 metadata/md5-cache/net-libs/libnids-1.24-r6
 1809280334 metadata/md5-cache/games-action/btanks-0.9.8083
@@ -41881,6 +41880,7 @@
 1809280334 metadata/md5-cache/media-plugins/vdr-skinsoppalusikka-2.2.0
 1809280334 metadata/md5-cache/media-plugins/vdr-duplicates-0.0.5
 1812110115 metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.11
+1901162309 metadata/md5-cache/media-plugins/kodi-pvr-nextpvr-3.3.12
 1901091009 metadata/md5-cache/media-plugins/gst-plugins-libpng-1.14.4
 1809280334 metadata/md5-cache/media-plugins/vdr-peer-0.0.1
 1811082009 metadata/md5-cache/media-plugins/caps-plugins-0.9.24
@@ -42103,7 +42103,7 @@
 1901091009 metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.14.4
 1810030549 metadata/md5-cache/media-plugins/gst-plugins-flac-1.14.1
 1812110115 metadata/md5-cache/media-plugins/kodi-pvr-iptvsimple-2.4.8
-1901160309 metadata/md5-cache/media-plugins/Manifest.gz
+1901162309 metadata/md5-cache/media-plugins/Manifest.gz
 1812230739 metadata/md5-cache/media-plugins/kodi-pvr-dvbviewer-3.7.8
 1810030549 metadata/md5-cache/media-plugins/gst-plugins-dv-1.14.1
 1809280334 metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.13-r100
@@ -42289,6 +42289,7 @@
 1809280334 metadata/md5-cache/media-plugins/vdr-extrecmenu-1.2.2-r2
 1809280334 metadata/md5-cache/media-plugins/vdr-weatherng-0.0.8_pre3-r1
 1812110115 metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.4
+1901161839 metadata/md5-cache/media-plugins/kodi-pvr-hts-4.4.11
 1812110115 metadata/md5-cache/media-plugins/kodi-visualization-nastyfft-9999
 1702282326 metadata/md5-cache/media-plugins/gmpc-alarm-11.8.16
 1901091009 metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.14.4
@@ -43417,7 +43418,7 @@
 1809280333 metadata/md5-cache/dev-libs/squareball-0.2.0
 1809280333 metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
 1809280333 metadata/md5-cache/dev-libs/xmlwrapp-0.8.1
-1812292239 metadata/md5-cache/dev-libs/Ice-3.6.4
+1901161909 metadata/md5-cache/dev-libs/Ice-3.6.4
 1809280333 metadata/md5-cache/dev-libs/ustr-1.0.4-r8
 1812272039 metadata/md5-cache/dev-libs/xapian-bindings-1.2.25
 1809280333 metadata/md5-cache/dev-libs/isl-0.18
@@ -43819,7 +43820,7 @@
 1810090339 metadata/md5-cache/dev-libs/skalibs-2.7.0.0
 1901030109 metadata/md5-cache/dev-libs/libcharon-3.6.0
 1901072039 metadata/md5-cache/dev-libs/jansson-2.12
-1901160239 metadata/md5-cache/dev-libs/Manifest.gz
+1901161909 metadata/md5-cache/dev-libs/Manifest.gz
 1809280333 metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
 1901151309 metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
 1809280333 metadata/md5-cache/dev-libs/libcli-1.9.7
@@ -43882,7 +43883,7 @@
 1811260809 metadata/md5-cache/dev-libs/jsonrpc-glib-3.28.1
 1809280333 metadata/md5-cache/dev-libs/libxdiff-0.23-r1
 1808151104 metadata/md5-cache/dev-libs/skalibs-2.6.1.0
-1901082309 metadata/md5-cache/dev-libs/icu-63.1-r1
+1901161809 metadata/md5-cache/dev-libs/icu-63.1-r1
 1809280333 metadata/md5-cache/dev-libs/mpfr-3.1.6
 1809280333 metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1-r1
 1809280333 metadata/md5-cache/dev-libs/pcc-libs-1.1.0
@@ -44118,7 +44119,7 @@
 1812110115 metadata/md5-cache/dev-libs/qrosscore-0.3.2
 1804182338 metadata/md5-cache/dev-libs/mm-1.4.2-r2
 1812281339 metadata/md5-cache/dev-libs/ell-0.16
-1901160139 metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1-r1
+1901161839 metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1-r1
 1804142309 metadata/md5-cache/dev-libs/libmowgli-2.1.3
 1901142209 metadata/md5-cache/dev-libs/spdlog-1.3.0
 1809280333 metadata/md5-cache/dev-libs/fampp2-7.0.1-r3
@@ -45643,7 +45644,7 @@
 1901072339 metadata/md5-cache/sys-kernel/pf-sources-4.8_p8
 1809280334 metadata/md5-cache/sys-kernel/raspberrypi-image-4.1.17_p20160209
 1901072339 metadata/md5-cache/sys-kernel/ck-sources-4.14.66
-1901080039 metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
+1901161809 metadata/md5-cache/sys-kernel/linux-headers-4.14-r1
 1901072339 metadata/md5-cache/sys-kernel/aufs-sources-4.14.83
 1809280334 metadata/md5-cache/sys-kernel/genkernel-3.4.52.4-r1
 1809280334 metadata/md5-cache/sys-kernel/genkernel-3.4.52.4-r3
@@ -45700,7 +45701,7 @@
 1901140009 metadata/md5-cache/sys-kernel/gentoo-sources-4.20.2
 1901072339 metadata/md5-cache/sys-kernel/linux-headers-3.18
 1901092309 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.92
-1901151809 metadata/md5-cache/sys-kernel/Manifest.gz
+1901161809 metadata/md5-cache/sys-kernel/Manifest.gz
 1901072339 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.143
 1901072339 metadata/md5-cache/sys-kernel/linux-headers-4.9
 1812231639 metadata/md5-cache/sys-kernel/linux-firmware-99999999
@@ -45887,7 +45888,7 @@
 1812130639 metadata/md5-cache/media-gfx/pqiv-9999
 1809280334 metadata/md5-cache/media-gfx/gif2png-2.5.11
 1805012209 metadata/md5-cache/media-gfx/mkgallery-1.1
-1811241709 metadata/md5-cache/media-gfx/gphoto2-2.5.15
+1901161039 metadata/md5-cache/media-gfx/gphoto2-2.5.15
 1811261942 metadata/md5-cache/media-gfx/termtosvg-0.4.0
 1810030549 metadata/md5-cache/media-gfx/feh-2.26.4
 1810030549 metadata/md5-cache/media-gfx/sxiv-9999
@@ -45897,7 +45898,7 @@
 1809280334 metadata/md5-cache/media-gfx/jpeg2ps-1.9-r1
 1810030549 metadata/md5-cache/media-gfx/eog-plugins-3.26.3
 1706300138 metadata/md5-cache/media-gfx/pixels2pgf-0.1
-1901110409 metadata/md5-cache/media-gfx/inkscape-0.92.3-r1
+1901162309 metadata/md5-cache/media-gfx/inkscape-0.92.3-r1
 1901030109 metadata/md5-cache/media-gfx/curaengine-3.4.1
 1812291639 metadata/md5-cache/media-gfx/luminance-hdr-2.5.1-r1
 1809280334 metadata/md5-cache/media-gfx/swftools-0.9.2-r1
@@ -46077,7 +46078,7 @@
 1901020639 metadata/md5-cache/media-gfx/libimagequant-2.12.2
 1812110115 metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r3
 1809280334 metadata/md5-cache/media-gfx/openexr_viewers-2.2.0
-1901160639 metadata/md5-cache/media-gfx/Manifest.gz
+1901162309 metadata/md5-cache/media-gfx/Manifest.gz
 1810182239 metadata/md5-cache/media-gfx/ahoviewer-1.6.4
 1812110115 metadata/md5-cache/media-gfx/lximage-qt-0.7.0
 1812190209 metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0
@@ -46178,7 +46179,7 @@
 1812280409 metadata/md5-cache/media-gfx/displaycal-3.7.1.3
 1812300109 metadata/md5-cache/media-gfx/nomacs-3.12
 1709261639 metadata/md5-cache/media-gfx/evoluspencil-2.0.5
-1812312039 metadata/md5-cache/media-gfx/photoqt-1.7.1
+1901161839 metadata/md5-cache/media-gfx/photoqt-1.7.1
 1811130041 metadata/md5-cache/media-gfx/plantuml-8046
 1811101609 metadata/md5-cache/media-gfx/mkgallery-1.1-r1
 1809280334 metadata/md5-cache/media-gfx/apngasm-2.7
@@ -46674,7 +46675,7 @@
 1809280334 metadata/md5-cache/dev-vcs/svn2git-9999
 1901081809 metadata/md5-cache/dev-vcs/mercurial-4.7.2
 1812230010 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
-1901160139 metadata/md5-cache/dev-vcs/Manifest.gz
+1901161839 metadata/md5-cache/dev-vcs/Manifest.gz
 1809280334 metadata/md5-cache/dev-vcs/git-mailz-0.12
 1809280334 metadata/md5-cache/dev-vcs/cvs-fast-export-1.38
 1705101908 metadata/md5-cache/dev-vcs/mr-1.20170129
@@ -46748,7 +46749,7 @@
 1812230010 metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3.2
 1812230010 metadata/md5-cache/dev-vcs/gitolite-9999
 1812230010 metadata/md5-cache/dev-vcs/gitolite-gentoo-9999
-1901160139 metadata/md5-cache/dev-vcs/subversion-1.10.3
+1901161839 metadata/md5-cache/dev-vcs/subversion-1.10.3
 1710071439 metadata/md5-cache/dev-vcs/guilt-0.36
 1811261942 metadata/md5-cache/dev-vcs/hgsvn-0.2.3-r1
 1801012010 metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
@@ -47280,7 +47281,7 @@
 1901100039 metadata/md5-cache/app-editors/neovim-0.3.2
 1808151104 metadata/md5-cache/app-editors/jed-0.99.19
 1811251739 metadata/md5-cache/app-editors/emacs-vcs-26.1.9999
-1901101910 metadata/md5-cache/app-editors/kile-2.9.92-r1
+1901161839 metadata/md5-cache/app-editors/kile-2.9.92-r1
 1812290139 metadata/md5-cache/app-editors/vim-9999
 1809280333 metadata/md5-cache/app-editors/nano-9999
 1809280333 metadata/md5-cache/app-editors/fte-20051115-r3
@@ -47310,7 +47311,6 @@
 1812261140 metadata/md5-cache/app-editors/vim-8.1.0412-r1
 1811261942 metadata/md5-cache/app-editors/qhexedit2-0.8.4_p20170719
 1810030549 metadata/md5-cache/app-editors/gummi-0.6.6-r2
-1901101910 metadata/md5-cache/app-editors/kile-2.9.92
 1711132308 metadata/md5-cache/app-editors/le-1.16.5
 1810030549 metadata/md5-cache/app-editors/beaver-0.4.1
 1812290039 metadata/md5-cache/app-editors/neovim-0.3.1-r1
@@ -47381,7 +47381,7 @@
 1811110209 metadata/md5-cache/app-editors/atom-1.32.1
 1809280333 metadata/md5-cache/app-editors/ee-1.5.2
 1812110115 metadata/md5-cache/app-editors/neovim-0.3.1
-1901140309 metadata/md5-cache/app-editors/Manifest.gz
+1901161939 metadata/md5-cache/app-editors/Manifest.gz
 1901101910 metadata/md5-cache/app-editors/okteta-0.25.4
 1811130041 metadata/md5-cache/app-editors/jedit-5.2.0-r1
 1809280333 metadata/md5-cache/app-editors/emacs-24.5-r5
@@ -47668,7 +47668,7 @@
 1901101910 metadata/md5-cache/kde-plasma/khotkeys-5.14.3
 1901101910 metadata/md5-cache/kde-plasma/breeze-gtk-5.14.5
 1901101910 metadata/md5-cache/kde-plasma/bluedevil-5.14.3
-1901101910 metadata/md5-cache/kde-plasma/Manifest.gz
+1901161139 metadata/md5-cache/kde-plasma/Manifest.gz
 1901101910 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.14.5
 1901101910 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.14.5
 1901101910 metadata/md5-cache/kde-plasma/powerdevil-5.14.3-r1
@@ -47693,12 +47693,12 @@
 1901101910 metadata/md5-cache/kde-plasma/ksshaskpass-5.14.5
 1901101910 metadata/md5-cache/kde-plasma/ksysguard-5.14.3
 1901101910 metadata/md5-cache/kde-plasma/plasma-nm-5.14.5
-1901101910 metadata/md5-cache/kde-plasma/kinfocenter-5.14.5
 1901101910 metadata/md5-cache/kde-plasma/kgamma-5.14.3
 1901101910 metadata/md5-cache/kde-plasma/milou-5.14.5
 1901101910 metadata/md5-cache/kde-plasma/libkworkspace-5.14.3
 1901101910 metadata/md5-cache/kde-plasma/kmenuedit-5.14.3
 1901091310 metadata/md5-cache/kde-plasma/plasma-meta-5.14.3-r1
+1901161139 metadata/md5-cache/kde-plasma/kinfocenter-5.14.5-r1
 1901101910 metadata/md5-cache/kde-plasma/kwin-5.14.5
 1901101910 metadata/md5-cache/kde-plasma/plasma-desktop-5.14.5
 1901101910 metadata/md5-cache/kde-plasma/kwrited-5.14.5
@@ -47789,7 +47789,7 @@
 1811130041 metadata/md5-cache/dev-lang/tuprolog-2.9.2
 1810172209 metadata/md5-cache/dev-lang/tcl-8.6.8
 1812112039 metadata/md5-cache/dev-lang/ruby-2.3.8-r1
-1901141709 metadata/md5-cache/dev-lang/swi-prolog-8.0.0
+1901161809 metadata/md5-cache/dev-lang/swi-prolog-8.0.0
 1812252309 metadata/md5-cache/dev-lang/rust-1.30.1-r1
 1809280333 metadata/md5-cache/dev-lang/smlnj-110.75
 1810011609 metadata/md5-cache/dev-lang/python-3.6.5-r1
@@ -47868,7 +47868,7 @@
 1811130041 metadata/md5-cache/dev-lang/nqp-9999
 1811130041 metadata/md5-cache/dev-lang/tuprolog-3.1.0
 1811111440 metadata/md5-cache/dev-lang/whitespace-0.4
-1901160139 metadata/md5-cache/dev-lang/Manifest.gz
+1901161809 metadata/md5-cache/dev-lang/Manifest.gz
 1811111440 metadata/md5-cache/dev-lang/ghc-7.10.3
 1812271040 metadata/md5-cache/dev-lang/erlang-21.1.1
 1901160139 metadata/md5-cache/dev-lang/mujs-1.0.5
@@ -48041,6 +48041,7 @@
 1811271439 metadata/md5-cache/dev-python/dominate-2.3.5
 1811261942 metadata/md5-cache/dev-python/pytoml-0.1.18
 1901052039 metadata/md5-cache/dev-python/greenlet-0.4.12
+1901161839 metadata/md5-cache/dev-python/oslo-cache-1.30.1
 1811261942 metadata/md5-cache/dev-python/statsmodels-0.8.0
 1811261942 metadata/md5-cache/dev-python/automat-0.6.0
 1811261942 metadata/md5-cache/dev-python/boto-2.48.0
@@ -48170,6 +48171,7 @@
 1811261942 metadata/md5-cache/dev-python/widgetsnbextension-3.0.0
 1811261942 metadata/md5-cache/dev-python/keystonemiddleware-4.17.0
 1811261942 metadata/md5-cache/dev-python/python-pam-0.1.4
+1901161639 metadata/md5-cache/dev-python/pymysql-0.9.3
 1811261942 metadata/md5-cache/dev-python/d2to1-0.2.12_p1
 1811261942 metadata/md5-cache/dev-python/stripe-2.10.1
 1811261942 metadata/md5-cache/dev-python/guppy-0.1.10-r1
@@ -48254,6 +48256,7 @@
 1811261942 metadata/md5-cache/dev-python/cursive-0.1.2
 1811261942 metadata/md5-cache/dev-python/async_generator-1.10
 1811261942 metadata/md5-cache/dev-python/oslo-messaging-5.35.1
+1901161809 metadata/md5-cache/dev-python/clang-python-8.0.9999
 1811261942 metadata/md5-cache/dev-python/rply-0.7.6
 1811261942 metadata/md5-cache/dev-python/requests-2.18.2-r2
 1811261942 metadata/md5-cache/dev-python/gevent-websocket-0.9.3
@@ -48626,6 +48629,7 @@
 1811261942 metadata/md5-cache/dev-python/cssselect-1.0.1
 1901081209 metadata/md5-cache/dev-python/rosdistro-0.7.0
 1811261942 metadata/md5-cache/dev-python/wsproto-0.12.0
+1901161809 metadata/md5-cache/dev-python/lit-8.0.9999
 1811261942 metadata/md5-cache/dev-python/python-neutronclient-6.7.0
 1811261942 metadata/md5-cache/dev-python/enzyme-9999
 1811261942 metadata/md5-cache/dev-python/munch-2.2.0
@@ -49228,6 +49232,7 @@
 1811261942 metadata/md5-cache/dev-python/flask-api-1.0
 1811261942 metadata/md5-cache/dev-python/openpyxl-2.4.11
 1811261942 metadata/md5-cache/dev-python/kombu-4.2.1
+1901161839 metadata/md5-cache/dev-python/oslo-service-1.31.7
 1811261942 metadata/md5-cache/dev-python/flask-paranoid-0.1.0
 1811261942 metadata/md5-cache/dev-python/imageio-2.0.1
 1811261942 metadata/md5-cache/dev-python/spyder-4.0.0_beta1
@@ -49836,7 +49841,7 @@
 1811261942 metadata/md5-cache/dev-python/watchdog-0.8.3-r1
 1811261942 metadata/md5-cache/dev-python/theano-0.9.0
 1811261942 metadata/md5-cache/dev-python/python-magic-0.4.15
-1901160409 metadata/md5-cache/dev-python/Manifest.gz
+1901161839 metadata/md5-cache/dev-python/Manifest.gz
 1811261942 metadata/md5-cache/dev-python/mamba-0.8.6
 1812151239 metadata/md5-cache/dev-python/cython-0.29.2
 1811261942 metadata/md5-cache/dev-python/spyder-3.2.4
@@ -49931,6 +49936,7 @@
 1811261942 metadata/md5-cache/dev-python/ropemacs-0.8
 1811261942 metadata/md5-cache/dev-python/jwcrypto-0.4.2
 1811261942 metadata/md5-cache/dev-python/python-lzo-1.08-r1
+1901161839 metadata/md5-cache/dev-python/os-brick-2.5.4
 1811261942 metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-0.1.3
 1811261942 metadata/md5-cache/dev-python/os-networksv2-python-novaclient-ext-0.26
 1811261942 metadata/md5-cache/dev-python/imageio-1.5
@@ -50396,6 +50402,7 @@
 1811261942 metadata/md5-cache/dev-python/nltk-3.2.3
 1811261942 metadata/md5-cache/dev-python/os-vif-1.9.1
 1811261942 metadata/md5-cache/dev-python/ip-associations-python-novaclient-ext-0.2
+1901161839 metadata/md5-cache/dev-python/ovsdbapp-0.12.2
 1811261942 metadata/md5-cache/dev-python/disqus-python-0.4.2
 1811261942 metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1
 1811261942 metadata/md5-cache/dev-python/cherrypy-13.1.0
@@ -51711,7 +51718,7 @@
 1809280333 metadata/md5-cache/dev-ml/ounit-2.0.6
 1705081338 metadata/md5-cache/dev-ml/biniou-1.0.13
 1705181708 metadata/md5-cache/dev-ml/ocaml-redis-sync-0.3.5
-1812301509 metadata/md5-cache/dev-ml/Manifest.gz
+1901161809 metadata/md5-cache/dev-ml/Manifest.gz
 1704021208 metadata/md5-cache/dev-ml/async_kernel-0.9.0
 1809280333 metadata/md5-cache/dev-ml/eliom-6.2.0
 1809280333 metadata/md5-cache/dev-ml/ocaml-cohttp-0.22.0
@@ -51777,6 +51784,7 @@
 1802120109 metadata/md5-cache/dev-ml/iTeML-2.5
 1702282313 metadata/md5-cache/dev-ml/gen_js_api-1.0.3
 1802120109 metadata/md5-cache/dev-ml/iTeML-2.7
+1901161809 metadata/md5-cache/dev-ml/llvm-ocaml-8.0.9999
 1808151104 metadata/md5-cache/dev-ml/postgresql-ocaml-4.1.0
 1808151104 metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.0.7
 1808151104 metadata/md5-cache/dev-ml/ocaml-uri-1.9.4
@@ -52087,7 +52095,6 @@
 1809280333 metadata/md5-cache/app-shells/squirrelsh-1.2.7
 1809280333 metadata/md5-cache/app-shells/rssh-2.3.4_p3
 1809280333 metadata/md5-cache/app-shells/dash-0.5.9.1-r3
-1812281339 metadata/md5-cache/app-shells/bash-4.4_p23
 1809280333 metadata/md5-cache/app-shells/bash-4.0_p44
 1809280333 metadata/md5-cache/app-shells/tcsh-6.20.00
 1806071339 metadata/md5-cache/app-shells/pdsh-2.26-r1
@@ -52100,7 +52107,7 @@
 1901101239 metadata/md5-cache/app-shells/fish-3.0.0-r1
 1809280333 metadata/md5-cache/app-shells/heirloom-sh-050706-r1
 1809280333 metadata/md5-cache/app-shells/localshell-1.3.4-r1
-1810190539 metadata/md5-cache/app-shells/loksh-6.4
+1901161139 metadata/md5-cache/app-shells/loksh-6.4
 1809280333 metadata/md5-cache/app-shells/rssh-2.3.4
 1809280333 metadata/md5-cache/app-shells/mpv-bash-completion-3.3.17
 1811150109 metadata/md5-cache/app-shells/bashdb-4.4.1.0.0
@@ -52125,14 +52132,14 @@
 1901090309 metadata/md5-cache/app-shells/mcfly-0.3.1
 1811140109 metadata/md5-cache/app-shells/hstr-2.0
 1810181039 metadata/md5-cache/app-shells/posh-0.13.2
-1901160139 metadata/md5-cache/app-shells/Manifest.gz
+1901161409 metadata/md5-cache/app-shells/Manifest.gz
 1702282309 metadata/md5-cache/app-shells/bashdb-4.3.0.91-r2
 1809280333 metadata/md5-cache/app-shells/gentoo-bashcomp-20140911-r1
 1809280333 metadata/md5-cache/app-shells/mksh-52
 1812191709 metadata/md5-cache/app-shells/zsh-completions-0.29.0
 1809280333 metadata/md5-cache/app-shells/ccsh-0.0.4-r4
 1809280333 metadata/md5-cache/app-shells/smrsh-8.15.2
-1812010539 metadata/md5-cache/app-shells/fzy-1.0
+1901161139 metadata/md5-cache/app-shells/fzy-1.0
 1809280333 metadata/md5-cache/app-shells/bash-4.4_p12
 1809280333 metadata/md5-cache/app-shells/zsh-9999
 1809280333 metadata/md5-cache/app-shells/bash-3.1_p23
@@ -52154,11 +52161,11 @@
 1809280333 metadata/md5-cache/app-shells/dash-0.5.10.2
 1809280333 metadata/md5-cache/app-shells/gentoo-bashcomp-20140911
 1812222239 metadata/md5-cache/app-shells/bashdb-4.4.1.0.1
-1812010539 metadata/md5-cache/app-shells/fzy-9999
+1901161139 metadata/md5-cache/app-shells/fzy-9999
 1809280333 metadata/md5-cache/app-shells/mksh-52c
 1812200339 metadata/md5-cache/app-shells/peco-0.5.2
 1809280333 metadata/md5-cache/app-shells/ksh-93.20140625
-1901160139 metadata/md5-cache/app-shells/bash-4.4_p23-r1
+1901161409 metadata/md5-cache/app-shells/bash-4.4_p23-r1
 1809280333 metadata/md5-cache/app-shells/esh-0.8.5-r2
 1812300309 metadata/md5-cache/app-shells/fish-9999
 1901052039 metadata/md5-cache/app-shells/quoter-3.0_p2-r1
@@ -52419,7 +52426,6 @@
 1810030549 metadata/md5-cache/app-office/texstudio-2.12.6-r1
 1810030549 metadata/md5-cache/app-office/openoffice-bin-4.1.4
 1810030549 metadata/md5-cache/app-office/texstudio-2.12.8-r1
-1901101910 metadata/md5-cache/app-office/calligra-3.1.0-r2
 1901101910 metadata/md5-cache/app-office/skrooge-2.16.2
 1810030549 metadata/md5-cache/app-office/dia-0.97.3
 1810030549 metadata/md5-cache/app-office/abiword-docs-3.0.1
@@ -52431,7 +52437,7 @@
 1809280333 metadata/md5-cache/app-office/multitalk-1.4-r1
 1812110115 metadata/md5-cache/app-office/gnucash-3.3-r1
 1809280333 metadata/md5-cache/app-office/QtBitcoinTrader-1.10.01
-1901160139 metadata/md5-cache/app-office/Manifest.gz
+1901161939 metadata/md5-cache/app-office/Manifest.gz
 1812110115 metadata/md5-cache/app-office/gnucash-3.3
 1901101910 metadata/md5-cache/app-office/skrooge-2.17.0
 1805012209 metadata/md5-cache/app-office/ooextras-20060909
@@ -52439,7 +52445,7 @@
 1810030549 metadata/md5-cache/app-office/homebank-5.1.3
 1810030549 metadata/md5-cache/app-office/dia2code-1.0.0
 1811172339 metadata/md5-cache/app-office/moneydance-2017.8
-1901160139 metadata/md5-cache/app-office/calligra-3.1.0-r3
+1901161939 metadata/md5-cache/app-office/calligra-3.1.0-r3
 1809280333 metadata/md5-cache/app-office/eqe-1.3.0
 1810030549 metadata/md5-cache/app-office/wps-office-10.1.0.5707_alpha21-r2
 1901082309 metadata/md5-cache/app-office/libreoffice-l10n-6.1.4.2
@@ -52459,7 +52465,7 @@
 1812021739 metadata/md5-cache/app-office/grisbi-1.0.4
 1901101910 metadata/md5-cache/app-office/libalkimia-7.0.2
 1809280333 metadata/md5-cache/app-office/QtBitcoinTrader-9999
-1901102239 metadata/md5-cache/app-office/libreoffice-6.2.0.2
+1901161239 metadata/md5-cache/app-office/libreoffice-6.2.0.2
 1810030549 metadata/md5-cache/app-office/openoffice-bin-4.1.5
 1812310509 metadata/md5-cache/app-office/libreoffice-9999
 1901082309 metadata/md5-cache/app-office/libreoffice-6.1.4.2
@@ -52468,7 +52474,7 @@
 1809280333 metadata/md5-cache/app-office/libreoffice-l10n-6.0.6.2
 1810030549 metadata/md5-cache/app-office/texstudio-2.11.2-r2
 1809280333 metadata/md5-cache/app-office/sc-7.16-r2
-1901091310 metadata/md5-cache/app-office/libreoffice-6.2.9999
+1901161239 metadata/md5-cache/app-office/libreoffice-6.2.9999
 1901160139 metadata/md5-cache/app-office/calligraplan-3.1.0
 1810030549 metadata/md5-cache/app-office/abiword-3.0.2-r1
 1810030549 metadata/md5-cache/app-office/pinpoint-0.1.8-r1
@@ -52699,7 +52705,7 @@
 1805121638 metadata/md5-cache/net-analyzer/ipsumdump-1.86
 1812230010 metadata/md5-cache/net-analyzer/nagios-plugin-check_raid-4.0.8
 1812271040 metadata/md5-cache/net-analyzer/ndoutils-2.1.3-r1
-1812261140 metadata/md5-cache/net-analyzer/metasploit-4.17.21-r4
+1901162239 metadata/md5-cache/net-analyzer/metasploit-4.17.21-r4
 1812271040 metadata/md5-cache/net-analyzer/icinga2-2.9.1-r2
 1809280334 metadata/md5-cache/net-analyzer/snort-2.9.4.6-r1
 1809280334 metadata/md5-cache/net-analyzer/amap-5.4
@@ -52793,7 +52799,7 @@
 1812271040 metadata/md5-cache/net-analyzer/zabbix-3.0.22
 1812271040 metadata/md5-cache/net-analyzer/vnstat-9999
 1809280334 metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p4_p1
-1901111409 metadata/md5-cache/net-analyzer/Manifest.gz
+1901162239 metadata/md5-cache/net-analyzer/Manifest.gz
 1809280334 metadata/md5-cache/net-analyzer/iftop-1.0_pre4-r2
 1805012209 metadata/md5-cache/net-analyzer/neti-2.0
 1809280334 metadata/md5-cache/net-analyzer/sinfo-0.0.48
@@ -53105,7 +53111,7 @@
 1811072339 metadata/md5-cache/dev-ada/xmlada-2018
 1811101939 metadata/md5-cache/dev-ada/gnatmem-2018
 1811270009 metadata/md5-cache/dev-ada/libadalang-2018
-1901022139 metadata/md5-cache/dev-ada/Manifest.gz
+1901161039 metadata/md5-cache/dev-ada/Manifest.gz
 1811102339 metadata/md5-cache/dev-ada/gtkada-2017
 1811101939 metadata/md5-cache/dev-ada/gnatsymbolize-2018
 1811202109 metadata/md5-cache/dev-ada/gnatcoll-core-2018
@@ -53116,7 +53122,7 @@
 1809280333 metadata/md5-cache/dev-ada/gps-bin-2016
 1811302239 metadata/md5-cache/dev-ada/gprbuild-2018-r3
 1811221009 metadata/md5-cache/dev-ada/langkit-2018
-1811272239 metadata/md5-cache/dev-ada/aws-2018
+1901161039 metadata/md5-cache/dev-ada/aws-2018
 1901022139 metadata/md5-cache/dev-ada/gps-2018-r1
 1702282336 metadata/md5-cache/x11-themes/gentoo-artwork-0.4.2-r1
 1809280334 metadata/md5-cache/x11-themes/laughlin-backgrounds-14.1.0.3-r1
@@ -54277,7 +54283,6 @@
 1811020409 metadata/md5-cache/dev-php/PEAR-Net_IPv6-1.3.0_beta4
 1811020409 metadata/md5-cache/dev-php/PEAR-OLE-1.0.0_rc3
 1810230009 metadata/md5-cache/dev-php/igbinary-2.0.8
-1809280333 metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.3-r1
 1809280333 metadata/md5-cache/dev-php/pecl-redis-4.0.2
 1705041608 metadata/md5-cache/dev-php/symfony-dependency-injection-2.8.20
 1805212239 metadata/md5-cache/dev-php/securimage-3.6.5
@@ -54338,6 +54343,7 @@
 1809280333 metadata/md5-cache/dev-php/swoole-4.0.4
 1809040339 metadata/md5-cache/dev-php/adodb-5.20.13
 1707271838 metadata/md5-cache/dev-php/cphplib-0.51-r1
+1901161809 metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.5
 1711141808 metadata/md5-cache/dev-php/sebastian-global-state-1.1.1
 1812181839 metadata/md5-cache/dev-php/swoole-4.2.9
 1809280333 metadata/md5-cache/dev-php/pecl-dbx-1.1.2-r2
@@ -54421,6 +54427,7 @@
 1812192039 metadata/md5-cache/dev-php/PHP_CodeCoverage-4.0.7-r1
 1811020409 metadata/md5-cache/dev-php/PEAR-Date-1.5.0_alpha4-r1
 1812230239 metadata/md5-cache/dev-php/psr-log-1.1.0
+1901161709 metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.4-r1
 1702282315 metadata/md5-cache/dev-php/pear-1.10.3
 1811020409 metadata/md5-cache/dev-php/PEAR-Net_Socket-1.2.2
 1809280333 metadata/md5-cache/dev-php/pecl-mongodb-1.3.3
@@ -54458,7 +54465,7 @@
 1703121808 metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.3
 1811020409 metadata/md5-cache/dev-php/PEAR-Image_Color2-0.1.5-r1
 1702282315 metadata/md5-cache/dev-php/phar-utils-1.0.0
-1901160139 metadata/md5-cache/dev-php/Manifest.gz
+1901161809 metadata/md5-cache/dev-php/Manifest.gz
 1811020409 metadata/md5-cache/dev-php/PEAR-MDB2-2.5.0_beta5-r1
 1809280333 metadata/md5-cache/dev-php/pecl-http-2.6.0-r1
 1812180409 metadata/md5-cache/dev-php/pecl-redis-4.2.0
@@ -54909,7 +54916,7 @@
 1811261942 metadata/md5-cache/app-text/paperwork-backend-1.2.4
 1810061809 metadata/md5-cache/app-text/qpdfview-0.4.18_pre3-r1
 1809280333 metadata/md5-cache/app-text/ding-1.8.1
-1901160709 metadata/md5-cache/app-text/Manifest.gz
+1901170009 metadata/md5-cache/app-text/Manifest.gz
 1809280333 metadata/md5-cache/app-text/writerperfect-0.9.5
 1805012209 metadata/md5-cache/app-text/vlna-1.5
 1810101009 metadata/md5-cache/app-text/htp-1.19
@@ -55018,6 +55025,7 @@
 1811261942 metadata/md5-cache/app-text/restview-2.7.0
 1811290039 metadata/md5-cache/app-text/hunspell-1.6.2-r1
 1809280333 metadata/md5-cache/app-text/asa-1.1-r1
+1901170009 metadata/md5-cache/app-text/master-pdf-editor-5.2.00
 1812230010 metadata/md5-cache/app-text/po4a-0.47-r1
 1812261140 metadata/md5-cache/app-text/xmlformat-1.04
 1801231609 metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.78.0
@@ -55046,6 +55054,7 @@
 1805012209 metadata/md5-cache/app-text/freepwing-1.4.3
 1811261942 metadata/md5-cache/app-text/pelican-3.7.1
 1811261942 metadata/md5-cache/app-text/keepnote-0.7.9-r2
+1901161639 metadata/md5-cache/app-text/zathura-0.4.3
 1811061039 metadata/md5-cache/app-text/ghostscript-gpl-9.25
 1812240209 metadata/md5-cache/app-text/goldendict-1.5.0_rc2-r2
 1809280333 metadata/md5-cache/app-text/cutemarked-0.11.3-r1
@@ -55954,7 +55963,7 @@
 1809280334 metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1
 1809280334 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1
 1809280334 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1_p1
-1901160709 metadata/md5-cache/Manifest.gz
+1901170009 metadata/md5-cache/Manifest.gz
 1809280334 metadata/md5-cache/www-apache/mod_macro-1.1.10
 1809280334 metadata/md5-cache/www-apache/mod_wsgi-4.5.17
 1812230010 metadata/md5-cache/www-apache/mod_perl-2.0.10
@@ -55991,7 +56000,7 @@
 1809280334 metadata/md5-cache/www-apache/mod_xml2enc-1.0.3
 1808151104 metadata/md5-cache/www-apache/mod_h2-1.10.10
 1809280334 metadata/md5-cache/www-apache/mod_macro-1.2.1
-1901160139 metadata/md5-cache/www-apache/Manifest.gz
+1901162309 metadata/md5-cache/www-apache/Manifest.gz
 1809280334 metadata/md5-cache/www-apache/mod_log_rotate-1.00
 1809280334 metadata/md5-cache/www-apache/mod_vhost_ldap-2.4.0-r1
 1809280334 metadata/md5-cache/www-apache/mod_nss-1.0.12-r1
@@ -56014,7 +56023,7 @@
 1809280334 metadata/md5-cache/www-apache/anyterm-1.1.29-r1
 1809280334 metadata/md5-cache/www-apache/mod_authnz_external-3.3.2
 1809280334 metadata/md5-cache/www-apache/mod_vdbh-1.0.3-r1
-1901160139 metadata/md5-cache/www-apache/passenger-5.3.7
+1901162309 metadata/md5-cache/www-apache/passenger-5.3.7
 1809280334 metadata/md5-cache/www-apache/mod_caucho-4.0.47
 1812230010 metadata/md5-cache/www-apache/libapreq2-2.13-r1
 1808151104 metadata/md5-cache/www-apache/modsec-flameeyes-20130216
@@ -56158,7 +56167,7 @@
 1811251839 metadata/md5-cache/dev-util/mingw-runtime-4.0.3.1
 1811101839 metadata/md5-cache/dev-util/uftrace-0.9.1
 1702282321 metadata/md5-cache/dev-util/android-ndk-9d
-1901160139 metadata/md5-cache/dev-util/netsurf-buildsystem-1.7
+1901161839 metadata/md5-cache/dev-util/netsurf-buildsystem-1.7
 1811261942 metadata/md5-cache/dev-util/meson-0.48.1
 1812170209 metadata/md5-cache/dev-util/geany-1.34
 1811261942 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-0.9.12
@@ -56189,7 +56198,7 @@
 1901072239 metadata/md5-cache/dev-util/ostree-2018.5
 1702282322 metadata/md5-cache/dev-util/shtool-2.0.8-r1
 1812200339 metadata/md5-cache/dev-util/docker-ls-0.3.1
-1812260039 metadata/md5-cache/dev-util/glslang-7.10.2984
+1901161839 metadata/md5-cache/dev-util/glslang-7.10.2984
 1812260039 metadata/md5-cache/dev-util/spirv-tools-2018.4
 1812020639 metadata/md5-cache/dev-util/tup-0.7.8
 1811201839 metadata/md5-cache/dev-util/ninja-1.8.2-r1
@@ -56234,9 +56243,10 @@
 1811130041 metadata/md5-cache/dev-util/weka-3.8.0
 1812261140 metadata/md5-cache/dev-util/cucumber-3.0.2-r1
 1809280334 metadata/md5-cache/dev-util/android-sdk-update-manager-21.1
+1901161439 metadata/md5-cache/dev-util/debootstrap-1.0.114
 1809280334 metadata/md5-cache/dev-util/google-perftools-2.6.2
 1702282321 metadata/md5-cache/dev-util/complexity-1.10
-1812260039 metadata/md5-cache/dev-util/spirv-tools-2018.5
+1901161839 metadata/md5-cache/dev-util/spirv-tools-2018.5
 1810021239 metadata/md5-cache/dev-util/perf-3.15.5
 1812270609 metadata/md5-cache/dev-util/cucumber-core-3.2.1
 1805012209 metadata/md5-cache/dev-util/smem-20071119_p1
@@ -56314,7 +56324,6 @@
 1802061838 metadata/md5-cache/dev-util/vbindiff-3.0_beta5
 1901160209 metadata/md5-cache/dev-util/strace-4.25
 1901101910 metadata/md5-cache/dev-util/kdevelop-5.2.4
-1812271809 metadata/md5-cache/dev-util/debootstrap-1.0.112
 1806081509 metadata/md5-cache/dev-util/byacc-20170201
 1901160239 metadata/md5-cache/dev-util/geany-plugins-1.34
 1809280334 metadata/md5-cache/dev-util/repo-1.12.37
@@ -56509,6 +56518,7 @@
 1812260039 metadata/md5-cache/dev-util/ignition-cmake-0.2.0
 1809280334 metadata/md5-cache/dev-util/android-tools-5.1.1_p13
 1808151104 metadata/md5-cache/dev-util/obs-service-rearchive-20130802
+1901161809 metadata/md5-cache/dev-util/lldb-8.0.9999
 1810171109 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-7.5.18-r2
 1809280334 metadata/md5-cache/dev-util/intel-ocl-sdk-2.0.31360
 1810021239 metadata/md5-cache/dev-util/perf-3.13.1-r1
@@ -56517,7 +56527,7 @@
 1811251839 metadata/md5-cache/dev-util/mingw64-runtime-6.0.0-r1
 1809280334 metadata/md5-cache/dev-util/ragel-6.9
 1810171109 metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
-1901160239 metadata/md5-cache/dev-util/Manifest.gz
+1901161909 metadata/md5-cache/dev-util/Manifest.gz
 1809280334 metadata/md5-cache/dev-util/xdelta-3.1.0
 1809280334 metadata/md5-cache/dev-util/dmake-4.12.2
 1809280334 metadata/md5-cache/dev-util/dissembler-0.9-r1
@@ -56566,7 +56576,7 @@
 1809280334 metadata/md5-cache/dev-util/global-6.3.1
 1702282321 metadata/md5-cache/dev-util/fix-la-relink-command-0.1.1
 1812110115 metadata/md5-cache/dev-util/bcc-0.7.0
-1812260039 metadata/md5-cache/dev-util/cmocka-1.1.1
+1901161039 metadata/md5-cache/dev-util/cmocka-1.1.1
 1806180109 metadata/md5-cache/dev-util/shards-0.8.1
 1812230010 metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r2
 1901070209 metadata/md5-cache/dev-util/packer-1.3.3
@@ -56627,7 +56637,7 @@
 1808151104 metadata/md5-cache/dev-util/obs-service-source_validator-0.3
 1812260039 metadata/md5-cache/dev-util/vulkan-tools-9999
 1812201609 metadata/md5-cache/dev-util/lldb-7.0.1
-1812110115 metadata/md5-cache/dev-util/spirv-headers-1.3.4_pre20180917
+1901161839 metadata/md5-cache/dev-util/spirv-headers-1.3.4_pre20180917
 1809280334 metadata/md5-cache/dev-util/valgrind-3.13.0-r3
 1901061939 metadata/md5-cache/dev-util/rr-5.2.0
 1901090309 metadata/md5-cache/dev-util/cbindgen-0.6.7
@@ -56657,7 +56667,7 @@
 1811261942 metadata/md5-cache/dev-util/spec-cleaner-9999
 1811261942 metadata/md5-cache/dev-util/buildbot-pkg-1.3.0
 1810030549 metadata/md5-cache/dev-util/codeblocks-9999
-1812030909 metadata/md5-cache/dev-util/shellcheck-bin-0.6.0
+1901161209 metadata/md5-cache/dev-util/shellcheck-bin-0.6.0
 1802072238 metadata/md5-cache/dev-util/patchbin-20160208
 1809280334 metadata/md5-cache/dev-util/lockrun-20120508-r1
 1811080239 metadata/md5-cache/dev-util/lttng-ust-2.8.1
@@ -56791,7 +56801,7 @@
 1811261942 metadata/md5-cache/dev-util/dput-ng-1.10
 1809280334 metadata/md5-cache/dev-util/unifdef-2.10
 1901121839 metadata/md5-cache/dev-util/radare2-3.2.0
-1901031809 metadata/md5-cache/dev-util/cppcheck-1.86
+1901161909 metadata/md5-cache/dev-util/cppcheck-1.86
 1810171109 metadata/md5-cache/dev-util/nvidia-cuda-sdk-7.5.18
 1809280334 metadata/md5-cache/dev-util/dejagnu-1.4.4-r3
 1811261942 metadata/md5-cache/dev-util/buildbot-grid-view-0.9.12_p1
@@ -56816,7 +56826,7 @@
 1811261942 metadata/md5-cache/dev-util/wstool-9999
 1811301839 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.0.130
 1812141839 metadata/md5-cache/dev-util/meson-9999
-1812110115 metadata/md5-cache/dev-util/vulkan-headers-1.1.92.0
+1901161839 metadata/md5-cache/dev-util/vulkan-headers-1.1.92.0
 1811261942 metadata/md5-cache/dev-util/scons-3.0.1-r1
 1702282321 metadata/md5-cache/dev-util/distro-info-data-0.29
 1809280334 metadata/md5-cache/dev-util/yacc-1.9.1-r6
@@ -58903,7 +58913,7 @@
 1812271040 metadata/md5-cache/app-admin/verynice-1.1-r2
 1809280333 metadata/md5-cache/app-admin/consolehm-1.31
 1812261140 metadata/md5-cache/app-admin/puppet-4.10.12
-1901160139 metadata/md5-cache/app-admin/Manifest.gz
+1901162109 metadata/md5-cache/app-admin/Manifest.gz
 1811261942 metadata/md5-cache/app-admin/diamond-9999
 1901152109 metadata/md5-cache/app-admin/puppetserver-6.1.0
 1812110115 metadata/md5-cache/app-admin/keepassxc-2.3.3
@@ -59078,7 +59088,6 @@
 1705150108 metadata/md5-cache/app-admin/filewatcher-2.4.6-r1
 1812200339 metadata/md5-cache/app-admin/kube-bench-0.0.17
 1702282308 metadata/md5-cache/app-admin/emacs-updater-1.15
-1812271040 metadata/md5-cache/app-admin/vault-0.11.4
 1901152109 metadata/md5-cache/app-admin/puppetserver-5.3.7
 1812200339 metadata/md5-cache/app-admin/cli53-0.8.9
 1809280333 metadata/md5-cache/app-admin/ide-smart-1.4-r1
@@ -59523,7 +59532,7 @@
 1807101539 metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.0
 1810030549 metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.5.0
 1810030549 metadata/md5-cache/xfce-extra/xfce4-radio-plugin-0.5.1-r1
-1901140209 metadata/md5-cache/xfce-extra/Manifest.gz
+1901161139 metadata/md5-cache/xfce-extra/Manifest.gz
 1810030549 metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.0.2
 1810030549 metadata/md5-cache/xfce-extra/xfce4-mpc-plugin-0.5.0
 1810030549 metadata/md5-cache/xfce-extra/xfce4-verve-plugin-1.1.0
@@ -59563,6 +59572,7 @@
 1812090109 metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.2.1
 1810030549 metadata/md5-cache/xfce-extra/xfce4-fsguard-plugin-1.1.0
 1812021439 metadata/md5-cache/xfce-extra/xfce4-screenshooter-1.9.3
+1901161139 metadata/md5-cache/xfce-extra/xfce4-sensors-plugin-1.3.92
 1807101539 metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.2
 1810030549 metadata/md5-cache/xfce-extra/xfce4-netspeed-plugin-0.3.1
 1901132009 metadata/md5-cache/xfce-extra/xfce4-battery-plugin-1.1.2
@@ -60174,7 +60184,7 @@
 1809280334 metadata/md5-cache/media-sound/mp3blaster-3.2.6
 1811261942 metadata/md5-cache/media-sound/sonata-1.6.2.1-r2
 1809280334 metadata/md5-cache/media-sound/mp3cat-0.4
-1901152039 metadata/md5-cache/media-sound/pulseeffects-4.4.6
+1901170009 metadata/md5-cache/media-sound/pulseeffects-4.4.6
 1810301839 metadata/md5-cache/media-sound/moc-2.5.2
 1812110115 metadata/md5-cache/media-sound/lmms-1.2.0_rc4
 1809280334 metadata/md5-cache/media-sound/dcaenc-9999
@@ -60227,7 +60237,7 @@
 1809280334 metadata/md5-cache/media-sound/gom-0.29.103-r1
 1702282327 metadata/md5-cache/media-sound/gst123-0.3.4
 1901082209 metadata/md5-cache/media-sound/pulseaudio-12.2
-1901152039 metadata/md5-cache/media-sound/Manifest.gz
+1901170009 metadata/md5-cache/media-sound/Manifest.gz
 1809280334 metadata/md5-cache/media-sound/mpg123-1.25.10-r1
 1809280334 metadata/md5-cache/media-sound/id3ed-1.10.4
 1809280334 metadata/md5-cache/media-sound/aucdtect-0.8.2-r1
@@ -60658,6 +60668,7 @@
 1809280334 metadata/md5-cache/sys-fs/reiser4progs-1.2.1
 1809280334 metadata/md5-cache/sys-fs/ddrescue-1.21-r1
 1809280334 metadata/md5-cache/sys-fs/snapraid-6.3
+1901161509 metadata/md5-cache/sys-fs/btrfs-progs-4.20_rc1
 1809280334 metadata/md5-cache/sys-fs/snapraid-7.1
 1811111339 metadata/md5-cache/sys-fs/ncdu-1.13
 1811230139 metadata/md5-cache/sys-fs/zfs-kmod-9999
@@ -60680,7 +60691,6 @@
 1812110115 metadata/md5-cache/sys-fs/cryfs-0.9.9
 1809280334 metadata/md5-cache/sys-fs/e2fsprogs-1.43.9
 1809280334 metadata/md5-cache/sys-fs/copyfs-1.0.1-r1
-1809280334 metadata/md5-cache/sys-fs/btrfs-progs-4.16.1
 1810021239 metadata/md5-cache/sys-fs/loop-aes-3.7m
 1810021239 metadata/md5-cache/sys-fs/vhba-20170610
 1812291409 metadata/md5-cache/sys-fs/reiserfsprogs-3.6.27
@@ -60710,7 +60720,6 @@
 1809280334 metadata/md5-cache/sys-fs/fatsort-1.4.2
 1812011639 metadata/md5-cache/sys-fs/iprutils-2.4.17.1
 1809280334 metadata/md5-cache/sys-fs/snapraid-11.2
-1809280334 metadata/md5-cache/sys-fs/btrfs-progs-4.15.1
 1807111409 metadata/md5-cache/sys-fs/extundelete-0.2.4
 1812081539 metadata/md5-cache/sys-fs/fuse-2.9.8
 1810021239 metadata/md5-cache/sys-fs/bees-9999
@@ -60731,7 +60740,7 @@
 1810021339 metadata/md5-cache/sys-fs/fuse-zip-0.4.5
 1812292209 metadata/md5-cache/sys-fs/f2fs-tools-1.12.0-r1
 1809280334 metadata/md5-cache/sys-fs/snapraid-11.0-r1
-1901160139 metadata/md5-cache/sys-fs/Manifest.gz
+1901161509 metadata/md5-cache/sys-fs/Manifest.gz
 1811252339 metadata/md5-cache/sys-fs/mac-fdisk-0.1_p18
 1809280334 metadata/md5-cache/sys-fs/libeatmydata-82
 1811130041 metadata/md5-cache/sys-fs/jdiskreport-bin-1.3.0
@@ -60826,7 +60835,6 @@
 1812131239 metadata/md5-cache/sys-fs/bindfs-1.13.10
 1812271040 metadata/md5-cache/sys-fs/zfs-0.6.5.11-r2
 1811230139 metadata/md5-cache/sys-fs/zfs-kmod-0.7.11
-1809280334 metadata/md5-cache/sys-fs/btrfs-progs-4.17.1
 1708061709 metadata/md5-cache/sys-fs/bashmount-3.2.0
 1809280334 metadata/md5-cache/sys-fs/sysfsutils-2.1.0
 1812271040 metadata/md5-cache/sys-fs/udisks-2.1.8
@@ -60951,36 +60959,31 @@
 1810021239 metadata/md5-cache/x11-drivers/xf86-video-intel-2.99.917_p20180214-r1
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-voodoo-1.2.5
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.5
-1812141609 metadata/md5-cache/x11-drivers/nvidia-drivers-384.130
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.3
 1811061239 metadata/md5-cache/x11-drivers/xf86-video-vboxvideo-1.0.0
-1812141609 metadata/md5-cache/x11-drivers/nvidia-drivers-375.82
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-ast-1.0.1
 1812271040 metadata/md5-cache/x11-drivers/xf86-input-wacom-0.36.0-r2
 1810021239 metadata/md5-cache/x11-drivers/xf86-video-ati-9999
-1812251709 metadata/md5-cache/x11-drivers/nvidia-drivers-390.87
+1901161339 metadata/md5-cache/x11-drivers/nvidia-drivers-390.87
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.9
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.18
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-tdfx-1.4.7
 1810021239 metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.0
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.17
-1812141609 metadata/md5-cache/x11-drivers/nvidia-drivers-387.34
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-ast-0.97.0-r1
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.15
-1901152109 metadata/md5-cache/x11-drivers/Manifest.gz
+1901161339 metadata/md5-cache/x11-drivers/Manifest.gz
 1809280334 metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.6.0
-1901080209 metadata/md5-cache/x11-drivers/nvidia-drivers-415.25
-1812141609 metadata/md5-cache/x11-drivers/nvidia-drivers-378.13-r1
-1812251709 metadata/md5-cache/x11-drivers/nvidia-drivers-340.107
+1901161339 metadata/md5-cache/x11-drivers/nvidia-drivers-415.25
+1901161339 metadata/md5-cache/x11-drivers/nvidia-drivers-340.107
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.21
 1810290309 metadata/md5-cache/x11-drivers/xf86-video-ati-18.1.0
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-vmware-13.3.0
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.5
-1901152109 metadata/md5-cache/x11-drivers/nvidia-drivers-410.93
+1901161339 metadata/md5-cache/x11-drivers/nvidia-drivers-410.93
 1810272339 metadata/md5-cache/x11-drivers/xf86-video-amdgpu-9999
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.9
-1812141609 metadata/md5-cache/x11-drivers/nvidia-drivers-396.54
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-newport-0.2.4
 1809281909 metadata/md5-cache/x11-drivers/xf86-input-mouse-1.9.3
 1811010939 metadata/md5-cache/x11-drivers/xf86-input-libinput-0.28.1
@@ -60992,18 +60995,16 @@
 1810021239 metadata/md5-cache/x11-drivers/xf86-video-vesa-2.4.0
 1810021239 metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
 1809280334 metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.5.0
-1812141609 metadata/md5-cache/x11-drivers/nvidia-drivers-381.22-r1
 1810290309 metadata/md5-cache/x11-drivers/xf86-video-r128-6.12.0
 1809280334 metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.1
 1812262339 metadata/md5-cache/x11-drivers/xf86-video-ast-1.1.5
 1809281909 metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0
-1901152109 metadata/md5-cache/x11-drivers/nvidia-drivers-415.27
+1901161339 metadata/md5-cache/x11-drivers/nvidia-drivers-415.27
 1810021239 metadata/md5-cache/x11-drivers/xf86-video-vesa-2.3.4
 1809280334 metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3
 1810021239 metadata/md5-cache/x11-drivers/xf86-video-intel-9999
 1810021239 metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
 1809280334 metadata/md5-cache/x11-drivers/xf86-input-keyboard-1.9.0
-1812141609 metadata/md5-cache/x11-drivers/nvidia-drivers-304.137
 1810021239 metadata/md5-cache/x11-drivers/xf86-input-wacom-0.35.0
 1901121739 metadata/md5-cache/kde-frameworks/modemmanager-qt-5.54.0
 1901101910 metadata/md5-cache/kde-frameworks/syndication-5.52.0
@@ -61067,8 +61068,8 @@
 1901101910 metadata/md5-cache/kde-frameworks/kdbusaddons-5.52.0
 1901121739 metadata/md5-cache/kde-frameworks/kdewebkit-5.54.0
 1901121739 metadata/md5-cache/kde-frameworks/kactivities-stats-5.54.0
+1901162009 metadata/md5-cache/kde-frameworks/kio-5.54.1
 1901101910 metadata/md5-cache/kde-frameworks/kwallet-5.52.0
-1901121739 metadata/md5-cache/kde-frameworks/kio-5.54.0
 1901121739 metadata/md5-cache/kde-frameworks/kunitconversion-5.54.0
 1901121739 metadata/md5-cache/kde-frameworks/knotifyconfig-5.54.0
 1901101910 metadata/md5-cache/kde-frameworks/kwindowsystem-5.52.0
@@ -61085,7 +61086,7 @@
 1901101910 metadata/md5-cache/kde-frameworks/kitemmodels-5.52.0
 1901121739 metadata/md5-cache/kde-frameworks/kirigami-5.54.0
 1901121739 metadata/md5-cache/kde-frameworks/kded-5.54.0
-1901141909 metadata/md5-cache/kde-frameworks/Manifest.gz
+1901162009 metadata/md5-cache/kde-frameworks/Manifest.gz
 1901121739 metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.54.0
 1901101910 metadata/md5-cache/kde-frameworks/knewstuff-5.52.0
 1901101910 metadata/md5-cache/kde-frameworks/kjs-5.52.0
@@ -68796,7 +68797,7 @@
 1811190039 metadata/md5-cache/media-libs/babl-0.1.58
 1809280334 metadata/md5-cache/media-libs/adplug-9999
 1809280334 metadata/md5-cache/media-libs/wxsvg-1.5.11
-1812260039 metadata/md5-cache/media-libs/vulkan-loader-1.1.92.1
+1901161839 metadata/md5-cache/media-libs/vulkan-loader-1.1.92.1
 1810030549 metadata/md5-cache/media-libs/clutter-gtk-1.8.4
 1809280334 metadata/md5-cache/media-libs/jpeg-8d-r1
 1812110115 metadata/md5-cache/media-libs/libsfml-2.4.2-r2
@@ -68841,7 +68842,7 @@
 1811061939 metadata/md5-cache/media-libs/libprojectm-3.1.0-r1
 1901152339 metadata/md5-cache/media-libs/glew-2.1.0-r1
 1811180409 metadata/md5-cache/media-libs/libopenraw-0.1.3
-1901151609 metadata/md5-cache/media-libs/harfbuzz-2.1.3-r1
+1901161439 metadata/md5-cache/media-libs/harfbuzz-2.1.3-r1
 1809280334 metadata/md5-cache/media-libs/sampleicc-1.6.8
 1812110115 metadata/md5-cache/media-libs/gmmlib-9999
 1809280334 metadata/md5-cache/media-libs/libemf-1.0.4-r1
@@ -68909,7 +68910,6 @@
 1812260039 metadata/md5-cache/media-libs/codec2-0.8.1
 1901021309 metadata/md5-cache/media-libs/sdl2-image-2.0.4
 1901090809 metadata/md5-cache/media-libs/gst-rtsp-server-1.14.2
-1812260039 metadata/md5-cache/media-libs/opencv-3.3.0-r6
 1809280334 metadata/md5-cache/media-libs/libdc1394-2.2.5-r1
 1812260039 metadata/md5-cache/media-libs/libopenglrecorder-0.1.0
 1901160139 metadata/md5-cache/media-libs/mlt-6.12.0
@@ -68924,7 +68924,6 @@
 1812110115 metadata/md5-cache/media-libs/openimageio-1.6.18
 1809280334 metadata/md5-cache/media-libs/phat-0.4.1-r1
 1901140209 metadata/md5-cache/media-libs/raul-0.8.0-r1
-1901031809 metadata/md5-cache/media-libs/gexiv2-0.10.10
 1809280334 metadata/md5-cache/media-libs/kvazaar-1.1.0
 1809280334 metadata/md5-cache/media-libs/fidlib-0.9.10-r1
 1809280334 metadata/md5-cache/media-libs/libmp3splt-0.9.2-r1
@@ -68976,7 +68975,6 @@
 1810071709 metadata/md5-cache/media-libs/libggigcp-1.0.2
 1810030549 metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r3
 1809280334 metadata/md5-cache/media-libs/liblqr-0.4.2-r1
-1812260039 metadata/md5-cache/media-libs/opencv-3.2.0-r4
 1809280334 metadata/md5-cache/media-libs/plib-1.8.5-r1
 1809280334 metadata/md5-cache/media-libs/libsbsms-2.0.2-r1
 1812110115 metadata/md5-cache/media-libs/lensfun-0.3.2-r1
@@ -69017,7 +69015,6 @@
 1809280334 metadata/md5-cache/media-libs/libafterimage-1.20-r2
 1809280334 metadata/md5-cache/media-libs/speexdsp-1.2_rc3-r2
 1702282326 metadata/md5-cache/media-libs/libquvi-scripts-0.4.21-r1
-1812260039 metadata/md5-cache/media-libs/opencv-3.4.1-r2
 1809280334 metadata/md5-cache/media-libs/raspberrypi-userland-bin-1.20170303
 1809280334 metadata/md5-cache/media-libs/libpostproc-10.20140517-r1
 1702282326 metadata/md5-cache/media-libs/gnonlin-0.10.17
@@ -69046,7 +69043,7 @@
 1809280334 metadata/md5-cache/media-libs/speex-1.2.0-r1
 1810071709 metadata/md5-cache/media-libs/libggiwmh-0.3.2
 1812260039 metadata/md5-cache/media-libs/libaom-1.0.0-r1
-1812260039 metadata/md5-cache/media-libs/vulkan-layers-1.1.92.0
+1901161839 metadata/md5-cache/media-libs/vulkan-layers-1.1.92.0
 1901160139 metadata/md5-cache/media-libs/phonon-vlc-0.10.2
 1812260039 metadata/md5-cache/media-libs/libreplaygain-477-r1
 1809280334 metadata/md5-cache/media-libs/freetype-2.9.1-r3
@@ -69149,10 +69146,9 @@
 1812110115 metadata/md5-cache/media-libs/ampache_browser-1.0.1
 1812110115 metadata/md5-cache/media-libs/oyranos-9999
 1812260039 metadata/md5-cache/media-libs/taglib-1.11.1-r1
-1901151609 metadata/md5-cache/media-libs/harfbuzz-2.2.0-r1
+1901161439 metadata/md5-cache/media-libs/harfbuzz-2.2.0-r1
 1901040839 metadata/md5-cache/media-libs/zita-convolver-3.1.0
 1810021239 metadata/md5-cache/media-libs/libv4l-1.12.3
-1809280334 metadata/md5-cache/media-libs/libpng-1.6.34
 1809280334 metadata/md5-cache/media-libs/libvisio-9999
 1809280334 metadata/md5-cache/media-libs/gstreamer-0.10.36-r2
 1809280334 metadata/md5-cache/media-libs/libopendaap-0.4.0
@@ -69169,15 +69165,14 @@
 1812110115 metadata/md5-cache/media-libs/libprojectm-2.1.0-r2
 1812230010 metadata/md5-cache/media-libs/ming-0.4.8-r1
 1809280334 metadata/md5-cache/media-libs/sdl-gfx-2.0.26
-1901081239 metadata/md5-cache/media-libs/libpng-1.6.35-r1
+1901161839 metadata/md5-cache/media-libs/libpng-1.6.35-r1
 1809280334 metadata/md5-cache/media-libs/ilmbase-2.0.1-r1
 1809280334 metadata/md5-cache/media-libs/vo-aacenc-0.1.3
 1812260039 metadata/md5-cache/media-libs/openal-1.19.0
 1809280334 metadata/md5-cache/media-libs/libtimidity-0.2.0
-1812110115 metadata/md5-cache/media-libs/phonon-gstreamer-4.9.0-r2
 1811052309 metadata/md5-cache/media-libs/raptor-2.0.15-r1
 1809280334 metadata/md5-cache/media-libs/gavl-1.2.0
-1901160309 metadata/md5-cache/media-libs/Manifest.gz
+1901170009 metadata/md5-cache/media-libs/Manifest.gz
 1809280334 metadata/md5-cache/media-libs/libsixel-1.8.1
 1808151104 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932
 1811090209 metadata/md5-cache/media-libs/libsndfile-1.0.28-r4
@@ -69238,12 +69233,12 @@
 1809280334 metadata/md5-cache/media-libs/smpeg-0.4.4-r10
 1812260039 metadata/md5-cache/media-libs/libsoundio-1.1.0-r1
 1901140209 metadata/md5-cache/media-libs/lilv-0.24.2-r3
-1901151609 metadata/md5-cache/media-libs/harfbuzz-2.0.2-r1
+1901161439 metadata/md5-cache/media-libs/harfbuzz-2.0.2-r1
 1809280334 metadata/md5-cache/media-libs/libfame-0.9.1-r2
 1809280334 metadata/md5-cache/media-libs/libdvdnav-9999
 1809280334 metadata/md5-cache/media-libs/tremor-0_pre20130223-r1
 1901041139 metadata/md5-cache/media-libs/libsoundtouch-2.1.1
-1811241709 metadata/md5-cache/media-libs/libgphoto2-2.5.16
+1901161039 metadata/md5-cache/media-libs/libgphoto2-2.5.16
 1809280334 metadata/md5-cache/media-libs/libfreehand-9999
 1809280334 metadata/md5-cache/media-libs/libyami-1.2.0
 1811080309 metadata/md5-cache/media-libs/liblrdf-0.6.1
@@ -69300,6 +69295,7 @@
 1809280334 metadata/md5-cache/media-libs/plotutils-2.6-r2
 1809280334 metadata/md5-cache/media-libs/quvi-0.9.5
 1811021539 metadata/md5-cache/media-libs/libchamplain-0.12.16
+1901170009 metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
 1901141109 metadata/md5-cache/media-libs/cimg-2.4.5
 1805012209 metadata/md5-cache/media-libs/stops-0.3.0
 1810030549 metadata/md5-cache/media-libs/clutter-1.26.2-r1
@@ -69334,7 +69330,7 @@
 1809280334 metadata/md5-cache/media-libs/libvisio-0.1.6
 1901092339 metadata/md5-cache/media-libs/zimg-2.7.4
 1702282326 metadata/md5-cache/media-libs/libxtract-0.6.6
-1901150139 metadata/md5-cache/media-libs/opencv-3.4.1-r5
+1901161339 metadata/md5-cache/media-libs/opencv-3.4.1-r5
 1809280334 metadata/md5-cache/media-libs/zimg-9999
 1702282326 metadata/md5-cache/media-libs/libquvi-scripts-0.4.21
 1809280334 metadata/md5-cache/media-libs/libffado-2.4.1
@@ -69351,10 +69347,8 @@
 1809280334 metadata/md5-cache/media-libs/libnut-661
 1809280334 metadata/md5-cache/media-libs/ffmpegsource-2.23
 1812162239 metadata/md5-cache/media-libs/phonon-gstreamer-9999
-1812110115 metadata/md5-cache/media-libs/phonon-vlc-0.10.1
 1809280334 metadata/md5-cache/media-libs/lib3ds-1.3.0-r1
 1812110115 metadata/md5-cache/media-libs/avidemux-plugins-2.7.0
-1812110115 metadata/md5-cache/media-libs/phonon-4.10.1
 1901160139 metadata/md5-cache/media-libs/liblscp-0.6.0
 1809280334 metadata/md5-cache/media-libs/libgpod-0.8.3-r2
 1708231539 metadata/md5-cache/media-libs/libmatroska-1.4.5
@@ -69374,7 +69368,7 @@
 1809280334 metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r4
 1809301739 metadata/md5-cache/media-libs/fontconfig-ultimate-2015.08.01
 1809280334 metadata/md5-cache/media-libs/babl-0.1.56
-1901031809 metadata/md5-cache/media-libs/gexiv2-9999
+1901170009 metadata/md5-cache/media-libs/gexiv2-9999
 1812302339 metadata/md5-cache/media-libs/libcdr-9999
 1810062009 metadata/md5-cache/media-libs/exempi-2.4.5-r1
 1901131309 metadata/md5-cache/media-libs/kvazaar-1.2.0-r1
@@ -69472,7 +69466,7 @@
 1809280334 metadata/md5-cache/media-libs/webrtc-audio-processing-0.3
 1809280334 metadata/md5-cache/media-libs/sdl-ttf-2.0.11-r1
 1811062009 metadata/md5-cache/media-libs/nv-codec-headers-8.1.24.2
-1901160139 metadata/md5-cache/media-libs/libsdl2-2.0.9
+1901161839 metadata/md5-cache/media-libs/libsdl2-2.0.9
 1702282326 metadata/md5-cache/media-libs/icc-profiles-basiccolor-printing2009-1.2.0
 1702282326 metadata/md5-cache/media-libs/libmetalink-0.1.1
 1809280334 metadata/md5-cache/media-libs/fdk-aac-0.1.6
@@ -69501,7 +69495,7 @@
 1809280334 metadata/md5-cache/media-libs/libfpx-1.3.1_p10
 1809280334 metadata/md5-cache/media-libs/libass-0.14.0
 1809280334 metadata/md5-cache/media-libs/libyami-1.0.1
-1901151609 metadata/md5-cache/media-libs/harfbuzz-2.3.0-r1
+1901161439 metadata/md5-cache/media-libs/harfbuzz-2.3.0-r1
 1809280334 metadata/md5-cache/media-libs/libdv-1.0.0-r2
 1809280334 metadata/md5-cache/media-libs/openexr-2.2.0-r1
 1809280334 metadata/md5-cache/media-libs/libhdhomerun-20140121
@@ -69612,7 +69606,6 @@
 1901101910 metadata/md5-cache/kde-misc/ktoshiba-5.3.1
 1901101910 metadata/md5-cache/kde-misc/openofficeorg-thumbnail-1.0.0-r500
 1809280334 metadata/md5-cache/kde-misc/kanyremote-6.4
-1901101910 metadata/md5-cache/kde-misc/yakuake-3.0.5
 1901101910 metadata/md5-cache/kde-misc/plasma-redshift-control-1.0.18
 1901101910 metadata/md5-cache/kde-misc/kio-gdrive-1.2.5
 1901160139 metadata/md5-cache/kde-misc/basket-2.49a_p20181205
@@ -69623,7 +69616,7 @@
 1901101910 metadata/md5-cache/kde-misc/kimtoy-1.91
 1901101910 metadata/md5-cache/kde-misc/kolor-manager-1.1.0
 1901101910 metadata/md5-cache/kde-misc/krename-5.0.0
-1901160139 metadata/md5-cache/kde-misc/wacomtablet-3.1.1
+1901161939 metadata/md5-cache/kde-misc/wacomtablet-3.1.1
 1901101910 metadata/md5-cache/kde-misc/kio-locate-0.5.3-r1
 1901101910 metadata/md5-cache/kde-misc/gmailfeed-1.1
 1901101910 metadata/md5-cache/kde-misc/zanshin-0.5.0
@@ -69632,9 +69625,8 @@
 1901091310 metadata/md5-cache/kde-misc/playbar2-2.5
 1901101910 metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
 1901101910 metadata/md5-cache/kde-misc/latte-dock-0.8.2
-1901101910 metadata/md5-cache/kde-misc/wacomtablet-3.1.0
 1901101910 metadata/md5-cache/kde-misc/basket-2.49a_p20170225-r1
-1901160139 metadata/md5-cache/kde-misc/Manifest.gz
+1901161939 metadata/md5-cache/kde-misc/Manifest.gz
 1901101910 metadata/md5-cache/kde-misc/kdiff3-0.9.98_p20170219-r1
 1901101910 metadata/md5-cache/kde-misc/skanlite-2.1.0.1
 1901101910 metadata/md5-cache/kde-misc/kshutdown-4.2
@@ -69645,7 +69637,7 @@
 1901130139 metadata/md5-cache/kde-misc/kmarkdownwebview-0.5.4
 1901101910 metadata/md5-cache/kde-misc/kdirstat-3.1.3
 1901101910 metadata/md5-cache/kde-misc/colord-kde-0.5.0
-1901160139 metadata/md5-cache/kde-misc/yakuake-3.0.5-r1
+1901161839 metadata/md5-cache/kde-misc/yakuake-3.0.5-r1
 1901101910 metadata/md5-cache/kde-misc/plasma-applet-network-monitor-1.7.3
 1901101910 metadata/md5-cache/kde-misc/kio-gopher-0.1.99
 1901101910 metadata/md5-cache/kde-misc/latte-dock-0.8.3
@@ -72099,6 +72091,7 @@
 1901072339 metadata/md5-cache/app-emulation/libpod-0.12.1.2
 1809280333 metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
 1901021309 metadata/md5-cache/app-emulation/libvirt-glib-2.0.0
+1901161509 metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.24
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2
 1811050039 metadata/md5-cache/app-emulation/wine-any-3.18
 1812200339 metadata/md5-cache/app-emulation/buildah-1.4
@@ -72109,6 +72102,7 @@
 1901101639 metadata/md5-cache/app-emulation/runc-1.0.0_rc6_p20181203
 1806040439 metadata/md5-cache/app-emulation/dlx-1.0.0
 1812271040 metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.0
+1901161509 metadata/md5-cache/app-emulation/virtualbox-modules-5.2.24
 1702282308 metadata/md5-cache/app-emulation/ganeti-os-noop-0.2
 1809280333 metadata/md5-cache/app-emulation/ganeti-htools-0.3.1
 1810021239 metadata/md5-cache/app-emulation/libguestfs-1.36.13
@@ -72148,6 +72142,7 @@
 1901070339 metadata/md5-cache/app-emulation/qemu-guest-agent-3.1.0
 1805091208 metadata/md5-cache/app-emulation/libdsk-1.5.8
 1811261942 metadata/md5-cache/app-emulation/docker-compose-1.22.0-r1
+1901161509 metadata/md5-cache/app-emulation/virtualbox-bin-5.2.24.128163
 1812110115 metadata/md5-cache/app-emulation/dynamips-0.2.18
 1812200339 metadata/md5-cache/app-emulation/go-secbench-0.1.0-r1
 1709290138 metadata/md5-cache/app-emulation/wine-gecko-2.47-r1
@@ -72177,6 +72172,7 @@
 1810030549 metadata/md5-cache/app-emulation/punes-0.102
 1810021239 metadata/md5-cache/app-emulation/openstack-guest-agents-unix-1.39.1_p20170227
 1811112109 metadata/md5-cache/app-emulation/wine-d3d9-3.20
+1901162309 metadata/md5-cache/app-emulation/virtualbox-6.0.2
 1809211939 metadata/md5-cache/app-emulation/libguestfs-appliance-1.36.1
 1812271040 metadata/md5-cache/app-emulation/lxc-3.1.0
 1810181509 metadata/md5-cache/app-emulation/genymotion-bin-2.12.2
@@ -72214,6 +72210,7 @@
 1804270439 metadata/md5-cache/app-emulation/bochs-2.6.9
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-17.5.0-r1
 1702282308 metadata/md5-cache/app-emulation/virtio-win-0.1.126
+1901161509 metadata/md5-cache/app-emulation/virtualbox-5.2.24
 1812271040 metadata/md5-cache/app-emulation/docker-18.09.0
 1812200339 metadata/md5-cache/app-emulation/runv-0.7.0
 1812200339 metadata/md5-cache/app-emulation/simplevirt-0.0_p20181011
@@ -72223,6 +72220,7 @@
 1809280333 metadata/md5-cache/app-emulation/ganeti-instance-debootstrap-0.16
 1811252009 metadata/md5-cache/app-emulation/wine-d3d9-3.21
 1812200339 metadata/md5-cache/app-emulation/img-0.5.2
+1901161509 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.0.2.128162
 1810201539 metadata/md5-cache/app-emulation/wine-vanilla-3.0.3
 1811280539 metadata/md5-cache/app-emulation/virtualbox-bin-5.2.22.126460
 1812271040 metadata/md5-cache/app-emulation/docker-registry-2.7.0-r1
@@ -72250,6 +72248,7 @@
 1812200339 metadata/md5-cache/app-emulation/containerd-1.1.1
 1809280333 metadata/md5-cache/app-emulation/lxc-templates-3.0.1
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-14.0.3-r1
+1901161509 metadata/md5-cache/app-emulation/virtualbox-additions-6.0.2
 1812271040 metadata/md5-cache/app-emulation/rkt-1.30.0
 1809280333 metadata/md5-cache/app-emulation/softgun-0.22
 1811120439 metadata/md5-cache/app-emulation/xen-tools-4.10.2-r1
@@ -72260,7 +72259,7 @@
 1812271040 metadata/md5-cache/app-emulation/lxd-3.7
 1901052339 metadata/md5-cache/app-emulation/qemu-2.12.1
 1812200339 metadata/md5-cache/app-emulation/runc-1.0.0_rc5_p20180509
-1901152039 metadata/md5-cache/app-emulation/Manifest.gz
+1901162309 metadata/md5-cache/app-emulation/Manifest.gz
 1810030549 metadata/md5-cache/app-emulation/libvirt-glib-1.0.0
 1809180947 metadata/md5-cache/app-emulation/docker-gc-9999
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2
@@ -72268,7 +72267,9 @@
 1901051939 metadata/md5-cache/app-emulation/wine-any-9999
 1809280333 metadata/md5-cache/app-emulation/runc-9999
 1901060139 metadata/md5-cache/app-emulation/qemu-9999
+1901161509 metadata/md5-cache/app-emulation/virtualbox-modules-6.0.2
 1809280333 metadata/md5-cache/app-emulation/xtrs-4.9d-r5
+1901161509 metadata/md5-cache/app-emulation/virtualbox-additions-5.2.24
 1812030609 metadata/md5-cache/app-emulation/spice-9999
 1812200339 metadata/md5-cache/app-emulation/containerd-1.2.1
 1810030549 metadata/md5-cache/app-emulation/winetricks-20180217
@@ -72287,6 +72288,7 @@
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-16.2.5
 1901130539 metadata/md5-cache/app-emulation/libvirt-9999
 1809280333 metadata/md5-cache/app-emulation/xtrs-4.9d-r4
+1901161509 metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.2
 1901101739 metadata/md5-cache/app-emulation/skopeo-0.1.34
 1811280539 metadata/md5-cache/app-emulation/virtualbox-additions-5.2.22
 1809280333 metadata/md5-cache/app-emulation/crossover-bin-15.3.1
@@ -72318,9 +72320,10 @@
 1901091909 metadata/md5-cache/app-emulation/containerd-1.2.2
 1812300039 metadata/md5-cache/app-emulation/wine-vanilla-9999
 1812222039 metadata/md5-cache/app-emulation/virtualbox-modules-6.0.0
-1812222039 metadata/md5-cache/app-emulation/virtualbox-6.0.0
+1901162309 metadata/md5-cache/app-emulation/virtualbox-6.0.0
 1810021239 metadata/md5-cache/app-emulation/xe-guest-utilities-5.6.0_p595
 1812200339 metadata/md5-cache/app-emulation/containerd-1.1.4
+1901161509 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-5.2.24.128163
 1811261942 metadata/md5-cache/app-emulation/cloud-init-9999
 1811050039 metadata/md5-cache/app-emulation/wine-vanilla-3.18
 1812200339 metadata/md5-cache/app-emulation/buildah-1.2
@@ -72375,6 +72378,7 @@
 1809280333 metadata/md5-cache/app-emulation/hercules-3.10
 1811130041 metadata/md5-cache/app-emulation/edumips64-1.2
 1812271040 metadata/md5-cache/app-emulation/flannel-0.10.0
+1901161509 metadata/md5-cache/app-emulation/virtualbox-bin-6.0.2.128162
 1812200339 metadata/md5-cache/app-emulation/cri-tools-1.11.1
 1812071609 metadata/md5-cache/app-emulation/libguestfs-1.36.15
 1812200339 metadata/md5-cache/app-emulation/reg-0.15.4-r1
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1f2aea230e4b..02a27b7116c2 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 16 Jan 2019 05:30:01 +0000
+Wed, 16 Jan 2019 21:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 5eec2cf3b114..ad3016744821 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c37e9ae04b1512350ac1a767d28c47fe2bde61f5 1547612774 2019-01-16T04:26:14+00:00
+3fdd3bb181ca9896598639f69992ca97e5116bbe 1547672460 2019-01-16T21:01:00+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c7a88c2e588c..83f7baf0851f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1547615101 Wed 16 Jan 2019 05:05:01 AM UTC
+1547672701 Wed 16 Jan 2019 09:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index c7a7cbd95a47..cf43854746cc 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 16 Jan 2019 05:08:45 +0000
+Wed, 16 Jan 2019 21:08:42 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index f15fc99aceb1..30a6867d711a 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 93faf880e626..e707226397ec 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -2,6 +2,6 @@ AUX database.yml 613 BLAKE2B c724103b21f7650e4c6a221a22984cbff1be21ae761b62666db
 DIST metasploit-4.14.16.tar.gz 23726763 BLAKE2B ab2d3f10c948db394643f2bcd9b08822f16133ef81abe7048b6c4e49bf635abded40d7359b9787f7f955ba6eccfdb81ff6372d24dd2acd732ba9f16cb41ca8b4 SHA512 882968e68ff5adf10426f6e8480f3eac7cd9b289c1e641a91e537d31a434858f2c47b4f7b5bf23fcfc22eceecd2527eedb7eac3e9a8ad4a212187762b1b9aab2
 DIST metasploit-4.17.21.tar.gz 28812125 BLAKE2B 15ff8ccac99d783b7b9cd20d6512df551b3143b4947d2f347b2558d1bafd2861d41fe6b051034c75cd25030ad85d26f261ffe9149dd27d551f92f17fcc0b4075 SHA512 00763f515bc6b556d4dbe15a7c58fac3c7febb64fb339fd5c05ad2b18b5b55bdf8815daca35f24bb22bea3d376db4f4610918730d813079e5ac3f8d5ad16d2d9
 EBUILD metasploit-4.14.16-r2.ebuild 11790 BLAKE2B 8b2fb60ffa9bf4636f4c0cbd25802fa531339d4e439478118fbef1fd2b411095544984195bccf69100049ecdca7f7e276e2f79ca489d953e2a597f9ce6cfde34 SHA512 a9a189b1d3eef0054aa63628b16b51a5c16be4861b12afae2442083cffbc37e3e18fd8ed0955d4e9190fefe0c72417b4623aca17a68c35d363097eeb4dcfaf17
-EBUILD metasploit-4.17.21-r4.ebuild 12232 BLAKE2B 6634d2be9375e19e5048ced4801f55424ac143b46b1675be8040230ee51a586e6512821509ad00dcb841411ebe715615ee8ec36715d14e1b17a1fa68206a767a SHA512 abbb8fa6cb57158bd38457456d3b63d5bf2f1a8aa2bef5a7512492bebc1174cf1572f0250801f6a954ae3f717542b864ae029993fa4581ec92c20379a9af0940
+EBUILD metasploit-4.17.21-r4.ebuild 12241 BLAKE2B bd8f424eb18242dcf6113c99ce1ec2b22d3a493a3b54ba1de1af358c2efece5e93e8430ae6726ffc3011cccddff656cfe6b4e51ea229f4656d39018739872bf5 SHA512 56b1bcf9388914ef39adf2b438bbc168fbe88b27404c753441843581efc35cb280a39240125c47a005834f8e1acad05a098d4fca472d4f364835d32fe4dabd80
 EBUILD metasploit-9999.ebuild 12233 BLAKE2B 43593e3349db4932a2c4808be403b07e4dceb79abdad407a3285a515f31209ddddbeddf371822fc71156f99c1dae3dbbee8423d776370926a6108adcafa4dcce SHA512 eea4237aaaf6a6c36f6df83a1b4475126797c3fa2c2c5758042e28079b46637e56e0b509abe28eaa149029dd5db683111773d479c59c972b4b4f1d258483e799
 MISC metadata.xml 853 BLAKE2B 9b0b2e6c82a4df1327ded8b8381fa1e557ba4353ae5dab9665e7b59950d36e61faead5d8672e2cc10dad68b5a3250126a7fb1c4edc7f6814f28ea3f6df663473 SHA512 9af2dae0c12ae84ae2a7887fad0e7f5ea1d945a8b6e6674ba9e3c3bbff167b00a4aeff2da8b457ff8657f83d617dad67f633b260578a1e9608475fe45585cad0
diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
index 9c5d8872886b..d749f104d93e 100644
--- a/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,13 +12,13 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="4.x"
 	EGIT_CHECKOUT_DIR="${WORKDIR}"/all
 	inherit git-r3
-	KEYWORDS=""
+	KEYWORDS="~arm"
 	SLOT="9999"
 else
 	##Tags https://github.com/rapid7/metasploit-framework/releases
 	MY_PV=${PV/_p/-}
 	SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 	RUBY_S="${PN}-framework-${MY_PV}"
 	inherit eapi7-ver
 	SLOT="$(ver_cut 1).$(ver_cut 2)"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 91a35ab74c74..cb7c5f23e8be 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 205ee5ba3dd6..4f7b21bbaf73 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,16 +1,8 @@
-DIST libmicrohttpd-0.9.52.tar.gz 1244489 BLAKE2B b8736bd50afa9531ea5377f082c8085ff189fad32cca5c07db14e4a1551dd2330630a06cfadb022b212385c2b01e4469c66e727c3e1c2035c131d99760962171 SHA512 2cb7fa6ed59ec5f48748cd2aedea8a68629f02ffcf8e86c6d5b57a6622bb5f0ffd7dabfd6c04cc99047ca81eb76efe2a79b34bd6e3de329261a319369232fcf4
-DIST libmicrohttpd-0.9.55.tar.gz 1308328 BLAKE2B 5189bcaf2f29fdff9fdd3d7dfddd1b5e5abbca016c4f55a7e0a176b505cd6e3aa5868260615c922937856cfb9c6fd77a4edeab829c669b4f7751d5512e8c538b SHA512 b410e7253d7c98c40b5e8b8dcd1f93bcbb05c88717190e8dae73073d36465e8e5cfa53c6c5098de60051a5ec64dc423fd94f4b06537d8146b744aa99f5a0b173
-DIST libmicrohttpd-0.9.57.tar.gz 1332713 BLAKE2B 52e46726b220229ae722b4b94478bcd657e5edf1a836fa412b3365d8a2ca651887e62badd095f42f4fe41ad92f07e4147c812aef1c03dd6fba72a4acc6b1581a SHA512 996a59b1bc950320f21df095d3e24e1e6a6e4204095eb84e7dc5e5ed296b1dbe553459b227ba6cc93f60721f1975f778ece8c7c1c10e9168d030fba46675eed3
-DIST libmicrohttpd-0.9.58.tar.gz 1333687 BLAKE2B ef3dfb4684f2c387399d9044eb46de70c387b89bc4600529a9cdad7f2f31a25e0b0996b91d03cf42421979279781161b72d35eeb94d4bb101dd4d73bb6181bb7 SHA512 f68268bb0a0776ac0654a682fc598f4778561c2cc775e7315505c0e2f26f0633590d01f157984d348fdcedfb63d31d39add760a4ddb041694330015293d161b6
 DIST libmicrohttpd-0.9.59.tar.gz 1396234 BLAKE2B 9cb2d52dd39bdc6c54267751e21a224ffa926f4200b392a28009c6f717b5059580884f4de1bb272f49f7c48bdae276df2832b413cc60db77222b7b1278ba6004 SHA512 2c9080ebd520631b5ab6eed42770c7911079365c7bc79ea74fc5502ebc370fdaea9a84a4d9db7cbd8ba1c4797c7531e127e3b73ad8d38601d700529f2bab84d5
 DIST libmicrohttpd-0.9.60.tar.gz 1818383 BLAKE2B 693da0a02e289000bb657d843cd577311e97ca4d8cd698d659410e669295314d429eb9679eedac98398420f3386c1fa6800c33b883481120ea199585412f8e83 SHA512 418afc302e93ac93141c2457c2bf03c6a1da4a16ff19aa655312f9953e1d0b132b0dd983fc36ccc703688b0acd68fc0900f5927efcada354a10078ba5e577325
 DIST libmicrohttpd-0.9.61.tar.gz 1823891 BLAKE2B d7704f36790b7f14e03a02b7fbc5eaaca5fc22702f1fadfc94f9fe05329505d5bf9422a1ff38daa1f33c82db3e1196a8db754227574cc2cb9441c08a50d65d72 SHA512 d409ca2164a55b0eab948a8a4a17e0d6547942039354f593b293a286a3cae247bd67d7de4ce0dd4f1a3f3684948250076f582a8086546eb72598a43d7f41a27d
 DIST libmicrohttpd-0.9.62.tar.gz 1837529 BLAKE2B eb06d6ee05af2b37909ad1c60e16de29d94278a7ffea6e7b98391330e3778950537f9c2d6b057186b4ed45af66853570c0a386b6e9b1f0164956bd0856ecbaa5 SHA512 337f29dbc5e8c30132c17aad6142f21ea1c794b0ce80a3fc4c5e1e14b3dabb300aa410bf9413ef9e65d5d486fcfedbc3716725763a1fa28b4687c9f2aa3158e4
-EBUILD libmicrohttpd-0.9.52.ebuild 1187 BLAKE2B 00f635699d0ecabd004a9b9003cee412425207baddd3a4d54510aba6f4bff6741bf6400d527f4628b1977c5358460da5e4aee13dbba6dff14cec86c81e371d16 SHA512 74a4a07e0beb590bb10064c50402f504df59e4fdccb837f844b47d72e9ce1795fbf78f02e3ca7ef5948bffdc171e90240e5e98eb759fb756c5fc06eba7cf12e3
-EBUILD libmicrohttpd-0.9.55.ebuild 1195 BLAKE2B e9133561165018a4c03134cebc940c4d636d789dff1dbd76a4c635bcb47a20aab909ca05ae5641bf4a1e25b2165fcd02312fab7d0c7608b4f0ce39ba0e053993 SHA512 a319e69ead4556143002662c33ac17954b6cfef74015739eadd31e2ff81c8ca36a9421201d326e8448e8efdda4de9ad6c460f9fed684993d4009bc75c522b8bb
-EBUILD libmicrohttpd-0.9.57.ebuild 1274 BLAKE2B e47b21d68fca4320be4c488a43b09bf147b09b570a180019fbb2cb5f831931f6373bc8c6639fefe6c29204100ff74bfe66124830bb1c190c12a574dd9d34ad9a SHA512 f3e0970fad231edae530b31bb639dbeff43cb7be72d79d1a1f674440c14d055dd11b330ed67b2c26f31b8c1dd07c7b19425b956c99d3974dd8cc6bd55f189b67
-EBUILD libmicrohttpd-0.9.58.ebuild 1274 BLAKE2B e47b21d68fca4320be4c488a43b09bf147b09b570a180019fbb2cb5f831931f6373bc8c6639fefe6c29204100ff74bfe66124830bb1c190c12a574dd9d34ad9a SHA512 f3e0970fad231edae530b31bb639dbeff43cb7be72d79d1a1f674440c14d055dd11b330ed67b2c26f31b8c1dd07c7b19425b956c99d3974dd8cc6bd55f189b67
-EBUILD libmicrohttpd-0.9.59.ebuild 1264 BLAKE2B 0e9f9332f4cd3750e01203fbf17bb95faa259198e759d038ec157a1e00d920b64fdfed2db39bad6518d6883831ef5e725501c6e4a1b89b1c9d6f6cca8233251a SHA512 20a5c232312809e36d79fe9a475c3d82885c4045c2b9763eb21fc1aa7a973d3bab967042a24a7ac03891b1ca23787aa06d24125d41c47b7ce944e7889d71c232
+EBUILD libmicrohttpd-0.9.59.ebuild 1263 BLAKE2B 2ed2aa3c175c488d14b03e19651678166ba24b0d898ec901100622cc6841600a4ab8a056dafe90aa74dc3d2dcc1357a8d1664930f6cda26634c483eb71f43238 SHA512 91694bcc81e890f44600139f54bb1c1ab0fe05f70810ed826522bb338a0dea714b2ce2e0a2f76a41d7ed2d95846e84695dcb0df9309ca3a87eb5ce15776bb3af
 EBUILD libmicrohttpd-0.9.60.ebuild 1271 BLAKE2B dbc9bbe154271e5cea08016a268442618d1a696e3b5b6eadee3cf5e149305baeeade7af37df524798d96b2fe927f0fd0408964e5708a2e205e78c07aad136ba4 SHA512 4c102a0ecf59e09048e3ab848647d8a4c1300c399396528ae8bdaf704fad193b5a085a4222a203a2bb8ad39e3ca6a28f78e12f2535330aaff61b943c4b6c32db
 EBUILD libmicrohttpd-0.9.61.ebuild 1271 BLAKE2B dbc9bbe154271e5cea08016a268442618d1a696e3b5b6eadee3cf5e149305baeeade7af37df524798d96b2fe927f0fd0408964e5708a2e205e78c07aad136ba4 SHA512 4c102a0ecf59e09048e3ab848647d8a4c1300c399396528ae8bdaf704fad193b5a085a4222a203a2bb8ad39e3ca6a28f78e12f2535330aaff61b943c4b6c32db
 EBUILD libmicrohttpd-0.9.62.ebuild 1271 BLAKE2B dbc9bbe154271e5cea08016a268442618d1a696e3b5b6eadee3cf5e149305baeeade7af37df524798d96b2fe927f0fd0408964e5708a2e205e78c07aad136ba4 SHA512 4c102a0ecf59e09048e3ab848647d8a4c1300c399396528ae8bdaf704fad193b5a085a4222a203a2bb8ad39e3ca6a28f78e12f2535330aaff61b943c4b6c32db
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.52.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.52.ebuild
deleted file mode 100644
index a31f258f10f8..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.52.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/12"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="epoll messages ssl static-libs test"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-src_configure() {
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable messages) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-src_install() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.ebuild
deleted file mode 100644
index c669e3a7e3c9..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.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"
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/12"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="epoll messages ssl static-libs test"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-src_configure() {
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable messages) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-src_install() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.57.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.57.ebuild
deleted file mode 100644
index e5946aac12bd..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.57.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib-minimal
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="epoll messages ssl static-libs test"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable messages) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-multilib_src_install_all() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.58.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.58.ebuild
deleted file mode 100644
index e5946aac12bd..000000000000
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.58.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib-minimal
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Small C library to run an HTTP server as part of another application"
-HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="epoll messages ssl static-libs test"
-
-RDEPEND="ssl? (
-		dev-libs/libgcrypt:0=
-		net-libs/gnutls
-	)"
-
-# We disable tests below because they're broken,
-# but if enabled, we'll need this.
-DEPEND="${RDEPEND}
-	test?	(
-		ssl? ( net-misc/curl[ssl] )
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--enable-bauth \
-		--enable-dauth \
-		--disable-examples \
-		--enable-postprocessor \
-		--disable-thread-names \
-		$(use_enable epoll) \
-		$(use_enable test curl) \
-		$(use_enable messages) \
-		$(use_enable ssl https) \
-		$(use_with ssl gnutls) \
-		$(use_enable static-libs static)
-}
-
-# tests are broken in the portage environment.
-src_test() {
-	:
-}
-
-multilib_src_install_all() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild
index bc481246c49b..19abf491bbfd 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.59.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 70e92cd716b3..341a1ba7c2f2 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -4,7 +4,7 @@ DIST libssh-0.8.4.tar.xz 425848 BLAKE2B 8ca913e4c9e2ffa231bb437ac6a4de695bbdf872
 DIST libssh-0.8.5.tar.xz 427372 BLAKE2B d1cd94a50f09b1562f7267ff435b2d180b84d4132a589e053f43f5de64bb764d9263910837a53be594e64595483ed9516dcbf20abc5071e9a8154b8bb75f6f4c SHA512 f1e90a5046e006d44a48ab36675167761d8e308ada7a1d7a1f7ba2825d222a2fab7e19dbc78b1371fee9ba74d9c55d9856a623f97842c9b9ad4c79215e344124
 DIST libssh-0.8.6.tar.xz 433680 BLAKE2B f222e67676a90a2d2431463dc71859ad336a23a519b54e08fe368efe6322d0b9c8e393ec92d5246cb4721cd57bb955856fa6a2d92ffe71b6c35e2c94cde28762 SHA512 e91d1f4c1343aa232ade0fe4b5e9a92ca65e3716f4ebe2ec25b04def4fae5a3774349f05a6919836551f66fb0288ed6a3e19e0ab786c081616218be973356522
 EBUILD libssh-0.8.4.ebuild 2957 BLAKE2B dd4df344d463601b948ac65ee55b23f5586384eb43941614fac7b77c16c2c20c0feac5e3ab78c98e8566f07cf6ab6a06e1a32476183838950adf39a3be2ab6ff SHA512 3aa65824678b47784712a1b50fd8c2a78e1ee069150bfb9221896a599704d732b40541492d5a26a9b5049d271a34a958a5fde0d8338e820c3f63bfedab46a7f0
-EBUILD libssh-0.8.5.ebuild 2962 BLAKE2B f888f5dbea50bc9b29053ac917b314043df8aec8389a5c73f2c2eac7d8c942fccbbba06f9f5e0d29c8c6564bf9c831d3dd11856268a1da8cd339a18beddfcc29 SHA512 b16d211e4f0a7b6bb05dd421125029fcf9f15fe99d1909ff0c740d1c4cc8082bf17f0c6f83df905f6985612509bd1a71d49e881b0932a188d0c0f8c1c2dd99fc
+EBUILD libssh-0.8.5.ebuild 2961 BLAKE2B bffba63d69df2dd451e8f197e0f06d6b5d59a4b0d70f2f677f5df0ea395050ccca7b728dc06a107f01443a80445dad269e0e50517c8847093c21c65cfe632612 SHA512 ccb18db2538bd67d1ab644b9fd6db7cb595c38ed013e9de2d0b63dea41836aeed6b0d4976a037ebc0ab5f2dcaab576fa8d5ccd841c3464d0664f08e83cca2a18
 EBUILD libssh-0.8.6.ebuild 2947 BLAKE2B a05a939e8d1f1f5168aa583030d44c19fef3eee261d782e13a8906eb7a7d3190d732f07efb5a2f6c3fd2750344a71e184c8cbde4d6fbfb0cced27d0995edb916 SHA512 afea1393ad93357142d8480ad9af757d78792cb991113f5f453381206fdaac3eb84a0ff75d735324a7c7c253b09d8484c2752b85f05d2c85899ae91e37878857
 EBUILD libssh-9999.ebuild 2897 BLAKE2B 45f5872ca4ccd8b8e51d45ee218dfe82367cee5018dfd34e59e8f453ec1d480244632431e3d911efb55ec1c8d2707114292804bcb18e909a2132f2a3ac72eb7f SHA512 4e974acf3d5a821f11822d4e36a8ed8b965ebe1b047992a7b1b344764043d8f81f925269766e98bc61a61615b6d61f24bed7cd5e9a19795bffe75f810f284dd6
 MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/libssh-0.8.5.ebuild b/net-libs/libssh/libssh-0.8.5.ebuild
index bfa5efa28109..230827a4e3c9 100644
--- a/net-libs/libssh/libssh-0.8.5.ebuild
+++ b/net-libs/libssh/libssh-0.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	inherit eapi7-ver
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 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"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 654623a7e902..acc4485fde5e 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 48d019f71273..23005fd6213d 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Amy Liffey <amynka@gentoo.org> (15 Jan 2019)
+# Mask experimental contrib repo
+media-libs/opencv contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d gflags glog tesseract
+
 # Brian Evans <grknight@gentoo.org> (06 Dec 2018)
 # Unmask argon2 for php
 dev-lang/php -argon2
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 8984d871c8e8..ce0266ba8af1 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -53,7 +53,7 @@ net-dns/avahi bookmarks gtk3 utils
 net-misc/openssh X
 sys-apps/dbus test
 sys-apps/man-pages l10n_fr
-sys-apps/systemd cryptsetup http policykit qrcode xkb
+sys-apps/systemd cryptsetup policykit qrcode xkb
 sys-auth/pambase consolekit pam_krb5 pam_ssh passwdqc
 sys-block/thin-provisioning-tools test
 sys-devel/distcc gssapi
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 201511485afd..2b5b8406df6f 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Amy Liffey <amynka@gentoo.org> (15 Jan 2019)
+# Mask experimental contrib repo
+media-libs/opencv contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d gflags glog tesseract
+
 # Brian Evans <grknight@gentoo.org> (06 Dec 2018)
 # Unmask argon2 for php
 dev-lang/php -argon2
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index e82e9643d137..8966740a2cc6 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -13,7 +13,7 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CALLIGRA_EXPERIMENTAL_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
@@ -68,7 +68,7 @@ LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer"
 # Johannes Huber <johu@gentoo.org> (15 Apr 2018)
 # Andreas Sturmlechner <asturm@gentoo.org> (01 Jan 2019)
 # By default build all calligra features (except unmaintained: stage).
-CALLIGRA_FEATURES="karbon plan sheets words"
+CALLIGRA_FEATURES="karbon sheets words"
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (28 Sep 2010)
 # Small default list of enabled plugins for collectd
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index f2e1c566f789..4c9f4bea6c40 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -167,6 +167,7 @@ media-video/ffmpeg appkit
 # packages. Those who wish to experiment with it as a fully recognised
 # Gentoo JVM can unmask the flag.
 dev-java/oracle-jdk-bin:9 gentoo-vm
+dev-java/oracle-jdk-bin:11 gentoo-vm
 dev-java/oracle-jre-bin:9 gentoo-vm
 dev-java/openjdk-bin:11 gentoo-vm
 dev-java/openjdk:11 gentoo-vm
diff --git a/profiles/desc/calligra_experimental_features.desc b/profiles/desc/calligra_experimental_features.desc
deleted file mode 100644
index eca3e40cdde2..000000000000
--- a/profiles/desc/calligra_experimental_features.desc
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file contains descriptions of CALLIGRA_EXPERIMENTAL_FEATURES USE_EXPAND flags.
-
-# Keep it sorted.
-stage - CALLIGRA_EXPERIMENTAL_FEATURES option to build presentation processor
diff --git a/profiles/desc/calligra_features.desc b/profiles/desc/calligra_features.desc
index 2915e518a3b8..f0979ab31d23 100644
--- a/profiles/desc/calligra_features.desc
+++ b/profiles/desc/calligra_features.desc
@@ -5,7 +5,6 @@
 
 # Keep it sorted.
 karbon - CALLIGRA_FEATURES option to build vector image editor
-plan - CALLIGRA_FEATURES option to build project planning component
 sheets - CALLIGRA_FEATURES option to build spreadsheet processor
 stage - CALLIGRA_FEATURES option to build presentation processor
 words - CALLIGRA_FEATURES option to build word processor
diff --git a/profiles/package.mask b/profiles/package.mask
index aeea373e9d72..01a820a157cd 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -116,12 +116,6 @@ dev-tex/revtex
 <x11-base/xorg-server-1.20.3
 <x11-base/xorg-drivers-1.20
 
-# Hans de Graaff <graaff@gentoo.org> (12 Dec 2018)
-# Old ruby23 only slots without any reverse dependencies.
-# Use the newer slots instead. Removal in 30 days.
-dev-ruby/net-ssh:2.6
-dev-ruby/rest-client:0
-
 # Zac Medico <zmedico@gentoo.org> (11 Dec 2018)
 # A Go library which has no consumers except those that include
 # it via EGO_VENDOR. Masked for removal in 30 days.
@@ -131,32 +125,6 @@ dev-go/sarama
 # Requires >=dev-lang/lua-5.2 which is masked
 >=app-admin/lsyncd-2.2.3
 
-# Hans de Graaff <graaff@gentoo.org> (9 Dec 2018)
-# Old component for Rails that is no longer used and no longer
-# maintained upstream. Masked for removal in 30 days.
-dev-ruby/hike
-
-# Hans de Graaff <graaff@gentoo.org> (9 Dec 2018)
-# No longer provides tests and no tagged upstream releases. No reverse
-# dependencies. Use classifier-reborn instead. Masked for removal
-# in 30 days.
-dev-ruby/classifier
-
-# Hans de Graaff <graaff@gentoo.org> (1 Dec 2018)
-# Old Rails 5.0 version. This version is no longer maintained
-# upstream. Please update to Rails 5.1 or newer.
-# Masked for removal in 30 days.
-dev-ruby/rails:5.0
-dev-ruby/railties:5.0
-dev-ruby/activerecord:5.0
-dev-ruby/actionmailer:5.0
-dev-ruby/actionpack:5.0
-dev-ruby/actionview:5.0
-dev-ruby/activejob:5.0
-dev-ruby/actioncable:5.0
-dev-ruby/activemodel:5.0
-dev-ruby/activesupport:5.0
-
 # Andreas Sturmlechner <asturm@gentoo.org> (25 Nov 2018)
 # Masked per security vulnerability CVE-2018-14345, bug #661510
 # Keeping it masked while users have unsolved issues with >0.15.0.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a61b472c30ff..a3d2e4d38c55 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8941,7 +8941,6 @@ x11-drivers/nvidia-drivers:compat - Install non-GLVND libGL for backwards compat
 x11-drivers/nvidia-drivers:driver - Install the kernel driver module
 x11-drivers/nvidia-drivers:gtk3 - Install nvidia-settings with support for GTK+ 3
 x11-drivers/nvidia-drivers:kms - Enable support for kernel mode setting (KMS)
-x11-drivers/nvidia-drivers:pax_kernel - PaX patches from the PaX project
 x11-drivers/nvidia-drivers:tools - Install additional tools such as nvidia-settings
 x11-drivers/nvidia-drivers:uvm - Install the Unified Memory kernel module (nvidia-uvm) for sharing memory between CPU and GPU in CUDA programs
 x11-drivers/xf86-video-ati:glamor - Enable Glamor OpenGL 2D acceleration
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index ffdab4e44f36..61567718b410 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 56558aee0a22..caee535a7abb 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -9,8 +9,9 @@ AUX gdal-2.3.0-libtiff.patch 306 BLAKE2B 8f2b39c812ceeee94b95102638885d0ff25086d
 AUX gdal-2.3.1-poppler-0.69.0.patch 12775 BLAKE2B 27fe38cb5db58961e1f9f4aef9eddbf396dd364dd1c14bb61fefe4eb16397b75a56edd1b7e3225ccb30ecb2da1f5a5ddc669c9dd984807d5e92fb76c9b83e0b5 SHA512 84eb0107abc9030e34bd953d1b8218a15c35432c0dc687e4d52b97c66cda44e842b53d2819cd998921fe5e90830ce063aa242fe933f0675b1c649fb1c5e44ecc
 AUX gdal-2.3.1-poppler-0.71.0.patch 2770 BLAKE2B d856ebd2cc1077b39303ca0300ff5a27d1d9981c4f557bb935a0a2ddf7372ef3ae25b59c8f87a103eaf8be0eb467741b1191032889efb5f98a8bb09be1254ab5 SHA512 9c8fc013b191fc579517389928c2d0c4c2f769f188b26fa86b192dc6e7223c799f579095d0765ffe2c6f7158a661b384cb36e92e7bc8c1d5af236d24fe41281d
 AUX gdal-2.3.1-poppler-0.72.0.patch 2377 BLAKE2B c70dbfba879ecba9956b27e56ffe6fcbb076b9f6ed127eedc201c8d47cf527109374e98e2c31107f9ff14dace67556bffeff8651ae01161f2cb9e78732585846 SHA512 985a44492c585c1c8066feb7810b135535ccc87abf86996f64806e53952e7dd96c02649e072a1329aefab80c03d2d6069c829d36c4ea1471493cfb3af26eb69e
+AUX gdal-2.3.1-poppler-0.73.0.patch 906 BLAKE2B c71bf66068f19e80f38907d3f5ffd24e73ae4be99f720cc852ba8aad2f6999a020d59e068ed8a173c6f84e97471c1f6937f82d2519a166282216995cb8db69bb SHA512 0e846ec7c5ddf44144949018ae70063df1043f9dc2730bb189e794ffb40bd91869bd6f5939bd40fc88b18fb53f20151e286610a8db6e9292ba1c5ccc4065148f
 DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992 SHA512 b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f
 DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7 SHA512 0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57
 EBUILD gdal-2.3.0-r2.ebuild 8138 BLAKE2B f11f4a5110a63b6eacac015ce16d05c235776a365d8328ce2046494ec560f6653f9dee26b8c99b536c6452d25e0fb600bfaed4b849b5dea87dea2bf5c0d5752b SHA512 a2cbe076456ad3b151c554b7f72da5fdf52637278b2e06816aede1e5150ee6c8aaf6441fd1be10a90b3bba380d99262c33430df10dfc7a524ea6001feca7bcab
-EBUILD gdal-2.3.1.ebuild 8331 BLAKE2B e956da7abd805784036e5d353f816f3710b8290073e19543590882f6348c0c09e5843b49ab44435eb972f118c3582642eb9304ce71390682ce21fe0c8199156c SHA512 c2aaf3699ae6b88d74c17ec17dbd0749dd667923db274b943e3d9082203e15f9470d0ed9646e615848dff135bb70b7e3dbc6eadb509ac84ae86910977a38c36c
+EBUILD gdal-2.3.1.ebuild 8497 BLAKE2B 263ccfa2d5ec703d0a51adea18f3a4cdfa5d2a8808c04b30f37bc5cb674e8d5c2f2eb578c4942691610a3d509252967b16056a371929a0eb1490ef4922c15f49 SHA512 9fe9e0bbe01a40dcff87ea0aa6004c8f5ca58619227bd76349ed0b85406c23c6f0cef79021a7634cce10fd1072a1f8bc1d6f7e5a6b6c35cb4a1bf5c21d999a29
 MISC metadata.xml 1616 BLAKE2B 7167165623c93e069ce77ef80e68e6339fc38354c0db343564ce8ecf3566e0d61b8b5aeb4e6b69e66bf1e8932d18de54b528bf1a2148767efe3b5cf985a31748 SHA512 dca0cb7a8c94a5313aed09f8c28ae35a55de4b0ff8198469b7f9adc8220b29cbd8c3f92db121b944b03c169b302ac8aa95f4342b76510590aff63a5f122c74c1
diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch
new file mode 100644
index 000000000000..8529d99e7351
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.73.0.patch
@@ -0,0 +1,35 @@
+From 77ea05388924fcf2a8c9fd4a777c97e4d69f5e17 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 16 Jan 2019 20:52:59 +0100
+Subject: [PATCH] Fix build with poppler-0.73
+
+---
+ gdal/frmts/pdf/pdfsdk_headers.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h
+index 9150b0f410..574943b41f 100644
+--- a/frmts/pdf/pdfsdk_headers.h
++++ b/frmts/pdf/pdfsdk_headers.h
+@@ -50,7 +50,6 @@
+ #pragma warning( disable : 4244 ) /* conversion from 'const int' to 'Guchar', possible loss of data */
+ #endif
+ 
+-#include <goo/gtypes.h>
+ #include <goo/GooList.h>
+ 
+ /* begin of poppler xpdf includes */
+@@ -79,6 +78,10 @@
+ 
+ /* end of poppler xpdf includes */
+ 
++/* poppler-0.73 compatibility */
++#define Guchar unsigned char
++#define Guint unsigned int
++
+ #ifdef _MSC_VER
+ #pragma warning( pop )
+ #endif
+-- 
+2.20.1
+
diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild
index 7af0dee08518..9f81394be026 100644
--- a/sci-libs/gdal/gdal-2.3.1.ebuild
+++ b/sci-libs/gdal/gdal-2.3.1.ebuild
@@ -122,6 +122,8 @@ src_prepare() {
 
 	# not upstreamable, not fixed in 2.4.0 or master as of 2019-01-12:
 	has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.72.0.patch"
+	# not upstreamable, not fixed in 2.4.0 or master as of 2019-01-16:
+	has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.73.0.patch"
 
 	eautoreconf
 }
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 05349629262c..045ae6d6f04b 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,5 +1,3 @@
-DIST indilib-1.6.0.tar.gz 1726681 BLAKE2B fc746fe74b41467930f50f4aabe63d485372dc3f7e551bf8b91ec92694efc5a73a29495ee4931f84215a90afdd1deb3c12f87aaedc32d33e408114674e6d79ad SHA512 a086a63e15f5f6fb05a0d1569578f5fbd4d6ba6ff5a0aaff7bd475925d3858840753f1aa04e7429a22576f52432a19e93b781e821ea908db6b7352af85f30422
 DIST indilib-1.7.5.tar.xz 1380436 BLAKE2B 092f4100894218bf749ee0d7c910c4ee20026cf471f4f65686b67dd37a924b448b6de3733e70d7047dca6a77fd8ae26b9a568f8249336be78d052984838a2ccf SHA512 57205ed9ea9d8e8215886b17d9f0307755bca571d599967dc607320fad5ec62096f31526280f3b184ffeb0434d9adb71e65a7d6f89d29edaa643d729765f47a8
-EBUILD indilib-1.6.0.ebuild 1105 BLAKE2B 8f5e21b13aea5f88309ea355abf526255c200a78b545e2992c774aefd28383bb5a14c07137f1370f820577c257e6304feed0e6be0912e69fe39fd7f2cf76b963 SHA512 42ca02a83d01913d99a786365166088a13bc0a41f49a99077f9d0acb58592f990124d753eaa21ff860deae33d438cacd591d7f6533cda7370b75f395e3e4750b
-EBUILD indilib-1.7.5.ebuild 1094 BLAKE2B 8e9bbf09f1f149092a38044d8dd41fcec374d4880c1fc23b86360087a2d3c6460aeebaac31fa2ec7e12fef7d1a7059a728e9f609af15280366f3f74b64abd0c8 SHA512 1f1e361e25cad53327834f0e103c039bd5482ead879c62bf645992db47079a3446ed76fa1931bba3ace38184aaff69e6e372ab210eb31756a3e3ce5104588dfd
+EBUILD indilib-1.7.5.ebuild 1093 BLAKE2B c74b0e81070522d33288a206e8200276d9953900b0445436db63d55729fd68476247347d083eac12b5c4a82716f4b084f8fa3fc67ef85233ef17e593d716ec48 SHA512 9b1d66d5f521da18f8002ef52b6c0e6017904404e8b123c839669e3f0fa3ab6afe4b824e306a90c0ce69d1e3664146f95456ca0609456accdff8cba9204d1ad3
 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
deleted file mode 100644
index 2bf180538e5e..000000000000
--- a/sci-libs/indilib/indilib-1.6.0.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
-
-MY_PN="lib${PN/lib/}"
-
-inherit cmake-utils udev
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="http://www.indilib.org/"
-SRC_URI="https://github.com/${PN}/${PN/lib/}/releases/download/v${PV}/${MY_PN}_${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
-SLOT="0/1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="ogg test"
-
-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
-	)
-"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	test? ( >=dev-cpp/gtest-1.8.0 )
-"
-
-DOCS=( AUTHORS ChangeLog COPYRIGHT README TODO )
-
-S=${WORKDIR}/${MY_PN}
-
-src_test() {
-	BUILD_DIR="${BUILD_DIR}"/test cmake-utils_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINDI_BUILD_QT5_CLIENT=OFF
-		-DINDI_BUILD_UNITTESTS=$(usex test)
-		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"
-		$(cmake-utils_use_find_package ogg OggTheora)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/indilib/indilib-1.7.5.ebuild b/sci-libs/indilib/indilib-1.7.5.ebuild
index 45c37c9670c3..a8179c7fb67a 100644
--- a/sci-libs/indilib/indilib-1.7.5.ebuild
+++ b/sci-libs/indilib/indilib-1.7.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 
 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/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 7c1d816fbbbd..3c75bb004087 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/yaboot/Manifest b/sys-boot/yaboot/Manifest
index 10d09ea0babc..8bd8eb4a064f 100644
--- a/sys-boot/yaboot/Manifest
+++ b/sys-boot/yaboot/Manifest
@@ -1,11 +1,11 @@
-AUX chrpfix.patch 979 BLAKE2B 0b3409ff68dd07f22faee5fd2af13e9d5fcfc6a3683cb09cc0d5858b03be33999d1818a3b7454028f2a6c7fa66734f1e0cd80d8fccc1587caede88411c88e6cd SHA512 e9be3e0a49b24c6b3879f45b29a14e186df95ebcfb2f4960b38c96c341de5123bc0bb8d42ed6ccab9a0bfb6632d1a5424b2167b4c6b566ee2a914a6594b80510
+AUX chrpfix.patch 983 BLAKE2B 8b2ecfaf5af26639abb3ed24e3b0cf5fe46e95d17a23e329ed646be444cfec754ab0c38b55c20defc5e8738dc4fc7f08937762f3674957ca858e28a4b5ffcf90 SHA512 2e21a50600d90d36c7532c19488bee5a010cd270c558607dab02a6e6d9df8f968ad6df4c5d99355d55a6a8aaf8084e553eb21629589946b036c4b9808a8a0d00
 AUX new-ofpath 4319 BLAKE2B 04866ae6446993febf28fd49fd382e6092724640e74e5dc940777dac21ee3acb12722f1e2c90f793f89de5ce97c8ce743a853ad8968e5c86a2a17c5525e0c6f1 SHA512 8095d1e085a38d3c058e750acabaaf58464117f1af03fcc4604e86c58cd305e138b340420d3f1a5da5e3752dea59cc823599a6cc7a585195011f0030f1b80787
-AUX new-ofpath-devspec.patch 936 BLAKE2B 6a0f7587b8ec86ec5e417c699d409a46498b2f8530176b7b16f278292ffa73eeb420dac42f814771f6326068d744de7ecc6fafd5e9c94d182ff6cafa11825337 SHA512 4848ebb10a3879224a5748741ed7134c3ae54f7425b786eae7ab6a9f13bdc893c70c15c2e1986a4a2d1f3f26fdc20c0da92c81c9f47e42c061670963d5cb82f0
+AUX new-ofpath-devspec.patch 940 BLAKE2B d398bb81e62ce4caecc2431657c2429d8fdb76b56c82ea2975784662f8eef52dd5201e98d78343ed6b9a4a3ce29844e4060edf25b24c232d2e7b0afe4e05b616 SHA512 ff3dfa9bb8d79d48d083b618e39ad98b0e6dc26c13986d0187961fcd323c8979439c0b21dc37655e4749db75ba397597c52a9a66b05a41155257219eaa0e660c
 AUX sysfs-ofpath.patch 3432 BLAKE2B 307f737b869ca0de81e638a48b4a7e0d9d597b0dc86cc3680efa6e40561706a8829b0c3a13c7d0f6153345d75d9394a8975131ec1722b8f18f8eb261753efec7 SHA512 e99946565708581ac0c606b4490f129eb7fd3687ef30350c4fd5a184a296cf8803d9ea4429a8c00011e7a491040ac2369185bd56cc327437755ce533e4749e38
 AUX yaboot-1.3.16-memalign.patch 889 BLAKE2B df80c4bd0ed2291dd465822820874ea913693f22eb916a7707bdfbb6ea36fb5592d0f2bdd2c7643fff93f7be9d78431ac6f2f25ad31d110b7a31fe94cc118fae SHA512 d80c9c9d8592f33d39b900c86dbda3a13ec23f8d6b1a6d9612ba59b6c38218b9e41b9f3a3aa01bd39c8b91ae01d7ea4693ae93b0e7cf9c0912f7243e1364820c
 AUX yaboot-1.3.17-nopiessp-gcc4.patch 1229 BLAKE2B a1d8faa966e7e1daa609d4102e5e9a73a429db3d2a762620ed4251a00b52aec4ae939dfce13bed933de29ae1fc0d23774b5fe7206087a58951ad837a3e4420e4 SHA512 32e41b33a1e7109ec0a7ba9ca97ff0d45144d9499aa7657bc93a8007c6c6fa8206a6b406729cbb27407c84ef004b4cdb85e4664d9a4666cbde7700e7b3e82231
 AUX yaboot-nopiessp-gcc4.patch 1355 BLAKE2B 2728cceadba84f37953ed702d09b69a6b11d9320dc97490f145e30bb8845011f9e26d18d909ac2e330512f2651d26d7d0dfdbc85d3d5c45a28ea29d8bc4de16d SHA512 413b2353735d82a81e2831d1e51a995096eadfb3c17feb51b6b75035057557ed8c9adebd58fa1635fcaae36fd25c1783e491b85b4437dfb73e1569cf48a51359
-AUX yaboot-stubfuncs.patch 4602 BLAKE2B 9ec25ccc2b7a491c4a94495aa16dedd1c354724716a1bd74b3136ecc4d2af781bc510e28545f27a59b1e2b232f2288d00ebe9c5101bcbef12a545d21631703f4 SHA512 599b0c0e1b1907ace9e0d449bddd934cf1d96364ff446e1cbbe5e743f46b44412a38b169f896a0a6fa51c19652b751089643331196ae66f0314bedc689ef04b8
+AUX yaboot-stubfuncs.patch 4610 BLAKE2B e2c8f77d4a0e12a74d9a52b0a410f671509ff1db205f09569108745eab31719218a0cd9d302d6d8471c50b54b458a5752417f5eff42017fa50476632b78b232c SHA512 1acb5a8a054ce469b7f0d7ee7960067a03fb1df0b43cafc7a1c4e9775b27ed7e982028185ebbc564116d51406b8ee7b12357cfab456ac00a26e9415e1da58fb8
 AUX yabootconfig-1.3.13.patch 1655 BLAKE2B bdd8f618bc30706b04adba1664a5414a233f9c32d793b364158a3f9b665872b9f2da3b5f9ac20e13b713280be2f6fb097055095a4d23f2953bff8630f116abdd SHA512 0efcae987f7cc9b93a86bbcbe1e74b3ee6228b0db3937adea1f6c8b2e48c58cab35db80209ae6e79ff3e9f992c374b65a7786adf46787c0bbe400270ae006e98
 DIST yaboot-1.3.14.tar.gz 219089 BLAKE2B e9f71476502dd61e1e277980eab486b35675f809249e27d72627f6469c75c7ea43740898cc8dc58196bb70d08dce52ef334fcd035ac92c66a4f77236a0371049 SHA512 7542073159a15787e27fd8246fe4c84c48cec5cc6fe76be06f4591bb9ca459ad0c81f0085f08d944745a186da005a5ace0d3d0b2598711ca3309fad1c5a00e74
 DIST yaboot-1.3.16.tar.gz 220360 BLAKE2B e717b101f14b6178f9fdcd4cf45077c1b9c5db91504f8a000710c02d8b35f6094deb590710c09352fcd18385122a1824b99de5600b176c79da0937fa5b287b0b SHA512 9cd98335c8b32787567253e628549fe88af5ebe4b81fb6b99741fbbcc0ae3b44dc4fdad527ed27da00103bc0482d9a33d3f128f542884387f5aa754546624e14
diff --git a/sys-boot/yaboot/files/chrpfix.patch b/sys-boot/yaboot/files/chrpfix.patch
index e64369ba899a..59ea7a072633 100644
--- a/sys-boot/yaboot/files/chrpfix.patch
+++ b/sys-boot/yaboot/files/chrpfix.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2004-03-22 12:04:32.056149336 -0600
-+++ Makefile	2004-03-22 12:05:51.824138328 -0600
+--- a/Makefile.orig	2004-03-22 12:04:32.056149336 -0600
++++ b/Makefile	2004-03-22 12:05:51.824138328 -0600
 @@ -103,9 +103,11 @@
  
  all: yaboot addnote mkofboot
diff --git a/sys-boot/yaboot/files/new-ofpath-devspec.patch b/sys-boot/yaboot/files/new-ofpath-devspec.patch
index ac03c15d8dd7..e9ad749d8f06 100644
--- a/sys-boot/yaboot/files/new-ofpath-devspec.patch
+++ b/sys-boot/yaboot/files/new-ofpath-devspec.patch
@@ -1,5 +1,5 @@
---- ybin/ofpath.bak	2012-05-09 12:24:51.709911981 -0400
-+++ ybin/ofpath	2012-05-09 12:32:19.661560544 -0400
+--- a/ybin/ofpath.bak	2012-05-09 12:24:51.709911981 -0400
++++ b/ybin/ofpath	2012-05-09 12:32:19.661560544 -0400
 @@ -85,11 +85,20 @@
  [ "$DEBUG" = 1 ] && echo "Devpath is: $DEVPATH"
  
diff --git a/sys-boot/yaboot/files/yaboot-stubfuncs.patch b/sys-boot/yaboot/files/yaboot-stubfuncs.patch
index 8ae522b7d4eb..ba6fcc7b3606 100644
--- a/sys-boot/yaboot/files/yaboot-stubfuncs.patch
+++ b/sys-boot/yaboot/files/yaboot-stubfuncs.patch
@@ -1,7 +1,7 @@
 Stub out some functions that are not provided (and unneeded)
 
---- lib/malloc.c
-+++ lib/malloc.c
+--- a/lib/malloc.c
++++ b/lib/malloc.c
 @@ -64,6 +64,15 @@ void *malloc (unsigned int size)
      return caddr;
  }
@@ -18,8 +18,8 @@ Stub out some functions that are not provided (and unneeded)
  /* Do not fall back to the malloc above as posix_memalign is needed by
   * external libraries not yaboot */
  int posix_memalign(void **memptr, size_t alignment, size_t size)
---- lib/nonstd.c
-+++ lib/nonstd.c
+--- a/lib/nonstd.c
++++ b/lib/nonstd.c
 @@ -65,3 +65,208 @@
  {
  	return NULL;
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 6db5085d3459..30a2d70ac4fc 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 185a0307d1f8..7b5b7401cef8 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -55,7 +55,7 @@ EBUILD automake-1.13.4-r2.ebuild 2675 BLAKE2B ef9568b327579376407244fad857df7259
 EBUILD automake-1.14.1-r2.ebuild 3101 BLAKE2B 9764c77e6d0c28b387a59160d09e8d9114bbbc7fae92cf48265c410898fd60a4cc50df8da592485e23a95a0e93c28ab78ab15e7db0eb6f063dc448246d5394f8 SHA512 2c804c47964a2f1b11a8400fbe9e650839a2cea4f73dec487a300ffdc4a5260a224b234e3c0c0b329e967acca63ec6ed2a44af657ba720100935d2a8d6f365ff
 EBUILD automake-1.15.1-r2.ebuild 3206 BLAKE2B 331eaa9a446627e92a4e3ae26904fa9d70ca64af6514edc269c711f27d628ca399663018045b6132954ab31dcb4bb1e11c841ab5d99b128d18f4dafa4cbc7309 SHA512 42a1acbf22ca591b1989f8e626655927d835518f4e28bed7122e807fb753cffde3bd04f9ddd218037ba8b7e3b93dfe6d655811da8b4a5d8dde7fc611b9e9a987
 EBUILD automake-1.16-r2.ebuild 3271 BLAKE2B e651d682f387c9e673df4022102bc35030d428b3023385e18e6734df82606e0b792dd70b09203f63d35834cfec5852f13da740f98ccf5ce352707eb15aad6779 SHA512 f91410336cb5de6a49fe4dbfc4fd3a5ac76f3aa2c8c585289805a7e283d4095a9542e3a0a56e4f15eca5cb490023925815980fed4e32fe832924722c68508dc0
-EBUILD automake-1.16.1-r1.ebuild 3126 BLAKE2B 45f8e393a7113aa7947c95ecfafe1659eadfebcec124543231240773eb5f582a8285eee456ea5fed9eea8dfa7fae2a100c23b5bb1ac6afc4a8db35ac1afea71a SHA512 97f1d902f0ed8c2d716759b4d91d10bc780363073790b51b6d247075d3cb6448e432171398b827b27210ad6770fecad693ac6071af1f9f108c7a1be0130d3e65
+EBUILD automake-1.16.1-r1.ebuild 3125 BLAKE2B 179ddba5abaca93c1203ff1cee14534f8585dc4afba1295e2b7e822a7729dd0e5a9f54ac6c9fcc11693a5176b2ed49cddc92b289c99a77b5dc4a24d494941317 SHA512 42f4c990e294dde181dedb947f4d4ab30d133b80c264cd7144bc424fef627bc7820ceee748480369e6054ceb74c851f5b5fef8a1867cf871ce0a13f167913285
 EBUILD automake-1.4_p6-r2.ebuild 2481 BLAKE2B 6247d6b13d0b5902ffc48b15936e69a45300bda12b236a80a99ba31562e7e1706201a1ff56c8cf0a6539c50a2e2b44972018f5e882e42b4801b6b1e7ce1b1e53 SHA512 db4daa874be88149d6eef10a8babe82bdaba6125c7cb5413a1c6b01a28cc7d0933adca8c1b6eb2aa31cb1e708cb6ec0404138f1c2661b4c008ce0c2a80d5c0fc
 EBUILD automake-1.5-r2.ebuild 2299 BLAKE2B 4d2c160631fb5dd5f3803a37168c90941f1d60890e0ec707a1e27a6dafd4dc960f54aa71c1beb0d646948dbc6a317aec7e2fa7805d587cef417d0e5227ea7984 SHA512 13f0e0ffb4b322743bb7e7922f380f77faf5fb9106055a540a66cce0663bca3bfb670d6d22d5dfa0e3c9678b4b20e7cbd17bd6719497d99e334adf592cf1d9fa
 EBUILD automake-1.6.3-r2.ebuild 2047 BLAKE2B 92a42f972d1d976370774166e25a13c399b9b720a228f2c7cfbdfde9ca005bbb33c6fbc53a3b40db8984b0682f512510dc0ec3f0476edec7785224fe6f8da9f0 SHA512 22e21b1a05187f1535f082b16a3607bc9f88270f2cfdf2b720491ab9615c226b2229ffb7b38dadb8a20b32fbea1d54cc7737d72b5c1aaed7b488dc88450f8a7f
diff --git a/sys-devel/automake/automake-1.16.1-r1.ebuild b/sys-devel/automake/automake-1.16.1-r1.ebuild
index 57e25033e8bb..75feef1cbf3a 100644
--- a/sys-devel/automake/automake-1.16.1-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit git-r3
 else
-	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"
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P=${P}
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 9d974cf4058f..fda6c036b101 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -3,5 +3,6 @@ DIST cfe-7.0.1.src.tar.xz 12488668 BLAKE2B b80247b5caf81661dfa715d9bf454b8023221
 EBUILD clang-common-6.0.1.ebuild 777 BLAKE2B 3f19ef0457ce59dffd312ee898a72b4b5e6d21a2f9403d159c2f92c76dd16f212beec6a906fc8652487a7bd7f0b773b86620ceb03ceeaa1974e9fd8bd021a830 SHA512 e469a91c0619ae0aca5f0c25bb14cb22fb5b773c452dbb212a32a499ff5101878455b28b2948fe118713ee5d9d15b24d470fde9a57ce38bbe46f26c0ed2c33da
 EBUILD clang-common-7.0.1.ebuild 782 BLAKE2B 8afe6fcd75128ff16981bceccf9558b9e4a98135ecc2298bfceb0cb5c42aeb2e283f55077b6f13cb68d5986c7b77b0d48887c5bc2bfc4109b483be14378f4ce8 SHA512 ecf255096b76c75ab26de6b86db0633ab09a253fc9e4cf9bbe7adb8e5cf5eeab75309b5548ae6622761eb59743720058975ea48e62f553e097eae6f32bc8bc29
 EBUILD clang-common-7.0.9999.ebuild 666 BLAKE2B f6c1fe58d00db323baffd3c426bb31d1835cf44b5554fbb8d7cbfd3a0ddfcfe968e0007465fdd13297c7aad3bf94b219c6d156e12fcfc95ea72e44a6f273dd40 SHA512 3ad6ab3333f0cbb4aea199b9409668f1ae5d3a1ba8e31f0a68e1dc1d2b4489cef0a54cf144c56ccb256feabe4bada8e764331ddf91c682eb4752527ce8bd54ad
+EBUILD clang-common-8.0.9999.ebuild 663 BLAKE2B 07c756fdc01c6a437104bd9c60d18e1aaed3605a2b2055d125077d001c61070b92aa663ffdf9e06ee0d7c2c02eafbaf584fe9733edce6dc19c6f0d434f9ca6bb SHA512 364a317e9cad676067a4b13990a4ba6a63270b10fb98a60c1bdbdb6ec94ba96db782b722d506e8735a9db9a8247a02632e11a70ad3b017af2ca515c1c08380cf
 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-8.0.9999.ebuild b/sys-devel/clang-common/clang-common-8.0.9999.ebuild
new file mode 100644
index 000000000000..c412694e6d73
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-8.0.9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 git-r3
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/clang.git
+	https://github.com/llvm-mirror/clang.git"
+EGIT_BRANCH="release_80"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+PDEPEND="sys-devel/clang:*"
+
+src_unpack() {
+	git-r3_fetch
+	git-r3_checkout '' '' '' utils/bash-autocomplete.sh
+}
+
+src_configure() { :; }
+src_compile() { :; }
+src_test() { :; }
+
+src_install() {
+	newbashcomp utils/bash-autocomplete.sh clang
+}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index c1cf2725c5f2..ba7f0755b3d7 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -5,5 +5,6 @@ EBUILD clang-runtime-5.0.2.ebuild 820 BLAKE2B 52c56a71db4514803c8ecc070e21a479ba
 EBUILD clang-runtime-6.0.1.ebuild 819 BLAKE2B ce5fe6e1f47830366c00f80149adfb9f0ac25742fe57dd1cb1f35c30186a919b89cdb679b342ff1db3ed676bc48c58f28c85b5c74e1adaaab18875293b8be1c1 SHA512 25d88ca2c1d51c0140fbb7572fc45786a61902ff27534ad8e2bd8d12155a69229cadeee3c4827533207a265aa290e829de2141f96bc7d2181c59731ce0fbacfc
 EBUILD clang-runtime-7.0.1.ebuild 824 BLAKE2B ea493dd4bc3f7f0d043d6dfffcbcd33f1de6544ca39eacd9f9de57416fed31e6efb4826387b621b14629aef90cc8c73d9d6120e90f5f8f65086de4a7e43eb58c SHA512 875abc4cfc5a4d63016699c7b95b398e8ad1a4bcae6aa90ef198918e9e7d419bfc604ec8e7efc9387f1be36954fd2cd9530487f96b9387e86af8cada2c26ac2a
 EBUILD clang-runtime-7.0.9999.ebuild 780 BLAKE2B c911019fb106da9d2c2010921b3e410a83249dc8b1d776a0b98b8cf8024a259d0fb0daaa12558ac994155be97ac831987b18672975cae40b9544828e0369fad2 SHA512 87183412251e82acd10c3a33921ee0e87f24ec9d37feadeb128094684523fb6512efe6216993b0cef4ed19a00138fee372359eedde58752b48cf85c0f10b9888
-EBUILD clang-runtime-9999.ebuild 780 BLAKE2B 97af098ee32a2d42a79dcad29edd1ff7471cb82575ce140cf664d95f2ac805dffdb82d1ee7a6a2b1186e72f594a45a651008494dceea77f496f10b6de5c3acb9 SHA512 d13c63d506cfcda5f1ff4b192b4748d7e4236e89faefd99fc5e30a961bc85931ecdbedd333d83111204cf849e1a0e7f066d845aa38d5b52b911865986173949c
+EBUILD clang-runtime-8.0.9999.ebuild 777 BLAKE2B d63ec3b09f8c2c7d2ff3e3801c3ddefcc59f0086832b96eb014d2a928ffea163c61527e149986bb5f81cb55b466a44bcdee00aead81e1a1dc95ed83133618f13 SHA512 c51f0a4cf46ecb01481e6c4613e399ef3801e7e38963b6b4a94f652a305ebfc45f7afd849f170a4da2333c8372cb27ae129fa054a57f5734ee3cf966c52aeca5
+EBUILD clang-runtime-9999.ebuild 777 BLAKE2B b8dd34360665cae1564b7b6f18d06e5bb7c40d4da1a1315104fa8b530229301ee1a1643c8481657782cae55c6f7921de33cadbc8e46b206d66db438c244b7025 SHA512 0598b3a3381374f377637bacfae6dd8fe8efaba5901692c8a1efb4fe7c2faada61c821602bbfd0f1ba5553642383507acd4ae10207e98fb7bf01cfd78c1f99eb
 MISC metadata.xml 708 BLAKE2B 56cc586deba4a72cc9ebf5d0ac6b9dbb3767b736a96f1c0e4f8d9a715076645be25e42f1c610f55ba69e500bc828d629e7f2253e7c9ed6fd4b01032722bec3c8 SHA512 764eefdff5358c66cad9e8fe18fc7b938c7656268208639cbb92a4b5ae76f7de0dee86a729cc1e6745ddbf7308180885ef99047502e0e040020e738e3d0d1425
diff --git a/sys-devel/clang-runtime/clang-runtime-8.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-8.0.9999.ebuild
new file mode 100644
index 000000000000..d9cfd5fe10db
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-8.0.9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+# Note: keep it matching clang-9999 version
+SLOT="8.0.0"
+KEYWORDS=""
+IUSE="+compiler-rt crt libcxx openmp +sanitize"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}
+		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
+	)
+	crt? (
+		|| (
+			sys-libs/netbsd-csu[${MULTILIB_USEDEP}]
+			sys-freebsd/freebsd-lib[${MULTILIB_USEDEP}]
+		)
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
+
+REQUIRED_USE="sanitize? ( compiler-rt )"
diff --git a/sys-devel/clang-runtime/clang-runtime-9999.ebuild b/sys-devel/clang-runtime/clang-runtime-9999.ebuild
index 43a7e11f5ce0..feee635ea14f 100644
--- a/sys-devel/clang-runtime/clang-runtime-9999.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 # Note: keep it matching clang-9999 version
-SLOT="8.0.0"
+SLOT="9.0.0"
 KEYWORDS=""
 IUSE="+compiler-rt crt libcxx openmp +sanitize"
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 6c116b834a8c..4883e98fe2fb 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -34,5 +34,6 @@ EBUILD clang-5.0.2.ebuild 10452 BLAKE2B 2f0af78f8cdaf88e643bccc474ff186db2683073
 EBUILD clang-6.0.1.ebuild 10272 BLAKE2B 7f179071a60dad773c4fedd95aae8c7529e84f891f6001808576bf6523baebe92eee713522c03accdcbeff76afc0c0a1329e159eef2cd307a2ff4ba6b598edc1 SHA512 508dc2b7c6758f63e931f83ec851ccf6e07433719e4e8dcb1f366c736bd22cb4fc19723dc2f05f7ff90f1828fc41a71d808d4f7f8332625134294516dc52ce79
 EBUILD clang-7.0.1.ebuild 10292 BLAKE2B 09856bbb082206962b40968f0553d40005a9b47000c2f612d2052bbca72e8c0e6e1bd5f3605deae0779167263e054e3f3c403a4bf5317cc48855dcc85664218f SHA512 f6239ddbad9a90e2006ab6358594ea035782a5f44fd5ffb76714c3ec85fd1f3711b1d9242f1e51a494a403b60eb03d8cade16bc2bf2e81af614d4942cc2a3583
 EBUILD clang-7.0.9999.ebuild 9427 BLAKE2B 60c2334a185dec4b05de6eb73eccd498bd707703dd80c429f6ffdfd74b2fb9ee82b916df14ff7433857cab5d5381b9e9527ab53560c4362a57f187fefc7e6e71 SHA512 dcdef2d19e4c10302607595349a2ad5b5e58fdcabb16a798713cf2e8f2dda0cd2d778b7f8b1769b8326bb75043daafeb2bcf48c722614c11dfcadc1b0861e49f
-EBUILD clang-9999.ebuild 9507 BLAKE2B d80b2dea59f1e942e67fcf9ca322ee85be631b59e79adcb2cfd40577875248188cfc173607efac57febc0b1463083e991dda65244bd6663655ddf19564db6c70 SHA512 682d2c98a82d7b3be48820737ed46e363e53d9f4c74cb2f53e4cac4a546872af269dc1d40b601c05b42fd9ed886003f8ff2f1af1045e4edc7a97d660ad15d5f9
+EBUILD clang-8.0.9999.ebuild 9439 BLAKE2B ee444ec3a9b2eb53f5099460abb1aacf3e4ff66508f41e37187cc2ff55d03e20e114e9e0adbfd7688823f0ab43064905246e77048c3692b0ea3386780781844a SHA512 410a534f8ed61a4928b6dbfcd4e9b851131fe789dd188953a86722a617ac90284799041da9aa94843858c3c41d4d62a5a00eda4ab3ea49cc0d2861df85a6ef55
+EBUILD clang-9999.ebuild 9504 BLAKE2B e4cde897640df7698df594f3f64785b8e1980b909cd6aba4cb6b5126c60b4d5dc3c85679e80d071e6b09932cf44432261619d65d3782e90ab24b7a563fbb7af5 SHA512 35b7656ae05016917109f7eae5dcf96f25686cd37d3a7d3a4604f79f806826e97226056a041818ed681a9e23b6e026ddf4ff703e6f858d89dc930110d5e7de62
 MISC metadata.xml 1455 BLAKE2B 9dd88bba7158dfdc83bfc48fa4134e1f5a3357ab778cad400a51e348bbb4b44d2740ec417fdc888df0b4fd820441649e92b7adffdd4db558a2f4c3f4830a83a1 SHA512 369a87bd551e483e81ff56f5167177b1bcfedf9bc97f501ef2b07bfdfea3a25532f5e86af062568b3b22a53fe07318fd93dc55bd83b453dd10a0f4d3e88cb932
diff --git a/sys-devel/clang/clang-8.0.9999.ebuild b/sys-devel/clang/clang-8.0.9999.ebuild
new file mode 100644
index 000000000000..436cd91d92d1
--- /dev/null
+++ b/sys-devel/clang/clang-8.0.9999.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eapi7-ver flag-o-matic git-r3 llvm \
+	multilib-minimal multiprocessing pax-utils python-single-r1 \
+	toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/clang.git
+	https://github.com/llvm-mirror/clang.git"
+EGIT_BRANCH="release_80"
+
+# Keep in sync with sys-devel/llvm
+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="UoI-NCSA"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
+	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
+	static-analyzer? (
+		dev-lang/perl:*
+		z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
+	)
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	${PYTHON_DEPS}"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	xml? ( virtual/pkgconfig )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+	!<sys-devel/llvm-4.0.0_rc:0
+	!sys-devel/clang:0"
+PDEPEND="
+	sys-devel/clang-common
+	~sys-devel/clang-runtime-${PV}
+	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+# We need extra level of indirection for CLANG_RESOURCE_DIR
+S=${WORKDIR}/x/y/${P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	# create extra parent dir for CLANG_RESOURCE_DIR
+	mkdir -p x/y || die
+	cd x/y || die
+
+	git-r3_fetch "https://git.llvm.org/git/clang-tools-extra.git
+		https://github.com/llvm-mirror/clang-tools-extra.git"
+	if use test; then
+		# needed for patched gtest
+		git-r3_fetch "https://git.llvm.org/git/llvm.git
+			https://github.com/llvm-mirror/llvm.git"
+	fi
+	git-r3_fetch
+
+	git-r3_checkout https://llvm.org/git/clang-tools-extra.git \
+		"${S}"/tools/extra
+	if use test; then
+		git-r3_checkout https://llvm.org/git/llvm.git \
+			"${WORKDIR}"/llvm '' \
+			lib/Testing/Support utils/{lit,llvm-lit,unittest}
+	fi
+	git-r3_checkout "${EGIT_REPO_URI}" "${S}"
+}
+
+multilib_src_configure() {
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+	local mycmakeargs=(
+		# ensure that the correct llvm-config is used
+		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# override default stdlib and rtlib
+		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+		# z3 is not multilib-friendly
+		-DCLANG_ANALYZER_ENABLE_Z3_SOLVER=$(usex z3)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			# normally copied from LLVM_INCLUDE_DOCS but the latter
+			# is lacking value in stand-alone builds
+			-DCLANG_INCLUDE_DOCS=$(usex doc)
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc)
+		)
+		use doc && mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=ON
+			-DLLVM_ENABLE_SPHINX=ON
+			-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+		use z3 && mycmakeargs+=(
+			-DZ3_INCLUDE_DIR="${EPREFIX}/usr/include/z3"
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-clang
+	multilib_is_native_abi && cmake-utils_src_make check-clang-tools
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED%/}"/usr/include/clangrt "${ED%/}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	# note: we use two version components here (vs 3 in runtime path)
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1 "${llvm_version}")
+	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED%/}/usr/lib/llvm/${SLOT}/bin/${i}" || die
+		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+			dosym "${abi_chost}-${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
+		done
+	done
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	if use kernel_FreeBSD; then
+		rm "${ED}"usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
+	fi
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED%/}"/usr/include || die
+	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
+	mv "${ED%/}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED%/}"/usr/include/clangrt || die
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"usr/lib/llvm/${SLOT}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
+	elog "To use these scripts, you will need Python 2.7. Some of them are vim"
+	elog "integration scripts (with instructions inside). The run-clang-tidy.py"
+	elog "scripts requires the following additional package:"
+	elog "  dev-python/pyyaml"
+}
+
+pkg_postrm() {
+	if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index bf5ab043a347..a7338a6473ca 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
-SLOT="8"
+SLOT="9"
 KEYWORDS=""
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
 	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index a3379e6941d7..7068404d8905 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -13,5 +13,6 @@ EBUILD lld-5.0.2.ebuild 1589 BLAKE2B ce6f2b7d0b095223600a236432966cbc44d89d781f6
 EBUILD lld-6.0.1.ebuild 1731 BLAKE2B 94a45353bb5db9ff18974afbbf2f77f00814302af1f146298da97cc53941811b91367aee89c82365e1a712ad7d86b2e8ad0b6b59653e56296c7e45e8ab65a266 SHA512 3985af3b2b300c6ddfade3c848a51f8dd1254f15bc3c51cf4d6a5bf8d655de756c8e5315c5594f65f07530b8d21526367f4397fd9b39f895a5f1e525a3aef409
 EBUILD lld-7.0.1.ebuild 1733 BLAKE2B 8f5515ebfa7e00622c1502882129f0772b3e8c8f3cdb4ecd4b218125bff671992398fa9475b0ed7ceace43a424ce4ff0a534d2f3eb6ab70b5b887a27dcc9ea02 SHA512 ccf1242bb538e4fb270936f9ccf735833a41533867465735b81deb9b5dc224c8324894beb311bbda78f3c46199cc59ef7945dca456a14bcb6c9eb3a454ee20ad
 EBUILD lld-7.0.9999.ebuild 1674 BLAKE2B 14f026b7d86c935329e9909ac9ed73519350e8a845dffd669a1c0c1f1f82c8ef9ccfa06140f25efe78ff765eed2e05a667f495007a2a40259b1e75fb798a48a3 SHA512 6d1786893ec8348de2b8efb675c13672be1d366b108f633adf1772c0b96e3f2574aaf624cd37bca76af86032431589cd3788cca76e5fc64b4aa49a86904498e1
+EBUILD lld-8.0.9999.ebuild 1671 BLAKE2B fe3a570707d74ecca2953d44c0fa144565dc8401ebf1010e42d02fd6ce4206f5dcbd7be59f809da0c4dd155d8841612906d54d425b93480c5d5d3e6bab892a90 SHA512 465911be8df389e238d611e8341e9af6012027638aab97bc81cc5ad4cb55a79805830cf9e6eb6a2db8f708abc515e8a39225643d2f62898619ee55a921be30d9
 EBUILD lld-9999.ebuild 1625 BLAKE2B 2308235d2368d9eb25a1d8ae41eaa6b182475e5d49aeb37ff5fc025cb500d268a2f935b4dbe26ed1c2ab950d082e40030a5d5d39a5e3357ca8610f927ccc0fb6 SHA512 6abdc37eef950c50164a29752ab370e08aefe9db909a4ac2ec1f9eb1e6a8b3fdca8ed776945f0e9b745bed11633b2ff33f1f00853e7fdfd22664756eba839f14
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-8.0.9999.ebuild b/sys-devel/lld/lld-8.0.9999.ebuild
new file mode 100644
index 000000000000..997012491a4f
--- /dev/null
+++ b/sys-devel/lld/lld-8.0.9999.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils git-r3 llvm multiprocessing python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/lld.git
+	https://github.com/llvm-mirror/lld.git"
+EGIT_BRANCH="release_80"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if use test; then
+		# needed for patched gtest
+		git-r3_fetch "https://git.llvm.org/git/llvm.git
+			https://github.com/llvm-mirror/llvm.git"
+	fi
+	git-r3_fetch
+
+	if use test; then
+		git-r3_checkout https://llvm.org/git/llvm.git \
+			"${WORKDIR}"/llvm '' utils/{lit,unittest}
+	fi
+	git-r3_checkout
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make check-lld
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 7bac66c909cf..6f25d774c50c 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -7,5 +7,6 @@ EBUILD llvm-common-5.0.2.ebuild 839 BLAKE2B d7e6aaba7df7b7da6da5f7cc9cc165b89217
 EBUILD llvm-common-6.0.1.ebuild 838 BLAKE2B 7c30c7e7e52916af34728e11cc6e00e6add5363974affd53e7940bcbacfb3b7a73bd17d86b29b10684535ced07c0237909473c4500e2439d5824b4cbcf924d7e SHA512 d642ce674d3a0a742e5afaeb97a5e67e5a616ddd18642777dc640c44fc65c9f5d34c5e1398483c062152e87c9ab076b5518ad3ab5d39df9d1ce1331eb2784464
 EBUILD llvm-common-7.0.1.ebuild 839 BLAKE2B cf53a218b327891d8647c5c703470b85f28d60bd36057d9eff6273746af7da0ff6ec8f09589a19c6df46f89359c663cbbca8898082f33a6a58baacce883e1469 SHA512 c02493f7f293c9b500a2e5a68d065053b61ec22f9d1e082e6cf802b869f0097ba2ffb04a7db65dd8441bafc6555c16a4cf6868ab3ce3a3ddd562c92f011dae48
 EBUILD llvm-common-7.0.9999.ebuild 729 BLAKE2B da80aa6feb2e836dc2549dac86659c920be0b8430a70c322d7337a5771963d2cff95d497486904a5e96706002123c098ba446a50925269122c14abdb8cdae76e SHA512 b45c99bc3f1c5ec05df418b2206245159b5604c6780e497f16ce52f50def0d0e867151ee7f6811b5ac72150336f0821dc1c4e56ed1e9302d840dd23b6a651a26
+EBUILD llvm-common-8.0.9999.ebuild 726 BLAKE2B dc1acf8df7298c6a658b6b4c9d11335363c2e8be2c437e414a7379c104ee8300f52375c1c20e441edf397558b73e5e37099ad421ef43869625dc79e58c85e165 SHA512 cb7c4c44f573c2b4918fb40e2db5d92937ec6079e68ae832a4419382487996ddca833655beb3a1e0b433d69ae96649995d77890d4c2f88b010f3d613c8168dc8
 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-8.0.9999.ebuild b/sys-devel/llvm-common/llvm-common-8.0.9999.ebuild
new file mode 100644
index 000000000000..d83ddbc253e5
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-8.0.9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
+	https://github.com/llvm-mirror/llvm.git"
+EGIT_BRANCH="release_80"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="!sys-devel/llvm:0"
+
+src_unpack() {
+	git-r3_fetch
+	git-r3_checkout '' '' '' utils/vim
+}
+
+src_configure() { :; }
+src_compile() { :; }
+src_test() { :; }
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r utils/vim/*/
+	# some users may find it useful
+	newdoc utils/vim/README README.vim
+	dodoc utils/vim/vimrc
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 9427362e63f2..2b74e1e1c5b4 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -56,5 +56,6 @@ EBUILD llvm-6.0.1-r2.ebuild 8173 BLAKE2B 9b735e8161bf235b538e6ab375ea17b428cb5c3
 EBUILD llvm-6.0.1.ebuild 7824 BLAKE2B d816d77974b826836a9aced3387b6a3583859d15b7b8c83499b5f5eb04932ea89966af4b49ea5e2b320c997051891387dace2d2d84bde8f2c0d6f3b26fea55c8 SHA512 bc460c9e7bee704c2d814c9911398d5125196337f410489396a9254d79b2d421c2ca33ec350b3342bb073c761d2e180e73eb474281af3aca2194eb291ea223ed
 EBUILD llvm-7.0.1.ebuild 7720 BLAKE2B a1a0f4e79ac4728c84f13801997dd49472d385c0df5eda400988480aacb2ed4e282db9ded6d2444135f9a2cf37dca9f05fe7974a02595c922ca42e2cecd7707b SHA512 1d1e17afe9153f96a18da9533a58b6543d8874a0bfac66ac603bcb078ee7af4f83ba5a4558e6827656e5aaf3a7f81518bfe0b6e0485dea6ef19ec0e5ca9adc61
 EBUILD llvm-7.0.9999.ebuild 7410 BLAKE2B 1e55f001db2f018dbcf0b8eb268b4174a10e10cc0def90b37f462457bfce89c8f2001932770f07ad527e2a28d13aa0941ac962bf535a54076792646ae3340ca7 SHA512 f7e5966be7d4b688e48cd67faf87ea6ec2f1096c067db6958381b5cb2ddc923bf79eac922892d271283d99df9cb6889f4d442f7ecda9155d406d5003abaccaea
-EBUILD llvm-9999.ebuild 8533 BLAKE2B b77410643fbcfc2bbc9884ee13c40fb7bb262c4935301d9e09e02743117c654c246783121c06aa7e241ba5964012b917dbfb90f527f98291f176ec0388db5fd2 SHA512 44006ca5a022656b53fcc006f3e8adbc5828e183a69b2952bb556c580ea92d755b01ffedc8a4736b22ded70df8d51df0dcb5b906211503aaef7a97e715295232
+EBUILD llvm-8.0.9999.ebuild 8223 BLAKE2B 2e30e777d023ddd2ac4bc57029358a8fc312bbd6024fac1e26ab60970b54efaf1ef361674f257558528dd65f461f537a5c6e62c3d2f3b9ae2ed2b00ca009e7cc SHA512 c9b919165278d7a2104f0bf93e1db08cc52321a1bc30fbdb0a0dd4fa85d7f1de75ab870a4c980a0357b3dc92f5e12b62bdb0a9f140dbd19ec8f6793493daecfc
+EBUILD llvm-9999.ebuild 8530 BLAKE2B 319395250daaf2b3d087c8c5321557746917ffcdfb96e8bc0d27dba9a671935cdb2d3c65045f1a3a3f964e2de8ca41a381082bf075f822ba59010fd7e8f5d02a SHA512 662e75b9022bcec745a52a45c26d914e4b2511e330ee67402f77ad6c5d20bb4241bc16d73d09c3002291ec494df8a49bf36279b0acb5bc0a7e3ab3c51f2a1911
 MISC metadata.xml 3022 BLAKE2B bce3df757f9f5639bfb0171321774084523f1f86b22d73fdc577b73ef8765c13f0b32118905616e8ae8505dd7e8820039d9223c33e209c53c354db82c35b4ec0 SHA512 27b6955992b03981b5bb91d358686ddbeac8d97d1b55b5178209acb22d7efff04c34b463ee2fdd5882b66569c97973f2dc39a8f12d5b4342040b61d59a449226
diff --git a/sys-devel/llvm/llvm-8.0.9999.ebuild b/sys-devel/llvm/llvm-8.0.9999.ebuild
new file mode 100644
index 000000000000..b31f34a91058
--- /dev/null
+++ b/sys-devel/llvm/llvm-8.0.9999.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils eapi7-ver flag-o-matic git-r3 multilib-minimal \
+	multiprocessing pax-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
+	https://github.com/llvm-mirror/llvm.git"
+EGIT_BRANCH="release_80"
+
+# Keep in sync with CMakeLists.txt
+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_}" )
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. ARM backend: LLVM Software Grant by ARM.
+# 3. MD5 code: public-domain.
+# 4. Tests (not installed):
+#  a. gtest: BSD.
+#  b. YAML tests: MIT.
+
+LICENSE="UoI-NCSA rc BSD public-domain
+	llvm_targets_ARM? ( LLVM-Grant )"
+SLOT="$(ver_cut 1)"
+KEYWORDS=""
+IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml
+	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=
+	exegesis? ( dev-libs/libpfm:= )
+	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
+		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
+	)
+	kernel_Darwin? (
+		<sys-libs/libcxx-$(ver_cut 1-3).9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( $(python_gen_any_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	!doc? ( ${PYTHON_DEPS} )
+	gold? ( sys-libs/binutils-libs )
+	libffi? ( virtual/pkgconfig )
+	!!<dev-python/configparser-3.3.0.2
+	${PYTHON_DEPS}"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="${RDEPEND}
+	!sys-devel/llvm:0"
+PDEPEND="sys-devel/llvm-common
+	gold? ( >=sys-devel/llvmgold-${SLOT} )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( ${ALL_LLVM_TARGETS[*]} )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	use doc || return 0
+
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	# Fix llvm-config for shared linking and sane flags
+	# https://bugs.gentoo.org/show_bug.cgi?id=565358
+	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# User patches + QA
+	cmake-utils_src_prepare
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DWITH_POLLY=OFF # TODO
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DHAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	if is_libcxx_linked; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		mycmakeargs+=(
+			-DLLVM_VERSION_SUFFIX="libcxx"
+		)
+	fi
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	if multilib_is_native_abi; then
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=$(usex doc)
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=$(usex doc)
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use doc && mycmakeargs+=(
+			-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF
+		)
+		use gold && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED%/}"/usr/include || die
+	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	newenvd - "10llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT%/}/usr/lib/llvm/${SLOT}/share/opt-viewer"
+	elog "To use these scripts, you will need Python 2.7 along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index eb43281d3111..abc5f6f5ebda 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,7 +35,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="UoI-NCSA rc BSD public-domain
 	llvm_targets_ARM? ( LLVM-Grant )"
-SLOT="8"
+SLOT="9"
 KEYWORDS=""
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
diff --git a/sys-devel/llvmgold/Manifest b/sys-devel/llvmgold/Manifest
index fe3e19551302..392b76f6b567 100644
--- a/sys-devel/llvmgold/Manifest
+++ b/sys-devel/llvmgold/Manifest
@@ -3,4 +3,5 @@ EBUILD llvmgold-5.ebuild 562 BLAKE2B 31652a1e9d08a66e2b9cac7557c3e887da039b2a1c6
 EBUILD llvmgold-6.ebuild 561 BLAKE2B 791f54efe7fa1c99d9a14d75a5ef023114b8cbb4183261b0b042e5dd5eb28a14657082fb0ac3faefa0f4b44bfa2a5d885dea11450e313ba156925eb074c33239 SHA512 245def4febc63a8f161aaa00caefaab5d9d82d6857c730024f1e1366e8a3c6d4cb48e5d1c5c648b9e8ad127607b7e009f29a3e39e39c574ea23356ffe93b0f9e
 EBUILD llvmgold-7.ebuild 565 BLAKE2B fb2d5bf2c3af4e725d29e914a332c80242f0fe39a78bf383adaf95e0f4df25406ee18084ab07ac9aa189b47f91a6175fecaba7c1023fb767f4b01b4467470bf8 SHA512 08beaf82e233404ebb09c23fe505654db8888176ffd7f2a3a97940e5ee764c174dadc6cb5816378fbe4428787aa834e425b1eead8a4ea262e081a50f7ea03466
 EBUILD llvmgold-8.ebuild 529 BLAKE2B 9949030d84f9cbad9e1936893c75bed7207d32572606fc335a624f96c84ec4c79edf6ce557308868a3ead5e24ae64c92746d5bcc03a1c5ddbeae2b4500384b9e SHA512 d330f8a86bc4de2710de3bb4833e5d7e6c992e986723a66a1326121da39dfc409e0dc71af0d7e335e21ec849cc2fc5808866be7bdaee13f5ece246ca4d9e80b8
+EBUILD llvmgold-9.ebuild 526 BLAKE2B b3715471c71dd9d1ec294d3423560ba7623d43eccd8fcd007924c12ec9bcf9e7fb7db63c04db0ffa894889f0d1ec51cceb394c5a1ee245c361ad5d3d248f5c5b SHA512 5e5a876ddaa436a2ba0e478ed504c4d391195461748db0c8fe8b1a2125a2186417f282c214d2badd0f0fb255d6eea28a4f48ccb206ccb2427d83a74e7a52ea5a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvmgold/llvmgold-9.ebuild b/sys-devel/llvmgold/llvmgold-9.ebuild
new file mode 100644
index 000000000000..2003115b219f
--- /dev/null
+++ b/sys-devel/llvmgold/llvmgold-9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="LLVMgold plugin symlink for autoloading"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="sys-devel/llvm:${PV}[gold]
+	!sys-devel/llvm:0"
+
+S=${WORKDIR}
+
+src_install() {
+	dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins"
+	dosym "../../../../lib/llvm/${PV}/$(get_libdir)/LLVMgold.so" \
+		"/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so"
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index c7657ab0887e..f5d919be56a9 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 8bcf8f164e2d..e0324370e1ad 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,16 +1,12 @@
-AUX btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch 1168 BLAKE2B d2ebad85f6f15dfe97fbdce1f32170a14655ec3280ee5720fc6abece9b29c1a60eb3ad7207f396f9a4edd792a9f09928dc396e6906f1d2ce561d5d27ed8266b4 SHA512 de99775ec92dd87ed2bcb29885a18a69f781490bd71a26c0b5536f8b180d8a03ebb4fd52eb8b3939c2f28dcae01bcbddc93c0b7b347f15e5295939f5e5dfe9e4
 AUX btrfs-progs-4.19-be-bswap.patch 1035 BLAKE2B 153ffa73bf79eca3172bd566d7daffd84d52fcb01fd69ad30547ed44a2ce1eec23b6eb95bbcb0259a966a152f796f5c57f022b33cbf7063c4e53236e93c6b3aa SHA512 695d21bd1dab1196596e4f6e2d14020e0b0e938493459feec33ac21f9ab6ecddc5c14a79ba738166d6010662b4f6c75232c6d3393d8eb69c5d7c7d0560448051
-AUX btrfs-progs-man-no-gz.patch 2206 BLAKE2B f195b10aa96230e056b4d5b94019a799cbe9717a1fdb2141a293c3916a929181ea12a1d32da6db7113b888da066463ebd55ae64712d54458cba0c7b654d6487b SHA512 94f0cf810f4f800f40a478595cfd062b0a523cb7538030152ee21d5a0adeceaafa310aab95c119c98309ee606a2ee6d6c4ff7014fe8026d43288ceb04c2773cd
 DIST btrfs-progs-v3.16.2.tar.xz 291604 BLAKE2B 66c19a47062386888209b2bb569cc5db8629446554387af971f5ba13ee49b654b2706fd6ed391115075533e6aa5637c7ebfe87b9abc2fa941739baee9fffe1aa SHA512 7dc0f2f8f0bbddbbf1d4d99854425341c4b3997334c65d7e936bcec1ee5ca880101b8b45498721502857b478edae6237a934c7d4acb735de43c6d8ff35efe53b
 DIST btrfs-progs-v3.18.2.tar.xz 1029228 BLAKE2B be8b3e0151c939135bcac11cdd118b7cafdfefa9d06de4629a0727db781b42dfdfa447265d1b4dafce8711a65ac838b19c38a2a93c0439d92d5b8fb4b4d974f5 SHA512 7fd125eeedabd54178f5198ac09c364b6772125124adcdb2620515a51c331307205ae06ff81375a49ebc62650d537c6f9eed2b63bf1f7e97b9ff047cda8a2cc4
 DIST btrfs-progs-v4.1.2.tar.xz 1123080 BLAKE2B 4b6395080c1456321d6923609544da066bd86806588e5860bc2750162a257a94a64cd4e3fb1362065eaa38a73fdee92f053cd2a26c367fe179aa13f068e8b1d2 SHA512 dd159bcc3adb65efd4f612d75f5a6b30df8ad9fa06ef952dd03dac965256de37eab26f4cc2fb3840178403ccbb7368cae11638e27eadb9b1835b636c4b126e2e
 DIST btrfs-progs-v4.10.2.tar.xz 1508304 BLAKE2B d2540b27f4405d43ea60e0f6d31fae1794641d81db066ffab57a8f8cc9f6671c3bc01df5efc6309967e88af418e62eed61b7837863bc222bf371ce24b7d63cea SHA512 1a21ca29d03c8d0e697ce075b841e38b021771a67da20087c80ab84bb87c5f56ea80695f9b2a25a2a159fba8b01d74a364435f5462545ec00ebd6f335d3fcd6f
 DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be2433149b6aae5e8602cef4c892f7e5fa1160e4b8bbed354bf36c90d3a6a4d6856b57cb10e632a9fba47b1f0b312098a6393da SHA512 e01a52a84bc0de81e7173fda46c12fbd451b5117014008033e16c7bf48165065c6362d812a95ade17c01f62f66755b4c7ab11dd22804eb3bdfc56346a161e2a6
-DIST btrfs-progs-v4.15.1.tar.xz 1931820 BLAKE2B 00c4b9f6ec2039ad680cd625e5ece1cd306b8eaa4572f262cd2272c9d1e03923834ec7af7e59afc9e931cf95d224aea883cc544ba8e26de03119d85c67f19b64 SHA512 6e6a9799f6716bbf772d5f0c8069579815060db20d30807e12948e7274448bca09a12c385ea05a95afc23722d12067a8d99623ea0091dca8ae75ea646aa84b88
-DIST btrfs-progs-v4.16.1.tar.xz 1980696 BLAKE2B 85854fd025c92bd31c957623b78ad72efd536fc8c9d72cc7ad65b9a435b3d57405208e355a86d95ea46ed0179a04e34c3693c4e465e7d6a8edfacdbd185e1421 SHA512 9f0e8c593a10c1c09749ccc00f470ba44d4357fabca8d89ce5891ab0d9cd70f1356f1c6677288019387a6b3b3746431537da205627791a35955bb8bed33d807e
-DIST btrfs-progs-v4.17.1.tar.xz 2045192 BLAKE2B cfc696f32ae8f02865206ff0b1f749a5af072b147537e2c6389a4fb7e93e437754b6af23f122722837612a08d86485bcf110e069facb6c5b76f193dc89a6d433 SHA512 90f291e362b640a22b41036351619e7b8a793a3b57d0537e7865edf4b830d6dc57b3051c0aed9e1ff38b602441a20fea7f974ccff789a3b4a622a0ea57756538
 DIST btrfs-progs-v4.19.1.tar.xz 2007160 BLAKE2B fda89842f5117e77a00794054b1a11a7233d33c2135492b4a382cfdbcbbe58624447178cbeba7c44fabd5a5848fb4d47665dffbd838ff1b88432e1d98deb0666 SHA512 834b0a16216437301637d44561fd265db167b7084de7d43d36802907645627d955421c1f5c46f0eb72d85f8b8d70905e5f6c0d539a34693704aa188085dfeec4
 DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b098108f7363fc3c015d73bf9afcda9d579831fe0e324125893cdb2510873d052522b15843c461e640a546900e535ce76 SHA512 e5abf637a9c811973422ca05a5530f6cd18263013d141277e2a70099cf8ab7e0eb8781df56368da4321c90f21d1022ad852b661adc4877e9a9ba5c60ccbefdee
+DIST btrfs-progs-v4.20-rc1.tar.xz 2027492 BLAKE2B a964d3fe9c3d729b7dd9e927c21b96862201f0453cd79c77502d134752f05134b4883c28b50dbda475bd987eb0f13fc63487aa83b9cb8221a12a42d26eb284cf SHA512 c014500d25555bff8b856bac56360bb1096ee6b8dc66fb213d0503d233a144aa4bc002171c3a0b053e230ab0a77aa46d9b8065c26ff8d46b29d9a018c20fb257
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
 DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5
 EBUILD btrfs-progs-3.16.2.ebuild 1257 BLAKE2B b243da6fc07eb44afbb5c4db272ba98c88a27f27afaf7740e2105c143fbc5ac7f6894c66feb931229a1da4eb5b7613418240ee1a051ebedf79d53d4b0e260fc5 SHA512 2321b579af3ee75282836090bc1c0fa71e2f80fa039a479ea71755674f09cacc18e269430e1617e4b1dadd2a9a80b6155cfd0cf2231b6f3ef6fd58f03934caf2
@@ -18,11 +14,9 @@ EBUILD btrfs-progs-3.18.2.ebuild 1264 BLAKE2B 097f4c5717fb4824868811c82bae7a382a
 EBUILD btrfs-progs-4.1.2.ebuild 1891 BLAKE2B 6164d918d4452a4d91ee812a84fe7a2859fd303396ccacde0fa2dcd5fe7ed1e974bee47e9deece3b621e62d8176379d45b12c2ce6b52497d406425781cb35a3a SHA512 9f0771068eae7ec9bd54545d1f7d1146e9c1a221599dacb40c15106f73ea15bded433adc13dda8d2f7e302b2b4a989fd3a4442904ab222901eab70652e43d28c
 EBUILD btrfs-progs-4.10.2.ebuild 2195 BLAKE2B b2fc7318648463c6a9dd12fdca7f92fd4e6f03c85b84cc5e25f6f7ce8c471e8c2830cae58125145a794f42f17724edd82aaf0de71ad73db05b6e4b32da0ea177 SHA512 ad7aee9448e252f09291ddf82ca9e4c992cbb7b3cf25dfe968b3ed1d5a3958b6c63289f49d829621f2d08bbe3fe75f8e8a1888a6802c186db2a1617576a5b2c8
 EBUILD btrfs-progs-4.14.1.ebuild 2481 BLAKE2B 3e4db698cb95fdcdb982b424364cced1aa3087eeb77f2d5e86f51995dba2c85b557c5546f659798d593e36cc03307d436a11a98ab768bce47ffa186c7a2da6d2 SHA512 01032adb19e4ebef2bc923c16284274b5177701551c578e8813596f13e938b5504b1735e438f4633cc9131a2e20decd6e5bc58a45b3955f08b7d9c9144f60512
-EBUILD btrfs-progs-4.15.1.ebuild 2586 BLAKE2B a4f784458b56797d6018ed5bcc84d5270419c3507cc861af002ee7756420e864889414deb713f5f78154d7e0c84bf2ec63e2509ae62cc1b00560f85b37a4a9f8 SHA512 94662ed43680e269ad10be9209b59e5e882839d30ff28e6311420f6298d4e37aeff328ec889b66f661f61bae0b21d0541c79733521dec0b4b8cc0d0c8ab652dc
-EBUILD btrfs-progs-4.16.1.ebuild 2861 BLAKE2B cd4e072ef8183ff769336767957e2b9528b4c9811170f91758cfc296fde24d23077d72cb6fe44af4b75e6ce8510e5f8db2b54545b461a6d358d75fc1705a93af SHA512 edb7fbdc799d29430afb45d6249ff533079d7fe8b60be61e9601fe285a3b332ddce80cd36e50d1a92cfd12be683e57c2ddacffd0b3c52a716903429af3967f2c
-EBUILD btrfs-progs-4.17.1.ebuild 2912 BLAKE2B cd9161dd0c7fa433d03020dc951e1bd0a6974fc02bbbf48353f6fea4d2724ced5c5187e6ab050d46dae41027338a9a55a8f97d65eb9899c282c0dcaf488bb426 SHA512 4b27b69c325883fd5728a6efd4fd9110dfa6e013dfd6ad56a447049097108247e62adcceae768980afd15f3a433eed5c041f70331d55495fd52875281019bbd5
 EBUILD btrfs-progs-4.19.1.ebuild 2855 BLAKE2B 94e2d31c4d5f8ef45c076cd736f246d35c46b7a768dfee3e17bd7ac2a92a391b4817f188c6e84dc44a4bf94b107d452bd7376cd4dbf47dedcfda1215ae57c357 SHA512 040c58607f706224ee439f46bdb82123b3abf83ea75f8bce6c47ba7f8c3ad971b717c1c4895caafdc49fdadd6ef646470177eb377a17fd8009d666b7afd627eb
 EBUILD btrfs-progs-4.19.ebuild 2897 BLAKE2B 98a269aee1b1781b2dcd9be3dc4d6da8c82d2b5474e08f79937498d055766b738acc0e349321d6899c9ed2c5ad42c3db8126fa48041deec695cc2e78f7dfe801 SHA512 9dcd83e8f22b19b44a974ec809c8e1847f44dd33e85dc4adc3d47b26f90464f08247b195efa4ce3bb6effd5f68544f1cb1a08699220d658235ea73858be81ad2
+EBUILD btrfs-progs-4.20_rc1.ebuild 2855 BLAKE2B 091b43bbf8beae8e05e97b26f8f200aeaed6e5061bd6b945b42c9dcadb27d45ffbe69f47ec9c6cf2d7bcd820b123d686fba2fdd10e5762266adc63ec0d83c375 SHA512 7eff670c6e93f5f43cccb98b8cae3e41d3087f876bd94bde340f8a9b4690fef262237a39b205e4536f441685f5759b2b7c3b834c63d78e295d5feb96a7557d1e
 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd
 EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4
 EBUILD btrfs-progs-9999.ebuild 2855 BLAKE2B 94e2d31c4d5f8ef45c076cd736f246d35c46b7a768dfee3e17bd7ac2a92a391b4817f188c6e84dc44a4bf94b107d452bd7376cd4dbf47dedcfda1215ae57c357 SHA512 040c58607f706224ee439f46bdb82123b3abf83ea75f8bce6c47ba7f8c3ad971b717c1c4895caafdc49fdadd6ef646470177eb377a17fd8009d666b7afd627eb
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild
deleted file mode 100644
index ceeea58afa06..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.15.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.15.1-e2fsprogs-1.44.0.patch"
-)
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild
deleted file mode 100644
index 5f71a58e642e..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.17.1.ebuild
+++ /dev/null
@@ -1,121 +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} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/btrfs-progs-man-no-gz.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-	use python && python_optimize
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.16.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.20_rc1.ebuild
similarity index 96%
rename from sys-fs/btrfs-progs/btrfs-progs-4.16.1.ebuild
rename to sys-fs/btrfs-progs/btrfs-progs-4.20_rc1.ebuild
index 0936ade75910..13b960406d19 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.16.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.20_rc1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -95,6 +95,7 @@ src_configure() {
 		$(use_enable convert)
 		$(use_enable elibc_glibc backtrace)
 		$(use_enable python)
+		$(use_enable static-libs static)
 		$(use_enable zstd)
 		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
 	)
@@ -108,7 +109,6 @@ src_compile() {
 src_install() {
 	local makeargs=(
 		$(usex python install_python '')
-		$(usex static-libs '' 'libs_static=')
 		$(usex static install-static '')
 	)
 	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch
deleted file mode 100644
index 8aa05a54ed62..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 33e9f2bd47a17bd0798a664718b6bfcfc4d044a1 Mon Sep 17 00:00:00 2001
-From: Qu Wenruo <wqu@suse.com>
-Date: Wed, 14 Mar 2018 08:56:57 +0800
-Subject: [PATCH] btrfs-progs: convert/ext2: Remove check for
- ext2_ext_attr_entry->e_value_block
-
-In latest e2fsprogs (1.44.0) definition of ext2_ext_attr_entry has
-removed member e_value_block, as currently ext* doesn't support it set
-anyway.
-
-So remove such check so that we can pass compile.
-
-Issue: #110
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199071
-Signed-off-by: Qu Wenruo <wqu@suse.com>
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- convert/source-ext2.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/convert/source-ext2.c b/convert/source-ext2.c
-index b1492c786..070126ec3 100644
---- a/convert/source-ext2.c
-+++ b/convert/source-ext2.c
-@@ -422,8 +422,7 @@ static int ext2_xattr_check_entry(struct ext2_ext_attr_entry *entry,
- {
- 	size_t value_size = entry->e_value_size;
- 
--	if (entry->e_value_block != 0 || value_size > size ||
--	    entry->e_value_offs + value_size > size)
-+	if (value_size > size || entry->e_value_offs + value_size > size)
- 		return -EIO;
- 	return 0;
- }
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch b/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch
deleted file mode 100644
index aeb187baaf41..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-man-no-gz.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 0a319cad0f002c2dfd44cffc1de0a26cf270560f Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 6 Aug 2018 11:26:54 -0400
-Subject: [PATCH] Install uncompressed man pages
-
-Bug: https://bugs.gentoo.org/662920
----
- Documentation/Makefile.in | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in
-index 184647c4..c4c843cb 100644
---- a/Documentation/Makefile.in
-+++ b/Documentation/Makefile.in
-@@ -37,9 +37,9 @@ MAN3_TXT += btrfs-ioctl.asciidoc
- MAN_TXT = $(MAN3_TXT) $(MAN8_TXT) $(MAN5_TXT)
- MAN_XML = $(patsubst %.asciidoc,%.xml,$(MAN_TXT))
- MAN_HTML = $(patsubst %.asciidoc,%.html,$(MAN_TXT))
--GZ_MAN3 = $(patsubst %.asciidoc,%.3.gz,$(MAN3_TXT))
--GZ_MAN5 = $(patsubst %.asciidoc,%.5.gz,$(MAN5_TXT))
--GZ_MAN8 = $(patsubst %.asciidoc,%.8.gz,$(MAN8_TXT))
-+MAN3 = $(patsubst %.asciidoc,%.3,$(MAN3_TXT))
-+MAN5 = $(patsubst %.asciidoc,%.5,$(MAN5_TXT))
-+MAN8 = $(patsubst %.asciidoc,%.8,$(MAN8_TXT))
- 
- mandir ?= $(prefix)/share/man
- man3dir = $(mandir)/man3
-@@ -86,9 +86,9 @@ endif
- 
- all: man
- man: man3 man5 man8
--man3: $(GZ_MAN3)
--man5: $(GZ_MAN5)
--man8: $(GZ_MAN8)
-+man3: $(MAN3)
-+man5: $(MAN5)
-+man8: $(MAN8)
- html: $(MAN_HTML)
- 
- install: install-man
-@@ -96,15 +96,15 @@ install: install-man
- install-man: man
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
--	$(INSTALL) -m 644 $(GZ_MAN5) $(DESTDIR)$(man5dir)
-+	$(INSTALL) -m 644 $(MAN5) $(DESTDIR)$(man5dir)
- 	# the source file name of btrfs.5 clashes with section 8 page, but we
- 	# want to keep the code generic
--	$(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5.gz $(DESTDIR)$(man5dir)/btrfs.5.gz
--	$(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir)
--	$(LN_S) -f btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz
-+	$(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5 $(DESTDIR)$(man5dir)/btrfs.5
-+	$(INSTALL) -m 644 $(MAN8) $(DESTDIR)$(man8dir)
-+	$(LN_S) -f btrfs-check.8 $(DESTDIR)$(man8dir)/btrfsck.8
- 
- uninstall:
--	cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8.gz $(GZ_MAN8)
-+	cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8 $(MAN8)
- 	$(RMDIR) -p --ignore-fail-on-non-empty $(DESTDIR)$(man8dir)
- 
- clean:
--- 
-2.18.0
-
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index cede8d05e751..31395b74dd70 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 384648396169..8b2d6ec393d1 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -23,7 +23,7 @@ DIST gentoo-headers-base-4.4.tar.xz 3911752 BLAKE2B 5031ecd48b99cb0c9c35ca935fa6
 DIST gentoo-headers-base-4.9.tar.xz 4052748 BLAKE2B e279954c56170fbfa4ebae8dade731825b3d5f0cd5d73a5b33cd93a9c8f5fa140e14edf0d5ac26a452fe8a61b16fdcc851f5329f56e4c8dcf4472a995de44c4c SHA512 a03418cfba7fa4531279d9122411af3e285e962506e8df9279fbbb27ae08a4e30725bd1cf03f48ad523f61f2889195e6c844fa4c7b4ef2f828baf47ef402abfa
 EBUILD linux-headers-3.18.ebuild 1433 BLAKE2B e9f705fade3656a6e3662737a30e44dc2c2354184304222fe466471440116762ad1976f6ca56d223bcd51afa82bde434c9d26c43450b274d0842f0ee87afef6d SHA512 8bba162f7ec52127681302a552fdb090a6fbe000e741307663d98003476a056ebc25e2cbd1b98f0e1bff0b8ef274627ff920901d3c79cf6196e16a5da04b8a98
 EBUILD linux-headers-4.13.ebuild 1507 BLAKE2B c52f49cf153cb2cb59bf9202c9eac06197da88e85353984048423300bdc0383ad70ce08b24f06839cd43cabebbee311c17b3482e42552d343c48ce2dbeb8c7df SHA512 f2635872e189cc11fea828b5d0e392218eef81b7a98807c12cfdccf8901fdefe96614d27174ebceaa35e492b358729b904669f285c852cd7535e4f595e7e98fb
-EBUILD linux-headers-4.14-r1.ebuild 1503 BLAKE2B c306ca054be152b1e795a7249497c7bd68a92c1041cfeb44df751b72f2c23511bd4478cc8cfab38eb1992d49d3a7c1419b56e83f01ef9249f5d1dcb8ecc3dc0d SHA512 b3e95e47914d2b898c280cae679b3e9ff381de73674599a6ebf9d0fa2f460384ba36612cc23a9be9eacbf5081ba820c31fd78930bed2952962949733285d356e
+EBUILD linux-headers-4.14-r1.ebuild 1500 BLAKE2B 3902147808799f66645aa2553bff109b66ce0c9af408baeaf1c56e9a1cb13cd2a4d5cc15cc2330c54180e1604c415921346bec0e1bf43f9ee3a664f20fba29c4 SHA512 f1f28bc43e034a6353ab9132f4338b51336e9217c4b8d8a0a1e35622372fc1b6fd82c272b370ac14903f408efcbee04e5cfabfec0347e85084a07bbf02a22a9b
 EBUILD linux-headers-4.15-r1.ebuild 1519 BLAKE2B 6d1b24772c1aea77fc91386872801ebe3fe06c2bbed531eb82c028f09fbce4b25fbb2883b487aff0e0fa491f5aa804ca18b43096c9fd2fa36df0cf4a6f1c79bc SHA512 43997a52bcdee13acb3e8fd8d6068fdd00deb8cbe18fe5874b2a0b53576a52293f0ce58973b018572947cd8e1f1c6f0a99bc8636ef2ad144a49bb35d11b53157
 EBUILD linux-headers-4.16-r2.ebuild 1698 BLAKE2B 83414bf8ba9db9e6ecb9a42c34db25a6ed9b43111ef86158a3c13b431609bfce5b8a282ef2253bdc3ec65563ff29c01067473a17fa837e705fd5ce1888746a57 SHA512 bb0f928e073ae3f793098c7ce59ea85462405cd52a47cb627d2fb576b060c5eb60464757aa392d2748be6333508b56b6f59a04606bda6f2c6b7641acba263f37
 EBUILD linux-headers-4.16.ebuild 1709 BLAKE2B feb0f31d53c3c095d9db9e09ba24bfbacada0b82f0959ea2a97c26ce7806a3cffbbed01b8d6cb0ac88c8bb8c7361327c3ae37189b82cf29ae03fc4409e63c1cf SHA512 b0e68a128feb68bf21e717ec0224d0a6033249f553cbc161b3d5da5cc8ac94220ec3870c2f5933d1c8bd49b38f5c21886227638cb3fac1f7e49f4950fcb2ddd8
diff --git a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
index aa4dc8f5b5ea..5e39a6ce99d8 100644
--- a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
@@ -12,7 +12,7 @@ PATCH_VER="1"
 SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
 	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-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"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 347d9704dfce..61b1dd6da932 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 2e6ef8f63ee0..d0dddc138a50 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -1,7 +1,5 @@
 AUX 7.0.9999/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch 2583 BLAKE2B be7e9a2cbab8b3bd110346f6c8bda30d104397601950c995b77388fcb91e53ca82f5d3574931c58244403eee698f01209ca9e704fd4c6b9b3ef08e68d41dbea7 SHA512 656a7bbdcf0f678814d0ad0ff56ce43b7fc48c7a549373a4ef77e74490437283c5834e86b1b4e8bcb85578953687d79474ef2bf494c7eed4cf7fa1f17003f385
 AUX 7.0.9999/0002-test-Support-using-libtirpc-on-Linux.patch 4161 BLAKE2B 3db2dcebf70ca3e7c399dfb22d8ae50d51863f7a8a15a10b0232f73d4fc2ee0b51ff67e8842b0e4d29dd41e60a326c90670f62a431ca593617f566e03bc7f90a SHA512 2f03f4d0232b600861de0c527d6bef26b0e3273865a7d7344e083a6a7de4033de6d30df3a6b22f4d23be74dfa8864ccaebd42c1f0d4474abc83a66f8997e19fb
-AUX 9999/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch 2583 BLAKE2B 9d7ca157f6a14784e1207d3051719eea3ba069dc1ba34f7067cca630680993f3953a7e2f5600ec3ab184bbc0fb39b59281523481564122eb1580bc91d5c6e18a SHA512 5a74754bd19861ca2cbf28966dd13b6e17fa0024c6e3f1e513e6aabd732fc5d5804b01e25e538e434b48f6c7f10923cc09d0ced10fadef870cb43aa42082a9a4
-AUX 9999/0002-test-Support-using-libtirpc-on-Linux.patch 4183 BLAKE2B 385c8bc659031b6c6a6bb03506b142915f69be36acaf65440da40e7f33af15095a429d177a7be9d75c09dca38842d5ba0c960ce29764f9f8b2fe9df46496b88f SHA512 d06f7248fa18edd360bfb6c481ac260b9e5162550c09d2c4fc99c46d65e6f025e15aa6cc6b629847c26a441db271c7adc5b3d39b9895fce1dfc6326098478ba6
 DIST compiler-rt-4.0.1.src.tar.xz 1434100 BLAKE2B ca6bf78fc07f387b7244a52ef648b06a5685effb46a66b241a9ee847ecafb17d02602f49b0dbe473d47202586874a043a6d75141400062f526d2f808da323e1e SHA512 cfeb625884b273f7c0e6767b81a8d3e5f24e0b96a510d5764d9d47a0e215fc841b4cb9d1843c8fb428cd21def720cfbfe8d3593ff5bb390548ebc8c32a902649
 DIST compiler-rt-5.0.2.src.tar.xz 1543256 BLAKE2B 09fa84b8f3e9b8627a14387bc6eaa3d6b4588b9c8f1ac5a0114135fd830e3d45922408b237866789eb81bf38defde1186e0f7430a69f825bee12776b7cd9f74e SHA512 605a6d064877a860d6c9097e0220896dfceafed0a2392ad495c97aa347b97899d89f7e21932e29d3274f396615837414a3e730a915fe4f53eaa858ce3642a666
 DIST compiler-rt-6.0.1.src.tar.xz 1686820 BLAKE2B 59fa3f6e478bd4d6dfa056c85dcdc4349cbce7cea7fc56519feddc9d66c88c9ca48bad7967432ceb81d754213577f12707035afd827cf630a58627575b73b798 SHA512 69850c1ad92c66977fa217cbfb42a6a3f502fbe3d1a08daa7fc4cfeb617a7736d231f8ad8d93b10b1ae29bd753315d2a2d70f9ff1f4d18a9a7cc81758d91f963
@@ -17,5 +15,6 @@ EBUILD compiler-rt-sanitizers-5.0.2.ebuild 5095 BLAKE2B 0f3348e8800d24d01231b246
 EBUILD compiler-rt-sanitizers-6.0.1.ebuild 5453 BLAKE2B b643f95efc78b4aaa3ab4f05072397003d6e46793a763f91eb79f60c183d89e7265a53f6f96401dc87546bba5b8d21dd38dd0b8bceecdb652702685288465916 SHA512 c9b1dee74f1cbe7d6822589372389c2e3e6f3398211e26d83072dab290541797fa08c52c4c6ac581a59dac52fe5893a27812e5e46e175b9146f2c8348f170458
 EBUILD compiler-rt-sanitizers-7.0.1.ebuild 5410 BLAKE2B b93a8907f25f9a6864556787b0e0b86b2fad39c19136e93baa9d73df5b5001f9539c27b5227eb5ae40fd7c34ca343ed45de1c2cd71f1f9753953bff04ced8c5c SHA512 b70f6f3ad6764d9d6244ec51a07a1948864db899213d68947c904161312b4ea450c7eba8f2c1aa3f9b0ab25bb7a1ac3d5650551c37f48abf0bfafc232cc3a7ad
 EBUILD compiler-rt-sanitizers-7.0.9999.ebuild 5335 BLAKE2B 2c1851ad178efe08bf96f342e1d2b02c269b395fd29a20532e54538060b09b6c9f7dda7a98f02bb50d309b57a69aff29ff06a5051a0aa28b24b40bba80cbf866 SHA512 7f3d61dfc5ac2087d6069d02cdd485367d0c8ec5b5e51384d1b1c6af4668548e5091ec05861569d4bbeb7bee149a5feb8621c8ba6370de5d250c59d37b8b81e5
-EBUILD compiler-rt-sanitizers-9999.ebuild 5302 BLAKE2B 6f0a715beb0734deb7b2d9795eb66632eae12c4cb7df768dcaa4fa2cb18e7adca30a865f93d2c61b160e28168f103075c9ed171d0124c92b780681138d4e1fc7 SHA512 56b252d8298dacb82274c652049df08299a8811d4991549f24a178e600f2580b1a7fb8a8600d65f667853464bb248b2f5b014e8ef12f8e456fb29350f68d0855
+EBUILD compiler-rt-sanitizers-8.0.9999.ebuild 5118 BLAKE2B 9849fb97a4f8bf53f8650254fd51948e1e9247a988403246435548c99e6fec1796103b6dabb806973551608c8eab58e5ecba857587454cfd2816b79deeaed162 SHA512 485195703afba4a48ad3fec38542c65ecadbd29d79719be2c287e1de2cedf840d4c8ab67ddc0bde3e8954ecbfb1c35facad32faad222df77ed65e468a02863f5
+EBUILD compiler-rt-sanitizers-9999.ebuild 5093 BLAKE2B 8975ce0628079b44988b4cce3f33c1536fe8c88b8b76b6358b1a3de4056b693caa0b508e9ea0afbfaa57501abb6d5820cfd54ab8d1d11dd8b77f96452fcf50f8 SHA512 b6af187292c659305e04c4bb744a6735e9c5b6a3e9fd1eba5d0ed01a07751a18675bc5ec90e0eaf26af510342aa38a1e0bfb7724ee08bff97a1038f93824217f
 MISC metadata.xml 547 BLAKE2B 6f9d8b65c12797fd3d168e9b3948c604265db135bda5493d9f1d8b1d01fd73a79d07e5241afc3a7fa1672827fac23d3d9dc4d7ae42371a0de892a900c8c28269 SHA512 fb73a96b1ffbc7ff2fecfba35c9acd3e54ade0154016ae04423217f5c000eee2b0b821cc626908647551a0aa7b7f462d42d56cde3993ddd52248bc373b117c3e
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.9999.ebuild
new file mode 100644
index 000000000000..e2589f02ba5d
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.9999.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit check-reqs cmake-utils flag-o-matic git-r3 llvm \
+	multiprocessing python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/compiler-rt.git
+	https://github.com/llvm-mirror/compiler-rt.git"
+EGIT_BRANCH="release_80"
+
+LICENSE="|| ( UoI-NCSA MIT )"
+# Note: this needs to be updated to match version of clang-9999
+SLOT="8.0.0"
+KEYWORDS=""
+IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
+# FIXME: libfuzzer does not enable all its necessary dependencies
+REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		!<sys-apps/sandbox-2.13
+		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+		sys-libs/compiler-rt:${SLOT} )
+	${PYTHON_DEPS}"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if use test; then
+		# needed for patched gtest
+		git-r3_fetch "https://git.llvm.org/git/llvm.git
+			https://github.com/llvm-mirror/llvm.git"
+	fi
+	git-r3_fetch
+
+	if use test; then
+		git-r3_checkout https://llvm.org/git/llvm.git \
+			"${WORKDIR}"/llvm '' utils/unittest
+	fi
+	git-r3_checkout
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use test; then
+		# remove tests that are (still) broken by new glibc
+		# https://bugs.llvm.org/show_bug.cgi?id=36065
+		if use elibc_glibc && has_version '>=sys-libs/glibc-2.25'; then
+			rm test/lsan/TestCases/Linux/use_tls_dynamic.cc || die
+			rm test/msan/dtls_test.c || die
+		fi
+	fi
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# built-ins installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# disable use of SDK for the system itself
+			-DDARWIN_macosx_CACHED_SYSROOT=/
+		)
+	fi
+
+	cmake-utils_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake-utils_src_make check-all
+}
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
index 78884e8f13dc..22e6a9b283cb 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ EGIT_REPO_URI="https://git.llvm.org/git/compiler-rt.git
 
 LICENSE="|| ( UoI-NCSA MIT )"
 # Note: this needs to be updated to match version of clang-9999
-SLOT="8.0.0"
+SLOT="9.0.0"
 KEYWORDS=""
 IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
 # FIXME: libfuzzer does not enable all its necessary dependencies
@@ -77,10 +77,6 @@ src_unpack() {
 src_prepare() {
 	cmake-utils_src_prepare
 
-	# apply the fixes for new glibc / split tirpc
-	eapply "${FILESDIR}/9999/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch"
-	eapply "${FILESDIR}/9999/0002-test-Support-using-libtirpc-on-Linux.patch"
-
 	if use test; then
 		# remove tests that are (still) broken by new glibc
 		# https://bugs.llvm.org/show_bug.cgi?id=36065
diff --git a/sys-libs/compiler-rt-sanitizers/files/9999/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch b/sys-libs/compiler-rt-sanitizers/files/9999/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch
deleted file mode 100644
index f39645669da0..000000000000
--- a/sys-libs/compiler-rt-sanitizers/files/9999/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 6d96ca43ca31bb69d07271696c43b4372ca534d9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 6 Jun 2018 12:16:38 +0200
-Subject: [PATCH 1/2] [sanitizer_common] Fix using libtirpc on Linux
-
-Fix using libtirpc on Linux by using pkg-config to detect it, and append
-appropriate include directory.  The libtirpc headers reference one
-another via '#include <rpc/...>', so attempting to include it via
-'#include <tirpc/...>' just failed and resulted in RPC headers not being
-detected at all.
-
-Additionally, perform the header check without -nodefaultlibs as that
-apparently causes it to fail.
----
- lib/sanitizer_common/CMakeLists.txt                   | 11 ++++++++++-
- .../sanitizer_platform_limits_posix.cc                |  4 +---
- 2 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/lib/sanitizer_common/CMakeLists.txt b/lib/sanitizer_common/CMakeLists.txt
-index ad3aba005..f2a6bab51 100644
---- a/lib/sanitizer_common/CMakeLists.txt
-+++ b/lib/sanitizer_common/CMakeLists.txt
-@@ -191,9 +191,18 @@ include_directories(..)
- 
- set(SANITIZER_COMMON_DEFINITIONS)
- 
-+include(FindPkgConfig)
-+pkg_check_modules(TIRPC libtirpc)
-+if (TIRPC_FOUND)
-+  include_directories(${TIRPC_INCLUDE_DIRS})
-+  set(CMAKE_REQUIRED_INCLUDES ${TIRPC_INCLUDE_DIRS})
-+endif()
-+
- include(CheckIncludeFile)
-+cmake_push_check_state()
-+string(REPLACE "-nodefaultlibs" "" CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
- append_have_file_definition(rpc/xdr.h HAVE_RPC_XDR_H SANITIZER_COMMON_DEFINITIONS)
--append_have_file_definition(tirpc/rpc/xdr.h HAVE_TIRPC_RPC_XDR_H SANITIZER_COMMON_DEFINITIONS)
-+cmake_pop_check_state()
- 
- set(SANITIZER_CFLAGS ${SANITIZER_COMMON_CFLAGS})
- append_rtti_flag(OFF SANITIZER_CFLAGS)
-diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-index cd1b73d58..c6de2683d 100644
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -146,8 +146,6 @@ typedef struct user_fpregs elf_fpregset_t;
- #include <netrom/netrom.h>
- #if HAVE_RPC_XDR_H
- # include <rpc/xdr.h>
--#elif HAVE_TIRPC_RPC_XDR_H
--# include <tirpc/rpc/xdr.h>
- #endif
- #include <scsi/scsi.h>
- #include <sys/mtio.h>
-@@ -1243,7 +1241,7 @@ CHECK_SIZE_AND_OFFSET(group, gr_passwd);
- CHECK_SIZE_AND_OFFSET(group, gr_gid);
- CHECK_SIZE_AND_OFFSET(group, gr_mem);
- 
--#if HAVE_RPC_XDR_H || HAVE_TIRPC_RPC_XDR_H
-+#if HAVE_RPC_XDR_H
- CHECK_TYPE_SIZE(XDR);
- CHECK_SIZE_AND_OFFSET(XDR, x_op);
- CHECK_SIZE_AND_OFFSET(XDR, x_ops);
--- 
-2.19.1
-
diff --git a/sys-libs/compiler-rt-sanitizers/files/9999/0002-test-Support-using-libtirpc-on-Linux.patch b/sys-libs/compiler-rt-sanitizers/files/9999/0002-test-Support-using-libtirpc-on-Linux.patch
deleted file mode 100644
index c851cae0a6b8..000000000000
--- a/sys-libs/compiler-rt-sanitizers/files/9999/0002-test-Support-using-libtirpc-on-Linux.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From a415328c75fe88c5e8e3bd0c01913a25b5705fec Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 6 Jun 2018 12:45:55 +0200
-Subject: [PATCH 2/2] [test] Support using libtirpc on Linux
-
-Add compiler flags necessary for using libtirpc on Linux (RPC headers
-split out of glibc).  The flags are obtained via pkg-config.  This fixes
-test failures due to tests being unable to find <rpc/...> includes.
----
- cmake/base-config-ix.cmake          | 4 ++++
- lib/sanitizer_common/CMakeLists.txt | 2 --
- test/msan/lit.cfg                   | 3 ++-
- test/msan/lit.site.cfg.in           | 1 +
- test/tsan/lit.cfg                   | 3 ++-
- test/tsan/lit.site.cfg.in           | 1 +
- 6 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake
-index b92e29a2e..ec0b1b979 100644
---- a/cmake/base-config-ix.cmake
-+++ b/cmake/base-config-ix.cmake
-@@ -8,6 +8,10 @@ include(CheckCXXSourceCompiles)
- 
- check_include_file(unwind.h HAVE_UNWIND_H)
- 
-+# used in sanitizer_common and tests
-+include(FindPkgConfig)
-+pkg_check_modules(TIRPC libtirpc)
-+
- # Top level target used to build all compiler-rt libraries.
- add_custom_target(compiler-rt ALL)
- add_custom_target(install-compiler-rt)
-diff --git a/lib/sanitizer_common/CMakeLists.txt b/lib/sanitizer_common/CMakeLists.txt
-index f2a6bab51..a560e7c15 100644
---- a/lib/sanitizer_common/CMakeLists.txt
-+++ b/lib/sanitizer_common/CMakeLists.txt
-@@ -191,8 +191,6 @@ include_directories(..)
- 
- set(SANITIZER_COMMON_DEFINITIONS)
- 
--include(FindPkgConfig)
--pkg_check_modules(TIRPC libtirpc)
- if (TIRPC_FOUND)
-   include_directories(${TIRPC_INCLUDE_DIRS})
-   set(CMAKE_REQUIRED_INCLUDES ${TIRPC_INCLUDE_DIRS})
-diff --git a/test/msan/lit.cfg b/test/msan/lit.cfg
-index e08673d5c..e86f6091f 100644
---- a/test/msan/lit.cfg
-+++ b/test/msan/lit.cfg
-@@ -14,7 +14,8 @@ clang_msan_cflags = (["-fsanitize=memory",
-                       "-fno-omit-frame-pointer",
-                       "-fno-optimize-sibling-calls"] +
-                       [config.target_cflags] +
--                      config.debug_info_flags)
-+                      config.debug_info_flags +
-+                      [config.rpc_cflags])
- # Some Msan tests leverage backtrace() which requires libexecinfo on FreeBSD.
- if config.host_os == 'FreeBSD':
-   clang_msan_cflags += ["-lexecinfo", "-fPIC"]
-diff --git a/test/msan/lit.site.cfg.in b/test/msan/lit.site.cfg.in
-index f744d71fd..35634d324 100644
---- a/test/msan/lit.site.cfg.in
-+++ b/test/msan/lit.site.cfg.in
-@@ -6,6 +6,7 @@ config.target_cflags = "@MSAN_TEST_TARGET_CFLAGS@"
- config.target_arch = "@MSAN_TEST_TARGET_ARCH@"
- config.use_lld = @MSAN_TEST_USE_LLD@
- config.use_thinlto = @MSAN_TEST_USE_THINLTO@
-+config.rpc_cflags = "@TIRPC_CFLAGS@"
- 
- # Load common config for all compiler-rt lit tests.
- lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
-diff --git a/test/tsan/lit.cfg b/test/tsan/lit.cfg
-index 233d273f3..2776775eb 100644
---- a/test/tsan/lit.cfg
-+++ b/test/tsan/lit.cfg
-@@ -49,7 +49,8 @@ clang_tsan_cflags = (["-fsanitize=thread",
-                       [config.target_cflags] +
-                       config.debug_info_flags +
-                       extra_cflags +
--                      ["-I%s" % tsan_incdir])
-+                      ["-I%s" % tsan_incdir] +
-+                      [config.rpc_cflags])
- clang_tsan_cxxflags = config.cxx_mode_flags + clang_tsan_cflags + ["-std=c++11"] + ["-I%s" % tsan_incdir]
- # Add additional flags if we're using instrumented libc++.
- # Instrumented libcxx currently not supported on Darwin.
-diff --git a/test/tsan/lit.site.cfg.in b/test/tsan/lit.site.cfg.in
-index 6dec5f92b..67020f3b9 100644
---- a/test/tsan/lit.site.cfg.in
-+++ b/test/tsan/lit.site.cfg.in
-@@ -6,6 +6,7 @@ config.has_libcxx = @TSAN_HAS_LIBCXX@
- config.apple_platform = "@TSAN_TEST_APPLE_PLATFORM@"
- config.target_cflags = "@TSAN_TEST_TARGET_CFLAGS@"
- config.target_arch = "@TSAN_TEST_TARGET_ARCH@"
-+config.rpc_cflags = "@TIRPC_CFLAGS@"
- 
- # Load common config for all compiler-rt lit tests.
- lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
--- 
-2.19.1
-
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index f7c3cbff1e79..9ade8b308950 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -7,5 +7,6 @@ EBUILD compiler-rt-5.0.2.ebuild 2840 BLAKE2B 4c6e6ca121bad66f69f272a1ddc8a515319
 EBUILD compiler-rt-6.0.1.ebuild 2911 BLAKE2B 9ee423b460c62366af5525ab3b32cd2980aff78331a65b5658a50e0f808c9cb694d2e5d85bd753d291e1b5f96ab9e6cbc6a6d9f0cddcd9f7f8521ed5280f8291 SHA512 ecce0303d9db8ec0c74b3d0b248547402c32b7bceef52a5bb999f076c8fa82e209d5d113e6c14a1511e99dbf04bfd4d79077da1c010d9069a1bd284a168b26e0
 EBUILD compiler-rt-7.0.1.ebuild 2916 BLAKE2B 2ee4babc2459a1073c19b43831c1d51ed9a3a40a7a543c992999e9f9475bf20710e17eee8d860af65806038e93151b8449bffeb7352d2266e04728ab1fafaa2c SHA512 7d4ad62cc476d53c6bb0a6282e03b1809119cb0466e468095398151efa9097d177365abe51c454a5039e5c5550935b7ce8b745458e8d88e849760db936d36e2b
 EBUILD compiler-rt-7.0.9999.ebuild 2949 BLAKE2B a5c0f6cf82f2bfcf79d0982f9f05a4c93931c5f4fcb05b0eab1a97d87ad542755dd7f56f5b327440cd9cef4926ef17dc0932fcc32e60a83a1634ac3622f64de2 SHA512 acf6fa98a75065222b89a1da36ffc1752ab920ddf521a9bdf55a4407c6d65e141c6c30117748c6e0ba41aa6f39df8a301d575aac455f6179695c4c9ef889ff3f
-EBUILD compiler-rt-9999.ebuild 2924 BLAKE2B cf4a64f89ad620025fe423575b3117c69c64524d52ecd5d5a292f12c5c53eec23c631f7a7104ae101b6f5b38619d9b4480f92f922e5d36e399dd000617c36544 SHA512 5ef28c369a110e4423e346e128deb0b11805bd7086e5538b603a7644c62bc43e36a500c25ae9ee196622f24197b9bd94f405d487b62eb573208fba36d55d92ac
+EBUILD compiler-rt-8.0.9999.ebuild 2946 BLAKE2B 3de0bf13d36b5918e8664bdcfe40e7b1f2f875f526bbaac36f5f1421f045cdff1d01bdcfabccfccb8f665aa068ad92eaa1b9ba800d688d3b8cb0bf306658f8a3 SHA512 af1b450b9bc9ae0e848c28fca2ee61365cb3613cfcb4eab2432121f54a7c5f4108dab5bfea7e84004039a487911dc6e67b1aedb0948fed7d27bb42dca4934b88
+EBUILD compiler-rt-9999.ebuild 2921 BLAKE2B ab782d0000a7bbcfd022ea522694f6cab46320ebc1f64fd028990dce3fc6ba54efb816d2023118b730d84e1b6ec3ba44fafdf0410157d088e966e01125ba63b3 SHA512 32e3c1355f663c8301b5d9f9f2616f0679a3b7eb51f763973d1d4c62d2adecba0ea20b01608d34820dd2a2ba490acef85e2b6e50af3169c992ffbc3c315d7170
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-8.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-8.0.9999.ebuild
new file mode 100644
index 000000000000..6e1eec0d94f6
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-8.0.9999.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils flag-o-matic git-r3 llvm multiprocessing \
+	python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/compiler-rt.git
+	https://github.com/llvm-mirror/compiler-rt.git"
+EGIT_BRANCH="release_80"
+
+LICENSE="|| ( UoI-NCSA MIT )"
+# Note: this needs to be updated to match version of clang-9999
+SLOT="8.0.0"
+KEYWORDS=""
+IUSE="+clang test"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6
+	clang? ( sys-devel/clang )
+	test? (
+		$(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
+	${PYTHON_DEPS}"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	local nolib_flags=( -nodefaultlibs -lc )
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		# ensure we can use clang before installing compiler-rt
+		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+		strip-unsupported-flags
+	elif ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+	)
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# disable use of SDK for the system itself
+			-DDARWIN_macosx_CACHED_SYSROOT=/
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake-utils_src_make check-builtins
+}
diff --git a/sys-libs/compiler-rt/compiler-rt-9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
index 7e254d18763c..75c4024449f6 100644
--- a/sys-libs/compiler-rt/compiler-rt-9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ EGIT_REPO_URI="https://git.llvm.org/git/compiler-rt.git
 
 LICENSE="|| ( UoI-NCSA MIT )"
 # Note: this needs to be updated to match version of clang-9999
-SLOT="8.0.0"
+SLOT="9.0.0"
 KEYWORDS=""
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 3f1059c9858a..2108867d152f 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -16,5 +16,6 @@ EBUILD libcxx-5.0.2.ebuild 6502 BLAKE2B d6b0b4b2fc3ca56858c2b785da51187964074d55
 EBUILD libcxx-6.0.1.ebuild 6746 BLAKE2B 616128b9d49049ac6de90b84f89a48c7033f5927edc5e15674df5e3a2225630f59a99c8047c71d9128304d726241ceaa1cefabf8d44e4b2d6a491611f63bee88 SHA512 3df9e7e79b62893441212fe7baa51190ac69f0bf64332718ae53596a043dc3583b8125bbcf7339cca7cf9937aa870ea0d8b12670700962c1cb22892f706e3129
 EBUILD libcxx-7.0.1.ebuild 6750 BLAKE2B 0052def7166376e81fdc4126220bc6749113e43b2fd66f6e447e020f6bbb6b63b7519e3656c79793837c5b105e2606f34b1d23e78bf4dcd2c892f79cc32b2101 SHA512 f16905c20b669428f1378185072563f855ed03520057039ba794fc717f0ca2cc44bc1c1a78aa24bca688946d5a32e2843163198e4085396e668f4c695f5e61e7
 EBUILD libcxx-7.0.9999.ebuild 7047 BLAKE2B eb80753b38042cdb3ae3f01db2c4dc9bc7a588e00bcf1d7da85d3c30c73e941bbc1096d9b6be67c21dd47874354f909255a843371cb0fe9f479ee09d3439b292 SHA512 ae81c9c856f39dfef3dec1e66decab8b20987eb82c4093b6bfda2937c5111bc6a24058f95a92b3a3beb0b91df6f5bb83216ff4997a0be8fd7d28b8f29f91290f
+EBUILD libcxx-8.0.9999.ebuild 7044 BLAKE2B 12185d3065a0cdecf4b6eb2c7eca5f70a2a1732214c77c4e695418ffe5bb39273342088fa4cba2504a411db8ecc8543d219a932d5f022383197df7d4b84b1e1e SHA512 57f565cb1652c53e08ba21776dcf1707061697937533c5e447bcff37cdf274f54525ff59112a1bf54a25d39477e20f0dc7dbdf4ad71846266c06a0002d1c0980
 EBUILD libcxx-9999.ebuild 7019 BLAKE2B ea929ac8759c5b70e48fe32ade6ef24c2ce8830be6bb5a35411a654212c7b2d127ecaa2a94bebbbb01807ff57c7d814379f23047c206d265d917958478df54b6 SHA512 5dddc6b30accff0ad414953ec2cd177ee5b151106282113687a2977c00b1a85e7151f772000118d341d0074ae91875b8ef1bd0e03de1816875bcd289b03d14ef
 MISC metadata.xml 854 BLAKE2B f731ffbb07722face32cfe5ef0576c572fc45d93e8d78ec4adb46c43b95999dc4eb48f20311517fe08a397f2e5dec56c530bb6787a058358cfd1af8d79ffad90 SHA512 8ef3feab266e09442a42baced2d72667fa8b1290624c2c84bab7b173ead72669568847f6e995388fc1d7bc722381f60805d87b2a0cc2d04ae0c49e36bec3802a
diff --git a/sys-libs/libcxx/libcxx-8.0.9999.ebuild b/sys-libs/libcxx/libcxx-8.0.9999.ebuild
new file mode 100644
index 000000000000..523cba0073ef
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-8.0.9999.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Ninja provides better scalability and cleaner verbose output, and is used
+# throughout all LLVM projects.
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+EGIT_REPO_URI="https://git.llvm.org/git/libcxx.git
+	https://github.com/llvm-mirror/libcxx.git"
+EGIT_BRANCH="release_80"
+PYTHON_COMPAT=( python2_7 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3" || SCM=""
+
+inherit ${SCM} cmake-multilib llvm multiprocessing python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+if [[ ${PV} != *9999 ]] ; then
+	SRC_URI="https://llvm.org/releases/${PV}/${P}.src.tar.xz"
+	S="${WORKDIR}/${P}.src"
+else
+	SRC_URI=""
+fi
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="0"
+if [[ ${PV} != *9999 ]] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
+REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
+	?? ( libcxxabi libcxxrt )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+	libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
+	!libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )"
+# llvm-6 for new lit options
+# clang-3.9.0 installs necessary target symlinks unconditionally
+# which removes the need for MULTILIB_USEDEP
+DEPEND="${RDEPEND}
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )
+	app-arch/xz-utils
+	>=sys-devel/llvm-6"
+
+DOCS=( CREDITS.TXT )
+
+PATCHES=(
+	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
+	# out-of-tree build.
+	"${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
+)
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! use libcxxrt && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+	if tc-is-gcc && [[ $(gcc-version) < 4.7 ]] ; then
+		eerror "${PN} needs to be built with gcc-4.7 or later (or other"
+		eerror "conformant compilers). Please use gcc-config to switch to"
+		eerror "gcc-4.7 or later version."
+		die
+	fi
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
+	elif use libcxxrt; then
+		cxxabi=libcxxrt
+		cxxabi_incs="${EPREFIX}/usr/include/libcxxrt"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# we want -lgcc_s for unwinder, and for compiler runtime when using
+	# gcc, clang with gcc runtime (or any unknown compiler)
+	local extra_libs=() want_gcc_s=ON
+	if use libunwind; then
+		# work-around missing -lunwind upstream
+		extra_libs+=( -lunwind )
+		# if we're using libunwind and clang with compiler-rt, we want
+		# to link to compiler-rt instead of -lgcc_s
+		if tc-is-clang; then
+			local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			   ${LDFLAGS} -print-libgcc-file-name)
+			if [[ ${compiler_rt} == *libclang_rt* ]]; then
+				want_gcc_s=OFF
+				extra_libs+=( "${compiler_rt}" )
+			fi
+		fi
+	fi
+
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
+	)
+
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
+
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	cmake-utils_src_make check-libcxx
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	local libdir=$(get_libdir)
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "$(usex libcxxrt "libcxxrt.a" "libsupc++.a")")
+
+	# Move it first.
+	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=" libpthread.a libdl.a"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
+}
+
+gen_shared_ldscript() {
+	local libdir=$(get_libdir)
+	# libsupc++ doesn't have a shared version
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "$(usex libcxxrt "libcxxrt.so" "libsupc++.a")")
+
+	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
+	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	gen_shared_ldscript
+	use static-libs && gen_static_ldscript
+}
+
+pkg_postinst() {
+	elog "This package (${PN}) is mainly intended as a replacement for the C++"
+	elog "standard library when using clang."
+	elog "To use it, instead of libstdc++, use:"
+	elog "    clang++ -stdlib=libc++"
+	elog "to compile your C++ programs."
+}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 673825bdbd19..25bcc205042c 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -16,5 +16,6 @@ EBUILD libcxxabi-5.0.2.ebuild 3193 BLAKE2B b1157a436e40da0b67d012c903b9a137f3544
 EBUILD libcxxabi-6.0.1.ebuild 3172 BLAKE2B 0078aa6ca753285439a17dea5af0c66a991a1844b7bd487c0f51b95d9c8007a4d077515d3282cea8a044692a3d14f869f2b651bed3a7ba5e6acd20629bfd2e5b SHA512 b1168935e250e2a83356061456bef94635a1bb797abeb725f201298de3f6c90e285714799de4d79f30bd33f2a9ad9cfbdad2f4339100023485aee4554c36c133
 EBUILD libcxxabi-7.0.1.ebuild 3176 BLAKE2B c2993747161a2232090de704000d4002cd335c51404d580ab9787cd256b73eb487d19d3579ed22b46f9634c0dca8a20576a27e283d0843ba99cab0bc235b9908 SHA512 338dc004836e27f78f4956bcdbb8ba3d53327f59d2d3ac47290413a462a2752fe9d2b33ef3c7677e749004ff58b5526e7042ac9ccb1b56d92cc0e67511b83346
 EBUILD libcxxabi-7.0.9999.ebuild 3288 BLAKE2B 1c2f5f25a232d6e9a34fbb2b93a3d447542d770938fe8e8052a6e4e5e499e95e78033c259c674a1ebb3538577452c709c760f8a258d86c139a3b02857a63ec05 SHA512 add8b1705623bf5e4e6e504995f88cad05d1dbe57d5d803a45c13e49f77e8e45cd2c85e821d27ffc59d1ef8d7a216767f33019c6e8cb13e20f0075b0430f9e1d
+EBUILD libcxxabi-8.0.9999.ebuild 3285 BLAKE2B 3b5ee2037761fcb1a9c90ca11f7e4d371622ec95e468b0fba6545df8c6eb6482f5ca2c5a8d46671ee7219fd99c2a729e0667939170f26ee5f4735cdf59010b66 SHA512 c45db120d7713fe9763da17cdaf2401da3c7d639bb2041fe9b5802667ae240e444c971b9914712be5eff740729b47d65b8d8f7079e4d12ec98eb8a0203220a05
 EBUILD libcxxabi-9999.ebuild 3263 BLAKE2B 26e1877ef423b0f869b6033601c584599c00f6f46b7296ba213ff080bb060c81995a2be2693b16b73e94c979c46fa5632b0fcf110ba2bc86c1b8f30bb548f74d SHA512 28ee56c5c823aa82e02e7fa680455e425d2ec5c4ae4c98c82a18f7afa1d0a663d22f4a85299fb44c3c10d5367bf33637f68a70516b02c6c206293038a65e22ef
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-8.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-8.0.9999.ebuild
new file mode 100644
index 000000000000..d97e01f1e829
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-8.0.9999.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/libcxxabi.git
+	https://github.com/llvm-mirror/libcxxabi.git"
+EGIT_BRANCH="release_80"
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+libunwind +static-libs test elibc_musl"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libunwind? (
+		|| (
+			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
+			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
+		)
+	)"
+# llvm-6 for new lit options
+DEPEND="${RDEPEND}
+	>=sys-devel/llvm-6
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	# we need the headers
+	git-r3_fetch "https://git.llvm.org/git/libcxx.git
+		https://github.com/llvm-mirror/libcxx.git"
+	git-r3_fetch
+
+	git-r3_checkout https://llvm.org/git/libcxx.git \
+		"${WORKDIR}"/libcxx ''
+	git-r3_checkout
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
+
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+build_libcxx() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	cmake-utils_src_configure
+	cmake-utils_src_compile
+}
+
+multilib_src_test() {
+	# build a local copy of libc++ for testing to avoid circular dep
+	build_libcxx
+	mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	cmake-utils_src_make check-libcxxabi
+}
+
+multilib_src_install_all() {
+	insinto /usr/include/libcxxabi
+	doins -r include/.
+}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 1cad8550b2b3..c26d475ad194 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -8,5 +8,6 @@ EBUILD libomp-5.0.2.ebuild 2392 BLAKE2B 18b10357f48653d53a6a2ff6a8af75721a0fe774
 EBUILD libomp-6.0.1.ebuild 3257 BLAKE2B 44eb78a362f0a88c2096e5dbda7e11f94fa02f08cc5919f533e9f19e09d573d4d9921a3939eebc776b40f777cea5676d270e5e91434bb8430e9d1f445edddba2 SHA512 99d7f400c7ff76cdcdc8609e733baa4b69e3f87a131355da3f353b5e8f244f531717372f146cf57dc6d5230a1be27cecd7e00069780c53c43edfb3152e793ac9
 EBUILD libomp-7.0.1.ebuild 3262 BLAKE2B cd2b359eb354dd9390f749c8b4a91ef07590ef7eab98c3e03252e25b8680206542334cd07e1bca95c250b381fe07834a99396b5593a2c80ac3ad3bede0bc4f6f SHA512 c4643617f58e135f9dc9b833d0cac8eefaf386eb2a92c6441a5d5fc34af60cf13969dd83dcbdba0e5c799afecc14ee5a2a5bd804f88ff2e3a109ebe938a787a7
 EBUILD libomp-7.0.9999.ebuild 3230 BLAKE2B 600cece5328bb4dfdf2a4f99f7d3ddd28334e41529f59c6379ea9e1a2a8661abdb14f2cb5b6ec3bc98979fb70e5be1f433fcb63dce5de57d47e955dcae172334 SHA512 84955824d6fc4f8f62cafcaa931940c99b0ee69b9c91fa2102b983a230a22a2a882f1f9d1840888ae317193eff3c9adb7906f68db1de7fcef52880d6c36b1ad6
+EBUILD libomp-8.0.9999.ebuild 3227 BLAKE2B 70f184f0749b7abd46ab236e95717f8d917af98806c0574e878cdf74238da185d7887e56b14c29b3767eb988c66ce5d9e786dd3d067a0a6612a3b2813b05d72c SHA512 d1f6862436037ddb67fc630034684a85d5507b19d655ab8258ffd778498efb31fa9131e290f4f4be6ed2765160165484b3b5b7909064c0b527fefed0e2d01215
 EBUILD libomp-9999.ebuild 3205 BLAKE2B a8bca945602ba1b5045f473a2caed666242ec3ba75440ec6ef98ebdcf1fbf146c775baf142dfc47f676946b90c0a3cea797d7fdade4565d3467ef7b5b5481001 SHA512 4021e79b4057c3a86ce3f330f8532a3cc566ee64c9894c9f3c2bb402bf37431717105a5601b11c7413e71d965657dbdd6be2d215d4bafaba916fb0b371270cac
 MISC metadata.xml 825 BLAKE2B 07802144018f2f74b0927b53a346f99cbc7e36dbf501bb8dfc786f8d549c10eb688afafb1759f13d4d56d10f1bcae67dfa86cc2047cc39a9655a09a22e9a4260 SHA512 de43d5be94a5ea1cdfd3ae747d55b50d5d6ee577743f55d006d585d2d5acd5b3100845486ac415685f07361cd9985bae9347fff9c65417d198c49a61b4f6ba5e
diff --git a/sys-libs/libomp/libomp-8.0.9999.ebuild b/sys-libs/libomp/libomp-8.0.9999.ebuild
new file mode 100644
index 000000000000..9bc57b4ecb37
--- /dev/null
+++ b/sys-libs/libomp/libomp-8.0.9999.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-multilib git-r3 linux-info multiprocessing python-any-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/openmp.git
+	https://github.com/llvm-mirror/openmp.git"
+EGIT_BRANCH="release_80"
+
+# Additional licenses:
+# - MIT-licensed Intel code,
+# - LLVM Software Grant from Intel.
+
+LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
+SLOT="0"
+KEYWORDS=""
+IUSE="cuda hwloc kernel_linux offload ompt test"
+# CUDA works only with the x86_64 ABI
+REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		virtual/libelf:=[${MULTILIB_USEDEP}]
+		virtual/libffi:=[${MULTILIB_USEDEP}]
+		cuda? ( dev-util/nvidia-cuda-sdk:= )
+	)"
+# tests:
+# - dev-python/lit provides the test runner
+# - sys-devel/llvm provide test utils (e.g. FileCheck)
+# - sys-devel/clang provides the compiler to run tests
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	offload? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		>=sys-devel/clang-6
+	)"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+kernel_pds_check() {
+	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
+		local CONFIG_CHECK="~!SCHED_PDS"
+		local ERROR_SCHED_PDS="\
+PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
+< 4.14-pf9) do not implement sched_yield() call which may result in horrible
+performance problems with libomp. If you are using one of the specified
+kernel versions, you may want to disable the PDS scheduler."
+
+		check_extra_config
+	fi
+}
+
+pkg_pretend() {
+	kernel_pds_check
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+	use offload && mycmakeargs+=(
+		# this is non-fatal and libomp checks for CUDA conditionally
+		# to ABI, so we can just ignore passing the wrong value
+		# on non-amd64 ABIs
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
+	)
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake-utils_src_make check-libomp
+}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 44dd5df0b412..989f20406f83 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -11,5 +11,6 @@ EBUILD llvm-libunwind-5.0.2.ebuild 1094 BLAKE2B 3378498096da36b9cbd6e70c9f2646cf
 EBUILD llvm-libunwind-6.0.1.ebuild 3742 BLAKE2B a2e7fc30c8084cf48c4fd795c78351081cd58408eb8f60fe8c09bf8b87196c9e4fbb471da223f36369a25eecd8cdd6d92abae5cd7544729c50c47c55f0232c6a SHA512 6367327da3e0fae97282370e2762382588daf6e59d9f8ec882d52b974cb9bcd5209dd1f37a7c9e94d15cc411f4212b94b332aac5dd3d652ebb38893f74df8391
 EBUILD llvm-libunwind-7.0.1.ebuild 3746 BLAKE2B 5f063fb9affa4730b2310d4c79d04699744a18cf0470e4a7463372f94933df9604727ad0e6d68097d830b48f0bb66228a5601a30655004e3cf648c00684cbaad SHA512 87766c87aaa2fa5c186fae3aa97692448da5cfca29510b428c8d69e0803e37a8d41b03dba68b8cf734f7229bb023e444fe6e3f26966909dfd2857068351b9205
 EBUILD llvm-libunwind-7.0.9999.ebuild 3885 BLAKE2B b4b67285b574900596fe96caaa7733569686e2ddf898eb506b509de25895798e5521377c06503c8206517016a11060913399584072758114b9f0ce9c9f00cf66 SHA512 0e47757fb33b1b59cd8d989953b34ec22f01f993ce5e91d3390551a6b8b83df7678c4e747f297dbd1c76a21f99d1a1309b024b754d60e9b8fe8b3e606bc3cec0
+EBUILD llvm-libunwind-8.0.9999.ebuild 3882 BLAKE2B d779794a7428fc30151b688c0f207812a7919f2b6ccac4d424af11f4976d664e3fc9cc8eda569678f6ae7bc5bbf45a60489dc39d4798f43c3b60e18ae20e7b1a SHA512 8fbf23c4669f8078e6ed91a232ef4e86cbffacd9081a728659d2ce40204af425bff456a45c8b411752e318ad7a6903c8228e53383d2495538cf0384d270b5684
 EBUILD llvm-libunwind-9999.ebuild 3860 BLAKE2B 177f9e223b61e3bd3a6fec78ff0b3d2efa1220228d55f78eb41a200518441d8b617998f13642338e91ff3f56dd224c1e1382df5031060c1783440ad20223d069 SHA512 b0cdcbe531188ffa9f7e294136a9238a79441b0768144116784fbf3e647b3fef11eb6a4e5569f08e7e7092d4aec46843c15a1c2b3b96ec63ee64028a0fb29c83
 MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-8.0.9999.ebuild
new file mode 100644
index 000000000000..ccd4e8e6c89c
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-8.0.9999.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit cmake-multilib git-r3 llvm multiprocessing python-any-r1
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://github.com/llvm-mirror/libunwind"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/libunwind.git
+	https://github.com/llvm-mirror/libunwind.git"
+EGIT_BRANCH="release_80"
+
+LICENSE="|| ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug +static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!sys-libs/libunwind"
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6
+	test? ( >=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if use test; then
+		git-r3_fetch "https://git.llvm.org/git/libcxx.git
+			https://github.com/llvm-mirror/libcxx.git"
+		git-r3_fetch "https://git.llvm.org/git/libcxxabi.git
+			https://github.com/llvm-mirror/libcxxabi.git"
+	fi
+	git-r3_fetch
+
+	if use test; then
+		git-r3_checkout https://llvm.org/git/libcxx.git \
+			"${WORKDIR}"/libcxx
+		git-r3_checkout https://llvm.org/git/libcxxabi.git \
+			"${WORKDIR}"/libcxxabi
+	fi
+	git-r3_checkout
+}
+
+multilib_src_configure() {
+	local libdir=$(get_libdir)
+
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+
+		# support non-native unwinding; given it's small enough,
+		# enable it unconditionally
+		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
+
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}"/libcxx
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+build_libcxxabi() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
+	local BUILD_DIR=${BUILD_DIR}/libcxxabi
+	local mycmakeargs=(
+		-DLIBCXXABI_LIBDIR_SUFFIX=
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=OFF
+		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+		-DLIBCXXABI_INCLUDE_TESTS=OFF
+
+		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
+	)
+
+	cmake-utils_src_configure
+	cmake-utils_src_compile
+}
+
+build_libcxx() {
+	local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)"
+	local CMAKE_USE_DIR=${WORKDIR}/libcxx
+	local BUILD_DIR=${BUILD_DIR}/libcxx
+	local mycmakeargs=(
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+	)
+
+	cmake-utils_src_configure
+	cmake-utils_src_compile
+}
+
+multilib_src_test() {
+	# build local copies of libc++ & libc++abi for testing to avoid
+	# circular deps
+	build_libcxxabi
+	build_libcxx
+	mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die
+
+	cmake-utils_src_make check-unwind
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# install headers like sys-libs/libunwind
+	doheader "${S}"/include/*.h
+}
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index b1d2778c993e..b5eb6df4d7da 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -48,6 +48,6 @@ EBUILD readline-5.2_p14.ebuild 1598 BLAKE2B c3ecb5f6130c10718b55db1a3e1d092cfce6
 EBUILD readline-6.3_p8-r3.ebuild 4383 BLAKE2B 51ed7b8cb69f0d776ff9ff55b98eb68f31ba09fa129fc92972eea4fc468d819b6e1cc0394164b2d76c9137f308e89845827dbe9227dbf46fbab1be7c6fc78ded SHA512 6d3fee3e47449221123dacc7b64fd8c05101931b95502b65c05f8cf33f70c7a88788fbd196ea63203a8986a11204abdc57f890f6f11d966cafae7e48b478884b
 EBUILD readline-7.0_p3-r1.ebuild 4842 BLAKE2B 9415a62951536475fbd13f12d424cf6519ec190c22e32fead4665c9596ddec22bac56b2525b3b2702a553fc540c3e8449ebc4565a2815c0e3edc1dd36728b544 SHA512 aa737fe34a90f6ee81f9b36017ace1a89b75e1fd7632d417e129711d5119a9d33331f679dc3b4a0424e67fe9658c18773fc490c8c51ab9114a9c85ee44de615d
 EBUILD readline-7.0_p3.ebuild 4597 BLAKE2B 4e5d1aa3dff883d9ee4b1dffcf7670e30d7224f6c0496fe305eca3ef3611e060762bba5ac1a57ed4a31ecfe02ee1e600015a0cc997d3ba777eb41898e135cec1 SHA512 cde16dedb5a7a0c2b237c5606bc504aa89ec584940ea32386ad775f07efce7e1ee20ff02f3e6ea031a4edfdba72ee96af8a7e95a415ec3ef2953e101dcbd7340
-EBUILD readline-7.0_p5.ebuild 4837 BLAKE2B 0fa256393f9c602d3041927836ae28035f00f6f0cf45bef8f7db41fea80f5063ee79f8121e55efa74d9a02cd61ad81ffe230efeb8dc4287d78be40a975b8413c SHA512 b90e5797037cc279d71078f10d0de3122448e03850d5ebe8846310778c24ce0a1f309dcf952b89b23046a5363818c38d84160bb72f53dce3f9f7443a15059f6c
+EBUILD readline-7.0_p5.ebuild 4836 BLAKE2B 18750ef7f7c66bdd720aa537fc018fb9a8bda6b2fe21bcef27e7a9bf0e5cb4eca8c5e4298de028a98159488f8dfa7a4346f7950fde2a49801c291deb304f9f5e SHA512 90316b5b28f851953808fba6f1243d6e74f528413117a4c0cd8c2877b3e2d789c3bb3d2f0c479471ed2608b6f681a68cd9353b6e8f2a734f9b1343eca8edc9bb
 EBUILD readline-8.0.ebuild 4795 BLAKE2B 693bf1a55ea3fcc3f8b18c41c34c5e98ccb848e535e28d3e51b6444dcb8a09d77b2e5f47bde05ee930850a1018d4bef32e5ef74b9ebdfe45163aa05b0a7fa4b9 SHA512 2a1f19f4d8154aeb6428f016265f1bbe8a2ef0cf5de20072ccd9c4f3c7a35fde1fee65c320f9742e0d3fb0962d1b00a1bb659e00769c8baade123dbce6ebb1c6
 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
index ea1aade9500b..ce7bda9f8835 100644
--- a/sys-libs/readline/readline-7.0_p5.ebuild
+++ b/sys-libs/readline/readline-7.0_p5.ebuild
@@ -41,7 +41,7 @@ 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 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs utils"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 5f965eb80331..65ab528da2a7 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 2f36f51a9381..2663f7d78165 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -6,7 +6,7 @@ DIST passenger-5.3.7.tar.gz 7195477 BLAKE2B 43a2384574316f6c8472f326389e8c1feed7
 DIST passenger-6.0.0.tar.gz 7202705 BLAKE2B 764e3072e1bed8caf87198442a11d660c8bb4d88007bf60fd77c3dc10c110a6e7836c35c1897484190df74281ff1027bdf7f2ed7eb98155ab4419b108aae1136 SHA512 f3fb7e29764397684bff58314db34d25d22a0a4f1420d149f8f43b2a1ff77407a1d67908bf89182f3ed8fbe9476938da91a13dd11c9eeeb6fe4f0af2f9646ec7
 DIST passenger-6.0.1.tar.gz 7203144 BLAKE2B 1c59a4e7c6e82fc57f507653d8648cc8c21fae6ce8fb008b0839b60e6a076227f139300d7521eaff281ce2f935f20a730b3b34cb2cf3527a807f38e78219277d SHA512 d2fdd27367a2adc8e5486038c7bb9a504c13bc675ba9640123c1a091e6a891238c90c54a75938cd119d74f40c8d0b28257704c83ebefa024057c744ea845997d
 EBUILD passenger-5.3.2.ebuild 3980 BLAKE2B 90f06491d9546734822f033e4f8acf0aeae40e2a8f8185ff48d9995869eea7aa6731a290d0f7e8066c4ef92d50f5ed458ec1de979df518b3b29e0bbf6fd31c51 SHA512 c0defec19d84def74d81f1b3e8fb2f69228a5f1805d3a7fd40ea2894b22662deda3dbce5ba4fbba8c4481483718618fe4a9602666a0fa8b6b06e0d795905b0c4
-EBUILD passenger-5.3.7.ebuild 3978 BLAKE2B 964f9f720d8b09967f1c370f04cbab3ac27afbf377f04c46c7e8fa425b426f3b6f552a519da81d12170ba992b37645bf842554a264e2c60cfdeba53923e37145 SHA512 bfe38495e9ad8b757879dedf4c0fc410d176445fab7d76482b1d7608dbaf5a99d239e9407736c3e912684479b0be60037363dd008785277e7b0b8f1b663f42d8
+EBUILD passenger-5.3.7.ebuild 3977 BLAKE2B da5ac9a4676d2ae1cd238be73803583619f2b0c5711761790a399cb19633f3f760de25dd7e04ad76a89cf2a7420fc74a60d150fc2fb2a25eff7aa7a8c6e60a5c SHA512 b6a6df0c2a3c0502632e6bb65511e9df1e468b013bbc56dbb430055e6dcca3dcf773f09fa108f9d993c1bddd5a2c41fd29cce889bc5a0985888b5cecc15bade2
 EBUILD passenger-6.0.0.ebuild 3979 BLAKE2B 93e7172e6d1886aece5cee9e34f9d85479f226203424aa71c22bfce2acee354574fbe0144f2303c6a08a2adf4e5bebd07333a42dcf82ff6a6b859cf43c34aa86 SHA512 c237287d7c5a09f0ada83551c152d16660705da43af3a9b1d68a906f02e7eb5403b614125077f016b54856da561b20783150f6abbbc571612b0f1cb38e12c974
 EBUILD passenger-6.0.1.ebuild 3986 BLAKE2B 0485d3f5041b1f833df6a475a824a9ae88f1ff86e6be1190b1c8a5719fe07d471c55a2d7ebe1aacc8a08e5d104cf02e9e4d4e54b934c5bc0b2a4dc818869c219 SHA512 be4cc479158cd2458e959fc96b9fe49808e4fde6baef440009c0b84c603ebb0c703ba454cdf69db62d8613eb3545faf4dbc7ecee185107693043fb3e54faf24e
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-5.3.7.ebuild b/www-apache/passenger/passenger-5.3.7.ebuild
index a73378756c8b..a73ad98d9059 100644
--- a/www-apache/passenger/passenger-5.3.7.ebuild
+++ b/www-apache/passenger/passenger-5.3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="apache2 debug"
 
 ruby_add_bdepend "dev-ruby/rake"
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index a60954a8f570..734cdb71717f 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 4f881dc728ad..f56398bbb163 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -2,12 +2,6 @@ AUX 50nvidia-prelink-blacklist 319 BLAKE2B 5751bacd4ce890d08400323da30c2c86fb8a6
 AUX 95-nvidia-settings 54 BLAKE2B 0428ef5071f8bf5dc8b7220f9963c4882d6915417d76abd0bf45989b29e04468c33c6facbb9fb0d3c6aadb324a76e3181baaa02c829445d299a2c17f457bb553 SHA512 0fdaff8701598081eeb78defcd140b78f75309ace998df67569a15d0ff653aca7ad0576912bf9a619f42990e6fb35cdb79e21f8181d3cd04dea719d912da8be9
 AUX 95-nvidia-settings-r1 54 BLAKE2B 598067babb48bd0f5680300cf3cbb37ac804edb3131c47510d3350511b918cd47fcf44f1ccd4746e4a41f2f8aa36511f20c2c6f313010e89a79b7869771b9ee6 SHA512 de9edf678c64ca3d10c912397800b2cb651ef9108b33ece97a4cc1e86dad0a9e81986cca6b96cfe80740d9cb433de7ef93f29be45178db714ee408c7f6570ac7
 AUX nvidia-169.07 639 BLAKE2B 00b279e3c338dc84258d8018fe80efc4b87f0fb1fcd61eda0ac2f698897605f4675a3ebb53d8baa3bdfa9f137aff214046464a642113a1b01a8c3e35bf5f99b8 SHA512 3af295c026280dc3a2b73c2cc7772254686b09cad15f1333ab0b4de8cb0ccf78e725ced2a399b10edcf8af6ba42ab1485dc0661af67461b0c3789f786357772f
-AUX nvidia-drivers-331.13-pax-usercopy.patch 2127 BLAKE2B 8b2edda3d51af98d4974268c6435332308e343d27aef943e7fa014f0dae390dcd92935937a37abddc20fb37082484bd7950aba3c32be92fe8b709dfcb0356e75 SHA512 c6ebd534d1e88fe5c1b71ef5ccced8957e34931cab72d1adb4017c703fc2e285f6e36a778bb36a319f505cfe6408be098569944aa5d78c00c8837ffe880d006a
-AUX nvidia-drivers-337.12-pax-constify.patch 1042 BLAKE2B 7eb82ffb799fbbc6d47e50d934b5e25bcfa7bea6a8b6bb09b47aaddc22a181e14cd4513d73aa9fbf3802ccf54068a574ed9fc7492102488598807ca14e0e2c73 SHA512 203b0baf036e4f301959516ab17b6748814bed850bc79da30ae524a3c902fda57942587aba0803ad25891fb4867d88a003658b630849e12bc2c95015a62661b0
-AUX nvidia-drivers-375.20-pax.patch 15901 BLAKE2B 74f95d590772960e34c7a4ab42998e4f0ee34aa3c27ee417e0d08171ff67009cc09acd7e5a4ba43467a310d0469cb75ee9a441eb01a8b91ce3fa9273df381ba3 SHA512 65ad102cc3c28c6e2d67c4f24c8fe6ca3b9b4b4f57eca6fdf437127ce9caccabebd3049af53b30ba808e68529b5627a7e3add31b42cffb09d648a69bedfa55d9
-AUX nvidia-drivers-375.82-profiles-rc.patch 299 BLAKE2B 932beab7dbb738d1ca9d9d45868d109e2f54237d0e30f1e55436d6d1c2a33d6d527f1cb9eb82d5b12f558be691659df16fcc62bc6a9de5bcccb5e2f4491bcbd0 SHA512 270b42fdc93bcf9e8a39bdcdf02de0c6f2a015b856d25cfd948aeaae54059b21c1e18b4b90e2e54c63c05a380d495bfcac310ab7804a51edc31bf5498d946cf4
-AUX nvidia-drivers-pax-const.patch 833 BLAKE2B 8702984a399b50eddda786a31173f760646e7d6960999e319cca01295922471d708b356bce68817008b572ab558b49c8ec3c84bc9622225fed4efaf12e866f2d SHA512 6ef94db71cab2dd47273eaed1857209d03ef648d268c7645f3ca4caf6b894590e42a8e716e4354f2eed656e7d55a4c1774b1e6a4be215fbf59fc9d0b1a5762a0
-AUX nvidia-drivers-pax-usercopy.patch 2350 BLAKE2B 57117ae12d43c1fdce54fefb3341fbf990f2ad0bd808833745de5d0075e703deb1644a8400b97bcf5e3eef6bfb0e06f6370391ab830203a09ed505f67eacec3d SHA512 54a1354ba008d014a608044610027b4d808120f8e77cc7d5ac855c3dcf4f487b0a4c0870ae4e727db0643cb56ee21513b803976e9a30c6838adf2f5414232804
 AUX nvidia-persistenced.conf 250 BLAKE2B 8b3514f981d992d34c949011a25fda5737d85ade831f15481843db14f67494e6f271eb7947a459a28c7991cdeb86092a2a7920e6f40213bcded90b7f9f15dae0 SHA512 9c9562bb15bf4552754dd50a1b01dec5df76f7f5666fba2fff642a169f87e9ed421a260f2258ab469f7e4cd9ef8161653355795624387fe7ad5ae6a0d71e5f46
 AUX nvidia-persistenced.init 650 BLAKE2B 3be9ea563ecb9741bad4de1516ab9cf373c5b412eea52cf4d8e6446ee09f6adee47bcd1f65217c7379b55d99de1966b2335ecdfa940f9c7544cd103992ba280f SHA512 864c90573a033e30d151c9adb9f0f12c5bcba2b5a7eaaa62f86fc11747f13956825fc5acb4fb1fb453a32acefe850e73264a650fafa6014cc96bbc7e3b56fdaa
 AUX nvidia-rmmod.conf 108 BLAKE2B 8a14963d7498c08f22c60f0e7286b66375c22e9db081454d973738bf847bfd4343c82f4e1c529ec6b904ae3e8cf29e2570dd4cf2fbb8c8aa9bd33491d2e4f543 SHA512 cb6b70ba0fc9c6d81d43f31d724538beff79e7e9b02c610485f1e46757d7bf16410d5cb2853d8d67ea6e4da59e7e1687ad14dc4b494415c6db6fab517a03b28b
@@ -17,74 +11,29 @@ AUX nvidia-smi.init 545 BLAKE2B f4a0743f1fa5136c9c0f327645d8b66932492f2539b5c2b0
 AUX nvidia-udev.sh 185 BLAKE2B cf7a46f2d123d5df46138d9ad12c4c700984fb773acdda93fc4dfe5fe5bfad36db70342ce4a851fc450a90b6ee6e481d8a4f6e38884063be14c4f0d6e15a2329 SHA512 166df3a4e7c1862ca2e0f634bf5eed7aad1bdd7e55764ca42371b91a7077c59f0bc243de5616fd38dac9694159d1695d54fbd08ac89d4d3f3649c70c7db5977e
 AUX nvidia-udev.sh-r1 285 BLAKE2B 6ea76f2f913b2bc2c9955e7564c770368ea6a0327887684d086040047fb95a0088387c5f87f22bc1f5a093cc79299ad72dd1495719bb344c504a342d03f34db3 SHA512 493b0d5f2698d299e3b8d5782ac7fb8174e7ee93f1dae66bc1161eb4dd16d4db91048444dc6e7bea344960936c0a5c825041f6909af004438d8009a3d3fe71c9
 AUX nvidia.udev-rule 462 BLAKE2B d417e0e4f5a64c5cee235f4640554ff1ba4d34590a6c3459fd8b4e10dc7581010c006f96cfd01f2c9a847c79979631f6e5afbef01724d110201377e8f8c75966 SHA512 96f9edaa0b46bea5fce17596f868bea5265b303d7185af6ba81527bbd7b8fdf92de9311317cbde51a29d222083d451c25ab77c3d6837cbc4072a50d9af89aa86
-DIST NVIDIA-FreeBSD-x86-304.137.tar.gz 35399011 BLAKE2B 823726e4a54f029a47b4c473718099b97d0364b19ac73d36111c0e3552af9a896f60c2aef0eac05d84eb7386fd32ff0a33b2b26d572b6803fddf3c9df0443caa SHA512 9bab183289461d915371b7b5b34e66fdfe8ffff945806dbdf00e0e1cc7242f7b74a0acfc6ed24c3643a6d51edc837cd905ba3b224c30040b0f40d662dc6e7a6d
 DIST NVIDIA-FreeBSD-x86-340.107.tar.gz 60305952 BLAKE2B b634bfd610653f1c546b68e87d934c5d0e25a2e5be6df15e0cb6016793274b4cf08577669e61c35976f3482da2221b05797459b2814965bcfdbf519c8a6d2681 SHA512 fe09e1b3dd870a07b4edd163d302e2d98f00e139d05a8fa627c292182b61d2bd9b37eb746d639ba592dcf90fecedc57430cf1ef76b6522785ffcb3fd46fe9ba0
-DIST NVIDIA-FreeBSD-x86-375.82.tar.gz 59566154 BLAKE2B b888b08cd434899ff73f04a855b47f9416ab247f63023f742dff55e9249d20b8da07bc5cd42e6d555cd9a8ecc62c97821ae09dce1986f0ac2384a16a70c7f181 SHA512 6747bf6d6278c6ed0828c6fdcad5353e516f28384609a3f0a885966707eebb096926a876c17843bfa7626a01a6d4e0ab12c781faf9ac0291771b195c9eb13d85
-DIST NVIDIA-FreeBSD-x86-378.13.tar.gz 59610253 BLAKE2B 723b392b869dd5cc9244cfe9df371fc6df6b4ebc4c1f01082fd79b2bbd0cbf4e670cfb69511f1773d28f6fc51a8801777dd6e3066f50fc96888a9efa467e459e SHA512 a0101201089df2bbf5bdc4ded2228dd989da6a47da31c3ec8d55916b1ff3457924555f82c7381934745fdc1b1f8f78e3fc10e5089279eb13423628dbfe560c6b
-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.87.tar.gz 64326801 BLAKE2B 91cf9e77040d8c710a0fef58f9bae685a86962f8460a5d55e2c0733dc7bd2050c910bbd0732bb89efb8550d501b08c02e0587118ea767ba768dcf1c356e0e872 SHA512 b7ff9f4e61de08c0626e5e55c1f51e3451640043066944d791f79f4c0b57f39211c0648a2551c0b5ed1622809d7c9579e24b8ee9a46a7988319e25ab709c1400
-DIST NVIDIA-FreeBSD-x86_64-304.137.tar.gz 36474676 BLAKE2B bd75e2916d34f76566d838406419991a860118830366f0297fa63baade3a99f637dae601d6bc6a051596222f2715297dffbf9b81ff5478b030741e6c8a09bc13 SHA512 f0ae7ccea417aceedf34bfb9c96fd79b31cbf74a8fa59d5199b0ad7b81b8a4aeb66cd4801a45cc37f836979cb4267aa69e08517beaa9b8cb9c66a477d02ef8de
 DIST NVIDIA-FreeBSD-x86_64-340.107.tar.gz 61179967 BLAKE2B c12c7c07c090fd7bca78a30082890d0b0330dde07ce9beacdb94fad97d40e9ff9e1413fc36fd94116821137e74076d99a82ab85ecd0a8e16d52b47abeb747802 SHA512 661a4cc79a0adc9a1abebfb3567c26e69628266794b5b539c112112a0989760ea1ea2d8c35a5fe7539b579d4e9cef2685e3e1d12fc7031cd6d1b743c23eadc52
-DIST NVIDIA-FreeBSD-x86_64-375.82.tar.gz 58748290 BLAKE2B 629d65b71270d1c0d94c71e4215a72f0e49bb82e68ebb93fd4b14cd56a2031674458764f4c3e2e3dec7379ec0d5ed9212c8d09a64e4361f40352e52aa9b57de5 SHA512 5e2b42ff63e06219764db8187203ce1a2c3c8b478be31fc713ef396e8f8d46def9b2631d7989866740bd0c6a81bbf5d2ed083c14cfa7171c0d993553ca6f431c
-DIST NVIDIA-FreeBSD-x86_64-378.13.tar.gz 58779963 BLAKE2B d0a165dab740b25e1d97050e4dfc9f916ae17159eb4e4b79e068a4cd6ec3e2bc146d061abb4a411847cbb0d987253f86327e67ffd6efaf725c4fa4dce27e4fa9 SHA512 34cfc383ba196ecec2cd27fc12bf30dd58f8782b73414e7b4c182e832ae0dce1f8c017afbb2101d7525d4e321f80cac49d3b578a8fc0cf88be9310f4deb77057
-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.87.tar.gz 63648591 BLAKE2B 88aa38b11b64b2ad91f723ec84a2adb6829571136aabb1441a9119418395d5f143736487902f0c60b49ebc1284f3100fbd089e4c941cdd3519ab8511cc1d3261 SHA512 0865fef8b8a3be8f6d9fc81908b162fd6062ba0ea81fd00200e7b2a1e3149ef62408b46bc4ccb7a77f1ac943557a22b13a10cfdde084f0b76cf2b23432e57540
-DIST NVIDIA-FreeBSD-x86_64-396.54.tar.gz 60938322 BLAKE2B a23488b625a15703b0c40bc6871314b05d117d489f64a6f7c70ac3c934b02028b9623be10f0369c98c7d3b5e018e1eb6f1d2cde9d9e1b90be5065f06f6a646dd SHA512 52df85364bfd45a23394078855859ce85de996f7990bb96ba63eb33e516c3cf8e72c4391af9817213f735286f2cf6444bc8ed00312365f12ae17373cfbdc3fc7
 DIST NVIDIA-FreeBSD-x86_64-410.93.tar.gz 61977979 BLAKE2B a662fa13866cfb36ef61a0b9dd459519e26ea93a6ad6ae7bf34075fae8e7622a91707d88cec8de0660513cb959c3596e8b6169357891c83e847870ecffd72928 SHA512 ecdd5270f9d5f32117d83cd3e3cf0376f0b37c748fe164e702c4230d225c6b28bdbbea4334555b6928d05f1a7cfaf87caf20dd2e7e06e1259c526f6bd50e4d0e
 DIST NVIDIA-FreeBSD-x86_64-415.25.tar.gz 62373961 BLAKE2B 4c1ce36ad31933efdb7b9b3a5a530439cadb50c6ee29c0689a521308fbc213266a761765998c44643fd8511159ae96387a3a278accc4a0d00322b06b9b327232 SHA512 792f0cfafb1d6b2137db62c3a5a7e76217d89c3b18cee92ec8317d6c583fdc9676aa46efd55bc795aeaaf1532501f7b40d1d9609d782ffe63e55bb37d0d6db14
 DIST NVIDIA-FreeBSD-x86_64-415.27.tar.gz 62389955 BLAKE2B 39ac5970ef1a6ffbb03abe8b758a6f5d7eaca787231845fa4b4bff5f26aa770fb7c695bbd5585d919c934c65b9ed0cfe42f9674bcaabd796c9bd8b89cea87ee6 SHA512 857d1523bad2fca21c75b45c29066be0f530afa8ca124806bcaa36509ac5135df1c4037e6b09e5718c701f085b3608925e2b1fea45d0681e69a99ef709c307d0
-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.87.run 29078256 BLAKE2B a7ce24bcaf82e6c2c95cd11a0d9e0e2aa69c717b8455d4ce0a79a9c03c92f5f6b84107dea6347dedc5c4f8fe076e616fc7a36053c6a5f571af9d794bada6cb1f SHA512 3f8ef4eabc7275685bd5d887c6b7dc20786baab1f4a89bfb23ae6c8d837188d93369c777915d3ea010b08e578c4fb7318d9428811971470e31a8b8b4f51e240f
-DIST NVIDIA-Linux-x86-304.137.run 41504115 BLAKE2B 5938d4df818947e5576172c0ee9bfa42a2fc49a7a7a2b14128cf3b967dfea6d4523901b33283284d450cfadc2c6d72a82a1533b27ebb4b542b6b1454fe8ae960 SHA512 021c5a88d50489aa0a1c7eac14259e23542b93578ae339995a2e38b786d06d239968c07933cab3fb78a922cffc7e213d6fa3fe07e34065a9c7f03e24f8729370
 DIST NVIDIA-Linux-x86-340.107.run 39016798 BLAKE2B 2632c8f257d0cf7c5b9294eb2c0b763eee6feb60eacc316024655971e4d067c4af6548aab3b7b2b295792b064f3f3ac3e6403a2ecfa096761d308dfb6b2569b8 SHA512 0add713942bcdb639d19b5c36f5e0cea14f9e07490191d46dfeba0515ede7700fd8e9467ec531d38329fe1e76bf45905e70e0d440e7bc2dc79c1d767eab03338
-DIST NVIDIA-Linux-x86-375.82.run 44633335 BLAKE2B 55392ba748108b47994bf272829a6476dfc23f7756e0c18d56c8e4d827968196ee70e521c2e6307c134ca0c85d59715db777583fb07c8e06ae7325d586a8117b SHA512 cbd6edd7490e0e5ef9dd2020c18eb5f75412993e06b9c4f1919f49a8ffdc36131a96d868ab51691fb5c4a661e826b000ec93363c9b168304f6498014e300bf24
-DIST NVIDIA-Linux-x86-378.13.run 44397547 BLAKE2B 5b45bdceba75e214028b9f59a3655482ac1ac2b51cc0a6ea22927e5143b47c670db7078ed898e04663feb9fd495165954c90df5ee3afca00155dcc2ae6a97dc8 SHA512 b96d2558a1003a3c66cade3a1e16abd34d855c0e27cdebacdc0495e0ba3cd5c68bb84cc5f81bff1b9ddce36ac52e0dc125c56d868b77d7c8e2f606d559b13b4a
-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.87.run 47959124 BLAKE2B bb799a53b6d25ecd0e6013cea544402c25332efcedf0db5c490dc7ebfa064f97a31427d529f0453092e0f6495a996acb8ffcdd29dc1fed5fc8af31514d959c80 SHA512 18c5ef058098c0f055bada06888ee07da4d1455d90d393357483c289eab27969d49a593318d28e535941e7ebacde33e349f3a1cb2f7c627366ba5c6b7835ccbd
-DIST NVIDIA-Linux-x86_64-304.137.run 70087133 BLAKE2B 8db0ade7cf64231ae11e6fc55a16a68a2f7b11a8bb7debb49799fee96eba06a3062b97fe539b093727623a1ed1067282813de047c2aeb89d93bf35a97c71aac5 SHA512 d7fae1e486005ffa2f2bf7f14f901bf5156fc784407a9acfea584f49bdab92ff5f4d0fb66c4c5b2800a461fc06aebb7d760bcb59f69ce4f2cb4e03e11816b3e9
 DIST NVIDIA-Linux-x86_64-340.107.run 70233686 BLAKE2B 821a2672dcc3b546fbb3f826230fb06741503d75b06f72cb407dd3c9de4f2cbd150bff34e554dca8aa86e7f6bf64ce4f7f9b52976799a477c6c2659aaa5bb4d3 SHA512 51df9370526732db099a8a925d35cdf1317ae2b0ab2c130eaf82373f25186165b4af7d44f71e51e2a68f7d07c7ae3f441a6c6c4be8467003b15dc770c4f4e89b
-DIST NVIDIA-Linux-x86_64-375.82.run 77461911 BLAKE2B e7f32bdf1672d98a1fe98c82d80a08dd6f63b3c859df4c60124977dae19520a21e4239ff7be6c272243d4af9416320b5e166d8f100979daa0d005ea2a44fc16d SHA512 6da63b807d6dd7cc8ac2b794d5c9ab8383e3c0ce6a47adc600941545509fb40b5f06344781afc895bd83f2780b2bce187994df5684db2890f50b41adfee8f910
-DIST NVIDIA-Linux-x86_64-378.13.run 76239469 BLAKE2B 0f2be330645f8d9d2828fa6d159f9e41ef09bb32805f94cf3fa255f088a8c6f4c25add584787bd1ed64756ef75821f7143c14330718cc5f5ac3cbcf8b7c3bae4 SHA512 2f6789aa0a400c035c0a074631dc5c26abb4f8a62efe928ca3a2865b89d29acfc09c27f23a664e438275e4bfd25c261745d4d495f9aca5f54ee6c53a389059d2
-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.87.run 82690871 BLAKE2B b43a45a7d48160a72185417360a4ff4238922f6d77c7b58c0562f0e01c8aa33e89057e8a5d354e8d3c8e6fa86acf8908a6c2eab81e06158a92908eec18a9b02e SHA512 f4883744f5e07150677918669eed03c7b87774f752112aabd52d903a09ae16351b34105075da2ff0fcb7a847cf66ec17e9797826859fcaecc44fdcd464a61805
-DIST NVIDIA-Linux-x86_64-396.54.run 86946680 BLAKE2B 9b3ab39c9d09c663238d0fac6346c24feea6ecc44b0ecaf3de871522697685c1c474ec4cc83f3bab0a2bcfecc7c77acea0e6bfee6e8ca8e6883bd338fd6da8a2 SHA512 17139abe99d4f32ec87379ee57af2cc0fec7d24605b2be7e3cd6609d9fcdf871e3c1cb7414b3544e14eb32d2213fec7ac45b3261f27c8d6565d510ccb14a1247
 DIST NVIDIA-Linux-x86_64-410.93.run 107257681 BLAKE2B 56e9b6a17ab4d2fe2f18d90b4e209fe048c53dc43846ee9c8bd0960999a06ef9d9b6ba7e4c242f77cc35cfc5b9a0e2ae24aa5f07f68cb7662bd5010de41a9b36 SHA512 1132884210e447d20768c4ae84ff572c9f6886fb9a082da4d229a03c13932a5c6ccc518cad3311a9302b6a0d9e9675e3a53199e7183e07c81282d46883d26105
 DIST NVIDIA-Linux-x86_64-415.25.run 108599932 BLAKE2B 958a345f03157ebd8f8a84da91af78143ada75be4bf1d5abbbec9bc8b0ca11549891efb2f78c3ae89ed86fa94a4bf179834d1b229b2dc7d3587a138235a8ce7f SHA512 d289a37344916f5d17425f17d0530a7838b264c49866a0148665c9b87dcb7c23e868abae866a2568abac425701149d9075da540dd0f45f3d18f67b57102c0857
 DIST NVIDIA-Linux-x86_64-415.27.run 108399659 BLAKE2B 05fb81a4ab8626d0170a30b70ed114c639ba7f0e5ac260d2f38cb5042a4d6052e40ada51cf2feff6bae0f394781d77cb70014f390873a715b7d9495b86918bf1 SHA512 5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6
-DIST nvidia-settings-304.137.tar.bz2 1481361 BLAKE2B cf52a55a34eeb03a685a683487af6a198ba467dd8ba9983cc75624a37a226373cd931d98e8448b7b8ed430c54be2118c7b240ed2a9100b19bec5e832e2f6cdad SHA512 676d1f70c9a78ee234f5f1a283412430a386fa604de211afba02806a45906c5e246a002989b724d74752178d28c92a268de1c98d4c87876797d991253f16b0cc
 DIST nvidia-settings-340.107.tar.bz2 1549413 BLAKE2B 127442ee2c35ceec47ab4f103bdd2d0278c621fcb9be47051111f6f8728ef5699bdc95fe33a3812a807c38c4868b04c2176e2ed218a422171d2a88ac0c00de96 SHA512 593e7e83aa350a3a7beaaa32aca8660d7e203f6f2e460a6e6eabcdc092087f9917ee4e6d141e37ad4e3b0a1b9908c085e4a71d2f579e481a03bbd1c6f75ca776
-DIST nvidia-settings-375.82.tar.bz2 1620463 BLAKE2B 0c100ee95c91bb53c2192da8ddd1042ce4e0dec7defcf4793a1745020f65d538c4b0d09f690f00034bb02f7ec219048a0539e81031c8b3eb12006f2a0d566d2e SHA512 abc650089cad57ae95a3e3456deb16d2e3c116e148aed83ab40ca5e381445561cdf4c3c0d8676930fb4c73dd5f3282dd1cc1a62d876b7ed07146569ccfb38488
-DIST nvidia-settings-378.13.tar.bz2 1618011 BLAKE2B cc9d5cf7ad63fce3b084c1116c076925ec5c07b8743b6aea80d19c46177d6f33f1916ac90bf8d639e962599e209a0f23bcf945d78e056839e7cc7adcaa6c1ede SHA512 a12352c92fd4f56002bda2b07e8cddd5573af98521ec3495cd428b784eb368c9f2cb40f9b4372400ba1ea67c9349c6a9b4f7c218ede2d0d5dabb08325eda9844
-DIST nvidia-settings-381.22.tar.bz2 1629344 BLAKE2B 1e7fe16b28f12ebef380e85d96597f5a8171fc33b6054eea4c44b5347c579dcf2e114d540c527f9ac5d39d08c90aabfac3a3feab2456e69b336d7d1d8ea64df4 SHA512 be8e7051df88202fdc6afd63da86231453ab19c8ac35d0940ec4d11a011b0bf886919a3c3ba51bd3e8f9b34a29de727586b63dd861eaa6a0ee6190238c682a0f
-DIST nvidia-settings-384.130.tar.bz2 1633217 BLAKE2B ffc1381e680e94aee95752074c39163e48082615f92c6184c01fc7d21e20bf18308d30960db0db602baf89b34fdd295a715692446d21fb2491056ec707e8b844 SHA512 3d878552a78234347f4e51920e8358e56b42d595375e8fd2b0520c3495b02d6fc3877d4346354145c420acd79ff1e9607c312330b2a2e27781a3a576f8860939
-DIST nvidia-settings-387.34.tar.bz2 1080507 BLAKE2B 4eeae3ad4b489f574832e967f0c72198d2b5be0139e36981b701e5ca2cde17119d584677e705243f1be6f920669b921f8e4b54968e2d56e98142aec81383dff5 SHA512 a7a1a2db170b803b769a7307c8507289b763f6cbcecc746edf988491fcc28d7ef1eb76574d6c1f24283e6aebeb56fc8a99d5302a81422c3384df0c8979f006d6
 DIST nvidia-settings-390.87.tar.bz2 1109274 BLAKE2B 20eb809ceeade932e89592ac91071e6d3311f4a075812225d68342806b7ab1f9f8ed0399ea7a47241b7974311794852fd932fd8e824065589de6c124a3c81ef3 SHA512 cafdf2bfefac187409dfcffd593ff23eaba5ab7ab8dd85a9f14a4b6a47ffb3649af770bd2615887af9d30de3ef8fedaad7afc2ebe9f60a8ba7355a9004702959
-DIST nvidia-settings-396.54.tar.bz2 1116371 BLAKE2B 114b88f393b0909c8d84a56a280854e258d0e7e7ce800ee58547ef68b4989f22a3bbb380795472b8222493a988dc9308fc20ef03c81589448b518a12285cf204 SHA512 23dc3c61bef71200b3e8185940dd52a50dae7ca7f2b8a68fa96eaa937aabc87ded5d5f73081af51d1e7af2b78b0ec10ab80d28dadbcf10a046c32ec14db1d83c
 DIST nvidia-settings-410.93.tar.bz2 1115704 BLAKE2B 1119181feb2704711593c19a43dce5feb58778d0251cb2dcb8647de7bfb1abe3a7f374bddd62e4c983b07a207bca7c1d99a7ac51cba3ae41f78fb97c4d1e9666 SHA512 4e5a5babae382dbe9f6899e51d3b1081fd7123f9ba5e147f7d5cc1899904892ea8d953983e43643ea4355d06348db40005755a02c7c0ff6ba104eac4a9d450f2
 DIST nvidia-settings-415.25.tar.bz2 1121689 BLAKE2B acd9dd12b4d9a3d76e08d1498fe2373327308d0764791c7e14c6471cf98e79f635a1073dfacdaa4fa60dd148c15803a18061b185cdea24676d851b3a1b695184 SHA512 8646e4eb8d491cbd20205766833fa9f0629a2567797fbb7ca085e07946f4698645cc134615bc20a42090d4f4fe826df48ab4be717b227ee59c17941d185e0b0b
 DIST nvidia-settings-415.27.tar.bz2 1128013 BLAKE2B 36513252ff3d5f2036c80250e012d79bebfc14daff56fdaabb032856f5f78ce77cf4ce32d6eaee5fe4c1a18db63d5c69d6848517f025c711f133e28b3e509396 SHA512 5ac3b673c41194a1952ec10cd3c961aefd281bb044ecae5c9d11cb55d4555fed44e6056b5a2e97b5b87687743cd7f702f33ce7e0f841f04c8175d63693a24594
-EBUILD nvidia-drivers-304.137.ebuild 13739 BLAKE2B 674217817d033e081e351ebea79b85998b187332246e24a50451377300a1ab1215071ff8214ae52a1d220fda066a53964f711c884074a3b74761b934367e2bf2 SHA512 86f27804b30922d046de5efa65ddafc15daea5b83ea716600387edfa8355890379712a3bab09f74a3f9a4755f9b3dd5a645bcb2a137f2762196f4f2ecb32f5d4
-EBUILD nvidia-drivers-340.107.ebuild 14727 BLAKE2B 6307b7dd2facd4c7b7ffff22835b296b4cb89082706d8f030567ebbca0f73128b482bb63c2d8453d94972c7517e0a1eae90da10a825cb2905f62e6b42cb0ef7c SHA512 77d821b0130a9dc1ac10a362abc11b605f996ba045157ff03add5a6bc9a1560f4a898be3cab75a5e4b4b3388de15e00a6c9d34eb6340355de062735d506c9a5f
-EBUILD nvidia-drivers-375.82.ebuild 15843 BLAKE2B b4708a8ad1a0fd3a54e10857dadd16bb32df036ccecb74c873e493c1537f459c4fe00494928c705f33671a27fdab5505cee23eaeef200a2151d58f662c01fea0 SHA512 b5172b2fab65ba07d4b7530c05bbbb5b41c28639c15ded01ee3bb8c8fac2d9623d27aa6e3bd797e813471922e49983c83a9f1ee3107de19a3a970aa55670f371
-EBUILD nvidia-drivers-378.13-r1.ebuild 15872 BLAKE2B 423f068cbd1c0ba99960a5b980af76a98829df94c81f257fc31ab1135e08c6a412055f58822d5dface66104da0a8fe42e1079dfe7e2d02e82c3f54895d4883fe SHA512 6a8c5e01e60247a4b8ddf325683c850445e595cddf1ec480e1c8a636ba0fcbfeba4040d46af2b5a625e8702f5b3074016118c2faaa7362677ba1d9a0497f36e4
-EBUILD nvidia-drivers-381.22-r1.ebuild 15871 BLAKE2B 3c5b3c4e4d449794e1f858b7b4100b7ca47e58215d2404c3131de54b7892ce96057c8f18200a2f98548bbfedbeb1379f255fee8577270ae80712d8d737fed071 SHA512 b82d77e04f745dde86ae7cc711ae09091356e6e50cb9ae4cf3d93fef71a36e2d242e072d0bc9298bc3a34c1c404398bd02e2585644fb2fbead87883b881b7005
-EBUILD nvidia-drivers-384.130.ebuild 16172 BLAKE2B 686d03182b2a1d1e0bff1afd0e8f6b08d3885dcc2bbb6d5650d810df99da31f7236c2d06db8e32e9cf7fbe4aadd7a9f1b8b7ce337fb1071ed684acbd9b4047db SHA512 3dea2e197adeb382fdf375236d8645e5c1f1b1fa8f46f4967eef1f168ba437789af36e9694cd2a959c6239d3d2c2de9de279841d2177cb3194eb89b4d5bf1628
-EBUILD nvidia-drivers-387.34.ebuild 16354 BLAKE2B f1a83e45474902305b2fc97f13b32fb0464658b27bc5f66310bed5c13aef63dfa794cb30f95ceb1f98cc580ddf506534800836d2868f244fb7d43ad14553d822 SHA512 631688d10c1c33acc4c2b7526e4bad7ec60d77e9c0a2dc4805b49747f6e9b65b1bbe5e238a67c7b9e5c186cbf71ddc12d02d3a579c79962d51315e1e12d849cc
-EBUILD nvidia-drivers-390.87.ebuild 16369 BLAKE2B d30be65e829598adcce893844c01871873ba8bf751d0b322e535713e145c3bd6f73394fad5e93120852d48a23bd73014ee1261e065683c919b730b45bc0a49c2 SHA512 2348c56ee239c2a45473840d61fee3ec465578ffbfc8c83d11f042d79b57314766f7c96f51181457fe9c43e2061c61d565aec9eb399871fc73ca62543f5c5d5c
-EBUILD nvidia-drivers-396.54.ebuild 15991 BLAKE2B aee8b58a8df6652c123e86ba216512c5f9e42fbd83ae87bda788768f327e73121b1f8bf383cfe9836b231940e9cfc8acf16b0950f1105d138ed47a76bf4cdbd5 SHA512 e0f3b12f7943f96ff0e63553f3c42ae0abfa6c994131c2fee117f21b96499772484b420d7b39db27f67eace5e8b95533bc8b4d1baa8108065c9bb18a76510338
-EBUILD nvidia-drivers-410.93.ebuild 16258 BLAKE2B a24edf0e299f63488afefc78a8223322bb7e979bcb0e02255d80436a3dd99ec80a6c9ba429c5e4f869149688a3ad9860694587818f6c9b41774c424af23346d7 SHA512 e06a7fc6a02f441fb2e112baaf89fd76a8783280e4d91a9e575c7d3a91ff830b5f9cd441a45885ca8de66d636d9d69bae3d83451d94b85c60e872d3bb2adf470
-EBUILD nvidia-drivers-415.25.ebuild 16266 BLAKE2B d3bae475782fe830aec69eff46303f2a7cf28b202433199c0ce933c15d38bb66bffd0a95b1b2b450c79105308b93fa60ebd26d1af8bda15497d9a9450a9474bc SHA512 700bbd31140b81559545d1d4690845f338b55b34c5ebd6574bf0503ce04f197fe943c2d7c8dd179bb35796bdc34bf530f65fa929a204256596d752985b865a42
-EBUILD nvidia-drivers-415.27.ebuild 16267 BLAKE2B e948748208ca19519bd43fc83fd4b887c1de69e79a5590335a0c824747297440487b83b91879c9635a731cfbee29ccc16063c3dca626d96a5d6c9ef3f5247e5c SHA512 b8291306b6ab6f20408ee18b69946ec402cf9b0e1554d77c3cbb879048613505d5944a975386f3e7e179cea37db3f8f8cbcfa93ca3b4a57fec77f19e8244136c
-MISC metadata.xml 1275 BLAKE2B df5cb10ac396802437bf6efb3e80226124c11d6167bef2b64c3e525c17fb27213b13d7413ef909469440804a373b6e5c7088c53e0a6b44897860b7276ac3de6b SHA512 464ba5638a5d82a6e6bcbfe11b52759846f9f81e3f223cc313e0059b923427f21dab95b84595d6bffad4441fec96fe5f01044be572b72add8196a812f5682edb
+EBUILD nvidia-drivers-340.107.ebuild 14336 BLAKE2B 9643ffca2bc0701291c4f652f130f45f78bbbe77006836de6ba0475174c8792f27046da39cc26b1b46fa46856c4b34cd9b8b0fc523b24e63cf13222d16176aac SHA512 595b0f9f702638ad458d20ab9e1d9515b24845d8c527463fc79dcdb3f910edea2a4fa3a0110d219c2b64e7782f55cf8e7c0701a3e3d5107c3f46f8f4630ad691
+EBUILD nvidia-drivers-390.87.ebuild 16042 BLAKE2B 25ad849c0268011ff406e40a59c37fcbf24463a829e5e92e769db0837bf6f15d5809f9bc43650e4930fcfa6b39935e3036200c241545823b0f967bd89b896ab5 SHA512 b28bbbb140c9b3f8133d8233a06c870df32597fe1046fd8a41452471b52dc1bd0db5c70859b2b7740719019576f591415be13ae8d0ced3ea7521673f81a19ab0
+EBUILD nvidia-drivers-410.93.ebuild 15931 BLAKE2B 64efd9c1954d0071877efc91cb4001f33131e21bc54c345f997f28d4b794e7d8ab080a97f806200be18e7e7adc7e00bfc39a4522c8653fe5a389459856a92f82 SHA512 8431d1807b47ab60de2ec80ff653e799fa79f47b829425c30bbfe4bd2effa9b81c422139aa27e19385e51c1d1bb7d0db54a9906b043f36b9f7b48e33410dc0ae
+EBUILD nvidia-drivers-415.25.ebuild 15939 BLAKE2B 5f3836bb7ccb8d63e2f8d01b5867463f30b9c3f775233ea20a004cac7aeea02cab323779322435ea53070e5290c55f255f9e6c005cb3e7428e0f608a63c7b6d5 SHA512 edb51b164c85a209d9ffb073c2a7ed5504a3fc054c46101164435000e539302f11619c114650069694f1cea074311feb1d2c301aca159e52029c3440695924e6
+EBUILD nvidia-drivers-415.27.ebuild 15940 BLAKE2B c92e53dd5237e8143a4ead9608f26884bbd9fa92a30b27fa84edd880a152e97a527e5ea57e9f87a37c26706d90efeb74b5f47cd3ad40509142c328148b379616 SHA512 492bb7c626252df85e6487ecac7bf35597924743651a1ccea068d9a1578502e349e58d6eeed4a071c982081e1657b32306bb63059bff63657917d4f4b810eec7
+MISC metadata.xml 1207 BLAKE2B 6fd00cf82a2940c84a3802484c9c752e5bd9786158f6f6e983cf5fe56f5018b7f1f90108525234bf8c98b0f63abba54a468509609f34b9e7647f7bfa7491bea1 SHA512 2a3274c9c81c05f1d722974a5f73dfec9ae778745092c4441e441d87f2554cb0c4822e8ce63c89a90e11d7237e6dc5a3a11ca12cdfd9813054e3abf75e7f9ba1
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-331.13-pax-usercopy.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-331.13-pax-usercopy.patch
deleted file mode 100644
index 9777ce6c2d43..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-331.13-pax-usercopy.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/kernel/nv-linux.h
-+++ b/kernel/nv-linux.h
-@@ -757,16 +757,16 @@
- 
- #if defined(NV_KMEM_CACHE_CREATE_PRESENT)
- #if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 6)
--#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
-+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags)     \
-     {                                                           \
-         kmem_cache = kmem_cache_create(name, sizeof(type),      \
--                        0, 0, NULL, NULL);                      \
-+                        0, flags, NULL, NULL);                  \
-     }
- #elif (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
--#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
-+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags)     \
-     {                                                           \
-         kmem_cache = kmem_cache_create(name, sizeof(type),      \
--                        0, 0, NULL);                            \
-+                        0, flags, NULL);                        \
-     }
- #else
- #error "NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT value unrecognized!"
---- a/kernel/nv.c
-+++ b/kernel/nv.c
-@@ -794,7 +794,7 @@
-     NV_SPIN_LOCK_INIT(&km_lock);
- #endif
- 
--    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t);
-+    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, NV_STACK_CACHE_STR, nv_stack_t, SLAB_USERCOPY);
-     if (nv_stack_t_cache == NULL)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
-@@ -924,7 +924,7 @@
-     nv->os_state = (void *) &nv_ctl_device;
-     nv_lock_init_locks(nv);
- 
--    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, NV_PTE_CACHE_STR, nv_pte_t);
-+    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, NV_PTE_CACHE_STR, nv_pte_t, 0);
-     if (nv_pte_t_cache == NULL)
-     {
-         rc = -ENOMEM;
-@@ -935,7 +935,7 @@
-     if (NV_BUILD_MODULE_INSTANCES == 0)
-     {
-         NV_KMEM_CACHE_CREATE(nvidia_p2p_page_t_cache, "nvidia_p2p_page_t",
--                             nvidia_p2p_page_t);
-+                             nvidia_p2p_page_t, 0);
-         if (nvidia_p2p_page_t_cache == NULL)
-         {
-             rc = -ENOMEM;
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-337.12-pax-constify.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-337.12-pax-constify.patch
deleted file mode 100644
index 0ec9edf99cc8..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-337.12-pax-constify.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/kernel/uvm/nvidia_uvm_common.c
-+++ b/kernel/uvm/nvidia_uvm_common.c
-@@ -95,7 +95,6 @@ static RM_STATUS uvmnext_gpu_event_stop_
- #endif // NVIDIA_UVM_NEXT_ENABLED
- 
- static dev_t g_uvmBaseDev;
--struct UvmOpsUvmEvents g_exportedUvmOps;
- 
- // TODO: This would be easier if RM allowed for multiple registrations, since we
- //       could register UVM-Lite and UVM-Next separately (bug 1372835).
-@@ -147,9 +146,11 @@ static RM_STATUS uvmSetupGpuProvider(voi
-     RM_STATUS status = RM_OK;
- 
- #ifdef NVIDIA_UVM_RM_ENABLED
--    g_exportedUvmOps.startDevice = uvm_gpu_event_start_device;
--    g_exportedUvmOps.stopDevice  = uvm_gpu_event_stop_device;
--    g_exportedUvmOps.isrTopHalf  = uvmnext_isr_top_half;
-+    static struct UvmOpsUvmEvents g_exportedUvmOps = {
-+        .startDevice = uvm_gpu_event_start_device,
-+        .stopDevice  = uvm_gpu_event_stop_device,
-+        .isrTopHalf  = uvmnext_isr_top_half,
-+    };
- 
-     // call RM to exchange the function pointers.
-     status = nvUvmInterfaceRegisterUvmCallbacks(&g_exportedUvmOps);
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-375.20-pax.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-375.20-pax.patch
deleted file mode 100644
index 9dd245a1f16a..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-375.20-pax.patch
+++ /dev/null
@@ -1,406 +0,0 @@
-diff -urp work.orig/kernel/common/inc/nv-linux.h work/kernel/common/inc/nv-linux.h
---- work.orig/kernel/common/inc/nv-linux.h	2016-11-27 21:56:50.391617167 +0100
-+++ work/kernel/common/inc/nv-linux.h	2016-11-27 22:04:14.045516163 +0100
-@@ -1310,7 +1310,8 @@ extern void *nvidia_stack_t_cache;
- #if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
- #define NV_KMEM_CACHE_CREATE_FULL(name, size, align, flags, ctor) \
-     kmem_cache_create(name, size, align, flags, ctor)
--
-+#define NV_KMEM_CACHE_CREATE_FULL_USERCOPY(name, size, align, flags, useroffset, usersize, ctor) \
-+    kmem_cache_create_usercopy(name, size, align, flags, useroffset, usersize, ctor)
- #else
- #define NV_KMEM_CACHE_CREATE_FULL(name, size, align, flags, ctor) \
-     kmem_cache_create(name, size, align, flags, ctor, NULL)
-@@ -1319,6 +1320,14 @@ extern void *nvidia_stack_t_cache;
- #define NV_KMEM_CACHE_CREATE(name, type)    \
-     NV_KMEM_CACHE_CREATE_FULL(name, sizeof(type), 0, 0, NULL)
- 
-+#ifdef SLAB_USERCOPY
-+#define NV_KMEM_CACHE_CREATE_USERCOPY(name, type)    \
-+    NV_KMEM_CACHE_CREATE_FULL(name, sizeof(type), 0, SLAB_USERCOPY, NULL)
-+#else
-+#define NV_KMEM_CACHE_CREATE_USERCOPY(name, type)    \
-+    NV_KMEM_CACHE_CREATE_FULL_USERCOPY(name, sizeof(type), 0, 0, 0, sizeof(type), NULL)
-+#endif
-+
- #define NV_KMEM_CACHE_DESTROY(kmem_cache)   \
-     kmem_cache_destroy(kmem_cache)
- 
-diff -urp work.orig/kernel/common/inc/nv-modeset-interface.h work/kernel/common/inc/nv-modeset-interface.h
---- work.orig/kernel/common/inc/nv-modeset-interface.h	2016-11-27 21:56:50.391617167 +0100
-+++ work/kernel/common/inc/nv-modeset-interface.h	2016-11-27 21:54:23.971706350 +0100
-@@ -72,7 +72,7 @@ typedef struct {
-      * mix nvidia and nvidia-modeset kernel modules from different
-      * releases.
-      */
--    const char *version_string;
-+//    const char *version_string;
- 
-     /*
-      * Return system information.
-@@ -117,6 +117,6 @@ typedef struct {
- 
- } nvidia_modeset_rm_ops_t;
- 
--NV_STATUS nvidia_get_rm_ops(nvidia_modeset_rm_ops_t *rm_ops);
-+NV_STATUS nvidia_get_rm_ops(const nvidia_modeset_rm_ops_t **rm_ops, const char **version_string);
- 
- #endif /* _NV_MODESET_INTERFACE_H_ */
-diff -urp work.orig/kernel/common/inc/nv-register-module.h work/kernel/common/inc/nv-register-module.h
---- work.orig/kernel/common/inc/nv-register-module.h	2016-11-27 21:56:50.391617167 +0100
-+++ work/kernel/common/inc/nv-register-module.h	2016-11-27 21:54:23.971706350 +0100
-@@ -34,7 +34,7 @@ typedef struct nvidia_module_s {
-     int (*ioctl)(struct inode *, struct file * file, unsigned int cmd, unsigned long arg);
-     unsigned int (*poll)(struct file * file, poll_table *wait);
- 
--} nvidia_module_t;
-+} __do_const nvidia_module_t;
- 
- int nvidia_register_module(nvidia_module_t *);
- int nvidia_unregister_module(nvidia_module_t *);
-diff -urp work.orig/kernel/nvidia/nv.c work/kernel/nvidia/nv.c
---- work.orig/kernel/nvidia/nv.c	2016-11-27 21:56:50.395629748 +0100
-+++ work/kernel/nvidia/nv.c	2016-11-27 21:54:23.971706350 +0100
-@@ -666,7 +666,7 @@ int __init nvidia_init_module(void)
-     NV_SPIN_LOCK_INIT(&km_lock);
- #endif
- 
--    nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE(nvidia_stack_cache_name,
-+    nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE_USERCOPY(nvidia_stack_cache_name,
-                                                 nvidia_stack_t);
-     if (nvidia_stack_t_cache == NULL)
-     {
-diff -urp work.orig/kernel/nvidia/nv-chrdev.c work/kernel/nvidia/nv-chrdev.c
---- work.orig/kernel/nvidia/nv-chrdev.c	2016-11-27 21:56:50.395629748 +0100
-+++ work/kernel/nvidia/nv-chrdev.c	2016-11-27 21:54:23.971706350 +0100
-@@ -20,8 +20,6 @@ int nv_register_chrdev(void *param)
- {
-     nvidia_module_t *module = (nvidia_module_t *)param;
- 
--    module->instance = nv_module_instance;
--
-     return (nvidia_register_module(module));
- }
- 
-diff -urp work.orig/kernel/nvidia/nv-instance.c work/kernel/nvidia/nv-instance.c
---- work.orig/kernel/nvidia/nv-instance.c	2016-11-27 21:56:50.395629748 +0100
-+++ work/kernel/nvidia/nv-instance.c	2016-11-27 21:54:23.971706350 +0100
-@@ -51,6 +51,7 @@ struct pci_driver nv_pci_driver = {
- nvidia_module_t nv_fops = {
-     .owner       = THIS_MODULE,
-     .module_name = MODULE_NAME,
-+    .instance    = MODULE_INSTANCE_NUMBER,
-     .open        = nvidia_open,
-     .close       = nvidia_close,
-     .ioctl       = nvidia_ioctl,
-diff -urp work.orig/kernel/nvidia/nv-mmap.c work/kernel/nvidia/nv-mmap.c
---- work.orig/kernel/nvidia/nv-mmap.c	2016-11-27 21:56:50.395629748 +0100
-+++ work/kernel/nvidia/nv-mmap.c	2016-11-27 21:54:23.971706350 +0100
-@@ -102,12 +102,12 @@ nvidia_vma_release(struct vm_area_struct
- }
- 
- #if defined(NV_VM_OPERATIONS_STRUCT_HAS_ACCESS)
--static int
-+static ssize_t
- nvidia_vma_access(
-     struct vm_area_struct *vma,
-     unsigned long addr,
-     void *buffer,
--    int length,
-+    size_t length,
-     int write
- )
- {
-diff -urp work.orig/kernel/nvidia/nv-modeset-interface.c work/kernel/nvidia/nv-modeset-interface.c
---- work.orig/kernel/nvidia/nv-modeset-interface.c	2016-11-27 21:56:50.395629748 +0100
-+++ work/kernel/nvidia/nv-modeset-interface.c	2016-11-27 21:54:23.971706350 +0100
-@@ -100,10 +100,9 @@ static NvU32 nvidia_modeset_enumerate_gp
-     return count;
- }
- 
--NV_STATUS nvidia_get_rm_ops(nvidia_modeset_rm_ops_t *rm_ops)
-+NV_STATUS nvidia_get_rm_ops(const nvidia_modeset_rm_ops_t **rm_ops, const char **version_string)
- {
--    const nvidia_modeset_rm_ops_t local_rm_ops = {
--        .version_string = NV_VERSION_STRING,
-+    static const nvidia_modeset_rm_ops_t local_rm_ops = {
-         .system_info    = {
-             .allow_write_combining = NV_FALSE,
-         },
-@@ -116,17 +115,26 @@ NV_STATUS nvidia_get_rm_ops(nvidia_modes
-         .set_callbacks  = nvidia_modeset_set_callbacks,
-     };
- 
--    if (strcmp(rm_ops->version_string, NV_VERSION_STRING) != 0)
-+    static const nvidia_modeset_rm_ops_t local_rm_ops_wc = {
-+        .system_info    = {
-+            .allow_write_combining = NV_TRUE,
-+        },
-+        .alloc_stack    = nvidia_modeset_rm_ops_alloc_stack,
-+        .free_stack     = nvidia_modeset_rm_ops_free_stack,
-+        .enumerate_gpus = nvidia_modeset_enumerate_gpus,
-+        .open_gpu       = nvidia_dev_get,
-+        .close_gpu      = nvidia_dev_put,
-+        .op             = rm_kernel_rmapi_op, /* provided by nv-kernel.o */
-+        .set_callbacks  = nvidia_modeset_set_callbacks,
-+    };
-+
-+    if (strcmp(*version_string, NV_VERSION_STRING) != 0)
-     {
--        rm_ops->version_string = NV_VERSION_STRING;
-+        *version_string = NV_VERSION_STRING;
-         return NV_ERR_GENERIC;
-     }
- 
--    *rm_ops = local_rm_ops;
--
--    if (NV_ALLOW_WRITE_COMBINING(NV_MEMORY_TYPE_FRAMEBUFFER)) {
--        rm_ops->system_info.allow_write_combining = NV_TRUE;
--    }
-+    *rm_ops = NV_ALLOW_WRITE_COMBINING(NV_MEMORY_TYPE_FRAMEBUFFER) ? &local_rm_ops_wc : &local_rm_ops;
- 
-     return NV_OK;
- }
-diff -urp work.orig/kernel/nvidia-drm/nvidia-drm-drv.c work/kernel/nvidia-drm/nvidia-drm-drv.c
---- work.orig/kernel/nvidia-drm/nvidia-drm-drv.c	2016-11-27 21:56:50.395629748 +0100
-+++ work/kernel/nvidia-drm/nvidia-drm-drv.c	2016-11-27 21:54:23.971706350 +0100
-@@ -594,7 +594,7 @@ static const struct drm_ioctl_desc nv_dr
-                       DRM_CONTROL_ALLOW|DRM_RENDER_ALLOW|DRM_UNLOCKED),
- };
- 
--static struct drm_driver nv_drm_driver = {
-+static drm_driver_no_const nv_drm_driver __read_only = {
- 
-     .driver_features        = DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER,
- 
-@@ -654,6 +654,7 @@ static void nvidia_update_drm_driver_fea
-         return;
-     }
- 
-+    pax_open_kernel();
-     nv_drm_driver.driver_features |= DRIVER_MODESET | DRIVER_ATOMIC;
- 
-     nv_drm_driver.master_set       = nvidia_drm_master_set;
-@@ -664,6 +665,7 @@ static void nvidia_update_drm_driver_fea
-     nv_drm_driver.dumb_destroy     = drm_gem_dumb_destroy;
- 
-     nv_drm_driver.gem_vm_ops       = &nv_drm_gem_vma_ops;
-+    pax_close_kernel();
- #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
- }
- 
-diff -urp work.orig/kernel/nvidia-modeset/nvidia-modeset-linux.c work/kernel/nvidia-modeset/nvidia-modeset-linux.c
---- work.orig/kernel/nvidia-modeset/nvidia-modeset-linux.c	2016-11-27 21:56:50.395629748 +0100
-+++ work/kernel/nvidia-modeset/nvidia-modeset-linux.c	2016-11-27 21:54:23.971706350 +0100
-@@ -335,29 +335,28 @@ static void nvkms_resume(NvU32 gpuId)
-  * Interface with resman.
-  *************************************************************************/
- 
--static nvidia_modeset_rm_ops_t __rm_ops = { 0 };
-+static const nvidia_modeset_rm_ops_t *__rm_ops;
- static nvidia_modeset_callbacks_t nvkms_rm_callbacks = {
--    nvkms_suspend,
--    nvkms_resume
-+    .suspend = nvkms_suspend,
-+    .resume = nvkms_resume
- };
- 
- static int nvkms_alloc_rm(void)
- {
-     NV_STATUS nvstatus;
-     int ret;
-+    const char *version_string = NV_VERSION_STRING;
- 
--    __rm_ops.version_string = NV_VERSION_STRING;
--
--    nvstatus = nvidia_get_rm_ops(&__rm_ops);
-+    nvstatus = nvidia_get_rm_ops(&__rm_ops, &version_string);
- 
-     if (nvstatus != NV_OK) {
-         printk(KERN_ERR NVKMS_LOG_PREFIX "Version mismatch: "
-                "nvidia.ko(%s) nvidia-modeset.ko(%s)\n",
--               __rm_ops.version_string, NV_VERSION_STRING);
-+               version_string, NV_VERSION_STRING);
-         return -EINVAL;
-     }
- 
--    ret = __rm_ops.set_callbacks(&nvkms_rm_callbacks);
-+    ret = __rm_ops->set_callbacks(&nvkms_rm_callbacks);
-     if (ret < 0) {
-         printk(KERN_ERR NVKMS_LOG_PREFIX "Failed to register callbacks\n");
-         return ret;
-@@ -368,20 +367,20 @@ static int nvkms_alloc_rm(void)
- 
- static void nvkms_free_rm(void)
- {
--    __rm_ops.set_callbacks(NULL);
-+    __rm_ops->set_callbacks(NULL);
- }
- 
- void NVKMS_API_CALL nvkms_call_rm(void *ops)
- {
-     nvidia_modeset_stack_ptr stack = NULL;
- 
--    if (__rm_ops.alloc_stack(&stack) != 0) {
-+    if (__rm_ops->alloc_stack(&stack) != 0) {
-         return;
-     }
- 
--    __rm_ops.op(stack, ops);
-+    __rm_ops->op(stack, ops);
- 
--    __rm_ops.free_stack(stack);
-+    __rm_ops->free_stack(stack);
- }
- 
- /*************************************************************************
-@@ -705,13 +704,13 @@ NvBool NVKMS_API_CALL nvkms_open_gpu(NvU
-     nvidia_modeset_stack_ptr stack = NULL;
-     NvBool ret;
- 
--    if (__rm_ops.alloc_stack(&stack) != 0) {
-+    if (__rm_ops->alloc_stack(&stack) != 0) {
-         return NV_FALSE;
-     }
- 
--    ret = __rm_ops.open_gpu(gpuId, stack) == 0;
-+    ret = __rm_ops->open_gpu(gpuId, stack) == 0;
- 
--    __rm_ops.free_stack(stack);
-+    __rm_ops->free_stack(stack);
- 
-     return ret;
- }
-@@ -720,23 +719,23 @@ void NVKMS_API_CALL nvkms_close_gpu(NvU3
- {
-     nvidia_modeset_stack_ptr stack = NULL;
- 
--    if (__rm_ops.alloc_stack(&stack) != 0) {
-+    if (__rm_ops->alloc_stack(&stack) != 0) {
-         return;
-     }
- 
--    __rm_ops.close_gpu(gpuId, stack);
-+    __rm_ops->close_gpu(gpuId, stack);
- 
--    __rm_ops.free_stack(stack);
-+    __rm_ops->free_stack(stack);
- }
- 
- NvU32 NVKMS_API_CALL nvkms_enumerate_gpus(nv_gpu_info_t *gpu_info)
- {
--    return __rm_ops.enumerate_gpus(gpu_info);
-+    return __rm_ops->enumerate_gpus(gpu_info);
- }
- 
- NvBool NVKMS_API_CALL nvkms_allow_write_combining(void)
- {
--    return __rm_ops.system_info.allow_write_combining;
-+    return __rm_ops->system_info.allow_write_combining;
- }
- 
- /*************************************************************************
-diff -urp work.orig/kernel/nvidia-uvm/uvm8_global.c work/kernel/nvidia-uvm/uvm8_global.c
---- work.orig/kernel/nvidia-uvm/uvm8_global.c	2016-11-27 21:56:50.399642330 +0100
-+++ work/kernel/nvidia-uvm/uvm8_global.c	2016-11-27 21:54:23.975709978 +0100
-@@ -35,17 +35,17 @@
- #include "nv_uvm_interface.h"
- 
- uvm_global_t g_uvm_global;
--static struct UvmOpsUvmEvents g_exported_uvm8_ops;
-+static struct UvmOpsUvmEvents g_exported_uvm8_ops = {
-+    .startDevice = NULL,
-+    .stopDevice  = NULL,
-+    .isrTopHalf  = uvm8_isr_top_half,
-+};
- static bool g_ops_registered = false;
- 
- static NV_STATUS uvm8_register_callbacks(void)
- {
-     NV_STATUS status = NV_OK;
- 
--    g_exported_uvm8_ops.startDevice = NULL;
--    g_exported_uvm8_ops.stopDevice  = NULL;
--    g_exported_uvm8_ops.isrTopHalf  = uvm8_isr_top_half;
--
-     // Register the UVM callbacks with the main GPU driver:
-     status = uvm_rm_locked_call(nvUvmInterfaceRegisterUvmCallbacks(&g_exported_uvm8_ops));
-     if (status != NV_OK)
-diff -urp work.orig/kernel/nvidia-uvm/uvm8_gpu_semaphore.c work/kernel/nvidia-uvm/uvm8_gpu_semaphore.c
---- work.orig/kernel/nvidia-uvm/uvm8_gpu_semaphore.c	2016-11-27 21:56:50.399642330 +0100
-+++ work/kernel/nvidia-uvm/uvm8_gpu_semaphore.c	2016-11-27 21:54:23.975709978 +0100
-@@ -368,7 +368,7 @@ void uvm_gpu_semaphore_set_payload(uvm_g
-     // being optimized out on non-SMP configs (we need them for interacting with
-     // the GPU correctly even on non-SMP).
-     mb();
--    ACCESS_ONCE(*semaphore->payload) = payload;
-+    ACCESS_ONCE_RW(*semaphore->payload) = payload;
- }
- 
- // This function is intended to catch channels which have been left dangling in
-diff -urp work.orig/kernel/nvidia-uvm/uvm8_hal.h work/kernel/nvidia-uvm/uvm8_hal.h
---- work.orig/kernel/nvidia-uvm/uvm8_hal.h	2016-11-27 21:56:50.399642330 +0100
-+++ work/kernel/nvidia-uvm/uvm8_hal.h	2016-11-27 21:54:23.975709978 +0100
-@@ -316,7 +316,7 @@ typedef struct
-         // fault_buffer_ops: id is a hardware class
-         uvm_fault_buffer_hal_t fault_buffer_ops;
-     } u;
--} uvm_hal_class_ops_t;
-+} __do_const uvm_hal_class_ops_t;
- 
- // When UVM next support is enabled support for future chips in the hal is
- // enabled by providing additional hal table entries below.
-diff -urp work.orig/kernel/nvidia-uvm/uvm8_mmu.h work/kernel/nvidia-uvm/uvm8_mmu.h
---- work.orig/kernel/nvidia-uvm/uvm8_mmu.h	2016-11-27 21:56:50.399642330 +0100
-+++ work/kernel/nvidia-uvm/uvm8_mmu.h	2016-11-27 21:54:23.975709978 +0100
-@@ -24,7 +24,6 @@
- #ifndef __UVM8_MMU_H__
- #define __UVM8_MMU_H__
- 
--#include "uvm8_forward_decl.h"
- #include "uvm8_hal_types.h"
- #include "uvm8_pmm_gpu.h"
- #include "uvmtypes.h"
-diff -urp work.orig/kernel/nvidia-uvm/uvm_common.c work/kernel/nvidia-uvm/uvm_common.c
---- work.orig/kernel/nvidia-uvm/uvm_common.c	2016-11-27 21:56:50.399642330 +0100
-+++ work/kernel/nvidia-uvm/uvm_common.c	2016-11-27 21:54:23.975709978 +0100
-@@ -42,7 +42,6 @@
- #define UVM_SPIN_LOOP_PRINT_TIMEOUT_SEC     30ULL
- 
- static dev_t g_uvmBaseDev;
--struct UvmOpsUvmEvents g_exportedUvmOps;
- 
- static char* uvm_driver_mode = "8";
- 
-diff -urp work.orig/kernel/nvidia-uvm/uvm_full_fault_buffer.h work/kernel/nvidia-uvm/uvm_full_fault_buffer.h
---- work.orig/kernel/nvidia-uvm/uvm_full_fault_buffer.h	2016-11-27 21:56:50.399642330 +0100
-+++ work/kernel/nvidia-uvm/uvm_full_fault_buffer.h	2016-11-27 21:54:23.975709978 +0100
-@@ -31,6 +31,7 @@
- #define _UVM_FULL_FAULT_BUFFER_H_
- 
- #include "uvmtypes.h"
-+#include "linux/compiler.h"
- 
- #define MAXWELL_FAULT_BUFFER_A (0xb069)
- #define MEM_RD32(a) (*(const volatile NvU32 *)(a)) 
-@@ -303,7 +304,7 @@ typedef struct
-     NvUvmControlPrefetch_t              controlPrefetch;
-     NvUvmTestFaultBufferOverflow_t      testFaultBufferOverflow;
-     NvUvmClearFaultBufferOverflow_t     clearFaultBufferOverflow;
--} UvmFaultBufferOps;
-+} __no_const UvmFaultBufferOps;
- 
- /******************************************************************************
-     uvmfull_fault_buffer_init
-diff -urp work.orig/kernel/nvidia-uvm/uvm_linux.h work/kernel/nvidia-uvm/uvm_linux.h
---- work.orig/kernel/nvidia-uvm/uvm_linux.h	2016-11-27 21:56:50.399642330 +0100
-+++ work/kernel/nvidia-uvm/uvm_linux.h	2016-11-27 21:54:23.975709978 +0100
-@@ -420,7 +420,7 @@ static inline NvU64 NV_GETTIME(void)
- 
- // WRITE_ONCE/READ_ONCE have incompatible definitions across versions, which produces warnings.
- // Therefore, we define our own macros
--#define UVM_WRITE_ONCE(x, val) (ACCESS_ONCE(x) = (val))
-+#define UVM_WRITE_ONCE(x, val) (ACCESS_ONCE_RW(x) = (val))
- #define UVM_READ_ONCE(x) ACCESS_ONCE(x)
- 
- // Added in 3.11
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-375.82-profiles-rc.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-375.82-profiles-rc.patch
deleted file mode 100644
index 552f0d6df0ed..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-375.82-profiles-rc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/nvidia-application-profiles-375.82-rc
-+++ b/nvidia-application-profiles-375.82-rc
-@@ -48,7 +48,7 @@
-         {
-           "name" : "NoEnforceShaderInputOutputMatching",
-           "settings" : [ "GLShaderPortabilityWarnings", false ]
--        },
-+        }
-     ],
-     "rules" : [
-         {
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-const.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-const.patch
deleted file mode 100644
index f3b82593570e..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-const.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Binary files kernel.orig/.nv-procfs.c.swp and kernel/.nv-procfs.c.swp differ
-diff -urp kernel.orig/nv-procfs.c kernel/nv-procfs.c
---- kernel.orig/nv-procfs.c	2011-07-13 03:29:30.000000000 +0200
-+++ kernel/nv-procfs.c	2011-07-19 15:45:27.982993911 +0200
-@@ -707,8 +707,10 @@ int nv_register_procfs(void)
-      * However, in preparation for this, we need to preserve
-      * the procfs read() and write() operations.
-      */
--    nv_procfs_registry_fops.read = entry->proc_fops->read;
--    nv_procfs_registry_fops.write = entry->proc_fops->write;
-+    pax_open_kernel();
-+    *(void **)&nv_procfs_registry_fops.read = entry->proc_fops->read;
-+    *(void **)&nv_procfs_registry_fops.write = entry->proc_fops->write;
-+    pax_close_kernel();
- 
-     entry = NV_CREATE_PROC_FILE("registry", proc_nvidia,
-         nv_procfs_read_registry,
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-usercopy.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-usercopy.patch
deleted file mode 100644
index ce8c201b8e05..000000000000
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-pax-usercopy.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -urp kernel.orig/nv.c kernel/nv.c
---- kernel.orig/nv.c	2011-09-24 02:32:09.000000000 +0200
-+++ kernel/nv.c	2011-10-05 19:13:41.474242252 +0200
-@@ -1105,7 +1105,7 @@ static int __init nvidia_init_module(voi
-     NV_SPIN_LOCK_INIT(&km_lock);
- #endif
- 
--    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, "nv_stack_t", nv_stack_t);
-+    NV_KMEM_CACHE_CREATE(nv_stack_t_cache, "nv_stack_t", nv_stack_t, SLAB_USERCOPY);
-     if (nv_stack_t_cache == NULL)
-     {
-         nv_printf(NV_DBG_ERRORS, "NVRM: stack cache allocation failed!\n");
-@@ -1220,7 +1220,7 @@ static int __init nvidia_init_module(voi
-     }
- #endif
- 
--    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, "nv_pte_t", nv_pte_t);
-+    NV_KMEM_CACHE_CREATE(nv_pte_t_cache, "nv_pte_t", nv_pte_t, 0);
-     if (nv_pte_t_cache == NULL)
-     {
-         rc = -ENOMEM;
-@@ -1229,7 +1229,7 @@ static int __init nvidia_init_module(voi
-     }
- 
-     NV_KMEM_CACHE_CREATE(nvidia_p2p_page_t_cache, "nvidia_p2p_page_t",
--            nvidia_p2p_page_t);
-+            nvidia_p2p_page_t, 0);
-     if (nvidia_p2p_page_t_cache == NULL)
-     {
-         rc = -ENOMEM;
-diff -urp kernel.orig/nv-linux.h kernel/nv-linux.h
---- kernel.orig/nv-linux.h	2011-09-24 02:32:09.000000000 +0200
-+++ kernel/nv-linux.h	2011-10-05 19:14:42.522238996 +0200
-@@ -695,16 +695,16 @@ extern nv_spinlock_t km_lock;
- 
- #if defined(NV_KMEM_CACHE_CREATE_PRESENT)
- #if (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 6)
--#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
-+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags)     \
-     {                                                           \
-         kmem_cache = kmem_cache_create(name, sizeof(type),      \
--                        0, 0, NULL, NULL);                      \
-+                        0, flags, NULL, NULL);                  \
-     }
- #elif (NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT == 5)
--#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type)            \
-+#define NV_KMEM_CACHE_CREATE(kmem_cache, name, type, flags)     \
-     {                                                           \
-         kmem_cache = kmem_cache_create(name, sizeof(type),      \
--                        0, 0, NULL);                            \
-+                        0, flags, NULL);                        \
-     }
- #else
- #error "NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT value unrecognized!"
diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
index 9949b7e95257..dea17321a16e 100644
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ b/x11-drivers/nvidia-drivers/metadata.xml
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>hardened@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		Nvidia provides different branches of its drivers for different batches of its
-		hardware. When maintaining these ebuilds or other ebuilds depending on them,
-		you will need to keep in mind that the major versions represent these different
-		branches.
-	</longdescription>
-	<use>
-		<flag name="compat">Install non-GLVND libGL for backwards compatibility</flag>
-		<flag name="driver">Install the kernel driver module</flag>
-		<flag name="X">Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries</flag>
-		<flag name="gtk3">Install nvidia-settings with support for GTK+ 3</flag>
-		<flag name="kms">Enable support for kernel mode setting (KMS)</flag>
-		<flag name="pax_kernel">PaX patches from the PaX project</flag>
-		<flag name="tools">Install additional tools such as nvidia-settings</flag>
-		<flag name="uvm">Install the Unified Memory kernel module (nvidia-uvm) for sharing memory between CPU and GPU in CUDA programs</flag>
-	</use>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+</maintainer>
+<longdescription>
+Nvidia provides different branches of its drivers for different batches of its
+hardware. When maintaining these ebuilds or other ebuilds depending on them,
+you will need to keep in mind that the major versions represent these different
+branches.
+
+You can use http://www.nvidia.com/Download/Find.aspx to figure out which branch
+best matches your hardware.
+</longdescription>
+<use>
+<flag name="compat">Install non-GLVND libGL for backwards compatibility</flag>
+<flag name="driver">Install the kernel driver module</flag>
+<flag name="X">Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries</flag>
+<flag name="gtk3">Install nvidia-settings with support for GTK+ 3</flag>
+<flag name="kms">Enable support for kernel mode setting (KMS)</flag>
+<flag name="tools">Install additional tools such as nvidia-settings</flag>
+<flag name="uvm">Install the Unified Memory kernel module (nvidia-uvm) for sharing memory between CPU and GPU in CUDA programs</flag>
+</use>
 </pkgmetadata>
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.137.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-304.137.ebuild
deleted file mode 100644
index 97647bdcaa39..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.137.ebuild
+++ /dev/null
@@ -1,499 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 versionator udev
-
-NV_URI="https://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${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 )
-	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-r1"
-SLOT="0/${PV%.*}"
-KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel static-libs +tools +X"
-RESTRICT="bindist mirror"
-EMULTILIB_PKG="true"
-
-COMMON="
-	app-eselect/eselect-opencl
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	tools? (
-		dev-libs/atk
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf[X]
-		x11-libs/gtk+:2
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXv
-		x11-libs/pango[X]
-		x11-libs/pangox-compat
-	)
-	X? (
-		>=app-eselect/eselect-opengl-1.0.9
-	)
-"
-DEPEND="${COMMON}
-	kernel_linux? (
-		virtual/linux-sources
-		virtual/pkgconfig
-	)"
-RDEPEND="${COMMON}
-	acpi? ( sys-power/acpid )
-	tools? ( !media-video/nvidia-settings )
-	X? (
-		<x11-base/xorg-server-1.19.99:=
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		x11-libs/libXvMC[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1[${MULTILIB_USEDEP}] )"
-
-REQUIRED_USE="
-	tools? ( X )
-	static-libs? ( tools )
-"
-
-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 13; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.13"
-		ewarn "<sys-kernel/vanilla-sources-4.13"
-		ewarn ""
-		ewarn "You are free to utilize eapply_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="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-	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 kernel_linux; then
-		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${S}/kernel)"
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-		# 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
-
-	# 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() {
-	# Please add a brief description for every added patch
-
-	if use kernel_linux; then
-		if kernel_is lt 2 6 9 ; then
-			eerror "You must build this against 2.6.9 or higher kernels."
-		fi
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-
-	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}-pax-const.patch
-		eapply "${FILESDIR}"/${PN}-pax-usercopy.patch
-	fi
-
-	cat <<- EOF > "${S}"/nvidia.icd
-		/usr/$(get_libdir)/libnvidia-opencl.so
-	EOF
-
-	local man_file
-	for man_file in "${NV_MAN}"/*1.gz; do
-		gunzip $man_file || die
-	done
-
-	# Allow user patches so they can support RC kernels and whatever else
-	eapply_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use kernel_linux; then
-		linux-mod_src_compile src="${KERNEL_DIR}" KERNELRELEASE="${KV_FULL}"
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl clean
-		emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
-			AR="$(tc-getAR)" \
-			CC="$(tc-getCC)" \
-			RANLIB="$(tc-getRANLIB)" \
-			libXNVCtrl.a
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			AR="$(tc-getAR)" \
-			CC="$(tc-getCC)" \
-			LD="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NVML_ENABLED=0 \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			RANLIB="$(tc-getRANLIB)" \
-			STRIP_CMD=true
-	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 its not /usr/lib
-donvidia() {
-	# Full path to library minus SOVER
-	MY_LIB="$1"
-
-	# SOVER to use
-	MY_SOVER="$2"
-
-	# Where to install
-	MY_DEST="$3"
-
-	if [[ -z "${MY_DEST}" ]]; then
-		MY_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	else
-		exeinto ${MY_DEST}
-		action="doexe"
-	fi
-
-	# Get just the library name
-	libname=$(basename $1)
-
-	# Install the library with the correct SOVER
-	${action} ${MY_LIB}.${MY_SOVER} || \
-		die "failed to install ${libname}"
-
-	# If SOVER wasn't 1, then we need to create a .1 symlink
-	if [[ "${MY_SOVER}" != "1" ]]; then
-		dosym ${libname}.${MY_SOVER} \
-			${MY_DEST}/${libname}.1 || \
-			die "failed to create ${libname} symlink"
-	fi
-
-	# Always create the symlink from the raw lib to the .1
-	dosym ${libname}.1 \
-		${MY_DEST}/${libname} || \
-		die "failed to create ${libname} symlink"
-}
-
-src_install() {
-	if 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
-
-		# 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}
-
-	if use kernel_linux; then
-		# NVIDIA video decode <-> CUDA
-		donvidia "${NV_OBJ}"/libnvcuvid.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
-
-		# XvMC driver
-		dolib.a "${NV_X11}"/libXvMCNVIDIA.a || \
-			die "failed to install libXvMCNVIDIA.so"
-		donvidia "${NV_X11}"/libXvMCNVIDIA.so ${NV_SOVER}
-		dosym libXvMCNVIDIA.so.${NV_SOVER} \
-			/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
-			die "failed to create libXvMCNVIDIA_dynamic.so symlink"
-	fi
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins nvidia.icd
-		donvidia "${NV_OBJ}"/libnvidia-opencl.so ${NV_SOVER}
-	fi
-
-	# Documentation
-	dodoc -r "${NV_DOC}"/html
-	if use kernel_FreeBSD; then
-		dodoc "${NV_DOC}"/README
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-	else
-		# Docs
-		newdoc "${NV_DOC}"/README.txt README
-		dodoc "${NV_DOC}"/NVIDIA_Changelog
-		doman "${NV_MAN}"/nvidia-smi.1
-		use X && doman "${NV_MAN}"/nvidia-xconfig.1
-		use tools && doman "${NV_MAN}"/nvidia-settings.1
-		doman "${NV_MAN}"/nvidia-cuda-proxy-control.1
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-
-	if use X; then
-		doexe "${NV_OBJ}"/nvidia-xconfig
-	fi
-
-	if use kernel_linux ; then
-		doexe "${NV_OBJ}"/nvidia-debugdump
-		doexe "${NV_OBJ}"/nvidia-cuda-proxy-control
-		doexe "${NV_OBJ}"/nvidia-cuda-proxy-server
-		doexe "${NV_OBJ}"/nvidia-smi
-		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-	fi
-
-	dobin "${NV_OBJ}"/nvidia-bug-report.sh
-
-	# Desktop entries for nvidia-settings
-	if use tools ; then
-		emake -C "${S}"/nvidia-settings-${PV}/src/ \
-			DESTDIR="${D}" \
-			LIBDIR="${D}/usr/$(get_libdir)" \
-			PREFIX=/usr \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			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
-
-		# 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
-
-	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
-	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
-		# The GLX libraries
-		donvidia "${nv_libdir}"/libGL.so ${NV_SOVER} ${GL_ROOT}
-		donvidia "${nv_libdir}"/libnvidia-glcore.so ${NV_SOVER}
-		if use kernel_FreeBSD; then
-			donvidia "${nv_libdir}"/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
-		else
-			donvidia "${nv_libdir}"/tls/libnvidia-tls.so ${NV_SOVER} ${GL_ROOT}
-		fi
-
-		# VDPAU
-		donvidia "${nv_libdir}"/libvdpau_nvidia.so ${NV_SOVER}
-	fi
-
-	# NVIDIA monitoring library
-	if use kernel_linux ; then
-		donvidia "${nv_libdir}"/libnvidia-ml.so ${NV_SOVER}
-	fi
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia "${nv_libdir}"/libcuda.so ${NV_SOVER}
-		donvidia "${nv_libdir}"/libnvidia-compiler.so ${NV_SOVER}
-		donvidia "${nv_libdir}"/libOpenCL.so 1.0.0 ${CL_ROOT}
-	fi
-}
-
-pkg_preinst() {
-	if 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 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, XvMC, 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 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-340.107.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.107.ebuild
index 928ed785b265..115f7dad12b8 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.107.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.107.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ 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"
+HOMEPAGE="http://www.nvidia.com/"
 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 )
@@ -26,7 +26,7 @@ SRC_URI="
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/${PV%.*}"
 KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel static-libs +tools +X"
+IUSE="acpi multilib kernel_FreeBSD kernel_linux static-libs +tools +X"
 RESTRICT="bindist mirror"
 EMULTILIB_PKG="true"
 
@@ -172,14 +172,6 @@ src_prepare() {
 #		convert_to_m "${NV_SRC}"/Makefile.kbuild
 	fi
 
-	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}-331.13-pax-usercopy.patch
-		eapply "${FILESDIR}"/${PN}-337.12-pax-constify.patch
-	fi
-
 	local man_file
 	for man_file in "${NV_MAN}"/*1.gz; do
 		gunzip $man_file || die
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-375.82.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-375.82.ebuild
deleted file mode 100644
index beb76b9a7719..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-375.82.ebuild
+++ /dev/null
@@ -1,569 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="https://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 )
-"
-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 14; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.14"
-		ewarn "<sys-kernel/vanilla-sources-4.14"
-		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="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-	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() {
-	eapply "${FILESDIR}"/${P}-profiles-rc.patch
-
-	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
-
-	# Allow user patches so they can support RC kernels and whatever else
-	eapply_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use driver && use kernel_linux; then
-		MAKEOPTS=-j1 linux-mod_src_compile
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			AR="$(tc-getAR)" \
-			CC="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NV_VERBOSE=1 \
-			RANLIB="$(tc-getRANLIB)" \
-			DO_STRIP= \
-			build-xnvctrl
-
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			CC="$(tc-getCC)" \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LD="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NVML_ENABLED=0 \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			DO_STRIP=
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
-	# Full path to library
-	nv_LIB="${1}"
-
-	# SOVER to use
-	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
-
-	# Where to install
-	nv_DEST="${2}"
-
-	# Get just the library name
-	nv_LIBNAME=$(basename "${nv_LIB}")
-
-	if [[ "${nv_DEST}" ]]; then
-		exeinto ${nv_DEST}
-		action="doexe"
-	else
-		nv_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	fi
-
-	# Install the library
-	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
-
-	# If the library has a SONAME and SONAME does not match the library name,
-	# then we need to create a symlink
-	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
-		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
-			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
-	fi
-
-	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
-		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
-}
-
-src_install() {
-	if use driver && use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia "${NV_OBJ}"/libnvidia-cfg.so.${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia "${NV_OBJ}"/libnvidia-fbc.so.${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia "${NV_OBJ}"/libnvcuvid.so.${NV_SOVER}
-		donvidia "${NV_OBJ}"/libnvidia-encode.so.${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins "${NV_X11}"/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia "${NV_X11}"/libglx.so.${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-
-		insinto /usr/share/glvnd/egl_vendor.d
-		doins "${NV_X11}"/10_nvidia.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) ${GL_ROOT}"
-			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGL.so.$(usex compat ${NV_SOVER} 1.0.0) ${GL_ROOT}"
-			"libGLESv1_CM.so.1 ${GL_ROOT}"
-			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2.so.2 ${GL_ROOT}"
-			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLX.so.0 ${GL_ROOT}"
-			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLdispatch.so.0 ${GL_ROOT}"
-			"libOpenCL.so.1.0.0 ${CL_ROOT}"
-			"libOpenGL.so.0 ${GL_ROOT}"
-			"libcuda.so.${NV_SOVER}"
-			"libnvcuvid.so.${NV_SOVER}"
-			"libnvidia-compiler.so.${NV_SOVER}"
-			"libnvidia-eglcore.so.${NV_SOVER}"
-			"libnvidia-encode.so.${NV_SOVER}"
-			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
-			"libnvidia-fbc.so.${NV_SOVER}"
-			"libnvidia-glcore.so.${NV_SOVER}"
-			"libnvidia-glsi.so.${NV_SOVER}"
-			"libnvidia-ifr.so.${NV_SOVER}"
-			"libnvidia-opencl.so.${NV_SOVER}"
-			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-			"libvdpau_nvidia.so.${NV_SOVER}"
-		)
-
-		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-wfb.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_FreeBSD; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		if use kernel_linux; then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-ml.so.${NV_SOVER}"
-				"tls/libnvidia-tls.so.${NV_SOVER}"
-			)
-		fi
-
-		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
-			donvidia "${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-378.13-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-378.13-r1.ebuild
deleted file mode 100644
index 66cd8db51273..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-378.13-r1.ebuild
+++ /dev/null
@@ -1,572 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="https://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 )
-"
-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 10; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.10"
-		ewarn "<sys-kernel/vanilla-sources-4.10"
-		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="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-	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
-
-	# Allow user patches so they can support RC kernels and whatever else
-	eapply_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use driver && use kernel_linux; then
-		MAKEOPTS=-j1 linux-mod_src_compile
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			AR="$(tc-getAR)" \
-			CC="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NV_VERBOSE=1 \
-			RANLIB="$(tc-getRANLIB)" \
-			DO_STRIP= \
-			build-xnvctrl
-
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			CC="$(tc-getCC)" \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LD="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NVML_ENABLED=0 \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			DO_STRIP=
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
-	# Full path to library
-	nv_LIB="${1}"
-
-	# SOVER to use
-	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
-
-	# Where to install
-	nv_DEST="${2}"
-
-	# Get just the library name
-	nv_LIBNAME=$(basename "${nv_LIB}")
-
-	if [[ "${nv_DEST}" ]]; then
-		exeinto ${nv_DEST}
-		action="doexe"
-	else
-		nv_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	fi
-
-	# Install the library
-	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
-
-	# If the library has a SONAME and SONAME does not match the library name,
-	# then we need to create a symlink
-	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
-		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
-			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
-	fi
-
-	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
-		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
-}
-
-src_install() {
-	if use driver && use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-
-		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) ${GL_ROOT}"
-			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGL.so.$(usex compat ${NV_SOVER} 1.0.0) ${GL_ROOT}"
-			"libGLESv1_CM.so.1 ${GL_ROOT}"
-			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2.so.2 ${GL_ROOT}"
-			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLX.so.0 ${GL_ROOT}"
-			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLdispatch.so.0 ${GL_ROOT}"
-			"libOpenCL.so.1.0.0 ${CL_ROOT}"
-			"libOpenGL.so.0 ${GL_ROOT}"
-			"libcuda.so.${NV_SOVER}"
-			"libnvcuvid.so.${NV_SOVER}"
-			"libnvidia-compiler.so.${NV_SOVER}"
-			"libnvidia-eglcore.so.${NV_SOVER}"
-			"libnvidia-encode.so.${NV_SOVER}"
-			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
-			"libnvidia-fbc.so.${NV_SOVER}"
-			"libnvidia-glcore.so.${NV_SOVER}"
-			"libnvidia-glsi.so.${NV_SOVER}"
-			"libnvidia-ifr.so.${NV_SOVER}"
-			"libnvidia-opencl.so.${NV_SOVER}"
-			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-			"libvdpau_nvidia.so.${NV_SOVER}"
-		)
-
-		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.0.1"
-			)
-		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-381.22-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-381.22-r1.ebuild
deleted file mode 100644
index 2d4d3a73dcd6..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-381.22-r1.ebuild
+++ /dev/null
@@ -1,573 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="https://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? (
-		${NV_URI}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 12; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.12"
-		ewarn "<sys-kernel/vanilla-sources-4.12"
-		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="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-	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
-
-	# Allow user patches so they can support RC kernels and whatever else
-	eapply_user
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use kernel_FreeBSD; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	elif use driver && use kernel_linux; then
-		MAKEOPTS=-j1 linux-mod_src_compile
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			AR="$(tc-getAR)" \
-			CC="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NV_VERBOSE=1 \
-			RANLIB="$(tc-getRANLIB)" \
-			DO_STRIP= \
-			build-xnvctrl
-
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			CC="$(tc-getCC)" \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LD="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NVML_ENABLED=0 \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			DO_STRIP=
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
-	# Full path to library
-	nv_LIB="${1}"
-
-	# SOVER to use
-	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
-
-	# Where to install
-	nv_DEST="${2}"
-
-	# Get just the library name
-	nv_LIBNAME=$(basename "${nv_LIB}")
-
-	if [[ "${nv_DEST}" ]]; then
-		exeinto ${nv_DEST}
-		action="doexe"
-	else
-		nv_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	fi
-
-	# Install the library
-	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
-
-	# If the library has a SONAME and SONAME does not match the library name,
-	# then we need to create a symlink
-	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
-		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
-			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
-	fi
-
-	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
-		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
-}
-
-src_install() {
-	if use driver && use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-
-		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) ${GL_ROOT}"
-			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGL.so.$(usex compat ${NV_SOVER} 1.0.0) ${GL_ROOT}"
-			"libGLESv1_CM.so.1 ${GL_ROOT}"
-			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2.so.2 ${GL_ROOT}"
-			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLX.so.0 ${GL_ROOT}"
-			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLdispatch.so.0 ${GL_ROOT}"
-			"libOpenCL.so.1.0.0 ${CL_ROOT}"
-			"libOpenGL.so.0 ${GL_ROOT}"
-			"libcuda.so.${NV_SOVER}"
-			"libnvcuvid.so.${NV_SOVER}"
-			"libnvidia-compiler.so.${NV_SOVER}"
-			"libnvidia-eglcore.so.${NV_SOVER}"
-			"libnvidia-encode.so.${NV_SOVER}"
-			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
-			"libnvidia-fbc.so.${NV_SOVER}"
-			"libnvidia-glcore.so.${NV_SOVER}"
-			"libnvidia-glsi.so.${NV_SOVER}"
-			"libnvidia-ifr.so.${NV_SOVER}"
-			"libnvidia-opencl.so.${NV_SOVER}"
-			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-			"libvdpau_nvidia.so.${NV_SOVER}"
-		)
-
-		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.1.0.1"
-			)
-		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-384.130.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-384.130.ebuild
deleted file mode 100644
index 398ef28e2d08..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-384.130.ebuild
+++ /dev/null
@@ -1,581 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="https://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-32bit-ARM/${PV}/${ARM_NV_PACKAGE}.run )
-	x86-fbsd? (
-		https://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz
-	)
-	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-	tools? (
-		${NV_URI}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="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-	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
-
-	# Allow user patches so they can support RC kernels and whatever else
-	eapply_user
-
-	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
-		linux-mod_src_compile src="${KERNEL_DIR}" KERNELRELEASE="${KV_FULL}"
-	fi
-
-	if use tools; then
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			AR="$(tc-getAR)" \
-			CC="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NV_VERBOSE=1 \
-			RANLIB="$(tc-getRANLIB)" \
-			DO_STRIP= \
-			build-xnvctrl
-
-		emake -C "${S}"/nvidia-settings-${PV}/src \
-			CC="$(tc-getCC)" \
-			GTK3_AVAILABLE=$(usex gtk3 1 0) \
-			LD="$(tc-getCC)" \
-			LIBDIR="$(get_libdir)" \
-			NVML_ENABLED=0 \
-			NV_USE_BUNDLED_LIBJANSSON=0 \
-			NV_VERBOSE=1 \
-			DO_STRIP=
-	fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
-	# Full path to library
-	nv_LIB="${1}"
-
-	# SOVER to use
-	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
-
-	# Where to install
-	nv_DEST="${2}"
-
-	# Get just the library name
-	nv_LIBNAME=$(basename "${nv_LIB}")
-
-	if [[ "${nv_DEST}" ]]; then
-		exeinto ${nv_DEST}
-		action="doexe"
-	else
-		nv_DEST="/usr/$(get_libdir)"
-		action="dolib.so"
-	fi
-
-	# Install the library
-	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
-
-	# If the library has a SONAME and SONAME does not match the library name,
-	# then we need to create a symlink
-	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
-		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
-			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
-	fi
-
-	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
-		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
-}
-
-src_install() {
-	if use driver && use kernel_linux; then
-		linux-mod_src_install
-
-		# Add the aliases
-		# This file is tweaked with the appropriate video group in
-		# pkg_preinst, see bug #491414
-		insinto /etc/modprobe.d
-		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-		doins "${FILESDIR}"/nvidia-rmmod.conf
-
-		# Ensures that our device nodes are created when not using X
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
-		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	elif use kernel_FreeBSD; then
-		if use x86-fbsd; then
-			insinto /boot/modules
-			doins "${S}/src/nvidia.kld"
-		fi
-
-		exeinto /boot/modules
-		doexe "${S}/src/nvidia.ko"
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
-
-	# NVIDIA framebuffer capture library
-	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
-
-	# NVIDIA video encode/decode <-> CUDA
-	if use kernel_linux; then
-		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
-		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
-	fi
-
-	if use X; then
-		# Xorg DDX driver
-		insinto /usr/$(get_libdir)/xorg/modules/drivers
-		doins ${NV_X11}/nvidia_drv.so
-
-		# Xorg GLX driver
-		donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
-			/usr/$(get_libdir)/opengl/nvidia/extensions
-
-		# Xorg nvidia.conf
-		if has_version '>=x11-base/xorg-server-1.16'; then
-			insinto /usr/share/X11/xorg.conf.d
-			newins {,50-}nvidia-drm-outputclass.conf
-		fi
-
-		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.$(usex compat ${NV_SOVER} 1.2.0) ${GL_ROOT}"
-			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2.so.$(usex compat ${NV_SOVER} 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.1"
-			)
-		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-387.34.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-387.34.ebuild
deleted file mode 100644
index 0673bc7bb2a7..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-387.34.ebuild
+++ /dev/null
@@ -1,586 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="https://us.download.nvidia.com/XFree86/"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
-SRC_URI="
-	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
-	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	arm? ( https://download.nvidia.com/XFree86/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 15; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.15"
-		ewarn "<sys-kernel/vanilla-sources-4.15"
-		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="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-	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
-		linux-mod_src_compile src="${KERNEL_DIR}" KERNELRELEASE="${KV_FULL}"
-	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) ${GL_ROOT}"
-			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGL.so.$(usex compat ${NV_SOVER} 1.0.0) ${GL_ROOT}"
-			"libGLESv1_CM.so.1 ${GL_ROOT}"
-			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLESv2.so.2 ${GL_ROOT}"
-			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLX.so.0 ${GL_ROOT}"
-			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-			"libGLdispatch.so.0 ${GL_ROOT}"
-			"libOpenCL.so.1.0.0 ${CL_ROOT}"
-			"libOpenGL.so.0 ${GL_ROOT}"
-			"libcuda.so.${NV_SOVER}"
-			"libnvcuvid.so.${NV_SOVER}"
-			"libnvidia-compiler.so.${NV_SOVER}"
-			"libnvidia-eglcore.so.${NV_SOVER}"
-			"libnvidia-encode.so.${NV_SOVER}"
-			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
-			"libnvidia-fbc.so.${NV_SOVER}"
-			"libnvidia-glcore.so.${NV_SOVER}"
-			"libnvidia-glsi.so.${NV_SOVER}"
-			"libnvidia-ifr.so.${NV_SOVER}"
-			"libnvidia-opencl.so.${NV_SOVER}"
-			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-			"libvdpau_nvidia.so.${NV_SOVER}"
-		)
-
-		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
-		then
-			NV_GLX_LIBRARIES+=(
-				"libnvidia-egl-wayland.so.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.87.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.87.ebuild
index 90b232bbe062..a7f8f326d161 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.87.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.87.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ 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"
+HOMEPAGE="http://www.nvidia.com/"
 
 AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
@@ -32,7 +32,7 @@ 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"
+IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X"
 REQUIRED_USE="
 	tools? ( X )
 	static-libs? ( tools )
@@ -177,13 +177,6 @@ pkg_setup() {
 }
 
 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
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-396.54.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-396.54.ebuild
deleted file mode 100644
index 7a038cf22fee..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-396.54.ebuild
+++ /dev/null
@@ -1,581 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="https://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 19; then
-		ewarn "Gentoo supports kernels which are supported by NVIDIA"
-		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.19"
-		ewarn "<sys-kernel/vanilla-sources-4.19"
-		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="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-
-	# 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
-		linux-mod_src_compile src="${KERNEL_DIR}" KERNELRELEASE="${KV_FULL}"
-	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-410.93.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-410.93.ebuild
index b496478afc95..d19a89c0ca97 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-410.93.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-410.93.ebuild
@@ -6,7 +6,7 @@ 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"
+HOMEPAGE="http://www.nvidia.com/"
 
 AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
@@ -27,7 +27,7 @@ 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"
+IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X"
 REQUIRED_USE="
 	tools? ( X )
 	static-libs? ( tools )
@@ -170,13 +170,6 @@ pkg_setup() {
 }
 
 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
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild
index b4dd340c748b..60fea3075d37 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-415.25.ebuild
@@ -6,7 +6,7 @@ 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"
+HOMEPAGE="http://www.nvidia.com/"
 
 AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
@@ -27,7 +27,7 @@ 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"
+IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X"
 REQUIRED_USE="
 	tools? ( X )
 	static-libs? ( tools )
@@ -170,13 +170,6 @@ pkg_setup() {
 }
 
 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
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-415.27.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-415.27.ebuild
index 93bdc175c38d..ca38002944b9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-415.27.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-415.27.ebuild
@@ -6,7 +6,7 @@ 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"
+HOMEPAGE="http://www.nvidia.com/"
 
 AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
@@ -27,7 +27,7 @@ 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"
+IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib static-libs +tools uvm wayland +X"
 REQUIRED_USE="
 	tools? ( X )
 	static-libs? ( tools )
@@ -170,13 +170,6 @@ pkg_setup() {
 }
 
 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
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 43b1aeaf0c09..cb3091a888f9 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest
index eae4b5bde670..c01ca7eee7c9 100644
--- a/xfce-extra/xfce4-sensors-plugin/Manifest
+++ b/xfce-extra/xfce4-sensors-plugin/Manifest
@@ -1,7 +1,9 @@
 DIST xfce4-sensors-plugin-1.2.98.tar.bz2 477241 BLAKE2B dcb757e7014a159fbba77a24248a0663207aa0031a624d60c899483b608f729e31dafdd2de4e5d6a64122a2abbaa21eaa857afdbfa266203b0639ced7f299d4a SHA512 6437acc17d2719e3deef011c206c8c5593f4b14a8263e82bb3b0e8b1cb7e17e842adf2cb3a479e1a8e2729db744df2778ee04bc9af5e4c918f417e1c8ac4d17e
 DIST xfce4-sensors-plugin-1.3.0.tar.bz2 466468 BLAKE2B 52eadaec22980105fcf4c4e5efb4621b0966e86520e7ded90a1514f7925d76232278ec105785409dbe13f5ab4019363b47b63b5df642319a924fe5a8882b847c SHA512 77f6df354c883f9f0b99856738e0976e7bddd5f16c90a8715777c4f4d6debe116cdc21c2e0efbbe9f371d36f9469797d3e631854c33f8561e3ff32291cdef35a
 DIST xfce4-sensors-plugin-1.3.90.tar.bz2 474322 BLAKE2B 3d3e4c08ea1e6c973b3dc274a64826e4cd1ff75ab9eda91a822eaf1caad7786364d2c5f35b36d3b5772d0f99e7c13349f69c23f98312cecdda1d73eb87b33839 SHA512 692bcaad876323627a882f5e6e535f547e8eff59676a0586c86496abe410d395fd4f049febcd9c8bd774eed9713d5e12e3f13d5eda91c888eb165fc7bcf8c294
+DIST xfce4-sensors-plugin-1.3.92.tar.bz2 477837 BLAKE2B e5399a3052b124c5391209c6ca6bc849467e09be3dac6b7a7d1c946f800e22dcfe84d245b6236cb56cdcea756c98d9bb70c1c945b597f13e49ff18455f4f4715 SHA512 a5b7d90683c993205323084431606cc6d13de88989e3636fba5c06bfa7ef52fbe6285e3bd7f8eb70683541b5c42727c8fbe7bf80e8832bcfb378de0e6d7d7b37
 EBUILD xfce4-sensors-plugin-1.2.98.ebuild 1412 BLAKE2B 97e2eb9a00ce3b34606e023f917bc89f23fff70609327be9c9948f6990bf3c484a1cab8443f6b1399998c469e431530aae1210c00a84aa4a3549e8c8a59942c4 SHA512 b0e07260882350536c16d155c7918f54e060f2f815af62c18ef2c6ec45dc725157c5dd94f52a5d0fb595a9a691e794a72f1a28c56cdc9b93c6581b89b633f35a
 EBUILD xfce4-sensors-plugin-1.3.0.ebuild 1523 BLAKE2B 05c809b077c321791d055d9916bb5130038a13f5f8ffa74537017114007bde76391ccd7f31745d498e7bb5529d6006eda3f3fcafc79839cf9fe546941a5b7d8c SHA512 a2ed8743ef0d44deb17aecc9e4a6dff35ea04b11866b86d67908c2c6a9a82e617ab365bbc31a1b9aae12cfc7b814fbfd3700974fb01aa54e39379a55c1606ea2
 EBUILD xfce4-sensors-plugin-1.3.90.ebuild 1526 BLAKE2B af233f6b7653dc989b0b91710442f3ea9ca5417b58265b4606de663e5456b10889cf45fb174c34d43d64f07004de542e773f978d244635db4ce0eadc691cd147 SHA512 5b860e0f2a3f23faa0ef7d08e1952dec7d360c3e2f00f911e3da9e3300656d9e1d4b03d4949dbdbf1b982c9cd629e365bd79fcb30cab7c65f8a39ec8215a4440
+EBUILD xfce4-sensors-plugin-1.3.92.ebuild 1526 BLAKE2B 36eec69409a79f60cdeb7f09ffe4ba6b03624f7bc972ada798aeb0d42a55db4f1ec578cad5be8c0b839847e47bace796c2865331fb8de6a0cb9aa39405b51f89 SHA512 ab0d50c331c53609d3454087c18f8659fc212313c785b2ccdc04563417303a3c79495579665032e561b7d842ea503365e42bb53f1018c88b64897138bbd739e5
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92.ebuild
new file mode 100644
index 000000000000..5339ab77ed2a
--- /dev/null
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="A panel plug-in for acpi, lm_sensors and hddtemp sensors"
+HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
+SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+acpi hddtemp libnotify lm_sensors video_cards_nvidia"
+
+REQUIRED_USE="|| ( hddtemp lm_sensors acpi )"
+
+RDEPEND=">=x11-libs/gtk+-3.20:3=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/xfce4-panel-4.12:=
+	hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NOTES README TODO )
+
+src_configure() {
+	local myconf=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
+		$(use_enable lm_sensors libsensors)
+		$(use_enable hddtemp)
+		$(use_enable hddtemp netcat)
+		$(use_enable acpi procacpi)
+		$(use_enable acpi sysfsacpi)
+		$(use_enable video_cards_nvidia xnvctrl)
+		$(use_enable libnotify notification)
+		--disable-pathchecks
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}