gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-libs
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
652 files changed, 4001 insertions, 5302 deletions
diff --git a/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild b/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild
index 1339f84e150c..9920bcb5065a 100644
--- a/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild
+++ b/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild
@@ -37,10 +37,10 @@ src_configure() {
 		--with-fhs \
 		--with-openldap \
 		--disable-rpath \
-		--disable-tests ||die "econf failed"
+		--disable-tests
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake failed"
+	emake DESTDIR="${D}" install
 	dodoc README  NEWS
 }
diff --git a/dev-libs/389-adminutil/Manifest b/dev-libs/389-adminutil/Manifest
index 8cf0632a028f..506a2f92b47f 100644
--- a/dev-libs/389-adminutil/Manifest
+++ b/dev-libs/389-adminutil/Manifest
@@ -1,3 +1,3 @@
 DIST 389-adminutil-1.1.15.tar.bz2 283825 BLAKE2B 170797066b25303c6c582c95a935cf1d47b09b28a0c530588322fca2547416eeb5dba48561ccd06b7862dd5066e15abd1dcfeb168a9331e9a7f081bb5a14ae2e SHA512 5ed8d758ee47a2e276bab73696067dd2acd36f15ea5b93b32e3e244530920d74d95a4a4ff96cd325f22ae4ce2cc764fef03c90497c0181cbc1f0291f260d8ddf
-EBUILD 389-adminutil-1.1.15.ebuild 891 BLAKE2B e60060ee4068872d5a9d323a1f896e8bfd6f562d7d6ebb61d15f09a48aa7db433c2f26cbe54b4ee6faf4f9be808179c498b421c6151665002a4c0c8fde4edaad SHA512 4fd0518990f3d3c8cafe2505e05323c048f883008322abc8a47de84fda828b242cd99f2c6fc91ef43f0bd47c5b960f771fec1ce073c9a4d5dcac5c94cffefd90
+EBUILD 389-adminutil-1.1.15.ebuild 848 BLAKE2B 29411b696588dfd063e7dcb1a36e625d5210750b54f2f81bc36777096bcf544190bbe05c9c281e35f4c3f84c520966e24f8431021b2de31c1543cb567ac78e40 SHA512 4f53deab2a2070d6a3125cba0601a1f4a9635f8d37adec60c07963d0c3622c088cacd0088292bf8b343d61c1a1a57fbe5bbbda7c974cbe1266488c98ff3568cd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index fa0d90849fa1..6723bad7230d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/OpenSRF/Manifest b/dev-libs/OpenSRF/Manifest
index 140ebaf42810..989cdc68a90f 100644
--- a/dev-libs/OpenSRF/Manifest
+++ b/dev-libs/OpenSRF/Manifest
@@ -1,4 +1,4 @@
 AUX OpenSRF-2.1.1-buildfix.patch 3436 BLAKE2B 9aff428ea42562bddbbc59f063d2902e55ee1c5f14fbb0a49b801840d8fc8ac02f703e8d4f95139bd90a54c689e1cd4fa9d5a4b23e9e56b8f16dbf4c6ad622db SHA512 5db2d704a3d539c1c57ee3b5d4e0965f60c23134c68746ab84655d698388e10b7d611dff0e25db4c633fce462816c4d76afae9d74acdee5a95baeb99528e2b5b
 DIST opensrf-2.1.1.tar.gz 1058060 BLAKE2B 83c702727d21bea4683530857cd67037bde9eab94b91a801f64ebe70f5ad3b4994eea956cb9aaf531fbc663d4e9cb3242740f1941604a69aceaab8e396ae0e0e SHA512 5294ae2c9410ae52964067cd9090f9b7b5424e96f1731868cd896c1928ef1e89729af4a83f804f491bf2da0c6d129149105309afa18531b184098ebff2820306
-EBUILD OpenSRF-2.1.1.ebuild 3650 BLAKE2B 1b4fce57366084438d4e5b9bd296a1fb26845deb22ffd3df580d5d39aa4484b04d6db7240465c691c6abb6facde8e4fb7949911ed0ac3e3bcb82fa5e6115cd44 SHA512 20a963a4ab4ebb19fb86920bff737967a73d4af15e82b5b2a22d5f1852f5b43bffec3bf823535d32cf2a49f2e6acfc226a207fa402fc91dc450b0350eeab80a6
+EBUILD OpenSRF-2.1.1.ebuild 3573 BLAKE2B 151d209296f20f8a52836677ffbcfced0f9670d7d27fabddb4b18c97261912ff993fcc02e15f31474d573068ceead2b6146479f145dc8eadbd335889d2a0e0f1 SHA512 4d2091743b631f21108ddf154ab84edefb9a7fbdffbe1e5a5eaa6c21cf7400a88c2d8874301644e18d0e0b58284c883868a5e698c7d1238371826e57168504b7
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild b/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild
index 7080fd53a102..ed235d5aab1e 100644
--- a/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild
+++ b/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild
@@ -73,15 +73,15 @@ src_prepare() {
 #		-e "/^export APR_HEADERS=/s,/.*,${APR_HEADERS}," \
 #		-e "/^export LIBXML2_HEADERS=/s,/.*,${LIBXML2_HEADERS}," \
 #		install.conf
-#	emake verbose || die "Failed to build"
+#	emake verbose
 #}
 src_configure() {
 	APXS2_INSTALL="-i" \
 	econf \
 		--with-apxs=/usr/sbin/apxs2 \
 		--sysconfdir=/etc/opensrf \
-		--localstatedir=/var \
-		|| die "econf failed"
+		--localstatedir=/var
+
 	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_configure || die "perl-module_src_configure failed"
 }
 
@@ -92,7 +92,7 @@ src_compile() {
 
 src_install() {
 	einfo "Doing src_install"
-	#emake install-verbose DESTDIR="${D}" || die "Failed to install"
+	#emake install-verbose DESTDIR="${D}"
 	emake install DESTDIR="${D}" APXS2_INSTALL="-i"
 	apache-module_src_install || die "apache-module_src_install failed"
 	cd "${PERL_S}" && S="${PERL_S}" perl-module_src_install || die "perl-module_src_install failed"
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index d12216b264f9..182c4a10dfba 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,5 +1,5 @@
 DIST AppStream-0.12.7.tar.xz 1958948 BLAKE2B 51a70395e4801ceeb3e97ac081f4c45be242cca14728f8efc5eec0d4b3cfa4cc9fab9ef7429c18e9bbb0dedb693a847258be1b11491155658a6ffa2a28358e35 SHA512 53ca7ebde3fcd345a895527da2ac5d829a09f25d28836a867b500282fba3465bde657cd75a4030cb831022f7a0d9f50aadb36078d62924e4d0edad6bfe3c5561
 DIST AppStream-0.12.9.tar.xz 2023312 BLAKE2B aa5de7936909be54401e4df80363c9b59ad60dc29b3d02ef1ed8203dd480dfb4222816cde5ea6e469039448684142afc028275e619665f15cef99af6745d80e8 SHA512 af3d5e7885ee09fb6ef9ea0a5c2386141736166ce42912e618f1ee04f2b28866b27c7c5e326221574eb78933b32de8db9f76023bf54e528aded1607e5130992e
-EBUILD appstream-0.12.7.ebuild 1592 BLAKE2B 005c91236cae8d6abdc3bcc8d88fb35b51f8fada8ba4d34b5bc669765da015789019f1a04c5bbc1ac5184a8fdc3954b565a9bf17bc11ef5c26f2cb810d7296ee SHA512 a6c840fee66ab6eb0273810497de22e3812c5d309dc863938f1308735c0202f296a3ed36626806f92084422f4bfb7033f604259c8bf431c4c2405a7cacdd02ad
-EBUILD appstream-0.12.9.ebuild 1624 BLAKE2B 601740e5e85b497741afdf50dea87406aaf3ace959e0e3e5926ec9c73211ea756a48f2cfee0455aaa3a4fc7e045486d3c5525ea7ce21e9716b4866177223dbb2 SHA512 0baa93cc9c0605400add5633e9f413d77e0e0e31fb6029df538e6ae4bd39788e5de610b1acdc56f6c4d3624c83aec26dc62d1facc8e840495b8f9c9e1509251c
+EBUILD appstream-0.12.7.ebuild 1619 BLAKE2B 0355409cb6ed3d49aba5deee05dddb87dd000b45427a472a1ca39a9c887567ef7f26cbf777eb9b9a6ec50e90b5544c1c607636ec22f8227ac5f087e7b2d0bcec SHA512 90a0ab33c5cf51b48c4297da10e26765b18a55bf5d2b18c051d6119ef10bc94d6470cb708d3105af39349ec63de90c1f03883544dcecad6853bce85f09b9b4fb
+EBUILD appstream-0.12.9.ebuild 1651 BLAKE2B 094685c556ba8196ff701c0a76ea25ad870cc3edd8543f6b9cadd5616af3f4c607895fe1ea74654a7d72acc6aea8c194aaf18c8ae34f402069cd036f36923e95 SHA512 7917b204126a71e1c1ab4cebf4b191bcab86786fb2689e8ef6ed767910daa776201eaf1710998959e8fe7f4c0c0020fc7192caa407fe56c0386c23a3f46173a6
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.12.7.ebuild b/dev-libs/appstream/appstream-0.12.7.ebuild
index fbc659372b2b..592863c75581 100644
--- a/dev-libs/appstream/appstream-0.12.7.ebuild
+++ b/dev-libs/appstream/appstream-0.12.7.ebuild
@@ -22,6 +22,7 @@ LICENSE="LGPL-2.1+ GPL-2+"
 # check as_api_level
 SLOT="0/4"
 IUSE="apt +introspection qt5 test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	app-text/docbook-xml-dtd:4.5
diff --git a/dev-libs/appstream/appstream-0.12.9.ebuild b/dev-libs/appstream/appstream-0.12.9.ebuild
index 82e775582a5f..90432b992ef2 100644
--- a/dev-libs/appstream/appstream-0.12.9.ebuild
+++ b/dev-libs/appstream/appstream-0.12.9.ebuild
@@ -21,6 +21,7 @@ LICENSE="LGPL-2.1+ GPL-2+"
 # check as_api_level
 SLOT="0/4"
 IUSE="apt doc +introspection qt5 test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-libs/appstream-glib
diff --git a/dev-libs/atcore/Manifest b/dev-libs/atcore/Manifest
index 503eaadc89fc..4d91d83713e3 100644
--- a/dev-libs/atcore/Manifest
+++ b/dev-libs/atcore/Manifest
@@ -1,3 +1,3 @@
 DIST atcore-1.0.0.tar.xz 169116 BLAKE2B 8aaafe18edfbb0dcbe08b99c9cfba2d2390a9e9aaf5ed8ebbc61b6320c37ac4e893a7c64e5c56a131e32ec112fa0d9e253749e634661834de3d03e2cced97dea SHA512 8be63850d939aa9b89651252e91cd3295d52d2d0603f88b846783cca25fc0e29dd3569bfef97aeaf6c115a3bc3328fb127e126b20aaf67faf1c319ac8be7b88b
-EBUILD atcore-1.0.0.ebuild 967 BLAKE2B c3e1de9ce3a362a4babadd70a6a09a7819f430d5c207eef9af1f07b7b79bc3b94ea6852ec0752c671ad1609844788a90c7825c1f301cdfa80b32095023c88b0b SHA512 c5917436969de1dd1d22766521edef344ca31cfc79c903fbbe152667202b26999421610bbeb52fe5b29dc647721b8599ea695656cd1576f2e224dd344c263faf
+EBUILD atcore-1.0.0.ebuild 994 BLAKE2B 8f988a72f795cc0f2b235e3cb76b4ffb775d8c41c0110a45e1b1737bed91ed5f24da2bd0027b22516617e0ffe1a6e03210d4caebce135831403cb7777ac76bf1 SHA512 4502b90c165193ebff91f5590f5d8867b4234dfd502bc78d84d5e8c072bb81db2ce6d97426bdfc3405399ad55844f7490ced8cd44a77d655179b0b7cb07c7ff6
 MISC metadata.xml 305 BLAKE2B 75067008e2b19ae5f79db1eaac07e5e01b9f0139d8e18c1b31edc0298bc2ce688f8115c6ae0a8d5a9a1d496338a57837fcfc60c2e97e75e370c1e195715bcdec SHA512 f266cc30e4f6a4cbc4e61c44a83450b714dc88a9873de30957d0ba34b5b923757676f581e49251f6ea06841d85095e9695b4938ba9174cd0dad937dbcef16e19
diff --git a/dev-libs/atcore/atcore-1.0.0.ebuild b/dev-libs/atcore/atcore-1.0.0.ebuild
index 97a8acd4d301..ea5b5987fee2 100644
--- a/dev-libs/atcore/atcore-1.0.0.ebuild
+++ b/dev-libs/atcore/atcore-1.0.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="|| ( LGPL-2.1+ LGPL-3 ) gui? ( GPL-3+ )"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc gui test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	$(add_qt_dep linguist-tools)
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 30c10b95729c..e2107ae69315 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -3,8 +3,8 @@ DIST atk-2.28.1.tar.xz 712508 BLAKE2B 71aee8bc937e1e37d40e6a9820d0002bcc763dbf87
 DIST atk-2.30.0.tar.xz 290264 BLAKE2B dec44abf3bd4937f417cd0b75bee32fdd073ccca1e44d883293d060afbbc30909aac483007e293231fafe0c5481df94d1113d287a0002a823f4e9c8e7bd647c2 SHA512 03f311378fdb91442f27ed542fa36edd2c9c036837c9f25ff37468bf7f743277d0b9253621563d15894e0da9d37e8df0a0e2c0e47e6aae33a38b13744c3b8b8e
 DIST atk-2.32.0.tar.xz 292088 BLAKE2B 15f093db60cc54d1a5a18dc78cb9d64fa73e18dadb724fe5143956199f4ff1aa4ea9daf0796b14f228a1d91f1d44e88749c67fe5a6a84bd001916d78be4680f9 SHA512 8cd2a3ee006f21835f3e564f2e1de4ae61bd9529b4c0b4f2e3ece88e905e2dd36b67affb089f41582806a1397576602a526a4b8698303708894f20af97ecac22
 DIST atk-2.34.1.tar.xz 293140 BLAKE2B 8ae280583867460734ca001eb01963eefcc519eb09658e2e793cd1a07831e8e5ade20a4d38bb5925a1103da206d9d6283a2b1892c671f12090b3eefac04b34e1 SHA512 a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e
-EBUILD atk-2.28.1.ebuild 1419 BLAKE2B b54bfca44773cc5d28023f6a80b13d3c65947d08f76cd4cd3fcd61bcc87b1916989bbeccb188499b5a9dfa0448cc30bf24110f29c6dc9157918489324fc708e7 SHA512 e36d9b19836b966cdb4d547dcce195f8169ac3b3e132c8871a553be7ce1b0719a5ddd9604dbddd64f92928462429fecd208900a066d07b2ce95b2165abf99af0
+EBUILD atk-2.28.1.ebuild 1446 BLAKE2B 3e9c9e8b1b047c59cc66bc9646e20a82a41f3b2ba6b58bff75de5ea9c5341e17640bf814f49c951db080e4c3fbb3e26e8580b1b047eaaf27a9208a2211b1c97f SHA512 4bacb9f02f8d7d067dd2bef3788b80cf0b36f0a0fd48eace9549efa082fd01f2ede7054f8b9d2b4fac04c83b4d001c70f30a641ea355dea52e0a660c7a8634eb
 EBUILD atk-2.30.0.ebuild 1227 BLAKE2B 0a21234fffdf74308704e199dd20ae4c4b6229c29d0265ce2734d0ece6b5fcfb9298ce65e6496b53f0a757863856e73dcc7d7a8287ab33b9371c65b0cb064c8c SHA512 7a23da2f804ef760dd5fc941f77f745c259203cb7e58c6cc218300a52c901e75c1efbd427245e7ec484ad8eaa57802d8855a0005c48e25a086b6d52e34863aa6
-EBUILD atk-2.32.0.ebuild 1175 BLAKE2B 8e6da9c1bf673c7e4e8c81e0b6181d60054e63b2cc3c61b76e77e05edb0fab820a03ef2c1bf7905ffba6b39e9ca81f174e8fe1e99413b1de78b3e86db2d852e5 SHA512 e6d4be88b1cba082260d4a95e597403369d7c8b063fbac3cc68ed5c8aa85da1b2aeb9a7cf8060110b71f0301d386ce4595728861ea051f3f548126e17b1c4e02
+EBUILD atk-2.32.0.ebuild 1167 BLAKE2B 77292c0b375f95f1985a7ccc4426a6c1f3615b7a482fb2dfa749e66cb3ea775374c3b2a66753b555814781fa88e2b90be81c40c4c311c9ae3fff2b8db134abca SHA512 efbe20f0687c83825aa8ca24b1c57712626898f1deae925ea466d89fb1a81731957d1be818e00dbf0193601c4610e38589f5728db6f4c778a46061ef15d560c7
 EBUILD atk-2.34.1.ebuild 1175 BLAKE2B 212f9032adf2df7804cde272f7d512a8668907b0086d0dae909c6c1026abc10099100536548dca08ac029b2395a64714ed08bb6c046aa38e5b0a3f0e23fcf019 SHA512 ed002c44722328bb6a36883177dd24d0c47acc568173c16884ecb9ff5e6ee7883d81d8701aaaefe667d359354abc0928decfcada3b2d268de68249bb2d5f9ae7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.28.1.ebuild b/dev-libs/atk/atk-2.28.1.ebuild
index 7d62480588c4..6df4ce591ae7 100644
--- a/dev-libs/atk/atk-2.28.1.ebuild
+++ b/dev-libs/atk/atk-2.28.1.ebuild
@@ -11,6 +11,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+introspection nls test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/dev-libs/atk/atk-2.32.0.ebuild b/dev-libs/atk/atk-2.32.0.ebuild
index 1f0c98bf665c..8b62f7db6a39 100644
--- a/dev-libs/atk/atk-2.32.0.ebuild
+++ b/dev-libs/atk/atk-2.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/aws-c-common/Manifest b/dev-libs/aws-c-common/Manifest
index 839038c1143f..44cdcc205de4 100644
--- a/dev-libs/aws-c-common/Manifest
+++ b/dev-libs/aws-c-common/Manifest
@@ -1,3 +1,3 @@
 DIST aws-c-common-0.4.11.tar.gz 306933 BLAKE2B 5a2370a3696e4d90b67bc03fbf88f152e1a2d6e4d4a9ff2a9423a2cf18c14a1e3b6d978250c3359f4ebb2cf5e524e416b11604dc09dc45f5c8a5a6f982b344a7 SHA512 1e00f6aa025578978551fc8ca1bc09b448f79ac28bdc969af4312569ffca035d656dc68825da15ad8f4f890bbdb03327c624147dded1ce402e9dab1726290890
-EBUILD aws-c-common-0.4.11.ebuild 484 BLAKE2B 6271c0a5a78d9f1eb6e21a943cea54f747e0fe5dd375f5fdaf6835ec79cfa7f18d7297a0c6dc4fe56cc0b10f6860b619aba4d103a417732ec4c925ec51a71e3e SHA512 083eccf3e46638317d0b2e20e52c8f23e40e0b8606a654f0f3498493b742cd577233d94ac21c026c983fef2a5b1b484839b46ddccb74e438ca8dde569c847304
+EBUILD aws-c-common-0.4.11.ebuild 511 BLAKE2B ee38d0430d7ea3ecb2c5cea103d9cc8c6ab19b73fed8efc24d4dcd13c0340332af6af889d2779405ae1a9b0adfc57e079e7255f4eafe9eeae5b85763dd154e35 SHA512 b2a2245f686c21312416f8476c83e46a5788898fd043e3e7f7a8caa8c47eff4f8b599b91afb0ce632c4bb2f051e8345b4aaf48709f77f77c5f8f6d6b64a78b0c
 MISC metadata.xml 527 BLAKE2B 794ec45e133fb3a39495c56b783b1d7bb5ca7cdd44840a3a305c3137dc5f72cedd7e4acc2e19aae8fc55a43521cc387462337df0ee1a6f0c662fb23b05afd996 SHA512 d859baf8f23805e9f9da7957e88d250f5f34fb24bcfb5c6760c479280d425af641dfc750995b328db197b8b9ee4ea7fee41ceed1a9c06e6b3e4acc7da1cb70e4
diff --git a/dev-libs/aws-c-common/aws-c-common-0.4.11.ebuild b/dev-libs/aws-c-common/aws-c-common-0.4.11.ebuild
index e67469eec702..f3ee9be44b13 100644
--- a/dev-libs/aws-c-common/aws-c-common-0.4.11.ebuild
+++ b/dev-libs/aws-c-common/aws-c-common-0.4.11.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/aws-c-event-stream/Manifest b/dev-libs/aws-c-event-stream/Manifest
index ae58822175df..72194d6828e6 100644
--- a/dev-libs/aws-c-event-stream/Manifest
+++ b/dev-libs/aws-c-event-stream/Manifest
@@ -1,4 +1,4 @@
 AUX 0.1.3-add_missing_cmake_install_prefix.patch 566 BLAKE2B 1e638a3fc81c27addf3fba53173584b379b271a357246f448d5df0dd34dbcea42f698c4e5be87937070d5274940e25c1dc893c2af621b999405925cd57471c70 SHA512 872305633d8f3129280d3252632dbc07d24ee666f236f02e568e27153dd69657a2cdfdb2d594d9a86816f09923fba5b0e9cb2bd3eb0198b2a9077e02082ff54a
 DIST aws-c-event-stream-0.1.3.tar.gz 27945 BLAKE2B 1e6944006d4da339726a4a4f292af5c0a9a31dcb907ff01cfb63f2efbcda0466fc42b770936704e3c8d49f00b1ba9e180726ed0de9acc38c3fb23553395da1b7 SHA512 d8959b8b30795a62fe5f15d95ccc81a705e9ba8f4e5f6a05e5a965bf705877992df5660d91fde3499fd3087405018e3207e0991fba214c1362d78ee824f4cca9
-EBUILD aws-c-event-stream-0.1.3.ebuild 649 BLAKE2B 6180176ac83ab02e6ae800686b8445b2439ed8499b95eb68fbfa8ca876f5423f57fb90da039810fe3a2a16be00a006a8ecdc6a387d4e29ca0327dcf96ebef796 SHA512 c54ba3465d9220d7f163e7c3140426f38e2583b558d45b6669661c350c0610aa2af5d45bbcdfa67fd4e78a653067555ebbf9662cc897f9c6b827d0e267394c95
+EBUILD aws-c-event-stream-0.1.3.ebuild 676 BLAKE2B 87b3f6b408087db7ca28a306ebd0e5d1dc94d85fd0d722a8e782fbcbe65eca945a59ebb6d77e8958bfaaa8710bb80a25f84ed1b0b70a569c859080d7145b1809 SHA512 15d07c1c5f959a56f520c54ade9105a64a7be78e0a0dad6640f2734bfdf2c3d62fc22d181dadcfe5ea7d342ec981a32530eed53d31e6705703a85250da26e91c
 MISC metadata.xml 360 BLAKE2B c3adf10e8868a7699a1c7798e4221cff255e9505062692d7db7b733e9d5cf7b568183a294c9e0e7b125e9a6c0d848d370a43ed6cd32e498eab4adfe1c46e7abb SHA512 571bbdb2968c5b6f49dcf41e7706775f2bab9302eef8795f9ccbd51922436161af01b17857370bc49960cb1f40a670ca759ff76381e92f7cd18ee51b9361f10e
diff --git a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild
index b45aa6f30db9..b33495cc06ca 100644
--- a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild
+++ b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/aws-c-common
diff --git a/dev-libs/aws-checksums/Manifest b/dev-libs/aws-checksums/Manifest
index 5ee449cd9dd9..3d6be1d54970 100644
--- a/dev-libs/aws-checksums/Manifest
+++ b/dev-libs/aws-checksums/Manifest
@@ -1,3 +1,3 @@
 DIST aws-checksums-0.1.3.tar.gz 78242 BLAKE2B e78f3bb34e124351ad494e86e579613799afebcfe491fb36b20190121f2bf9de9d96714ad304a7fcd702708f5be417c6dbafe65606b2fe42c340edc796a3ecf3 SHA512 79bf71a6c4c268b27efe8a6a3c4b90281da4ce7f6e4c1c62fce80b11a4756ecfd4dc2b19624ace3f54137113d0cb56a517de0b91dd6338ee8ca069756bca13f4
-EBUILD aws-checksums-0.1.3.ebuild 521 BLAKE2B ac0b2afb5ddd5b0d409a024e0aa2de1801a265e35af9f748ec491d2159f5bcc8279e078c9e2827943ce075c45e1bc25368cc77e96beab3b7aa426e57df1972f2 SHA512 ca682f571e977ef6038e99c51cffe176da59d2732b45a6f6835f7b01382142fab4bf471a3bbabfbd6d3f003ccc49af76276d019990669fef9ba29fe4411bf50c
+EBUILD aws-checksums-0.1.3.ebuild 548 BLAKE2B 38b560431403331937d71abf13d41080a680f271361e925eb1ce6fa3574e5ef25c587dd4f9436bcdd37c1477057b767072f8c307c18c033aa02d13ab48dc6faf SHA512 084ca14c86b202da22daf0d7e8769e451e19092a9f1ad4d372b139508713ae4c81ac83600ae7111e191eb5718c10af6b60c19e8a7f2db5f241879497d5de2038
 MISC metadata.xml 555 BLAKE2B 48bbce733b96fcf28e492a782ad5681c554e20a269477851b734a16c9bff126ce545920754491532fc5ac026707290d7c988e162d0815586da19986a6793c4a0 SHA512 4d5a312fb968d62d31279d1e3f998688c54b9f9829a3c839227e10e931422f865fa29450469d0a8cd08c05849d098e05b8c5bcf962039dded80932d1d25e0b42
diff --git a/dev-libs/aws-checksums/aws-checksums-0.1.3.ebuild b/dev-libs/aws-checksums/aws-checksums-0.1.3.ebuild
index cb764eeadcce..a0d6bce25cf4 100644
--- a/dev-libs/aws-checksums/aws-checksums-0.1.3.ebuild
+++ b/dev-libs/aws-checksums/aws-checksums-0.1.3.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/aws-sdk-cpp/Manifest b/dev-libs/aws-sdk-cpp/Manifest
index 9a54ac55076e..013b69d6f3c8 100644
--- a/dev-libs/aws-sdk-cpp/Manifest
+++ b/dev-libs/aws-sdk-cpp/Manifest
@@ -1,3 +1,3 @@
 DIST aws-sdk-cpp-1.7.178.tar.gz 22589166 BLAKE2B 40364307fb676a89cf2b363d02dfa95e03c6e0b02e34c3d5376820dd7721f13108bf1f1713ff5f39dfc7d98f5cd368718601a397f55c4e26a37cd62d346cbf70 SHA512 b5c969d8b0b9ca5aa7b6af762bf79647ee407cae2686b90c4acefb6a113cf4e7a582e4e5aebd2e6289685e6ac373f9f994e57cd34bd12543b2b36142e00df478
-EBUILD aws-sdk-cpp-1.7.178.ebuild 6270 BLAKE2B 271416754c2c63cd552fc03623ed81a0451c59a39a7f8640cc7e8f4b93b1ef530235e810ce5c78248e41308c04452961d0bc62d7301abb5ff02e112ae71ac9bd SHA512 f17166cad311a58c54d183638251f3e09945450336cb7a9aaf3fa448168bdd4585799335210074d6b4b2f1dd8b9edb18d290fa5273365412f0beb31bf08e1af1
+EBUILD aws-sdk-cpp-1.7.178.ebuild 6297 BLAKE2B b0add7627f38f0983d8be4c604998c47ba2dcfbc91da49c88866a5b7a98a42c3ca560723c657065e9018642a99a1857a63417ff6558605b56bb0f591f22a0915 SHA512 a25be1dcf28aea3fd685e421676573389c65e8f3ea0e6a6b826e953e05d7f3c16432d45b8e49db7edb1cc36f9e28a69485caba2cce8c708db71f178ee00339c3
 MISC metadata.xml 19286 BLAKE2B 2f347b29348e37e9b80827e6b2a2dd5a70b5d354e9eb226e8fbcd7eea26f57f831e13e57bde15e5ca97ac9403bb6acef68612e2a30c22db8136ac501630e3670 SHA512 5c072bae80814025ffc5eac7d2eb6199360e99e4b806be97a7770c2b6b570d122ac399feb137b65fd02f52bd8c5b1e8e61e75fcd91d7ae24489ef05ee018bb0f
diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.7.178.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.7.178.ebuild
index 1c20c4f04f22..1ce4d2c80bf7 100644
--- a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.7.178.ebuild
+++ b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.7.178.ebuild
@@ -25,6 +25,7 @@ MODULES=(
 )
 
 IUSE="+http libressl +rtti +ssl static-libs test unity-build ${MODULES[*]}"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
diff --git a/dev-libs/bemenu/Manifest b/dev-libs/bemenu/Manifest
index d457553a0c2c..ca892c3dfaec 100644
--- a/dev-libs/bemenu/Manifest
+++ b/dev-libs/bemenu/Manifest
@@ -1,2 +1,4 @@
+DIST bemenu-0.2.0.tar.gz 119935 BLAKE2B 8f9d1575f6ec31062df0bfe06d16722d4bc61ddcc5dabf0d6e9df8b88536eea638b7ce1e05e3b19a3cad125ecb09edeb72b6ca8d283e73e35d279ba14ebd7975 SHA512 05ddc79b2f4152fe4a3cbbec500f21f0b3e045aeb0e18bd5749acfe16ed41d7d933accf68a4793345cb20543620894847cec34236684d8cb4d42f20454d31b4e
+EBUILD bemenu-0.2.0.ebuild 1191 BLAKE2B 4523d8c01caea2a5660e44213f3231b9374c3d4663de3e2b53900019702ea89608a6d53b0e1d0f119742287b70a70ed3c9332bf0bb851e34eb20258cd8951b47 SHA512 b895adf49482a6496db8afb7683490db24e5358b94a523aaed546d6705605070925fd17611ca111576f2bf84d9c39030d07452ca05e0c979d6d378dc204dd3c6
 EBUILD bemenu-9999.ebuild 1033 BLAKE2B 793582c8a631f3f4147386bec6c40f8458239a317b2d92811fe80aa6802a7599c1a253e1033e66ee1044642f864ca1d295ab5a65e6aba4f3ec77d17023be9b5e SHA512 25f0ed77a1fe37215ee30f4c970a800df2329a1f6e261602884bf9abaebaeb1b93ed1a4258c85e9669cea5b6c1adb5f365053d61624595b18b1de95814dbc0de
 MISC metadata.xml 377 BLAKE2B 6b29e18f25e7237d1e1fec87b4cfe534471a6e7da07682cac5cfe97cd01d968b7b037a9b624432922e73f135f72d41b2662dcc95b862bb33cc2667cc700dfd0f SHA512 e7a4e4d244d06524f6c8f53251d6e0a41c570c76b0c5e5c49e97c53793c1e0d745fd82c511979073163e69fcea9ede4659d14a8ad85a1f6f648390e45682ad64
diff --git a/dev-libs/bemenu/bemenu-0.2.0.ebuild b/dev-libs/bemenu/bemenu-0.2.0.ebuild
new file mode 100644
index 000000000000..910039e31c1b
--- /dev/null
+++ b/dev-libs/bemenu/bemenu-0.2.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="dmenu clone for wayland"
+HOMEPAGE="https://github.com/Cloudef/bemenu"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Cloudef/bemenu.git"
+else
+	SRC_URI="https://github.com/Cloudef/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc ncurses wayland X"
+
+# Require at least one backend be built
+REQUIRED_USE="|| ( ncurses wayland X )"
+
+DEPEND="
+	ncurses? ( sys-libs/ncurses:0 )
+	wayland? (
+		dev-libs/wayland
+		dev-libs/wayland-protocols
+		x11-libs/cairo
+		x11-libs/pango
+	)
+	X? (
+		x11-libs/libxcb
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/cairo[X]
+		x11-libs/pango[X]
+	)
+"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCURSES_LIBRARY=/usr/$(get_libdir)/libncursesw.so
+		-DBEMENU_CURSES_RENDERER=$(usex ncurses ON OFF)
+		-DBEMENU_WAYLAND_RENDERER=$(usex wayland ON OFF)
+		-DBEMENU_X11_RENDERER=$(usex X ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index b2e9811f461e..eacc3244f6b1 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -1,3 +1,3 @@
 DIST gc-8.0.4.tar.gz 1160528 BLAKE2B ec42378c964fc573e53f6f58aa22fa63a0b421c91b81336acfeb2e2afdb5c89514edace3a9500699e13ff1cadc4205ea245af4f0dfa5e439ed9b78cabf6058f7 SHA512 57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e
-EBUILD boehm-gc-8.0.4.ebuild 1382 BLAKE2B 9cca475a48372734a32ea4eb8a9bdb17d1d6aed7f40570620f1927f9fd881d8b334eb19174b18506f804d055ac837c8d225c0d93c7d21b5b19d81023cf7e59b7 SHA512 7bf5ffb109e04af137923570a013763a841fd2ce69a39f2e63d4c4fd954bb7f4bdb64824772b726eb05b919ec2f4d90b116d355da96abd159c98af19aaa17399
+EBUILD boehm-gc-8.0.4.ebuild 1383 BLAKE2B 894a264bc93328fd84de21ee7d047d3cb21317fdf7f3d7c505e46a51db238abbef0b9cf0fdab346862a2b23436c1725949df0a0cf325580859b1902fe1fd2845 SHA512 d60590235f257796236a46ff9f271cd9edd8553e9fac270d429f3ec18cf315c62a50db8715bb1751abcf93c9063ef10dc5d4bed7a1c530bd5004a5f034c16f10
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
index df283205da84..99896863371c 100644
--- a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
@@ -8,7 +8,7 @@ inherit multilib-minimal libtool
 MY_P="gc-${PV}"
 
 DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
-HOMEPAGE="http://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/"
+HOMEPAGE="https://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/"
 SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="boehm-gc"
diff --git a/dev-libs/boost-mpl-cartesian_product/Manifest b/dev-libs/boost-mpl-cartesian_product/Manifest
index 21e23ccb8bbb..67c483f121f3 100644
--- a/dev-libs/boost-mpl-cartesian_product/Manifest
+++ b/dev-libs/boost-mpl-cartesian_product/Manifest
@@ -1,3 +1,3 @@
 DIST boost-mpl-cartesian_product-20161205.tar.gz 4391 BLAKE2B 1ed647de2cf98f78aa58fcf9fa4122c3b4a8a40c00c6379d9abb8c7f36ccf1b3360ed3fc3143effc7a7e228404c496d9b93dd3c4f9ced59be15148ae122d7316 SHA512 cbe1f10b45bbb3db84bba7aa935698d7d79a59ae8b40c786df31da2936500feffe5589755ea53f31e3fc869ca4e87a880f013967d2829ce55412900b244252e7
-EBUILD boost-mpl-cartesian_product-20161205.ebuild 981 BLAKE2B 140c8d83aa8642312492f3442e814b2630901c83266dc949fc54a75c53638b051f5cf861de4e5e5a4fe5c30eedfd1fe26f14ed26c2bcb6fd4b0b3c3fc996d3c6 SHA512 1239631b92d98662f5754ba022c7bebaa5f10ae3dc643089b763f8907e1db824a1bf0b0d6ea93d683789252b497cbc381d2e4614885b7c79206a9343940e9594
+EBUILD boost-mpl-cartesian_product-20161205.ebuild 1008 BLAKE2B c0229b0b3a05f72cee13083cb6f93248e2bd0f869c3a882bf4aa8b984a0bf18e51e838c93de404062b29853e1eb1c0754d6b8bb9edf9fd9053e91b6e957475c9 SHA512 d12b3161db35767c538a3dd7ce37b9e66f2813510bf637eb49887549d296222a66cdc3a86e845bc656cff029b41e4876d0a904efb9f7bc4dfc398f19354a4615
 MISC metadata.xml 472 BLAKE2B ec58c693ec625618d6a11e4639365572c555253bc3a84168151cefa286e4c27edc8e7447778d4a8c992e6dbc76fd965e040f834bd5ba3299e3e06bb15c3a1239 SHA512 9ebb1a50e9e3924a4fc5237741f017a0963ddb60e4a39ec0b118c09937772bb1934acf5e80549f4204437ba2803981b12776e795a3b1918b0700b1e9717b8aac
diff --git a/dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild b/dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild
index ac621115d48c..d7206af56292 100644
--- a/dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild
+++ b/dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild
@@ -14,6 +14,7 @@ LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-libs/boost"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 9872952a1f52..7bbc06012b94 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,12 +1,8 @@
-AUX boost-1.48.0-disable_icu_rpath.patch 1077 BLAKE2B 367246d711de06ef20a93a0e2a354fff4e8360ef79582a75d262b2e6dfcd76a5c2bb00e719a05ca79c7f5f0f3fefa975713251e65cb9f2c09e76cb6c3b16888b SHA512 013503fd16bcb609c624c9952a5448e612b81150db9ce60b5a51acbb57b62ce1cf0e7c5dd4a58c110ca7895c86effef24d8fe55ea3f316c9e47d5c549a33180c
-AUX boost-1.55.0-context-x32.patch 1077 BLAKE2B 76ff0e52ca076ccddd58a469b4531f49782d6373bfa9d65ac63fe365fe90d25d10557fa041584f8d0bcf04438a90e78b69624006220f53983a456485b868cbc9 SHA512 0e2e45abe5833396508666355e26bafe114fa4ada628b24d8d9953268edddcb2f8e3dcfe8bc7f27d6c1794418990dc9ef914c936dfa64ed6e5e647a40e3f8a73
-AUX boost-1.56.0-build-auto_index-tool.patch 412 BLAKE2B 4449dbe600547f339eba9afc4d3da5310f08baa2dd1beb30f9c1b4076e95e867c8fa84fef8a84e2aa38bf35368173e52057e73499a66766cbb81e2d3312fa07b SHA512 9fe245adddf76375d0ee8066952c46d229c9e37fdce83ff608fcc1fb5942b1c226a0fba6e28f859bbcd58863dc49a356f32c7fcc3b90baca4069c6bdc9c0f203
-AUX boost-1.65.0-fix-python.patch 9210 BLAKE2B 31e32cfbc8fa0c4e8a5c142f56a4a7b1d06173b6a5b7b4bc1c2fcc64e645eac22e9e4f85c8b278a1fcefcb15e389a38d82ec90facdbb1e7812f9f4cc77d2fe93 SHA512 df2e8841b3415724b2920230da36e3e3aa610a5d7ee7dcada847cb4d6c921405ef4f0c034f96d1ac078d33bb3f32408b748cf7835f173b6e7692c76c6135e2f2
-AUX boost-1.69.0-context-x32.patch 1116 BLAKE2B 16b6ddbdc47d72d5afd39e61441f9f094dff8db46bd7fa4e04e5a8b132c8894c51db506d20356c352022f42d5b9a9923f23c5db2b0f9fa1c64ceeb4e50e16be1 SHA512 cf76691d4adbc4b43f468c587fea23c43e1b337ba7eebff2c856b0403bf32b78826f483faca25a4459c1d47eabbd5b67c65863a4d44407990178022433f718bf
-DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
-DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
+AUX boost-1.71.0-build-auto_index-tool.patch 265 BLAKE2B 05e52ca716522db7bb11b481576a08138be826f7383a689a6c0725d491a244dc8697fc39fac1a79e4639ba51b3a3eb7ee2f2e11a20883de0ecd3dd3c2fc2c9cd SHA512 28952e7cd791678be0963beb0a29e3e40b54a8c3618c66a8b8d21ab63c414771cfa1e9961f08c0b3818bd4c311c122e777109e15002a71230b0c3c9dbc4d6075
+AUX boost-1.71.0-context-x32.patch 1116 BLAKE2B 16b6ddbdc47d72d5afd39e61441f9f094dff8db46bd7fa4e04e5a8b132c8894c51db506d20356c352022f42d5b9a9923f23c5db2b0f9fa1c64ceeb4e50e16be1 SHA512 cf76691d4adbc4b43f468c587fea23c43e1b337ba7eebff2c856b0403bf32b78826f483faca25a4459c1d47eabbd5b67c65863a4d44407990178022433f718bf
+AUX boost-1.71.0-disable_icu_rpath.patch 1077 BLAKE2B c4549b7a706cd934392bdafb44ee89987534d5cca48060b955a4b998f0ac6c8a96b5c0d6f5d46476a0225ba6e66fabc095ec12c0f0c43a60c7147ef922e8a2ae SHA512 7095d94def1ee04f009f0c2e84d0450705211793f6d18ac4a3e0fb673a36127282f31172a7f571ed89f4128b6ffbc38d850e6105a5ad5224d42749557db41ee0
 DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
-EBUILD boost-1.65.0.ebuild 12413 BLAKE2B 46cecac07c7772137d690212714fa54f29b1afd623ca17270565ac75960408e54185f1b8e70883397084e761cfbaeabf2b5d83879d2e5f81f5693101a911a896 SHA512 d1d91b697c7027587dd90f0ecdc07e0c5af1a3ab922fc33caa7a2850f597e4cf4c67603dd8ba651c0afc02ef09451ee2417c869c64ea16ccbced9151380acf19
-EBUILD boost-1.70.0.ebuild 10140 BLAKE2B 3248ad7f134f001c8a626d0062ce39c72ab00ea451d57c4d78c82f2994a490df20798ebedff5d8e072999abbf5ca7b93b8340f1be9ae411072434720440f7e33 SHA512 8934c3d1ec1f4e35d58779e440db7da9403fe57a49c2bbb3bb87b6bd0f5d2c5f08e3138e96c14dfa99b183f9e67c5e35b87db89b8879b3b243e5112172f4ff2a
-EBUILD boost-1.71.0.ebuild 10627 BLAKE2B 20f1f871b900e36f86e66eb22f99de57b44d6fe8b87a06df4203353b68eb5ddd43d38a4db2734dbd3d01100e195c2e6679d559688ffddac1dd87a9c22fe65a50 SHA512 6b5407cb47c297cd75aa069b3c54d2d57de17a04b95537b65d8afe0f9581e7ff65907259797f2b5346b3d95ece976789b1c7eace7b7179b0399c932feeddf034
+DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
+EBUILD boost-1.71.0.ebuild 10437 BLAKE2B b0267ac55c5f80ff25aff70d0e789a76dd68489f0a7491b2b409127a2f5fa7ab3e0f2b59abeee63b7e585b9cd8703d264c149197f68d9d17fc7c38622cd26db4 SHA512 48b29502f7cf875cdccb7d1203a7ff51bac79225e99a88c5c21fa09f1b9b8c8411b5a70e4870e1e0499c84b812b25e451bec1908897328592ccfe801c3db5403
+EBUILD boost-1.72.0.ebuild 10479 BLAKE2B 04c1b99222969bdb527316b8c0056a3e84bd83cdecba78e71e95dd16969ecfce2e091a1cd1fded400c0d69172781713e1438b10249a65cb80491622dc15ac01e SHA512 ff57a99c717975379ae993d328939212374dc4855c40d8c3b76ef1ad93a41abcf5f4b231ebd9a9e44fe18fcb648cb034991f55ef17fd483df73f687154c9a4f8
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.65.0.ebuild b/dev-libs/boost/boost-1.65.0.ebuild
deleted file mode 100644
index 7db346d24331..000000000000
--- a/dev-libs/boost/boost-1.65.0.ebuild
+++ /dev/null
@@ -1,439 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-
-inherit eutils flag-o-matic multiprocessing python-r1 toolchain-funcs versionator multilib-minimal
-
-MY_P="${PN}_$(replace_all_version_separators _)"
-MAJOR_V="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="https://www.boost.org/"
-SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
-
-IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
-	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
-	python? ( ${PYTHON_DEPS} )
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	!app-admin/eselect-boost"
-DEPEND="${RDEPEND}
-	=dev-util/boost-build-${MAJOR_V}*"
-REQUIRED_USE="
-	mpi? ( threads )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
-	"${FILESDIR}/${PN}-1.55.0-context-x32.patch"
-	"${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch"
-	"${FILESDIR}/${PN}-1.65.0-fix-python.patch"
-)
-
-python_bindings_needed() {
-	multilib_is_native_abi && use python
-}
-
-tools_needed() {
-	multilib_is_native_abi && use tools
-}
-
-create_user-config.jam() {
-	local compiler compiler_version compiler_executable
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-		compiler_executable="$(tc-getCXX)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-		compiler_executable="$(tc-getCXX)"
-	fi
-	local mpi_configuration python_configuration
-
-	if use mpi; then
-		mpi_configuration="using mpi ;"
-	fi
-
-	if python_bindings_needed; then
-		# boost expects libpython$(pyver) and doesn't allow overrides
-		# and the build system is so creepy that it's easier just to
-		# provide a symlink (linker's going to use SONAME anyway)
-		# TODO: replace it with proper override one day
-		ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
-
-		if tc-is-cross-compiler; then
-			python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
-		else
-			# note: we need to provide version explicitly because of
-			# a bug in the build system:
-			# https://github.com/boostorg/build/pull/104
-			python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
-		fi
-	fi
-
-	cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die
-using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-${mpi_configuration}
-${python_configuration}
-__EOF__
-}
-
-pkg_setup() {
-	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT%/}/etc/site-config.jam" ]]; then
-		grep -q gentoorelease "${EROOT%/}/etc/site-config.jam" && grep -q gentoodebug "${EROOT%/}/etc/site-config.jam" ||
-		(
-			eerror "You are using custom ${EROOT%/}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
-			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT%/}/usr/share/boost-build/site-config.jam to it."
-			die
-		)
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Do not try to build missing 'wave' tool, bug #522682
-	# Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
-	sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
-
-	multilib_copy_sources
-}
-
-ejam() {
-	local b2_opts=(
-		"--user-config=${BOOST_ROOT}/user-config.jam"
-		"$@"
-	)
-	echo b2 "${b2_opts[@]}"
-	b2 "${b2_opts[@]}"
-}
-
-src_configure() {
-	# Workaround for too many parallel processes requested, bug #506064
-	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
-	OPTIONS=(
-		$(usex debug gentoodebug gentoorelease)
-		"-j$(makeopts_jobs)"
-		-q
-		-d+2
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	elif [[ ${CHOST} == *-winnt* ]]; then
-		compiler=parity
-		if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
-			compilerVersion=trunk
-		else
-			compilerVersion=$($(tc-getCXX) -v | sed '1q' \
-				| sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,')
-		fi
-		compilerExecutable=$(tc-getCXX)
-	fi
-
-	# bug 298489
-	if use ppc || use ppc64; then
-		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
-	fi
-
-	# Use C++14 globally as of 1.62
-	append-cxxflags -std=c++14
-
-	use icu && OPTIONS+=(
-			"-sICU_PATH=${EPREFIX}/usr"
-		)
-	use icu || OPTIONS+=(
-			--disable-icu
-			boost.locale.icu=off
-		)
-	use mpi || OPTIONS+=(
-			--without-mpi
-		)
-	use nls || OPTIONS+=(
-			--without-locale
-		)
-	use context || OPTIONS+=(
-			--without-context
-			--without-coroutine
-			--without-fiber
-		)
-	use threads || OPTIONS+=(
-			--without-thread
-		)
-
-	OPTIONS+=(
-		pch=off
-		--boost-build="${EPREFIX}"/usr/share/boost-build
-		--prefix="${ED%/}/usr"
-		--layout=system
-		# building with threading=single is currently not possible
-		# https://svn.boost.org/trac/boost/ticket/7105
-		threading=multi
-		link=$(usex static-libs shared,static shared)
-	)
-
-	[[ ${CHOST} == *-winnt* ]] && OPTIONS+=(
-			-sNO_BZIP2=1
-		)
-}
-
-multilib_src_compile() {
-	local -x BOOST_ROOT="${BUILD_DIR}"
-	PYTHON_DIRS=""
-	MPI_PYTHON_MODULE=""
-
-	building() {
-		create_user-config.jam
-
-		local PYTHON_OPTIONS
-		if python_bindings_needed; then
-			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
-		else
-			PYTHON_OPTIONS=" --without-python"
-		fi
-
-		ejam \
-			"${OPTIONS[@]}" \
-			${PYTHON_OPTIONS} \
-			|| die "Building of Boost libraries failed"
-
-		if python_bindings_needed; then
-			if [[ -z "${PYTHON_DIRS}" ]]; then
-				PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
-			else
-				if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
-					die "Inconsistent structure of build directories"
-				fi
-			fi
-
-			local dir
-			for dir in ${PYTHON_DIRS}; do
-				mv ${dir} ${dir}-${EPYTHON} \
-					|| die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed"
-			done
-
-			if use mpi; then
-				if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
-					MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
-					if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
-						die "Multiple mpi.so files found"
-					fi
-				else
-					if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
-						die "Inconsistent structure of build directories"
-					fi
-				fi
-
-				mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \
-					|| die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed"
-			fi
-		fi
-	}
-	if python_bindings_needed; then
-		python_foreach_impl building
-	else
-		building
-	fi
-
-	if tools_needed; then
-		pushd tools >/dev/null || die
-
-		ejam \
-			"${OPTIONS[@]}" \
-			${PYTHON_OPTIONS} \
-			|| die "Building of Boost tools failed"
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use python; then
-		rm -r "${ED%/}"/usr/include/boost/python* || die
-	fi
-
-	if ! use nls; then
-		rm -r "${ED%/}"/usr/include/boost/locale || die
-	fi
-
-	if ! use context; then
-		rm -r "${ED%/}"/usr/include/boost/context || die
-		rm -r "${ED%/}"/usr/include/boost/coroutine{,2} || die
-		rm "${ED%/}"/usr/include/boost/asio/spawn.hpp || die
-	fi
-
-	if use doc; then
-		# find extraneous files that shouldn't be installed
-		# as part of the documentation and remove them.
-		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
-		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
-		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
-		docinto html
-		dodoc *.{htm,html,png,css}
-		dodoc -r doc libs more tools
-
-		# To avoid broken links
-		dodoc LICENSE_1_0.txt
-
-		dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
-	fi
-}
-
-multilib_src_install() {
-	local -x BOOST_ROOT="${BUILD_DIR}"
-	installation() {
-		create_user-config.jam
-
-		local PYTHON_OPTIONS
-		if python_bindings_needed; then
-			local dir
-			for dir in ${PYTHON_DIRS}; do
-				cp -pr ${dir}-${EPYTHON} ${dir} \
-					|| die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
-			done
-
-			if use mpi; then
-				cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \
-					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
-				cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \
-					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
-			fi
-			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
-		else
-			PYTHON_OPTIONS=" --without-python"
-		fi
-
-		ejam \
-			"${OPTIONS[@]}" \
-			${PYTHON_OPTIONS} \
-			--includedir="${ED%/}/usr/include" \
-			--libdir="${ED%/}/usr/$(get_libdir)" \
-			install || die "Installation of Boost libraries failed"
-
-		if python_bindings_needed; then
-			rm -r ${PYTHON_DIRS} || die
-
-			# Move mpi.so Python module to Python site-packages directory.
-			# https://svn.boost.org/trac/boost/ticket/2838
-			if use mpi; then
-				local moddir=$(python_get_sitedir)/boost
-				# moddir already includes eprefix
-				mkdir -p "${D}${moddir}" || die
-				mv "${ED%/}/usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die
-				cat << EOF > "${D}${moddir}/__init__.py" || die
-import sys
-if sys.platform.startswith('linux'):
-	import DLFCN
-	flags = sys.getdlopenflags()
-	sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
-	from . import mpi
-	sys.setdlopenflags(flags)
-	del DLFCN, flags
-else:
-	from . import mpi
-del sys
-EOF
-			fi
-
-			python_optimize
-		fi
-	}
-	if python_bindings_needed; then
-		python_foreach_impl installation
-	else
-		installation
-	fi
-
-	pushd "${ED%/}/usr/$(get_libdir)" >/dev/null || die
-
-	local ext=$(get_libname)
-	if use threads; then
-		local f
-		for f in *${ext}; do
-			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
-		done
-	fi
-
-	popd >/dev/null || die
-
-	if tools_needed; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED%/}"/usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# Yai for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT%/}/usr/include/boost" "${EROOT%/}/usr/share/boostbook"; do
-		if [[ -L ${symlink} ]]; then
-			rm -f "${symlink}" || die
-		fi
-	done
-
-	# some ancient installs still have boost cruft lying around
-	# for unknown reasons, causing havoc for reverse dependencies
-	# Bug: 607734
-	rm -rf "${EROOT%/}"/usr/include/boost-1_[3-5]? || die
-}
diff --git a/dev-libs/boost/boost-1.71.0.ebuild b/dev-libs/boost/boost-1.71.0.ebuild
index af9362277197..faa5a9609109 100644
--- a/dev-libs/boost/boost-1.71.0.ebuild
+++ b/dev-libs/boost/boost-1.71.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
@@ -49,9 +49,9 @@ BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
 S="${WORKDIR}/${PN}_${MY_PV}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.48.0-disable_icu_rpath.patch
-	"${FILESDIR}"/${PN}-1.69.0-context-x32.patch
-	"${FILESDIR}"/${PN}-1.56.0-build-auto_index-tool.patch
+	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
+	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
+	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
 )
 
 python_bindings_needed() {
@@ -130,11 +130,6 @@ pkg_setup() {
 
 src_prepare() {
 	default
-
-	# Do not try to build missing 'wave' tool, bug #522682
-	# Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
-	sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
-
 	multilib_copy_sources
 }
 
diff --git a/dev-libs/boost/boost-1.70.0.ebuild b/dev-libs/boost/boost-1.72.0.ebuild
index 4f826fa75b46..7434b5bd5d16 100644
--- a/dev-libs/boost/boost-1.70.0.ebuild
+++ b/dev-libs/boost/boost-1.72.0.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
 
-MY_P="${PN}_$(ver_rs 1- _)"
+MY_PV="$(ver_rs 1- _)"
 MAJOR_V="$(ver_cut 1-2)"
 
 DESCRIPTION="Boost Libraries for C++"
 HOMEPAGE="https://www.boost.org/"
-SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2"
+SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
@@ -39,19 +39,21 @@ RDEPEND="
 	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
 	python? (
 		${PYTHON_DEPS}
-		numpy? ( >=dev-python/numpy-1.14.5[${PYTHON_USEDEP}] )
+		numpy? (
+			$(python_gen_cond_dep '>=dev-python/numpy-1.17[${PYTHON_USEDEP}]' -3)
+		)
 	)
 	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${PN}_${MY_PV}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.48.0-disable_icu_rpath.patch
-	"${FILESDIR}"/${PN}-1.69.0-context-x32.patch
-	"${FILESDIR}"/${PN}-1.56.0-build-auto_index-tool.patch
+	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
+	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
+	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
 )
 
 python_bindings_needed() {
@@ -118,8 +120,8 @@ create_user-config.jam() {
 
 pkg_setup() {
 	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT}/etc/site-config.jam" ]]; then
-		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}/etc/site-config.jam"; then
+	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
+		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
 			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
 			eerror "Boost can not be built in such configuration."
 			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
@@ -130,11 +132,6 @@ pkg_setup() {
 
 src_prepare() {
 	default
-
-	# Do not try to build missing 'wave' tool, bug #522682
-	# Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
-	sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
-
 	multilib_copy_sources
 }
 
@@ -197,11 +194,6 @@ src_configure() {
 		append-ldflags -Wl,-headerpad_max_install_names
 	fi
 
-	# bug 298489
-	if use ppc || use ppc64; then
-		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
-	fi
-
 	# Use C++14 globally as of 1.62
 	append-cxxflags -std=c++14
 }
@@ -319,7 +311,7 @@ pkg_preinst() {
 	# resorting to dirty hacks like these. Removes lingering symlinks
 	# from the slotted versions.
 	local symlink
-	for symlink in "${EROOT}/usr/include/boost" "${EROOT}/usr/share/boostbook"; do
+	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
 		if [[ -L ${symlink} ]]; then
 			rm -f "${symlink}" || die
 		fi
@@ -330,3 +322,16 @@ pkg_preinst() {
 	# Bug: 607734
 	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
 }
+
+pkg_postinst() {
+	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
+	elog
+	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
+	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
+	elog
+	elog "Then you need you need to recompile Boost and all its reverse dependencies"
+	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
+	elog "requires a complete rebuild of the boost-dependent ecosystem."
+	elog
+	elog "See for instance https://bugs.gentoo.org/638138"
+}
diff --git a/dev-libs/boost/files/boost-1.55.0-context-x32.patch b/dev-libs/boost/files/boost-1.55.0-context-x32.patch
deleted file mode 100644
index 5bf740625381..000000000000
--- a/dev-libs/boost/files/boost-1.55.0-context-x32.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://svn.boost.org/trac/boost/ticket/9445
-
-hack to fix x32 builds
-
---- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S
-+++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S
-@@ -31,6 +31,10 @@
-  *                                                                  *
-  * *****************************************************************/
- 
-+#ifdef __x86_64__
-+#include "jump_x86_64_sysv_elf_gas.S"
-+#else
-+
- .text
- .globl jump_fcontext
- .align 2
-@@ -73,3 +77,5 @@ jump_fcontext:
- 
- /* Mark that we don't need executable stack.  */
- .section .note.GNU-stack,"",%progbits
-+
-+#endif
---- a/libs/context/src/asm/make_i386_sysv_elf_gas.S
-+++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S
-@@ -31,6 +31,10 @@
-  *                                                                  *
-  * *****************************************************************/
- 
-+#ifdef __x86_64__
-+#include "make_x86_64_sysv_elf_gas.S"
-+#else
-+
- .text
- .globl make_fcontext
- .align 2
-@@ -78,3 +82,5 @@ finish:
- 
- /* Mark that we don't need executable stack.  */
- .section .note.GNU-stack,"",%progbits
-+
-+#endif
diff --git a/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch b/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch
deleted file mode 100644
index 48ca51388713..000000000000
--- a/dev-libs/boost/files/boost-1.56.0-build-auto_index-tool.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Build auto_index tool with USE="tools"
-Gentoo bug report: https://bugs.gentoo.org/show_bug.cgi?id=529066
-
---- a/tools/Jamfile.v2.orig	2014-12-24 12:57:32.290880067 +0300
-+++ b/tools/Jamfile.v2	2014-12-24 12:58:38.403883250 +0300
-@@ -20,6 +20,7 @@
- use-project /boost/regression : regression/build ;
- 
- TOOLS =
-+    auto_index/build//auto_index
-     bcp//bcp
-     inspect/build//inspect
-     quickbook//quickbook
diff --git a/dev-libs/boost/files/boost-1.65.0-fix-python.patch b/dev-libs/boost/files/boost-1.65.0-fix-python.patch
deleted file mode 100644
index 079160218ea2..000000000000
--- a/dev-libs/boost/files/boost-1.65.0-fix-python.patch
+++ /dev/null
@@ -1,272 +0,0 @@
---- a/boostcpp.jam
-+++ b/boostcpp.jam
-@@ -104,7 +104,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
--    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
- }
- 
- 
---- a/libs/mpi/build/Jamfile.v2
-+++ b/libs/mpi/build/Jamfile.v2
-@@ -58,81 +58,50 @@
- 
-   if [ python.configured ]
-   {
--    py2-version = [ py-version 2 ] ;
--    py3-version = [ py-version 3 ] ;
--
--    # These library names are synchronized with those defined by Boost.Python, see libs/python/build/Jamfile.
--    lib_boost_python(2) = boost_python ;
--    lib_boost_python(3) = boost_python3 ;
--
--    lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ;
--    lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ;
--
--    lib_boost_mpi_python(2) = boost_mpi_python ;
--    lib_boost_mpi_python(3) = boost_mpi_python3 ;
--
--    lib_boost_mpi_python($(py2-version)) = $(lib_boost_mpi_python(2)) ;
--    lib_boost_mpi_python($(py3-version)) = $(lib_boost_mpi_python(3)) ;
--
--    for local N in 2 3
--    {
--        if $(py$(N)-version)
--        {
--            lib $(lib_boost_mpi_python($(py$(N)-version)))
--              : # Sources
--                python/serialize.cpp
--              : # Requirements
--                <library>boost_mpi
--                <library>/mpi//mpi [ mpi.extra-requirements ]
--                <library>/boost/python//$(lib_boost_python($(py$(N)-version)))
--                <link>shared:<define>BOOST_MPI_DYN_LINK=1
--                <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
--                <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
--                <define>BOOST_MPI_PYTHON_SOURCE=1
--                -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
--                <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
--                <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--                <python>$(py$(N)-version)
--              : # Default build
--                <link>shared
--              : # Usage requirements
--                <library>/mpi//mpi [ mpi.extra-requirements ]
--              ;
--
--            python-extension mpi
--              : # Sources
--                python/collectives.cpp
--                python/py_communicator.cpp
--                python/datatypes.cpp
--                python/documentation.cpp
--                python/py_environment.cpp
--                python/py_nonblocking.cpp
--                python/py_exception.cpp
--                python/module.cpp
--                python/py_request.cpp
--                python/skeleton_and_content.cpp
--                python/status.cpp
--                python/py_timer.cpp
--              : # Requirements
--                <library>/boost/python//$(lib_boost_python($(py$(N)-version)))
--                <library>$(lib_boost_mpi_python($(py$(N)-version)))
--                <library>boost_mpi
--                <library>/mpi//mpi [ mpi.extra-requirements ]
--                <link>shared:<define>BOOST_MPI_DYN_LINK=1
--                <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
--                <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
--                <link>shared <runtime-link>shared
--                <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--                <python>$(py$(N)-version)
--              ;
--
--            libraries += $(lib_boost_mpi_python($(py$(N)-version))) ;
--        }
--        else
--        {
--            alias $(lib_boost_mpi_python($(N))) ;
--        }
--    }
-+    lib boost_mpi_python
-+      : # Sources
-+        python/serialize.cpp
-+      : # Requirements
-+        <library>boost_mpi
-+        <library>/mpi//mpi [ mpi.extra-requirements ]
-+      	<library>/boost/python//boost_python
-+        <link>shared:<define>BOOST_MPI_DYN_LINK=1
-+        <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
-+        <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
-+        <define>BOOST_MPI_PYTHON_SOURCE=1
-+	-<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-+	<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
-+      : # Default build
-+        <link>shared
-+      : # Usage requirements
-+        <library>/mpi//mpi [ mpi.extra-requirements ]
-+      ;
-+    libraries += boost_mpi_python ;
-+
-+    python-extension mpi
-+      : # Sources
-+        python/collectives.cpp
-+        python/py_communicator.cpp
-+        python/datatypes.cpp
-+        python/documentation.cpp
-+        python/py_environment.cpp
-+        python/py_nonblocking.cpp
-+        python/py_exception.cpp
-+        python/module.cpp
-+        python/py_request.cpp
-+        python/skeleton_and_content.cpp
-+        python/status.cpp
-+        python/py_timer.cpp
-+      : # Requirements
-+      	<library>/boost/python//boost_python
-+        <library>boost_mpi_python
-+        <library>boost_mpi
-+        <library>/mpi//mpi [ mpi.extra-requirements ]
-+        <link>shared:<define>BOOST_MPI_DYN_LINK=1
-+        <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
-+        <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
-+        <link>shared <runtime-link>shared
-+      ;
-   }
- }
- else if ! ( --without-mpi in  [ modules.peek : ARGV ] )
---- a/libs/python/build/Jamfile
-+++ b/libs/python/build/Jamfile
-@@ -31,26 +31,23 @@
-         ;
- }
- 
--py2-version = [ py-version 2 ] ;
--py3-version = [ py-version 3 ] ;
--
- project boost/python
-   : source-location ../src
-   ;
- 
- rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
- rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
--local rule eq ( a : b ) { if $(a) = $(b) { return 1 ; } }
--
--lib_boost_python(2) = boost_python ;
--lib_boost_python(3) = boost_python3 ;
--
--lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ;
--lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ;
- 
--rule lib_boost_python ( version )
-+rule lib_boost_python
- {
--    lib $(lib_boost_python($(version)))
-+    local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
-+    local python2 ;
-+    if $(python_major_version) = 2
-+    {
-+        python2 = true ;
-+    }
-+
-+    lib boost_python
-         : # sources
-         list.cpp
-         long.cpp
-@@ -96,7 +93,8 @@
-             # python_for_extensions is a target defined by Boost.Build to
-             # provide the Python include paths, and on Windows, the Python
-             # import library, as usage requirements.
--            [ cond [ python.configured ] : <library>/python//python_for_extensions ]
-+            [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
-+            [ cond [ python.configured ] : <library>/python//python ]
-             
-             # we prevent building when there is no python available
-             # as it's not possible anyway, and to cause dependents to
-@@ -105,13 +103,10 @@
-             <dependency>config-warning
- 
-             <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--            <python>$(version)
- 
-             -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-             <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
- 
--            <conditional>@python.require-py
--
-         :   # default build
-             <link>shared
-         :   # usage requirements
-@@ -120,68 +115,8 @@
-         ;
- }
- 
--lib_boost_numpy(2) = boost_numpy ;
--lib_boost_numpy(3) = boost_numpy3 ;
--
--lib_boost_numpy($(py2-version)) = $(lib_boost_numpy(2)) ;
--lib_boost_numpy($(py3-version)) = $(lib_boost_numpy(3)) ;
--
--rule lib_boost_numpy ( version )
--{
--    numpy-include = [ python.numpy-include ] ;
--    lib $(lib_boost_numpy($(version)))
--        : # sources
--        numpy/dtype.cpp
--        numpy/matrix.cpp
--        numpy/ndarray.cpp
--        numpy/numpy.cpp
--        numpy/scalars.cpp
--        numpy/ufunc.cpp
--        :   # requirements
--            <link>static:<define>BOOST_NUMPY_STATIC_LIB 
--            <define>BOOST_NUMPY_SOURCE
--            [ cond [ python.numpy ] : <library>/python//python_for_extensions ]
--            [ unless [ python.numpy ] : <build>no ]
--            <include>$(numpy-include)
--            <library>$(lib_boost_python($(version)))
--            <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--            <python>$(version)
-+libraries = boost_python ;
- 
--            -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
--            <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
--
--            <conditional>@python.require-py
--
--        :   # default build
--            <link>shared
--        :   # usage requirements
--			<link>static:<define>BOOST_NUMPY_STATIC_LIB
--            <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--        ;
--}
--
--libraries = ;
--
--for local N in 2 3
--{
--    if $(py$(N)-version)
--    {
--        lib_boost_python $(py$(N)-version) ;
--        libraries += $(lib_boost_python($(py$(N)-version))) ;
--    }
--    else
--    {
--        alias $(lib_boost_python($(N))) ;
--    }
--    if $(py$(N)-version) && [ python.numpy ]
--    {
--        lib_boost_numpy $(py$(N)-version) ;
--        libraries += $(lib_boost_numpy($(py$(N)-version))) ;
--    }
--    else
--    {
--        alias $(lib_boost_numpy($(N))) ;
--    }
--}
-+lib_boost_python ;
- 
- boost-install $(libraries) ;
diff --git a/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch b/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch
new file mode 100644
index 000000000000..ca793b9d06eb
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch
@@ -0,0 +1,13 @@
+Build auto_index tool with USE="tools"
+See also: https://bugs.gentoo.org/529066
+
+--- a/tools/Jamfile.v2
++++ b/tools/Jamfile.v2
+@@ -18,6 +18,7 @@
+     ;
+ 
+ TOOLS =
++    auto_index/build//auto_index
+     bcp//bcp
+     inspect/build//inspect
+     quickbook//quickbook
diff --git a/dev-libs/boost/files/boost-1.69.0-context-x32.patch b/dev-libs/boost/files/boost-1.71.0-context-x32.patch
index 9ee3d545d618..9ee3d545d618 100644
--- a/dev-libs/boost/files/boost-1.69.0-context-x32.patch
+++ b/dev-libs/boost/files/boost-1.71.0-context-x32.patch
diff --git a/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch b/dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch
index 23a87830d109..32faf8d0eb31 100644
--- a/dev-libs/boost/files/boost-1.48.0-disable_icu_rpath.patch
+++ b/dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch
@@ -1,6 +1,6 @@
 --- a/libs/locale/build/Jamfile.v2
 +++ b/libs/locale/build/Jamfile.v2
-@@ -58,8 +58,8 @@
+@@ -65,8 +65,8 @@
  
  if $(ICU_LINK)
  {
@@ -11,7 +11,7 @@
  }
  else
  {
-@@ -117,7 +117,6 @@
+@@ -124,7 +124,6 @@
        <library>icuuc/<link>shared/<runtime-link>shared 
        <library>icudt/<link>shared/<runtime-link>shared 
        <library>icuin/<link>shared/<runtime-link>shared
@@ -19,7 +19,7 @@
          <runtime-link>shared ;
  
  
-@@ -176,7 +175,6 @@
+@@ -183,7 +182,6 @@
        <library>icuuc_64/<link>shared/<runtime-link>shared 
        <library>icudt_64/<link>shared/<runtime-link>shared 
        <library>icuin_64/<link>shared/<runtime-link>shared
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 65b8300ef528..041b05662eb2 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -7,4 +7,4 @@ DIST Botan-2.9.0.tgz 7216373 BLAKE2B 5ad2e15db871ccc3a32b29b7f54a02d69f251f0aca2
 EBUILD botan-1.10.17-r2.ebuild 4270 BLAKE2B 7b8f1a4722002c8dee3d30c9f29c9aa27e2d1cf3e98e7b41ddc2b9b959e51b5b451b945cbaa9c13890f555e077843cbc94106f2c0032c9f4fb181513f159b432 SHA512 fd4b7886680da84254c19e546ddb4a96491263b228caf5408e48b01ad02c1156058ba11c8aef6722e99be92af6f6f5bd9599730f93820c40f0598513000ab9d7
 EBUILD botan-2.11.0.ebuild 2493 BLAKE2B ff01dd555ab285fec89ddd821d35838724842bc00e1dcdc2d18ba66973780c1a0a990ce408c48cb81921b1e7ef32600867253444b80c7302a32fab1e0343864c SHA512 fb406e8d1752d2d456902bf69bb9f2bb7e1fbedffb232015d4829d371850a49d5e350e2d386bf24d95b947af461f258ce8b953945e055e8f0659e3a55b878311
 EBUILD botan-2.9.0.ebuild 2530 BLAKE2B 550a64323758808af1525767900553a56fc7e80b857923c678d718bde1bcc04e9265e1671b3cd16dca9bc4ac7b2dcf1b8ae86c6f4c098cb63fbbcad880230efd SHA512 d22a695d68e9e05add7aedc7d79985261238593b5ff626d28e40eb49d4d287ea3dcfba6c272a3ccb951d5a8d453e36bd47ff3d6581eba247492fb9f16dc15aa3
-MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
+MISC metadata.xml 301 BLAKE2B d1a73485448b1088e1b111211b6a83573a3dc0f12c8870181a0446ace38120473c34f9ba19ce66c35941ec02a77015645894bdb646aa311baf4cd523c2528d7f SHA512 f2a77fdccb86cb75295e672fa686560a232f927337449527c62c6a07b396b36c95aada8673ca0316394c2b55ff5783e5f60a74aa132630514f7e430252338568
diff --git a/dev-libs/botan/files/botan-2.9.0-build.patch b/dev-libs/botan/files/botan-2.9.0-build.patch
index 6208ffdbf0ad..6208ffdbf0ad 100755..100644
--- a/dev-libs/botan/files/botan-2.9.0-build.patch
+++ b/dev-libs/botan/files/botan-2.9.0-build.patch
diff --git a/dev-libs/botan/metadata.xml b/dev-libs/botan/metadata.xml
index dfd9dcf6cba7..53a23c170e3f 100644
--- a/dev-libs/botan/metadata.xml
+++ b/dev-libs/botan/metadata.xml
@@ -1,18 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>lloyd@randombit.net</email>
-		<name>Jack Lloyd </name>
-	</maintainer>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-		</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers Project</name>
-		</maintainer>
+	<!--maintainer-needed-->
 	<use>
 		<flag name="boost">use <pkg>dev-libs/boost</pkg></flag>
 	</use>
diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 524c6ec2b338..57ad37a1029f 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,4 +1,4 @@
 AUX c-blosc-1.11.2-fix-build-system.patch 803 BLAKE2B 1472877db42d6a952b8f91a75ba437c6693701cc255a44638c5035d4f723563a5c0dfb5baee73ce0eb061bbaf45c8a49988ba799f35ff3d8b79159e73ea15afe SHA512 3064040af07acc445e4c7a9e962939eafa02d75366e6eee2ce12f15cc5846fbb4214a17d27f9366e8c08b69a3565cb04910008b1e4bd62d6ded3087e1a27124b
 DIST c-blosc-1.11.2.tar.gz 633280 BLAKE2B 426de12ffa0db784fc26316e5758836517f3b3498111cfea64ebd2bc4582ebc6236f64845d41e75db272d3741ab8a7f22a12e0847fb7c98ba10a3ae2c2906e22 SHA512 c1282f60f4ef9d24844be225587e7f46c43ba8a5071f5ee49a7326bce9e84b65312c4f9606e78fd3d1209a4ca50f1c31312a7c377caf9522c9915177c92a4d7b
-EBUILD c-blosc-1.11.2.ebuild 1295 BLAKE2B 6fa832e8eadb8974601885ca87434c0cae161bb7754549a632a654bca7cfa35f69fccf663f40d4f433f06110b95e56ae8c69f78c97809e54eb593be6c7eaffb3 SHA512 cc150fa9fc5f1d0529f09e2e015dde5914a45e5a4e00a6b726ac7b56810b50a8c143e3e2715144ecf58ed82ed21bb738a7fa94ed77d59faa381b3e2413648d37
+EBUILD c-blosc-1.11.2.ebuild 1319 BLAKE2B 97370a1b3e7c87da96c412e6a2c751bf8fd684e716f0ee525adfd90208d1d1d5cf4bc610072dd7578f9ca78f57e1c2b1e846f97874dd1740df5eef791d21c78a SHA512 efe7b63e4cb3eeaec4187967e28df0aa61f3a352806216942fc3173817729f82c8f30027ec9f57d12247d19117de6f50dbfa89e4b41a95653ebd13622e098ce2
 MISC metadata.xml 730 BLAKE2B 1e77a8bebe2f36cc0176d61bfb8839c80dc66b2c14fb0b8cdb2a997034308eae84ca6d9c403e4fc0da17b4ce1fcd571bcbf2f73d4349adc60a7e6163474df372 SHA512 eb015563106b9b23336c0954d6ab6395f823df52e33b64ce480376678d2d34ceb872775d607f97e8423ee888976f8bb74c6ee025a39b396882efec6af3af07f4
diff --git a/dev-libs/c-blosc/c-blosc-1.11.2.ebuild b/dev-libs/c-blosc/c-blosc-1.11.2.ebuild
index c06bbca39377..dbd37220fef8 100644
--- a/dev-libs/c-blosc/c-blosc-1.11.2.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ SLOT="0/1"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="cpu_flags_x86_avx2 +lz4 +snappy static-libs test zlib zstd"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	lz4? ( >=app-arch/lz4-1.7.5:= )
diff --git a/dev-libs/capnproto/Manifest b/dev-libs/capnproto/Manifest
index 891f33841817..880adfe27941 100644
--- a/dev-libs/capnproto/Manifest
+++ b/dev-libs/capnproto/Manifest
@@ -1,7 +1,7 @@
 DIST capnproto-0.6.0.tar.gz 1199198 BLAKE2B 90db934f8fd2affeef8908a9f8aa955892c8d25d556a76003f7d2e8e5634ea76e3759ace94b3bff42235e6da666e97657f69327ecdf620067e13ad2dde2a8105 SHA512 4882b2e5d1544517348e436600705d18b41fc82e6fc141a934ad960556ed73781c974d4a45f8c949a297edd5c95fb156fd75f1d7179666dc7ab881f98ac9e69d
 DIST capnproto-0.6.1.tar.gz 1720489 BLAKE2B 5fad902bb4221fa872bd52311442a4073c4e58e3d21726f24e06430246f1d757bc4d4e7e122df0a7cd9401ff2c47cb48d1791bb0b7ceda8889a819ac52edc02b SHA512 baea7f867bb789d3bf8cdc9c1a4a0d31cdce3beb7ae1fd9464690a006a86eca841aaac5d86599c2a84a39d62c4d01213b29789c2b7385ad6636fef95fc867dd6
 DIST capnproto-0.7.0.tar.gz 1983172 BLAKE2B d88b5f8e3278f8e3aceccdc459001b99328b0440812352dcb6b54bd11e18aa7fee6d337252841c86e9c3eb1afcdbd99884c965156d6cec37e3c0996c9ec1241f SHA512 a3ea278ded6a866759c0517d16b99bd38ffea1c163ce63a3604b752d8bdaafbc38a600de94afe12db35e7f7f06e29cc94c911dc2e0ecec6fe1185452df2a2bd3
-EBUILD capnproto-0.6.0.ebuild 791 BLAKE2B 0b6b2e3dbd35b4bc6e75d497b28baeb0bd3e1998da0b139e1b279896223f21c28db49f10ddd381922f55661bbb9e010da9d421a584c5ec2652e04dff513cb8f9 SHA512 d3c794f90de85325011c4510f8d3c230fd63aff7cccad7cf9183980a039c686cc4a7686740dfa1114295ed9ecf9a19a7cca02231b7ddbc48f5a06547be9bf90d
-EBUILD capnproto-0.6.1.ebuild 791 BLAKE2B 4d6bea6b1e5616528804f24a4f1b8b80da4c546ff854b27804ee51b6780d2f50875e71586f42e3f2bae3615dac3f4df5f8605e43e7ac37d45ffb3d73f96529e4 SHA512 032be8ca5ea93114e4f4febdcf5f2123455c32db6bac3cc619323913a6be59237c057fed11e339750d0f0a406498729606a4d25157f840e21a0dfefc4e142508
-EBUILD capnproto-0.7.0.ebuild 869 BLAKE2B 59dcbef3ca34af52b0378f70298fad711c64bed4886e633d2cfb0d8f24fe8a35dcd6713cc3d73b267bf715552ca3115c0017f1cc4380c2f9d86c414a83afb67e SHA512 9bff6f8abf740b2253e5a5bb24af76d4de268a7064eb938ae2a620b2ad3e626afd4e71bc9f34e6ada001b846cc12c818139765ebb2d1c98673c8880b64aaf794
+EBUILD capnproto-0.6.0.ebuild 815 BLAKE2B c568f71f4e6be421b7cc1c2c0cf5746c53f1ec0974efe46533441840ba0972b2431e42a65d3d78e49bc6dd3c7e19fa81fbda7b992855eb35460e0659134fa947 SHA512 65b75863b45e512e9dd073e55b3dd4ca8d1b8d2285df8d9d7f7f7cdafec970497ae00b78e2f72a359679db821a766e0dda4056c6fcf6184f8e1107887877da10
+EBUILD capnproto-0.6.1.ebuild 815 BLAKE2B e05f98460b1d6f3cfdf5cc046c555756e579f41ba887b42942230c7e185c0269f43bd9dc0ce10ee34b5c46c1d7999f78b5805523efb61560fea2c8837dccf68c SHA512 1b53b7a5505fdffb6ace4b7075f1abf8cfa3f67c0bf8fa532bfddcbcab7420208cfeb637e36e163a641114a68663f8cde39cc43bd9348af95e9b6cd058031c8f
+EBUILD capnproto-0.7.0.ebuild 896 BLAKE2B c757e024d3dba96bde07edba58c8ebb7af1a6cf0752f606ebe13e538b9b0b34401207fc8932dc485ea49fe4e1905e7d4b53c7d5c3f9f56a6910a891727515c25 SHA512 f7b7820d7a4d77d3e699683c56527596e5a45859a7b06f2ef7d4ddcc4648db489104ca8873fa9c43dce47dd2850d02a7f4905bd70c96fdd34057d0760082c3c7
 MISC metadata.xml 346 BLAKE2B eab1f05d43ea625945b539ea49039ac08905f9b4e0d6b85ace2c1c31cc7aa6719b15697e75d472afb2900e3810c19c091fee57f900f8688cc3586d713ec4206f SHA512 c3c8f965d691c76d1f31fd9d8edcb1c623eac59b81caf4bbd51a184a6b7f8c74b1c1459c15957341700fe443c18946fbaac0a28b46976fa23cd55c9e57a03879
diff --git a/dev-libs/capnproto/capnproto-0.6.0.ebuild b/dev-libs/capnproto/capnproto-0.6.0.ebuild
index 2a6230fa3b94..367234c1aaa8 100644
--- a/dev-libs/capnproto/capnproto-0.6.0.ebuild
+++ b/dev-libs/capnproto/capnproto-0.6.0.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
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/060"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="test? ( dev-cpp/gtest )"
diff --git a/dev-libs/capnproto/capnproto-0.6.1.ebuild b/dev-libs/capnproto/capnproto-0.6.1.ebuild
index 358e6ae7a0c2..de5d76054bfc 100644
--- a/dev-libs/capnproto/capnproto-0.6.1.ebuild
+++ b/dev-libs/capnproto/capnproto-0.6.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=5
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/061"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="test? ( dev-cpp/gtest )"
diff --git a/dev-libs/capnproto/capnproto-0.7.0.ebuild b/dev-libs/capnproto/capnproto-0.7.0.ebuild
index 59b088483836..15a2c832efd4 100644
--- a/dev-libs/capnproto/capnproto-0.7.0.ebuild
+++ b/dev-libs/capnproto/capnproto-0.7.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/070"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+ssl static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND} test? ( dev-cpp/gtest )"
diff --git a/dev-libs/cereal/Manifest b/dev-libs/cereal/Manifest
index 7917c6270776..4ffd0fac7862 100644
--- a/dev-libs/cereal/Manifest
+++ b/dev-libs/cereal/Manifest
@@ -1,5 +1,5 @@
 DIST cereal-1.2.1.tar.gz 301994 BLAKE2B 0fd5649b5e9c12615a0ca68939dd48544c749483ac114c35e3e7238de0ede624b12ded8e0f529df186fbdfd1069bf35821504b04cc1a40d87dbaf7a8ff82b15f SHA512 f0050f27433a4b544e7785aa94fc7b14a57eed6d542e25d3d0fda4d27cf55ea55e796be2138bf80809c96c392436513fe42764b3a456938395bf7f7177dd1c73
 DIST cereal-1.2.2.tar.gz 335759 BLAKE2B 6804b9aabb235a546758c70554502208f1b7b6bcab9b602fa075123335331f0522191a83027fdbac4ee947881c6866f24f48223a00b9490fca5ca961f3e4b260 SHA512 9567b2e19add9446b24f8afd122eea09ba6ecd1a090335cf0ab31fdc8f64c6c97daa3d9eaf0801c36a770737488e0eebf81d96d7b7a65deed30da6130f2d47eb
-EBUILD cereal-1.2.1.ebuild 585 BLAKE2B 8fd3fc34d8a0ee8183563f04d6af2545a72bbc661bbf408212628a0cf6609bbf2c7bdc05a35ae21e37d503fe9d12652ef5ff935a71b78ff43d66fa9a1b64962d SHA512 8be4219a1f3e2f9a74e4920f3786a2843238db2029a0c248f60f532dc859b2331567a7b60121f31fd6a144b10cf1f2e355a37dc71eb769407cc50b20e234ca76
-EBUILD cereal-1.2.2.ebuild 533 BLAKE2B 537531e5430d16896fafdcd7d918d148c8591d2e151a91f0b1a08b61d29725c6c93ee5aa8a538ec97b62e12b151c0d129b473665a527cf03a42951e5a36ac1a6 SHA512 e3ef43ef0951d82a241be5fa3484b0a253029eca7a4a354123b93a95e918310f683d73cf4d05f5393c0ada4fa8ab748e82c632cd067fe26943605a802f9e1c51
+EBUILD cereal-1.2.1.ebuild 609 BLAKE2B 50f1e95aa7f6170f7586debde95765334529ce70252f594305f4f84802a28258c2baac1ded2d14a7584784707e77158ee989f45f9adc4531da2cd932eae37a33 SHA512 7704b66514c95b9ea8f0135157b144588ab86b1519937a847c6430273f9ec0aad090fcc7651e9a100b62e65ea3722c5d7374b4c3d731a10552039f82aa786c33
+EBUILD cereal-1.2.2.ebuild 557 BLAKE2B 683cddc30d6e8c41ce82b813bd42ae684d4b443a01244fb7767beabcc03a522eab55e102df1d0d8da954cc777af8c7937244a93d76225b20c3c72bb373d59649 SHA512 dbf756221e0eef4ab69e8396056200e9c184da2eb62951aa84c0c0e06c3b5b2192c3f389b58c5b4cb8c81dbc56c128b1b46e85d91f8cdb1dd805c1efe125d090
 MISC metadata.xml 332 BLAKE2B a679c74a4685ee5284dec4d538af8be073746c2a00f777949a891942870bba3d06e732ec4d195c84c822036a060015984dc05b529696fe9a256348c435efe6c2 SHA512 efca0ade811924778a8cf3694bb6615636e8dcb9ae131b48659671293b49c8970be2e66dad7d413877246c8b0178656216c361364c02834e1eef8784e772191c
diff --git a/dev-libs/cereal/cereal-1.2.1.ebuild b/dev-libs/cereal/cereal-1.2.1.ebuild
index 038a8c4469b5..3e62e1429c37 100644
--- a/dev-libs/cereal/cereal-1.2.1.ebuild
+++ b/dev-libs/cereal/cereal-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-libs/boost )"
 
diff --git a/dev-libs/cereal/cereal-1.2.2.ebuild b/dev-libs/cereal/cereal-1.2.2.ebuild
index a873eb5bdfc5..fc09025d5883 100644
--- a/dev-libs/cereal/cereal-1.2.2.ebuild
+++ b/dev-libs/cereal/cereal-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-libs/boost )"
 
diff --git a/dev-libs/console_bridge/Manifest b/dev-libs/console_bridge/Manifest
index d80bd5e801f8..b92d826ce38d 100644
--- a/dev-libs/console_bridge/Manifest
+++ b/dev-libs/console_bridge/Manifest
@@ -1,8 +1,6 @@
-DIST console_bridge-0.4.0.tar.gz 230398 BLAKE2B 9f8473402d3df14284530be1285b62201fce6d08db7fca6675725fa104bbf929999a2ef84d7a2b7ea12f5645e609447ed7af6e4babe0832d953b3e181ada6071 SHA512 ebfd2ee31bd27380db750e1c40d9f09f50cc7db72f4aceaac9c5bf94894eb8db8ac7cbf67d82cfc27aa154d0e8f2c25ad80b12d06ee90679b5fd6d10fd8d4037
-DIST console_bridge-0.4.2.tar.gz 254013 BLAKE2B 9a02e1a6748c954783615be3242a90a27dd117940dbd5d9a3b5cb1f265ead3c6dc7891a7db2b9f908ce45bc200c50f9e15b5ef1069721d6cc0c9aebd44eb00fe SHA512 21e5d8eaef03512de48189a678318ddc6cb824a99e06885a3185c8316fb1839596c79be4472795b5ffe4be33bf5896b305410fb1144ee979d071e273f66bf532
 DIST console_bridge-0.4.3.tar.gz 254021 BLAKE2B dc0816c65fb44151c88935058abc1528b1162d5fa8a940956f386031a23eb087e2653954ec60ff08f2f99fc6b3da76b08d8d6db6903955061cc6832d9e2e80ef SHA512 034f69dcfe0c56b93a5bc60095afaaaa275955ff58f0ddee1a0a325eff3981c41703c8b521b43cdca5f6317d6a5775e7caf221cf2d79b5d62045b0f4315cc577
-EBUILD console_bridge-0.4.0.ebuild 663 BLAKE2B f1157b2f0c44f5d4f3b0c6f1112e786259795fef7ec8e8cca233588883b8557c521fa08807d5072c7baccf22b6e8afc081ca65dde72c4742545d95ce7bdcf644 SHA512 80b2bde2ddea1977510af71c8d1516b46a61477bf02523fc72c7f879011aa8ca2bf0d2441e371dcef768f24dba887ceb66dc8eb230dcc0e1df6296e81e95627a
-EBUILD console_bridge-0.4.2.ebuild 660 BLAKE2B 0f97c722af6e86c9181b86b22df65ebbe6b6e1886a5bb462bf4538d4bec4d20ca7e1dc84076426dd8a0e01206e9c693b3c011c890c43d5bbb863d65453e68a69 SHA512 8b712f5dce7bc67dbe004d81820e9b213e85246863ddeb1b883631f52d1c3bf186a78049529a147746cb4ec1eefce4cb51e9f5694c491a4fe93346047f8b1256
+DIST console_bridge-0.4.4.tar.gz 254030 BLAKE2B ed25742be7eabe4723beb49db33c14eec8653234e86b10aaad49f0138dd610d1901be65306bd5dc1c3e297c2fff591a20dfce7f6e3134144ffc5e3e966c3c206 SHA512 9b8f165e3c2ea4a6c9ee5f551c78229aa57196d19c87a4393e9257bb65aed4dcfa0eb97a0b8c433347c71330659ca80ac6a3952775adb20312c51c31ef905184
 EBUILD console_bridge-0.4.3.ebuild 660 BLAKE2B 0f97c722af6e86c9181b86b22df65ebbe6b6e1886a5bb462bf4538d4bec4d20ca7e1dc84076426dd8a0e01206e9c693b3c011c890c43d5bbb863d65453e68a69 SHA512 8b712f5dce7bc67dbe004d81820e9b213e85246863ddeb1b883631f52d1c3bf186a78049529a147746cb4ec1eefce4cb51e9f5694c491a4fe93346047f8b1256
-EBUILD console_bridge-9999.ebuild 663 BLAKE2B f1157b2f0c44f5d4f3b0c6f1112e786259795fef7ec8e8cca233588883b8557c521fa08807d5072c7baccf22b6e8afc081ca65dde72c4742545d95ce7bdcf644 SHA512 80b2bde2ddea1977510af71c8d1516b46a61477bf02523fc72c7f879011aa8ca2bf0d2441e371dcef768f24dba887ceb66dc8eb230dcc0e1df6296e81e95627a
+EBUILD console_bridge-0.4.4.ebuild 660 BLAKE2B a20604842f209961f17ed06f2328306829722971b642fa7284ae72abc705f0897dc93d44ec1ebacec2613b78b3deee1b953e674e4175d8794679a3ee72e48223 SHA512 6572426be9429d43884b3fc97e89916cade366efc4e64c024093b78cad573bcd4a609221dea0ab994ba546f9d6a6feb762040302d8a1a685aea0cbf708621244
+EBUILD console_bridge-9999.ebuild 660 BLAKE2B a20604842f209961f17ed06f2328306829722971b642fa7284ae72abc705f0897dc93d44ec1ebacec2613b78b3deee1b953e674e4175d8794679a3ee72e48223 SHA512 6572426be9429d43884b3fc97e89916cade366efc4e64c024093b78cad573bcd4a609221dea0ab994ba546f9d6a6feb762040302d8a1a685aea0cbf708621244
 MISC metadata.xml 342 BLAKE2B 27f453549abc2dbcca6275e79549c765f3802eccc8161d95baf12311844a9a2b4b42ad7f20e84ca07bde29048436dcfb2b9644b88f30f5a2889b50516afb1e10 SHA512 a438639c10d92d4ae5b4b54b7dff6dcdecfe829544dc7480dd830f38803efe0207f142d5b6177aafb1b170979d11dea590d85d75ac7814dead2edce720367aaf
diff --git a/dev-libs/console_bridge/console_bridge-0.4.0.ebuild b/dev-libs/console_bridge/console_bridge-0.4.0.ebuild
deleted file mode 100644
index cab29294793f..000000000000
--- a/dev-libs/console_bridge/console_bridge-0.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/console_bridge"
-fi
-
-inherit ${SCM} cmake-utils multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/ros/console_bridge/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="A ROS-independent package for logging into rosconsole/rosout"
-HOMEPAGE="http://wiki.ros.org/console_bridge"
-LICENSE="BSD"
-SLOT="0/4"
-IUSE=""
-
-RDEPEND="dev-libs/boost:=[threads]"
-DEPEND="${RDEPEND}"
diff --git a/dev-libs/console_bridge/console_bridge-0.4.2.ebuild b/dev-libs/console_bridge/console_bridge-0.4.4.ebuild
index 24c3a5e41f0a..1fac726c6456 100644
--- a/dev-libs/console_bridge/console_bridge-0.4.2.ebuild
+++ b/dev-libs/console_bridge/console_bridge-0.4.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-libs/console_bridge/console_bridge-9999.ebuild b/dev-libs/console_bridge/console_bridge-9999.ebuild
index cab29294793f..1fac726c6456 100644
--- a/dev-libs/console_bridge/console_bridge-9999.ebuild
+++ b/dev-libs/console_bridge/console_bridge-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest
index a00df160c88e..29c5a287ca13 100644
--- a/dev-libs/cudnn/Manifest
+++ b/dev-libs/cudnn/Manifest
@@ -4,6 +4,7 @@ DIST cudnn-10.1-linux-x64-v7.5.0.56.tgz 471291852 BLAKE2B 966a84e983631c827d7852
 DIST cudnn-10.1-linux-x64-v7.6.0.64.tgz 500810447 BLAKE2B cfe884dd3b2a5ca4641844a0b5df22420148bcd9092b9ad81a45560f901d36e3ab228e7b5fed85519094f4b68be46cbb631368d67166cbef2546b94185a9058d SHA512 c8d2c6efdb79940f5d475057b1e11246038b894990f58a620635e03d561ec3987806c0bccee8c12d0d3d8c4b5bf5211e46faa2c12918520af61f36bd36eb1738
 DIST cudnn-10.1-linux-x64-v7.6.1.34.tgz 521806738 BLAKE2B 9804ed394cf58f0c415d454ce83503db3faff74181e3746eabbae648cf85718ccfdcc1b64877e30e367a285294665975169fe1f992c27ac12b65d340784079a8 SHA512 81dc9a3d07885996b3b7141ea9785768dd6e266d138a671b934139b38ac1dcab0ffdb97617b308a9f492b5b163cb4dd65972e24de98499a2ecbed2bd261c1244
 DIST cudnn-10.1-linux-x64-v7.6.2.24.tgz 522872521 BLAKE2B 6424ade8443521138b36bb528105bc482202ff475dd3eb3aaa7f992e8ad8b67628ac1b464d10056f16bb5766fb8464abe8ae406f8766831d248b90796d146c1e SHA512 3451c113b4dcb8aaa33b2740e0e0b60d121ef02525c4e8ece3d7afd76b3472f704a90eb69d1a06f2bc94a981c2bfa3bea2f3bd057dcbdc6eecdea1056563057d
+DIST cudnn-10.2-linux-x64-v7.6.5.32.tgz 548210361 BLAKE2B 51fdd14f0bbc5a029bddca94ab7ae56ee77c16fdc525c78b986bb3dc1e0525943e5ab17eb81e356ef92c985ee467bd87a6670c343a96136d932ace86bb649437 SHA512 943c1afc0b7711dec87931770eaa567e25361a31ed5e1edabcc3f81df72880428611308e8032a28dc197e8c5edfebe3f67cc9d22a21eb569d8b254d8eb84eac6
 DIST cudnn-8.0-linux-x64-v6.0.tgz 201134139 BLAKE2B a7e616c671272a3a0f0c51b93646c8c60302c3dec85b71144e011bc3460d0ce80ff75d39869c05c4ef183d2d09aff31bb470a3fd3fd3d79b581a7a2d5a349279 SHA512 ddeeacb5b449920d942a26b98c353d78fd6f7d7fb3b3ce42a078626473efdda25c7ae641232702d62eb5749e39ecfd03e88346119c920c19348ac3ee82d3ff47
 DIST cudnn-9.1-linux-x64-v7.tgz 343081241 BLAKE2B 22c2fbef38a05e7929ccc28410dfdbff906b2c3e97e0419cf83988c2fc2340005e4a944d43b1a215b0c3458b2cad03480b7e537ae93861924c28ec1010a530fb SHA512 7eadb64a3d5e49aec2761e6f7dc0295c1d356910b114eed450c47081fc81b6e3b7748f3a4153f6a9d957691e3689cd52823bfa12816b1950dfc8794d6f332749
 DIST cudnn-9.2-linux-x64-v7.1.tgz 421083972 BLAKE2B 1a1dd6708132d6ad6f8f541694b1406de4a26b7bb78b6198bc8ec5ddde2172d0cc0dc540c7c446a2f941ad11cfafa562235d17129ab8e6aa641433c35c8d31d6 SHA512 2f67c905976eb041512eb012a7cc98e1f408ec867f6a1d9d440afbcddc622c03c40de10386e44e4ab138c1a4ad040d39b0e9243f68e22975ca27ec297be25c5d
@@ -16,4 +17,5 @@ EBUILD cudnn-7.5.0.56.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c1
 EBUILD cudnn-7.6.0.64.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
 EBUILD cudnn-7.6.1.34.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
 EBUILD cudnn-7.6.2.24.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
+EBUILD cudnn-7.6.5.32.ebuild 718 BLAKE2B e8fec9a34ff7103a60c8ec7f226d29054c711c13cc127a41abde7620344246edb06139147a769a3b3b0a7fd007765177ed781726a297bd9d013cc2e44e86bdff SHA512 d435be66ef4be1c40885016c5e13d5fd11dbadc4d109f06da5eef3608bd3d57e7b66b54d3f6ea12c6a94a4d91aaf8b8b6fd3872aab7205d4473ea61281cc8182
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-libs/cudnn/cudnn-7.6.5.32.ebuild b/dev-libs/cudnn/cudnn-7.6.5.32.ebuild
new file mode 100644
index 000000000000..9efaf0b7e601
--- /dev/null
+++ b/dev-libs/cudnn/cudnn-7.6.5.32.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CUDA_PV=10.2
+
+DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
+HOMEPAGE="https://developer.nvidia.com/cuDNN"
+
+MY_PV_MAJOR=$(ver_cut 1-2)
+SRC_URI="cudnn-${CUDA_PV}-linux-x64-v${PV}.tgz"
+
+SLOT="0/7"
+KEYWORDS="~amd64 ~amd64-linux"
+RESTRICT="fetch"
+LICENSE="NVIDIA-cuDNN"
+QA_PREBUILT="*"
+
+S="${WORKDIR}"
+
+DEPEND="=dev-util/nvidia-cuda-toolkit-${CUDA_PV}*"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /opt/cuda
+	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
+
+	insinto /opt/cuda/targets/x86_64-linux/include
+	doins -r cuda/include/*
+
+	insinto /opt/cuda/targets/x86_64-linux/lib
+	doins -r cuda/lib*/*
+}
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index c1e2d371b3b3..83fdfe741869 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,3 +1,3 @@
 DIST pcsc-cyberjack_3.99.5final.SP13.tar.gz 1617714 BLAKE2B 344f00217fa5dfb18e5318d2b8ccb88a3cc12b86a9c14d41a9800d701d0fc7a0a486a0b3c05188d07d1f7c51c4c514c48a55d987d8d9d2af574f427e550c8654 SHA512 74ac56a0f74a69006c87e2c22e147b65d26582d29753de03d56e4ad76413f4477a031d47f5eb074323b4ffd000b0908a1fb2b12fb7d91e9b3ee67e983e09e968
 EBUILD cyberjack-3.99.5_p13.ebuild 1909 BLAKE2B 89a8930abaf196be95b6657497a5756469ffb0d1021aea7fb383aa4cbe0a44bdf4f19eb89e91908f79afcefd42d48c9c66d89ddc645270c610c2d7fce4fcd945 SHA512 e639adafff9fbc49deafaba8c35886bc3efb260a37dfdcd18200b70a6fb43cfa8781609e5ab87fbeb844c9bf10908d5a880468130c6522e592062bda29040862
-MISC metadata.xml 741 BLAKE2B 1660cf6afa7c5988573bb7a651560b0ce38832ad7149784aabd2589407c3d6fff7a9a76a0ee3bef81c1e3efaa46c8733e7e8de724d07bff7766280ebb8dcc4be SHA512 442fce5186e7a04e0d96b2d179db3438a4d7b8f0b5b11443d494d8b0203881c63dd4e4238eae594ad5c15b7eab683c7d35d50d24e147ce896128784ffe7442bf
+MISC metadata.xml 622 BLAKE2B 4238fe4ea370787f4542d53d161afaa0c0df5788d7a2da5ee6b99b788ae6d4456cd43d6ea8df0a174431b4582127fb49712a59ed2acdbeaf4808f57b8fa44930 SHA512 2062ac48ee73a6a58a2663e39f467e8e55f06af48b7a04b5f174e467c3f33d4b92b93b8fff3747447503b3256fc514fc40c8e07f7cbec8e1608d6389d9aed4ba
diff --git a/dev-libs/cyberjack/metadata.xml b/dev-libs/cyberjack/metadata.xml
index 52a3a62602d7..e57eaa0f05c4 100644
--- a/dev-libs/cyberjack/metadata.xml
+++ b/dev-libs/cyberjack/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		REINER SCT cyberJack USB chipcard reader user space driver.
 		This package includes the IFD driver for the cyberJack
diff --git a/dev-libs/cygwin/Manifest b/dev-libs/cygwin/Manifest
deleted file mode 100644
index 112586756a63..000000000000
--- a/dev-libs/cygwin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST cygwin-1.5.25-15-src.tar.bz2 11486150 BLAKE2B 0fb9119396fc609dc243026a1a706a2a9ff87d34184581802d284a138e575dedce62f176cf31b02ab1bd9c1e218588b4f35e4a72cc554c95fc84af1f5f5bb47a SHA512 464553b06f74ffad464361b0bddb2eacc581abfb68f2154bba8f70334274ec63901b1f46f73cf930b05256467196e1b1ab8003215bb12ea6a42ad73fd9ac229a
-DIST cygwin-1.5.25-15.tar.bz2 1427096 BLAKE2B 7a6a2a5be6eaec21660a8f4ffa3e76f5390f9893a057d2d22ff888989c2fa11137b5516d7dd9698c17a92f5296a11d2c0c5ad8f594196ee29232508d29e10641 SHA512 72f677cd9140d4f61808203a56234e47b8e3a6e18438ff2c8d47d45472d6cc671e4dc42603967e62a1b2293d4bd9d4e1d95652746f939a6d5e1f1ec2f6c96105
-DIST w32api-3.12-1.tar.bz2 1229076 BLAKE2B 1e182fc23c01fa58fb63510351a9aa76aa046dc4971a9cdf402be0100c8765323afbd207a5ba9a92e8f906bcedbbcbf1888685092554bab0238066d490009dee SHA512 739f1f71163cac83ed892dda157f25bb30e70f2c1b134df069a6ece5fb5784e4394d597b078a8a913b8b66fb0f617495aeb94ceab2f1e5a25dab712a010f3f29
-EBUILD cygwin-1.5.25.15.ebuild 2150 BLAKE2B 1c8fdf1228fd10f69e411842a7b3edd6b9cffc80666d19cc116c58fb928180348aff02d69df2743f8098d33ee91d54e7bba634d3391e733eecfe88d51d6fa397 SHA512 66c2f425a79ca563a8d202e7da740ac4c0186fd57983f17f5388e9738e7eadacfe5a5d220a90eb8cd4419e38acd93754b0fd2f45ad535abeb3863bfaf0007896
-MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/cygwin/cygwin-1.5.25.15.ebuild b/dev-libs/cygwin/cygwin-1.5.25.15.ebuild
deleted file mode 100644
index 433361029fd4..000000000000
--- a/dev-libs/cygwin/cygwin-1.5.25.15.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit flag-o-matic toolchain-funcs
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-
-W32API_BIN="3.12-1"
-MY_P="${PN}-${PV%.*}-${PV##*.}"
-DESCRIPTION="Linux-like environment for Windows"
-HOMEPAGE="http://cygwin.com/"
-SRC_URI="!headers-only? ( ftp://sourceware.org/pub/cygwin/release/cygwin/${MY_P}-src.tar.bz2 )
-	headers-only? (
-		ftp://sourceware.org/pub/cygwin/release/w32api/w32api-${W32API_BIN}.tar.bz2
-		ftp://sourceware.org/pub/cygwin/release/cygwin/${MY_P}.tar.bz2
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only"
-RESTRICT="strip"
-
-DEPEND=""
-
-S=${WORKDIR}
-
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration; do not emerge this directly"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	if just_headers ; then
-		mv usr/lib/w32api/* usr/lib/ || die
-	else
-		rm -rf ${MY_P}/etc # scrub garbage
-	fi
-}
-
-src_compile() {
-	if just_headers ; then
-		return 0
-
-		# steps to install via src pkg
-		cd winsup/cygwin
-		econf || die
-	else
-		CHOST=${CTARGET} strip-unsupported-flags
-		mkdir "${WORKDIR}"/build
-		cd "${WORKDIR}"/build
-		ECONF_SOURCE=${S} \
-		econf --prefix=/usr/${CTARGET}/usr || die
-		emake || die
-	fi
-}
-
-src_install() {
-	if just_headers ; then
-		# cygwin guys do not support bootstrapping.  thus the cygwin src pkg
-		# blows and cannot be bootstrapped.  use the binaries -- the only
-		# thing upstream supports.
-		insinto /usr/${CTARGET}
-		doins -r * || die
-		return 0
-
-		# steps to install via src pkg
-		insinto /usr/${CTARGET}/usr/include
-		doins -r winsup/w32api/include/* || die
-		doins -r newlib/libc/include/* || die
-		dosym usr/include /usr/${CTARGET}/sys-include
-		cd winsup/cygwin
-		emake install-headers tooldir="${D}"/usr/${CTARGET}/usr || die
-	else
-		cd "${WORKDIR}"/build
-		emake install DESTDIR="${D}" || die
-	fi
-}
diff --git a/dev-libs/cygwin/metadata.xml b/dev-libs/cygwin/metadata.xml
deleted file mode 100644
index e396f3755977..000000000000
--- a/dev-libs/cygwin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>toolchain@gentoo.org</email>
-	<name>Gentoo Toolchain Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/darts/Manifest b/dev-libs/darts/Manifest
index 9bfd6d58d1bd..76b36cb940cf 100644
--- a/dev-libs/darts/Manifest
+++ b/dev-libs/darts/Manifest
@@ -1,6 +1,6 @@
 DIST darts-0.32.tar.gz 234001 BLAKE2B e40f16e6ead25809d981c98924867903e1d0f3734682b61ad1be40a10a4212795dfdef55a0eb6f9d0f60ef7676ed27929a6812bf8f57972dcf00875e99d9917b SHA512 b9af8ce60688f5858dac2cac35a8666848dba6729f9f4364786123a1c0484e56c8b981ec04e59653afbcf20cce3b326a49243095213efb525b5669472ac7358e
 DIST darts-0.32h_pre20181117064816.tar.gz 38856 BLAKE2B db4bf7ca88ceb81dcaee4494708d3f469dfc4f1ce53aa731f291d4b7d73f2c48a9e8d97caf32fd0bdd66aaba1c9e3e2e0289a5f2fdf7f5f1f2351c3808d6a98c SHA512 092cc833fff937365117f5b780f09a1ffdd25104ab57e36f7cba25a9a6bee289c105cae997a50b61b5b542c1c34d71bddf132d0ca14d563198b57caa9af2ac22
 EBUILD darts-0.32.ebuild 729 BLAKE2B 1dc4fef45e356b9a262761d3856ef7f738b410abf05ae38b3e9234d7add6628373742188d5de7e7d909e03da6ab80116f78758c18d82d90228dc0ea1c1ae6e4f SHA512 00b64494e1fe11c587c0a6112e6934574d081657a87f3ae0e9dce4fb5f769b946e52d58039f2d07b4d8ec57a048769fdd6e0830e73b5e1ca4ed11726dfbed954
-EBUILD darts-0.32h_pre20181117064816.ebuild 1355 BLAKE2B d3be92820ddbb72b77ca357450cbe13172d010f349c64f668656f5c544649c629c9f6029d889318792aacbf9d2849237b8814db8c4fdfcae469af2f4a6592c25 SHA512 e62e473d08d7d3e72fe1a9d86c05e3bffb5c8d791bfa63a0e35ff587cf99591966266280dd82735154da3faa3f3f7cb2509e19f5e143656d2e011ffd09f2bd52
+EBUILD darts-0.32h_pre20181117064816.ebuild 1353 BLAKE2B 8e2c0c1693cf8fb04771c4fd37fdf9b5b95f59bb45eb4580516baefa4f3aed401b16b14bfee11df28aff5c44cdb15320db4562c9b1f0ff8f83784004cf807522 SHA512 590c632a2626d2b86708b93af8fbe1fd0684e6348a90f4d142d7a6f91d2553631f3f3304120b53675a276ca4b366beaf0ca327d73376678488f9363931e10401
 EBUILD darts-9999.ebuild 1209 BLAKE2B fc98dc93002e7a6e7d4269cf2a13b8228056b29b72f8dee5519587bf8d4888678ee0748a86074d5e6b73d877a8d8fea7fa77eb31b998295cd99145b36496a0f2 SHA512 892651f7fdebb19693f99e03d1f3fda914aef6b91d56192692292252a1a3978bbf58e229bd0e9e051b3845ce7d5046d6aac05f86da850e252e3bf85913516592
 MISC metadata.xml 317 BLAKE2B ba86d84ef277a4804384827cd7ee4e9a94fd436a8c3b195c8f7060f69191a55f15530a4c8794ea810e3a3c568de194b85fd2d813baf3dc17c52c3297042b8cd7 SHA512 d00da6fdec16d16929003623603ebbc9ef6f6bd92da8773553a219d49b396e8ea18aba30d5a505ec934cf4688940a8ffde7e24d5e9eb2e210bf0801e9cfc795d
diff --git a/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild b/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
index a379bd2b6cb6..a377777d7d3f 100644
--- a/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
+++ b/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND=""
diff --git a/dev-libs/dbus-c++/Manifest b/dev-libs/dbus-c++/Manifest
index 62cde5cd902a..c41dcb2e5d5b 100644
--- a/dev-libs/dbus-c++/Manifest
+++ b/dev-libs/dbus-c++/Manifest
@@ -1,5 +1,5 @@
 AUX dbus-c++-0.9.0-gcc-4.7.patch 1073 BLAKE2B 2cc43e4d23c14646adfffae77bc1168b69d4e3e2049ae8d3b5283d41f8214fd6884500fc014b66dfbc86dc1928c7e5c33024833e4b2bb28ddad6d17e443db2d1 SHA512 3625f7473db8ee069009655f5c8b68bd7290d622be56ace8e1472bd93b0a946a000bf0d728839cd6309414cbcb925247bfee888bb58fda8316e906fe5a8e25b2
 AUX dbus-c++-gcc7.patch 891 BLAKE2B e3f1c902b52cbec776849c86d2d4c7a13acbc907355c380cad7eabdfe670d9058a1ddd3687af9bcbbd4d815affea21728d8296f5a87122bc6b5fc99396ea0428 SHA512 b8c67af11620c2414d482cb3d77784f7c9831e64e0bc9cb9b946e13b0ad13135f06cfb894667fb9b184e6fc7e750df0769a2d4c09df4f430c2189c2c3804fbae
 DIST libdbus-c++-0.9.0.tar.gz 466362 BLAKE2B 401e266286fef383754c945f3adcf8e68a1169e55d33614f1e11227c324fe1219db7043674b5894d548f827d0b673ab4f012babbb4a395c212f6e17ef6d0e281 SHA512 7acebbb4254b2886cc0f05c5ddeeeac0b5863c5552d32249463b89380b0b95b8225c80bd98b8c7fcaada42ab770b5eff41b15390cd0d78bf1ee322ac6c2de319
-EBUILD dbus-c++-0.9.0-r3.ebuild 1687 BLAKE2B cbead8e369db1fb56f2018e6df20e7e4371d2aef36df9bb023780d04ebd3b4ac2439979b4803236d64d8e7a7dc32725aafc208e5829e60a654002c5beebce5a3 SHA512 fc47c3de0847fe572bd6ecadfb54efde8851faaf4c9e056498494b6a6ebf8ed4d10bba0c5752341aeaf1c10d3176f43223a127d2a37bf3f58aca83ae51f6277d
+EBUILD dbus-c++-0.9.0-r3.ebuild 1709 BLAKE2B 45c71166f3ffe945daa7bd132f01180e624648bfff97e7d99bcb1bd22ccdcdaf6f880dbb220a2af0b021e658de0d09547d1ba80297a585c7db61db6e2a819ecb SHA512 6443fa82cb24fa4bfc6acb039dd13d164220fc3ce86c11bcd0f0171fe7aee782364202efc4e281ab2976d06b2518517366962c28f4b537390617215200b2d32b
 MISC metadata.xml 455 BLAKE2B bfa5bb5384bf8187f5be23cbb737bb6e6e453f7bca875ec9d978ee40f0812ee38b8bb46315290f79be935f074a4075df5f954c94a06185fdf9a75771c4184096 SHA512 8c3a3e516a5401174cc93ae457b7fe8fc20fd6e7b68f24e05576c04c9dfde90055262af435b0032b82e57644a20f117aed1eea37f71b08b9cfe90b0689e14646
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild
index 89e531716b5d..c6463e43878c 100644
--- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild
+++ b/dev-libs/dbus-c++/dbus-c++-0.9.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"
@@ -13,8 +13,9 @@ SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc ecore glib static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sys-apps/dbus[${MULTILIB_USEDEP}]
 	ecore? ( dev-libs/efl )
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index c7663057427e..a06ab973a168 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -1,3 +1,3 @@
 DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
-EBUILD dbus-glib-0.110.ebuild 1898 BLAKE2B 51e814ef0cd61157c269994517bdd0455a24e2f5c9baa7b2d73eb2301d88891396bea801f881a7353dc4d1e8a7cb2fbb1ec2e75ac1bc84f926dff72f5a002711 SHA512 de39d088f57af158163a2c987e4905ce7318437b54da98bb328385bf0d433664a56c89f67d6e1ed5935eddc41499c3d28c0ee4da511ff8dc7a17a9ae612044b6
+EBUILD dbus-glib-0.110.ebuild 1925 BLAKE2B 3a853f9e2a9cff4b46e859c4efb40704bf550fac5ded70cd9c410d7a978aad8e787a2af04445316e1570ecab19e87fe3174c6e257c54ce9b03a80872e8426afa SHA512 2ec307e2e411d1f5604e452dcafc87d11bcdd2d17afc5dfa58dfc6bf92f01515fddd27584dd801554346aaa6d2d752be7509cb3c8d4be81e6b6f731e530fb33c
 MISC metadata.xml 326 BLAKE2B 83337c958adc4c6e7c8ffe6c166598af211c2688753440bbf3978e3bca37553eb90d3d0c8b0423d422691afcbae51c872b2149c97a76206bd090e379e7fff422 SHA512 65080e75b6d877c594f4f4a1e931d26885b3059f43d567ccd640f089cfc5d7969963cd5d8fa51200dbbafcaf93eddf6faa5cf7d548b60809b808543dcb3c2af6
diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
index 9a13087f2463..3e10ea1cb88f 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -12,6 +12,7 @@ LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
diff --git a/dev-libs/device-atlas-api-c/Manifest b/dev-libs/device-atlas-api-c/Manifest
index 033dd28bb157..c8da4d8f9678 100644
--- a/dev-libs/device-atlas-api-c/Manifest
+++ b/dev-libs/device-atlas-api-c/Manifest
@@ -1,7 +1,4 @@
-AUX 2.1.3-src-cmakelists.patch 629 BLAKE2B f3bb4160bbbe58a92e33216f11b52f25b3fc80d58efd11830575b819a41165df51f3c7e8c1a4c431157296d34f179c95c596b2d37b22b5211ff3e7e05989e671 SHA512 08b5f1156341b91911adbba7d527f11f385642a8afcd0ad0e833f83e6c799dd85bb6195dddf9cde13672ec9f52b5b7094f57a09c85866c3c42e627495b45e9bb
 AUX 2.1.4-src-cmakelists.patch 1496 BLAKE2B 879dfb7943eee4c03791c25b1f73d5a1d1cdab07f5144f46891d610492dffd61dfa0cd03afb35177740615549a81ac403d0f4009992cb78d46fccb2f20efe922 SHA512 1f9097accda72d10bf5201110fc5ae099d99e4a6573ac30fac399744b88ce9957f6fa82e8c11275663e028865c8c4b376d07ba8894785b57e8324e6e2ea81f2c
-DIST deviceatlas-enterprise-c-2.1.3.tgz 183663 BLAKE2B e190aa8e9a4b9bc90af76e21eb425c0f040ef70e605c8f9e588bd0c859520a82807aaafddd24402d3365e94bcf3b7a875a65804f2b1b3bed6f0703f28a841440 SHA512 364811d42b2c0d937a12f2bbfee760701a1dee4e93bcc84423c8b236d59257a3440111ffc6072a7822b9694ea65986572550f67d0b1e5d68a784d1339b2b70aa
 DIST deviceatlas-enterprise-c-2.1.4.tgz 51756 BLAKE2B f8dafdf31b608890da07214e14e9b2ec558e2c9c94c394a04c554e915cc1d4e2e886be1c0932353b0a68efaf90f190157696a2575db6ff2a86bbca3b492bc427 SHA512 5ea765738560c6dbc90799426f6bc0e6eb5e7775fa005279f046a68a4a984305ef99ae8b943dd9d32f88d88c1d24b6c09145643fa64a90eb834fc4a6ece05008
-EBUILD device-atlas-api-c-2.1.3.ebuild 1061 BLAKE2B fa019f2768618bfd43c93ae8936efb609824ecabc6fb49871d3b1fa57ef00775c4764365779b3bca8b8adcfeb64805beeb7ab1b7e196d76b2cc27a7110f0bc93 SHA512 26b10edaf8aae154e9b21fa32da662305b51e6255a12e5fe9d0e3d2ed49e57dc30c630d6cb98af8c26c3989f12e579861a8647fe10c36d3e80529f31baa50507
 EBUILD device-atlas-api-c-2.1.4.ebuild 992 BLAKE2B a82dc8b3f1e78572763a771cd8a59d80c719b6613e1591ed074864512811c0b3e3a5cf84e34a161c5312d7669a686b3072333a6e51d36dcaac1d98a4d91effe5 SHA512 bc9272a8efb0a99008403dc981d662a86800cd92e462a3c9d0c517b0ffb83a19d7a711abc3675a384d23d0a77a4b32b43755c81153bfacbf4ed0ca27d65a6486
 MISC metadata.xml 794 BLAKE2B 5021d469addcb51164731491a3a9ae1c24c3a24ccf2159574bcd8cb2c3ec7aa5dd217beb093c696db8438ae31778c18f8d047e73deec3984683009f50279af41 SHA512 2da64d528f2e49d368ba7b8684d818f0d8bb979dd0c64d613f25bdca97a9c5a3af2eb85f4955e03ed52dc5eb43b3ba7bad21eb94bdd67d370e1ddfa6545b26a1
diff --git a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.3.ebuild b/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.3.ebuild
deleted file mode 100644
index 2177b9530f2d..000000000000
--- a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-MY_P="deviceatlas-enterprise-c-${PV/_p/_}"
-
-DESCRIPTION="API to detect devices based on the User-Agent HTTP header"
-HOMEPAGE="https://deviceatlas.com"
-SRC_URI="${MY_P}.tgz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/libpcre[${MULTILIB_USEDEP}]"
-DEPEND="
-	${RDEPEND}"
-
-RESTRICT="fetch mirror bindist"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-src-cmakelists.patch"
-)
-
-pkg_nofetch() {
-	eerror "Please go to https://deviceatlas.com/deviceatlas-haproxy-module"
-	eerror "And download DeviceAtlas C API"
-	eerror "Save the file as ${MY_P}.tgz in your DISTDIR directory."
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		local -a HTML_DOCS=( Documentation )
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc Examples/daexutil.h
-		dodoc Examples/example{0,1,2,3,4}.c
-		dodoc Examples/util.c
-		dodoc Examples/EXAMPLES.USAGE
-	fi
-
-	einstalldocs
-}
diff --git a/dev-libs/device-atlas-api-c/files/2.1.3-src-cmakelists.patch b/dev-libs/device-atlas-api-c/files/2.1.3-src-cmakelists.patch
deleted file mode 100644
index 6d1f9ff5586b..000000000000
--- a/dev-libs/device-atlas-api-c/files/2.1.3-src-cmakelists.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Src/CMakeLists.txt
-+++ b/Src/CMakeLists.txt
-@@ -18,6 +18,7 @@ if (NOT MODEL)
-     set(MODEL 64)
- endif()
- 
-+include(GNUInstallDirs)
- message(STATUS "${CMAKE_BUILD_TYPE} version")
- 
- include_directories(${PCRE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-@@ -37,5 +38,5 @@ set (CMAKE_EXE_LINKER_FLAGS -m32)
- set (CMAKE_SHARED_LINKER_FLAGS -m32)
- endif()
-  
--install(FILES libda.so libda.so.${API_VERSION} DESTINATION /usr/local/lib)
--install(FILES dac.h dac_json.h DESTINATION /usr/local/include)
-+install(TARGETS da DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(FILES dac.h dac_json.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index 312c4af66434..0ba688d73325 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -5,8 +5,8 @@ DIST ding-libs-0.4.0.tar.gz 827058 BLAKE2B aa6e1cef9747646ece2643495eaa720254a96
 DIST ding-libs-0.5.0.tar.gz 868840 BLAKE2B dc89dbd0951d8505776ae98a10bbfb54f4a2106da0a5b76f3d08556f7df0e85093862813ceb12f0190709ca71fe75eceb2c373dd95a0437f15ceec0bd70cf171 SHA512 d79db6794dbb59b518db15c51c3f981e8873e478a156ca8ae766a61107796968eeed36cf21bd20f5e6f04c5b460d3a40ab114a482754e2f3976c53bb82fe1fcb
 DIST ding-libs-0.6.0.tar.gz 880038 BLAKE2B 97d575fa73e436ae5062c15eb6448a31f3e2758ddc42338556a2c697e83ec4c57aa60867d5d2dc6add935266c8a4404f59d089fe52507d52783aed8bbe967503 SHA512 7218b6825bc078bdc35f149bd17944f427af0e32fa4d94026c00ecd14037598959ad7e1dee46af6fd3736424cdb499720fd8e1a0d1dfd173a5bc0085f8f986b2
 DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc246492fb1cc3581661184d050827aad6a5897aadf9b06db9b6dbd18da756637bd27bcc02742c6318c8cc7e68298 SHA512 335a0925bfa7cc113e86c91ad3f2c8aac12711879d5c9b62660140a4b749335a74024c987fcd2304dd78176362997b3e0ebd745193aaffab7a368e2873118628
-EBUILD ding-libs-0.4.0.ebuild 492 BLAKE2B 56a1412b2906d75ba6623c7e3f57aff2829a95c4fbdf8b21f3127754b5950deeaafaad6e918e6f97a26e44ea5127b7cbce2e58b4a2d16faca17a85bc9791eace SHA512 169e8d203a8aac008017dd1d61e7c160d75b97f90f4874ab6e6321c61a6c58b7bf04817520b081d33598290dde2069cad8e4e60c785bebde332a611783fb252f
-EBUILD ding-libs-0.5.0.ebuild 548 BLAKE2B b85dc9940e7d1249f3d729f8b2aca392ebccc4a8af068712fb68c31f7996dd1704eac4cc9247bc447715b9f8aacc5a0dc32d7bd37ffab00f5bc8a811fedf454e SHA512 ece4b10606274a789cb9a6877b7cad4fc87d7a011c48b7d0791fbd4a1a9b8859acb800c0c1b95cda542edf1abf63c364dab01ff6c149ca0fba742eb70138705e
-EBUILD ding-libs-0.6.0.ebuild 598 BLAKE2B f0212d264f319d4ac2c3204e8e187b0f00b35359a69987814eb1a2242e5ab4234aef0f16efb244c262f0bfe2e745d32ba3c9961cc8f01cc0c81573f59d39a515 SHA512 5e13b98a2defd0fcbb2c0e6ca17b06981ddaaf0ee09b83095f6c63edcf4f9f4eda0d1049f03705c9c677935d601f25e66acf36e3b3e7bdadf9b034a86c3b84d7
-EBUILD ding-libs-0.6.1.ebuild 799 BLAKE2B e137061191edd73651718dc2fe054b6d1c049011660606958755aa4f1eb6644cd5022edf7dc05646a2b45f4ec3bdc33b8e908093264a5d3953710198f284593c SHA512 3bbd1f3690c0fa16a3b90f7d89947bb06e7467532c04082b1c1c762ca9dbbfa4f5e98b6f7c44a4c1773180f424e38ac19ce4ad80fb7ef0f947fd0a4f925e57c8
+EBUILD ding-libs-0.4.0.ebuild 516 BLAKE2B 3efb751ee44e75122af233c127090cf3977a4b2ebd0f57c929d18951c8d4472f6de73ced552d10a8667c6e04177e477a5fcedc074fe595571dd5ae0ca33b03be SHA512 23b7dcac84ec3ab93ae0ba3aa8e1c4f649d19b11a093034ca79878ca1415eff62c90f08aa2dcee4400c7c61de5f943b5232ead4c6015b05d208db3aa45380f2b
+EBUILD ding-libs-0.5.0.ebuild 572 BLAKE2B 22afc48844e844a685701124447624136b590047f551ecdeb21f13bb138f293040b8a31c6e6beb212dff62fac6b0569f7b5dd7b16a7cff91fd78997588c1e291 SHA512 fa994ce04f766b88b51ffc7c49e5b711c34a1efb5a048712833c2f964f4e3593604b2ae8bf7f38bd23c0b18982aba55dac2063a9e36a6ce8cd760bb14f9829f3
+EBUILD ding-libs-0.6.0.ebuild 622 BLAKE2B eb5b454fafc7c3e9e94f290871595a1f8c8b4564bc162f45ec28573a298220a25e1ebcd3b11bda16ecccee5e432380d377e523cfebc23e0736f309fb03bd09c6 SHA512 d3e59eb21c02d1da76be75b325d1e9c16fdc80ee9fe98a092069dd94a3a4d84d4168d2332e57734993d2ea6155287b6d007ea73d406a21c08c4b4376841c95a6
+EBUILD ding-libs-0.6.1.ebuild 826 BLAKE2B acba62d05998047772464fa9cb5ce976d7262c6210d0484cf073641556b98c97f10606bf0fb30b6961a77d95c2b8a964a436efcb39d86f980e67c51d7779d38a SHA512 31b3c01de236186b0017da6871eda9090122f6e19c4effbad0254631fa9f1b3d8ff62daf37438b4c9fdabf48c40b2161232c5be7ced389038b4c8cfa6c82c20e
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/dev-libs/ding-libs/ding-libs-0.4.0.ebuild b/dev-libs/ding-libs/ding-libs-0.4.0.ebuild
index 8aa0f79aa2c9..b64fddba5b07 100644
--- a/dev-libs/ding-libs/ding-libs-0.4.0.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.4.0.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
@@ -14,6 +14,7 @@ SLOT="0"
 
 KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="test static-libs"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-libs/ding-libs/ding-libs-0.5.0.ebuild b/dev-libs/ding-libs/ding-libs-0.5.0.ebuild
index f917de14d1b4..19a7325e01dd 100644
--- a/dev-libs/ding-libs/ding-libs-0.5.0.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.5.0.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"
@@ -13,6 +13,7 @@ LICENSE="LGPL-3 GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="test static-libs"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-libs/ding-libs/ding-libs-0.6.0.ebuild b/dev-libs/ding-libs/ding-libs-0.6.0.ebuild
index 1f488639729e..6870b2e56da0 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.0.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.0.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"
@@ -13,6 +13,7 @@ LICENSE="LGPL-3 GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="test static-libs"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
index ffbf1b010c0b..545d960419c5 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-3 GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux"
 IUSE="test static-libs"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-libs/distorm64/Manifest b/dev-libs/distorm64/Manifest
index b2f3c9643612..bfc37b4bf6f3 100644
--- a/dev-libs/distorm64/Manifest
+++ b/dev-libs/distorm64/Manifest
@@ -1,5 +1,5 @@
 DIST distorm-3.3.8.tar.gz 219869 BLAKE2B 91be3a56f1ffcff96ab345c8dd42a4f17b22f40299c5c16b77b3074ba2e071d747aa2e91adeea3cb78e3787cc42d5ad4544b89c3ed5b7940d9156168acc8da62 SHA512 bf65fe500089b4aa38d6430eb985f1dc3494b43c829379c56f91b5b4b25d19504fa3781a2fb2b03946f541962f6e564e46d6ec464c469ee21ecb773303b8494e
 DIST distorm-3.4.1.tar.gz 220042 BLAKE2B a845fb3b5a3c98c1b25601896785273668b48c8477dd29c5db4c4ddcf3cdfe73095e3c4c883ca0909820430989a412d9b47c87471450eba2a4d969a9a03d32c1 SHA512 0e9f8b62bc190ef7d516f1902b6003adef9c7d5d4a5f985fb0bdfc5d4838b2805e2b8836b02d5eccdb3401e814417de615dec675aed9e606c93122ca8a0d2083
-EBUILD distorm64-3.3.8.ebuild 548 BLAKE2B 071920883d027d9916cdff0389492b2f11920ef0040930ee9ef15d4de286b8bafadd8385e9a52165ce06baa13bb4bdf0008baebe35603d8d89f194583cf3ffef SHA512 2331947ad506986ea47740ed19fdb079fe67bf9c7e9aaf8c978920d82eda8c68bd082c0b98a77775054076e0cfb820a0409f8e3b4878ba79f28cc0a4450eae13
+EBUILD distorm64-3.3.8.ebuild 511 BLAKE2B 78d69d4c5a2ca795cfa16816e32639dbc101cee5791be4056cfc8b3f6bb87f39dd7e185bdb02b3ca6c76dd559ed081182bb1a7dc9b3b0e40bbdd529a30d530ed SHA512 c62d3efe2adfec5da4c7c49a2ce5e7adbf46e632ec6899151386f759555468f78965fae19b07d1c8c908d83ba36793ade075a7aa08133b53c5b1adea2a315628
 EBUILD distorm64-3.4.1.ebuild 511 BLAKE2B 78d69d4c5a2ca795cfa16816e32639dbc101cee5791be4056cfc8b3f6bb87f39dd7e185bdb02b3ca6c76dd559ed081182bb1a7dc9b3b0e40bbdd529a30d530ed SHA512 c62d3efe2adfec5da4c7c49a2ce5e7adbf46e632ec6899151386f759555468f78965fae19b07d1c8c908d83ba36793ade075a7aa08133b53c5b1adea2a315628
 MISC metadata.xml 541 BLAKE2B 6c2f81faf6c95690ba0ca52f27f9a8dceae7eb3e85690f9f9cb3825ddb9da76e0beddb21c45f7a914f13197857cb4d2701204fbd194a032e102f3703b3bcabae SHA512 264cfb7a150b89d0c84d275466c5dce39631a939523990b728c9c3bd6db7854f0a23ec3403b92c3a8c1fff6c8b436eeb6e1503706008aadde11b7c51834b0b57
diff --git a/dev-libs/distorm64/distorm64-3.3.8.ebuild b/dev-libs/distorm64/distorm64-3.3.8.ebuild
index 26cda2dbaba9..7642f63664f1 100644
--- a/dev-libs/distorm64/distorm64-3.3.8.ebuild
+++ b/dev-libs/distorm64/distorm64-3.3.8.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-# does not work with python3_4 as-is
 PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index b544ca901b03..bf67179a61c5 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -6,5 +6,5 @@ AUX dmalloc-5.5.2-threads.patch 165 BLAKE2B fee0be1573996dc7460735a94c645989db6f
 DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93
 EBUILD dmalloc-5.5.2-r4.ebuild 1750 BLAKE2B 9669a1d5b365f1d24c3ff6ca4e3df5f5af97a779c5f046eed3f0f13f8a85325e642872859c3900459120ee29338b9bb559ae73eb7cc5211e91dfb8a64edfc3de SHA512 b9f4531a4db6864f217fd61338b4fcb0111a36ade6a663c65445ca33a6b49cc1188ac73490d2c9c3c3b03b61e71c2aa9f912f63931853f6563261e3b4c31d42f
 EBUILD dmalloc-5.5.2-r6.ebuild 1916 BLAKE2B 431e238b85cb9fbb37a082202a33c715f5249e2da0252302d2b681b14c093b6590d258cf3e0190a66ce905933258bb8d9f802d42d006c5056eb162f4893dd364 SHA512 4bfa2ea6d13ad1cfa1524a1fc20dcfaee27d06153793c7947a6f4dee9a6ff59e2df3c18a6ea11ac2496cdab625fb57e3df8fc04cb16b200abca3846d4d90576b
-EBUILD dmalloc-5.5.2-r7.ebuild 1867 BLAKE2B a749d69dca06f652fe1bd4c34780957aeb99f190b276fa797170df4c6d901b269139e48a8780ed8f181f025ef20c30fdf168a350f4e4ae4c76e8c82bf89598b6 SHA512 f2abaece08c31f0803987ce919a7c9a5e6535dfca251381b25c5fd31db2204f2351826100a4a2c18600fa594d01cf2e2c5fe75ff47ed77e05ee7210a25e54e64
+EBUILD dmalloc-5.5.2-r7.ebuild 1859 BLAKE2B ffe84f2ef5469befec20815930c4ceb5b7d47acb00f8558762de400e39e3a495c71f86a9418c4005c632cac9c2674685b91bdae2e76ed06c4254104c750471d4 SHA512 c6e015728e7f0a998bacdbaa0aeab56386a07b2748ecbbf15b286a0cdb584368918c70835ab1390f6bec2d3477e788e524d0f2fcdf2b49cdc4f2781d52c28532
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
index 8c427e5ca7b3..1bb0426e3da6 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dmalloc.com/releases/${P}.tgz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="static-libs threads"
 
 DEPEND="sys-apps/texinfo"
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 4165842e2261..5a92e40a6c88 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,4 +1,4 @@
 AUX 0001-CMake-install-to-correct-lib-dir.patch 1957 BLAKE2B a8139d2c7474b96526ba983a3d66ae406c5239f04585b0c9156b9f85ce456924ebf6cc0fe052c48670229fbe86523ba40a7d0d37cfd2badc54d0b6cb4b99e8b9 SHA512 1145dffdba811bc09dd76c0f39fc6bae275a1c94ca4700bfa0487db85f48e3a899c0010af39549990d2610bac3d5f0fd6b0faeb000b6c8cd22e2bc6f2c0f8069
 DIST double-conversion-3.1.4.tar.gz 7022872 BLAKE2B 270f318e6b37205ab3da3ccf5c598ca7a02dc2e728a5d8e3467523bc8f21039651bea3f70aeb9f8579505812d63181de9d1e8106997795a79efeb663e1bc22d7 SHA512 715a34ace2ff74b79d80a8c003c16cfbf958ebc92264e28cc572e1a12a786e1df9678abb46f032c2be387495e1a3d02957b12fa4a245ec6cfe19ca637519ac3c
-EBUILD double-conversion-3.1.4-r1.ebuild 1386 BLAKE2B 6ffc915df784623810a39fac77a8f93a353932bfd1931e4e0ae2b6a8cfc917c8adecb5870b05232f60fae73bca2157e0711bf3e6b83486b3ac2a2be646549f08 SHA512 04ee9fce5fc4db356cc3c119673c78d97af1a02c77c6734ca9754570a26499b6946bed3b089e60bd5013b0aecd684dbde03bd23ddefc628367559e383879812f
+EBUILD double-conversion-3.1.4-r1.ebuild 1413 BLAKE2B 84e0a0d86df46566dfdfd37c1d43fa4667c47ad62f8cb1e274c0ed5f0aa9ffeb9ab019c12be0abc959d152ef37c1d1d8a3f6fcc7bc4d9059f12ae9d0e4ad0006 SHA512 dd10edb94846e496187fbcd4d877e87075426d78616162c0823c934e984da4d82232d996918a78b62dfd43003f2e715b2994c15b22d8be53be9ac073cf00261f
 MISC metadata.xml 681 BLAKE2B add558ddf626cde6768c25b9a6c3f004ca0e588e99f247d7c1000ca9e7f572429a2d321af2c39b82b61ad1cf66b87f108a241100f6ef28cf85f8daf172e05489 SHA512 e7eee783d9ed17369d7dabdb78eb1bed547c6d75a527b418fc42815ab161688740633d062d59f6b7b30ca26872b40163a8188eefbb4f2eb19299a8809bd49524
diff --git a/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild b/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
index 07d645b51f2d..055a8017e283 100644
--- a/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0/3"
 KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/0001-CMake-install-to-correct-lib-dir.patch"
diff --git a/dev-libs/editline/Manifest b/dev-libs/editline/Manifest
index e5e436404895..09065801ea8c 100644
--- a/dev-libs/editline/Manifest
+++ b/dev-libs/editline/Manifest
@@ -1,4 +1,6 @@
 AUX editline-1.16.0-rename-man.patch 466 BLAKE2B 0fa3edfe0733d2a72fe2bed1c03dfb0ff3f14cac9b33d6258a19489cb5db3b97b2fed3d6fd9c2fe3b350db102f287ade6006627ec92a3e956309550e3af218a6 SHA512 2226b4312f13d433248d705d6abf6ba77e71bebdf1774af131909139856541bdcac4e7483a8e2e38b3e9f009016bc6b36838519fcf423ba9562020d97dd6cfcf
 DIST editline-1.16.0.tar.xz 250376 BLAKE2B a9e080eb2b105f7c83dfbb26dfaebf07d7d2d664098504f4995b12b14b100420118ab70454afbba63518f4c510e2349b68923fade2412940e190177cfab442df SHA512 99e1070d9d658aaec82582d5148a58e7039182f9d73e755547bc090682821fbfb29af19261f38db9a0f022e304e8f8e779e79f7b21f57ad5c80af5bcf316c6f6
+DIST editline-1.16.1.tar.xz 251848 BLAKE2B 06cb75343f89c8698efc7c682c0ef968ca078e101b4c49193e009da18ebfe4cf9e3f630e27a25f2c0a05ca99e56efd0935db6da3d04027613a7c9078d01747ad SHA512 4c4e96c9218ab29c559dc8f0c2ca4015c149c70af1696cd43e7ddb38aba7eb68452a22718932bf40a83d3377ad73d26734109db13ecd4470170ef6fbcab6a9fc
 EBUILD editline-1.16.0.ebuild 779 BLAKE2B 69e9135b9e9ad50fd347cb21bfbae40fc826167a53c05f8267171d54f48d665903eaa454851e651a1cc83065d6fc0f1328338a9c2810234ca4f0d6a836d73621 SHA512 f85547ae9ae1143454bcb8540ed30752a12234716f36d77ddbe69ea3886f6cd9f60df67fe18439bde49895164c2b65c214611263ef092009f69ab0d014609e79
+EBUILD editline-1.16.1.ebuild 779 BLAKE2B 69e9135b9e9ad50fd347cb21bfbae40fc826167a53c05f8267171d54f48d665903eaa454851e651a1cc83065d6fc0f1328338a9c2810234ca4f0d6a836d73621 SHA512 f85547ae9ae1143454bcb8540ed30752a12234716f36d77ddbe69ea3886f6cd9f60df67fe18439bde49895164c2b65c214611263ef092009f69ab0d014609e79
 MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
diff --git a/dev-libs/editline/editline-1.16.1.ebuild b/dev-libs/editline/editline-1.16.1.ebuild
new file mode 100644
index 000000000000..d11555380163
--- /dev/null
+++ b/dev-libs/editline/editline-1.16.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="line editing library for UNIX call compatible with the FSF readline"
+HOMEPAGE="http://troglobit.com/projects/editline/"
+SRC_URI="https://github.com/troglobit/editline/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=("${FILESDIR}"/${PN}-1.16.0-rename-man.patch)
+
+src_prepare() {
+	default
+
+	# To avoid collision with dev-libs/libedit
+	# we rename man/editline.3 to man/libeditline.3
+	mv man/editline.3 man/libeditline.3 || die
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# package installs .pc file
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/eekboard/Manifest b/dev-libs/eekboard/Manifest
index 3014d94e136b..382ddafb723f 100644
--- a/dev-libs/eekboard/Manifest
+++ b/dev-libs/eekboard/Manifest
@@ -1,4 +1,4 @@
 AUX eekboard-vala.patch 971 BLAKE2B 61e8185b8946593bff928bf51e86e133c2e4b0880265a96a56da0fbb2792fba147a4aff605f9e73080fd0e41845805636b23dc4ba47378b5649aa2d73c4ea45a SHA512 0e33141e6e8bbdee661b12083e5e261b013a1c83603dd06ef93b5b9360d89153ff53225e1c8068ebccd5d92c3dfd1c439f7b0fb27ed5e8f21d9ca201c7db01fc
 DIST eekboard-1.0.8_p20121001.tar.gz 330923 BLAKE2B 74bc0a9e4d3bea73828020895726e12b986100812ff7260758a881899c7ff92dc706c6b7a57bc4d17a9524d1305658c8c29e441ba4b7b4b8023d8f2ddebc2d10 SHA512 3c6ccbaac55a4680ba4d2bd5d214b1738b7fb17f83b66b11621149b6f8a945eb6b39c47be51dfcf53f84317d860ae28b8f83e3071d5d4474fbcfbdc72f6e4c87
-EBUILD eekboard-1.0.8_p20121001.ebuild 1733 BLAKE2B f640cdf1e36c00d6c93eb151285abf1335b90a225fe9a1a5ad02868dfe0a1a77c45a600d9c45e3bc6f538ab33fe97c5018b07913a9786c50175c7042b467eb5a SHA512 818879306689613447fa6a84969010b51b4aa87d8514d4e96731ed9f01d96b46fe274837b890c95ef3ef33b67b82343158a18a93a3297cf8315e486b99b127f8
+EBUILD eekboard-1.0.8_p20121001.ebuild 1760 BLAKE2B 5abcc9293a1a60b8847e3329bcdf6a975bd1b288ac0e4f43f10669040e0d179808989a31350bfbbf99d044484a716cd1e910538dd51de8d7bfded9d3f545381b SHA512 0655c670c6c100a0058dd21d0ba6482f06480d5e6cb9d35e2e0160809e795e455ebd27daec501f68efd415d9b448274732ad4d3b391b3bd9742038d472391558
 MISC metadata.xml 678 BLAKE2B 18e1494e9a6761d511dfbb99dea84044838cb13974662f6244014647fc414dc4dca585549a44d534ed7d3a63a2b94c7bc4e5a533a817bb2b77194e1b4988b88e SHA512 6ae8cfdff8c6df95729329152c2d853301b2d795c1aa22fe0a45fe0d37c1e3b60339523e35fb58fcf90ca7ab82aea8061baf816f694f8fde25afa53ddc98f0e5
diff --git a/dev-libs/eekboard/eekboard-1.0.8_p20121001.ebuild b/dev-libs/eekboard/eekboard-1.0.8_p20121001.ebuild
index 08d074cafb78..b534ae9a443f 100644
--- a/dev-libs/eekboard/eekboard-1.0.8_p20121001.ebuild
+++ b/dev-libs/eekboard/eekboard-1.0.8_p20121001.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc +introspection libcanberra static-libs +vala +xtest"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="app-accessibility/at-spi2-core
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 8f1a5b492982..a0ba047852d8 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,5 +1,7 @@
 DIST efl-1.22.6.tar.xz 70641848 BLAKE2B a6644f25934d3c9776b06edd7a9ffc321da42ee039b703c1af317d14e757b489c6d42add281febde5e81b48e38fbfa31f5b201ade4d27cd50cc70d16b9028fdd SHA512 adf2b9275c295b61928134ce1af53d8830b46815d8ba09d221c7659b8a2aed6e4593b35919a98f0e33ec9b7930c5b09de8e6680536cccb21c551908b25158f56
 DIST efl-1.23.2.tar.xz 77492124 BLAKE2B cfd77a9fa75baa12d1e6aeb9b08168ebe13ed720830bd86572d5deb3c72dbb76a51ecf32fb4dddafe0dea56266cb09a3d24cbbfa27cd98618a912e341d3b409f SHA512 59e9bedd9402c204c511a88bc6a697551dd552ddab9bc5e8a30ce1e2095d7452bca1606929693e9e706809e28bc19f039858253b1690ecd1fd2a229aa5b1b3ed
+DIST efl-1.23.3.tar.xz 77485032 BLAKE2B e5f65080aec1d11a43f1e1786b8ac4e7be70ddd9614b53db822177c28ee73f9590f63d032df5ddf00db6224730b45b045d9f91da2287a4dec7589e902cbcde28 SHA512 47ad067c43d39b534834195f89a745c4a47d867f33aaa68c28c6dccd147379e9bc2416bd68878cc16585f8cb60e926a7df62102658b205756c01985f37f0d297
 EBUILD efl-1.22.6.ebuild 6910 BLAKE2B 52d27a0baa59508ebb3e522338aaa6fe8cb15f5be8f265bf264b8a56209a6e9a5ed801eca19fb32d815282cafa3a2eadf1b781dd2c22935eba6af34d331cfbad SHA512 67aa26a52d2e234d7bd64f6f2c508762805aa45433c7733638e0564f8de32d8b7374618b59660827ea90749976deeb17e415ef7bac69e542d3da7cec02b63334
-EBUILD efl-1.23.2.ebuild 7474 BLAKE2B bc053b6d6fec7b7fb88acddaa68e83688a7cdb4f4c02fcbf8c2711c4a8261496ba815c4bf0b3de8d11bda772d82a09b334b862a361bcbc0a46a05949a4f1b04b SHA512 3f3f59ebfca187633e641b7e49da7907e825aebada2f70916b8ad4bb51ebac31500857473294b80d94fc0d38d424d937fae8aa017a4b6931b98452e42c538c42
+EBUILD efl-1.23.2.ebuild 7479 BLAKE2B 71595b8282e68b883bea05412bffc03427d083296703aa057853df4829c4bff58334147b726949b3246a23c861a3ab894fdfdcfe29e235c6a8c03132a8ef7286 SHA512 859a09198ca5bf083544f8b2b21e81874c0fc69722ebb70507e15f42f8791b569fd337011d1345dd2a4a418ee2a3cbb7c4ceabb25272cbc85f37376bddbfce14
+EBUILD efl-1.23.3.ebuild 7474 BLAKE2B bc053b6d6fec7b7fb88acddaa68e83688a7cdb4f4c02fcbf8c2711c4a8261496ba815c4bf0b3de8d11bda772d82a09b334b862a361bcbc0a46a05949a4f1b04b SHA512 3f3f59ebfca187633e641b7e49da7907e825aebada2f70916b8ad4bb51ebac31500857473294b80d94fc0d38d424d937fae8aa017a4b6931b98452e42c538c42
 MISC metadata.xml 2199 BLAKE2B 56690b1757b3903b9c7008e64a287ed84420d1da4b3bbd4260617c66da0eded0bd5bb29d1880dd9484b428beb9a02f4b36f7f9b146c090e1c1f55272b5b77066 SHA512 45a075877b05d2dcca13c376b8af5fa269855e9419dbbaa60234a7529a737697ac8eb56ffb7c14b6216ec537b367de47b2558716dd7dedbfed737d07e307595a
diff --git a/dev-libs/efl/efl-1.23.2.ebuild b/dev-libs/efl/efl-1.23.2.ebuild
index 22e657b9eff3..4f5cd47d3360 100644
--- a/dev-libs/efl/efl-1.23.2.ebuild
+++ b/dev-libs/efl/efl-1.23.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
 IUSE="X bmp connman dds debug doc +drm +eet elogind examples fbcon fontconfig
 	fribidi gif gles2 gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
 	lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd
diff --git a/dev-libs/efl/efl-1.23.3.ebuild b/dev-libs/efl/efl-1.23.3.ebuild
new file mode 100644
index 000000000000..22e657b9eff3
--- /dev/null
+++ b/dev-libs/efl/efl-1.23.3.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+IUSE="X bmp connman dds debug doc +drm +eet elogind examples fbcon fontconfig
+	fribidi gif gles2 gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
+	lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd
+	pulseaudio raw scim sdl +sound +ssl static-libs +svg +system-lz4 systemd
+	tga tgv tiff tslib unwind v4l vlc vnc wayland webp xcf xim xine xpm
+	xpresent zeroconf"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	?? ( gles2 opengl )
+	^^ ( lua luajit )
+	ssl
+	drm? ( gles2 )
+	gles2? ( || ( wayland X ) )
+	pulseaudio? ( sound )
+	wayland? ( gles2 !opengl )
+	xim? ( X )
+	xpresent? ( X )
+"
+
+# Requires everything to be enabled unconditionally.
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/check
+	net-misc/curl
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-libs/zlib
+	virtual/jpeg:0=
+	X? (
+		media-libs/freetype
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+		wayland? ( x11-libs/libxkbcommon[X] )
+	)
+	connman? ( net-misc/connman )
+	drm? (
+		dev-libs/libinput
+		dev-libs/wayland
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+		x11-libs/libxkbcommon
+	)
+	elogind? (
+		sys-auth/elogind
+		virtual/libudev
+	)
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gles2? (
+		media-libs/mesa[egl,gles2]
+		virtual/opengl
+	)
+	glib? ( dev-libs/glib:2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	hyphen? ( dev-libs/hyphen )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:= )
+	json? ( >=media-libs/rlottie-0.0.1_pre20191101 )
+	lua? ( dev-lang/lua:* )
+	luajit? ( dev-lang/luajit:* )
+	mono? ( dev-lang/mono )
+	opengl? ( virtual/opengl )
+	pdf? ( app-text/poppler:=[cxx] )
+	physics? ( sci-physics/bullet:= )
+	postscript? ( app-text/libspectre )
+	pulseaudio? ( media-sound/pulseaudio )
+	raw? ( media-libs/libraw:= )
+	scim? ( app-i18n/scim )
+	sdl? ( media-libs/libsdl2 )
+	sound? ( media-libs/libsndfile )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	svg? ( gnome-base/librsvg )
+	system-lz4? ( app-arch/lz4 )
+	systemd? ( sys-apps/systemd:= )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib:= )
+	unwind? ( sys-libs/libunwind )
+	v4l? ( media-libs/libv4l )
+	vlc? ( media-video/vlc )
+	vnc? ( net-libs/libvncserver )
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[gles2,wayland]
+		x11-libs/libxkbcommon
+	)
+	webp? ( media-libs/libwebp:= )
+	xine? ( media-libs/xine-lib )
+	xpm? ( x11-libs/libXpm )
+	xpresent? ( x11-libs/libXpresent )
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	local emesonargs=(
+		--buildtype=release
+
+		-D buffer=false
+		-D cocoa=false
+		-D drm-deprecated=false
+		-D g-mainloop=false
+		-D install-eo-files=false
+		-D mono-beta=false
+		-D pixman=false
+		-D wl-deprecated=false
+		-D xgesture=false
+
+		-D edje-sound-and-video=true
+		-D eeze=true
+		-D libmount=true
+		-D native-arch-optimization=true
+		-D xinput2=true
+		-D xinput22=true
+
+		$(meson_use X x11)
+		$(meson_use debug debug-threads)
+		$(meson_use drm)
+		$(meson_use elogind)
+		$(meson_use examples build-examples)
+		$(meson_use fbcon fb)
+		$(meson_use fontconfig)
+		$(meson_use fribidi)
+		$(meson_use glib)
+		$(meson_use gstreamer)
+		$(meson_use harfbuzz)
+		$(meson_use hyphen)
+		$(meson_use luajit elua)
+		$(meson_use nls)
+		$(meson_use physics)
+		$(meson_use pulseaudio)
+		$(meson_use sdl)
+		$(meson_use sound audio)
+		$(meson_use systemd)
+		$(meson_use tslib)
+		$(meson_use v4l v4l2)
+		$(meson_use vnc vnc-server)
+		$(meson_use wayland wl)
+		$(meson_use xpresent)
+		$(meson_use zeroconf avahi)
+
+		$(meson_use !system-lz4 embedded-lz4)
+	)
+
+	if use opengl; then
+		emesonargs+=( -D opengl=full )
+	elif use gles2; then
+		emesonargs+=( -D opengl=es-egl )
+	else
+		emesonargs+=( -D opengl=none )
+	fi
+
+	if use gnutls; then
+		emesonargs+=( -D crypto=gnutls )
+	else
+		emesonargs+=( -D crypto=openssl )
+	fi
+
+	if use connman; then
+		emesonargs+=( -D network-backend=connman )
+	else
+		emesonargs+=( -D network-backend=none )
+	fi
+
+	if use static-libs; then
+		emesonargs+=( -D evas-modules=static )
+	else
+		emesonargs+=( -D evas-modules=shared )
+	fi
+
+	local disabledEvasLoaders=""
+	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
+	! use dds && disabledEvasLoaders+="dds,"
+	! use eet && disabledEvasLoaders+="eet,"
+	! use gstreamer && disabledEvasLoaders+="gst,"
+	! use ico && disabledEvasLoaders+="ico,"
+	! use jpeg2k && disabledEvasLoaders+="jp2k,"
+	! use json && disabledEvasLoaders+="json,"
+	! use pdf && disabledEvasLoaders+="pdf,"
+	! use pmaps && disabledEvasLoaders+="pmaps,"
+	! use postscript && disabledEvasLoaders+="ps,"
+	! use psd && disabledEvasLoaders+="psd,"
+	! use raw && disabledEvasLoaders+="raw,"
+	! use svg && disabledEvasLoaders+="rsvg,svg,"
+	! use tga && disabledEvasLoaders+="tga,"
+	! use tgv && disabledEvasLoaders+="tgv,"
+	! use tiff && disabledEvasLoaders+="tiff,"
+	! use webp && disabledEvasLoaders+="webp,"
+	! use xcf && disabledEvasLoaders+="xcf,"
+	! use xpm && disabledEvasLoaders+="xpm,"
+	[[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
+	emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
+
+	local disabledImfLoaders=""
+	! use ibus && disabledImfLoaders+="ibus,"
+	! use scim && disabledImfLoaders+="scim,"
+	! use xim && disabledImfLoaders+="xim,"
+	[[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
+	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
+
+	local disabledEmotionLoaders="gstreamer,"
+	! use gstreamer && disabledEmotionLoaders+="gstreamer1,"
+	! use vlc && disabledEmotionLoaders+="libvlc,"
+	! use xine && disabledEmotionLoaders+="xine,"
+	disabledEmotionLoaders=${disabledEmotionLoaders::-1}
+	emesonargs+=( -D emotion-loaders-disabler="${disabledEmotionLoaders}" )
+
+	local disabledGenericEmotionLoaders=""
+	! use vlc && disabledGenericEmotionLoaders+="vlc"
+	emesonargs+=( -D emotion-generic-loaders-disabler="${disabledGenericEmotionLoaders}" )
+
+	local bindingsList="cxx,"
+	use luajit && bindingsList+="luajit,"
+	use mono && bindingsList+="mono,"
+	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
+	emesonargs+=( -D bindings="${bindingsList}" )
+
+	local luaChoice=""
+	if use luajit; then
+		luaChoice+="luajit"
+	else
+		luaChoice+="lua"
+	fi
+	emesonargs+=( -D lua-interpreter="${luaChoice}" )
+
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	if use doc; then
+		cd doc/ || die "Failed to switch into doc/ dir."
+		doxygen . || die "Doxygen failed to run."
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${S}"/doc/html/. )
+	meson_src_install
+
+	if use examples; then
+		dodoc -r "${BUILD_DIR}"/src/examples/
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index a7e8eb178727..3a0b7199a917 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -4,6 +4,8 @@ AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b1
 AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f55e0611fe83782374d5201b984e85e7c27897d0d056f53af40ebb383e8cbe315a57adce2af378348ee1a573cfeb005e7a43 SHA512 2660ee456b62d6b1ed72ede92d8b00e9d1cd4b0a5778a80bfbdc3139e5527758591cdb05110b39a5c5811f60e2223cc8c83a488ac055a554f5b3c71fc5980acb
 DIST elfutils-0.176.tar.bz2 8646075 BLAKE2B 7f23d59b7f5d74946fea928a7fada7764c1f96a5eefefc4a3a382090eb7cad07c80419218300d853ccbef8f4e2288eb443ff06b3e64bf4511d9fa7aa84f5b794 SHA512 7f032913be363a43229ded85d495dcf7542b3c85974aaaba0d984228dc9ac1721da3dc388d3fa02325a80940161db7e9ad2c9e4521a424ad8a7d050c0902915b
 DIST elfutils-0.177.tar.bz2 8852413 BLAKE2B 03f432342651f7646d73b7847325bd14b722ce34d85df01b1ad072b916af9b9da2d0d119cd24e952073bd584ec76b027ba9b6c7d45fb057372b3e700b1f5741a SHA512 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f
+DIST elfutils-0.178.tar.bz2 9007557 BLAKE2B 241b611dbfac37f35a670fbe80096c21b870e4b26fcddc8af26fba0373c9cd72eae42aabae2803b7b16c3bf649aeda036b1ea1b40952b43c4021ed23fcb51e80 SHA512 356656ad0db8f6877b461de1a11280de16a9cc5d8dde4381a938a212e828e32755135e5e3171d311c4c9297b728fbd98123048e2e8fbf7fe7de68976a2daabe5
 EBUILD elfutils-0.176-r1.ebuild 1971 BLAKE2B e9ea01a2147d318c75c8c6157c2d830db85cba78585e96d182a52c39c55b97da56bbab955dd34bda74a9e28fcdc49441ba08812b86e055e53f3aabe01723d4e5 SHA512 f73f6d944944730a1b0d389a2b6a1a7dff50c7f1aba0332472180100c4869e5266b78c76f451d8ed00cbc6e58e2bd9d07f50ba9f97c1bae0a1b7940e21d0bea4
-EBUILD elfutils-0.177.ebuild 1999 BLAKE2B f58770ef1ccc48112761207c6e7897b056ede80ed13bafdba5ba9c91b603d8aaaf3601e5223913fc5fd20e7cf8b3ef7202160ea4cbfc1c379aa473406a18dd9b SHA512 d0aa6897f4db082cfb56098e266bcc1982fcb5204381738f3ddc4a2b9bb09fe7217b4c4ad76791f2c0a3a26d7b7b28180dd1c7057f2ba039a64dd9c273d3c941
-MISC metadata.xml 630 BLAKE2B a868e2c1506f03ed2a36575a7395f4cff5688ef1ffd629d0db737a33305dc58a368aca03179f5a7e428b478c317789a4600b9cf4e2a90a3a34a2f402781b966e SHA512 81099941ba6bca61567b62e353c488b3705408cca1d8c097beb1e0f0baacc4d45dd1708932d8f255efb8691d6b94844d267054251cacc0860a369701203d9b82
+EBUILD elfutils-0.177.ebuild 1990 BLAKE2B 5ac49f5d08c38e3b6819fac2c7b2e2df9211a0c95a7c72e6e930f41752d593c09747d932585aa39272a5478ffff8fd8d0557f98e69df2f6fa08464ec61d45642 SHA512 7e7ec503accb8f504fdd9eee61d6d96a26216730e3ef65a3d1b36e9d0ae38a4eaa62c2bb56a1364620253a437b1b57573febdb2834cb7b284e64aa8d9b34d8ff
+EBUILD elfutils-0.178.ebuild 2094 BLAKE2B ed3352adc5be205c5eed92b686704eead7fc490645de277bcdba05ce03c7564a7601f6393a7e6538d25d7c9ea4433a570151077d9cfed733742130cdb2c7dca2 SHA512 e22bb08e2943398310f23be66939fe818594a926de5caef787cef0d6d6d5a0b7e4d6ee21e94590685b46a9ccef0bf118988251997cac92989c18fade7e9501db
+MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.177.ebuild b/dev-libs/elfutils/elfutils-0.177.ebuild
index 307449017a35..205fdc10fcdf 100644
--- a/dev-libs/elfutils/elfutils-0.177.ebuild
+++ b/dev-libs/elfutils/elfutils-0.177.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/elfutils/elfutils-0.178.ebuild b/dev-libs/elfutils/elfutils-0.178.ebuild
new file mode 100644
index 000000000000..f6a0ba093e28
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.178.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="http://elfutils.org/"
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	!dev-libs/libelf"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+"
+BDEPEND="nls? ( sys-devel/gettext )
+	>=sys-devel/flex-2.5.4a
+	sys-devel/m4"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.118-PaX-support.patch
+	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
+	"${FILESDIR}"/${PN}-0.177-disable-large.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use static-libs; then
+		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+	fi
+	# https://sourceware.org/PR23914
+	sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+	use test && append-flags -g #407135
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		$(use_enable threads thread-safety) \
+		$(use_enable valgrind) \
+		--disable-debuginfod \
+		--program-prefix="eu-" \
+		--with-zlib \
+		$(use_with bzip2 bzlib) \
+		$(use_with lzma)
+}
+
+multilib_src_test() {
+	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+		LC_ALL="C" \
+		emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc NOTES
+	# These build quick, and are needed for most tests, so don't
+	# disable their building when the USE flag is disabled.
+	if ! use utils; then
+		rm -rf "${ED}"/usr/bin || die
+	fi
+}
diff --git a/dev-libs/elfutils/metadata.xml b/dev-libs/elfutils/metadata.xml
index 7d0275bbf23a..10d87faccf5d 100644
--- a/dev-libs/elfutils/metadata.xml
+++ b/dev-libs/elfutils/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="lzma">Support automatic decompression of LZMA-compressed files and kernel images</flag>
 		<flag name="threads">Build the libraries with thread safe support</flag>
 		<flag name="utils">Install command-line utilities (all the eu-* programs)</flag>
+		<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:elfutils_project:elfutils</remote-id>
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 0bcd594cc26c..a6c758604707 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -5,6 +5,7 @@ DIST ell-0.23.tar.xz 453040 BLAKE2B 027adbaf786bd83070acfcbb1435c36adb70e6d798c6
 DIST ell-0.24.tar.xz 473332 BLAKE2B 97b5f5de1a4680f5b8da5db8d151df56d2eadb511c5440a780959cb832f9414030040abf91072a751b19028713cc8527f5dbb24450b07c69dcebcc9d8f62366b SHA512 14e9b31ab0f08761c7672798a23ee91b7d2fe8fd509df35c40e413e26b90f86a192f48283b3798402d9d23acdf1fbcd1d506e5fa9331a32279f03f4cf462205b
 DIST ell-0.25.tar.xz 473392 BLAKE2B cefb71c0bd1c30a1c2e85baf19097f9028b3d2d1e8df14beb231f3c52f39e2ec98fbafdfbba4c05e94328c0c5747eb49111e1c76b3cb02fe22c09b51a5016f17 SHA512 7f12e2dfae16a38750166787ede7e3bf6def1e15a8bcb33bdba80ff84c2930d1857437f4ab871c408a52b18fec2212856ae9190ddf5eb542e90ebc76edd1f693
 DIST ell-0.26.tar.xz 473512 BLAKE2B bad1545b65caad7263e03156740ef5dfc401536fc063f34bdac5346a9edca8b7b16fd175abb264a6163e9dca87d1469f388984a95962dcc695e3e98549ff2a0a SHA512 b7a841f6e3c50077b60c210549744344ee70b5116bc9ee0f44dfea896f68fe6ab89a6fa38fcfe04e259648de978162aa5592f2e07accf13825584b40d57ef6cb
+DIST ell-0.27.tar.xz 474412 BLAKE2B 3b7d7ccfff8a92bbe930032b6a54bdc91b6541d1e6d8e514f1e49fcd08f3f5bc47beb3722dc864a63dcbbd72f793fbc2bc590b168f1623ff6e7088fbc960acb1 SHA512 ecda285155ef5ac1b8bdeabfba2e972149a5027c85236af74366c735aec7304b2dee8ff6aa931000b4299e8bb7654e7d4a63c1738de6e6e740f5ba16467f2823
 DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
 EBUILD ell-0.20.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 EBUILD ell-0.21.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
@@ -12,7 +13,8 @@ EBUILD ell-0.22.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96a
 EBUILD ell-0.23.ebuild 1048 BLAKE2B 3ad500373c36074fd147ba65234f25b61ce46b9f1d7235625c749369e4a8b2e89682c48a6b78ebebf185be232a38ecd539eb644099cc4339cc538196c894b21f SHA512 07e80a76a8e6ae61b4c5183613140efc63704175772cdd90f734a08808ddd38659c5b1d4d10a25bd5a60c259e4f3ee754eccf9cafb1df51e1c9db914f9523a58
 EBUILD ell-0.24.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 EBUILD ell-0.25.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
-EBUILD ell-0.26.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
+EBUILD ell-0.26.ebuild 1050 BLAKE2B e825e91aa3cff7bf8a798c1ce32e0503b9384180d970e38c2a03419f0d25273c665a0210e84b15a1f3ce25e72d694b0b6e50684eabe4c188a5db1bacfd5ff549 SHA512 3a842d423c1e62182f786cab574520c4ec47781a1c64405999bb4133342a3e12d6c41afa71f1d6f4f56ceefe57d6cd78ade6fee3fdd7615c554b9a07cb83fe36
+EBUILD ell-0.27.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 EBUILD ell-0.9.ebuild 821 BLAKE2B 000640e99b5e0c1e1a328014a8edfe47cc197201757fc6b4e71ce3c9efe27d7ea3f89c7171c2366605374624b4282fbf2859b1832d3f5136e4c713ccf0530391 SHA512 9d497dbe091631b7863b8f403e2ae138cf30c38a1b1eb7e98b775275649fce9c67717599f1ca38ab705dd7bb33e8bc406035c2102c368fa83a15c13069c0b79e
 EBUILD ell-9999.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 MISC metadata.xml 454 BLAKE2B a0768369a4193ad0aa995290515a1c2e2a99e363d345d33a52933ac274e0c10364801ed20727a78f0d22088bfea0eb833d54f08d4de47790e6e0213a0318ecbe SHA512 583e77bec8ec2bed4e72ae117a7afba7cbe3abd0c3d139227aaebd0f06081faf827356e871494c9fbd16bc16a146f23099729afd80e2583e2bacbda9226bfabf
diff --git a/dev-libs/ell/ell-0.26.ebuild b/dev-libs/ell/ell-0.26.ebuild
index cafd42ed2ce6..50e688b1b154 100644
--- a/dev-libs/ell/ell-0.26.ebuild
+++ b/dev-libs/ell/ell-0.26.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/ell-0.27.ebuild b/dev-libs/ell/ell-0.27.ebuild
new file mode 100644
index 000000000000..cafd42ed2ce6
--- /dev/null
+++ b/dev-libs/ell/ell-0.27.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="glib pie"
+
+RDEPEND="
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable glib)
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/faxpp/Manifest b/dev-libs/faxpp/Manifest
index 7043e8fb8570..2f391f13007e 100644
--- a/dev-libs/faxpp/Manifest
+++ b/dev-libs/faxpp/Manifest
@@ -1,3 +1,3 @@
 DIST faxpp-0.4.tar.gz 512740 BLAKE2B 922c0fe6092517c6d4fa6d1cc7169bce7d97b873c49e3d6a776174e43cfc72bcd5f38b1baf8cee4239aecfd7820a3e6b0594a1fa94e4a45392ac2cf0d6889dbd SHA512 25b871a6419b70d9ee85817cda267dfff7ed8aa99a031493a6ccaf1faed80e113ceb7407df1629958d7841c73ba3bee760af9f595dd71648d853561e8c8f33d8
 EBUILD faxpp-0.4-r1.ebuild 515 BLAKE2B 7cdec46e7b0c45139cb858c2c5e588504a483265aed0e86329c827ad2e66aa21b55744e2fe8ba1cff7484a2b37252c60321333823fa16bfcfbaa3c30609fbbb5 SHA512 c54c64eab185d287e6975a4cfa72853b9eef3acdaaaa17035aba8b0c74c26275dc5c565ac712589bcaac88ba4124806d6c7ac2f4cc969fde8fbb6842124a31e8
-MISC metadata.xml 325 BLAKE2B e4c5e516748c44d4fc9faf43f18b2f229ea0fd6d4da71de12f251d6e47be296b6d08088b4c42fd45356ec939a59ce55f90480aac196bbc01246bfee57782c078 SHA512 9dc47c5ac852f0e4c49f8a909b3b4647a01bdb99b10bdf29ac7e588bba8bfb7d70b9ce273e0067a1382fffba239590c15b601d7d5d5ec8362dca35d27bbf7cb1
+MISC metadata.xml 242 BLAKE2B 71d0f287af2c52ce2a8c0c681cf83005d1de3e9ed3c3da4433b355f926c510940a20147b18a68ea49c22c3ba2b416ef884905845be9d7e41b26982ce783945f8 SHA512 70445376619a9563f9714681fc55a4115cfd9406c80f465e59ec730798d62106cf1910b3d847ae0d8e3d9b8dc2da496047d1a75d6493678baacdb16409ad9d12
diff --git a/dev-libs/faxpp/metadata.xml b/dev-libs/faxpp/metadata.xml
index 9b9d39869aae..2a8ac2dcef57 100644
--- a/dev-libs/faxpp/metadata.xml
+++ b/dev-libs/faxpp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">faxpp</remote-id>
 	</upstream>
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index a602e204aaf2..c9ac80e4746c 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,3 +1,3 @@
 DIST flatbuffers-1.11.0.tar.gz 894944 BLAKE2B 8eee7165f2dfbed6ee0b0cfbec0df995bc6e8a19600ad42ac70788714635ba90d72f2dc24d0e1edd5ac6a1cf6148948f625245d3079e75861d29117f6fcf34fd SHA512 cbb2e1e6885255cc950e2fa8248b56a8bc2c6e52f6fc7ed9066e6ae5a1d53f1263594b83f4b944a672cf9d0e1e800e51ce7fa423eff45abf5056269879c286fe
-EBUILD flatbuffers-1.11.0.ebuild 682 BLAKE2B ffc7334d3025c9ffd80c1ea9e2f37098bd95bfae20cedc53fd7070fcfa9d7f289df1a7f24a04cf7109424cac1d09cee1f36d112f63b96d5735bd766b70fa3375 SHA512 9eb029c4a453af6bd4105af625975aa2e7797e137a03150b8db7e4bc5b9caeabb29cb0c47e736d5f71ae95b17bc934b4f97fa13bfaf5263f443ce382143debe8
+EBUILD flatbuffers-1.11.0.ebuild 709 BLAKE2B 9852190b172b501dc2607f5f29b03610b06990e3c5e4e08ba4634e0306dd6ba03f9866371e713b72669d0de7610c7ebdaa1793c225424c1d08b4cdfa6049d997 SHA512 75839617e7f54e2560471b7a7fc3c9056008a742cdb8eb1de00c8375e32403d1c70af2e4f6699a66cfba97425d7eb4396cdf22b7df65cbaefb03b556b778901b
 MISC metadata.xml 332 BLAKE2B db6517401d85991288145c5665477a48e6d546a522dccdae0856f127b273879965de38cbc17e054e99387c96da859b89cbd0d6bbd357e9388c15a43b708a7589 SHA512 c30e9735c09dc9df55b25e8943fb2bf4b9b780b396bd82ccdc9ae45c22940599ea38d4bf7a000721e3a0d9b84955fee047a545ce23f3c4c919b349f437182719
diff --git a/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild b/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
index 54bfce7666e8..aa501d3ba73a 100644
--- a/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
+++ b/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 DOCS=( readme.md )
 
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 0552af5ae8ea..57c2e2cefeda 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -4,6 +4,6 @@ AUX 0.12.1-conditional-tests.patch 1342 BLAKE2B 6e6724ecd63771c3ff417d82cced0230
 AUX 0.12.1-no-tracker-tests.patch 633 BLAKE2B 80f324c784248d5a25ddf70f82ec57c7ff4699f83805df96700f4013795afccd3dd098b4fae86c60381f31b6196d4beebbbd5f196663bda1796ffbf556e4b8d9 SHA512 3e37b6c6abc17aa0ae95f0d33042dc454328cfdc0ef4ebe035f7eacee65bad69db01fa6bc6493026d2a8ccd7ab030d1736cea2247b246f7296eefb1740a838df
 DIST folks-0.11.4.tar.xz 1972272 BLAKE2B 69fa21f9baf34a3597f8a7e3f789ab3d03ad508ec74e0e1dfaa8df09865cb99748483b4fa4aa9c219803c512a49a23e95d4c3ded5b285b0a0d2f7416a1d9bf7f SHA512 bd4088322c34b5d6e633d7d5d83dfb61eb3499014adf6fecad27231ec63509401b2867186d019a2f7c92cc3b3f2e6cfbc80e0d4700d84ce7a08d8153af3d2392
 DIST folks-0.12.1.tar.xz 522688 BLAKE2B 584957b628e286b850ee45c3f79d942ae602124e0130eeddc8806ae6fc12accd26c140df5caa0a1a68c84bff707df785d863d2f69ee9a0b6b450b8159c21fb39 SHA512 f60e993508137b33602ccc814bde45ad780d61afb0566f8175fd01b3dcaa5f5771e11d98156c4ecfd85f920a7adc140a5b2582eaaa97568b8fb3b3761668decb
-EBUILD folks-0.11.4-r1.ebuild 2563 BLAKE2B d8c4cee6a10be42a91052421d3a3eab4a6a6b67dbc0479dcd8e3f9e71a6d1f0e835f07f0f41e44cf9413f4b9fed7edd7f44c7fd0d8359b127a904337b3a02422 SHA512 84c6923cfc7ab30b27843e5899082a2284c30304b5d3c1353eca590a3729a712f7661365604a862d792fb4d4a0b79a04ea3907c548f90a5396446990d64b3eb2
-EBUILD folks-0.12.1.ebuild 2420 BLAKE2B 1437fc2e207ba25f073ac52479b88e7668e697700f416b0276e4c2cb3810a97313b020551e7a2a412a401ee36a643f175e9b9916e4706d5ba914121553278a36 SHA512 8822622d0f730fecdc585644dde45e7d4caa254e0bf86fc6dd52fb36849b0d914434325f4bcd578080c2fa88c435821b11d2cb49a4230212125a8e46ce4c74a9
+EBUILD folks-0.11.4-r1.ebuild 2590 BLAKE2B c0181f04f4b1abeb6313bb70333cb843d0a6dbae10e38482c12ed4a6e5de25d9192319c97c56e5adab921abed78500cf2f4d16440635f4b13b195c41800269ca SHA512 a90d812c4949a1d3c4d6f7b9086c3d99a4b22ba3f13e94a2be6f95885ee34fa69c37b32ebfa721135cef50d09336d3563bfd84ce208e4986b44e84fe7a34ec59
+EBUILD folks-0.12.1.ebuild 2418 BLAKE2B 5535c5ab78643462090c1613e028f0976d512a837788c3f07347cfefbd7795d5b5c2288d6bd38b0b9c0f8bccba4f7ba63b629fdf8bdc2451c86962964e5b6849 SHA512 9780b550f38d7178a3c4b429db12e505974942a858a3e633a711a67eea4dcc66bb1962c954717f6ea710b182a01a9fc227d7de01badab7e6e19245456643b900
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/folks-0.11.4-r1.ebuild b/dev-libs/folks/folks-0.11.4-r1.ebuild
index ae3a4dd69092..01e0bbbfc3f1 100644
--- a/dev-libs/folks/folks-0.11.4-r1.ebuild
+++ b/dev-libs/folks/folks-0.11.4-r1.ebuild
@@ -18,6 +18,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 # TODO: --enable-profiling
 # Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
 IUSE="bluetooth debug eds +telepathy test tracker utils"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="bluetooth? ( eds )"
 
 COMMON_DEPEND="
diff --git a/dev-libs/folks/folks-0.12.1.ebuild b/dev-libs/folks/folks-0.12.1.ebuild
index 0809549521cd..3815c4084e13 100644
--- a/dev-libs/folks/folks-0.12.1.ebuild
+++ b/dev-libs/folks/folks-0.12.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 
 IUSE="bluetooth eds +telepathy test tracker utils"
 REQUIRED_USE="bluetooth? ( eds )"
diff --git a/dev-libs/foma/Manifest b/dev-libs/foma/Manifest
index 46c83c5fc1f9..5f19521a5a3c 100644
--- a/dev-libs/foma/Manifest
+++ b/dev-libs/foma/Manifest
@@ -1,4 +1,4 @@
 AUX foma-0.9.18-clean-makefile.patch 1349 BLAKE2B 7f0dfb37d72ab9db835eff35dd5b79dca40c02c305cba23d89e2495c34592e5e4033b091763dcdb1eb64b7d4845868bf58c4754609e19a2f7ce2cef1ce7b749d SHA512 513ca1681e50c9ca7763364a510a28d86196f0685fc98842078a0b258d72cfbf4fb702e681d1433f242d7079ff4a78541a0765e261a12d7b7c2868fc15c3a7a3
 DIST foma-0.9.18.tar.gz 337134 BLAKE2B b7f1eeaeaa21096f8077f0e81f3c57c49bbba30afe8db280089c40ed6cf475df33a6899fd2b6929d3f58fe8b3660a92566ae41f2bd5d8a46dacc073b48caf030 SHA512 17df4c070d1460855804aa63f97cc4a0d9568755e93de0de80821625faab7a3994a260650c5e8f43f80b5a0702dadb0cfe57136ab50eb2a9946f118991205b1a
-EBUILD foma-0.9.18.ebuild 1007 BLAKE2B a96cc6045f75bdb615375ee48821b446dc141781f887b6a4a0b26a8d7966bd7fab8c0807fc2a81e53579774d4088df6a70b210103f1c70ac356d3d848b2a7f2b SHA512 4391f9d1d2782458af8998d532ace81f54cf3e731b8755bfb6a704e5cd4584237eaed1e813ce9766b326e60779dd922ef2d699196d20747d5b4320324a866236
+EBUILD foma-0.9.18.ebuild 1005 BLAKE2B a8bf9189025e585cf8348e14b3235a7eabad01390280e354b7faac1a491f44aaf4d1d0056a0b7b7c1c34edd3db1c2c4fa950f84b4627a0ff59f34529a9d67e03 SHA512 3140ff8dbfc2122b7640068cf5d3854f9539f63ad6f202d6964a5a3aed991fd4d88b98420ae6cfc2808e20d99d9d73cd2808e715a5c1fb0c1c45d47061e49baf
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/foma/foma-0.9.18.ebuild b/dev-libs/foma/foma-0.9.18.ebuild
index 778896159254..1831314c8e1d 100644
--- a/dev-libs/foma/foma-0.9.18.ebuild
+++ b/dev-libs/foma/foma-0.9.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/mhulden/foma/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="sys-libs/readline:*
 	sys-libs/zlib"
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index d81d08674a96..421a6b07e391 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,5 +1,5 @@
 DIST fribidi-1.0.5.tar.bz2 2082617 BLAKE2B 99b088a37600d1b3e556b4dd978cafb04af0fea9c7db8ed9b0aa90d6a6a60f8ca312c214151ce386d2d61ae382d6ff0e6ae240bd44dfde28eb8c25a5c5f4cd1e SHA512 c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2
 DIST fribidi-1.0.7.tar.bz2 2074943 BLAKE2B 9f2fccf46073c097ce89ab0b4ba640440b285e538a15a0ec3f8aba62ee5e892431e909c29fdcb793167eaea09fd4673ac33fbe12c7306ff9d26cbf871b9f565d SHA512 c7a1834eb5e79e337b31c62b75e9ab61f761cc5d6eef5c9ac9610f69ed044ce9d2d2efac150cad167eea3e1d573b27765e5d01abc4b4f9e43c7903d5980ba8c0
 EBUILD fribidi-1.0.5.ebuild 949 BLAKE2B 3d4c8524eb883cd96b6173c147575becdbb0128f05a91c7d6515bd3d1eb4e5f635636224240ecd389341ca24215f85bdab85ccb586db0259f683d6810685ac04 SHA512 450d49ba5396afc544f8bb7f0c6d8d9d7b4177ccc34bb50e6b8f56b6f6e943b4471bfc47ac7165485e070bc30b27703e838a01e2032aa696871a74494a62ffd2
-EBUILD fribidi-1.0.7.ebuild 1016 BLAKE2B f5ac2963eb03266da01e928930bf8ef77709e6c56ca8ebc2134bc0e4d7ce9242fa0ed927f4bac2ec8ed800556662d1b541f471641ba0ece7b54051401f8f4dd3 SHA512 91584816658e2b00db6486353e0bf441808e2e09dcbcd962574f9ae26f6aae1b122e0f83e13558965e1e673b55b438af8bc5446e4ea9ee22d240633ce5508d93
+EBUILD fribidi-1.0.7.ebuild 1008 BLAKE2B 2f713298a279759176d4d82e86edd924b79c161ee69344e0a34a1d9dac375e289d1b3f85ef275c83124752052bee5e062af146d4e7842e7965ce6c539980b29d SHA512 43f157951a4d86e28411e1960e273fe933aef17323f11cfd72390f4759da9900d978c3d84b03fb5c76f3d674189c652cc26bc03d7aaecf45ce0d218253c0ffec
 MISC metadata.xml 341 BLAKE2B 5270be41f2666b559cee776629574ac71d81f82d273992d8377febd5c22418ef3ed933214a02a39a8de6cdbd4730d2abf547f001cf1d86c9c40b1a344880d276 SHA512 70b910d1fc10d8c0750618d8e6c1b2722a377f71042539f2400d6364a61483bd270d58e3a8f4f4f46f1a018d239902157b0a1d4aaf9e32b33346136f093f40a8
diff --git a/dev-libs/fribidi/fribidi-1.0.7.ebuild b/dev-libs/fribidi/fribidi-1.0.7.ebuild
index ec4204eaddb6..c68773ca628a 100644
--- a/dev-libs/fribidi/fribidi-1.0.7.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 283860a00baf..22e66cb75208 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,7 +1,7 @@
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 DIST gjs-1.54.3.tar.xz 647704 BLAKE2B 792225afd9828755ef67b3e7221d4c53535d79d879e0aef0c7c56f06e02313a966776b5dddf9876649984a1599eb44a27d6288f9216bb929a66ad9e14cb632e5 SHA512 f19e667963fa3feecd23a9e4cc263a55d9d1311de7d10905969966f74e26ff982839c192c555cbc059e4fd65ff7c89d18944ca6bf8ffbb65ec91081036d19505
 DIST gjs-1.56.2.tar.xz 701976 BLAKE2B 77057e4a3a8958d6648c92bb56495b505b3ec49bc0eeff0fa5c9e3ae5a694a4b5643dc72d7aa673f9e66d42e9b0def7f9df0043f2690216bfc5c5109ea9eca51 SHA512 687b8e3795565b5c56fceebefb229c07b4c084a4f65c0035e0d185d12082920424632c0f896df8dc1cd5013a97b6e08274efaec4caeb564dc2070d26a5f974c5
-EBUILD gjs-1.48.7.ebuild 1548 BLAKE2B 47a474a7958d70ed915b8c1a2a973f1e72f99a7bc4459e98a687503122d83d40dc0733dcd3e7fbefc42304049520acf80b3ad609cda1ea5c8653e0ba215f19f7 SHA512 4a976754dcc518a188fa3ceae85ec61aa20b0abfe6c9c5ad248fa72ea62820935415451cb8f6659931b6b8f4044dee2f5a20be8c08a6d1a3df0d526b24b8695f
+EBUILD gjs-1.48.7.ebuild 1575 BLAKE2B 9575ca81c0f54cef94269398582a432584989999fa11266e7c7ba76a4429132d2b02993d6c23f3906f3bce08e0fbe040cfda63759ff163c4a36ff94a784293ee SHA512 b3322a094c9c1c10c2ee1693dc0e6532a58f34ac44c41b3ee12247490ada15ffeb4b21888712968f8fc6a38fa779020fc43f4dae65fae9ae5b652332e9f7a4d3
 EBUILD gjs-1.54.3.ebuild 1556 BLAKE2B 9fd9e8b7ae9511995a83a99a916c7c5afaf45b9a65a27aa4dc2f75c7f0ed77c794daa9bb7a541b36d3c8a230b628c4eb4705053120a08ff504ff1588e46c67cd SHA512 6ed337d8f79d3848159cb5ee234e6482e22b2cad42244e29b2ea3257dd1aca2fc9b6385bc8532703e109e576e609b95bba4474951335fbb51de755971a4a5ad7
-EBUILD gjs-1.56.2.ebuild 1730 BLAKE2B 0d09046b4a4029486f2c06d8ef923353bedb4a65448a19a33d417d7a144f4a6c7efd8c057df8a9f468a5e7950c5b80e1c31cb76e48c39f0e013340d25fb4fdce SHA512 165ea3340b784457679f261106d57e07b1328bb73f292bfa6bce90ec08d51b72243dc0537f1ae77525c4aded557822465feaf835f7a0690cd9474bec0adcae77
+EBUILD gjs-1.56.2.ebuild 1716 BLAKE2B 2d84c8877630973c34d759580e59af1b1616c17bb75248f18ed7d7383b39972e994dae7148e0083e8243bdcd555d022a79016e06d2f0b82f21340b230116906e SHA512 1827f6ddca0a590e275160110d630300519c8be48ae6eb0dfd8a912e4cd40ada8ad2b7c57a33bf2b2dfa9d266e5fd2e56714510834f805264e10bc083d90af1e
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.48.7.ebuild b/dev-libs/gjs/gjs-1.48.7.ebuild
index 7766348989c3..8b9abe61a64b 100644
--- a/dev-libs/gjs/gjs-1.48.7.ebuild
+++ b/dev-libs/gjs/gjs-1.48.7.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,6 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
+RESTRICT="!test? ( test )"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
diff --git a/dev-libs/gjs/gjs-1.56.2.ebuild b/dev-libs/gjs/gjs-1.56.2.ebuild
index a29e1c7e479c..f747eb708a79 100644
--- a/dev-libs/gjs/gjs-1.56.2.ebuild
+++ b/dev-libs/gjs/gjs-1.56.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.54.0
@@ -63,5 +63,5 @@ src_install() {
 }
 
 src_test() {
-	virtx dbus-run-session emake check || die
+	virtx dbus-run-session emake check
 }
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 1a2ef442e3ac..aa49f4955abb 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -5,7 +5,7 @@ DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b4
 DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD glib-2.58.3-r1.ebuild 10885 BLAKE2B 6ee9ecf6d7104c91fbfbc4831265d43cc5d02ca2473eab775c52d056c708b93a5308ae4786044369705e82663adae8c586cef30b1291e0115b3bfff6fb07e4b0 SHA512 dcb88988cca219590777abae14826a3f4ed029b84d68e93abe7be13fa0fbf8fbdf0c0db80d072e366e053fc572a161c06c81c40ef462a3c7edf010bff4e7625a
-EBUILD glib-2.60.6.ebuild 10117 BLAKE2B 1d81eb258138e4f24ce5582da17c0c47d379fb177fef6a0ea075b4bc83caff5fb8eb88ca50fea940da389b1ee2261a38cf54ba33f4e49434abc66336a72ce09b SHA512 644c45f8048fe03e99f05ddd5811bbf759e17f1eef8c409639b4140d66937ecf949ea2d62c269256556c2ca341077b63668e4f7cee5ab25bcc9f3f7e048a4904
-EBUILD glib-2.60.7.ebuild 10126 BLAKE2B c1a587ad1bbfee6ddde883bddc36bf408f4193e896ee955fc7b420b4065e37cc04ab7c2616487e537432b6128c60e903b95547eadb61aa7769ee74406772546c SHA512 885550488ad2f0b4dafae41df41870d7288332702fdacb25f24013ec7a4557d7697d575309a0f085599a406be89642520e56f29afdfc89497b14b785c6bdd7af
+EBUILD glib-2.58.3-r1.ebuild 10912 BLAKE2B d7e4d3145a37b7235a481febec833f15cd3129ddc004e5203b5d62a3213ee428c99500497d5800c844017cadcfb2a9e35336997c0d64af4470851209e5fe1d06 SHA512 947306752168cee891d4d97ca86d95ca5e3a395a3cab849e171338a21b9297cc803e968d4a5468cd585666719f8a8e2d1cb0cdaba6b9ddc0d48bf3ff30aec9c3
+EBUILD glib-2.60.6.ebuild 10144 BLAKE2B bdc664e55173540a83ffc84dd5845bb125c305bebf6a8d5bff36ca0a50767a1db22a6de09f70d9da037c32fd706800ffa7d0d59701466959654d61ba9f17e679 SHA512 83d66effe9c6934eb0e8720ae861fc4d05107070eb8539a06794271d4d17cba0d5267040bf059b5752e57a8c95bd911d46a7c32c37cb3e0400ed1a75725bd38f
+EBUILD glib-2.60.7.ebuild 10145 BLAKE2B bdcd02e148bf05cd18a3b19e7829dfb85c279270c197c6ac9bd65c0ea5a715480c5ee62b56fb443d8d8d9e1120e9767b52ffb9b0fd3470c3ccee0b523ecfe56a SHA512 50d3b20b79d0294828e08b3c0284c2caf19aeaa0d94f0199afe9f5137e62d4401be01753c2717ec950214a5e2da430594d30d5a014f8acd5fe3e43a7f6210f1e
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.58.3-r1.ebuild b/dev-libs/glib/glib-2.58.3-r1.ebuild
index af6ae5ac84a1..aba9651c1307 100644
--- a/dev-libs/glib/glib-2.58.3-r1.ebuild
+++ b/dev-libs/glib/glib-2.58.3-r1.ebuild
@@ -20,6 +20,7 @@ SRC_URI="${SRC_URI}
 LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
+RESTRICT="!test? ( test )"
 
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
diff --git a/dev-libs/glib/glib-2.60.6.ebuild b/dev-libs/glib/glib-2.60.6.ebuild
index 0da3428974bb..bc7a27071e05 100644
--- a/dev-libs/glib/glib-2.60.6.ebuild
+++ b/dev-libs/glib/glib-2.60.6.ebuild
@@ -12,6 +12,7 @@ HOMEPAGE="https://www.gtk.org/"
 LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
+RESTRICT="!test? ( test )"
 
 KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
diff --git a/dev-libs/glib/glib-2.60.7.ebuild b/dev-libs/glib/glib-2.60.7.ebuild
index c3b882a75d1e..752dfbde9ec3 100644
--- a/dev-libs/glib/glib-2.60.7.ebuild
+++ b/dev-libs/glib/glib-2.60.7.ebuild
@@ -12,8 +12,9 @@ HOMEPAGE="https://www.gtk.org/"
 LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
+RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index a61d135d9ebd..a64f240a9e39 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,7 +1,9 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
 DIST gmime-3.2.3.tar.xz 2217320 BLAKE2B 29c8004636b27acd1dfd102d45bad39c09c677475c5e063e73b26ed242070b66ce1030d6ecfbf16d76d83ff403685bd62bcad832b94883fc5b3c770d9f800fa8 SHA512 abaf9059baf0c045d5b62757953ee2fa0779462eb32142bb41be40c376fc7ac2b3e4a56fd66177fbbe1dca35c6168a251542b14a844125c2cfcc9a99888179b4
 DIST gmime-3.2.4.tar.xz 2219876 BLAKE2B 210941d10dd5c0ce8a638a54a51da9000b4638ae2cc8a37be757fb331c0c2360fc497d7bcf2101ed6bf22de668fe0b779984e83ab40d00d551a5b2971d7a5dcd SHA512 34592e89a2f923dacc37ac535da785918c2c0d6a63b0f2ec1d86393264aace44d1060e8ef4a77e60fd57e97475435f8e79d87e46b269ae332db9b9aaf98bf61b
+DIST gmime-3.2.5.tar.xz 2220348 BLAKE2B 677a5cf88633b0d437a86ed3189399ee9ae4a23704f2b92ba6224e395309bea69cee419e39dde69d14f689df737319946eaed6460cc22c529c18f8d3b68872c6 SHA512 37488da84f1befb37a0dff9465e9f786670dfb7248adbbc1f227dcc0e80bcd4ee7cd239abeab2b52e8ded6ea7f8aa432bcc0461b379282dacd6ee4f867aa049d
 EBUILD gmime-2.6.23-r1.ebuild 1497 BLAKE2B 5526b533983b0cc9cfbf6787b8e02652c91abdb3b5403d68dbe01b94f150307e549014f924d430c06eccb3e82ec19ce5e6e4b40a16ed04e4f30f683c31b04924 SHA512 20830a222e7c0ea845168c0a76be0efad72474078f93e65f4025a70b4cfebd9fa2a667c49be7d445b50d342e456b714bf6b78040266fbb80778af93ca99e2a86
 EBUILD gmime-3.2.3.ebuild 1581 BLAKE2B d3b4f70d96de01af0cc7062245b218b246dbf71e21bde1a384f8b05ffd6ca2f71e1628f41ec7ad07188469aa00269cdd0aa3932c97240758c2fae2b3247d15a4 SHA512 33b540735166e91d3f2fbf2cd4bf3e41f700e950295a0d6116f0679e1a94cbdf0705bdd1f973c08258f445d10e4782f022b67ea338c6a1ff8cfd0b309e9adb5e
-EBUILD gmime-3.2.4.ebuild 1583 BLAKE2B 2b934d6ad1c215315b5617ba051d576b61665d7a935a83d6001140ea09185f3448f1dc7d1b22c570bb8e636a094325a8f1263161f65cb46277ff1a9440c9d602 SHA512 7e4aef4193be091d005a5ba26199d4a51baac83d0d3a040e3b58109fba1e7f5e72624e9fdfc291b616c56cffcc8bd4c85e97941742ee6b72feb2085641b5c43d
+EBUILD gmime-3.2.4.ebuild 1577 BLAKE2B 961589b4af1f857d8967ab18eb74795241498ccf7ff47f263454884b5fbcbbacbee6f8bc3f133b75e97f225894cbd3789a70f39bb0656323475f75007d8f2543 SHA512 eb4cacf826c436b4329234327b57f78e9de8c221f5bb9e10745aefe44e0aa097121e6d9c81812f28043611f3f11a2f697191c5988c9f06400e271aca1d46b4d2
+EBUILD gmime-3.2.5.ebuild 1583 BLAKE2B 2b934d6ad1c215315b5617ba051d576b61665d7a935a83d6001140ea09185f3448f1dc7d1b22c570bb8e636a094325a8f1263161f65cb46277ff1a9440c9d602 SHA512 7e4aef4193be091d005a5ba26199d4a51baac83d0d3a040e3b58109fba1e7f5e72624e9fdfc291b616c56cffcc8bd4c85e97941742ee6b72feb2085641b5c43d
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-3.2.4.ebuild b/dev-libs/gmime/gmime-3.2.4.ebuild
index 3ae7bfbbc5f2..f5d59010489b 100644
--- a/dev-libs/gmime/gmime-3.2.4.ebuild
+++ b/dev-libs/gmime/gmime-3.2.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
 
 SLOT="3.0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn static-libs test vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gmime/gmime-3.2.5.ebuild b/dev-libs/gmime/gmime-3.2.5.ebuild
new file mode 100644
index 000000000000..3ae7bfbbc5f2
--- /dev/null
+++ b/dev-libs/gmime/gmime-3.2.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit flag-o-matic gnome2 vala
+
+DESCRIPTION="Utilities for creating and parsing messages using MIME"
+HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/"
+
+SLOT="3.0"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="crypt doc idn static-libs test vala"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.32.0:2
+	sys-libs/zlib
+	crypt? ( >=app-crypt/gpgme-1.8.0:1= )
+	idn? ( net-dns/libidn2:= )
+	vala? (
+		$(vala_depend)
+		>=dev-libs/gobject-introspection-1.30.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.8
+	virtual/libiconv
+	virtual/pkgconfig
+	doc? ( app-text/docbook-sgml-utils )
+	test? ( app-crypt/gnupg )
+"
+# gnupg is needed for tests if --enable-cryptography is enabled, which we do unconditionally
+
+src_prepare() {
+	gnome2_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	if [[ ${CHOST} == *-solaris* ]]; then
+		# bug #???, why not use --with-libiconv
+		append-libs iconv
+	fi
+
+	gnome2_src_configure \
+		$(use_enable crypt crypto) \
+		$(use_enable static-libs static) \
+		$(use_enable vala) \
+		$(use_with idn libidn) \
+		$(usex doc "" DB2HTML=)
+}
+
+src_compile() {
+	gnome2_src_compile
+	if use doc; then
+		emake -C docs/tutorial html
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use doc ; then
+		docinto tutorial
+		dodoc -r docs/tutorial/html/
+	fi
+}
diff --git a/dev-libs/go-usb/Manifest b/dev-libs/go-usb/Manifest
index 1258e5fd2ced..4022d53e3ece 100644
--- a/dev-libs/go-usb/Manifest
+++ b/dev-libs/go-usb/Manifest
@@ -1,2 +1,2 @@
-EBUILD go-usb-9999.ebuild 612 BLAKE2B 4beb09a14c163bdaa7ca8930de5f88a375006b1d04650fe3241d40bcaa4c0422441634977dc60d0ec4d0a2456d92344732a878e0f974cc5b1334ac62dc7f36fc SHA512 9c2ded5561d14480f22953141a0612cfded41ca887f96ad4bb36575ca9a8cc6467c66a95afa0ae076fa1aaafac49b45b9e7ac5ff53aa697cafab0ec8495494ed
+EBUILD go-usb-9999.ebuild 588 BLAKE2B d114ce899e91535cc0fcd3f72e485c97dc92f2bca5f95a6333ac97e8d976675041335808cc3a52bdaa3a541d65ef6118aefccde2e23a1cbaf95f2537e7c21bc2 SHA512 47cf595cff1e86834df60a21f5bb729d664ae8b111c807d440a5d54904b4bc4a9e19b4b83005d33b973451dbae687f642de32221f8ea94f9e56ff5d090806068
 MISC metadata.xml 332 BLAKE2B 5015b049d96897d2a7969096f0ed50a6606139d982a16ab849d0a908576f4c5bd2f2c17b7fd1c26f5ba4161a9140e9126c531974d57c2cf899e44736253ff4df SHA512 72d224af53ac4c93a252eae5a518d76abf05052e9a268ee007cc7e03f96ec5e673b6c7e83e4de15ea9f6e1a2222f7fe687fd10834b45edb7e638d75f61bb9cb9
diff --git a/dev-libs/go-usb/go-usb-9999.ebuild b/dev-libs/go-usb/go-usb-9999.ebuild
index e634c7ea3b82..7c84be80dbe4 100644
--- a/dev-libs/go-usb/go-usb-9999.ebuild
+++ b/dev-libs/go-usb/go-usb-9999.ebuild
@@ -24,7 +24,7 @@ GO_PN="/usr/lib/go/src/github.com/hanwen/usb"
 
 src_install() {
 	insinto "${GO_PN}"
-	doins *.go LICENSE || die "Install failed"
+	doins *.go LICENSE
 }
 
 src_test() {
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 8b6963730293..609ccc3291f8 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -3,5 +3,5 @@ DIST gobject-introspection-1.58.3.tar.xz 1378068 BLAKE2B 3ae0328892da30aeefcfb8f
 DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
 EBUILD gobject-introspection-common-1.56.1.ebuild 997 BLAKE2B bf4ec76f6cd5d29d97f122a3c3d85a4d120d4825b2e40443e322d79c1000c10628d5ffb9609c4e6b7effe7d0c4de759ed163cb7eab93b509cc5b7be17c47f95f SHA512 dcb5da39162a0d5456970818b00b3bac0ed1577ba6b70c7b15aa55f3184a3e6c8e7eeeec74182fab852f8a86862f871a277281117cfc93292de2850f4b11decb
 EBUILD gobject-introspection-common-1.58.3.ebuild 998 BLAKE2B fd13c13bda5ce03694d2f035bcd6f7d033d79a170e0f65740da671a37fc54adffb2982f64898dd2e24716ab1e9749232bfb8de527d6f72245a5355c25f4475c4 SHA512 9367c044c3b103f8ba66af6ebf874602eda425035696bfe2df9164a85785f268b5ae780b3d516f55903218ab47fde07d3e29f95ab690277399bf619a6fcdf021
-EBUILD gobject-introspection-common-1.60.2.ebuild 999 BLAKE2B ffdad0dcacec5740c928af3ab593b6ea8c9aa83d08da8e62ab77a3221b229bd68bb7c0f8a19050199876b7d2702b0c30c9c19d16cf9ec79ad920f49f1168f3c7 SHA512 2b20bf374e04277d12ef0b87fbd60e41229c85e3733755a1b703a96429d47cc3c02c5be468dea272575cfbf5beb54cd9df4275ae45db754ff95ac39c01d95f1b
+EBUILD gobject-introspection-common-1.60.2.ebuild 998 BLAKE2B fd13c13bda5ce03694d2f035bcd6f7d033d79a170e0f65740da671a37fc54adffb2982f64898dd2e24716ab1e9749232bfb8de527d6f72245a5355c25f4475c4 SHA512 9367c044c3b103f8ba66af6ebf874602eda425035696bfe2df9164a85785f268b5ae780b3d516f55903218ab47fde07d3e29f95ab690277399bf619a6fcdf021
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
index 930f9b7d4c5e..9efbf2992a73 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 48e3678e70d5..2d5b2b1900dc 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,7 +1,7 @@
 DIST gobject-introspection-1.56.1.tar.xz 1397812 BLAKE2B 070597f3bd6e4e58d1ae1964cf6e8d7881daa68aeeddc5e9b64bc410fad6d435f2041171f4dfc2a6b477d39f2d7e9181b9917d1244fcb45b3a37491726381649 SHA512 2bfcd45b8c5ad68a3f6550c2f80a6804db0e1a72ffaf4fdd3cec3d8acc23e79ad14bb5bf612fe26fc896691839ab19ca8dd1c9994db14d730e56fa79df9d973d
 DIST gobject-introspection-1.58.3.tar.xz 1378068 BLAKE2B 3ae0328892da30aeefcfb8f6d343312d4967345cc202ef137f29690fbd7a35fa9310f87b134fbdfd4fd753b68b47203cd306689d9892eccf17e303d1e7bcccd4 SHA512 0811cd08e224975b3aa55ae89d648fc65f3105cae8a077a5671593d84743b1db28e9fbffe53fc86a2b3e82ea98c35f3daae033d3df07c7020cc3bf8b5d94f796
 DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
-EBUILD gobject-introspection-1.56.1.ebuild 2101 BLAKE2B 866d4517a1dab7c782f52ac9025b76acc84f57dd259e80c0fec2cc7f9873f59ed8185c4df51297cdbfd3517fcdc88f0215b4c25adad5fadf2b2e8a3b6bb2ddf2 SHA512 c5fd3ea99ea9ec6ebe1752d4decafd20627a3bf5e0268ebcc0eb542669fc3be3fd4fca7afcc4ebfbe34e58e41da9139b711723a763917bb602026560eee942a2
-EBUILD gobject-introspection-1.58.3.ebuild 2178 BLAKE2B f2ef3c53982192cb2bd58f52f84ba033abffd354e62ad12f93b155e5ee82ca719f99749e22de750c3029080700c4abe1157bcb859604eaadd3c7d7ca027a0831 SHA512 07339b10f27d38e9b1d244e80156710eadd91f009fff57a69065305fd505f779a9bd9c5134307aea4a059a4d630258523551561e7a015a24770e694988a1bf18
-EBUILD gobject-introspection-1.60.2.ebuild 2135 BLAKE2B 48d77747097f9228b39ede21893bf0e407824c236132d9fb6d89388319897d1b8cd41bc5ab9778686ef598297c0ab1a54376bb61dde0e0c6fd34e2e01d952376 SHA512 f5f85387b190dcb1dfb72ac0fc368b6db70bc899f4805b544994c36ebba12f0e281d98caf35b259241a869f15b65a71d7e15dea36c3e8c53849d0546e2557b6d
+EBUILD gobject-introspection-1.56.1.ebuild 2128 BLAKE2B 022e97fb86bba4759d526a9618fe9e9cb4a78798c0aa32f3275cb0f946efab379a1fc0f5963af293e29210fe075a4a0827e601f64bcbc716eacaf8d94cef05a3 SHA512 eb8ab69d84e4094f505359f909d9863a37aebadbb3d23b7a73b57e5d26196582968e11f473904e89c2649a20e8ea09159afcd9b481b371c6fc654f6fc3183978
+EBUILD gobject-introspection-1.58.3.ebuild 2205 BLAKE2B c247ce9eaa4bfb27c652410e2b222ec8359306007f521e94a9cb7ede164d6c131bdcfa7d251b001bcc550e09f79d021de8ef349a2bbb579a18a13874e4d33671 SHA512 a6d8b9da2461314cbae5947acad21e78c1d98b633b2f07b64304cd118d71517c61db1dbf1fac8e768ce13c91ba9d53d64d40af760e4691eef0d9068a7b2b5c4b
+EBUILD gobject-introspection-1.60.2.ebuild 2161 BLAKE2B 06f368c9a7d7af7707a7d341005925654f5c4709abf0cfe3f711b2efc7e6783a5ea75dfe2e5c7403c5d42dd0de6e3e9870088adf42a448cd4f273956857d2d82 SHA512 f282869d41287ebc9a5a18bf37f7db8757c32698fc31e9f56a8705ff5e3adef53b1fb29b648dbd8cc0be60ec13c5597d7cbdaad49e130a402c018c4e680259a2
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
index fda611d8f9e4..f67a001b4c1c 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
@@ -13,6 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
 IUSE="cairo doctool test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
index a371c8e76422..a543fde12578 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
@@ -13,6 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
 IUSE="cairo doctool test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
index ecde3bca4d51..5f85916a865d 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
@@ -13,11 +13,12 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
 IUSE="cairo doctool test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/gumbo/Manifest b/dev-libs/gumbo/Manifest
index fd46b86f8d56..bdcc127f5066 100644
--- a/dev-libs/gumbo/Manifest
+++ b/dev-libs/gumbo/Manifest
@@ -1,3 +1,3 @@
 DIST gumbo-0.10.1.tar.gz 2119285 BLAKE2B 21a8dd479bcc568842ce85782d4de903c1b79d842dd5381c01fd7b7ee802872484bf8b647edde9c2a4939404a4d042e920633f4d337870cd9f4197a90b158ffd SHA512 bb1fb55cd07076ab6a9f38dc14db50397dbdca9a04ace4895dfba8b8cbc09038a96e26070c09c75fa929ada2e815affe233c1e2ecd8afe2aba6201647cf277d1
-EBUILD gumbo-0.10.1.ebuild 862 BLAKE2B 14fc40033747b692ccd3b4c355977833a1032d3828902b44961d96686b653d0afcf89c1e449d798905523f5b1a37aa0e5738f58c3f4821e11f11074d30c0275c SHA512 f15dbd423665c396c9488f972c0f56ea335ab0e39417de7857c6ba2126f776527496bfa559c00b07fae55f98ee627384c7d202c864e95ddd6c25f229cf6f6020
+EBUILD gumbo-0.10.1.ebuild 886 BLAKE2B 8c887d87f2c7d1f2b50a91a0017463e360e79761b11a824ca777cab6ae313034a6387080598c72fd40876f236430efb58f488f04c9b40561cbcb3f892ed5372b SHA512 a1c285c8cb763bd8ee53b06ab8db5bea9da89541417b900a63ace0a11962860bba57882239ed9e4163c6ad0d942f97e1548ebd0b68653d81b2844e8ab58404bd
 MISC metadata.xml 316 BLAKE2B f653d0ab857f07f4dc00630d5c795c86920514c04e51d0e86eb761d3f8298b8a4aa6ece91fe387fb1ec1e94b46cd8429405dbfd9303d1c591d155a0521e1547c SHA512 64d8505048d0a0eaae29a8078d340ae290f9bcd2971028e069fdca2f3dc503cec644109a9d695f7e63ce4cfdb6a1e6375e49292580aad1b4e61a46612cfc7c25
diff --git a/dev-libs/gumbo/gumbo-0.10.1.ebuild b/dev-libs/gumbo/gumbo-0.10.1.ebuild
index 3587bf94f754..41b664957449 100644
--- a/dev-libs/gumbo/gumbo-0.10.1.ebuild
+++ b/dev-libs/gumbo/gumbo-0.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/gumbo-parser-${PV}"
 
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index b8558b07a59f..fb18ac2c4f20 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -1,6 +1,6 @@
 AUX hiredis-0.13.3-disable-network-tests.patch 1297 BLAKE2B 49b87fc28763d551c51524941dd8254765569546997dea69d427473799fe4921b96013cff79a9c09af3341bee848274a5b2281c16785fd44592ebbec866c6978 SHA512 bfbf4ee0a6780cbdcac4c8578aacac241d2b00c94dedd4f298ff06d65cab100f446072573ea0b57a513d3f7146070776fa08e949374e43272c2b05e601f250fc
 DIST hiredis-0.13.3.tar.gz 58291 BLAKE2B 2af5853475a48b1f05c17100197633af61663a23a1259c702545938367b6a5b9fc09b886e12f57d27f23db3f5c636bb42d7e58887cc1481b7016cea405345ddb SHA512 0d8b71d5ee4105e8aaeeee308795afc2c1f60a04b0bfe8ae873d800a0c157882ec307efa04a8d0e63b538fd3fc3f88eedf4d46cb87c8937e2403927aeb7e434c
 DIST hiredis-0.14.0.tar.gz 63061 BLAKE2B 1923a63317f5f4a5bcbc9f8fd35e11fda15c30bb766d377f3be1eaf961cf34339e16b9b7c468b5bf07e513db4913c564e49eb29a2684b945db6c914b07d01905 SHA512 57a81a35b4750f0ca9dba830789483667f8ca1559f13b0ebdc3fab3e34ad16b2809f9734cf88157041263784e11447556b7a748bfb7ef318a60bb5dda3e358a0
-EBUILD hiredis-0.13.3.ebuild 1847 BLAKE2B 85fae34eb353c706da9e9e80290c6cc004c29cb29d4c03a16ce80da6e78f928b9fcc1a53dbb73d30efdeb324e8fb3c5ebd8e269846489a407608f83e1a75a42d SHA512 6f0d8e5018e5aa8607cfc63a1cdedf9fae8e18da89dedadae42f3d728a7a792db656d89f99195bb86ba3ac23d76562bf5b177b434b9e4481c9f37b17c7c662d6
-EBUILD hiredis-0.14.0.ebuild 1857 BLAKE2B 00f9c22dd85ae2bab39b29c216affb4006470656713c2e575b87b64c6c39a060dc239b5a4de4705e42947db59ee3885a8002414766e1c903eff3c9fd67263fad SHA512 ffbee692c3375e9fa8053fb1139590ed7292ded6aab4a187fd588aa4c1537c820f79ef48f5b0e1f3ee12d55b8030ae42bd779347ee8cce3eb148d2b190bb2583
+EBUILD hiredis-0.13.3.ebuild 1871 BLAKE2B b1c3ce67e58e0ea5d1b75ac9dc0c92083630496c9d5043ab80d3cc1e0977236fc6566120b92459eff7e47a8287d9bee55cfe49cc53e432e14f663c9d51a7661d SHA512 49a730abd67884fc9957c1d1ea05aec6e83f5ebf2122af862892840f8dba34336bd1f18318c8868a376a0d3449770954dec53f43a6ed79ebdfa6fc227e87519f
+EBUILD hiredis-0.14.0.ebuild 1884 BLAKE2B f4a58ee03ee045213dc4a1fe66511082857c79d2c9bc0e468d5cb31e1696cb5290121149e19f4fc30d9ac9bd58fcaa73cb3acc90a322d61c759bfa7b127db724 SHA512 f41ab5694ae37de96945666f48d86afeaeb1ff161db3a480589abaaabab8779b9405c50fb51be46e55782600783a69bcb484c5d0935839739d4e446810825252
 MISC metadata.xml 324 BLAKE2B 4b317777c17533d9f574064a410d1431dde5ac68fe50b25140f63cd21829b30cede1a4e3d38996eb50de1cc38257a9e5eabb2c2871c1d5727132a698048de93e SHA512 5c81a7e5c915ae46f6d2849806534ee520d413f8ca2f640c7441a61a478652bdc6f0a2501504843b1f07b557c06c0045e92ee87a949e018f7d95884e38faf78c
diff --git a/dev-libs/hiredis/hiredis-0.13.3.ebuild b/dev-libs/hiredis/hiredis-0.13.3.ebuild
index 045f7c1ebd2a..e4cb01085872 100644
--- a/dev-libs/hiredis/hiredis-0.13.3.ebuild
+++ b/dev-libs/hiredis/hiredis-0.13.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0/0.13"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
 IUSE="examples static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-db/redis )"
 
diff --git a/dev-libs/hiredis/hiredis-0.14.0.ebuild b/dev-libs/hiredis/hiredis-0.14.0.ebuild
index 201e0c0358d0..e9e551acd1a5 100644
--- a/dev-libs/hiredis/hiredis-0.14.0.ebuild
+++ b/dev-libs/hiredis/hiredis-0.14.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"
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0/0.14"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE="examples static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-db/redis )"
 
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index f2c9a878c98a..22f9b48efd53 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -1,8 +1,7 @@
-AUX intel-neo-19.16.12873_cmake_no_libva_automagic.patch 330 BLAKE2B a38c4a03d1837102168b907049c1a8fec93035f7efadd5e5cfb17296fd5fbf17dac1961affaa625847cd7c0cb3694d9d5c36b96d45f8c036334e8dc707100db0 SHA512 5c7133d355e0f4f8c0f8f0c84264d5f2a8cba6126d59b8a509354759a97d1a6f96b5deddcaacbce2ceb32e2014dd2f13e613a7db1973d3f865b906b803e8866e
-DIST intel-neo-19.22.13062.tar.gz 2402939 BLAKE2B e47f19fa602444cb260a2cdd9b676201ec8e4c50fe55c4216f779b8edab3497b5249071edcf5d162457be4f72cd33868cf7a971d99b1ae60e7a5e3714a795e82 SHA512 81ad69d051add3eb8d64373ad2ede0b323a4330c9f18010130e9b3db4d78d6e30e2e37f01c0cb7a77e378af62d9d6dd62755a21b153ae753417a6a2556d61b66
-DIST intel-neo-19.30.13641.tar.gz 2446018 BLAKE2B 640b3076c928eab80911d219dabda85029f544d62ff7d39de465f89844f244e75afe053f8475db79aba88a969252d3d5141f0167c8bc7f05120a71fd9ccfda26 SHA512 70aaccc74d74c1ecc9098e579fd6ad154b22eb6024f84aab626d92ece33f5d5d75bdded1656fa7250f34b5b69f69767f39e22b9777601152a5ae6b32d8e1c796
 DIST intel-neo-19.38.14237.tar.gz 2480609 BLAKE2B d44b00038009d6fc549f7cb17f248f83b6848d152cbb0a0815a5537b4e6131e5087ec231d777eb425b13aee27954c4526ede4859305e5312ad34cc7ec32b0897 SHA512 5886c1565405410da27fd3f2f38e78e9d7017968ec92a2819206e53eeeace3903c3d14fae9b5a5abf582cece5fe1d54bc1db18301846c668af768fcac5854c91
-EBUILD intel-neo-19.22.13062.ebuild 1346 BLAKE2B f370b74e4661c304cff1460da5c47d07b5768b08b1e67417308ed5965f4c4ef43f140e87b7f4256950935788fa244500c0dde0bc3defde0b7edd52626a2f6557 SHA512 982efe953499958ca48523a3ee7ddf271182221ed04a4ad756c862a5a906e9ac2f3c3c44c5cf1eb0fc154f0b468c50614d9bf3046da906f8b402efd13b063467
-EBUILD intel-neo-19.30.13641.ebuild 1346 BLAKE2B 3c5ba144dbb4faa6cfeac7138369f6dca9d2c3ba688a7e2ebf0fa27eb28e07174441261c44ad4227a16f7631661b1f9feed38e4929f9734ac9e40750bcd189fe SHA512 35953a7456361f0bf0e76b35ba659c99dd06a4b7bbed9130f87e05b0f5a3d477cb24d984a4f35add6c9ef683d72d1b761e5a12ac73583a3ba9faf7adb468a0b5
+DIST intel-neo-19.46.14807.tar.gz 2582591 BLAKE2B 07f65bf191e81a863e840a85c89d7632edfde814da0a00beaac0124293bf44a4d7bc45abdb0d8444dafcdaba24f83194d37df55297e0d0b32c91f622498e75c4 SHA512 fdf37bd51ffbf286d00ec395ba7f6bd53e0555610ed88ef201f2baaf1a03fb73137d0cd502119aba4cb6e146d2cd03c08bd20e004e6be3381104af9e24381820
+DIST intel-neo-19.48.14977.tar.gz 2633172 BLAKE2B 296c85c89833e49f66c428b62fda9753de260bfc819ee24846bc100021f103d2dcc432a9a8a60d310737470c7a4afece4fef557f72da40470ea950f8198bda0e SHA512 24a5f5306b90c763e803c34d3f20227ae0f22e6ff4192a0550e9e3050173b50f2b2e391250f1733676eca45002a061e2c753e7546db7dd21af7c1ed0857f329f
 EBUILD intel-neo-19.38.14237.ebuild 1265 BLAKE2B 6c2129e46819eb6e8f380e81a82728969b38743fe8ab2eb5840cb3c44927e64846f1c71da032fe3d56509721fddfba2609efb7789bba5c42181014abe3831f72 SHA512 06a356aa7aa56997c7cb4ce3d71eee2068819b1002d8de65bf0b5b8ff33c07539624a48e3ae82835d8bc2c4e02dbeea31a5ca17b724abeaee9c342fd80ad71ac
+EBUILD intel-neo-19.46.14807.ebuild 1267 BLAKE2B 5c39258b76a32e3ac770caf113fd457039cd255eac71494b3ca33076ab85232715f22ced75f20d08cc77bf6ac300e6d386dfe8065bb8248816f54d57227bfa86 SHA512 01ad25ca97b3a75495a73f6d46d0242aa8f805a17666fc0b444543e752da15c1b095b5dfdf5dd4c31383d0dbf6a93973d5fd4f4a45e6dd93ca9364efb690fd32
+EBUILD intel-neo-19.48.14977.ebuild 1267 BLAKE2B ba1c0f82596ae418fdf8c38a61039fed601b28f81430b16b610eb2c3f45d8e6a0d2bed49fcffd7b87444b71d0d57e6b710b78d807d63600e165ec740d1386bfa SHA512 ba43a79823c69965de75dddac8e886399e60bcf5fcf282e032ebffff277702b918a8796d781abc3c5ff82c491b098a910074495b23bbed527493b4c727f198a4
 MISC metadata.xml 871 BLAKE2B 2e394b97e0147760965e10f7d43f3b7f189a0f146df84adbcfd5adf22937587982b113fe4d7f07d436265746eb9339d5141dbe2655846a1b10ebcc0751f1a763 SHA512 1092d3b8c8dd26fac3822f0b4d25f19ea74726df3f3978a6d596a97b5019465a8a7a853fb98512a07f51c5b81ecc3a7fb9350fb796a2fb7fb27fd16b937eff93
diff --git a/dev-libs/intel-neo/files/intel-neo-19.16.12873_cmake_no_libva_automagic.patch b/dev-libs/intel-neo/files/intel-neo-19.16.12873_cmake_no_libva_automagic.patch
deleted file mode 100644
index fbfdfd32dffe..000000000000
--- a/dev-libs/intel-neo/files/intel-neo-19.16.12873_cmake_no_libva_automagic.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -374,9 +374,9 @@
- endif()
- 
- # LibVA detection
--if(UNIX)
-+if(UNIX AND ENABLE_VAAPI_MEDIA_SHARING)
-   set(IGDRCL__LIBVA_IS_REQUIRED "")
--  if(IGDRCL_FORCE_USE_LIBVA)
-+  if(IGDRCL_FORCE_USE_LIBVA OR ENABLE_VAAPI_MEDIA_SHARING)
-     set(IGDRCL__LIBVA_IS_REQUIRED "REQUIRED")
-   endif()
- 
diff --git a/dev-libs/intel-neo/intel-neo-19.30.13641.ebuild b/dev-libs/intel-neo/intel-neo-19.46.14807.ebuild
index b9fc9e809d42..0209ef1590c5 100644
--- a/dev-libs/intel-neo/intel-neo-19.30.13641.ebuild
+++ b/dev-libs/intel-neo/intel-neo-19.46.14807.ebuild
@@ -19,8 +19,8 @@ IUSE="vaapi"
 
 BDEPEND="virtual/pkgconfig"
 COMMON="dev-libs/ocl-icd
-	dev-util/intel-graphics-compiler
-	>=media-libs/gmmlib-19.2.3
+	>=dev-util/intel-graphics-compiler-1.0.2878
+	>=media-libs/gmmlib-19.3.4
 	vaapi? (
 		x11-libs/libdrm[video_cards_intel]
 		>=x11-libs/libva-2.0.0
@@ -35,16 +35,12 @@ DOCS=(
 	documentation/LIMITATIONS.md
 )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-19.16.12873_cmake_no_libva_automagic.patch
-)
-
 S="${WORKDIR}"/${MY_P}
 
 src_configure() {
 	local mycmakeargs=(
 		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
-		-DENABLE_VAAPI_MEDIA_SHARING=$(usex vaapi "ON" "OFF")
+		-DDISABLE_LIBVA=$(usex vaapi "OFF" "ON")
 		# If enabled, tests are automatically run during the compile phase
 		# - and we cannot run them because they require permissions to access
 		# the hardware.
diff --git a/dev-libs/intel-neo/intel-neo-19.22.13062.ebuild b/dev-libs/intel-neo/intel-neo-19.48.14977.ebuild
index fa2b3c8393e5..09ff894e4be2 100644
--- a/dev-libs/intel-neo/intel-neo-19.22.13062.ebuild
+++ b/dev-libs/intel-neo/intel-neo-19.48.14977.ebuild
@@ -19,8 +19,8 @@ IUSE="vaapi"
 
 BDEPEND="virtual/pkgconfig"
 COMMON="dev-libs/ocl-icd
-	dev-util/intel-graphics-compiler
-	>=media-libs/gmmlib-19.0.0
+	>=dev-util/intel-graphics-compiler-1.0.2990
+	>=media-libs/gmmlib-19.3.4
 	vaapi? (
 		x11-libs/libdrm[video_cards_intel]
 		>=x11-libs/libva-2.0.0
@@ -35,16 +35,12 @@ DOCS=(
 	documentation/LIMITATIONS.md
 )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-19.16.12873_cmake_no_libva_automagic.patch
-)
-
 S="${WORKDIR}"/${MY_P}
 
 src_configure() {
 	local mycmakeargs=(
 		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
-		-DENABLE_VAAPI_MEDIA_SHARING=$(usex vaapi "ON" "OFF")
+		-DDISABLE_LIBVA=$(usex vaapi "OFF" "ON")
 		# If enabled, tests are automatically run during the compile phase
 		# - and we cannot run them because they require permissions to access
 		# the hardware.
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index b773c7476490..27dca1fe3715 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -18,5 +18,5 @@ EBUILD jemalloc-4.5.0.ebuild 1787 BLAKE2B 06f3036d060df40707bb79c6520b62c13c55c3
 EBUILD jemalloc-5.0.1.ebuild 1943 BLAKE2B c63f49de52d468421fcd74f4726b673f1e50c356bcbda8212dc09b3d81d5515ce97d068b3ae5785d3deb55c65f847b975a4496e9d82b1edfdc6aeea2baec5c0c SHA512 d3d32d6b3ed70746106bb881ad251e16e428ea35d361b53bb845f66cb0fab72c8b2fd3f59dec0893525663038ea30e8343bf10c2fecb30d0e4598d771327f1e8
 EBUILD jemalloc-5.1.0.ebuild 1900 BLAKE2B e720371595b0652033dda4960c561a623a2076ca081deeba87bdeeb51bd3734588308a2dc2ae91be7d16637b452e4de11c4022caf330dcb76eeacdbda68d104e SHA512 1cca96a6ba7e45d3bbaae91749dc93a6ff32ab90b473bc179ef35c7f7d8ab9f89db92eab0cc893f3192b979815db9b843edecd9c1ddfa8b3f8ccee9056a764a2
 EBUILD jemalloc-5.2.0.ebuild 1845 BLAKE2B fb4289d6d0a5e3c95adb88bc129efcaa85a81e009a216a1d60b133a5f567c02f21fd9bbdfeecc7f8a582697c0ef98952e2955f3718d8827aff87e2ebb6c98a44 SHA512 d7cfc4732f7830098f1afda42f34d6d2d77e4e0cdb3b9616139b149d9f7e7b29ed27af0324fd2d7c1065f7e44d0d200b03bca1c2baf76e044a64575a6cdda9fe
-EBUILD jemalloc-5.2.1.ebuild 1838 BLAKE2B 7e901ba6319fc0c5ae63cc8cb511abafe23a749a1284522807331e404c7f4038079a46e7f8e717b9afb42bae3bbd3164369ef215c18f74a6a1a27473107bfe21 SHA512 f24f7e2a2091ea42243010ec8ca188734e3f2f1bf46c354af2463459dd38b06f71e2abbc8a6bbcd3e95a5adc1466fed8b50d446845cac4a6a8383fb6cd3f9aba
+EBUILD jemalloc-5.2.1.ebuild 1835 BLAKE2B 8978581f2b47af679036d47c1b22ba9a45ebaec5cbd060f6c6817b04e8c1ceb372d9a59877c38e9df4fad9f0464fba42e51711f9e85f08dab4937230cd53c323 SHA512 dcf8cb71795d6c8a092d966b086844772f76020701afe635b66fcec192f9a245658b5c82a2928753f2c1a0e5e1d6942b5f5fc6c35179370c41eebf1950f586b7
 MISC metadata.xml 817 BLAKE2B d5d6f72de6d230f5f1145859729384bfabdfff47430900d7b9d814afb471effd0fd6bdfa9859e20df4568d3af63cf839732e93838c74c626a1cc03a752f0865b SHA512 2859064d9e92245d040e2056719df537b4d4ecccbb6390b6dd878dd739a82a16f31dbe4c6ebbae0fb9c907031f4beaa19a99cb28ca83bfe638b798e5a66988e0
diff --git a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
index c0e109b5f3d7..9ccad1da4d11 100644
--- a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
 HTML_DOCS=( doc/jemalloc.html )
 PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 6c3ddf89fed6..63d2bd7c085a 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,7 +1,5 @@
-DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
 DIST jsoncpp-1.9.1.tar.gz 203067 BLAKE2B 654f39b1265b344bb24d3fefb34d4d8b44f69ec819f333f00033ef90acfd5b926fdcc743badf403af797a6f58fe58d195ec0cdf4a1514629f8a1e75c20a6e2f6 SHA512 4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766
 DIST jsoncpp-1.9.2.tar.gz 211341 BLAKE2B 9081bf2b2599194c1c77476287e34aaeacc3c331147db79e3343eae28321e55dbfc8d74faf899912c257194030d39eac4fdb016a68290755badd1b68b0a69dd4 SHA512 7c7188199d62ae040d458d507ba62f0370c53f39c580760ee5485cae5c08e5ced0c9aea7c14f54dfd041999a7291e4d0f67f8ccd8b1030622c85590774688640
-EBUILD jsoncpp-1.8.4.ebuild 1358 BLAKE2B 44a52626b84622c18285dc24eaccbf064151314769da1caca9727a4e16ca803878569350ea0a02e662cac212c1f290ecdad6b9c62e02c1c37e9f6ee4e060375f SHA512 dd4fdf4b0b85d571c63f3151f9252f471d15a4420342535caca055dd000f15fb483573b93748ddd27f8518c7e687e7e695f9f89fbad87294831a839a7dfad0ac
 EBUILD jsoncpp-1.9.1.ebuild 1366 BLAKE2B 61aab4ecaf27074ef443ea80b3f49d1c5a7efb5cc8c72534744b83599e0721db7b7b6a836e0241478ea6feb9731799c099e3e39b3b6d5422390dad99a52fd094 SHA512 389464ed9b6b1ae0713673c7937478da5d0dfc896efdbc75df6cbea4a5c5c7c7ff4281adcc8a6f978e4ccf41b9e24dbe75f79b26ad62426eef987323124e3007
-EBUILD jsoncpp-1.9.2-r1.ebuild 1394 BLAKE2B e9bfc10e5a5d3ab0311da795982767253c45799a9badf6925b4b229cf0462774597256caa786e3f422a13b18006e7d807409d5216199091b49e241025313343b SHA512 3b0e99bc5ae8913fe26a7a4f01520571882f08e3123df6c3648d1ad7d88a32039f255478b00badd32f293b37b682373996c0b6f54829876f65464c4d20569092
+EBUILD jsoncpp-1.9.2-r1.ebuild 1387 BLAKE2B 109c8d5ceac95d04ed3351c7fa45bfe87b1e1547800abbfa0a2ff1df67fdf6616631526344253ca96bbcb438239eda322b90332233e8294cd0f2c2d69e057417 SHA512 5d672540c2438147eeed08539f0a94dd8c4c119b87593521d8bfe32ca32cc9e80b6d6bbdf19aee351d6991d14afc0d126b5b807d9e399cbb3fed1d4c0117ef85
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
deleted file mode 100644
index 6eb5e4ed40ab..000000000000
--- a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="C++ JSON reader and writer"
-HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
-SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( public-domain MIT )"
-SLOT="0/19"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="doc test"
-
-DEPEND="
-	doc? (
-		app-doc/doxygen
-		${PYTHON_DEPS}
-	)
-	test? (
-		${PYTHON_DEPS}
-	)"
-RDEPEND=""
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	if use doc || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DJSONCPP_WITH_TESTS=$(usex test)
-		-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
-		-DJSONCPP_WITH_CMAKE_PACKAGE=ON
-
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS=OFF
-
-		# Follow Debian, Ubuntu, Arch convention for headers location
-		# bug #452234
-		-DCMAKE_INSTALL_INCLUDEDIR=include/jsoncpp
-
-		# Disable implicit ccache use
-		-DCCACHE_FOUND=OFF
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
-		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
-	fi
-}
-
-src_test() {
-	cmake-utils_src_make jsoncpp_check
-}
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
index e75db90c760b..5e2237b6f3b2 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/22"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest
index 672bef799a6b..f5edf7854645 100644
--- a/dev-libs/jsonrpc-glib/Manifest
+++ b/dev-libs/jsonrpc-glib/Manifest
@@ -1,5 +1,5 @@
 DIST jsonrpc-glib-3.30.1.tar.xz 41516 BLAKE2B c0b73c06682fd0a1bca2fb000d7909460c496e73364c24905e1a4c88cce64252ac024825ab89650ee0b3b5de1cd1686fc7a231ffb5b0bb7e1c66262eafce026f SHA512 f1ae34faf9b3902b45b01bfafc87fd8d30051bbb11cf247cf8af9dc2bae8b2f3c93564a17a9f047dbb61240662a0ffbc2c2b764f8e254305c7aee1b32fd8a86b
 DIST jsonrpc-glib-3.32.0.tar.xz 41552 BLAKE2B cea89237cbd622e951b0b4eca02e0aba0f3a9a3dd0db74baa0534ad49671834bf3daab5243d0be6f4e68ed5f441820fb8af1c5f59f7f5a7657280d1c55e5d104 SHA512 c6c52d36d3f8f736bc07c50174ca4a50e3cde6b23928751f260b4482e15cda9726b8279228653e4fde114111592131f344f3c7cf820edcc680fb0b32f9089ea5
 EBUILD jsonrpc-glib-3.30.1.ebuild 939 BLAKE2B 5550e20348a0d716bc17e491e179ec0e38c32db28caeee66fc3df930a637fee5f42c7147880ff22f32bda0f590a5cbf2bb6e6e28dfc98b4721e0be6a0dc430e6 SHA512 40f382868affa0c614c5f3f34725f2544416c720a76da60268e9525b2ee3370314dd5883ba17f74f7894d4d0c98ea2e6134dbd76f7396cd67935c8785b17a75b
-EBUILD jsonrpc-glib-3.32.0.ebuild 952 BLAKE2B fbf4ff8df8ac1dd84da4358410a18f4e054b7e5e453d41ccd7e594a13d5aa43d2e7d90facb21eabeb94af6c09925bdff4551d5c13637eebb341fe333ac1530d0 SHA512 0e735dfe9410e322e7692037ace6698897535113c722158d865b9ae737044eaef24ff716fccb7ebc7c66eebdc109689f5459af6333936c7440addf80c116c921
+EBUILD jsonrpc-glib-3.32.0.ebuild 950 BLAKE2B 1a5f899fcd1aa09f924ced35d237fecc2e83178e2df4149cd6973bbe9f5a26e63f56c388bf8e4dfb98f20f3d22a1c14708e3fb628bc46156bb2fad6273f957e6 SHA512 d18ea1e621e48980411ff2aa284acd7f0913b7ba4ca89f4b46fa030331c73a292e7edbacbb5a401e7be7d4d0b6ce34ee6cc9c932cc40dbcaaa919f4f760aa8d1
 MISC metadata.xml 505 BLAKE2B 2319e91326203e3b6173bc52a21d689b6adafff6a08ff2832a28d48e5b537592766b5c7a7ae5c60ea682beaca10e8037a88b05e2f98573441ea611c11e021dc5 SHA512 02f34f7222c80a4568b3c293fa46f45bf64bf1410c529c77271aa9922b22237c8f29ec9724e071cd6485d0e73ec0ea2bee028c6b0763d2c0da736d6aac24b2b3
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.32.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.32.0.ebuild
index b1e135ac476c..26713eaa276a 100644
--- a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.32.0.ebuild
+++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/keybinder/Manifest b/dev-libs/keybinder/Manifest
index a346b1fbe8e0..8e16f0bbd8f2 100644
--- a/dev-libs/keybinder/Manifest
+++ b/dev-libs/keybinder/Manifest
@@ -1,5 +1,5 @@
 DIST keybinder-0.3.1.tar.gz 391730 BLAKE2B ea286ab5bbd864709a1290ffd8d7d45468b1d525b4fdb8967159bbcf32ca8dc3d057ba39ad35dc19f5f68f67160fc48d805e107fcaea22f81fdd8bd1125db908 SHA512 aec4070b3d3b6c00900c3cb814e4b6a98beea09817eba3c3f7e6d5ce1ff68c091d183583f09b475e3e56bac67c94c1d912ebbe079dcece8195ac0ed9379d5f82
 DIST keybinder-3.0-0.3.2.tar.gz 378942 BLAKE2B f998430a14e881b5b1802747ec15967d60bedf8e076e5ace886a665ad168eb297679f30289b6cae835f4b291a0744c12331e420dcafbfca7e63cc5e807e9cd46 SHA512 14171875e03ade88165f28c7267b66cf9efe34259d7a3072a786ba49dacf8f8d6d84753b1aeedec5dfb0a24028be86bceeebee2f6b1bf5ef2eb79ee45f909b11
-EBUILD keybinder-0.3.1-r201.ebuild 1192 BLAKE2B abcfd749a63275c6f5fa3ec967da4db45327f50bc9093b3e6a9da16171e51fce1b519ee4165582fb10a455a9c0f315b95846127055e480d2f683743d581467d2 SHA512 7c0ff3a1e6f3d51fc6874234757e8c66d16356eeb14a8657dc51232a694b54b878532c168116aff0e3f6871006b96ee6c784d523541b51a97a76dc4b5b1c871f
+EBUILD keybinder-0.3.1-r201.ebuild 1234 BLAKE2B baa985aeabfc98525b72286bc1dd1d444075f18abdc7fa3ab49af13792ecbf3f3fdfdbbc730be4c1663caa1516731b06d582a5806e7f1dcae51e693e32a2ae11 SHA512 d3fecc206ed43d2aeeee105c28f46f26f794d358e84d5fb5ffd34a4081c39888dbecee7aa30d129121dfc2dc0ad300eb1601b039645a60c04599c95222f526a7
 EBUILD keybinder-0.3.2-r300.ebuild 1051 BLAKE2B cb4e876eb83fa674d598dd06045c795d0a562a5c212fc9685af67b74f473399238d213338d6874703092527b6257e0c06be24910833b8c4d8d0d9fdbf7a20069 SHA512 e3938b72869e319c940ed2392d60aeb6b27aeb8344065f845678fc95e80169362de1a3efdbb1264407c26ea55333048298b45e5c283393b0749d56838b748e91
 MISC metadata.xml 327 BLAKE2B 61157058cd32bae91e1b8bbae3235e70fd34ec1c6f89af874e974e76e5daba3ddb9b34878271d96a4ac761126b3d596f257014f24d40130256a2fcfa491f86d1 SHA512 e2597d9b1771b6cc57c5b372c5fa3a5a51cea3e87bbe3aaee10eae1fd90c445859eca6f855eb34f079253da6a771a747257ffe8b3b1834597791c03b7d3752f8
diff --git a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
index e081ae83d7f7..9392d4f40614 100644
--- a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.1-r201.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
@@ -23,8 +23,10 @@ RDEPEND=">=x11-libs/gtk+-2.20:2
 	introspection? ( dev-libs/gobject-introspection )
 	lua? ( >=dev-lang/lua-5.1 )
 	python? ( ${PYTHON_DEPS}
-		>=dev-python/pygobject-2.15.3:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-2.15.3:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+		')
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index fba8ad1eb0fe..42c0477f279e 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -6,5 +6,5 @@ AUX klibc.m4 3619 BLAKE2B b0895e5d775b2edc497514ce5adffa3824730cebd1b0c9f166a6ca
 DIST klibc-2.0.4.tar.xz 469348 BLAKE2B 5975e3d25f72b70c4cbaa56ea5363417407e8dace1e02e2da0b835bbb2cad56648b0084e5404528206ef3facf4ffd3611e8bd729eadd80b00e30d1a70b3057cf SHA512 7a01d1744b49f3de64111fefc522b1d63f054199acf671254bc046d6f1d0b6ca68e050c99025bf8303751c2466a5e034677555649ae5909c40997858d393db8d
 DIST klibc_2.0.4-9.debian.tar.xz 28628 BLAKE2B aaad6fafb7372152987eebda5951b9f3de2e33da583e0ea7597f666461977f461303566f9e363e9c96994c7b0eb6213c6a17b2fab72df7460db3cfbc0c2e1cf8 SHA512 0fe9a6642be962fa631919850d7eeed5a87c10682766ee10fe31dec2b19a6179e0067602acb26bdc2aa8ceecfd39b1dc95a76f3b0a9bc813b172c0ffe9f0ff53
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
-EBUILD klibc-2.0.4-r3.ebuild 9544 BLAKE2B 1084343464711ac1e6f111fb29164dbe8656f6bdd9e8626e24574720a7392128abf220da8b420227c38f3c21eab9228cf26b8576495644b9b3bf9942b784107b SHA512 c4b713d46a1b8f04f00d7aa992d4a92192348bc48b9fe39406d25770138ff772810ed62b6298cd041ddf3d5d9650bd522cd5659da3dcb51211a82f29d5562bb7
+EBUILD klibc-2.0.4-r3.ebuild 9427 BLAKE2B 10c84f8db7da74a0fc338e3ef470682692a043df2e8b77fd4948eb9f14ff68e9e5899f36ac968ffa6e7e8a61421ba97dc1da0a4e04cb095a2694472001d16a96 SHA512 cef6a79f5d6f2959bbe0644ee0adb24eb78c37012736e3e993550a264e41ad25a1ff83cb0baa2ec515ec8b5a992cb33db836036e4915b448d507ea28f727565b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/klibc/klibc-2.0.4-r3.ebuild b/dev-libs/klibc/klibc-2.0.4-r3.ebuild
index 0ce5d3b94957..ceaa4843485e 100644
--- a/dev-libs/klibc/klibc-2.0.4-r3.ebuild
+++ b/dev-libs/klibc/klibc-2.0.4-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
 
 # Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007:
@@ -63,7 +63,8 @@ KS="${WORKDIR}/linux-${OKV}"
 # Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot
 QA_EXECSTACK="*"
 # Do not strip
-RESTRICT="strip"
+RESTRICT="strip
+	!test? ( test )"
 
 kernel_asm_arch() {
 	a="${1:${ARCH}}"
@@ -155,7 +156,7 @@ src_compile() {
 	unset KBUILD_OUTPUT # we are using a private copy
 
 	cd "${KS}"
-	emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "No defconfig"
+	emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}"
 	if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \
 	   [[ "${CHOST/eabi}" != "${CHOST}" ]]; then
 		# The delete and insert are seperate statements
@@ -169,7 +170,7 @@ src_compile() {
 		"${KS}"/.config \
 		"${S}"/defconfig
 	fi
-	emake prepare CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "Failed to prepare kernel sources for header usage"
+	emake prepare CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}"
 
 	cd "${S}"
 
@@ -196,7 +197,7 @@ src_compile() {
 		$(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \
 		$(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \
 		$(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \
-		${myargs} || die "Compile failed!"
+		${myargs}
 
 		#SHLIBDIR="/${libdir}" \
 
@@ -248,7 +249,7 @@ src_install() {
 		$(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \
 		$(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \
 		${myargs} \
-		install || die "Install failed!"
+		install
 
 		#SHLIBDIR="/${libdir}" \
 
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 530e29eedbfe..4e39b978ac47 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -2,7 +2,9 @@ AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
 DIST leatherman-1.8.0.tar.gz 815287 BLAKE2B a8377cedac49e0845e689e4e8ff58fb59e6e59c77e8cd363774d22650b4b286d85e0b5e52b926c3e4169ba2eadf9fc50f16f5161001a16f63c49f3ca66c996cc SHA512 fb308025f0807b12527fe6fc287fee861eb27b6987df38c03e1da73c477aec5a2a6c92860c983c4cc10282388ee34f2cf657a38831db007519c471f815f492f6
 DIST leatherman-1.9.0.tar.gz 815504 BLAKE2B 62b4b9aeca3279b7f89fba1c3a7655e59c5d490cb44ba92e4c2dfe5ffa78eeb02a448bd6c6e6b08c324531b799ab5d1800a3b57c4e490794f76bf9737db16963 SHA512 d8e0fe7f165845056a0308241ef0e656077269cd6cbc656b1a72295ff475e813d3f523c8d45b14d7e10a8deebe786ac7fc836c46d4230142812a9c0362cd8967
-EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
-EBUILD leatherman-1.8.0.ebuild 1150 BLAKE2B 0d173c50865b8b66b27286a2e0df530c857ba5a9d48cf81e363905ff2cb0668fb6aca0c282fd56a5d3713d79cde73079eb96c8726c786ebbb9ef32aaabd3071e SHA512 91b7cedb5026b117f5d538d50a3b2f6b3d8583d7eb4944bff08cbc3e756acd255fc5f6d199a9f77b06258c34eda317aff32b4878207e645cc93e17638573699d
-EBUILD leatherman-1.9.0.ebuild 1152 BLAKE2B ccc089da10bfdf3835dc76aeb5dd2f087e974014566dcf62dec23551f1acc7e67d4741cb0c7f2d8c25a51fcf89a516bbb5ee11960c7b148a1713211722288f78 SHA512 d5af35ebba8fd2dc44c7bd264c33c898667812ce95e3557a9f151e8c5b44a351278414ac93dc93162b8bcd63e2a943b5004e359f6a8f1184d8f50c81da839792
+DIST leatherman-1.9.1.tar.gz 815756 BLAKE2B a0c8777531b066e247d8abfefc1b22fec825f7db22ef67cad6a703a7cd168f19349b13b923841e8064eec1e7bc7b755181b58370c7501b37710ac376687c5b43 SHA512 51dc356ec7196c7538fac154a094d3693de5ef89d50a07651753c400daff3ecdfbfe46516ffecfa592484aa1ec8afb891f2f2b6be62c94a8f0ab08a3bba65786
+EBUILD leatherman-1.3.0.ebuild 1091 BLAKE2B 53d75a2e93e6eb2bc30446327f70d929b5550e298e1e6d8f9c6396d6bdaa8c5f08cf50b2bfa717f6c7e9a61b72575eb03ce83b8c0846595d25f536685779d8cc SHA512 c51284fd5eb7481623e606e4843595ff52875de13909c2d0e052f563953448444dce71a4a5d2f6aaf481970d3b89fd063e44311edb5be66de2a0522d6a429ff4
+EBUILD leatherman-1.8.0.ebuild 1177 BLAKE2B 3151809adaa90822e9ff2ea0ab19b1a25787e098b67ae26c47f53e5d5f0ba7698c0b452d990b54d53aad2fa11cee4e7c7a5f3cca4d615ca81d2cdbd9e7121c06 SHA512 157ce4dda5741fc00f0aa8ba3cc38650b0f7a5c72a890deaa32a8caf869359c3ccc4476e70750869e1d3762d9b0ac3701ef4b895d3aa9dfca7c83628cd50f7f9
+EBUILD leatherman-1.9.0.ebuild 1177 BLAKE2B 3151809adaa90822e9ff2ea0ab19b1a25787e098b67ae26c47f53e5d5f0ba7698c0b452d990b54d53aad2fa11cee4e7c7a5f3cca4d615ca81d2cdbd9e7121c06 SHA512 157ce4dda5741fc00f0aa8ba3cc38650b0f7a5c72a890deaa32a8caf869359c3ccc4476e70750869e1d3762d9b0ac3701ef4b895d3aa9dfca7c83628cd50f7f9
+EBUILD leatherman-1.9.1.ebuild 1179 BLAKE2B c7e13c301c4d161afca945a196e62af93d03a3b13eab021613710423c3d6c5ff0e6caa464284abf24be953465708a5236411b8b1878c68c4d61449d4a0907cc1 SHA512 9bc9e413fc5e30aa9bcd5ee8c02781a0545e3057462317e0e0d5affef1334cac07782c39ddf52b8647b65df1f751d33cccc231d33f31c426e67fdfe1bc8c3a86
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.3.0.ebuild b/dev-libs/leatherman/leatherman-1.3.0.ebuild
index 5161ca2346ca..276c9fbb29ff 100644
--- a/dev-libs/leatherman/leatherman-1.3.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.3.0.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,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="debug test"
+RESTRICT="!test? ( test )"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/leatherman/leatherman-1.8.0.ebuild b/dev-libs/leatherman/leatherman-1.8.0.ebuild
index 3e365ff23fc8..978d0a696adf 100644
--- a/dev-libs/leatherman/leatherman-1.8.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.8.0.ebuild
@@ -11,6 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
+RESTRICT="!test? ( test )"
 KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="0/${PV}"
 
diff --git a/dev-libs/leatherman/leatherman-1.9.0.ebuild b/dev-libs/leatherman/leatherman-1.9.0.ebuild
index 335426971404..978d0a696adf 100644
--- a/dev-libs/leatherman/leatherman-1.9.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.9.0.ebuild
@@ -11,7 +11,8 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+RESTRICT="!test? ( test )"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/leatherman/leatherman-1.9.1.ebuild b/dev-libs/leatherman/leatherman-1.9.1.ebuild
new file mode 100644
index 000000000000..5767dcd6355c
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.9.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multilib
+
+DESCRIPTION="A C++ toolkit"
+HOMEPAGE="https://github.com/puppetlabs/leatherman"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+IUSE="debug static-libs test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0/${PV}"
+
+RDEPEND="net-misc/curl"
+DEPEND=">=dev-libs/boost-1.54:=[nls]
+	net-misc/curl
+	>=sys-devel/gcc-4.8:*"
+
+PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
+
+src_prepare() {
+	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+	)
+	if ! use static-libs; then
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=ON
+		)
+	else
+		mycmakeargs+=(
+			-DLEATHERMAN_SHARED=OFF
+		)
+	fi
+	if use debug; then
+		mycmakeargs+=(
+		  -DCMAKE_BUILD_TYPE=Debug
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${WORKDIR}/${P}"_build/bin/leatherman_test
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index ce2b646d6475..1a00fdfac2b3 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -7,5 +7,5 @@ AUX leveldb-1.9.0-memenv-so.patch 1957 BLAKE2B b26ddad37bba050ae2626aad164a3e403
 DIST leveldb-1.18.tar.gz 209376 BLAKE2B 08d63fe8aed45d38befd29caddee5a229ff847d254b30be55715793a621e840641d53af47e4fd93286ff0445d6001be26aa00063c075681659f7ceb692184249 SHA512 3d9c55a7bf8692914784ec33c273704ce9978496b071c7b661708f049d0d4ccd51a44441f50c3e536725caeb9896575192f52708a4bb1c0222cecdeec89919a3
 DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9c70215dd325daebfd93b30aa9bbe3c993a1758aa9804a7cd6f2c31df7cf98bdf98320cd1aebc14f5eb77d9a5 SHA512 c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2
 EBUILD leveldb-1.18-r2.ebuild 1866 BLAKE2B a2d85d2b76188cf1da2b5651933c085eb91439b7385aaca594d3074124fb771bd858725745a0269e8ecd17e2be5cafbaee13cce5ca32550f0d4069fad3994be4 SHA512 f564389eba2fb0d5189c9dff09c85373990efcd412148e6bd53ab715fac22a29a0a405981768b5c40ed487f68d2aa721196dbfd94cb499e27d769126e2938533
-EBUILD leveldb-1.20.ebuild 1729 BLAKE2B 2dc41230f1dfd71aa7bc808cefda1000d2f0eb03c86c696a312082d052e534d0271b53bc8e54f0fe2fee43977414238b21b617b70434db1b4d000c9336dd2bb4 SHA512 072b10a31156fb1adf282041adbedff81c9dcf435413c3746abad0cba9d0af906ff5559a163bc4f581c0dd27563a4ed5f13dbd8d17cc5ffaf0a3c83a7e5a2530
+EBUILD leveldb-1.20.ebuild 1756 BLAKE2B 11c82a4377faf026bd0670f46b3348141cb5837e13fd64110bf99bb71813097825be3aba2302284e69053f553de0b8b424cbe9b5551c326f1bfcc8d387bfbfcc SHA512 518acb56db4cbb85fd7e71bfb5d32de33aa08c6a958bab3fefcb30b738f856b39042d3edda04e0ebdcc5a7c15abaef6acbcb9c1bae9d351d74eb93611a603ed1
 MISC metadata.xml 400 BLAKE2B 770ed89274db8fd29e68bcc792bd9f593ea0785ff4f1651d85902bb0272cfdff3914ecd98e81dea4160ad085e1e0da6938ebfa801b2b5484cf5edd6666908e24 SHA512 b7284da0474b747738d6da09be217c815ec8b333f2b1f571594531fb77ec15a6cf4564b6053dbab84ceb94f3bcc5d16ed374780852920a7ca823df0ed00be5dc
diff --git a/dev-libs/leveldb/leveldb-1.20.ebuild b/dev-libs/leveldb/leveldb-1.20.ebuild
index 312bb341b5f4..c23b914b691b 100644
--- a/dev-libs/leveldb/leveldb-1.20.ebuild
+++ b/dev-libs/leveldb/leveldb-1.20.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD"
 SLOT="0/1"
 KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+snappy static-libs kernel_FreeBSD +tcmalloc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="tcmalloc? ( dev-util/google-perftools )
 	snappy? (
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index 265c90215d6e..a316ecf91f18 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -9,8 +9,8 @@ AUX libaio-0.3.112-cppflags.patch 350 BLAKE2B 8c2d0706f92a47dffff6465712588b525b
 DIST libaio-0.3.110.tar.gz 42270 BLAKE2B e774e5888106ffcf4db08569a8b3dc6722f4e0e8278e9f2fafe865e282c0568059e8dbb37aab7a33719ab4d80f42404bfb1d4ab03f5c066d9eb75301676f525e SHA512 664295d330d6e9adc005e2331e77582619625b479ffc2b81728ba6a682487380ee936079c4a69d35144b458bbe35c612f4ed9b32e913bd7e109b824345763eb3
 DIST libaio-0.3.111.tar.gz 44557 BLAKE2B dc2f44599218de0ca80cfc17f604eb85c9b1241ce7221f49f1a4ee8c5bd3fa135c29ac8d97f6f97550a508e27b0dc92eb709256ffd803c1feca255016a4d674d SHA512 259b89647e22ba47edd4076b8d6aa8ab89af197b64930aa5b01b69fc1969b13b4a5e91c449ccdc9b2746c9eae3160211ce1fe110d252efeca5f2c56d0ea66e2e
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
-EBUILD libaio-0.3.110.ebuild 2226 BLAKE2B 04e1eff5a1d9b776e97710e736b839d1dd5da5953f7c0906fe14f36409f419fc3ee5e63ba7ae4a606cf26b814f01fa04a578e3af13bd5d187938853a7b976b23 SHA512 1959d6113283180a30402719f292b8263204ea50ee1a23bc25c1cccf3af5e2dd1a14b7af1ce83bf3675643337f3977631d5b97ac235b40090e4e49e1430db9fc
-EBUILD libaio-0.3.111.ebuild 2209 BLAKE2B 86a6b378bd5d651151e8ca0e0d20b43f829d00350342909c2dab7920614ba5686d6f764f7d912130095dbfa01ac443864f01d3e4ef5a542bb7bc7141db7f651b SHA512 c82fe8e39e7ee20f06437db0069aca15e27fd72bf0dbf664cfdbe125a3f2ca374f7c996b695aac47ea6614d0b0e4a71f214916bec0693f310766a5f4823e703e
-EBUILD libaio-0.3.112.ebuild 2110 BLAKE2B cbf577e5f222ca2229ba849c9a682b80b931f17de3c0c2049dfd0ec9ff0364dae51764442aba089c909bfeccf79015ba38a0206ec5dca64c5f693d8344763cff SHA512 7f42863ea3c16b276f8689777cd0cc0f8b6e998c1517f206544f0a1c4b0623de4f5dd096bd2ba3e1284426482fecd07b5e6a626409aa056b85fb1209bf05850a
-EBUILD libaio-9999.ebuild 2110 BLAKE2B cbf577e5f222ca2229ba849c9a682b80b931f17de3c0c2049dfd0ec9ff0364dae51764442aba089c909bfeccf79015ba38a0206ec5dca64c5f693d8344763cff SHA512 7f42863ea3c16b276f8689777cd0cc0f8b6e998c1517f206544f0a1c4b0623de4f5dd096bd2ba3e1284426482fecd07b5e6a626409aa056b85fb1209bf05850a
+EBUILD libaio-0.3.110.ebuild 2250 BLAKE2B 78700ebeae320187388ac19d3d02edce00bf405f3807512f30f72d82324136e1a713e871d059a034530f4a4f3c906d43fbee0338c86231b28d636305b5a243eb SHA512 b13a51ba8d4e6e825c9183e9cd150fbf5b4ca86e52a132082a8d38a22e41cd009b71752c0a51b225598038f55c092390ddea68cf3589edb3421901daec553f30
+EBUILD libaio-0.3.111.ebuild 2236 BLAKE2B a7f1cb6e36a0478292b32b87f59c62b48c5d97f68a94723694a49639b9498b1f36a344d7a50a6d60194b1c15da8fbc09172b1b218adfd20bc0f10b43f0c6fad6 SHA512 9aaacb90032f48c1765863ac082afaf99525710a9a9cf93439ad216eebc061285e811f26f7071dc21e846b62ae1ee510f7ed06296215cca1bca0ebd7ee4b7696
+EBUILD libaio-0.3.112.ebuild 2137 BLAKE2B c9074524529cf0ffb4698dd019316c252bc4dca581d2a271d876e87edf9c8434e2ad054d5dd73b8d2009ff6f3268e93014b85e3a97202288208dac1fec7353bc SHA512 bf1ec5f7b90dd47b7b25d5a955a1ba8c830e238c97efdc72f3fea47642b9eed684351daa1466882314733d270f7bec7780972d0a1e3285da48193583e4e220e7
+EBUILD libaio-9999.ebuild 2137 BLAKE2B c9074524529cf0ffb4698dd019316c252bc4dca581d2a271d876e87edf9c8434e2ad054d5dd73b8d2009ff6f3268e93014b85e3a97202288208dac1fec7353bc SHA512 bf1ec5f7b90dd47b7b25d5a955a1ba8c830e238c97efdc72f3fea47642b9eed684351daa1466882314733d270f7bec7780972d0a1e3285da48193583e4e220e7
 MISC metadata.xml 414 BLAKE2B 291cfb45ed8ed29e916e1873b00685eb32f2cfdca2f225176028fda48335bff8369d1084565acc79d58bcf1c69af752efc0f7d30fa775406be03ce432c56c5df SHA512 31c76d1e4bb0c87402c00bdef098bf930b273cdf6c631a704fb02f925a3cdfebcded9d33d31f10cdd8c9ae2ab9bb71dd2cd0113029df501ad83a5a92b611b7c8
diff --git a/dev-libs/libaio/libaio-0.3.110.ebuild b/dev-libs/libaio/libaio-0.3.110.ebuild
index e8dbee25e771..3a9ff51ba4f3 100644
--- a/dev-libs/libaio/libaio-0.3.110.ebuild
+++ b/dev-libs/libaio/libaio-0.3.110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 src_prepare() {
 	epatch \
diff --git a/dev-libs/libaio/libaio-0.3.111.ebuild b/dev-libs/libaio/libaio-0.3.111.ebuild
index 926858c4ed94..9249c039bb12 100644
--- a/dev-libs/libaio/libaio-0.3.111.ebuild
+++ b/dev-libs/libaio/libaio-0.3.111.ebuild
@@ -17,6 +17,7 @@ fi
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.109-install.patch
diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
index 17263d200f64..735248f1f05b 100644
--- a/dev-libs/libaio/libaio-0.3.112.ebuild
+++ b/dev-libs/libaio/libaio-0.3.112.ebuild
@@ -17,6 +17,7 @@ fi
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
diff --git a/dev-libs/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-9999.ebuild
index 17263d200f64..735248f1f05b 100644
--- a/dev-libs/libaio/libaio-9999.ebuild
+++ b/dev-libs/libaio/libaio-9999.ebuild
@@ -17,6 +17,7 @@ fi
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
diff --git a/dev-libs/libatasmart/Manifest b/dev-libs/libatasmart/Manifest
index 5ba5788746d7..f8d1420f1932 100644
--- a/dev-libs/libatasmart/Manifest
+++ b/dev-libs/libatasmart/Manifest
@@ -1,7 +1,4 @@
-DIST libatasmart-0.19.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62
-DIST libatasmart_0.19-2.debian.tar.gz 6511 BLAKE2B d283dd1db988b95436a99cf804790b6c9b22d48b41d561a6fd2b9aff0948241ab5e775c5c35691692103acd5e73ad2e46278b9d37f886cd48c91cc69353a1564 SHA512 78e86b0c1d2a56dddc8d9ac97ee325871e319ad2226f1fbd5a048d792cd05e5d8162d282c1f767086da5329cd1ee67b37fbb5a2fd3c950f84e9efab11abcf754
 DIST libatasmart_0.19-5.debian.tar.xz 6452 BLAKE2B 09bde3d5d79062d4df82e5582e932b6b566a91607086ddd805925d1966cdee4cb4ba43863f4b7d26a98588479b117841050f762d23c6719448635bf1e681b315 SHA512 434b6ef3ea377485ce745e147da8bb72851b2eeabe6f418379511650f0161f15a9ee21f4f0b5f9beb218b99eb417c1aeafdea4640995efbaf45024f40ce71802
 DIST libatasmart_0.19.orig.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62
-EBUILD libatasmart-0.19-r2.ebuild 962 BLAKE2B ee87912f6b870e8ccb660802d46708d171bc057ec404c04f814483feec58e6cd65c0afe358e52a5868a5331ee25989523579b17b6dae814655066b560739d8f1 SHA512 d6ea6bd3d6982e89fde7189312757e1bafef524f8ee8e69074291a01f35005d53d433454a289a635debc723be4fd1a1e071269cf9d41148c6afbb759c5e3c304
-EBUILD libatasmart-0.19_p5.ebuild 1055 BLAKE2B 161c4bb23868cb06ead1dd68bc7f66a43d78a660135895f859e1a0f15c1f43494a0e05706c110f82e94dbe3ae5a4251055dfb061eba4301be706ed029b185199 SHA512 1620ca2a89aed751ddc6660c3da2e07fbac6c49bccee4292eb3a3417205c016e77d90cfbaef6609269611e4ff2fbc30b5d1c55876ee779e2bfd59a84785f762c
+EBUILD libatasmart-0.19_p5.ebuild 1045 BLAKE2B a843c53b45e268f58870ab720e59dd4f28324920627b155f61a5f2ec0be79ad2fe2898d6f7201af341c47fc4481fca1144fd380529aad0bdbe1eab9626aa2109 SHA512 cd7264d5dfb49008a9a87e85da1d55bee444a3abffafd15e7c6de1c517abb976f951309dbae359e0ad12b371e7948f3e4582288052727395f0045b6d0f7c1c7c
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild b/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
deleted file mode 100644
index 059a6224249e..000000000000
--- a/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-PATCH_LEVEL=2
-
-DESCRIPTION="A small and lightweight parser library for ATA S.M.A.R.T. hard disks"
-HOMEPAGE="http://0pointer.de/blog/projects/being-smart.html"
-SRC_URI="http://0pointer.de/public/${P}.tar.xz
-	mirror://debian/pool/main/liba/${PN}/${PN}_${PV}-${PATCH_LEVEL}.debian.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="static-libs"
-
-RDEPEND="virtual/libudev:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# https://bugs.gentoo.org/470874
-	local d="${WORKDIR}"/debian/patches
-	sed -i -e '/#/d' \
-		-e "s|^|${d}/|" "${d}"/series || die
-	eapply $(<"${d}"/series)
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
index 14cb1e0f3a06..a9e0d81fb64b 100644
--- a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
+++ b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p*}.orig.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libudev:="
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index e744dd1a6a11..694ee7f540c2 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -3,7 +3,9 @@ AUX libbpf-0.0.5-paths.patch 997 BLAKE2B e84f5349131a1ab7f976e60baf74fa030b28214
 DIST libbpf-0.0.3.tar.gz 127328 BLAKE2B eaa1be54f0a7fcc6fd41eb2adaad2f405f76db3bd7c7466a5484ead1cca5a9fe775e331838cd5645d7399cb5b1a5b2fcb3814fb45643660fd3f7d84b9986bae6 SHA512 ee489d968cd9a20a1f091dcd2696d3807ab0db2a001613684402de2c696391eea033f3bd961eaf1d0df95c1e15f4f0ccfb7003ff98c3f08f24a7e9a8db22cdad
 DIST libbpf-0.0.4.tar.gz 148625 BLAKE2B d8c2343441258a01ca54b0046b0f1d54cb2e0e7a09c99e489409b25d3f2486bc7d8a175b4a3e793b56ba72462d34b9a55c53e86eaf446c64f2c30d673e7f23bd SHA512 1e4a16ed0f3e378aa9d7080e4b54cb3a9542975105b09977d1ddecf3ae4dabb3b5edf80b92b61644b1f0cbda7ee7e135ee0f736e71c1d201a97b1b3dd573b543
 DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f90472e9593a9e9a93b08a00f0557d5a59fa841325b947e6f7b129232e7cd1fdc906f45de57b0dbe594548f1c2 SHA512 e42f6cc8f834f2d3cf9138d655bd3727ffffb2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c
+DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71
 EBUILD libbpf-0.0.3.ebuild 1006 BLAKE2B 0ab59a6d9ed6edf242765758286251d1d2dc65470162549396c13fe87ed790eeb7fb13cc2f14e47f2b8db5078948a6cbaa6cd896abb446b85d7bae9f95f34e07 SHA512 d1ae5e553b46fe69594e4576d1600bee0e6e717fd83d2f095adf2eac0a752797c07f0dd6d8bb2c0449d355fef2fe193e7386cebcf06379172f701bce5c9b38a7
 EBUILD libbpf-0.0.4.ebuild 1006 BLAKE2B 0ab59a6d9ed6edf242765758286251d1d2dc65470162549396c13fe87ed790eeb7fb13cc2f14e47f2b8db5078948a6cbaa6cd896abb446b85d7bae9f95f34e07 SHA512 d1ae5e553b46fe69594e4576d1600bee0e6e717fd83d2f095adf2eac0a752797c07f0dd6d8bb2c0449d355fef2fe193e7386cebcf06379172f701bce5c9b38a7
 EBUILD libbpf-0.0.5.ebuild 1006 BLAKE2B 76d69d107ffe635ca1d7bb638751a877daec5a61f1243690cd42db639e46099f30f9bb572b63c42ff5bdaa14b02995d3caea4482804e0a1aaf817989ea10277a SHA512 7b9fea9a715d9a5306342b22657539a6b053055832320e004bdfe7b9d2a8528f93e45d6ae18bf2c95bb19e2d6beb1e773180175c0dd796eb179df2828fe1e218
+EBUILD libbpf-0.0.6.ebuild 1006 BLAKE2B 76d69d107ffe635ca1d7bb638751a877daec5a61f1243690cd42db639e46099f30f9bb572b63c42ff5bdaa14b02995d3caea4482804e0a1aaf817989ea10277a SHA512 7b9fea9a715d9a5306342b22657539a6b053055832320e004bdfe7b9d2a8528f93e45d6ae18bf2c95bb19e2d6beb1e773180175c0dd796eb179df2828fe1e218
 MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41
diff --git a/dev-libs/libbpf/libbpf-0.0.6.ebuild b/dev-libs/libbpf/libbpf-0.0.6.ebuild
new file mode 100644
index 000000000000..7e265723db96
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-0.0.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+HOMEPAGE="https://github.com/libbpf/libbpf"
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+static-libs"
+
+COMMON_DEPEND="virtual/libelf
+	!<=dev-util/bcc-0.7.0"
+DEPEND="${COMMON_DEPEND}
+	sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+PATCHES=(
+	"${FILESDIR}/libbpf-0.0.5-paths.patch"
+)
+
+src_compile() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		BUILD_SHARED=y \
+		LIBSUBDIR="$(get_libdir)" \
+		DESTDIR="${D}" \
+		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+		install install_uapi_headers
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+}
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index c9258531a3d4..7f90c0b4fc87 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,6 +1,3 @@
-AUX libbsd-0.9.1-missing-header.patch 1165 BLAKE2B 03cd6fe04b969a3216300fa9b7d7072610047661e0b41e2dbd1ff2c471ce3c215ae31170ea0f15c775a2c68a000c3ecfa563f76ed854079609648f384615fd4a SHA512 d77b5b631aab66ce71d8170d899a0440e342be5be304719c7f576e6fa5756d432b4ec5a161582f281de00d9a2eb1aad6237e6be1c550284cdc7e30822b51bcb7
 DIST libbsd-0.10.0.tar.xz 393576 BLAKE2B 66005a511dae7fb799322c813b8ea058ab460e3b9044756d6efad5de741d8f70270496f09803bbce8cd0000ff37e998f18e092037c850826c3c8e3f47ddfdb28 SHA512 b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9
-DIST libbsd-0.9.1.tar.xz 387180 BLAKE2B 40dd82ca1088ee7aae8b3d7685e8514eec702bf7ada7ef98f7177cad92b7e0fccc22a953b35f0f27202eb56833b31a81bef1324d43864d1b80887ba7c58684d5 SHA512 435822b8f2495a5e2705e5ab5c834a4f0f3a177b3e5c46a7c6162924507ca984e957e94a512b5ebd0067ecb413bac458fade357709ef199e9b75edf0315de91c
-EBUILD libbsd-0.10.0.ebuild 1248 BLAKE2B 966ec0504283ad8e6a50e956c75f6125820e5c6c4b4e199dd24b0a84889ba9c52131d09464daf651b45dd0e48b82ffd1f5ef78aed9889e645f7e95a39105906e SHA512 ad524116200a19498374b424f0f34c86ee7e82b176d56b1ed0e5e6b91e98c3ce5f5d3c0d00bde1150df8315fb25f39040d37bd0413899b0aa2b29672b25bd636
-EBUILD libbsd-0.9.1.ebuild 1283 BLAKE2B 7ab75ea2173790f66c0910a9bf913a34b51be3d41fc3c4bcc5186053b8cfb9f3259e4bee24af6096b100ff5f6c8742e86676722be24aae1ea0503f0a07819c01 SHA512 2fe38faadbc7f8a14bd26f10cbd312f82343743b6b822a6e2dc3ec3e552abc1a988fb0addcd6a9e81ceca3184a2ac188872f4bf890a2e3d8fa20269f8f4af3b3
+EBUILD libbsd-0.10.0.ebuild 1237 BLAKE2B 77ff730477a4d7d6a0872a12332f385888070e4447fe80c581570afc714b6d4256a1f9a42dbbda5884847c3ae0321043bb94d6df5ec520f1fb856526f344f6e9 SHA512 e9de147aebf18196c966a6e676fbbcbf75e7b9b1a1071f30b254b77bdcfba9a06d5c04c14f20dbb2c17742dbc5ce392011e7810d9a393467c66b1fe59b8a1219
 MISC metadata.xml 362 BLAKE2B 5ffa8ebebcf0fd8d01f49f14b8f6a210a45a057669f88343e77a25907af8b4608f24898f7ad8b0367b1fa162de3ea7f6ae1692d7655ef899f72760d9b156cc1d SHA512 6bf19529af2e728fd1bb249f5f15875726ceeeb98f820c618aa8d8b9db8aebef20019e38486c5490e2808af57e4531f54201083514e6d3e20415ed08dd22e3bc
diff --git a/dev-libs/libbsd/files/libbsd-0.9.1-missing-header.patch b/dev-libs/libbsd/files/libbsd-0.9.1-missing-header.patch
deleted file mode 100644
index 7ca2b881a388..000000000000
--- a/dev-libs/libbsd/files/libbsd-0.9.1-missing-header.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 13c32916b4baab58d93940d57fea9ff0777f1931 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Tue, 5 Jun 2018 19:21:46 +0300
-Subject: flopen: Add missing <fcntl.h> include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 993828d84ee (Add flopenat() function from FreeBSD) dropped the
-fcntl.h header. This breaks the build with musl libc:
-
-flopen.c: In function ‘vflopenat’:
-flopen.c:60:14: error: ‘O_CREAT’ undeclared (first use in this function)
-  if (flags & O_CREAT) {
-              ^~~~~~~
-
-Restore the fcntl.h header include to fix the build.
-
-Fixes: commit 993828d84eed0468c6c15b2818e534e6b134b8e4
-Submitted-also-by: parazyd <parazyd@dyne.org>
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
-Signed-off-by: Guillem Jover <guillem@hadrons.org>
----
- src/flopen.c | 1 +
- 1 file changed, 1 insertion(+)
-
-(limited to 'src/flopen.c')
-
-diff --git a/src/flopen.c b/src/flopen.c
-index b9972c9..ff20d07 100644
---- a/src/flopen.c
-+++ b/src/flopen.c
-@@ -32,6 +32,7 @@
- #include <sys/stat.h>
- 
- #include <errno.h>
-+#include <fcntl.h>
- #include <stdarg.h>
- #include <unistd.h>
- 
--- 
-cgit v1.1
-
diff --git a/dev-libs/libbsd/libbsd-0.10.0.ebuild b/dev-libs/libbsd/libbsd-0.10.0.ebuild
index 383f350fac24..b2f7f97646f2 100644
--- a/dev-libs/libbsd/libbsd-0.10.0.ebuild
+++ b/dev-libs/libbsd/libbsd-0.10.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="BSD BSD-2 BSD-4 ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=sys-kernel/linux-headers-3.17"
diff --git a/dev-libs/libbsd/libbsd-0.9.1.ebuild b/dev-libs/libbsd/libbsd-0.9.1.ebuild
deleted file mode 100644
index 858d6676ad1f..000000000000
--- a/dev-libs/libbsd/libbsd-0.9.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
-HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
-
-LICENSE="BSD BSD-2 BSD-4 ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-3.17"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${P}-missing-header.patch"
-)
-
-pkg_setup() {
-	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
-	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
-	if ! has_version ${CATEGORY}/${PN}; then
-		if [[ -e ${f} ]]; then
-			eerror "${m}"
-			die "${m}"
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
-	# which is correct, see:
-	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 88880f9e7046..a475fc3d0a54 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,5 +1,5 @@
 DIST libbytesize-1.4.tar.gz 80943 BLAKE2B d4c6c34d81be01bf7db2c37b0660886d99eff3c0a87024f5fbc12cc3606dc01e772b81dfbcacbf76c62213120253a9e7bda90adbc749b6d4c3e31e1ed3ae7702 SHA512 5dd13cf52a1674be776220ee1863f42261a47dc53af1ce4a31460d6d02ce87e19c5a52260f700928af98f1d9d7a96de7c11d8f384907b3187ef2effc10cbb593
 DIST libbytesize-2.1.tar.gz 440209 BLAKE2B 7c689f269eae7b408b7f85fb9c877c9eb519d2a2eb143ef0ddb1657fbb4d79fab7cdaa56b35b4bbbb964e47361e37d7c70a0a135bacb8f817bd6cf8d2e22b68e SHA512 6b93d877e921820c19ed6874a36d9f8b6958112f6230f24980e8e6e30570b39ce74594f0ef126f70dc81b5434899c1f0f3ad0925f3ff7b6a596a9329c8f106c8
 EBUILD libbytesize-1.4.ebuild 1217 BLAKE2B 68b65c5481fe69757b383184c06b878cbf86ab1f271b188c1bf24ad37dd1104a93ec6e42a2d5e25f4074cb396e201d2640f211dc301de393a2e757a77a628b18 SHA512 7a8fe331b96238be23fd8711fc1270416503b9b9ba30f5a1d06ffb00f84465ff1d75deeb8f3f9309d9b6f08c35ca25b01765b6a171c19a2720edd62a6db6dc18
-EBUILD libbytesize-2.1.ebuild 1471 BLAKE2B cfbb90bc8d10883bbcedcfaa0ff7d023aa814a4b145bed1fdeb716444c76c01fc07fed5178cebd789b26a7e632bde7c4779e9138e50c4a3caf5ba94ac2909c70 SHA512 ae6cf6ad4ad79130ab6f83b2476228d38c41b6ef23347d7c65ac4abaa61ce6dc72e3100728fd954cae50be0f203bee76f1bb646ec0b07ec928f2a1cd51cbf848
+EBUILD libbytesize-2.1.ebuild 1473 BLAKE2B 5177c3bb69659bf9b2ac4673621eb1bbeeefee4df33a1a75ea9481cd47424330224fa78a84073222fddc22477926f3e6d3def1f5bb01aeea13f2f0afd058dfc4 SHA512 f590140eae7131451497a219122c7a8fd2c5a14c7ca35c18819eeded7d466aeb97da25569863977e53f84e771542cb039814e4b6e7b245edc5367eefefc448c0
 MISC metadata.xml 425 BLAKE2B 445bf1e0d46e04c766c4c81c90f9acb8e8f3c1c3eeb567c3101400139a7b2ab830efcf737e30332af5dd0e50d46bdf9f583cccbfb2e50186cbb6d3f5a396f0df SHA512 24b8980240c3513229ea2e181c64b7f89597be9cd121459ad62bce935fd52a7bbc0ee4871e15899b69b477fdbaf0850d55821a6fbcf3afc30d0cb81a3eb83b65
diff --git a/dev-libs/libbytesize/libbytesize-2.1.ebuild b/dev-libs/libbytesize/libbytesize-2.1.ebuild
index f3c68f3c42fe..ae527783b027 100644
--- a/dev-libs/libbytesize/libbytesize-2.1.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 
 inherit python-r1
 
diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index b5d0ae80dfd6..42b2e209ee2a 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -2,7 +2,9 @@ AUX libcdio-paranoia-0.90-oos-tests.patch 1401 BLAKE2B 0b4ba222d667325b2413519e1
 DIST libcdio-paranoia-10.2+0.93+1.tar.gz 686055 BLAKE2B 5b4c30687c907cc8dd0917263c20e3d55e425cb7fb2a935a79ec6c5cc82c6165a5504fe71b77e314bd4a828b0c652f948cce62fecf94341d20c920c66450d97a SHA512 2bb418c99ef037aeb90ba3db841ea9182c5bc401e74c6f4b552730e6c8561552f7d3e27be71ef4fbb07b4fcd9db418a4fe330d5278e8f41cdd99c757aa4b8bc6
 DIST libcdio-paranoia-10.2+0.94+2.tar.gz 704560 BLAKE2B babb912a7252b25b1d32f7d3cc80d73235383170b16118c4f6fcddd58ded534b2e5a8bb61aa8ca784270fc4631ea3e53cdc88d03b0a7686f74ab1cef7ca35980 SHA512 0e4ed5cc52d0758e945ac7f956c1ca870068f6444df912e2ba5f597947962c471d1c526b5cdab4e092fecb924ecb317667df454497b2e515a4e985693cd86f47
 DIST libcdio-paranoia-10.2+2.0.0.tar.bz2 588472 BLAKE2B 5593c967cc91e7db922c30a0e4fd6a71c81625527b3e3cd19494328c545237c64c6332969e6964ae27cce70b0a7ed9678c2dcf0cf675ea6ea81602071b5a9e1b SHA512 0398617f9af63632d74c5a93c4efae1bc69d339fb7ab2e36dbfa6d19c0940f3bf27ea3ed482698d2842838d2034df3e40304774f1648db8c274d441130ef40a2
-EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1859 BLAKE2B 69b0aa0dc11c3dbb49de2b7a706fe457f0131aa40a8b45955eb7bc1ada381dde2bd0aa30e09a0c3f02732e343518108fa93c39592237d09541b019a361445bbe SHA512 767a3106e1569c6bc015c1164f0de88d62366c8f59e6bebe786304a7b64f3e211b0ded49e2af363512c8ef69d68e1157c656cc8c504ce8337530c7cc555eaaf6
-EBUILD libcdio-paranoia-0.94_p2-r2.ebuild 2090 BLAKE2B cce8da2a95f0cbd4a290f88ff604310644502ff6886734faa14c1baf947924ec93247d489f55fd8505d24b9eb8b7f74ecef9d4b7c399c530666dc094002df6f9 SHA512 0d56e9e20a495ce72b2cd9dae528cfd5e4b5e31f410861aafefe8416c6c34d06110603c3847c772bc0fae50e6cfbce72850ed4724b6bfc9d37e01a90dcb859fd
-EBUILD libcdio-paranoia-2.0.0-r1.ebuild 1850 BLAKE2B 1b71fe902a9a3c83242a18a1d153e4f31f04529d236bebc651953c63f5186dfe6fc2087d1510428aba37d25e1e3e09b2da55a72836ec6d3d47c010e075ded3ae SHA512 4966449cb55b045c7bdc2349b1bd5ddae5841bebae1b0c85df88b475d10082f875879b240f2f4d6790a7479950bef9cea63f81dc569bbc2d27a66a90a91e5fa9
+DIST libcdio-paranoia-10.2+2.0.1.tar.bz2 589075 BLAKE2B 9d2a2d288ccd13ca4ce38a894740085ef099f3e63e68e568d58e9a0609ace21002375431dde862f86352b6aec0c5374f65e64aeb4e39c3d59b406ae14bdee7a9 SHA512 c4a768d11e9f62038ca8081316596c89c7fee6a314229fb42e3999757fae172a5dc167175f60d555c2442266d34fce6ce627f4124e9f3a93d0456adb09ca91f0
+EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1887 BLAKE2B 486d8344291c932d8ab5ad1df3670e132a0aae21b222f16e2442c7b2f6d371a6f3f4d3bba2c7d17f8f8b20d94054ac7a7eec80dfb440c59e1d1effc58577f1aa SHA512 493c9f9034cf251a52d5deed1d7df08fcd85d55735dc369f60c3e7feccb0e5fa4ef629f7e977a97c2c2b943b4a364ba4610c2139f323389b723b79b9e7babf19
+EBUILD libcdio-paranoia-0.94_p2-r2.ebuild 2118 BLAKE2B 992c2a1a7c2a63a0c09cec05de2a407853df4c3f5764d41fb447e7c299f4c4a1a6ec8944195cebd10edf31538122068e864e5c9786b7531b9637e89358fadd70 SHA512 19073d3edca42a41edcdabadf7076756b5ab3d64f351a1aacaede11fc84f129e701c6389afaa4476559f5ad33259fca13a770289ff39965d7c4777ebb9a75bd9
+EBUILD libcdio-paranoia-2.0.0-r1.ebuild 1878 BLAKE2B 1d5f8f1475d6ceee850b85048fc6849e6fae4df9ca8d81b73919971fe3e6cef93c3ce300f9488a590b89642c9a9aa88746d5d0f5cda46d666ff7fb4e8bb9ca81 SHA512 19db40a115b9b5826b2ef0f5b01c4c94b06bf2d561ce3750b8384e2d54a9afa131bef37520f0dce7d0437d68bc5e2c348967ec16fc1e706b2737a766f709358c
+EBUILD libcdio-paranoia-2.0.1.ebuild 1883 BLAKE2B d488c569f2b62d9dfb906ebbd4c0f64816f58c14656d51f07886eef623d5e5999b46200dc80c08884ac96306e70aa76397c9004b592ea92c5de59bf316faf74f SHA512 639a972e99cdaf48cdfc21c672abc424b472402af4d0883ea2a2d489fddfca7ce033e4da5d6c9d7e60573763280f38d7857103bbfb68e240cd36e034130b7621
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
index 3f740f79869e..28a0a70e8c06 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
+RESTRICT="!test? ( test )"
+
 S="${WORKDIR}/${MY_P}"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS )
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
index 26538d0a0fc3..b9ff91670f15 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r2.ebuild
@@ -29,6 +29,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
+RESTRICT="!test? ( test )"
+
 S="${WORKDIR}/${MY_P}"
 
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
index 222ea87fb769..9b8b8529a07d 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0-r1.ebuild
@@ -30,6 +30,8 @@ BDEPEND="
 	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
+RESTRICT="!test? ( test )"
+
 S="${WORKDIR}/${MY_P}"
 
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
new file mode 100644
index 000000000000..8fad81617381
--- /dev/null
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-10.2+${PV/_p/+}
+
+inherit autotools multilib-minimal flag-o-matic
+
+DESCRIPTION="an advanced CDDA reader with error correction"
+HOMEPAGE="https://www.gnu.org/software/libcdio/"
+SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
+
+# COPYING-GPL from cdparanoia says "2 or later"
+# COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
+# clause "or later" so we use LGPL-2.1 without +
+LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
+SLOT="0/2" # soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+cxx static-libs test"
+
+RDEPEND="app-eselect/eselect-cdparanoia
+	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-lang/perl )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog NEWS.md README.md THANKS )
+
+src_prepare() {
+	default
+	#sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
+	eautoreconf
+
+	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		#--disable-maintainer-mode
+		--disable-example-progs
+		$(use_enable cxx)
+		--disable-cpp-progs
+		--with-cd-paranoia-name=libcdio-paranoia
+		$(use_enable static-libs static)
+	)
+	# Darwin linker doesn't get this
+	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect cdparanoia update ifunset
+}
+
+pkg_postrm() {
+	eselect cdparanoia update ifunset
+}
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 9c5aa11b4d7b..85e8798f4a3a 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -5,10 +5,10 @@ DIST libcdio-0.94.tar.gz 2355452 BLAKE2B c6a720fb714e6aa0d4425ccf92e4c08172d26d7
 DIST libcdio-1.1.0.tar.gz 2348106 BLAKE2B c63959d6cd92288b2d098f19b28a61fc5a7005390186045c6f72392becf9eb5808da7a8b952de166c5b263b9c10e594031a3fb908331eda040c210b984b3e11e SHA512 fe5a0d726974c8678b59de74ce043a5ed464f6ab595bf938e90bc5a348e9e882755e75aa3eecce50ce910b28e2498b5a892402fc0ea8728d382d1af36db71985
 DIST libcdio-2.0.0.tar.gz 2354813 BLAKE2B d3ebf9a20004cc8c75d1e6f97a2cea68f490517e34a4cf84f343d717e49cbb9cd612a3c6911894501f16373e3222e7fc6d175fd6d93d1c967cd21502716b22f8 SHA512 8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f
 DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f
-EBUILD libcdio-0.93.ebuild 1735 BLAKE2B 9d282a8839dc6c2e39c5e9a3d3b5c904d857acd26e68fbda7ca50f0219b48da2985d55432abf1f479f585f1a3162635a8eef4ce8572dede0251151acaf62f1f0 SHA512 6688bf61ad36ff0ea59c84da659ec1e9e6ea7498f6dfb2c86d2df90078c3e2f9c209114835e7526369dc5c5593f4969cc65b27bbec5fa53bc2b11d13c94e14d3
-EBUILD libcdio-0.94-r1.ebuild 1744 BLAKE2B 5afaba80c73b64073ba86105658c239dd6e4b50e6f5f00940839302dfb0e71a86b785e51e084ca85a22150a4e5ed4c241f5deac57b7c18e437cd611db32cec95 SHA512 36a7e2a23e82da7ead7f0e4b2692295b9c45110482fefcfbdd8cd1c9f27209889219f2d1fcb172637374f1160d159faf9a3f942120f79998331165d36e8dcdea
-EBUILD libcdio-1.1.0.ebuild 1768 BLAKE2B 62116e87883e3c6dbffb97bd5f8b6499d6fb29b7e11c89f460fe8704e27140f87407ff6ab65b02be54fe13916f1ccfb19e12db174d963dc10009466ec7878adf SHA512 9ad9842d0bafd5e29521da0f38b9952704269526aa4e958d73508731cdfc3c4fee7241faefffbd843d589964a00f900099ec77ed0a29abd6cb7c373e0ead79c6
-EBUILD libcdio-2.0.0-r1.ebuild 1816 BLAKE2B a17ebc9538a436497bbe1df6728581251caab9e24c51ed20940bf1ba843fa041133dc82e90719df7738f11398d10f16a0d77d3405594b8a07f5bf06959f93ed0 SHA512 5367cab2a2b28d3f6053c56d76b7aa51fdc051ed62f0c9b6701d5efc8a62d3e7bd8eac8cdb3570cca8bd9ef87357c3cd0e9d59842877a1c356bfaf66989458d7
-EBUILD libcdio-2.0.0.ebuild 1767 BLAKE2B 87a7224d14eb6a957dbe8b52410cf8902e9a6af6476fd4389fdd34623f2b9123c044a65bf7e82efa2c6e907d456d501408056d8b251dac39a01ff212a702e069 SHA512 ad5c548e8e41db46129d29a01811cd9e07c93223fd813fadd97aefa9b3175d86827bdba9f12d7c6c18346cbbf42d1d19abbfbe21ebb4623ab1c3257604c52e06
-EBUILD libcdio-2.1.0-r1.ebuild 1791 BLAKE2B 7efd154961b829f0ac141fe7ad532902d03bdfb5f7b541495f3aea8b013a0e9442298e5801665256b4c17b12f2f0e8e0e814bf05dd9f6ebcf6d8eca1ea5d8591 SHA512 4eb7574577dfda20432621b56596f2ae901e3625e502d24b2ff1d079cce12e67b1866337da81a221ee81b73399eb0e83529b43ccd041668b9c7df74dec4616ae
+EBUILD libcdio-0.93.ebuild 1759 BLAKE2B b229414aa44c93b8f8b3ba15c1f3992d139900b8648eb349417690975a8f2f7ad397a55400c6536aa413217277059df61ba4c43ead7288d6d7b996d4ab9cfc6e SHA512 8f3b66d1458506b729785a9839aea5335f7ad3ce2ea8e6860042da36749c135afa676394b0683be293fa286c61d2b465e479c7e3b5d160fbbdfcf08ba78ec90d
+EBUILD libcdio-0.94-r1.ebuild 1768 BLAKE2B d59e89ac540fe5163b847aa8b528229b533c1f180eaf9ef4764eb8e5bf1cf1fa238735a3dd7a854fd315d3ffec39a036e7be81c2de1b97a8dfc9d9e604258cb5 SHA512 7ceff74bcd2a717752afe34c5072c0fa8741f015488e36a29a8ab40ddf19524caf606f6335337a58ce99754730e1fd11c3230a5e54a3278ca822d7e96ec712ef
+EBUILD libcdio-1.1.0.ebuild 1792 BLAKE2B d41e863c7713181b70071475cf222c01719a71b231cb18170a8c3d89a9190c500f7cfdc759394eb98e3bbe0d557d3ae9ed8797e69373ba40626aee79306de88f SHA512 19e2e3c38cc9e10e915e1878d12c3d5f9dbabe8625cc6e1511bb1bcbf08bc1725e6d483e84ec688b051c89a6216b83d0b5eba049375284b26eddf98a74c7ab02
+EBUILD libcdio-2.0.0-r1.ebuild 1843 BLAKE2B 716a61184539754decb512584c4e9bfc29cf8e7eb1f91615df6b391fe2f3429603314dd6b0360273f92c539dab25d810f15aabc12d90379972ec7c4dffe06045 SHA512 3fd6c8687c0f4ddb956116b4e7973d7ab13699fdbbf9bab8f74cd5de07b1ca88bdbe54ae0a1365c371fe9535b9a69b569a33010000e11900f748ed17be53c16c
+EBUILD libcdio-2.0.0.ebuild 1791 BLAKE2B 57587ee3d4b5daef555750a90886584e98b6238cda6db9eb5b29f6f20e34121de861d352e02b5384934e08f0f5c0822f51c3e1f1f995da5638410b727947beac SHA512 67fe1ed8e1bbcaf49fe9714343f9a5497792bf4132842142e40bdc2ad2fcd99dc8dcaf0de93e2e1df596ce061d4f769ac5309f48fb1b38394d9af9bcc9702e80
+EBUILD libcdio-2.1.0-r1.ebuild 1818 BLAKE2B d5acaec26526e2babdd81393e8612a93d167bb33845f3bb44e83e7afa06028ddf014ab765b522e710fd55f46930714a06010d264d216b3d6444379cce00928ca SHA512 1703703c9f04c4c3a2eccf5e72116d4c3d55604a2b27b2fdf6839c29e27de53f3fbbb197fdbdef1e131850062d44f9b154f4a6e204cd91162d7b94e42f626f20
 MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9
diff --git a/dev-libs/libcdio/libcdio-0.93.ebuild b/dev-libs/libcdio/libcdio-0.93.ebuild
index d4ca932e64b7..0dda745a992d 100644
--- a/dev-libs/libcdio/libcdio-0.93.ebuild
+++ b/dev-libs/libcdio/libcdio-0.93.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
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0/15" # subslot is based on SONAME
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!minimal? (
diff --git a/dev-libs/libcdio/libcdio-0.94-r1.ebuild b/dev-libs/libcdio/libcdio-0.94-r1.ebuild
index bb80335dbe05..3e1583dbc0f2 100644
--- a/dev-libs/libcdio/libcdio-0.94-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-0.94-r1.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
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0/16" # subslot is based on SONAME
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!minimal? (
diff --git a/dev-libs/libcdio/libcdio-1.1.0.ebuild b/dev-libs/libcdio/libcdio-1.1.0.ebuild
index 64bdaa9ca8be..b3fbe0155281 100644
--- a/dev-libs/libcdio/libcdio-1.1.0.ebuild
+++ b/dev-libs/libcdio/libcdio-1.1.0.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
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0/17" # subslot is based on SONAME
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!minimal? (
diff --git a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
index f0ba01979e37..16077c69bd9b 100644
--- a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.0.0-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
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0/18" # subslot is based on SONAME
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!minimal? (
diff --git a/dev-libs/libcdio/libcdio-2.0.0.ebuild b/dev-libs/libcdio/libcdio-2.0.0.ebuild
index 609c35aafe0b..9401e4a84c20 100644
--- a/dev-libs/libcdio/libcdio-2.0.0.ebuild
+++ b/dev-libs/libcdio/libcdio-2.0.0.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
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0/18" # subslot is based on SONAME
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!minimal? (
diff --git a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
index 6262baefae5c..25d26ab502f4 100644
--- a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0/19" # subslot is based on SONAME
 KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!minimal? (
diff --git a/dev-libs/libcgroup/Manifest b/dev-libs/libcgroup/Manifest
index 5483568e62d9..dd86781d2cb7 100644
--- a/dev-libs/libcgroup/Manifest
+++ b/dev-libs/libcgroup/Manifest
@@ -9,6 +9,6 @@ AUX libcgroup-0.41-reorder-headers.patch 953 BLAKE2B dcc4936227cfc67ddc0c32b2074
 AUX libcgroup-0.41-replace_DECLS.patch 5193 BLAKE2B d22bded7e356b31e9f1e8ceec50f7987311f36453ffd13acaf48e95eacce06052c19a89aedfbcd068218a5fdefc26e5aec737d1c00576f25fdef0b1fe658513a SHA512 c7601810e491764c30e8adfadd65e1b1b578a07af24df62cc9a7b291622d806fc196a98e01957b5acbd3bca072617bd0ff54cae200a8e6c21b5cca4d18cd45db
 AUX libcgroup-0.41-replace_INLCUDES.patch 3064 BLAKE2B 1947d306117beb62dba48d46b9e3caa7e2d5195c6d661b2d061c982220b7d3d92d42d4ef23172e34bf32be2e54b6c82c531aa839432e0489c2abe463b93e25f4 SHA512 17c8fa471347da4973969b954f966501d54889050766dfdd225235dd4539bb4249d57e719fa7a894aadc2e0f7296d233c89c44c96291a9266c958ca3a319541b
 DIST libcgroup-0.41.tar.bz2 500120 BLAKE2B 3410b430aa58613b5b9abedba05bef99b1b8a1fd619d55fb446ab951e052a336efc918879217055bceee886a03d97c3ff46028a87e8231212653a886cfb80521 SHA512 1aedb02cd2ce3bc2e2a328a247a92976ad0978ca4d3aee4eb671fbcc6bb270348efc78dcf84f27fc500f8bfb9bb57c7d6e4d429ef2bc69e4e5118b7cd895a6bd
-EBUILD libcgroup-0.41-r5.ebuild 2425 BLAKE2B 3fe187eef944fd9057b36b2b64ffdfa96dc5c16d4629e4b82bc5299868628e1af47262e79ce26a01b5cab95392b6ea979712b6012a1cd06be7db36b4081ec18d SHA512 019dfa34d9e63aa0a643d3b8cdac459e88626ef884d75497c5cd45b675a3da29800b337060624d3d8750bd6f7b98f2ec6939f0b53c843e4d91280caabe859d72
+EBUILD libcgroup-0.41-r5.ebuild 2417 BLAKE2B 3321982f564a3dbba550c5f67c7b17bb58d746a50f74dcab8e95cdb644c02cdf4dbfd65674121ba310336d641a8bf15eb62e0f9b41ae24c7c750982b1c7f5f62 SHA512 88ba4534f02e744bf1e881a3d23213e92d66a39d4ee8d079f170a1334869f9e0d52b759bf26f53706a0b679ee81d50cc5657246a0e4d2d069cf762cd13bce636
 EBUILD libcgroup-0.41-r6.ebuild 2665 BLAKE2B 7966175e3f4bfc4d331dac082d7926336ccb6b66d9b8d2b7c20c851ee60e1de5aaa65f0e0dd1125046dd2fa19c470e31baa80d96880346294318eb5d321db25b SHA512 200bf16ada36f18bd9ca33189ed5f1857498ea4e472391f6d7cc68fd64e3a25d14f3476e9d39a066574107bde913a5d18d720c8b25e499ef421af62c1dad6514
 MISC metadata.xml 700 BLAKE2B 4638c1287da7cb72c04f77ab1f8c9a46888f0c45194a1221fcc03e2f0ea0b148e7edd4608d2bf61a527dcd8f1701f91a123ecde3118b5f93bad67e56afd6e714 SHA512 faddc728ee6971cbf5e52bc89999f3bec9d312fe04d2c876a2ee69e6533ca1ba85350d0b504bff0c7da668b58a3531606fb3d67cb4f6925c08f65df2190ec0c1
diff --git a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
index a144fee7f9f2..b8847f2fdc27 100644
--- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
+++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="+daemon elibc_musl pam static-libs test +tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND="pam? ( sys-libs/pam )"
 
@@ -87,15 +88,15 @@ src_install() {
 	prune_libtool_files --all
 
 	insinto /etc/cgroup
-	doins samples/*.conf || die
+	doins samples/*.conf
 
 	if use tools; then
-		newconfd "${FILESDIR}"/cgconfig.confd-r1 cgconfig || die
-		newinitd "${FILESDIR}"/cgconfig.initd-r1 cgconfig || die
+		newconfd "${FILESDIR}"/cgconfig.confd-r1 cgconfig
+		newinitd "${FILESDIR}"/cgconfig.initd-r1 cgconfig
 	fi
 
 	if use daemon; then
-		newconfd "${FILESDIR}"/cgred.confd-r2 cgred || die
-		newinitd "${FILESDIR}"/cgred.initd-r1 cgred || die
+		newconfd "${FILESDIR}"/cgred.confd-r2 cgred
+		newinitd "${FILESDIR}"/cgred.initd-r1 cgred
 	fi
 }
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index f88141b76c1b..6af04b4f3428 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,5 +1,3 @@
-DIST libclc-0.2.0_pre20190313.tar.gz 176803 BLAKE2B c9ecd5053685c2de89d92ae4e9cc9e9f8bee24ca05e5ddca6fffd0b45356b7d4a96b54d9bebf316624e0a49594a33ebb156ae6c4b963093bdc6c1067548b2bd0 SHA512 22813bcd76e77c018acbdf2a3d3d300c2996e169c17729726ae8a93c39f85033cfa1f6d43907a7c026451bcdfcce6fbdc64a202961492aa951ef1b818c3f9335
 DIST libclc-0.2.0_pre20191024.tar.xz 128628 BLAKE2B dc750725ee48456e3678cb4f730cc889045ff7401c4b40ac3ae9b656da9fe429aa2094c2042a18eda4f7e87c786ff8ae121fbf726a18de03884f30dad48b3fa1 SHA512 b4c2ca980fb28b5662055bea951de844284fcf122695234d7618439234f0203baf82b5cc5cf8acddfe387f19d32be3a958e53511bb1e33e9469f6be5951dbcdb
-EBUILD libclc-0.2.0_pre20190313.ebuild 1888 BLAKE2B 0b53eb6d84dddad0e37cde71f16750105fbd64fa8b1e30e5508789927ac4b2e9f30ae152575dcf63e85e9b9bf69a79de64a6e8b65c79787490224a211c1ad9aa SHA512 bc80152ef6b2fbe8e600f3c57a8607d979c73aa7939bb172905663dc2290feb246fcc7c4ec98cfbc0db11d51359cb43bd57a659f71e9a564e4d76d0d80bb06d9
-EBUILD libclc-0.2.0_pre20191024.ebuild 1583 BLAKE2B cf80a510c31b8021d6e478b29b687e7c37c907a430890da33507b81bfd577c66a835bb3144ec8b4827b7b3dac19c122de97cbbd2e15da902bc12dc0d2d787d06 SHA512 b92a96b7a509ba120cdc75df4cefa45b1c33c762239dc4b939030b03dea395d12a1efa1347cdfba46a491e15c73fcbeb2def7765aae35cf9c16939672021efa8
+EBUILD libclc-0.2.0_pre20191024.ebuild 1581 BLAKE2B 571ebc473a2b34d931438b7b2be3933b3a2c439cdfa954b412ef501c32a1eda306f5bb7d4c28fc388469d8a67895bd4df3b362f6d347b61d00b68a130d3a1341 SHA512 39db0fcd5e42a5fea0d1a51002b0823ad654b144e782e15950dfd663518f40e30939aa40e0469cd92afcd359c16c8411fa4ee77032bbecd5ffe119f2f51ecadb
 MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20190313.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20190313.ebuild
deleted file mode 100644
index f33fd1c7cd74..000000000000
--- a/dev-libs/libclc/libclc-0.2.0_pre20190313.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-EGIT_REPO_URI="https://llvm.org/git/${PN}.git
-	https://github.com/llvm-mirror/${PN}.git"
-EGIT_COMMIT="45017385361603d6328997a2272d140e50786686"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-else
-	GIT_ECLASS=""
-	S="${WORKDIR}/libclc-${EGIT_COMMIT}"
-fi
-
-inherit llvm prefix python-any-r1 toolchain-funcs ${GIT_ECLASS}
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="http://libclc.llvm.org/"
-
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="https://github.com/llvm-mirror/libclc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-		${SRC_PATCHES}"
-fi
-
-LICENSE="|| ( MIT BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-IUSE="${IUSE_VIDEO_CARDS}"
-REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
-
-DEPEND="
-	|| (
-		sys-devel/clang:9
-		sys-devel/clang:8
-		sys-devel/clang:7
-		sys-devel/clang:6
-		sys-devel/clang:5
-	)
-	${PYTHON_DEPS}"
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify configure.py
-	fi
-}
-
-pkg_setup() {
-	# we do not need llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use video_cards_nvidia && libclc_targets+=("nvptx--" "nvptx64--" "nvptx--nvidiacl" "nvptx64--nvidiacl")
-	use video_cards_r600 && libclc_targets+=("r600--")
-	use video_cards_radeonsi && libclc_targets+=("amdgcn--" "amdgcn-mesa-mesa3d" "amdgcn--amdhsa")
-
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	./configure.py \
-		--with-cxx-compiler="$(tc-getCXX)" \
-		--with-llvm-config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" \
-		--prefix="${EPREFIX}/usr" "${libclc_targets[@]}" || die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
index 09e0ed6af9b5..7c410b8f787d 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 IUSE="${IUSE_VIDEO_CARDS}"
 REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index a2c13cf1072f..b382dcef03cd 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -2,6 +2,6 @@ AUX 0.6.12-CVE-2017-7960.patch 1285 BLAKE2B 10118fd008c5c009052f8802db3d65693806
 AUX 0.6.12-CVE-2017-7961.patch 1437 BLAKE2B 8678147cc24ff674b067691a3eeae42a5731faec2740c23a4679f689b51b160e51f0ec451b38954fb644b2545fab120aa2e97bd22bce253f5f4e5c1b7c21e22a SHA512 88cbcaf64e4c8ceb7002ffd05ce5f42880bd37a25f8c89e927760f0fa982122cde3819ace2e730cc0dd0e093812ad8470e8783477bc2bd10fe05aacf0b3e0e4f
 DIST libcroco-0.6.12.tar.xz 482028 BLAKE2B d43b73ba21f600ec6d549b867a58db956e081ca8b0787db577062e36487d23cd99b384ca3269421d26aff9825725b262fd6a3e48be73448fe984548ab3eb080b SHA512 af9a171d5ccded255b57f170576e67155f12fa0f61ab3e379e907975f77afc37e82e22772c6019b2897cffc15b2425faf3ccfda92b1a45b23eda2519debabeb6
 DIST libcroco-0.6.13.tar.xz 487840 BLAKE2B 511212f1849343d55104cc6d17662cacd524bae098bab12d6db58df41710c8dca2c5beb7a37e42feac6d856934a07feb3d11c55dc74ba055e21066f2bdefb260 SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4
-EBUILD libcroco-0.6.12-r1.ebuild 1420 BLAKE2B 0211d270622b90385551afe44769051c76064950d05fe5be82f5674d6242ac889cbe050e9bd218f57a7cdf1f8c51f51950a60cc2f5404a8b24dae4c7d1183896 SHA512 712d9d024aa698794fba84e4259ecbf3296888a0b5fc58514ef6c0c3a4aa21ea5b6089254a837703d9afbeef3f404e272e440e35e72a585e197955c97f427cb8
-EBUILD libcroco-0.6.13.ebuild 1323 BLAKE2B 2a6f69b3ba679701dc8559c6e3f11a5aa00d53acfa9525223c19ad468e306833d215125835eb9c19c5e7a50fd14e13f2e2cacc41c7fa4f9919f92b64708ace2f SHA512 60e88d84b310364545ec4da9815614bdeca585127670028d3e70f4ed2d33e89ca996cf3e5dae89a4c5cb33f8889d564d7bab20b8c696d25755c0fb874377e93e
+EBUILD libcroco-0.6.12-r1.ebuild 1444 BLAKE2B a0119b88e272fe49732c8c013c438748c1306d76a3b96be15da31ecad575a7cf87d42dee326403c097245a8f2568e986924ebc1647532987b35a7c90d374bedd SHA512 6ed6247270ff00453edaca0ca84ba0eb09949471bcd2f9f2c78e378496532370d94490467711d2f25a5b2f1af85ab5aee6a03466396dcd23ca6ac781c281dc49
+EBUILD libcroco-0.6.13.ebuild 1350 BLAKE2B 4f429789f1c19651005c7dc95bb960babc9686cd53b621444de08847c8fb14f01941d08179416664c0d59055e37c86544222e0be271c340522bd6c7bc331f2a5 SHA512 c953e8ee9df57c38609ed904879f60177d34c7da660500c033efc90b625044ad64b24dbb80ec7f9d7206da24f4e99562edb53ef9c595aa3d90dab17419c6ac0a
 MISC metadata.xml 677 BLAKE2B 075dc643dd13fa706bb3240a389f715e760c6d06c851c5074d6c58843668bbcbda2167fff34f720e57d48f01aaacf61dc2a5a98c11a5240550b7e2500bfef6a2 SHA512 57849cfa0cf0e61f52db3e7a357957d3eb0ea3e93381475ad1821a5e0d63c7971f31b4f52a9a851d303bac59a83edbb5fbdc76d54ccfdd6332ca5c93a43a0b14
diff --git a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild b/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
index 9356a6e7fbda..9cea2f4ac750 100644
--- a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.12-r1.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
@@ -13,6 +13,7 @@ LICENSE="LGPL-2"
 SLOT="0.6"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild
index 59611f6382dc..d3276daef92e 100644
--- a/dev-libs/libcroco/libcroco-0.6.13.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2"
 SLOT="0.6"
 KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest
index bc2ae7b5a50d..840a6ea87e96 100644
--- a/dev-libs/libcss/Manifest
+++ b/dev-libs/libcss/Manifest
@@ -1,3 +1,5 @@
 DIST libcss-0.8.0-src.tar.gz 516474 BLAKE2B 937adc65f68fecece189e0f06cfd601ae2d76f0b4dcdbcb8a67f3f058c4355c19c12c088fb50ecf1e6bcd8436c867b1845b3da27bb44b5d1a009bd946bf5e53e SHA512 fb52920ce462f442dfafa7b0061fa465e6c04827d26186e8468855c2a40e8f34e6f0689d5eb58cb0b2ee0759d083fcff5c8c583e1d98693755003c352a22a4be
-EBUILD libcss-0.8.0-r1.ebuild 1141 BLAKE2B f1eef7ad41b44f26eebbca5d2d2c8c201aee90879423198c0220356c4b22fb8647fd1d5e48e13bb86def6b30145503813ca00f1017c8dafbbfb81b34e18bcc75 SHA512 9ff1ce8316cb2842dbb22a730a85d23052c8a8dedd4a84b5d2803dbf605ead2c74e1507ee6825c719ef2e6d5da2ea6a5e1ed1b00095c904b669f0d07be226a24
+DIST libcss-0.9.0-src.tar.gz 522267 BLAKE2B c104dd2cf859b908d68ac318d1da0430733b8813fbfbcb1f8f6a3d373e3a2ba1db6685542823fe0bef838619ec358f336f8eb07dc073a55a2f8c1907727295b9 SHA512 435dbca91aa2b91398dddbc1d9d035d104be193bb593907e3fff9320cc4f668f8aae54e0d5d0b7cd2ed9cb36fc02255fbe97bc9038b79fe505b581d6af1ded0d
+EBUILD libcss-0.8.0-r1.ebuild 1168 BLAKE2B d99b4f68d2f8d41a4e7bbd6b6f27477aa73f6c169da4233baabb979f9e241d42adb7844a64fb159fa6755b599db031b92321bf4376d766ab00686d73cc9b437b SHA512 ef75a38e7e7ee5b748153d6c293fe21a842c232d27ea5ae94d812f26b538f479d8d5ba79eec5e114b5c480c0a4ecb1f89094f3ccd1356bfb16c4ce143a954aa2
+EBUILD libcss-0.9.0.ebuild 1161 BLAKE2B b600f4767b8a0aafa73461cf9055e14e7622748d56dd1252b2e683c2f74908a58f4c89fa0e34be1981540b9eb591c038e90eb2379da8e3eb1966cbb66aaa3781 SHA512 1661619dfd405943e3f3b03fdfff39d96c79e5558e7b9f6d426aca1ac720c2df54654407240c0364610210285e20d7833bd41f47b81ec3717d8c7baf141d7bce
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libcss/libcss-0.8.0-r1.ebuild b/dev-libs/libcss/libcss-0.8.0-r1.ebuild
index f360ce390d58..c90a2458ef4a 100644
--- a/dev-libs/libcss/libcss-0.8.0-r1.ebuild
+++ b/dev-libs/libcss/libcss-0.8.0-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libparserutils-0.2.1-r1
diff --git a/dev-libs/libcss/libcss-0.9.0.ebuild b/dev-libs/libcss/libcss-0.9.0.ebuild
new file mode 100644
index 000000000000..5712c44a7e2f
--- /dev/null
+++ b/dev-libs/libcss/libcss-0.9.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="CSS parser and selection engine, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libparserutils
+	dev-libs/libwapcaplet"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )"
+BDEPEND="
+	>=dev-util/netsurf-buildsystem-1.7-r1
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
+		-i src/parse/parse.c src/select/arena_hash.h || die
+	sed -e '1i#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"' \
+		-i src/parse/parse.c src/select/computed.c || die
+}
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install
+}
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index 0bd26d5c060b..5c51087ebfe1 100644
--- a/dev-libs/libdaemon/Manifest
+++ b/dev-libs/libdaemon/Manifest
@@ -1,6 +1,4 @@
 AUX 0.14-man-page-typo-fix.patch 1562 BLAKE2B 3e0bc53ca9cbe959ba6360c6226ee99a822bdd78918791bdcf367775d9f80a9bfcf7e82dcd3b4f45c4f10af31be1bacf4ecdbe119482ac6ee705d99967cf9826 SHA512 19aafe2b9d39484ad01544ad3c7937d98b0e8216de1ed8cd331106004f565a6c094888f1a0fd1f540c790728274079343d5db060a0e1a9647d600cea675994d1
 DIST libdaemon-0.14.tar.gz 340474 BLAKE2B 1dd6ac48e7b9a31f58688c7a59814435059287a30db80dd7c9cf69f9eaba27245424ecdbfd8719a4cf30d9686f4b61bb5e394821f66c05e770c244a0208e8f3f SHA512 a96b25c09bd63cc192c1c5f8b5bf34cc6ad0c32d42ac14b520add611423b6ad3d64091a47e0c7ab9a94476a5e645529abccea3ed6b23596567163fba88131ff2
-EBUILD libdaemon-0.14-r1.ebuild 1177 BLAKE2B 606a42c1ecfa9ded0dc083b53cbed867aab1a14145d3ba5c71964435d67d41544b06b87b5a28ff1326c0fd0a6dfe215e02ca644b5f9ddfc69665f56c48c07da4 SHA512 ad99759337cb7e247ab34ba6e9d01f5dec91bd13b0f506e86c23c4bd0900cbe259ca9d2777f180540f9e0b3de8ecfa0dbaa503634822a0f63f111b052cfb6c39
-EBUILD libdaemon-0.14-r2.ebuild 1424 BLAKE2B 17e8d9468524ffbdebf400e4df3f22ce64c0fc6266c7d05263145e70b38eec0082d265ddbb200a5383f027dae81528aefc4237a4ab5f8ff17e83721a7b19b071 SHA512 0b801257a5b4fb6ad79e2328bac08c2fc6fb4f65e8129bde87fb2c248b728ef14b6c3a2129e9d4a6585dd0cdba1869d728b6f2bfbcddd270497515f9eac365ad
 EBUILD libdaemon-0.14-r3.ebuild 1369 BLAKE2B ccd25d19ee559a1aaacee8adbb6d651a8eb7dc8d41edab589122677da195720e511c993c04f3f19f6b1eb50e2d60864e209c4174625535c56e245313564324a6 SHA512 c51e95a69ba90c191b366d641a51836ff7fd0bd44fef58af8ba25597ba7a9b3d1730c62ec0e5f3ec5e4ccf46cc4bf35496a2fc1a98ae2513b5d1c2d491f1ea02
-MISC metadata.xml 310 BLAKE2B 687f9b62c9f0ba35acf51e9cd7233c2b9c45a072125bea9955b06bdc3bf935f651c379e7a6bb7775335818bb0b331e7774829791bd0c6b598b7d7e12db4cfe78 SHA512 0eaa3a9c6030fbe639a5c0c9dd93e30ea2a5a7d2931a44f3b5491dea49f21313b899b47a5163e878baf37523d2251570116036184ea268bdf63b16bd9a8ec6ac
+MISC metadata.xml 263 BLAKE2B ffc12ff3506230708339c526731fc41075c998b49a137ab20123d685a623bc7b1a1f235a3b3bd170c7761ff470a92fa8d7a4b5a5d12d0d9bc6bf487a39f5dd37 SHA512 0d09fd7f66692657dfa07da397338a22091bdca415b13d84b7fb7f21ceba2c3ecccc49144612b6a7c639ff802c01851e7120a62789397ec585c8db497a3ae692
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild
deleted file mode 100644
index 62f84c239a81..000000000000
--- a/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit libtool eutils
-
-DESCRIPTION="Simple library for creating daemon processes in C"
-HOMEPAGE="http://0pointer.de/lennart/projects/libdaemon/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( "README" )
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--localstatedir=/var \
-		--disable-examples \
-		--disable-lynx \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake
-
-	if use doc ; then
-		einfo "Building documentation"
-		emake doxygen
-	fi
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	if use doc; then
-		ln -sf doc/reference/html reference
-		dohtml -r doc/README.html doc/style.css reference
-		doman doc/reference/man/man*/*
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc examples/testd.c
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${PF}/{README.html,style.css} || die "rm failed"
-}
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild
deleted file mode 100644
index 5b3e995289ac..000000000000
--- a/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit libtool eutils multilib-minimal
-
-DESCRIPTION="Simple library for creating daemon processes in C"
-HOMEPAGE="http://0pointer.de/lennart/projects/libdaemon/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-DOCS=( "README" )
-
-src_prepare() {
-	epatch_user
-
-	# doxygen is broken with out-of-source builds
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--localstatedir=/var \
-		--disable-examples \
-		--disable-lynx \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	emake
-
-	if multilib_is_native_abi && use doc; then
-		einfo "Building documentation"
-		emake doxygen
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use doc; then
-		ln -sf doc/reference/html reference
-		dohtml -r doc/README.html doc/style.css reference
-		doman doc/reference/man/man*/*
-	fi
-
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	if use examples; then
-		docinto examples
-		dodoc examples/testd.c
-	fi
-
-	rm "${ED}"/usr/share/doc/${PF}/{README.html,style.css} || die "rm failed"
-}
diff --git a/dev-libs/libdaemon/metadata.xml b/dev-libs/libdaemon/metadata.xml
index f13cc8c4e7c3..8440138e5920 100644
--- a/dev-libs/libdaemon/metadata.xml
+++ b/dev-libs/libdaemon/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>eva@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libdaemon_project:libdaemon</remote-id>
 	</upstream>
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index 61e6422b793c..45373cb0a00e 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -2,5 +2,5 @@ AUX 3.30.2-leak-fix.patch 820 BLAKE2B 42fa64e28ba3c94e4ff759bb6abaacc6046eb3e6b6
 DIST libdazzle-3.30.2.tar.xz 432192 BLAKE2B 4c31b74b0a5c972b5c86bbacf50862a0c2db5c9ed1e67124671e2ece75d72de4c3605c6ecc81bde10cf2566ae06cbd7f14fccaff5d154c1bd9e53a9f8b2dc2eb SHA512 591c3bb9dd65ae02e6234a1599497dce78d843ee6ca47e8d50656b9f98bab91c7b89424c23eb387184bdb28132e1fbe11ee7c01d4a7f0598bcef92739aa8bff6
 DIST libdazzle-3.32.3.tar.xz 439492 BLAKE2B 7a8cf5a4ad29ca11b489553785e66d49a2ba7998f6791bb392ca37740441ff0e72f59ced192dc681ab20da79cb9183621a7d73baf57c9f045ae917fc993d1205 SHA512 e82d5f04706ec2003db27ece490255264828334d1e1c2076485660539664fd382c1289b9d8d4a6cc2dc31c65db270207e7d51105ffd1cadb7c384cd91199ceaa
 EBUILD libdazzle-3.30.2.ebuild 1418 BLAKE2B 17728c31418560be84d81ad57278bbddeaeec59657956a22c548e70861639eff121d4199fc57d321e88f90dbfbc791fb2f9b51104d09a3a44849d34452e52717 SHA512 e81703274d2f3801069553ebcfe5a77f3c4f096741d9ed44ac2f02ce971b6e54c6561a4a0c6bab3a0ca0a44bbb17fd03c1dfa0522a57b8b6220ca0e17ff0af3c
-EBUILD libdazzle-3.32.3.ebuild 1580 BLAKE2B c075f550bd84ae90ba35da42c629556d6b395f5147c37109c1863d8d908540c722b2ef21782ff71e5183ceb372390a98678dacb4356f67a77ab051a0ba94ae9b SHA512 25e959cc030e506a28d13bd36806e52deecda4ff8d2067edd9b01bc94caa37663b29242f88ee4d57e03ac84b45727817a62821b87aeaa342adbb2261e3f69a96
+EBUILD libdazzle-3.32.3.ebuild 1578 BLAKE2B c6453a3ac2cd5d1041883d333b28c897a7cbcf3098b510ce8727ff9c9eefd109181539bc250c4577477c751321b151ba2c2137028da63f530943cf51c7b162c5 SHA512 fce495a156c818aa470fc3b2bbdb9f2eeb17cadaaf1f8a38f950490b70b68008728406fab78d20fa48d0a66898e3a6c3e824eda10f66c987340aad3d4971b8f4
 MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/libdazzle-3.32.3.ebuild b/dev-libs/libdazzle/libdazzle-3.32.3.ebuild
index 688356df7c4d..b32618ea3558 100644
--- a/dev-libs/libdazzle/libdazzle-3.32.3.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.32.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index 426aaaa95609..5935a81ba620 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -1,5 +1,5 @@
 AUX libdbusmenu-16.04.0-configure-fix.patch 1268 BLAKE2B 9b7c045b46b9b8ad6af069d4d95c0e867e4cdd7c5edba1412483a7b11424d24d757bd04c7f64fdd0ae36107befe26b54e589d658739438f331bf82277a79e391 SHA512 e872017556eb7e6b23a9c80e478b9e25be604bd2500be94879bad6634150265bb7b2979fc3cbe05a06dc9f3ca115ab57457853b37c6db622b5ec4bb23abff2bd
 AUX libdbusmenu-16.04.0-werror.patch 1131 BLAKE2B 0f08e797095a8f9358abe1784b64f8f4126f6ba6c271991a4cf95781485e6ddda30cc98db8c50c7f3cae61f398cec6d236fbccc7063073f041337832fa132536 SHA512 ba1144695110cd8ecf89deaea28e0aacc40b00a500a1dc86c28e67754599117e0a2217c4d6066c1061fa009af82e463dd303ba78c479053857ef6e793959068e
 DIST libdbusmenu-16.04.0.tar.gz 760376 BLAKE2B 6996ce09bc2b81a8f415a46490ecb3189a064a64f1716919bb1495dccefa220ab058af06f4b3391c954ec76ec38e62db9c092b620cb69cacffb064e590ec1297 SHA512 ee9654ac4ed94bdebc94a6db83b126784273a417a645b2881b2ba676a5f67d7fc95dd2bb37bfb0890aa47299ed73cb21ed7de8b75f3fed6b69bfd39065062241
-EBUILD libdbusmenu-16.04.0.ebuild 4050 BLAKE2B 7dd433075ca01b118a6c9540f6283db8cba309d93d06092563746338282e11c716a9d142656be3165b8db4edd6808952853947a8aa633a43c3a9b73e96eedbbe SHA512 239eb435509708f61103ac561b34d8f2b355ed3b234a93e68914aa50e86c09f49533a80bdf5b25561a6102b37c312256a106f474995b8b1c4a5d37ebbaa61aaa
+EBUILD libdbusmenu-16.04.0-r1.ebuild 3891 BLAKE2B 2eedacd0431a016f6b34acdf7ba180af4beb01e053cad27e350cec93059fc18acdf29e9581b4567191d2730392705ff7d34cb55d6d90c0e9508ca128b2644ebe SHA512 9a93356a0524f9c6d75cb9ce117be3b675c96256f1c0b6c4b968e3659e5a94c1e4942f26bea7d52c0e03d086253f4194e54cec81ab03db288757cd995e766fc0
 MISC metadata.xml 361 BLAKE2B 93f09713c694acddbfa9011a7a8c688341336d641ac74e49e914e2e099865fa6f7755a645dcee37014f5251b1577b980cb2b62e06d17f3d74ef5f0c02b0e769c SHA512 65033c817aacc6bf81e47970baca8feb6dacfcc74ed788806f65dc49e48178419b300edac867688f1be36d2ffc9291366274832912fa61cee48c328ca8f55efd
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
index d2da6965ec8f..e5b1db2075e5 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
@@ -5,32 +5,27 @@ EAPI=6
 
 VALA_MIN_API_VERSION=0.16
 VALA_USE_DEPEND=vapigen
-PYTHON_COMPAT=( python2_7 )
 VIRTUALX_REQUIRED=manual
 
-inherit autotools flag-o-matic multilib-minimal python-single-r1 vala \
-	virtualx xdg-utils
+inherit autotools flag-o-matic multilib-minimal vala virtualx xdg-utils
 
 DESCRIPTION="Library to pass menu structure across DBus"
-HOMEPAGE="https://launchpad.net/dbusmenu"
+HOMEPAGE="https://launchpad.net/libdbusmenu"
 SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="debug gtk gtk3 +introspection test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.35.4[${MULTILIB_USEDEP}]
 	dev-libs/libxml2[${MULTILIB_USEDEP}]
-	${PYTHON_DEPS}
 	gtk? ( x11-libs/gtk+:2[introspection?,${MULTILIB_USEDEP}] )
 	gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	!<${CATEGORY}/${PN}-0.5.1-r200"
+	introspection? ( >=dev-libs/gobject-introspection-1 )"
 # tests also have optional dep on valgrind which we do not enforce
 DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
@@ -48,7 +43,6 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	xdg_environment_reset
-	python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -56,7 +50,6 @@ src_prepare() {
 		vala_src_prepare
 		export VALA_API_GEN="${VAPIGEN}"
 	fi
-	python_fix_shebang tools
 
 	eapply "${FILESDIR}/${P}-configure-fix.patch"
 	eapply "${FILESDIR}/${P}-werror.patch"
diff --git a/dev-libs/libdynd/Manifest b/dev-libs/libdynd/Manifest
index a8dfba295838..bff86ffcd1b6 100644
--- a/dev-libs/libdynd/Manifest
+++ b/dev-libs/libdynd/Manifest
@@ -1,3 +1,3 @@
 DIST libdynd-0.7.2.tar.gz 1342364 BLAKE2B 28617a6b01c09dd8030d376f73c6dc6ddb4cd031aaa59348283fbb1226bb401e2d7ab48385263b8abc4ca95ffd75d2ce9f3b52a417fe04c6597886f8626cdd3f SHA512 134195ba5839e05af07dd9ad0b8e749a83345511acd2a22a029a4d9a2c0fc77a8a1f36722bce20653d28189b7883afe7feb651c7d32ff921ef257a8a9aa4bd7f
-EBUILD libdynd-0.7.2.ebuild 2070 BLAKE2B 23a9f3d75e6ffb109a2e52cbc2d6aac26bc6e900b8996b6b0812f99f95ccfb81d385f9b8f40652e4cda8e5891672da0ec5d51570921cc3a86b17cec91a428621 SHA512 0f327413a749969c9bcc9823b6677119d0ab7be52d6516ea6ef046131085877ffe744f08e1b7db4da7bf431271480415f3ff4181fe06cd9db419a24f16aec0dc
+EBUILD libdynd-0.7.2.ebuild 2094 BLAKE2B 0db790781513c16d65a0456572ffa3f4339d057a29b70341f242d1aa361830e23b69e17c2abd04fbd1ae7b68aa6827ed289f8be5453578884441f41bcabb7c6a SHA512 05bfe31c1ca2fcbd10edc7a8b2924874fe673e635b46edbafee0597150444d2d9115c0bc2dadedc935f1bf9ff398bea686295094ce79a29598b979f64a9954e1
 MISC metadata.xml 1120 BLAKE2B 9b42962d156122337c1e142a67a984aa8a2537a3e14b8273d18e749a2e4887e8694623eaf2d74b8beb463ac9070c73d5d0f0bd34e6f800b735e3151e1fd8616a SHA512 ac2eb8493d3e23ec7bdac5d3d5dc2d22358e51e468456de99b5bc48326924c1db31ea4d9474300a2579203d25ebb863ac84226529b36b6b1402e1351c03b1b68
diff --git a/dev-libs/libdynd/libdynd-0.7.2.ebuild b/dev-libs/libdynd/libdynd-0.7.2.ebuild
index bd2fb462f18f..2f1c96031bd5 100644
--- a/dev-libs/libdynd/libdynd-0.7.2.ebuild
+++ b/dev-libs/libdynd/libdynd-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc fftw mkl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/c-blosc:0=
diff --git a/dev-libs/libe/Manifest b/dev-libs/libe/Manifest
index 348c57d391bf..ca90234dade0 100644
--- a/dev-libs/libe/Manifest
+++ b/dev-libs/libe/Manifest
@@ -1,3 +1,4 @@
+AUX libe-0.11.0-strtoul.patch 246 BLAKE2B 0f114e529a4af885b628ab8db54b7f69d2e5b5ee4311469ddb15e77f431e7e86b88aaf8b94b288de8cdb0246ee37b0d4fd0fd6a849b3a97467893ffd7c751ac8 SHA512 3c9213064ead8bf7c549310ba26ef0705eb61a6b438ccac74f80ec0040ce07cb51b0e89a46a2b97d7af98e3075aa2674e5b8b470c21f12bd21b9b7ec17468dbe
 DIST libe-0.11.0.tar.gz 414542 BLAKE2B 5b7c312b837659811cca7e64c0006fb5b3378086b82f44b5819f975a11038cc305338555d60758e1f8435672a855668ab2e6719a4a42c9c7d596ca4d35a1aa5d SHA512 178003b19f5ad2b3503a929bce131d329e5eafba9f46ae3343cf4271e248ef883b84945e642239a7cdc96185e1b975bcf62004831042c2ab232e7813efbb5339
-EBUILD libe-0.11.0.ebuild 529 BLAKE2B fb93bfe1be9e7d509caf08796ea516086ffa94199d95b715ff4a9e3cbef7fb1ed1f7c91910afa63eea3d9a1913f7dbaa5952a1bb998bd6dbc096cb1799b0630e SHA512 eea4f6e3820d187a0d5f128e943493211571e97f2761f99fc8df36c9e043fa4eeda725b359996302d5d8f061f856a87dc85e1b3105c5f68133ebead0da0e5081
+EBUILD libe-0.11.0.ebuild 619 BLAKE2B ef58b960ed2c8a9b769361a32db84d4616cfd4d3121d1686dbc53e52e1334e15e9174319821b4758f8a8dc0a3784630eaf4ad5bc3c04e4c06f6dddcf1e0ebe6f SHA512 f2bd9e69ce8ef105b2d40121a814321f20ad1e5df489cf29330664cd0bb65523f3e9b7fa258b464993dd29987747c6229c5c1859ef34609a5b1d131d817714f5
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/libe/files/libe-0.11.0-strtoul.patch b/dev-libs/libe/files/libe-0.11.0-strtoul.patch
new file mode 100644
index 000000000000..e993c593252f
--- /dev/null
+++ b/dev-libs/libe/files/libe-0.11.0-strtoul.patch
@@ -0,0 +1,11 @@
+--- a/e/convert.h
++++ b/e/convert.h
+@@ -58,7 +58,7 @@
+ 
+     errno = 0;
+ #ifdef _MSC_VER
+-    ret = _strtoui64(s.c_str(), &endptr, base);
++    ret = strtoul(s.c_str(), &endptr, base);
+ #else
+     ret = strtoull(s.c_str(), &endptr, base);
+ #endif
diff --git a/dev-libs/libe/libe-0.11.0.ebuild b/dev-libs/libe/libe-0.11.0.ebuild
index be48fd2433c4..45011db72260 100644
--- a/dev-libs/libe/libe-0.11.0.ebuild
+++ b/dev-libs/libe/libe-0.11.0.ebuild
@@ -1,27 +1,31 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit eutils
-
-# bit messy at the moment, next release should fix it I hope
-RESTRICT="test"
+EAPI=7
 
 DESCRIPTION="Hyperdex libe support library"
-
 HOMEPAGE="http://hyperdex.org"
 SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
+# bit messy at the moment, next release should fix it I hope
+RESTRICT="test"
+
+RDEPEND="dev-libs/libpo6"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-IUSE=""
+PATCHES=( "${FILESDIR}"/${PN}-0.11.0-strtoul.patch )
+
+src_configure() {
+	econf --disable-static
+}
 
-RDEPEND=">=dev-libs/libpo6-0.8.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+src_install() {
+	default
 
-src_prepare() {
-	sed -i -e 's/_strtoui64/strtoul/' e/convert.h || die
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libelf/Manifest b/dev-libs/libelf/Manifest
index eae8a14b718d..c7e6df393388 100644
--- a/dev-libs/libelf/Manifest
+++ b/dev-libs/libelf/Manifest
@@ -1,4 +1,4 @@
 AUX libelf-0.8.13-build.patch 1358 BLAKE2B b0a6ea3d29cc508da873b9dcb9c99c171e01d47df4f6c753434f9da04f18aa56314df089fd2dfebca320645a99fa474359f731d315d51989041ccdc4eb997460 SHA512 7971ef661c058d092c7d5c89649c9abdec1b9fea45bb71f442d5a671a754f793b54674a7665614551067733f1c415c4e05be99c7714d78488eb19850a409f98c
 DIST libelf-0.8.13.tar.gz 148529 BLAKE2B c0364d6a155ec1590c8ef0754ff0989144d2331e99eb2a5208d80259229904a72328733460675e334ce6b26123f1c92d28d5fb9aea1acdff3ea7a16f4b572a09 SHA512 d2a4ea8ccc0bbfecac38fa20fbd96aefa8e86f8af38691fb6991cd9c5a03f587475ecc2365fc89a4954c11a679d93460ee9a5890693112f6133719af3e6582fe
-EBUILD libelf-0.8.13-r2.ebuild 1302 BLAKE2B 79accc1edde3550dba712a1ba002a39789f1792b24c97088dada3eb874a9ce0bf5a52658b8f72ee62966431b0bd581b53b386d43a4ed30424f253056914852ab SHA512 380c613579387ef1b32b5d111227a8294c25cc7a2ba2b31792ad15adcf31823c88f98a269fdde246dc582d6e7ccdcaf6016608c45236b3b6f4979ca1938cedde
+EBUILD libelf-0.8.13-r2.ebuild 1295 BLAKE2B 9c8e630c8b8a9392b825ea7e5d74e6796338b0b1fb09e389a9d5ed381530ff8fd4073175be4b7bf61ac162959d77a29f278a2e52040e8e3393d295de4472e69b SHA512 4fb260bf761c72c25cde1fa2889bdb7448a16280f12172382f8e95602d135929f7de770540bbd416a14120d5522c2417d686777e1210dd93b135d81aea8440b4
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/libelf/libelf-0.8.13-r2.ebuild b/dev-libs/libelf/libelf-0.8.13-r2.ebuild
index 20f15d7e1782..9cb4e75ff9d0 100644
--- a/dev-libs/libelf/libelf-0.8.13-r2.ebuild
+++ b/dev-libs/libelf/libelf-0.8.13-r2.ebuild
@@ -44,7 +44,7 @@ multilib_src_install() {
 		libdir="${ED}usr/$(get_libdir)" \
 		install \
 		install-compat \
-		-j1 || die
+		-j1
 
 	# Stop libelf from stamping on the system nlist.h
 	use elibc_FreeBSD && rm "${ED}"/usr/include/nlist.h
diff --git a/dev-libs/libestr/Manifest b/dev-libs/libestr/Manifest
index 91f76d0a1a17..814a20a80bd3 100644
--- a/dev-libs/libestr/Manifest
+++ b/dev-libs/libestr/Manifest
@@ -1,5 +1,5 @@
 DIST libestr-0.1.10.tar.gz 336122 BLAKE2B 7a157d030415bbdc8c289061c4ce1ddac4fdfd7356e82857afbf9a8d6ff4bee0a0b98f2e39c4adb69a0349c33a29f1cdd90ec901c3501c0fcafb45faecbfea7c SHA512 477b06e2b6ea9b2e34fe0d91328c9191a678b173751e595359c05772db50a4d348ac132bec0c926fba91ceccc013e15cd4cc57a6b734874c06073bf23151bac7
 DIST libestr-0.1.11.tar.gz 355544 BLAKE2B c165212c4a56ee577a76dbb95dfe9d08d84087d490422d4fb7c29cadc5b5d0eed97234369331286433e2d860d3cfa8af3117d3ff94e8833df91f6586905ad2c8 SHA512 0ab98c2fa4b58cf6fee89c88602725b8b5e8e5a171a6976cdd8cff4dfc1cd3e5b747868da74fccd1bca66b9fa524ceae1c4f1ad5ee653a44ff81df6916ab5328
-EBUILD libestr-0.1.10.ebuild 694 BLAKE2B 828faf8e0caca0ee43ebd9906f610d7b2e1bcf02bbb35ca4dbca2c0faffeee953cdc585846dc6f91115a833efd88bfed9885fb0c5ae51e71e0e0b7b01fcd4508 SHA512 8c84b1c09ce8a881527b24b7cac68b5d0508721996ca0b6455f8bdd1d8d207c90c198346df576738c14973db5de4fcb707ad67c8ebaffa82d49e76854a20a8f3
-EBUILD libestr-0.1.11.ebuild 700 BLAKE2B 706aeb3fd6e57b334f42dc2ff1440630c8a26a5ae4c94d0dbfb336f9a651a73fc215c27900898ed9e2b72fc32ff4916809800abd9341aa2b5d35ccc17846d48c SHA512 861acea04e6aa61abbf375f1d4de0478dd1ff919d71353adcffe154de495ec9c3efecdf42d920a964627ded4bd1a9905ac2a5a1fa5645b8a3d59f8103f96a5a4
+EBUILD libestr-0.1.10.ebuild 721 BLAKE2B 3d7d14cadc28180c2313dd48034e288197eea03a3e8f42f4b91dc29bf07e634696db51e2679dc5fa5b84dc29ac5feafaab209a22f0c904f1ed4fbc884dcc861a SHA512 1cd9e852123c1b319a83e162df47a50fb60a229dec519d9dcf3b840380f7b227cdbf137a20c5fbe9d6da47a02f43ca3dbe43f478c05b8f009418f28550ff0cd6
+EBUILD libestr-0.1.11.ebuild 727 BLAKE2B 022a13e520df6f8ebf898f3a676c8d2b1b4061512e9d96d3f1fb1e70220e8787bf390019133629a98d1c99b32fed657c115d9211bafc476483f5cae4c17c5b0f SHA512 c8e87d37127221c70c015f31bc84e0e3947ea891977d2c62e65e0e5704e405067ece5a0192d34e7da8527aa7b21aaa9cef861096721fd9736a259693f486b906
 MISC metadata.xml 563 BLAKE2B fb15f2cda9e02291c5a88dc7ac002a69d4504ca2e0d496962986846ff089628064e5334688d9806bb9e3478073e8b6fecdad7ca227723c8e4b8f4c7c83ac0aa3 SHA512 4ebbbbddedbb2ee70c52c73b23ef83c0920756ead3e14d8a75afd5bc994bdeaa63a6e9255083b74bdd80da8367650544c92763e299f3f6d49c930b2f92e7c478
diff --git a/dev-libs/libestr/libestr-0.1.10.ebuild b/dev-libs/libestr/libestr-0.1.10.ebuild
index c02a15e70051..5f40fae519c7 100644
--- a/dev-libs/libestr/libestr-0.1.10.ebuild
+++ b/dev-libs/libestr/libestr-0.1.10.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 hppa x86"
 IUSE="debug static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libestr/libestr-0.1.11.ebuild b/dev-libs/libestr/libestr-0.1.11.ebuild
index 9a94a5700650..22b6f6f1d57b 100644
--- a/dev-libs/libestr/libestr-0.1.11.ebuild
+++ b/dev-libs/libestr/libestr-0.1.11.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 hppa x86"
 IUSE="debug static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index 6d074a4415b1..79a3fe782f3a 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -1,11 +1,9 @@
 AUX libev-4.25-pc.patch 1237 BLAKE2B 6f07e9a8614f136dc44c099a49aafc57e78d107820f23319a9d498d7e6919c01d0e77cb0649e84913d8453341191f48ab6c1b71138c11005400e1936a2efd6e2 SHA512 4cb83f6ab869028a023f1dbc5be4d29b7bd5a703ce12e0cfa54305682e83a5e4a357c19b95dc1b8236e9dc2fe5e2647f42547983a1a3cff3eaf8049b297306bc
 AUX libev-pc.patch 1031 BLAKE2B 395e57ac5b71761c9603bc5355265ac7bc73aac78c2d6e0aaf9a53cc378c4a1ea3d819960d412e3cf0b6081c46fcf2120b6cef0ef9aa8be26d64e1241d090217 SHA512 09905e5bdd28b06e92bf0023b659c339e2dee05c78657f0871275ad3816cd050db346cfa6621d569b3b12977b2f99a63edcb9a5613367167d7187d705ee44fbb
 DIST libev-4.23.tar.gz 524184 BLAKE2B bb8c15665e0ff59322bc2f076f4256ca8f5acff5bc55bb3f5f10ac9704f9311ad90f581e4ced25dcc22c39988ffacce1958f195234a60039d33ba7b7beb9aee2 SHA512 e3d98364b3788a7f5c56be49b99cecc98da6323fc7e6d47aff808580653ab9effffe88636a2f5d357d596a9a580e778c20139cc162467e3e2c5fc736713c6e39
-DIST libev-4.24.tar.gz 524264 BLAKE2B 92a480cfba67119c630211b9acfadfa2dc6ab1806ed015cca693829fa6deedeb4fc5530aa47e0a0d21304b0f626136110596ccdbeb75bc13ea5d23eeca7b9ded SHA512 e4cb3b5dd4b9828d5b8da840c73ae4604258a8c4330aafa5472298b83bf944628f36918f0ddd47d9069d255639f0b24a2cf8d349f0644ffd50de823bcb54a31a
 DIST libev-4.25.tar.gz 545817 BLAKE2B a6ce69ba0a5824afc9e49afa8dba67f15b5945bb01104733c2a9478265fa78908ea26b6594c00f210c86eaef936956c16d3a55cb91a834501da0a6db12caf201 SHA512 83455d4dcb626a28d8477aaea27cdee6bc88b273fae926a57eed9f6a59d4b0ea2eef0f41ad09ff711aea2956ed83a591aa53cfe8aa242f7d0a4da19180d764c4
 DIST libev-4.27.tar.gz 556658 BLAKE2B a4cd33aa9320c0c81912b50c0f03cd338e09e9c1c63f14d682317322a3c875229b2317af00a48e65be9e56b165b994a385692b103cae7c44012a1281e764f27a SHA512 18fbac15c3a24b2efcd547d98d423fe59a1684cd3afe7ff25a3da54d8df3e11f351df455657d830df93366853f74d584f6e47a7c9ffaba84aa586957bf39ea82
 EBUILD libev-4.23.ebuild 1076 BLAKE2B ccb46133baf1abbfbe8999d6763201819ecd0ba91d2035cd837c059eb2f575d851b1093d83bb951c74f29a50e1c82f563d583f6ff3991a323b6f1e9932602ed8 SHA512 1e001c0b698429b355e0c4e783676edb4a3215a9c184ea423e6d91b637132c42d5839a7422300fa064d4b88f057948937fcf1b65648ba6dc763425505eb2e9f7
-EBUILD libev-4.24.ebuild 1093 BLAKE2B 70318df4f7926477dff4822bf6a53b6769a70d093eadf8eea12264bb5f7bfdece5c4846b62b5fdc86b332590ac3902029fdd12ae69968af2eb789d210bb7f9fe SHA512 0071e46906d078048052970e511285c95343f141ad1f871e52a5b329990caa3ae731dd321562851137f54d274235c665e1c39f00df791f1110bbc4f85d51159a
 EBUILD libev-4.25.ebuild 1122 BLAKE2B 72a683a63c004ef07500cf7f1f0a381ac862ae2e36eb459c5da2482ac3b784469745810155f4001acc1c63a51ec241bc3b326066ddf89cb67273ad1e8b9adac3 SHA512 9531e11b30ceb7d8992181b93f28e939735d40ad6c12fec3151ee21683f77b6b4eeb9c0338a2f9216fb2f70580c9689484728d7698a7d96af45b230633ee7dd2
 EBUILD libev-4.27.ebuild 1139 BLAKE2B 0b8c753c1f77f9a3e7b1486efdcd499031a8444d7c41903e5a04fd58fff1160ab8b29640ace1785fe2b7a3c2ab1f9a50ffff682e04702a1b545274551f36e7e7 SHA512 acdc3bd84f41ed391df8e9f6f5d676fe8ff009b0a897820d403714dcf0983caf8d6374897cec644a65b256c946aa4ebb8f7dd488cc063fde470af07725152b80
 MISC metadata.xml 246 BLAKE2B 65c152b918cef5b72db59bbb3fd1a71a6fd444bbbb3e95a87aa880e23f33d418b96f842f4a2070ad1bbd0c1d1c3753e935841e6fccf088954bb58f297b672dc4 SHA512 9977bb6fcdb8374bf6148fef57fa31bf04fdd8eb3701ecd75be5ea62a48382fb0ef703b3d01bbc996f91322b6fd0f8365dfa4134426770fa98d624d69d8073d9
diff --git a/dev-libs/libev/libev-4.24.ebuild b/dev-libs/libev/libev-4.24.ebuild
deleted file mode 100644
index 85ef89d675d2..000000000000
--- a/dev-libs/libev/libev-4.24.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="A high-performance event loop/event model with lots of feature"
-HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
-SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
-	http://dist.schmorp.de/libev/Attic/${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="elibc_glibc static-libs"
-
-# Bug #283558
-DEPEND="elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )"
-RDEPEND="${DEPEND}"
-
-DOCS=( Changes README )
-
-src_prepare() {
-	sed -i -e "/^include_HEADERS/s/ event.h//" Makefile.am || die
-
-	# bug #411847
-	epatch "${FILESDIR}/${PN}-pc.patch"
-
-	epatch_user
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-maintainer-mode \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	use static-libs || prune_libtool_files
-	einstalldocs
-}
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 7450301bf2a6..8ba6b5576ea9 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,7 +1,7 @@
 DIST libevent-2.1.11.tar.gz 1082234 BLAKE2B c6721589834bff027a8149ee0076e1877fba000d1712a405e20030192d9c81b892d0930bc1a4774650bef4cb08c60ac81b5928dc17346492ae7e4ded2125579a SHA512 9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3
 DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
-EBUILD libevent-2.1.11.ebuild 1658 BLAKE2B 254f8add1a9bdef775072433e2d14e5affb753f5232ec950cc45fa09d9ed7f24a74f71e46a10742fc6488bff01b109cb383a6a1ff22f9819c71e70a5e41f44b4 SHA512 ba9205268ddaf9d5ff35009fb6690d589c9625fb76039be0ff782a4a681d9c379c803390eed04923f89f726d508b19c89fde2e52690d9556c8288c7feabb4ee9
-EBUILD libevent-2.1.8.ebuild 1630 BLAKE2B e1b3f696f4dcdc378d63f5c90a1a0ef89aba84c4f6cdf7090c32c301e1467088cff61129cad6f147855e31783eb505fc46597632f00c8e8af633a961d67bed72 SHA512 6470eae8528b9dcb7f64e7c03d9d8108a435da77cdd4c450ccfbd3651c288bccc09b66f6b81c33e4f4cc97dc59aaf7a81ca26bb694e66516892235b2fdb467af
+EBUILD libevent-2.1.11.ebuild 1685 BLAKE2B ec8083997c5c5c21306306b00efdf5077d66f7895ef366c19abd00a4f83b1b1150e036e0c3fab2117a0ae8d6f9ea80a95e5fbc621a862a544d665451572878b4 SHA512 377dcc47b403d47144dea3a94950ec40ff626b072b36ad028802453a6095ee19b87f7362e3517de8caa9211d0377e13360487d844ee529d04cf6b52b301b6bcf
+EBUILD libevent-2.1.8.ebuild 1657 BLAKE2B 5f81cdcd7242220aac514bb2c4c5516ea1e478bab1c04b18821a1e2ed2ff136f8582415685f4be3600d3172e16f3efc3c4567abcbcfae6621619e318649ae2b3 SHA512 8f185e5cda9f485fdbc1769891c51793e7ab094e1832bda95f32220b442596b106d4cd233319c3463a7c582fa787d25210b12b9c251d0f653fe31a0c75a178e5
 EBUILD libevent-2.1.9999.ebuild 1305 BLAKE2B 700706493970712ee849965e9a43aa4698694793e43316cb041f24dd1a5918f0f9be95f8f831938bc5ce22c8658781b1c8adc9822f1b3048c8317304576716ec SHA512 6833ac30705f79f88d348c4b0fb5a71ae9749be51036a6890a7d3260a92dcc32970aad657eff6400c89e5e786cdd8825bfebf9cb943f2abaef38c0e411c15f0d
 EBUILD libevent-9999.ebuild 1242 BLAKE2B 64d887151fa3290389d91f64142e85b8302c0150ea943197ad0e4b64ff41f07426b573dc7e98d715f9a7c523f12d8b68aa477d4a2ec898189b5f73b0a73ca263 SHA512 54669027b1982f5f538df5f68aa32b91b468c9be132419e532fb7effc97d488417037ed480efd7e008f913724d347f5d037b6c8a2378e7b65489034c55628e57
 MISC metadata.xml 547 BLAKE2B feca63a3b25db4aa0a078b6135188aa7e4250fa9afb207e14c9b02cad83709abe5dace68f5a34cccc0a2a745424c4c044696d0e6021c4c83bcc2666700a8528d SHA512 556eebbb7d05a8234e9705126549520a8b8d553cf6331f353bf7a5bad343b0ad56292dbdda5bccec827772faf07bf17f0163e4b479530eea0832e31d9f17f73a
diff --git a/dev-libs/libevent/libevent-2.1.11.ebuild b/dev-libs/libevent/libevent-2.1.11.ebuild
index e2485b9fa95a..e446b3d11f89 100644
--- a/dev-libs/libevent/libevent-2.1.11.ebuild
+++ b/dev-libs/libevent/libevent-2.1.11.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD"
 SLOT="0/2.1-7"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug libressl +ssl static-libs test +threads"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	ssl? (
diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.8.ebuild
index 85d47d58908c..b16ba6c3ed4d 100644
--- a/dev-libs/libevent/libevent-2.1.8.ebuild
+++ b/dev-libs/libevent/libevent-2.1.8.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0/2.1-6"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug libressl +ssl static-libs test +threads"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	ssl? (
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 5b9a00093340..4a67d6181ff9 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -6,16 +6,20 @@ AUX libffi-3.2.1-include-path-autogen.patch 2901 BLAKE2B 836e61b6f64b9d649e96979
 AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f58265246599d0283bb148f954fb79d8037e37ae332a664f57a201589b89022d63932d8a4e56c4b0c6a7a9a2240ae6602e847fff3a55 SHA512 f387590510ee5e3aedc03744fcf1faae35c105a81d4c2f646e495d489bc6467cd88d4a0a63b40a29fe620ad71db1a05c1fe483af63974222f366135f73f36cb3
 AUX libffi-3.2.1-musl-emutramp.patch 1182 BLAKE2B 44db381b87d3f3f85b60379398b1a1d97437e14a8ab75d1035ee1cf498a6cb79b6d68a3a38d87e9e16ddd74d66a585064831a5e9370227289f2ddd297d90542d SHA512 cfd5106226fa45beaecf3b7eb039d77f5113e393b9e958625b8d015550daaea527365938a97f2ce5286777662df4848d6112961cb76653d8335950a734da43c5
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
+AUX libffi-3.3-power7.patch 1172 BLAKE2B 42408c0774553fde9c086ea3c2b0d0152d15a9dce63860e8884c683ce92553c3db38d6fdddcdee644f7819f56a28a12e639ee05a0956cf0fa3fed521157754f7 SHA512 17062f152ce2aa8d46e4e01c3c0b8e52c67d30c3405b9b2f40656dfe731c774fd67ff3ad397f426d9e56ca4fe4ec4908f5c8f6082d52975cf19171ca4e39c534
 AUX libffi-3.3_rc0-hppa-no-TEXTREL.patch 2821 BLAKE2B fcc7eb0ed4a3f9b31718bf7761de8194a5fff6dc0c32be843e15e3da089ccd3819b656843844475199eb5ecc53312f4ad5c1b26d896df464d077ce15ee32eb13 SHA512 202b0685ecbf058a0414e1f2e673e4c793f5381b5714e5e8f025307068eb48f5c7eb85081859194b4500cbc5b6981f07fb4b6efc866071ea0e64f9231852444c
 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
 DIST libffi-3.3-rc0.tar.gz 1084854 BLAKE2B 2c38d60f17ef52bcf270178c13c218f6ee320c9785091621d4689bcf6cee31d07eaaca12790965e1ae3ad71ad2c408342743968bf1d23f81a07fbdf6cfd55b90 SHA512 e6e695d32cd6eb7d65983f32986fccdfc786a593d2ea18af30ce741f58cfa1eb264b1a8d09df5084cb916001aea15187b005c2149a0620a44397a4453b6137d4
 DIST libffi-3.3-rc1.tar.gz 1122483 BLAKE2B c849f3c20bfb899f6659303bc739e894b842a3e0d85138a73915eafb8b2fe25b8d491f7eb023c735a9acd83933a9aa6cec562ca035513d774f5754c22a786fea SHA512 e1421d1bff8b71433dc06f6397f2f47894180b4f85e0a80b465b3a3edb904921e74be19d8ea15ef40f13275050e4b2c1432b6059372127c74560a4c73f18e18f
 DIST libffi-3.3-rc2.tar.gz 1126497 BLAKE2B 40960c8e8bfb6b266192436a8cbfa7cf5d5e5290b753b3360f965ef28b99fa51fa887845b6a2646b02f4ca4c1472d381df0c63cb64d1412ace737a064c2bbf57 SHA512 d792fea8252e68178ba87a0a53087e46c126129e5c9094ea77ad1b4863e009904bd53f213eaa7f78133e7c5645c280a7523343a7e0b79607a61af90ded4cd36a
+DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
 EBUILD libffi-3.2.1-r1.ebuild 2272 BLAKE2B b954d489dbc91b6e96bfd6184c769721c07a5d42b724b28d7302aea956a787a31267e2fd3fcadc76cd4e5f5b987150da7dceef16cb2f8cd66312a8ad0e444b9c SHA512 ed2e6c8bb1fdb8fcfbb6462deb5488aa8551f431c20f96787eafb9e56ae909a3494203908aa79fbb504b8c27a3c57bdb4c085068abd79c14d6e50640a4c17927
 EBUILD libffi-3.2.1-r2.ebuild 2331 BLAKE2B eddb0fbdd95f528bdac1739e7d401eb595bac249d322e3f59a7409869d8a33cf19d29356c22286afec4fbfc2f05d5249fbc265c48f9b3332b87ef87aef43c6a5 SHA512 d802ce84be1a8da75315c2291f97a48d0cdb7f2f1f39b6bda9a1b52623e0c36c86405a7129fb168a759e6834aeabcb87e86a0af9314ebf0b92539901811b01b3
 EBUILD libffi-3.2.1-r3.ebuild 2386 BLAKE2B 5b3e0429fa498c23aeb3950604089cf51f677229085e7d60b0b02c3413ae3328f6cfd78bdc399bf973d4f56412fde4399ede5584357c92282ea003d1f1712145 SHA512 bf4dbcceecce19e59f197383deb95967482f408f7ee02e2a0f32bb3f62a1a73b1115c0c60774376671aeaa51d03d225d481730f13f4688c697ae74417261d82e
 EBUILD libffi-3.2.1.ebuild 1971 BLAKE2B c0f52976c95a892d9537d9834b4b1624f9ad99054990f3cb83548778eb05f882c79483be9ad900397e19c42d05c5d3038effaaffefc4a13f32d19d25ba07f23b SHA512 2d784dc96c51b78238a02de4570ef479aa54bca77e2b704f030c05a3e534285cb4dae44979c2c684b60aa030df5676a02ced2b3ad4e945e58697d8a872e46ba5
+EBUILD libffi-3.3-r1.ebuild 2713 BLAKE2B b28474075c916f1a0b41069782f54477a277b97f7c171cabf153236e3ffbc635dfd188279dd571a84a7af6dc7982d61b84df0d6bb6c119a53ba07c79707d7df6 SHA512 67adf25a459d4788d917463c3a43bb5f82b22a29eefbe2eb582a652c4fcf2a078afbaba5284765efe8a49d93043f14f5a87535f27bd582aaec9e9469f44c5de6
+EBUILD libffi-3.3.ebuild 2189 BLAKE2B 3317970c1d2b634eaa24f267efe66b1d2e25b41d2a016429ba4e1182f7fc4af89e50ddf220685831bb55e9e09550be7bbd640e3e33b94d9f32c4118af1aeed2c SHA512 7ae2bf15d3952120ac022578a41603fa93c8838415077882b716718df2e60763dc780d239f1ee90ca1b53be30508dc903d18d5a88e2c05cbc9b418224b0b2c26
 EBUILD libffi-3.3_rc0.ebuild 2046 BLAKE2B ff84c9c3acd60f0fb191c0447987cdb3410e739456c94d8248e0a66b721fa74e5c5518a24a8edb008e1606e2d8b32b251154d9b6a8eeb84edb86c7b9bee9c4d6 SHA512 f8ca97d42cdb4da9c372424f64d4246fc85d0bbd8c2422a0c577e7d1db3759dc68c316a277b7fe6911ea1b8c56135a0297a01a4b59e5f3265f6bc3e79651f6e2
 EBUILD libffi-3.3_rc1.ebuild 2006 BLAKE2B ed7da466fbf5ff5d0736544ef4d656f869c57472289a4e130d44e4d77757947427c1ae1d603a3f5a972c3bda1cb4b2347d7a1655c70b236fc621275dc10ce346 SHA512 cebfc9c5c6aa0a0b99832d482afcef6f78f12cfe1b7c61b9dd353b7c120ae5b2c2317f5a6b2154d5e886e5f324381bfdfd15f52337732b204f00f4f72a83ced8
 EBUILD libffi-3.3_rc2.ebuild 2189 BLAKE2B 3317970c1d2b634eaa24f267efe66b1d2e25b41d2a016429ba4e1182f7fc4af89e50ddf220685831bb55e9e09550be7bbd640e3e33b94d9f32c4118af1aeed2c SHA512 7ae2bf15d3952120ac022578a41603fa93c8838415077882b716718df2e60763dc780d239f1ee90ca1b53be30508dc903d18d5a88e2c05cbc9b418224b0b2c26
diff --git a/dev-libs/libffi/files/libffi-3.3-power7.patch b/dev-libs/libffi/files/libffi-3.3-power7.patch
new file mode 100644
index 000000000000..83f518f4c2e3
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.3-power7.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/701128
+
+From 2138adb2a5b6a0bc2fe3518e0645eacc89b6f392 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Thu, 28 Nov 2019 00:02:42 +0000
+Subject: [PATCH] powerpc: fix build failure on power7 and older
+
+Build failure looks as:
+```
+libtool: compile:  powerpc-unknown-linux-gnu-gcc \
+    -O2 -mcpu=powerpc -mtune=powerpc -pipe ... -c src/powerpc/ffi.c ...
+In file included from src/powerpc/ffi.c:33:
+src/powerpc/ffi_powerpc.h:65:9: error: '__int128' is not supported on this target
+   65 | typedef __int128 float128;
+      |         ^~~~~~~~
+```
+
+The fix avoids using __int128 in favour of aligned char[16].
+
+Closes: https://github.com/libffi/libffi/issues/531
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/powerpc/ffi_powerpc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/powerpc/ffi_powerpc.h
++++ b/src/powerpc/ffi_powerpc.h
+@@ -62,7 +62,7 @@ typedef _Float128 float128;
+ #elif defined(__FLOAT128__)
+ typedef __float128 float128;
+ #else
+-typedef __int128 float128;
++typedef char float128[16] __attribute__((aligned(16)));
+ #endif
+ 
+ void FFI_HIDDEN ffi_closure_SYSV (void);
+-- 
+2.24.0
+
diff --git a/dev-libs/libffi/libffi-3.3-r1.ebuild b/dev-libs/libffi/libffi-3.3-r1.ebuild
new file mode 100644
index 000000000000..2377c7956365
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.3-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib multilib-minimal toolchain-funcs
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions"
+HOMEPAGE="https://sourceware.org/libffi/"
+SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/7" # SONAME=libffi.so.7
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug pax_kernel static-libs test test-bhaible"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="test? ( dev-util/dejagnu )"
+
+DOCS="ChangeLog* README.md"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044
+	"${FILESDIR}"/${PN}-3.3_rc0-ppc-macos-go.patch
+	"${FILESDIR}"/${PN}-3.3-power7.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+ECONF_SOURCE=${S}
+
+pkg_setup() {
+	# Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example
+	if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then
+		local base="${T}"/conftest
+		echo 'int main() { }' > "${base}".c
+		$(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null
+		if [ $? -eq 0 ]; then
+			eerror "The linker reported linking against -lffi to be working while it shouldn't have."
+			eerror "This is wrong and you should find and delete the old copy of libffi before continuing."
+			die "The system is in inconsistent state with unknown libffi installed."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	if ! use test-bhaible; then
+		# These tests are very heavyweight (hours of runtime)
+		rm -v testsuite/libffi.bhaible/bhaible.exp || die
+	fi
+}
+
+multilib_src_configure() {
+	use userland_BSD && export HOST="${CHOST}"
+	# --includedir= path maintains a few properties:
+	# 1. have stable name across libffi versions: some packages like
+	#    dev-lang/ghc or kde-frameworks/networkmanager-qt embed
+	#    ${includedir} at build-time. Don't require those to be
+	#    rebuilt unless SONAME changes. bug #695788
+	#
+	#    We use /usr/.../${PN} (instead of former /usr/.../${P}).
+	#
+	# 2. have ${ABI}-specific location as ffi.h is target-dependent.
+	#
+	#    We use /usr/$(get_libdir)/... to have ABI identifier.
+	econf \
+		--includedir="${EPREFIX}"/usr/$(get_libdir)/${PN}/include \
+		--disable-multi-os-directory \
+		$(use_enable static-libs static) \
+		$(use_enable pax_kernel pax_emutramp) \
+		$(use_enable debug)
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+	einstalldocs
+}
diff --git a/dev-libs/libffi/libffi-3.3.ebuild b/dev-libs/libffi/libffi-3.3.ebuild
new file mode 100644
index 000000000000..8e60ade28961
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib multilib-minimal toolchain-funcs
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions"
+HOMEPAGE="https://sourceware.org/libffi/"
+SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/7" # SONAME=libffi.so.7
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug pax_kernel static-libs test test-bhaible"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="test? ( dev-util/dejagnu )"
+
+DOCS="ChangeLog* README.md"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044
+	"${FILESDIR}"/${PN}-3.3_rc0-ppc-macos-go.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+ECONF_SOURCE=${S}
+
+pkg_setup() {
+	# Check for orphaned libffi, see https://bugs.gentoo.org/354903 for example
+	if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then
+		local base="${T}"/conftest
+		echo 'int main() { }' > "${base}".c
+		$(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null
+		if [ $? -eq 0 ]; then
+			eerror "The linker reported linking against -lffi to be working while it shouldn't have."
+			eerror "This is wrong and you should find and delete the old copy of libffi before continuing."
+			die "The system is in inconsistent state with unknown libffi installed."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	if ! use test-bhaible; then
+		# These tests are very heavyweight (hours of runtime)
+		rm -v testsuite/libffi.bhaible/bhaible.exp || die
+	fi
+}
+
+multilib_src_configure() {
+	use userland_BSD && export HOST="${CHOST}"
+	econf \
+		--includedir="${EPREFIX}"/usr/$(get_libdir)/${P}/include \
+		--disable-multi-os-directory \
+		$(use_enable static-libs static) \
+		$(use_enable pax_kernel pax_emutramp) \
+		$(use_enable debug)
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+	einstalldocs
+}
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 0e876a6b73cc..a9fb5fde2151 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,13 +1,7 @@
 DIST libfilezilla-0.15.1.tar.bz2 404746 BLAKE2B 644f4b8949670d5b07f9e7b861d388ce70eae6612e34bf938cb628b65724a527e33c1f039087fd8381c06a15c12cc2b4fc6f616cc5949bf325e2eebf41abdf2d SHA512 d557f7636bfc3958b8558fab3384b0ea84caea594566d39c051f20f02dfd71213369c50df282a3f7d2dd757038bd26e9722214839dab965cb7cde9733d59883a
-DIST libfilezilla-0.16.0.tar.bz2 413535 BLAKE2B ea6ce80e272efea3fcef2fbd1f0ecca1248c314eea49631b4a98d257cfe1ebe505de011c021874ab0158883077d0af61929689ffb2b92528ef50502d84c933a7 SHA512 ea3302ae0c51582d6715fa3dd06d330a2ac820c3229b4dcab4a3470021dba667b6aea1a5b13168d720d7218cc8513e40c97990ed6573d0ea46d76e6ef50c2e6e
-DIST libfilezilla-0.17.1.tar.bz2 517778 BLAKE2B d678675b2fafe80e2f0e54af372220194870460c1eeaeb91ae6709ad8addcfbb6326819bbaf1d3782e391b07172f94783b0d8a3405f54bad3f818c72426b5047 SHA512 c9c88bf3cbeb5284c3e55571b40b07f780cb23aeb802284d385a2564bf46396875a34739f9819b0c3f89923950f19a13f6454940434a987bb91b2f23b898f774
-DIST libfilezilla-0.18.0.tar.bz2 526221 BLAKE2B f2bc8610a2bba6e296a0bcdd0ae52f4c03dae14c5ff85db89c15fdbd4981bb1cc0001072b59ccd543968c96f08ccf7f59c14ae7ec24c9c539a653bb321908a81 SHA512 745039ca0123516bc58a7057117386fdaed8956b7612b331ffd10f3c7b6c739c47c9c90261ccaf5f7862662775f6b0b467891731ae30c5976d36a0cfb0102455
-DIST libfilezilla-0.18.1.tar.bz2 526448 BLAKE2B e4d709096db184072b9038cc85265fc8a16049ac2c460a45717d8386dfb36ffac17b75141565de2cfb1f37b08bc0c23aac348181ac34ef7ecd8014e543f1fdaf SHA512 b1077a48575ec6bd99cb01a21171fdec4ea662bb4ecb568cb547c6401164854588801cdc4ae80d62809534d2b04d42dcc3f7325bf57af0e2e737a4ca9f15032e
 DIST libfilezilla-0.18.2.tar.bz2 526968 BLAKE2B 81b27c18e9c04e2277dbe7a2fa2bfe3c1fa7c1f9c27eaf5cc02f309a15e9b61e71e5a67aa359c7bb36b27335f008cfb58641adcb42745ac00b9ac9eb2c649cde SHA512 6f165a008ea8e3090554070685ef042b5304a8e7fdeb9f16c81a01c00b5fcb3d4acd356cfaf3fc1189c04db0b726dd005c592f6c7c6b06a527d8b82e7890257b
-EBUILD libfilezilla-0.15.1.ebuild 892 BLAKE2B e93ea6ffe19681a690f1fc9df8f811b1245c35a6e5cfbf6f553fe88355382c7ff362aeb97a3f323c56faf5a4855c2e582a162bd8ccf961022a776dc23cfe024e SHA512 fb897a916e059235c8daef7eefd6a52a67623a7b7048a5f132cc91190c514209663808d525ed5f0607ad82a8b208238d3d78e57a154aadff0cab9e9b474b93dd
-EBUILD libfilezilla-0.16.0.ebuild 894 BLAKE2B b8e4add077c17fefc6ac06c0430ab72daaa389fa41477b62176512919b91dd20b7d82775d9af0c0ad520f992bdd9402d35db91c7dd570d9ee604ba477281a0b6 SHA512 054e46acaa485b9b2b109fb5a5d9046de22a3ee1db8f585e784d0e8e9a9e37eda4b7b8589f9446acfa216341c5f53328c1cb514954711d3ff11ddadce03558e2
-EBUILD libfilezilla-0.17.1.ebuild 924 BLAKE2B dca7cc4d3375a4efa42c56b80fbc9cdf08b9bd7b15f7df34fd3dc95cef57c6d00b6b4131a51d43032b761907cc50b3b362c9718b136f419d5760e1b824fe73c7 SHA512 9e075a5b597f488808284ed653d4a5f6251a58bba203ef9933331598bf6eff70c85301a5cd75fe77ecd8d8c56a90a2183fa6b82b46d45e72de2ac4c048d28537
-EBUILD libfilezilla-0.18.0.ebuild 1023 BLAKE2B cf5d65ea1a6178922c004a9ff6a0eaa853855844516891f40143d491831b7d5aceb6fa3138994c7b6b2e59ffaeef4e16aaa60dd0f47c9963e8d5f61a357e18a0 SHA512 798afdf395ccd2ea8b542877ca7828a59f920082e48b74405aeb4012cc86a2c1913b970c79f857363cf6a3326edae2c5530ff65bd53e0bd8069905fe01262603
-EBUILD libfilezilla-0.18.1.ebuild 1023 BLAKE2B cf5d65ea1a6178922c004a9ff6a0eaa853855844516891f40143d491831b7d5aceb6fa3138994c7b6b2e59ffaeef4e16aaa60dd0f47c9963e8d5f61a357e18a0 SHA512 798afdf395ccd2ea8b542877ca7828a59f920082e48b74405aeb4012cc86a2c1913b970c79f857363cf6a3326edae2c5530ff65bd53e0bd8069905fe01262603
-EBUILD libfilezilla-0.18.2.ebuild 1023 BLAKE2B cf5d65ea1a6178922c004a9ff6a0eaa853855844516891f40143d491831b7d5aceb6fa3138994c7b6b2e59ffaeef4e16aaa60dd0f47c9963e8d5f61a357e18a0 SHA512 798afdf395ccd2ea8b542877ca7828a59f920082e48b74405aeb4012cc86a2c1913b970c79f857363cf6a3326edae2c5530ff65bd53e0bd8069905fe01262603
+DIST libfilezilla-0.19.1.tar.bz2 539952 BLAKE2B a581964a34c9104543eb06579e1f1b816b0f47e6ef3af0de9aa0b7528665ca0ac17ddf3c5327a434b8e344bdde5602f1b7a71b7cc755367e750c88de06329335 SHA512 1342a199e4bdc211437deaa4ff34fe7f7de476a664b1ea4dc8df0482db98eb6c21e03f9c7b510bc00c81f6dacd7fdec2fa721554fe6e71c5bb2763618759b1a1
+EBUILD libfilezilla-0.15.1.ebuild 920 BLAKE2B 0f9101255067d3dd17f4048716b25ac12e9270db414208ee23911d644140f0d8a1bf446f07a6b67f3aab679403a87a0a3e7c569922cbe4ffcf7c9c0ef9d846a1 SHA512 5a6b773f29312f2b7557ba02404124040c4272328c51df45a00eef2ba8ec6ec72517116d501ddb7307b30b0216dabb94c42690bbc72fd96ac436c8684e423215
+EBUILD libfilezilla-0.18.2.ebuild 1051 BLAKE2B 06f0455b9a48fd2b1eb8f1a6437260efc74ca81b07f18124db2c99311c5ae3bbe416226f70c72f9732c71ceab52041138dd8a64ef3bd923d07658db409330080 SHA512 428fd7bc6c28d76db19f568edb3cd4f3e6528320e62f6da78408a57d34fdb31d4aad2f91da49f33634e29fbc6f7d443b01998a53d9ee599090094bd7940c5558
+EBUILD libfilezilla-0.19.1.ebuild 1080 BLAKE2B d046a5ab623d32c7dfa351fd168e4041650f9248e1099698dd04b8ddaede2eee71ca34078827b4f723d6b2abc02889985e6759073e054f1470453aa96aaeb736 SHA512 b4d226e728d68cbb97faaf22282869d59d506e91a0014a0164a35f1df394e53f58ed91cfbf0a7595f0c32177d3fd618bb75c1085d9260339df9e1228dc84acaa
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild
index 742bc805a500..feb0bb75f49d 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.15.1.ebuild
@@ -13,6 +13,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ia64 ~ppc x86"
 IUSE="test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="dev-libs/nettle:0="
 DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )"
diff --git a/dev-libs/libfilezilla/libfilezilla-0.16.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.16.0.ebuild
deleted file mode 100644
index 18821af9ca46..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.16.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="dev-libs/nettle:0="
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.17.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.17.1.ebuild
deleted file mode 100644
index e0aef7739c68..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.17.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/nettle:0=
-	>=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.18.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.18.0.ebuild
deleted file mode 100644
index 7ed54fcee7d1..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.18.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/nettle:0=
-	>=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! test-flag-CXX -std=c++14; then
-			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
-			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
-			eerror "to gcc-4.9 or an equivalent version supporting C++14."
-			die "Currently active compiler does not support -std=c++14"
-		fi
-	fi
-}
-
-src_install() {
-	default
-	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.18.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.18.2.ebuild
index 7ed54fcee7d1..1d6a0fa81fe4 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.18.2.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.18.2.ebuild
@@ -13,6 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
 IUSE="test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-libs/nettle:0=
 	>=net-libs/gnutls-3.5.7:=
diff --git a/dev-libs/libfilezilla/libfilezilla-0.18.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.19.1.ebuild
index 7ed54fcee7d1..b2a9ba95a24a 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.18.1.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.19.1.ebuild
@@ -9,10 +9,12 @@ HOMEPAGE="https://lib.filezilla-project.org/"
 SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
-SLOT="0"
+SLOT="0/2" # libfilezilla .so version
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
 IUSE="test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-libs/nettle:0=
 	>=net-libs/gnutls-3.5.7:=
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 42539c532670..010eab1ae7f3 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1,14 +1,12 @@
-DIST libfmt-4.1.0.tar.gz 620863 BLAKE2B ff3a7db5a1eed3a6fc936be16caf2dd153d9452df16c07d6e0dc718bcfb9f51f52146498cb3f49591f1ad96d36a9561de2a78426d3bb8a0907b772e8be5a6f7f SHA512 8daaa4a61bfe63345a12df0a9bca0b1cd6a162d0f4e97d2d2978ae19a1a1357ec4d4cce948ce726cdbe9403e51ad995950a2a99de28f9b9085c02ce845540b22
-DIST libfmt-5.1.0.tar.gz 641502 BLAKE2B 8507e875a78de2e89b7fe2c1c049691bfef6e0a7375ef7958e2191bcc4c60972b54b6ebc213d1465826af8322d8f90b217c1c7e176b29351c733184ff95cca40 SHA512 b759a718353254fa8cd981e483bf01a45af0fc76901216404ace5e47f5d3edf43d42422184e5413c221e49832322fdf60d1860e8ec87349c674511064b31e5d6
-DIST libfmt-5.2.0.tar.gz 648061 BLAKE2B a2ffe84277097f3cd5bfa163fa12e352349ab8239ab00f071cc0236bdea0c7c15b3c04f40036006fbe6ed231ff19d53abcba7c5dec709e5ac418ad41cc489d4e SHA512 75d53e6d8087288607f75fb891bb8812c7b9fe65e5ab7a20cdffeb5e56bd1f48e0de24c8cf1c2dd603fe3ed76f9fa067804ec5d3560f177db8f0a747c36f9d1c
-DIST libfmt-5.2.1.tar.gz 648668 BLAKE2B 516522d4e75e7ccdf95a43bfe1b5f95b8ce8ef0174d6b82d6b7be9985f084228a69e70ecba7f57788d536501699b584cb4eb51d7894b416ea857727b776b3823 SHA512 2b63a741df4df9c3cbf04098c6548bb3d0f9836fe912325542298df57c888f43e72159469fb87685b423694e43e4418545377d5ee6393f2709955be2c13780a8
 DIST libfmt-5.3.0.tar.gz 662493 BLAKE2B 462c54c227132b2398977ff575f74e63e973825968b106e09cb0f3da859f1d851a6dd1799c05e3ae6adff2ac972f4af259c42fdf8429346b2830134571c31480 SHA512 9ef0f3d328681253c1e1776576d54d67dec49c19fd7fc422ae63c3610b01a3f05f6e83cdf5e913dfd09bac42e52fe35c38ebe1ea91f4207d226a32aaf69eb4a8
 DIST libfmt-6.0.0.tar.gz 708425 BLAKE2B c04fb7f701e98442848a36489b09eca3dd64f736f668f04173db3afe77da6d933f5f13a2fe38489a5880fa1e4d8549dd34acc9fa37fbb0d6cdee3b6598610726 SHA512 7deb5bd843ae6b9d4b58dca9c68c1cfe7b55a41040f358247f5309655188d1ae194ff414437c068f74367f078faa214b5883e8c9e634c7623dcda50850e24766
-EBUILD libfmt-4.1.0.ebuild 770 BLAKE2B d629242c9a6109b42955a371589ad62ab163efa8b8b1ddbec61fd126af1368e704e2dc310bd48f9c829d81a56781d3610b63f0831c0879944788231293c00daf SHA512 b0962102dcc508761ea630c58e2e124fb0d2470f6b63fc527901ca8d5b80d3478c327dd1b4980055b295833aac85c2fc7801e87409842f7b7f17781782f037ae
-EBUILD libfmt-5.1.0.ebuild 770 BLAKE2B d629242c9a6109b42955a371589ad62ab163efa8b8b1ddbec61fd126af1368e704e2dc310bd48f9c829d81a56781d3610b63f0831c0879944788231293c00daf SHA512 b0962102dcc508761ea630c58e2e124fb0d2470f6b63fc527901ca8d5b80d3478c327dd1b4980055b295833aac85c2fc7801e87409842f7b7f17781782f037ae
-EBUILD libfmt-5.2.0.ebuild 755 BLAKE2B 2ceb89cf2e1db3ef548990b964342d5a9eff64c1aae76fba5f51b4500e220aa7fdf01e82932e4c81c76f0d7f60197ebce6d2314d8c6615432a6ac50a94184219 SHA512 6f4f4e1517a8ac5fee554e9128eeaa2695d8c65e72c57791910ff559c90023d68878d9af1966073bbcfd32c84ae596de05a6e4f6b3832eec2b927c04ebe9f9bd
-EBUILD libfmt-5.2.1.ebuild 760 BLAKE2B 353e6f862d50c681961f7a2dd7c3f8ab9abd04fc8189fb6b26bbdb698d652cdd4ed089b26e6421701108fa84e9585f1e329e175b097c366e13836c8d037ddfe9 SHA512 54007b3096d54918868e21a9f7f15706855b16f29df8a63793e5b740178a087872121989abc00f3c411e6192f9570bbca8ba10d6d78074b0edf8e6025e7ea479
-EBUILD libfmt-5.3.0.ebuild 765 BLAKE2B 1a3afb97bd66f948b9d123422f352a49623ba07aa615d8a909e413da71b261df8f5f3d01c1424bcd5d88746127e9d24f796c0f376a2e6a36becdd7dcf52f1702 SHA512 52763fa9d886af7aafbac4c9024b1389d536c4b0e41089382a4fd4537ce640539521c121850c78d23f2d4a1b65ff124fb0c447411ba0a2045c126196d5a2c16f
-EBUILD libfmt-6.0.0.ebuild 767 BLAKE2B 76565ac2fe5b3e35c21a22f0a17e033a209a3385905333620189a05e90762e9b1352ea601c8f146ef0994232a931014b332a29ae8594ee4c0fb186385dbd0d52 SHA512 34e168525043d359ecac5f839d110160468af5b7d36330eff393d62f1380501040016f1ed249b21af0de38867054345600ebe3ac40d5cb8d530ea49a307bcc48
-EBUILD libfmt-9999.ebuild 767 BLAKE2B 76565ac2fe5b3e35c21a22f0a17e033a209a3385905333620189a05e90762e9b1352ea601c8f146ef0994232a931014b332a29ae8594ee4c0fb186385dbd0d52 SHA512 34e168525043d359ecac5f839d110160468af5b7d36330eff393d62f1380501040016f1ed249b21af0de38867054345600ebe3ac40d5cb8d530ea49a307bcc48
+DIST libfmt-6.1.0.tar.gz 722127 BLAKE2B 2916293ebaff27a06f22e3c99bc1aee835d633a2b2eaa06d50dadff54f7ee20ed32c6e642f607274fdeeaf647a6aef03fde454555fa90c3ad790bb1be9c88a24 SHA512 51ee5fbe0ae7f9427289b7de37192652f16c63dd5fbf2d52dbf34e89d690ccd7ca5fd7962774d27a2d80fb1ccfa6836c171b519cfa0c41367772ebf8ef1fa81f
+DIST libfmt-6.1.1.tar.gz 722236 BLAKE2B 5497a89af4511d4b8356757fed17c5dc8bcc66cb60c85e2dc05db524a5eb5ae0247347bd3c6ca61edd12f0a469c26477de95290f977cf27f2413ba91d39dafdc SHA512 8018bec519ce788331c8be8d51a19d4eaceb6a2f33d6618ebe78d953fbef28a70d5b61f0db1c051cbe1e0ee26f3c09197caac196a4c20d1b6abd7f86619f5fef
+DIST libfmt-6.1.2.tar.gz 723160 BLAKE2B 36e7451a8732c62dcbf47e6d287ea582827b6196a468b8648803ea1bc9a37a5f681d87488f748d749183d97783ac7fb47a3f2aeed64fc6a684f9ee85b67ae28d SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7
+EBUILD libfmt-5.3.0.ebuild 792 BLAKE2B 2bc5485380c222af65a0948098394feb750838d19340b393bb23b51670a052082a24d8fc48250041f4199e7bc21fe55c2202d029097bb7eaf034d6cd266aae43 SHA512 340b90b24035993670dc769a5a47cc009c8017afbc0ae3e5de4167e4973b267688d40c19c2a4a49c74fd5ff3472203e071522916d523925ccd2a8a492ee8e618
+EBUILD libfmt-6.0.0.ebuild 794 BLAKE2B 2374647258e8637df110fd3e64e0faea4dbac55f86fb87a90ce0c2c17dc528dbf5117556dd57f1c74875d4e366cfdc3d5f5d2db9a826904dc636fcc92c95c22c SHA512 f6f8e396dfe3078ad5162a9ad79c4458056043a898140ea40613493f85e779dc39a98bb1726c798fcc7e1f88d029607be997935326b45cca49681b775ca075d5
+EBUILD libfmt-6.1.0.ebuild 794 BLAKE2B bc77dac18fca1d127abf1c8848f5d7e7b40161d593456dd3ae35081d13dc0c7df559e2209907feb37f1005f94e61f90f36d04654a9e3e21bce15473284eadc87 SHA512 b13417fa0946fa41a0e8f80f5ea30b5b23cd641ef023a72a393c7b07fba9843bff7f445a605665f07f089f8ce912ebaaa6149a93756d1750ea7fce23c18367d2
+EBUILD libfmt-6.1.1.ebuild 794 BLAKE2B bc77dac18fca1d127abf1c8848f5d7e7b40161d593456dd3ae35081d13dc0c7df559e2209907feb37f1005f94e61f90f36d04654a9e3e21bce15473284eadc87 SHA512 b13417fa0946fa41a0e8f80f5ea30b5b23cd641ef023a72a393c7b07fba9843bff7f445a605665f07f089f8ce912ebaaa6149a93756d1750ea7fce23c18367d2
+EBUILD libfmt-6.1.2.ebuild 759 BLAKE2B f76040556b50ffa04e6d4bcac49c91e9d36379da0a46c0c6bcff9d86b46f9f9946cb7be7f85758139b1d4b793d5fb955f50905e05192311fa5060b1f62dd4732 SHA512 063cc13c83c9ac642f6a914a0b58a1624999f18e4c417577301b8bca954b404da41d2e39a512916d1d07e8677614e60915fa978b9e37aa7fc4202b8c5c31adea
+EBUILD libfmt-9999.ebuild 759 BLAKE2B f76040556b50ffa04e6d4bcac49c91e9d36379da0a46c0c6bcff9d86b46f9f9946cb7be7f85758139b1d4b793d5fb955f50905e05192311fa5060b1f62dd4732 SHA512 063cc13c83c9ac642f6a914a0b58a1624999f18e4c417577301b8bca954b404da41d2e39a512916d1d07e8677614e60915fa978b9e37aa7fc4202b8c5c31adea
 MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
diff --git a/dev-libs/libfmt/libfmt-4.1.0.ebuild b/dev-libs/libfmt/libfmt-4.1.0.ebuild
deleted file mode 100644
index 205d52c52e72..000000000000
--- a/dev-libs/libfmt/libfmt-4.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib versionator
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="BSD-2"
-IUSE="test"
-SLOT="0/$(get_major_version)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-5.3.0.ebuild b/dev-libs/libfmt/libfmt-5.3.0.ebuild
index 4c49e01f573f..c8550ae57056 100644
--- a/dev-libs/libfmt/libfmt-5.3.0.ebuild
+++ b/dev-libs/libfmt/libfmt-5.3.0.ebuild
@@ -10,6 +10,7 @@ HOMEPAGE="https://github.com/fmtlib/fmt"
 
 LICENSE="BSD-2"
 IUSE="test"
+RESTRICT="!test? ( test )"
 SLOT="0/$(ver_cut 1)"
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/dev-libs/libfmt/libfmt-6.0.0.ebuild b/dev-libs/libfmt/libfmt-6.0.0.ebuild
index 9bb4ee093042..20f7a7d84f93 100644
--- a/dev-libs/libfmt/libfmt-6.0.0.ebuild
+++ b/dev-libs/libfmt/libfmt-6.0.0.ebuild
@@ -10,6 +10,7 @@ HOMEPAGE="https://github.com/fmtlib/fmt"
 
 LICENSE="MIT"
 IUSE="test"
+RESTRICT="!test? ( test )"
 SLOT="0/$(ver_cut 1)"
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/dev-libs/libfmt/libfmt-5.2.0.ebuild b/dev-libs/libfmt/libfmt-6.1.0.ebuild
index 9620f7502597..cf60d148a150 100644
--- a/dev-libs/libfmt/libfmt-5.2.0.ebuild
+++ b/dev-libs/libfmt/libfmt-6.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
@@ -8,7 +8,7 @@ inherit cmake-multilib eapi7-ver
 DESCRIPTION="Small, safe and fast formatting library"
 HOMEPAGE="https://github.com/fmtlib/fmt"
 
-LICENSE="BSD-2"
+LICENSE="MIT"
 IUSE="test"
 SLOT="0/$(ver_cut 1)"
 
@@ -17,12 +17,13 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
 DEPEND=""
 RDEPEND=""
+RESTRICT="!test? ( test )"
 
 multilib_src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/libfmt/libfmt-5.2.1.ebuild b/dev-libs/libfmt/libfmt-6.1.1.ebuild
index 932e58c0ce52..cf60d148a150 100644
--- a/dev-libs/libfmt/libfmt-5.2.1.ebuild
+++ b/dev-libs/libfmt/libfmt-6.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
@@ -8,7 +8,7 @@ inherit cmake-multilib eapi7-ver
 DESCRIPTION="Small, safe and fast formatting library"
 HOMEPAGE="https://github.com/fmtlib/fmt"
 
-LICENSE="BSD-2"
+LICENSE="MIT"
 IUSE="test"
 SLOT="0/$(ver_cut 1)"
 
@@ -17,12 +17,13 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
 DEPEND=""
 RDEPEND=""
+RESTRICT="!test? ( test )"
 
 multilib_src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/libfmt/libfmt-5.1.0.ebuild b/dev-libs/libfmt/libfmt-6.1.2.ebuild
index 205d52c52e72..fc0c0c0b8bef 100644
--- a/dev-libs/libfmt/libfmt-5.1.0.ebuild
+++ b/dev-libs/libfmt/libfmt-6.1.2.ebuild
@@ -1,35 +1,35 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-multilib versionator
+inherit cmake-multilib
 
 DESCRIPTION="Small, safe and fast formatting library"
 HOMEPAGE="https://github.com/fmtlib/fmt"
 
-LICENSE="BSD-2"
+LICENSE="MIT"
 IUSE="test"
-SLOT="0/$(get_major_version)"
+SLOT="0/$(ver_cut 1)"
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
 DEPEND=""
 RDEPEND=""
+RESTRICT="!test? ( test )"
 
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
 		-DFMT_LIB_DIR="$(get_libdir)"
 		-DFMT_TEST=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
 	)
 	cmake-utils_src_configure
 }
diff --git a/dev-libs/libfmt/libfmt-9999.ebuild b/dev-libs/libfmt/libfmt-9999.ebuild
index 9bb4ee093042..fc0c0c0b8bef 100644
--- a/dev-libs/libfmt/libfmt-9999.ebuild
+++ b/dev-libs/libfmt/libfmt-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-multilib eapi7-ver
+inherit cmake-multilib
 
 DESCRIPTION="Small, safe and fast formatting library"
 HOMEPAGE="https://github.com/fmtlib/fmt"
@@ -23,13 +23,13 @@ fi
 
 DEPEND=""
 RDEPEND=""
+RESTRICT="!test? ( test )"
 
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
 		-DFMT_LIB_DIR="$(get_libdir)"
 		-DFMT_TEST=$(usex test)
-		-DBUILD_SHARED_LIBS=ON
 	)
 	cmake-utils_src_configure
 }
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index ee920aae8ec5..1d7c0173f73a 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -3,7 +3,7 @@ AUX libgdata-0.17.9-ax2019-compat.patch 788 BLAKE2B f08605ae9ba096ed20b08c324727
 DIST libgdata-0.17.11.tar.xz 843948 BLAKE2B 8be79ea5840a585c5bdd5b51aa99401aedce0562ceaa98c7e323cdb2354384db635288d05c740993da49fa9c60c2cafab4e7c43ab82de4295afc0ca6b690d4dd SHA512 5abb00e6ebee1010fb6d9eab675e03d94883cac88e42b403a7d750bff73d65d0b35aae5c9e8f17a182819193b4a049ac7e9fc644ad9fa79872924ed5704c8982
 DIST libgdata-0.17.8.tar.xz 1464812 BLAKE2B 787b5d6e4a62e70f76ca4080fb5c3ff1e7d68745f388be646dd980ef8be18275997bca46a1f3639c9457c8310f9c3f4cd34892be88db284a9ee5e5f43e9723fa SHA512 dfc4c825a7053a6fd7659d04c7077bed8539b4cf3ef3da1d5ece4da3ce17941900e960a300a50b284010ed890dcab87e4c4726403f04481c672832fd34b975b0
 DIST libgdata-0.17.9.tar.xz 1434700 BLAKE2B e0b10bdd962aa5d294d75c15c3aa9187342cd85b9a28816fe5628864bc2236e10ee2765ed8123c8b90422f0394b342a2a144dc7ef844486193c8eec2a46cb17f SHA512 90289309cbdc4ec6932bf385ddbfcc75c0c2f8b9ca356329298aaa37f6c3db7a16de20e5c947c16c595e43e729a664e4d6d3e2c5a60bb1e463a13d1306f374ce
-EBUILD libgdata-0.17.11.ebuild 1775 BLAKE2B 047b7f3547fcc2f530d7616804842893e0d8e5ec04de8cdc1113b930e53af2e78c6c9658954d638f9411dddc06423c3d36913d287af97d8d4cf0bd6b5ee2a6f6 SHA512 714ad2a22a09d99c09afefd6d9a2e5aa279678d624f7c9e7bcc7dbfadc29efc143d534cc9334aeec026bf0ff3c1b64c8877ff9463b3130b7022599803b0847e4
-EBUILD libgdata-0.17.8.ebuild 1641 BLAKE2B 8bab41b7e782b93b1c0be447f60aea096d9b18284c4e684034cf7475be39db2751f34c9c80791396c39a95ce3df16da72573bc979c18ee21793306a1f1c5cb6d SHA512 7bce4dfccc02a77a70f0d1ecd8e1c6d121016004138917fa5505aa2cdc33205e5665c367aee3b3b45ee7524ffe041c8f3a561e8c11e835d213fd01f2a2910b6e
-EBUILD libgdata-0.17.9-r1.ebuild 1755 BLAKE2B 1ad712e61fd4e87765588c399324cb6955bcbd46490f5d0e246d0001f44737729c8d2beb751131b7e504cb181420c1f3681a633ef2725c49ab0c4f9c03e6ba0d SHA512 5a12a0a05f2cd95f659cc301af235ab6a4bd8cd90a111de8c73dc9a98f3567abf604155100d31dbb77d30c384156b470749b6694f8e9f9b94171e43e28e671df
+EBUILD libgdata-0.17.11.ebuild 1770 BLAKE2B cf75a24efc2d0b566be32c8ee8464c6492431056858c855d96c76d7cde875adaa4b783f8f8b0e8453d546574575722b32681731d7a1736aa550e8645f82f1779 SHA512 51b10ac2b62516a13fadee17c248f128fb0c2de8f35eb4541ee38a19f1091a6e4eea81f8c00f440a7705aa5124ca5a090cb3a8c45b64e9c580b4620db7b7b475
+EBUILD libgdata-0.17.8.ebuild 1665 BLAKE2B 2aee51b2982a4fb07ffc40ad745671a845a8f816b3a0e042b4145e4aec7ff5fef0c0321e22557f6dfc535794ebdfaf686514a77412d4248f681c40d3a678c477 SHA512 fc401b1ea9bbd5c5550577b91313d66fd149c5d8f34e85d05e8e69a9b129b8839b493349dacf84e0ef6d9f4426af95b08325ff6a00f02493a34ae7acdf9903ae
+EBUILD libgdata-0.17.9-r1.ebuild 1782 BLAKE2B e8cb72916b5b9b8a229665c7ee2bcac5b3d644c83b1b3db47e894b673131160a1682f24205d923ca5f1d4aa30bc95008ab9239b8b109c77d6394d6383e435635 SHA512 1eb86ce2b416426cb82b564e85151cf02df9a967b6cf1c119d9f25fdef3d80660bb38c23372d3e75dfedf599a339adfe2db8aa2ef9f7c837b9413d2fd4e0701e
 MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd
diff --git a/dev-libs/libgdata/libgdata-0.17.11.ebuild b/dev-libs/libgdata/libgdata-0.17.11.ebuild
index 72311b208ec4..54e902a6fd15 100644
--- a/dev-libs/libgdata/libgdata-0.17.11.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.11.ebuild
@@ -16,7 +16,7 @@ IUSE="+crypt gnome-online-accounts gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libgdata/libgdata-0.17.8.ebuild b/dev-libs/libgdata/libgdata-0.17.8.ebuild
index 7c6ac6bb7a98..bd7a03c2c697 100644
--- a/dev-libs/libgdata/libgdata-0.17.8.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0/22" # subslot = libgdata soname version
 
 IUSE="+crypt gnome-online-accounts +introspection static-libs test vala"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	gnome-online-accounts? ( crypt )
 	vala? ( introspection )
diff --git a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
index f9f1ba477023..65e05575dbad 100644
--- a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
@@ -14,6 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0/22" # subslot = libgdata soname version
 
 IUSE="+crypt gnome-online-accounts +introspection static-libs test vala"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	gnome-online-accounts? ( crypt )
 	vala? ( introspection )
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 15555b02237b..eb6c00fcc1f4 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,4 +1,6 @@
 DIST libgit2-0.28.3.tar.gz 4988580 BLAKE2B 93d87792b0aef6383845230880d749fa77f28ac8ece4564abf041ccbb672d17e6efb1ef9503879d45cf5f78b6f1e54dd2b2ab9eac0fb09ddb445310484bbd7fc SHA512 15444823b7d4885f7b8c3982f8905efc4a75913de016a9b2e0a24d5ce9746e6a549dffd5469036529557feff2ce7ece9328266eb312c80b96091ce0f65ee97ee
+DIST libgit2-0.28.4.tar.gz 4991720 BLAKE2B 7dc94dce69c27f6de3736b94b4d80b727e3e2a7db255a9eab7422cebd93a3ea1a6f47d1de6c3fbe4ba5bcb28ade9b23a989c5b54c06eafeaf30e382f3b859cdf SHA512 b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15
 EBUILD libgit2-0.28.3.ebuild 1684 BLAKE2B c13c366277f3e4b8f8b0fc074eaef7e3932483a2d2fe52aa43919457ecbba28676e0e08ca549c5e1d70701a5c55d06d32c3e460e5e6ee2e0bd71d9ef904731e2 SHA512 9a03f48114b70cb5b59a5c71c705dc0626d264173a1086ad5290d4d91f7ac52d886b5c926438caeddc9633cd9c19b5f6bf52785fd316c7682da7c69a56a68590
+EBUILD libgit2-0.28.4.ebuild 1684 BLAKE2B c13c366277f3e4b8f8b0fc074eaef7e3932483a2d2fe52aa43919457ecbba28676e0e08ca549c5e1d70701a5c55d06d32c3e460e5e6ee2e0bd71d9ef904731e2 SHA512 9a03f48114b70cb5b59a5c71c705dc0626d264173a1086ad5290d4d91f7ac52d886b5c926438caeddc9633cd9c19b5f6bf52785fd316c7682da7c69a56a68590
 EBUILD libgit2-9999.ebuild 1664 BLAKE2B ca592e3b60a50ee0ad16da964b1e9df3095e235d78aeec683582b38fd2b70395311778e453e59bbee913c2976e341f5bc947487ed58defc60d78ca63307ebd18 SHA512 ca41454b876cc379a6aac038b00ab48e01cd2fc728ba79e9164e144a1cd5b2fa7f563b9243d0af4c8d7f1538baece44cff31db260b137f265bee8ebc35050aca
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-0.28.4.ebuild b/dev-libs/libgit2/libgit2-0.28.4.ebuild
new file mode 100644
index 000000000000..84b9ad2b9c54
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.28.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit cmake-utils python-any-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm arm64 ~ppc x86 ~ppc-macos"
+fi
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.github.com/"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/28"
+IUSE="examples gssapi libressl +ssh test +threads trace"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sys-libs/zlib
+	net-libs/http-parser:=
+	gssapi? ( virtual/krb5 )
+	ssh? ( net-libs/libssh2 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P/_/-}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DBUILD_CLAR=$(usex test)
+		-DENABLE_TRACE=$(usex trace)
+		-DUSE_GSSAPI=$(usex gssapi)
+		-DUSE_SSH=$(usex ssh)
+		-DTHREADSAFE=$(usex threads)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]] ; then
+		# repo::iterator::fs_preserves_error fails if run as root
+		# since root can still access dirs with 0000 perms
+		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
+	else
+		local TEST_VERBOSE=1
+		cmake-utils_src_test -R offline
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc docs/*.{md,txt}
+
+	if use examples ; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-libs/libgnome-games-support/Manifest b/dev-libs/libgnome-games-support/Manifest
index 3849cc6d6073..231db7391b3c 100644
--- a/dev-libs/libgnome-games-support/Manifest
+++ b/dev-libs/libgnome-games-support/Manifest
@@ -1,5 +1,5 @@
 DIST libgnome-games-support-1.4.3.tar.xz 345824 BLAKE2B 7969d4470b5c7ba266e3d77071ff7b8b02a1bf407ec74bb0ad1cbe81af7e30e54d3af507f206b07ee1352be4e180dfd62ca6411f07bdbffeb5b18e2f921c7666 SHA512 01a2594d9f95987c99db92c8cc8c212b149619618d15f4128df7eb24d68b64e01f2e77c79b7b07cf81581493ae84215a5d4019ae67585188c04d90827381fc33
 DIST libgnome-games-support-1.4.4.tar.xz 336708 BLAKE2B ecd21376ce8d83a0a8c0f65992ba4d39d54b3b97d90df8adab0d5c5714d0c9841711a21dc611c94a8141313ff991c3a8787f7e27492c149a7f76e25d8a2fa8d6 SHA512 2b2c77210103610cb91554f870d634bc8d06f0886eef5166bf9909c1975a87d960005640d48e3e917f74c7553e3ae07d473ba06c6c5d6582313c50a390ec6168
 EBUILD libgnome-games-support-1.4.3.ebuild 533 BLAKE2B 2d5a86bf13e39bf85048fced123ff6aa22007d97c29a32d57c81cb041d479c7a61d652b9835699fac39f6adbdf5d84b589b444f58086d97f0b0f3aee7013b97b SHA512 4c41bc63d3afd03cf1423ee55879da6084514f474009350e6629529958e41181e2909c43fb8560dfd77ecb19cf478255404ec96b3b40fb1d1f4d9fb5a3e7e8ec
-EBUILD libgnome-games-support-1.4.4.ebuild 535 BLAKE2B 610ea0008f44dc855b0c63ce4d340fd226bf5a50921fc73452cebacf49cf84701ef5f4e9815627953a56e98444bb72127edd34ae884cd9519d5d0d260774b66d SHA512 a34d1a22e55b2f42c420bac7333bdfb1793d993d516d7f10931feae40158562b9ef0276ec23b2453337249c1fe4a7732ed65021800e598f7c6fcfbc4d88dd276
+EBUILD libgnome-games-support-1.4.4.ebuild 533 BLAKE2B 2d5a86bf13e39bf85048fced123ff6aa22007d97c29a32d57c81cb041d479c7a61d652b9835699fac39f6adbdf5d84b589b444f58086d97f0b0f3aee7013b97b SHA512 4c41bc63d3afd03cf1423ee55879da6084514f474009350e6629529958e41181e2909c43fb8560dfd77ecb19cf478255404ec96b3b40fb1d1f4d9fb5a3e7e8ec
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild
index a11da8121a77..0402b206bee2 100644
--- a/dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild
+++ b/dev-libs/libgnome-games-support/libgnome-games-support-1.4.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgnome-games-support/"
 
 LICENSE="LGPL-3+"
 SLOT="1/3"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-libs/libgpiod/Manifest b/dev-libs/libgpiod/Manifest
index 3bfc66b50326..c826c73231d0 100644
--- a/dev-libs/libgpiod/Manifest
+++ b/dev-libs/libgpiod/Manifest
@@ -1,5 +1,5 @@
 DIST libgpiod-1.1.1.tar.xz 302672 BLAKE2B 71c624f923118b7c50970beb737f2c813d1470a34f95798f9ce821211e16f15e2a3fd42d0054e25529ddc9846725c0935d915784f22d2509b844a0bac61b66b6 SHA512 a1d902ce8e1c94d5550ade2fb4889ebe28b86523505b92ab907f58c8e6903eaf07ce16278126989462956b879f591b42ddd50fbc4537c1b5af459f23a4dfc12f
 DIST libgpiod-1.4.1.tar.xz 314936 BLAKE2B 8949c4a96f69a83a479f5951e6f1eb8fee56db700e72320131c365a5d736a48700fb42b7ecc2b676cec54887eaa650075f45ec1f0b803de914958cefd3863db8 SHA512 2a9c58a46fb3c2e2dd15cc4ba52f589b44e5ae4547226eeb68a8e5bea6292d38aaf0889cc639e0979e12e129bb944bb42d9258f10292f59d074660e7c2d56d04
 EBUILD libgpiod-1.1.1.ebuild 755 BLAKE2B bfdfa328997d74ebc185549bedc6c8311d05904141a123e1aa7d1e701d10e0cb18d308fb196ef01ad6d2a8db4b82bb196bc1776a16f6135edc94b0975b0eb972 SHA512 9055950c40a6878e36082387dd6ddcd460ad8c0fe14cc258f391d68e555244c74493441ae845a81a6d1c707ea950063478a4408cd8f6be323fa5decfa9bd3b52
-EBUILD libgpiod-1.4.1.ebuild 1151 BLAKE2B 403ba368c1f61f9067c490056542fc5780650d2f42a3b63f00295602c8d2d2273cc850ed017516ed998a70581becceadce6f314c63ba60b979d83da3f07c3545 SHA512 8e8575bf37c2849469eb35ed7d096682bd278863f7f3ce4c21b6e5d3b8a2877090c246a1367d90db883bd1c6ab77066dd0a97e0956a952512525ec2f1c699613
+EBUILD libgpiod-1.4.1.ebuild 1178 BLAKE2B bd4644b318a0553fde85cf0e09ea7cc4444801b9a2181364a3cf7a884c6a4316bc55613eef515f65b02d9d7df23a8e611e403f93064200c61de7ca40f2096157 SHA512 4754f7d763c4c3f474ad012be481e0694239d8b1dfa2168baeb048d65eb5c3ab5fb2d32a47b14eee9c6db7c5ec9b4087ff000d3f3f914b2b72f45794f4375316
 MISC metadata.xml 343 BLAKE2B fc70cc41ae2770c509013c4d1a5d8aaa441b6d52d1259b9e2f5cb2e8928e146f5451e399d1345901e88b1b488095990e8c9f9b296b43b38f91b38a22b3507c90 SHA512 051b47fa59f992bf8347e89d17eecf645d4a20457ac1d9db931982c9efa4a61d777df4e215a790d518ac77b2baa7497862fc724fbd581dccfa404bfd232d749b
diff --git a/dev-libs/libgpiod/libgpiod-1.4.1.ebuild b/dev-libs/libgpiod/libgpiod-1.4.1.ebuild
index 50141fbb2619..e49f80f38f68 100644
--- a/dev-libs/libgpiod/libgpiod-1.4.1.ebuild
+++ b/dev-libs/libgpiod/libgpiod-1.4.1.ebuild
@@ -14,6 +14,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/1"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="static-libs +tools cxx python test"
+RESTRICT="!test? ( test )"
 
 #  --enable-tests          enable libgpiod tests [default=no]
 #  --enable-bindings-cxx   enable C++ bindings [default=no]
diff --git a/dev-libs/libgpuarray/Manifest b/dev-libs/libgpuarray/Manifest
index fe7ec6b701fb..3ad463a94bdb 100644
--- a/dev-libs/libgpuarray/Manifest
+++ b/dev-libs/libgpuarray/Manifest
@@ -1,5 +1,5 @@
 DIST libgpuarray-0.6.0.tar.gz 232281 BLAKE2B 73c4fd5598edc3b81296aea7acd24fa48d0302f54a0050de8bc5539a5150dcc4be052dbf8d0c1d822f79a8529ba47d60d51c3216ad774b5954915cab4c65b5c8 SHA512 ef2b37d7752d7b19e6034ca1992dfa0c82806bae7a15ce54aad785f5abbe06e57a77b804699c55b3b7dc94496afb22acaf3a43cfc15148c150f2c93085c23080
 DIST libgpuarray-0.6.7.tar.gz 256440 BLAKE2B cc0880259c368c02fe0fca1a7f9424ad78f057540426d28179ee2cb20a2559853566c9ebb7de3488d5fdf0fa0eefb4e9f16db198cda2727370d567fd16363480 SHA512 39cdb67ec12d0f939d7a3ebef9726c40e64387413200addbeaf205db4151d09efd90118fec4a71b9d1f81fdde9b52e37d2d97763bf2cc9efa1667c5b9ff716b2
-EBUILD libgpuarray-0.6.0.ebuild 1385 BLAKE2B c1a7f58f7db60023d57c513e45be8dd0707986a44a15a6a27a0b4f32a526d212f0949f0fab9503b9471e8f14247b1284b9d0d77167350dd5433cbd8681674412 SHA512 6362bd54bd304eab87869eb5b26ac946f0734de93a456b4d2d0a2b5f2b3ca5e850f07a051b64f895a3c417415d58db2a96d14315cfd8496b5556617e5762f118
-EBUILD libgpuarray-0.6.7.ebuild 1387 BLAKE2B 260fdb4617a628f8eb0fe96cd520bd206dc6693c96a5b5508ddf1ff0a7b65ee2f7bb144724421032b5f51a4352e88cc5ecbcacf1f2ba8ce1f690ab43b00b77fb SHA512 2b09ce47a8834b53009a87c42f9a94e1ab0551332b06583627307abbfa737bc1717edb9b86819bed44e67f86d83452e08a91251c3d01cd45a1f37323e2a3cb35
+EBUILD libgpuarray-0.6.0.ebuild 1409 BLAKE2B e40a1fe39c74ed7322f639be8de20611b3c8d6774b02b7f11f9e4fc917e1cbf17c874355ab967af9faa9e7a9e41347c17f559d42970d86b0fbf02e7d905ff738 SHA512 bddadfcfb40cd4a08a730f181db2932c2d1ea28af16c85cb38c84fd09ccf8afeefa053cea2b4736a1ca1d34436017febdba351dfd99490e913b9c235c1207443
+EBUILD libgpuarray-0.6.7.ebuild 1411 BLAKE2B e6d9c7e7683918f205e4f81fed6d5f0ed9c0f695572f45b66b7872d66e0dd29a69fcddc147f98dc7ae13549a1832aff4ed9cedd80fe817681e0a4e9e756e856c SHA512 faf3deaecfb62f6f4e0237a613563b6a9934dc867c0900854b67742eae4ded6ebeeda08cf91bf6ac878a28e8074cfd65300926cfd93a8dcf3f6ef7b80849be2c
 MISC metadata.xml 639 BLAKE2B ce7935c01ad94d02b4a1596cb7adbee6bff4a50276efb77d80d815e4f8664528d14f8b278beccbb79f0fe2a695c1e332a43e50e7894507e3a4d44b17e41a8d0b SHA512 f4b06c37069e3db5cbb303cc731f841b88ffa682ecb6f4238e6e89b7d915d720dcee1cca4595be8a3c80afde0df3b8c18dc66f2844469ffa65572a264f4b58b2
diff --git a/dev-libs/libgpuarray/libgpuarray-0.6.0.ebuild b/dev-libs/libgpuarray/libgpuarray-0.6.0.ebuild
index b8ff0a923d5f..032dc90b2654 100644
--- a/dev-libs/libgpuarray/libgpuarray-0.6.0.ebuild
+++ b/dev-libs/libgpuarray/libgpuarray-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc opencl static-libs test"
+RESTRICT="!test? ( test )"
 
 # cuda/opencl loaded dynamically at runtime, no compile time dep
 RDEPEND="
diff --git a/dev-libs/libgpuarray/libgpuarray-0.6.7.ebuild b/dev-libs/libgpuarray/libgpuarray-0.6.7.ebuild
index 744ea75a2b2d..843671c0eb75 100644
--- a/dev-libs/libgpuarray/libgpuarray-0.6.7.ebuild
+++ b/dev-libs/libgpuarray/libgpuarray-0.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="BSD"
 SLOT="0/2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cuda doc opencl static-libs test"
+RESTRICT="!test? ( test )"
 
 # cuda/opencl loaded dynamically at runtime, no compile time dep
 RDEPEND="
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 4a35da1dad92..050bfae66672 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -9,5 +9,5 @@ EBUILD libgweather-3.24.1.ebuild 1312 BLAKE2B 518c863280f2a52a3bd39f93ba33c43928
 EBUILD libgweather-3.26.2.ebuild 1314 BLAKE2B e9b48e125efc1de624e6cb692ab3d0ab29897ade082a56f766e2ac85e86992beb523197d4e5ae86be46651c5507a4229154f24ba0a819eccb0237d1c2dfb6875 SHA512 c68cb64df4776aeec8bb0814911640464b1dfe8f4480e03b57a9ea25b08a744a23989ce8e90522ca1e53679e59d2bc6932b83df2166e0dd9797169d2d0b629e3
 EBUILD libgweather-3.28.3.ebuild 1557 BLAKE2B 64445dc29f35a5671260ca003ed54ea596956d2e8d44fb508e05c21cdc13d183aa7d15cc6a69320f0fc8bb05116336590ffde483d456a3d1a60adc6c97890c91 SHA512 7a72409ee915394ccee78e9893c554d126b060e24998fd160b1eafced936121fa3d82d2b123daf11f066b6316fcb9786ee0e6fd1e6f780cfd97b3c97fc88f4d2
 EBUILD libgweather-3.32.1.ebuild 1570 BLAKE2B 0698db46988d982987d385d88964e04ea8fd341a7c718e9906bb360e6396f35357472b6ef4416521bab7e0f4d5d690dce9e23e5cf8a8af935afe11dab8058b73 SHA512 a450ac12c526ebb6028a9a6c31d365f48996ba9f9ed19526853dc966dda014cde24e4f36fc74964792dbdd2158e2cf041cf3a03fd3edc50b039795b54f46bf61
-EBUILD libgweather-3.32.2-r1.ebuild 1667 BLAKE2B 60aebb162110fa73e0473f8f72e79592adf479f7ab80150c2596e8465335315f6e1e9d472d6c7e738ac1f24647d5fa4f950a090231af9897378b781809222432 SHA512 c6ad1a6bef2c87f0fb691e4a730b03101a1997544233cfd98b9fe941d09ddd22b5ff86bb1fb8d428260c1d803b70ee379232957f7fc996e6bca1eaf09c486598
+EBUILD libgweather-3.32.2-r1.ebuild 1665 BLAKE2B 26223bd855a2e91e1a2f89074bcab4d45929cc72ca8dc31b9c6ebd6d44642612d2aa3893a83726712a61b3800ae9e973de51369de1dbea4a3612ea660ff7cd9d SHA512 2a52ab224d0994413117042f8ca00721343ef5a99f10031336dd90736a1c8efa3b5bee5d55f6c01ecea35cdf9c4b52a587e3442e729c8da246b4f54a3e1d9862
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/libgweather-3.32.2-r1.ebuild b/dev-libs/libgweather/libgweather-3.32.2-r1.ebuild
index 49030f1e61dd..4f7159085e8f 100644
--- a/dev-libs/libgweather/libgweather-3.32.2-r1.ebuild
+++ b/dev-libs/libgweather/libgweather-3.32.2-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="2/3-15-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suff
 IUSE="glade gtk-doc +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/dev-libs/libhid/Manifest b/dev-libs/libhid/Manifest
index f05e94c12a01..0b549b364f61 100644
--- a/dev-libs/libhid/Manifest
+++ b/dev-libs/libhid/Manifest
@@ -2,5 +2,5 @@ AUX libhid-0.2.16-gentoo.patch 628 BLAKE2B 6c2a25cb230a50c5eceff0229d9d6bf3860c5
 AUX libhid-0.2.16-libusb.patch 421 BLAKE2B 8b3283ddf9ca120bb77af75fb5aae88ca6d45904a425fdc90f4ca7fda8bd111f37deea5454d692499156337f473bdbd3731d7bf45ea7b80af5c359478cb96c69 SHA512 0fa3be119d1ab3efa428c81b96709a0cee4fd40fa4515d255a64be095a4e26f68a2c8175beda6615c720aaa593edc5aaaa2909bfc5ab9e7f9b818d8c507b9fde
 AUX libhid-0.2.16-swig.patch 1424 BLAKE2B afc3bbaedcd83c87b3186742872681a7a74780873d7aea8fe5fb1df9c69aa66e8265af58200476a2c85f7c0f7abc8036cd569e8827cfb239cb60262758618784 SHA512 62ff58921aa99947f8b33b0d1c02cf30f19fd3f75393cbb681846266b67af49bf6a2e70a995c9a7252b27c67e573e2c198b366830c15ca3c5e87a93325a849cb
 DIST libhid-0.2.16.tar.gz 435245 BLAKE2B 9bd06b226e42ed0dbbf4395824636dbfaa796ce9c0170ad7af561741ec3f494b92ec09c548f3bc7c698a32aa78d82d4da4094231fbb810de5a67d3066947fd97 SHA512 3c9348f9d63e0e1577e983c65ff8e6acbaee0d5f43ecb29b7004654a7e9d14a94176aa029f259e0b8576fc30e8a9af6d1df34912dd582bfadc2b29f9b87eb52b
-EBUILD libhid-0.2.16-r4.ebuild 1248 BLAKE2B 4747606716b55f804658147a08b58d4bfa4920886d40e550a5ca205f1d5eb5025609113486b66b0e3701578f39ba14b0ff53fc12e31c7d292164940223ed0a1c SHA512 a03b9f7036baa794c6a5bf9635a954a4eaf6d08b4eed218a8b84a12826b84784a7aea97f577fe299a05df067818eaf01bba744caf56675bd3dcc166f7ee66788
+EBUILD libhid-0.2.16-r4.ebuild 1246 BLAKE2B 701a353034012a53791f5cdc92f02ca6ab8678f9ef10417f4b4a874bf9936732439f28ade973e16d4a2c407f1bb3135b55c77ca94185d16f7bc443411c3ff68f SHA512 f8caa8416fb1fa367e59d3565449c86e09ec1b98a8b6436d24c11ff5edde830d332e8b53429373a1e481cd9be96d6c698060938b6b98508a8efde20832a68f8b
 MISC metadata.xml 495 BLAKE2B 1cf63c758e96eaeb6195814d8f568f80016982d94561737c3077637165c4fe5f791ca88d45374f95e0208aaca523f77e887e5c99b5839c8c8ce34573febe5987 SHA512 e465b7596e61565aa21ce9c32d7d76b099ee21c471c341677604f5816f2b7547c57f8a065f2bb9df2356c3e6d5fd26efb303884117096e8178127490a14ca268
diff --git a/dev-libs/libhid/libhid-0.2.16-r4.ebuild b/dev-libs/libhid/libhid-0.2.16-r4.ebuild
index e979176c107f..7eccaad83674 100644
--- a/dev-libs/libhid/libhid-0.2.16-r4.ebuild
+++ b/dev-libs/libhid/libhid-0.2.16-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc python static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index eaf3c39113a3..45f7b01d0e61 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -3,6 +3,6 @@ AUX libical-3.0.5-fix-lots-of-params.patch 898 BLAKE2B b0fd85229bde64bba92ee9317
 AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091c6ee3af676e8cb8d6082783f1f15dd430f73c8b82d403d120f1b2cb682c71313ef4262f42923ffc72480ab83d9b42aacee4df1 SHA512 24d312f8f6ad9c1a3d10ffd3ea96893a2345eefcf7485b6464a8879d561f8d23922c84560765dea3b83614eacb4ee6efe63c9233cf8964c441ae17630d001c37
 DIST libical-3.0.5.tar.gz 881800 BLAKE2B 64f95950cc6f128c9ea475129e54d9c58b26d9866f8183762d34c996934a1b2bcc528c47442357a12fb6444831caa8f39772a6810d81f8c0b6596fd724f0de6c SHA512 9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656
 DIST libical-3.0.6.tar.gz 879939 BLAKE2B 365e16cd7011df7e9e8bcf011035aeeb904a511c5a0ff76cde5b559a7c56049646108d1c2b499cd044e2784aef7bb1370ee3dbf88c24b745a349a0ee7c312157 SHA512 d1a3397071c2989983893e3bbaeb088f7cb9a3639dca39709e9422c334dd1e9a869bba9292a250f83eb2a5b6727bd91b73c8e420bd1814422d97aff9fc6b26fc
-EBUILD libical-3.0.5.ebuild 2063 BLAKE2B de5f7497391cd3be77755b00b034ea61d584cc68c7ac10f6270d14387a237b753f0ca8eceb2fde5ef9e6d1fb5b2fb479dcf0770f37b8959f6e094fb53f16ff00 SHA512 7fc2aef6bb07ecacccf61471b7f3ba429b11d2026cadec9e531ab70fc40bf1a6843b214002f52a5e8295258613b6c5bb21ee7816a1f8cf2df6fc269fada0131b
-EBUILD libical-3.0.6.ebuild 2283 BLAKE2B 2977bf90429e2c3748ea3ed41c7a1fa3da2c436fde2a1badec129b984a04294480fd94900577b426267d2d9228f2e83ff1cb10e10636816f09b7cd892cc6f066 SHA512 a4577b44bcce86bbcdd353f162b047b3276168ade45d753f14eb839c694b5e32f86c52e4b10460dfdabdff08a6c591016cfc17bf7f1a5a885ebd16a177441cfd
+EBUILD libical-3.0.5.ebuild 2090 BLAKE2B e46681230433e86dca87b9f8d982e05760254d8e8f8684c43e12a43289cd30b63b8d7cccf914d83e79a85047dd3268df5c82922d0659951e9b64956f912404af SHA512 8afc37fdaf16afd9592dd4481887db17593b9835b9125f146abceaffdfc38bc7bdfcfd77ffe51c2dac3081cea23a5439f299391ee1598c8116cc8161efbf55b9
+EBUILD libical-3.0.6.ebuild 2309 BLAKE2B 59c58448424670bb2a191c97fd9436ae0e35e2d1dbacb0364ce8c0f6b9fad42ac4f9a0b16620adac94dfd81f70d45e9149b0a9a84a34debae00411a0f4c8386e SHA512 90b734bd6038fd62b2f26d755c70c3f2066eae5600fe37c9065813c6137965df0ebd79f206e046e6a073219c5529823620c8db7d7626d085a5765339f7b834ad
 MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/libical-3.0.5.ebuild b/dev-libs/libical/libical-3.0.5.ebuild
index 3c63dcc44252..8db90e5024fb 100644
--- a/dev-libs/libical/libical-3.0.5.ebuild
+++ b/dev-libs/libical/libical-3.0.5.ebuild
@@ -14,6 +14,7 @@ LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="berkdb doc examples glib static-libs test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-lang/perl
diff --git a/dev-libs/libical/libical-3.0.6.ebuild b/dev-libs/libical/libical-3.0.6.ebuild
index decef5a1b82e..7d8dbfd7e5f3 100644
--- a/dev-libs/libical/libical-3.0.6.ebuild
+++ b/dev-libs/libical/libical-3.0.6.ebuild
@@ -13,8 +13,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="berkdb doc examples introspection static-libs test vala"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
 BDEPEND="
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index a7b941e3aa99..eb3384702d48 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -4,5 +4,5 @@ AUX libiconv-1.15-no-gets.patch 796 BLAKE2B 19eeadf7bbfb96c5c7d2037af18d55162d81
 DIST libiconv-1.14.tar.gz 4984397 BLAKE2B 8697bbff9b929e8a30157f271ba3216aef7b2f0020f5edd273f3cec249069fb23f58ae13cbe3d3bb502c27e97e7cccae66aba23017ab4f6bce11b2ec133ef684 SHA512 b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387
 DIST libiconv-1.15.tar.gz 5264188 BLAKE2B 2384dbf8549fa56e841b15b7e2698b83c0ee171cdff13aef48c60eae0bc4f5e7b2e937bc8d5eddf89fba11412d17bebd77bdda7060c177ce9dc9be00172c0c12 SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a
 EBUILD libiconv-1.14-r1.ebuild 1373 BLAKE2B 8164ba86f9ac4090f75618b1e63aa64ea83f569ba474598d76d4e6a3b5dc222c517e3e810394abcd528223f43582e361d36540dbde51112bada4b85bdb10b118 SHA512 36f86203f6f1323365987386de64da46dd6534c7b56a35b77f79f86359450d9cb314ba5a84b7a52a550337f71e7339ee6a9ee7d171df3eada00dc05d62d3802f
-EBUILD libiconv-1.15.ebuild 1925 BLAKE2B 18b97b3fdafbe9bf33e361e49493e8be3f0262af5bfc6886d2ae69bdde50c27414a09aaba71f89e172b0d1d2c7db261d0985fda12058a16d1f173990cf168ad4 SHA512 23c2ea0f450f45aad91033dda76d0ddb363563cc958569eb1063c543ac267d59f640d505aadf16b9ebea8157e39a97db3720ca443e0db14b4bbb4253cd0b96fc
+EBUILD libiconv-1.15.ebuild 1919 BLAKE2B ac63709e3065c43f6fc75c2e663b5996a65bd1cd71b4b1fe8b623f35ec1793fd13aabb5439f7bf8ad9d83da62f79357161b4cc4d2cdd135916b1d2dc008f55e6 SHA512 6c87bfb68a812a1dfdd30d1ea0cbb163ac9c00a6f03b5d05bc3030cad42272a34ef9c8331f1d21e73fa5a3be5d3dcac3a3ba0ac982322793be3e6f28d3459ebe
 MISC metadata.xml 465 BLAKE2B a9451430b40c62c22fa244871d26561960f697d360e3e46300f0512556d07988d73beb7e2eb468b94c9df71aae8aef6bb61c9e59ca9ea451bd86d1acfdbb8ce3 SHA512 a7f901242b5bcc60c070d40e4271e6d6a8dbd2e152a29c0b408ef43d5140a3ef89e90062853066532cd6d64db687aaf41ff553a56449865f1b84f37158cc389a
diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild
index 0e6e23881fcc..f200a83abc59 100644
--- a/dev-libs/libiconv/libiconv-1.15.ebuild
+++ b/dev-libs/libiconv/libiconv-1.15.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="mirror://gnu/libiconv/${P}.tar.gz"
 
 LICENSE="LGPL-2+ GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="prefix static-libs"
 
 DEPEND="!sys-libs/glibc
diff --git a/dev-libs/libindicator/Manifest b/dev-libs/libindicator/Manifest
index 92b48fe92dab..649580dc342b 100644
--- a/dev-libs/libindicator/Manifest
+++ b/dev-libs/libindicator/Manifest
@@ -1,5 +1,5 @@
 AUX libindicator-ldflags-spacing.patch 298 BLAKE2B 2d0fb361e2980d429beee418d9bf8d2f786de0d2b337b6775f9457158aa30d02b4dcbccdc488fa79236f04bf766aad49df732d25f48f1ecba923c46a4e239280 SHA512 fa283a8d6b88da0e2b6f5d0711ebe8a5cc0d4ab87cb07c3cecae9974dd68be751169b89503ae66751bca6cd73df2b2a262ac55a667c5c8e00e129d51f4452c67
 DIST libindicator-12.10.1.tar.gz 427764 BLAKE2B 93cc774df0b55b7ee447c24a0ce49047080ab867c20403724b855153cfc5b93ed0da278532a2fc67bd69e4a9484a31286c2c585cd14d156028f338b5ed2b306a SHA512 d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af
-EBUILD libindicator-12.10.1-r201.ebuild 1207 BLAKE2B d69e47daa9bf13333d31fdfde8f00e5dc49bb0ab8c3219ccc5e88698fdb8b12c3089fd1aa221e46452515a39bc938eb0127db19d927db57622df701d6e9730f4 SHA512 aad48d226c41fd1a282e4349a1686ffc2aa5c556a7d849ad40ebce9dcfe6fe8b2dc5d5ab60bf54d689fca4a579b3c3977bcd5bf9da2c0edc2156a540d573a355
-EBUILD libindicator-12.10.1-r301.ebuild 1181 BLAKE2B 6302ce3ff7ab26163fa5720f512d07c038314ecd18686493e5823d2d11f35dd38ec9fc0523c797e2aededc1b5a83fe195af56e5981d6628513bc159d27c4baf6 SHA512 16cfaf47444b8f2121b645bcbf5624cb8f3c36eaf3c29c7937a76787f09ca6b2f9f973427b9fa78202bd51b74a3877bf9097ad274b37fe52bbcd6a191d646508
+EBUILD libindicator-12.10.1-r201.ebuild 1234 BLAKE2B cf2fc1821cc3f9e23e26f33a5acf3bfecaf7931b8ca1ddc41794933910cd08b31a7f4158adf1c66024359f16508f24d2699586db7a1985911a2f77042d2a5a7f SHA512 b4c6339aa017d1b529e1f91401cb350ac5309fcc33fc3d48b576565791a2a0078bfdb3fd6f45b91df7169781d6fe43bfb894d26120898bcb26d109d3f4b50c2d
+EBUILD libindicator-12.10.1-r301.ebuild 1208 BLAKE2B 7577b20241fa0b6fb248719dbe5d213565b55a67e95b838709b8b287d3d9fd6a52bbece447a8cce80b11a7fb827ee0391280945ae3f1fafca9af94ae327693b6 SHA512 5abb0f76ee57493d8a42efe4e0bbc43ff73dfc98b9728127753a5f8080980289b25273df26f7847580998e4c0d44dd9984d007db15a92fb267892856b6b3791e
 MISC metadata.xml 247 BLAKE2B 216107f32a44b828d5bd65432dbdf2f3b71d81e96ee3580fc551392310b9ee554715698dfcba215fa2181a90f361564b6d04546c61848c3a2d176f3590602f69 SHA512 f24203e0188dd8311689fc59007368585764703b92f6fde9b4ea01666d37304193fc728a9f99b7f6c936f5a5a51a58a8402a101dc4eddc0bf2bf09f221bb0054
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
index c43c76e155f1..ed8abf2adcbb 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r201.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=5
@@ -12,6 +12,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
 	>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index c5c2badc6db5..042661be06a1 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -12,6 +12,7 @@ LICENSE="GPL-3"
 SLOT="3"
 KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
 	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 0597b91a8497..ce8021b1c182 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,5 @@
-DIST libinput-1.14.1.tar.xz 564412 BLAKE2B 185cede0e5d74dc27f544996aa003d50556ef50f432c73a45a1cffeac921ecc0a5c5c82158292bcd18a692d745fed552545e5ab60bcc29fb1451529cbdc7a57e SHA512 8416bab51ba1aab924fa1b41360bc2ad101fb60d3a82c73584bb1e2454554524716673e3eac7f08c18bd6a1ecdfa52ea3cfe09c7a866c59fcd47d75960e82d4c
-DIST libinput-1.14.2.tar.xz 566976 BLAKE2B 498b7032122b2d757e691663bde9ca0025af92d33a5e4b03bf9ce87ec8a4d4c47fe07939583d7450626208ca761efde2de14a327e0fcd794699cc9b72b928e79 SHA512 932949a78bf95a7a05f50170cfc7dc109c99e1e3e70e63797566c0c3a3003632cad56e9b9ca2a180880f5e2ec1060613066d068b384096f37785fe70ac30c1eb
 DIST libinput-1.14.3.tar.xz 567560 BLAKE2B 76d38b795a5e721a73062e9c37b23bf6739291549cadc66401ef47b1a9afd5766f1d0ed855fc66912e4257fae4b1b813946c67246adb8d8566d5ad9478079636 SHA512 f01d1bd1b25b8060519575644597d35f0c89de5386d298441f440128ceee3e57549921a058adec31adc8b33dbdedf4c0bd12c76905a69f752859d3136e26336d
-EBUILD libinput-1.14.1.ebuild 2059 BLAKE2B daeccd68674bec236e3501b14aa4529c7dfc66545acf523e76fe84696024761cd28b05aa4a30e27f30168b3ed947bde3ced491f7d410546eeff2d39dd6b0d116 SHA512 67193ea533150a70b2ff073d3078acff974eef2a46d40faa8cc6b69c695abbf4cbc6f3be7d25c351055b63ad1d2546147bfbde8fafad58fdc542da97fbe4d510
-EBUILD libinput-1.14.2.ebuild 2069 BLAKE2B c689b9409c22d2241ff39c52e19fa459938d72e51f3179d1ece4b9472ffce24e236b42a0bd69b1a7afbd4ac2d9f1946cfd41d12e11a75af1b950c324b8e55884 SHA512 807a2c5f246aa8a5a080fa446ea2b8f05f98511e693974b2cab731410b1567d93ead5344ad1fb10fa73b1d92c8591b1f88a8660cfb6516cc5186708f9205fec9
-EBUILD libinput-1.14.3.ebuild 2069 BLAKE2B c689b9409c22d2241ff39c52e19fa459938d72e51f3179d1ece4b9472ffce24e236b42a0bd69b1a7afbd4ac2d9f1946cfd41d12e11a75af1b950c324b8e55884 SHA512 807a2c5f246aa8a5a080fa446ea2b8f05f98511e693974b2cab731410b1567d93ead5344ad1fb10fa73b1d92c8591b1f88a8660cfb6516cc5186708f9205fec9
+DIST libinput-1.14.901.tar.xz 573900 BLAKE2B ec2561faa4e83fdbef28802295a7a4b458ce147a05213363f7bfb136ae6f144ac3e49ed012a76a4ac19dc0ae9e51b3ecbe266794b7a2f3862788556ef1394a1b SHA512 93d97cefa49f640b7b29ac3f54497d57cd1499cb0945504d4522ed564b2414fda55ece09d9212ca2cc3c911375ce0b6906ae62912fbc501aea5238afad3ad4bc
+EBUILD libinput-1.14.3.ebuild 2059 BLAKE2B daeccd68674bec236e3501b14aa4529c7dfc66545acf523e76fe84696024761cd28b05aa4a30e27f30168b3ed947bde3ced491f7d410546eeff2d39dd6b0d116 SHA512 67193ea533150a70b2ff073d3078acff974eef2a46d40faa8cc6b69c695abbf4cbc6f3be7d25c351055b63ad1d2546147bfbde8fafad58fdc542da97fbe4d510
+EBUILD libinput-1.14.901.ebuild 2103 BLAKE2B 491f3c74ba09a2d6af72d94e980d2e67a451eac8f332ce1e32383705b6baec26559e34ce9fc022b16dffd4d58a3a07121f5af080601b71c775ad234183f46b8f SHA512 a11df5fe7e09ee1a8bc7c36c7917a7a550169fc4b2c7bb172d7a48eec7f1ddc308321b86ff5e4ec1140f734fe857b4ce470833c4c3d57fd15605a9bc675a6222
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.14.1.ebuild b/dev-libs/libinput/libinput-1.14.1.ebuild
deleted file mode 100644
index 2a1ff8430843..000000000000
--- a/dev-libs/libinput/libinput-1.14.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2014-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit meson python-any-r1 udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="doc input_devices_wacom"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/commonmark[${PYTHON_USEDEP}]
-			dev-python/recommonmark[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
-		')
-		>=app-doc/doxygen-1.8.3
-		>=media-gfx/graphviz-2.38.0
-	)
-"
-#	test? ( dev-util/valgrind )
-RDEPEND="
-	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
-	>=dev-libs/libevdev-1.3
-	>=sys-libs/mtdev-1.1
-	virtual/libudev:=
-	virtual/udev
-"
-DEPEND="${RDEPEND}"
-#	test? ( >=dev-libs/check-0.9.10 )
-
-python_check_deps() {
-	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
-	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# gui can be built but will not be installed
-	local emesonargs=(
-		-Ddebug-gui=false
-		$(meson_use doc documentation)
-		$(meson_use input_devices_wacom libwacom)
-		-Dtests=false # tests are restricted
-		-Dudev-dir="$(get_udevdir)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc ; then
-		docinto html
-		dodoc -r "${BUILD_DIR}"/Documentation/.
-	fi
-}
-
-pkg_postinst() {
-	udevadm hwdb --update --root="${ROOT}"
-}
diff --git a/dev-libs/libinput/libinput-1.14.3.ebuild b/dev-libs/libinput/libinput-1.14.3.ebuild
index c6c5651aad46..2a1ff8430843 100644
--- a/dev-libs/libinput/libinput-1.14.3.ebuild
+++ b/dev-libs/libinput/libinput-1.14.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="doc input_devices_wacom"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libinput/libinput-1.14.2.ebuild b/dev-libs/libinput/libinput-1.14.901.ebuild
index c6c5651aad46..9e1ab791f12f 100644
--- a/dev-libs/libinput/libinput-1.14.2.ebuild
+++ b/dev-libs/libinput/libinput-1.14.901.ebuild
@@ -12,6 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
+[[ "$(ver_cut 3)" -gt 900 ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc input_devices_wacom"
 # Tests require write access to udev rules directory which is a no-no for live system.
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index a4f140e86814..22903d25006b 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,4 +1,4 @@
 DIST libixion-0.14.1.tar.xz 360568 BLAKE2B e4da21f0eff9111272618d1bad87790ed0c4b461478473654f8366b0023c0650b41d355b0737a4fd4ac943e66f919e2f0d6bf04250e597e54a290d4415f3a093 SHA512 e4ae6348833d2178c1dc76916937bcc9d7821dc6570fe13093c441ca22e0301a1ca6a4cf85d9814b83534733dba98f4c4a372791f93bc57173317657675b9ae3
-EBUILD libixion-0.14.1.ebuild 1081 BLAKE2B 9b054acb579d7e2d409386418433caf13e0d2c35559ffe77321e7878c7654ff943582c15785235f3aacc85660f324cabf6205227f0f318387ecca4c275317f0c SHA512 5e85969c94c1abc2ebfed5b1ba2e41bb45ff798e1bfcf1633ab9c11b53562d32d8d0fbcbf61c35cd3450cc29e7dbc32e570163d2c5b0ef53f878cdbcd260e6c5
-EBUILD libixion-9999.ebuild 1103 BLAKE2B 8ca8c29a35df52397f9e0d83671595f11ee97cad1302df5c159cf5ca9bc573bf8dee310d1d39d8bdad088c379d6e917c44fbf4e0bb8a3713df91d0977093c441 SHA512 7885380b0401262c300439b8c3c32f636c58abe65bec7478c8bcb7601ee9cda24bba34e469b0bc024ed6d96e8e4b542d2e247173d3e8c3d35dc27087667f0544
+EBUILD libixion-0.14.1.ebuild 1091 BLAKE2B 606c176845829ab2b0f518e8b1edf3bb5dce629c2cffd71d908618bb68f64245859e6a44d3dc8c6b80ad9cc6ea0e81e5178f7a85dab982bd84199bd4e84043f8 SHA512 1901ccb618f314b81526747f9d7602a24a0bc79c3493c46b2aa9b319875925cfc42dff32286d72ff87b1b659d4e32350301f81914137701991c40f0d273f0747
+EBUILD libixion-9999.ebuild 1113 BLAKE2B 17079093e13a05c2a3bf526fbe7623ca9b28facecaafcf83e87f8e2245a174dcf2cb081d120a7636fdc30846b7a2666e11f385a3b4f76e7dabe551937d6ab3e7 SHA512 5f2cc26fea62255c9ae24d2698d54a32bdb91c440e905515a089e35d97972cecbf518ef76539cd4a56084bad59e9aaf61caf1dd57500334d2ab225ed853771e6
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/libixion-0.14.1.ebuild b/dev-libs/libixion/libixion-0.14.1.ebuild
index 487a0e6613a6..7506f2c88e8c 100644
--- a/dev-libs/libixion/libixion-0.14.1.ebuild
+++ b/dev-libs/libixion/libixion-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 inherit python-single-r1
 
 DESCRIPTION="General purpose formula parser & interpreter"
@@ -49,5 +49,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index ff21270e7421..f55c1445135e 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 inherit python-single-r1
 
 DESCRIPTION="General purpose formula parser & interpreter"
@@ -51,5 +51,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index 2999380e2764..bcc0191dbb2a 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -1,5 +1,5 @@
 DIST liblognorm-2.0.5.tar.gz 667709 BLAKE2B 9f2a774c2378caa460a1f11e21570e719f83e782c5731a35921099b1b31397495ea2a4baebd489d186526eb2d011f2ab30d971713a8083c1ae02168d3f632ce8 SHA512 2b36fabfa8b751127d47f307833414d339ae43bad5b687ce6ac42a961021f9a515703ca0c4808e098ef49be3a943abdbf307f90995a2331c6e266167ef041d00
 DIST liblognorm-2.0.6.tar.gz 666712 BLAKE2B 4c3e46fbd9a3eaf6c429872d30c0fe93f1255dbf3cc14efc82ab94d70ef45c5560c50644e0e23dc63777ddbc405d0f3fb911975d06fd6f6cdee6f7b98ff10b74 SHA512 0b4ee55eb54920dd096fdd6d6dcc2263bc52e74442d86503bfebf26b31492a8c1b67cb3b709ecc8b96cc53252151515719027306b2b6f7ba3404adc5a48cf125
-EBUILD liblognorm-2.0.5.ebuild 1493 BLAKE2B a70a23c8c0dc92230759c124491511d4fc9ca0f5a2728ce5e734150a282ede7a10ab4eeb2ad574d08af706ab69a3e0c8dc6bf19d29850bdce6745b29775c3c3c SHA512 5bd5de8522dc182dc6aa8e15d64ca8682aad4cad2dbfd063fc7a900fced2775f40c182ffbe9338f1219f522300ff8a3023be538f4d96ea7e42bfe0d45614374e
-EBUILD liblognorm-2.0.6.ebuild 1493 BLAKE2B a70a23c8c0dc92230759c124491511d4fc9ca0f5a2728ce5e734150a282ede7a10ab4eeb2ad574d08af706ab69a3e0c8dc6bf19d29850bdce6745b29775c3c3c SHA512 5bd5de8522dc182dc6aa8e15d64ca8682aad4cad2dbfd063fc7a900fced2775f40c182ffbe9338f1219f522300ff8a3023be538f4d96ea7e42bfe0d45614374e
+EBUILD liblognorm-2.0.5.ebuild 1520 BLAKE2B 4d3848aefddad33d7f0f9cec516e70095a6caf1b15a518385ddc05ca0601b63fa19d6c712e61e710e32e5a5c34eab235753d6bd77a7dde070cef5e3ffce88c53 SHA512 d72bb7296a73416532ddc29698e0522d50eda5d09cc20221986b35f01a1de11a58fe8b4531a4a9fca9d984d8f579af3ea365e18de97c69f004c8f0b3d693c51b
+EBUILD liblognorm-2.0.6.ebuild 1520 BLAKE2B 4d3848aefddad33d7f0f9cec516e70095a6caf1b15a518385ddc05ca0601b63fa19d6c712e61e710e32e5a5c34eab235753d6bd77a7dde070cef5e3ffce88c53 SHA512 d72bb7296a73416532ddc29698e0522d50eda5d09cc20221986b35f01a1de11a58fe8b4531a4a9fca9d984d8f579af3ea365e18de97c69f004c8f0b3d693c51b
 MISC metadata.xml 582 BLAKE2B 59408e460cb8208149a93cbe049867d8cc202272aea9cd113a7f282eeb6f57b967abf7379241c8dd987e58f66f1efb36c29809176db34cdb3b2127a5ebe02f0c SHA512 7df1432cf2ddfe55c6a449d0179b771652a051d75fa34b8d3ea42d201bc64b3b18b2410ace68c263f14eb692661846a25cb0220de43abcaef13401e87f1173e2
diff --git a/dev-libs/liblognorm/liblognorm-2.0.5.ebuild b/dev-libs/liblognorm/liblognorm-2.0.5.ebuild
index f5361ff95e5d..4454eb1aea10 100644
--- a/dev-libs/liblognorm/liblognorm-2.0.5.ebuild
+++ b/dev-libs/liblognorm/liblognorm-2.0.5.ebuild
@@ -20,6 +20,7 @@ fi
 LICENSE="LGPL-2.1 Apache-2.0"
 SLOT="0/5.1.0"
 IUSE="debug doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libestr-0.1.3
diff --git a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
index f5361ff95e5d..4454eb1aea10 100644
--- a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
+++ b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
@@ -20,6 +20,7 @@ fi
 LICENSE="LGPL-2.1 Apache-2.0"
 SLOT="0/5.1.0"
 IUSE="debug doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libestr-0.1.3
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index 366914bea374..9d1a4d8854f1 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -1,7 +1,3 @@
-DIST libtool-1.3.5.tar.gz 538884 BLAKE2B 769c0ab679d5665bb729f97dc5c02b6e8921532788009425195c93971d8886547824e838a4dea559ccb365a86f600a250bccd8cb559e9be2158f9db3463f3ec4 SHA512 e7e693da0e87bc3b178b270c1d5b0d46116d1624f6e3657ad75bc381bcbba8949ab0913fe3985c77e9dd0ee519df7da9c5ee3b4f6030ad1d4651de2e642c4bd6
-DIST libtool-1.5.26.tar.gz 2961939 BLAKE2B c12ea59cc828ee7aa85ef445e3b0586ddfa8629824e308f46c74ac64dd8b73f0e4675d6673c09d76714c841f29b33000318eebfca3c5d28657327017e30b2372 SHA512 fcd39856c8cd457c97f176d5f6ce97fd93108808ce24315d179a7c9ca85bb90e799afaa83bc283ec627d73cfe0e0710d36a1ee8f39c9963cf2e806e64a0e0bcf
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
-EBUILD libltdl-1.3.5.ebuild 905 BLAKE2B 17a29c9938412946e98535f381d2b52356066803ae38807a2c7291a7bfb5b2c295d245753bd1c90f0404946e33fac288b939d65fe83317a369be8ef8aeb8dce9 SHA512 046ee53a680c7632700f78af5cb917cd8c9e284677020f36d342f88654f2253d47a3ca1ad01ec7b06797b9d8f5f64340618490f68699c23bdf124ccec503027c
-EBUILD libltdl-1.5.26.ebuild 856 BLAKE2B 2f6c7de602849dbe24517c741c281f2f98a2ed7321fc10f881cccafb3edde2e3c9e3152ba0928e23726dd0cec98089ff46d5d657db58b9287e19aff5849e1f4a SHA512 6528ff34fd44a3d5599b78960144727f2ea661809f67610ec28b23ba9321dfb2aea4271684eda20f04a99cfb734915ba1c570cecc6b6a1948ad6b756109bc36d
 EBUILD libltdl-2.4.6.ebuild 1120 BLAKE2B 120f5a7ce5097f3435635603aa80c7c8472ded3930dcbe2f0fedd5c507fa7c154d448be20e1bc330a70fd4030cbab77a3f0f7d5ba2de04b7d3cb464f55020774 SHA512 02625a3a25db9dae09ea8de1a46f6ad4e6b33801e17313bb0e2ee35126183ed64575829b4c3210f49e1b47dade56efc9c5e3b55481ec47019e1524115830005d
 MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1
diff --git a/dev-libs/libltdl/libltdl-1.3.5.ebuild b/dev-libs/libltdl/libltdl-1.3.5.ebuild
deleted file mode 100644
index 7e48b626acbd..000000000000
--- a/dev-libs/libltdl/libltdl-1.3.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This ebuild provides libltdl.so.0.
-
-EAPI="4"
-
-inherit multilib-minimal
-
-MY_P="libtool-${PV}"
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="https://www.gnu.org/software/libtool/"
-SRC_URI="mirror://gnu/libtool/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.3"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-# libltdl doesn't have a testsuite.
-RESTRICT="test"
-
-RDEPEND="!sys-devel/libtool:1.3"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-ltdl-install \
-		--disable-static
-}
-
-multilib_src_compile() {
-	emake -C libltdl
-}
-
-multilib_src_install() {
-	emake -C libltdl DESTDIR="${D}" install-exec
-	# basically we just install ABI libs for old packages
-	rm "${ED}"/usr/$(get_libdir)/libltdl.{la,so} || die
-}
diff --git a/dev-libs/libltdl/libltdl-1.5.26.ebuild b/dev-libs/libltdl/libltdl-1.5.26.ebuild
deleted file mode 100644
index 28eccdaf6bbf..000000000000
--- a/dev-libs/libltdl/libltdl-1.5.26.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# This ebuild provides libltdl.so.3.
-
-EAPI="4"
-
-inherit multilib-minimal
-
-MY_P="libtool-${PV}"
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="https://www.gnu.org/software/libtool/"
-SRC_URI="mirror://gnu/libtool/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1.5"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-# libltdl doesn't have a testsuite.
-RESTRICT="test"
-
-RDEPEND="!sys-devel/libtool:1.5"
-
-S="${WORKDIR}/${MY_P}/libltdl"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-ltdl-install \
-		--disable-static
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install-exec
-	# basically we just install ABI libs for old packages
-	rm "${ED}"/usr/$(get_libdir)/libltdl.{la,so} || die
-}
diff --git a/dev-libs/libmacaroons/Manifest b/dev-libs/libmacaroons/Manifest
index ca5196980d73..4b774f493079 100644
--- a/dev-libs/libmacaroons/Manifest
+++ b/dev-libs/libmacaroons/Manifest
@@ -1,5 +1,5 @@
 DIST libmacaroons-0.2.0.tar.gz 423629 BLAKE2B 8f3b58cbc31ad63e5e474dc76810cd921f6ee57d9836cceafcc2881518c87d185fddb48de13adb7f85fff5b831ce7abd53969ba8b0c96722909f855bb12d303f SHA512 4bc5f83b57c6a8080e646141a3c8b90c0025a894449dea4cb0ab15d1423a067b9833e70014468437d9edfe875e12ea90cae6f715893ded1eefa34f2f6506ecbe
 DIST libmacaroons-0.3.0.tar.gz 422086 BLAKE2B 16f398c93230ce745b302d212b58df1e154c8539f76437bbb49d07015c7445484fb5c187294c9a7a1fe6f33ab626a8d9a2fb4784b6bd9b652479072aaf2f0016 SHA512 57a5ffa1a8397228e29ab3f3f7d1440cd70b163b1b28904a046d7b3b1f70dbb0693ea983409f57cc63a02097a1af57209c70ecf8e3be5b8635a7ab6e498b1bcb
-EBUILD libmacaroons-0.2.0-r1.ebuild 778 BLAKE2B 5176f74627e73c6a59ea0588a81bfa6e27ae6b141bd26a0200106a2f83392d6cb173a84e45b966b4ffa844afc8af8028191c35bba657f398855e2a5dd0b2229e SHA512 22a7f6a0c5630d919ae312ab803f9b5c2958f832855e245643cb46ba4d44742b5327c3b92cd1a4700ab94f87a93060332587b8a6f86a245f417e4abdffb480be
-EBUILD libmacaroons-0.3.0.ebuild 778 BLAKE2B 5176f74627e73c6a59ea0588a81bfa6e27ae6b141bd26a0200106a2f83392d6cb173a84e45b966b4ffa844afc8af8028191c35bba657f398855e2a5dd0b2229e SHA512 22a7f6a0c5630d919ae312ab803f9b5c2958f832855e245643cb46ba4d44742b5327c3b92cd1a4700ab94f87a93060332587b8a6f86a245f417e4abdffb480be
+EBUILD libmacaroons-0.2.0-r1.ebuild 771 BLAKE2B 50ee3c521e6e240be843426208b318630c080af3dcdab51d51cd8e39c9cfda71c60e020aa851f07d4f6d9e449c1d420e064c5ffae4f4e9ebd45cdde4980b6e47 SHA512 de59324dc7c61dcdbb68bbd1de7e09b219c8d7c113acad59dfd4d9601b0ef9298ed2041c081697a1a511d4a66794a648ae8e3fcda9fe7e9edd407696495da106
+EBUILD libmacaroons-0.3.0.ebuild 771 BLAKE2B 50ee3c521e6e240be843426208b318630c080af3dcdab51d51cd8e39c9cfda71c60e020aa851f07d4f6d9e449c1d420e064c5ffae4f4e9ebd45cdde4980b6e47 SHA512 de59324dc7c61dcdbb68bbd1de7e09b219c8d7c113acad59dfd4d9601b0ef9298ed2041c081697a1a511d4a66794a648ae8e3fcda9fe7e9edd407696495da106
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild b/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild
index 448465a2c6ea..2e904c76228f 100644
--- a/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild
+++ b/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild
@@ -36,5 +36,5 @@ src_configure() {
 }
 
 src_test() {
-	emake -j1 check || die
+	emake -j1 check
 }
diff --git a/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild b/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild
index 448465a2c6ea..2e904c76228f 100644
--- a/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild
+++ b/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild
@@ -36,5 +36,5 @@ src_configure() {
 }
 
 src_test() {
-	emake -j1 check || die
+	emake -j1 check
 }
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index 58d8e39f150a..e149e0f63174 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -1,4 +1,4 @@
 AUX 0.2.3-optional-introspection-vapi.patch 2854 BLAKE2B 3e5499fc4cc28a926489c1a7b23f3dc5538c379982774328fa3168f0c49911e082502fded751e6f14b13f66c6003385ae4f79d7806a6f3f3355bc3d52fb61f3a SHA512 91c39c5ccfc87bfd484e93125112c12ec00aa191d748e2915ee06de19800d67e5d414650abb631a22e6ae3437a4dd3108aae9fc626fd8879d534ee3e790cd311
 DIST libmanette-0.2.3.tar.xz 33620 BLAKE2B ec811e0a939713e99eb931a2aa0c1b67a2de1fad4c4e399e47975b795da7672ab56a217cda94f4642f749aed1ff4379c67b58da349f8ac8434c95a80c7909980 SHA512 23d3feae3b0ba81deb75b0ff911eb37f3d0d767a0ae65815d34cadf69f78ca7f081177a2161105ea3979ba9222b3641e6b776bf4fcf3e46a9de716bdce475df6
-EBUILD libmanette-0.2.3.ebuild 967 BLAKE2B 3483687df5f2f0e6e90d89168adf644ce0f4d1ec82cabacf52cc7b93f12135bb1251b0832ed05b4a7caccbe5761b8152ccbd19828fc04a4661b81347bbd596ec SHA512 71e5b0d0cd28ec56705f2fd17cb1bfe4d3d86695f5508efeecfee72e716f60dabc9ec98a85dc7ef7b8bfb8f2b680847e263774de806633efba2709281de714be
+EBUILD libmanette-0.2.3.ebuild 977 BLAKE2B a0ee112e80695c4e1d08df111bd9d9005abb17f5b8df9528c36c6ca5a184d2c2282811ebbd21fd879106dddacd8c95432e988d137ba82243cf3c104a0850cf75 SHA512 7af56fce47f39cf1cb73432aa2c59cb7553818ddd93cd0fce881d262d2931ab20e8f567dd7c10821b4af9397dba37ead0f38e7c550226373a4ce6628aaf4ad7a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libmanette/libmanette-0.2.3.ebuild b/dev-libs/libmanette/libmanette-0.2.3.ebuild
index 3221014fc7e6..e936a0a38c13 100644
--- a/dev-libs/libmanette/libmanette-0.2.3.ebuild
+++ b/dev-libs/libmanette/libmanette-0.2.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="+introspection +udev +vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index 5e47235b1ad4..1f9f6e6de1bb 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,5 +1,3 @@
-DIST libmirage-3.2.2.tar.bz2 234131 BLAKE2B e3f2825b9e799447a6201f8d46fbb8cf229a5393c73d85ee8a230225603f5e42cb07af4e984aa8602fcce667b16c2af7e2ef9d27862022327a39d0b7189c1eb1 SHA512 f41a095d7a9a3bb0d00ac2bfb8ad443d8d065f446ca2635041e24a570b72c14a27d3c3b300d5fa941253284c4b05b1913715c1169cd26a80db920df9d27cd535
 DIST libmirage-3.2.3.tar.bz2 234761 BLAKE2B f3fc24dae81643c4fea99d12e4f7f1d600586a7c5e546e854d4391ecb11f39a6d1108ac86c79b917fb96cc53424975ff548522a0f0e035ffd4b99638fc18608a SHA512 25cc3ccfac9332d06edff7e73d992e9d74b7464f61b857c3fb40ec9e2584a8f61b8aaef96a6d6f4b8f3a7c871b6b7b7803502d5e1ef771fc239021a827b90f09
-EBUILD libmirage-3.2.2.ebuild 1128 BLAKE2B fbf5a809841d07edef43316e9363c6405d1262c422431f3623b882df6f0972cf1ba43bffaddb608ae865ff8d26728603b08169199e61b40d1d5b2bdb81950977 SHA512 a793624c4915c326d3fc99dee5ce2a103f8f82bd3322ee83ff438413fc0b1b1d7619d40c74b5cc7cedd9a708ad69f405ca5ca1ede848a14bc118a656905702fc
 EBUILD libmirage-3.2.3.ebuild 1160 BLAKE2B e5a33aa6a2d9c3827a7b49b0de806072c291ee8a16f5448542508ad3a5d03edbfe2e3f479eec61e9a40f24d3ca1001b244486e04cdd44a2debe26d81ed3b0b91 SHA512 bfcaabfab5dc6b9f265cbfddef81c61ac975d0e1ace22fa300943cda0ecc1c28c984b4719e8fe88bc2a6e07ab6f24ce457a7480db730d8f210cbf46aef5ee309
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/dev-libs/libmirage/libmirage-3.2.2.ebuild b/dev-libs/libmirage/libmirage-3.2.2.ebuild
deleted file mode 100644
index 27a19f3b1757..000000000000
--- a/dev-libs/libmirage/libmirage-3.2.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="CD and DVD image access library"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/11" # subslot = libmirage soname version
-KEYWORDS="amd64 x86"
-IUSE="doc +introspection"
-
-RDEPEND=">=app-arch/bzip2-1:=
-	>=app-arch/xz-utils-5:=
-	>=dev-libs/glib-2.38:2
-	>=media-libs/libsamplerate-0.1:=
-	>=media-libs/libsndfile-1.0:=
-	sys-libs/zlib:=
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGTKDOC_ENABLED="$(usex doc)"
-		-DINTROSPECTION_ENABLED="$(usex introspection)"
-		-DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	local DOCS=( AUTHORS README )
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/libmissing/Manifest b/dev-libs/libmissing/Manifest
index 15bd4406e065..09348dc29f89 100644
--- a/dev-libs/libmissing/Manifest
+++ b/dev-libs/libmissing/Manifest
@@ -1,3 +1,3 @@
 DIST gnulib-b451121ab45497e78cb6f612c8673a9705193391.tar.gz 6666079 BLAKE2B e7d3b9478697067b57ab198e044f3c854128d5fe390d30947829ce4f34c695a748668c33ae19690e9927fff6df3e194a3160cb4adb7cf47235c603241c66889a SHA512 f6e165cfc0a3999c778d9f43ffc90ff9b569a77ff1e54ff5c50b12b0eddf262c24da8cd2719548574e0397535bb0eb835eef603cc74769f7876ef9db101bebec
-EBUILD libmissing-1.1.0.ebuild 4144 BLAKE2B 4af50fbda40b6218926a43a0ab09e2706fa85aecb0b0a4755158894320098ade390d6dc9567b3d5a14cfb582f936503745afbd0f4c0acff9b068bdc4746c0eac SHA512 0cef22a263bd0df8ddd44901ae1c51fd888801756ff55409a887861704fa4f7bd4ff9751a0fb80c3cdd4cf8a158904be836a97be7db9bfb3fbd61a7b6a1159b0
+EBUILD libmissing-1.1.0.ebuild 4137 BLAKE2B 59aafb31b190ca6ea857cbfac6f8f33a60cbcaa22c1ba316abe516697b379ad71b8495415f7473ebb388f1b6261ac676281d48675ac55f6c81a9cfef1f145305 SHA512 e88fe685af2b37dbac4ab3bf0346c4d48874fdeda028152dbeb241cd062005e7c35a262d2539e2deedff7576c15a1af5e280c30883e5ea5ce931e5ec4200e321
 MISC metadata.xml 393 BLAKE2B 8fdadb018197632713de833a7b64d961fa8ce1b86db6996fad32484fa09eda403a7bbcb50d3502ac02888b44d56971b0241a9e0902366f10d79017d50e46289b SHA512 8b5739afeacf385f9399745c6396506060f425376e47e0fdc9ca05c59608dd9e82bee2dc385f34c27f96ad8df41753fe05dd90886a81f613a910c76d50bae422
diff --git a/dev-libs/libmissing/libmissing-1.1.0.ebuild b/dev-libs/libmissing/libmissing-1.1.0.ebuild
index b7099ebe7775..a60e94ec453f 100644
--- a/dev-libs/libmissing/libmissing-1.1.0.ebuild
+++ b/dev-libs/libmissing/libmissing-1.1.0.ebuild
@@ -135,7 +135,7 @@ src_configure() {
 
 	# gnulib cannot be used a shared library, doing so results in stack
 	# protector checks failing for reasons yet unknown to me
-	econf --disable-shared --enable-static || die
+	econf --disable-shared --enable-static
 }
 
 src_compile() {
diff --git a/dev-libs/libmodbus/Manifest b/dev-libs/libmodbus/Manifest
index fdacfcfa74f3..2143ff1086ae 100644
--- a/dev-libs/libmodbus/Manifest
+++ b/dev-libs/libmodbus/Manifest
@@ -1,4 +1,4 @@
 AUX libmodbus-3.1.4-doc.patch 358 BLAKE2B 7f69a497411d308bc02f4881802cbd2b17ef2dc9edd527a6f9ecfa96ed70d3336f79b20c4ab8297062802465fa174f0adcd4d3ac81946eea8c1409a23b067278 SHA512 a73147873d0ddb3338608cb7bd4a44e6e333b46313e9326e7442b6b3c3fd4da97cbf93f8c92e517352d8828cc6ab6eb95a36e7fcaaa62a48774bc8f4a109b6ae
 DIST libmodbus-3.1.4.tar.gz 471576 BLAKE2B 4fc57abd784e2cfb65d19cd55a31f4b778a209141cc13b9c969dbd6052f187ba0de0031105be748aa2113f345bdb16c2b582b53635b5334f06dfdb34c5992a18 SHA512 63f73894b27704f5e5b3ca0a364cc366c5b5d24903bb24384155890cf06c0f8e5c707a435a38129402ff6628ef3d611dd0db82f840b79cf1d205ebed2ac5681c
-EBUILD libmodbus-3.1.4.ebuild 710 BLAKE2B cbeb5b7a89a2015024d24f316d04a0f3bc1888b8869b3e6a764561738d057ac3bb250441da4556987eb1cc28e926a973afcbecf3f4b138d451b4f22ee718af0d SHA512 ddf366f800f5a3242b2625978f2fdd804f97521cf5368eea9ba6d241378402d1e48f12f578ff68ace2c614d01ba8d26e3af1de55d983d7642abe6843d882d97d
+EBUILD libmodbus-3.1.4.ebuild 737 BLAKE2B a89079a9c3fd16bff365879467f1f98707a83e34e1524e874821390ea29cb53b5b1e8dbfb23971f21035ec3c0814e40a56cec7064eef3c5e6cfe0a42a87ec0a6 SHA512 27b39d5db810d3d5c835644dacf8303d281b50f5eb27e3a78f6ff47fcf9129353b16ba83e3b6602a8c67a2cd96a955b3040bfea2f6c1805a635e8eb1db2e7cd3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libmodbus/libmodbus-3.1.4.ebuild b/dev-libs/libmodbus/libmodbus-3.1.4.ebuild
index a0367b70eb14..b8b3f359a002 100644
--- a/dev-libs/libmodbus/libmodbus-3.1.4.ebuild
+++ b/dev-libs/libmodbus/libmodbus-3.1.4.ebuild
@@ -11,6 +11,7 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="static-libs test doc"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="doc? ( app-text/asciidoc
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 0a00becf95af..87190c6e09e1 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -4,9 +4,9 @@ AUX libnl-1.1.3-offsetof.patch 320 BLAKE2B 5edb7d935321ae40784d16fdf289470deee86
 DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4
 DIST libnl-3.4.0.tar.gz 933443 BLAKE2B 735da9f800277c48a5deceb78084f510f56f7017b1184e91b2bb45ba61a2e95355e7a3f5d0a74bdaf7ae003393a6c7556d5b201d0d0052dfc66042aa9e137986 SHA512 6336e5c55c79ff2638de9c812cc1842871769236bad7f65c547dec35fafd91988b257fceab144a0cc133c4b29f61172f6552c53aa9fc723bdc783079c2b1851e
 DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
-EBUILD libnl-1.1.4-r1.ebuild 1165 BLAKE2B c53d5fc1b86e016bf89cf590a9bb8f65f9abc45d4a994d9f405a63d35415234dd8501c7bbd948ba10074e2c5e48e08426a1484fdebc95ef82c345e2539edd6f7 SHA512 2c28a5244287710b2b69aabcd210cb09304ba487e2fb35872243adf59c46af6281606b18c0a3a6de3544b04ed952640a7452c2b9681b14b5deae33374e8b0601
-EBUILD libnl-1.1.4.ebuild 1141 BLAKE2B 16521e18a8b986a96540245ed54c5737c1ba8d17d3a492fe34b2e504216ba21186d1eaf4685716894f826186a87dd3b4ad82c87d9a4e439cd984fdf0472b4828 SHA512 1c63d4eabb1268b349918acbdc3cbc7d2fabc09a75e4b07793f1e380309404f460bfc3b90c7426377d57be65f5b679a5d20155003ab589497b225dea2f9c281a
+EBUILD libnl-1.1.4-r1.ebuild 1158 BLAKE2B fc2e62c2286a6c5d5ea686ef638a6f29b458f8fc7806ebb29679da77fbc660c086d7122d8e02d732f1f5bd1e5cf073f817d8148c5e0f58abdee8cf35b0b96ee6 SHA512 3213fbca3c960b4d5088f2cc8fba234a1d49a3da4ce617aff11c9ea0207776dc2744143e1989ceb0368c2925318fdee16b9e191183be6ab212cc19ad854f83ae
+EBUILD libnl-1.1.4.ebuild 1134 BLAKE2B b65fee4f8cf8cdce4b923b1b8e0eabfe722e0ccf8fa856fb737a236bab8041c4cf5d3a05213a5c4264d9c1b432584121730cf8d55bbc3486255dd99d0a048b5d SHA512 95ef3ec713c5a739dec59512c597ce983c85db0535075db0245084a33a66ceb59867dc8b935e941a952d581c3b6396bdb11f211f42c45ba277c41710539c2bb5
 EBUILD libnl-3.4.0.ebuild 2407 BLAKE2B 7bb952c54ccaa828e964afae46e02aeafaaef93eb357c09b70f5c56966a11d261f40a402f41668adcd781d5b006e2d971b2325aff594024e71da6d9dacd92677 SHA512 a2a65e942a7f2dd0209a2afae4964af96d0133fe73cb76b8cbc9131e9b8b246b74f05a1869a10c25f0ce539bc7c7bae4bca7ff6639ade62a031245356a1db05c
-EBUILD libnl-3.5.0.ebuild 2412 BLAKE2B 823b9e509a918f65e677233921127990c063e97fd6c8c302e924917428913c2da2de4649daef6a88ebd4d6e3acf3b0c49d905e239f8b5a259d6c07275222ee41 SHA512 b008bbe84e8f5e90f9de71442d8da8998448bdbee8e726f4b9d57e9e5720b35c934da55dfe25748bf39837cce03cd6d23cf26038cb3c4ac111543028019c0cd9
-EBUILD libnl-99999999.ebuild 2175 BLAKE2B 68c392e976282c0b90ff94d94e7fdfe114f27e5a7f9edb3b799a3963fd3cc4e2e20cfa87ec9bf594dc2ea6e2c6bfa1d5106b361aa2f645eb6b25a5337a05e746 SHA512 ae82c5142e5340ebc5d0f86e959bddc7d22bf953b0134c6c43adfece73b39336106449dd425b2aabe2763b91b9dd2465236044b0d5cea8b1dbce4e1ed487ab3e
+EBUILD libnl-3.5.0.ebuild 2415 BLAKE2B 265d1301c9ab6b1b7f2520a73362e47f4c3807de40753e23fe267d940c5afd03da297aeb8111e621cdb1d63e91ba9d62f691bdc88f8d9116a8a98c3685308a0f SHA512 f06ae6288052c8f418057f099f06c6f61e2c34f83f1cd553dbb485c940d623f5846aa66faefc2282bd5ec754aac9ca434926517e60d72d585abe6caf52f8fd63
+EBUILD libnl-99999999.ebuild 2178 BLAKE2B 34f58a37452e3e5d9c9d521fe588419205738df9624770b7d52907a6cb090e97fa035114f578ff4dc162f91584c6bfed20b533c5ae01c283e7af5435acd54a52 SHA512 7466acda717417aac17fd817ddaab417342e2fe24e29f85aeabeb2b2bc4020da15f6876f359a78989baecfac5b8ee8621d25f42adfd1cce3419d85c089e09945
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
index 2b9928fc0566..39205ce0c9ca 100644
--- a/dev-libs/libnl/libnl-1.1.4-r1.ebuild
+++ b/dev-libs/libnl/libnl-1.1.4-r1.ebuild
@@ -42,7 +42,7 @@ src_compile() {
 
 	if use doc ; then
 		cd "${S}/doc"
-		emake gendoc || die
+		emake gendoc
 	fi
 }
 
diff --git a/dev-libs/libnl/libnl-1.1.4.ebuild b/dev-libs/libnl/libnl-1.1.4.ebuild
index 686c171132d1..8fc958567840 100644
--- a/dev-libs/libnl/libnl-1.1.4.ebuild
+++ b/dev-libs/libnl/libnl-1.1.4.ebuild
@@ -39,7 +39,7 @@ src_compile() {
 
 	if use doc ; then
 		cd "${S}/doc"
-		emake gendoc || die
+		emake gendoc
 	fi
 }
 
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index 32fb308b60fa..ae230e8101ea 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
 DISTUTILS_OPTIONAL=1
 inherit distutils-r1 libtool multilib-minimal
 
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index bb976be45138..96cee7696c84 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-99999999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
 DISTUTILS_OPTIONAL=1
 inherit autotools distutils-r1 git-r3 libtool multilib multilib-minimal
 
diff --git a/dev-libs/libnsfb/Manifest b/dev-libs/libnsfb/Manifest
index 1ad6b52b2438..100963f2358a 100644
--- a/dev-libs/libnsfb/Manifest
+++ b/dev-libs/libnsfb/Manifest
@@ -1,4 +1,6 @@
 AUX libnsfb-0.1.0-autodetect.patch 734 BLAKE2B bba90c622e559b8238672068792a558ac408954b85cc9798b12163564837e4fb44ec80eca33ca856e5344fafeb862a3eff43bddca27a9ae7603478505982a440 SHA512 72f3af574fadf38a514a6f6d4d24246ad1e76d9c9daa9700f0b37cb465f7afd4e4d7fdde6e53657740db3a6f87f1e8bfaeb1b008c43462d67f224c728af98993
 DIST libnsfb-0.2.0-src.tar.gz 82322 BLAKE2B d805478728015663b4bf9c8de018bda33dcd84a7ace7246c450a7c31cc3358f834ade21ac1df9f0ca0e4dcea1138369cc3cd9ac468ebb484cce139d4bc89441e SHA512 b90eca76c8dcb22e554e13b5bea4268e5c9fc6e4711bafa5acbed92cc83513c3a3965208b3956de250fb3013cc3db6a33922ded471fa7a24bde97f748d2212c5
-EBUILD libnsfb-0.2.0-r1.ebuild 1173 BLAKE2B 77786478bf9c16f0cb9cfd32aa8a2810c0f9b5e5514b40de69f2d8ccf3094ffe514acb1763399bcadf78a0b65a216e4cb982ea69dc291c89b16776872ce5f897 SHA512 fe3cf0b6f40d492d45f1230f0eceb9adacd4ef34d4031bcadc9e2ebf6fd68157016f2bb0e13eefa21b3f0675330129d7756bb109b0e740decb80bb4f714e1e26
+DIST libnsfb-0.2.1-src.tar.gz 82357 BLAKE2B 2904b8890fd1ce3f6eb8d327db09c7b38146d5d16499beecbe56efd762e33d6ee9da3394ed7923ad43a89fa41e45602ea4af2710dbf2f232b42a038ee90abdcc SHA512 f8965aeaab0d8e7c2676bac56ae67bdf6ef651ae84c62e01aeee888807f1edd7d65542cb14027a8f1a207155a1cc54ded9112a42bf9e7a8836956bba38d365ed
+EBUILD libnsfb-0.2.0-r1.ebuild 1200 BLAKE2B d20cdbd2c4557fd6ee74b4b60e6726360a1a880e18397f383ddf09183fc219828dac79ef072d8be3993ff821285687eff58aa82d866203cddaab07de98e58b54 SHA512 286c61ac9f6b183a18b6a889c069b3e6c4efa56c05b8b7f5b4ee05733408852e35f37e10d4fcbd5c001b304b3ea39a8b8b95ec603c07dc0a42489a85c4c55334
+EBUILD libnsfb-0.2.1.ebuild 1192 BLAKE2B 979d8a75d13b92f6aa60894d880b35150be247660372c7cb9c6f964d034de2adb78bcf53af9581e8799786e6d7ef5ea2e4289b1220338dd613150db1779ced02 SHA512 959a10d04baa87295e90b75ef786982dddf4ed5b802fc6a59e2f05418b4c195b2ebd8f154ba9974187843440be8615131e24ccd1ca4954ed310f3625e2478ced
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libnsfb/libnsfb-0.2.0-r1.ebuild b/dev-libs/libnsfb/libnsfb-0.2.0-r1.ebuild
index 29f239271066..8fa09879cae0 100644
--- a/dev-libs/libnsfb/libnsfb-0.2.0-r1.ebuild
+++ b/dev-libs/libnsfb/libnsfb-0.2.0-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
 IUSE="sdl test vnc wayland xcb"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sdl? ( >=media-libs/libsdl-1.2.15-r4 )
 	vnc? ( >=net-libs/libvncserver-0.9.9-r2 )
diff --git a/dev-libs/libnsfb/libnsfb-0.2.1.ebuild b/dev-libs/libnsfb/libnsfb-0.2.1.ebuild
new file mode 100644
index 000000000000..9c7ec5bfe438
--- /dev/null
+++ b/dev-libs/libnsfb/libnsfb-0.2.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="framebuffer abstraction library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE="sdl test vnc wayland xcb"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="sdl? ( >=media-libs/libsdl-1.2.15-r4 )
+	vnc? ( >=net-libs/libvncserver-0.9.9-r2 )
+	wayland? ( >=dev-libs/wayland-1.0.6 )
+	xcb? (
+		>=x11-libs/libxcb-1.9.1
+		>=x11-libs/xcb-util-0.3.9-r1
+		>=x11-libs/xcb-util-image-0.3.9-r1
+		>=x11-libs/xcb-util-keysyms-0.3.9-r1
+	)"
+BDEPEND="
+	dev-util/netsurf-buildsystem"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.1.0-autodetect.patch )
+
+DOCS=( usage )
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
+		WITH_VNC=$(usex vnc) \
+		WITH_SDL=$(usex sdl) \
+		WITH_XCB=$(usex xcb) \
+		WITH_WLD=$(usex wayland) \
+		$@
+}
+
+src_compile() {
+	_emake
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install
+}
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index 0a8c10ccb96e..5895a8d35d41 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,4 +1,4 @@
 AUX libofx-0.9.15-docdir-nothanks.patch 539 BLAKE2B 816194bff853bfec0cee811a2906a3c09143e79f3935e66f3ea7693bb7a8befc8a3e23bfa82cf612a928a4417554ccb42bfefa6885230fe33f27177d85d364c0 SHA512 819941c94e9c6ed393f3224d70a0905bd58d6d30d7b9f5fff68554f0d22030be9b170b44542fd70c7d6bbe3b3e2ee011cbe286e72d6b4bab2f05a3d1610cf0c1
 DIST libofx-0.9.15.tar.gz 207361 BLAKE2B c84fd4593a9888268c691653dc1b5fff5c38013f12ccc4a8454f9a5026ba190388e5747074aa800266efcfd49a0fdb391a605d5837f664bdcb8fe1dc5c064839 SHA512 6014bf9c457adbe9053a47718064e6246c911c3bf081c690bf761650220208aabe94824aaa38794c1834462894b7948a06b3ff6b517a9a84b9f881ba51aee3a1
-EBUILD libofx-0.9.15.ebuild 1003 BLAKE2B a665c10d613b4d69fbf71c7c952b6a7e7de11fe368d62389e219dd4157ece94d101e47d7b3c60f93e2ab5fa14945eb2d829b346ae5e297102fe281a6918b7b41 SHA512 3d4d1189a88063b6b52e6b49fec5633727f1edacc5e95ac8d8aa2e56140fe90bf0b0be0b870c307d0d9decb556a7b2d947cac47194be5125285479d8cfc76ab9
+EBUILD libofx-0.9.15.ebuild 1030 BLAKE2B 9fd2e976af0d9572e4981838e43e1611fea898dcc7f2c730703ff0d3234906fe907080ac6fa9f9594f1a1c88f706cfc7958126767271ca96f718ca0d25271321 SHA512 0854a4dac4a275fd70f47b336ec29b5c7cede9905d679d928129fe88ee64bdad834bf7f701ffd97b97e4c97378dc551157d6eaf861a74e54ff5f9f9e6bcc0274
 MISC metadata.xml 243 BLAKE2B 1611cb7b6df68e87374031fa563dcb5388243c0df9537b81e1c53f05cc297789e1f4d178edbbc8906af7a6b0ec549aae225662f87df1d48dc4a6fa2cc2c703c0 SHA512 fc5071bd581b91f72ea6f021641f47d46d1e6038cac7bd34bc13d94e6229441e3b2f7cdd981490a169d7e645339fe4137496a0eb0956014027ffd42a5b9814a8
diff --git a/dev-libs/libofx/libofx-0.9.15.ebuild b/dev-libs/libofx/libofx-0.9.15.ebuild
index 9e4c2c66d82d..2342fd3e1537 100644
--- a/dev-libs/libofx/libofx-0.9.15.ebuild
+++ b/dev-libs/libofx/libofx-0.9.15.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0/7"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-util/gengetopt
diff --git a/dev-libs/liboil/Manifest b/dev-libs/liboil/Manifest
index be5ce6f522d1..b5563c9d76b4 100644
--- a/dev-libs/liboil/Manifest
+++ b/dev-libs/liboil/Manifest
@@ -1,5 +1,5 @@
 AUX liboil-0.3.17-amd64-cpuid.patch 1040 BLAKE2B 4cf2a34250d08175c7bf466b93fea90c0b4a793561b127a8658ab4bfa354cd8ad5124655a305ae6f4437c504092492151b18b02c7c32fbacafebc8608bd5e82c SHA512 f77100d5e8270cd137b3061904009c8f9f37648e85fa2d82bbeec08d58886dc7a8544a39331ad7854b9db17890092944a74ca12fadc73c24fbc40feacfc50e73
 AUX liboil-0.3.17-x32.patch 7762 BLAKE2B f3402d64fa9ef13e488aa07d7565782b38e585e7ab73e8c6d4c33882ba138734c1369b87ec549850f9cd9b9d2a85cfd0e3972eb038863c1b632fc5ad2c34a9fa SHA512 83201a8a03a3785f228d9bff916928d80fdbf8abeaa27f715956c09b2a2eaffcffcda97e680abbb7b29b3f207531ee935489c1f226796a34968284751ffbd8d5
 DIST liboil-0.3.17.tar.gz 912563 BLAKE2B c7ad7cc4db422fd2a3fd2be01b81a8a2f4c9acbc7407955e30b8ca6d39b79a235f383b4897e01a51a9ed47f4476e321a0bd6522951a125acc2da85f38ea40770 SHA512 26f60d37af8aae435ff17f2aa852a4e52cebd96ef7be04cb4dc14c61bc42160e333e317e5b33f05f6d4b6c819b15c4ecd1d4c03018515252daea26dd4ed60145
-EBUILD liboil-0.3.17-r2.ebuild 1591 BLAKE2B 8fcc8174b3d342191e06ee7a47a7426b6ade687ceee12b6ee6eff42da72bb2edb0b060f9e8b06cdb1bd3c103d32febc35ba4b284b532c97b93388937e2b23212 SHA512 3c6efce8cf6816b4009d6c38bb50fc02c02caaf70349de26646cbcebc1cdb279cfdf796c5ef06f81ca50adf5ec76c23b5204066e76caeef7630d9950b31a98c3
+EBUILD liboil-0.3.17-r2.ebuild 1615 BLAKE2B 368382f816b2a2a52d1044f1e031dbda8a8ef350e2d7d21c8df0fe17b873b784f64332baeec9fa6d23ffdc206595f863c218467c7f07056df86a3003d9677477 SHA512 7a53997129988696769781939bbf260136ed750ec180cff1e09ce817ba04a8b9a81514ce072f68105d76b754e679e6f3470b11d86e3d4cdc7fbb7aecf74b60b5
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/dev-libs/liboil/liboil-0.3.17-r2.ebuild b/dev-libs/liboil/liboil-0.3.17-r2.ebuild
index aa340d2c9640..82cffebe44ec 100644
--- a/dev-libs/liboil/liboil-0.3.17-r2.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,6 +12,7 @@ LICENSE="BSD-2"
 SLOT="0.3"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="examples? ( dev-libs/glib:2 )"
 DEPEND="${RDEPEND}
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 5f321173427d..403f9046b36c 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,4 +1,4 @@
 DIST liborcus-0.14.1.tar.xz 1894680 BLAKE2B 0070baf319bf35275f36f3082141f154404ad43d8143588b35c00b8b536f0c1cf5bf38fd9e997c4be45a454f16de1cc1a25186da40e3ed0606a87e9a6a968053 SHA512 a32dc5a652ce99cff37273c38fb9460e13e7bfb562f40c8d0c79b65c33e340daaeeb2c796308ca700b85bfc13cc8215641563b9e9f6d44b7d61adb8e8a3c950f
-EBUILD liborcus-0.14.1-r1.ebuild 1241 BLAKE2B eda54e39c6ec27d9a5cd580d7d345d0b9abc99f6173bbc50e684dc18a263608b9569417d58268c54ec3fbb6289d3fbba28710146de8081eb0bef9bef2773e70d SHA512 c212f0a0eba560b736796a1c33ba6ddd16d94bee5325156bd285e005a555e8f9220a933b1a88ba8ff65baa1d5f0ab85511da028d4daa8df2dc2fa13f32a334f1
-EBUILD liborcus-9999.ebuild 1244 BLAKE2B 2a570591cdcc1cfd6ba09cc69ffbb3b9d871b891daddb36c91c36a1453f2f4a07bd5f9e1365c6ce1c14751f4dd62624ef3c3e7650a5bbbf0749ade067d9bdbc7 SHA512 8b1ea73e5181973b5b54b2664b38108b50d5d64c52d8eafc0117898c56bc6a7215c49cca33aead55ec0c2e0fa416020ca631cd554d34dea46f25e26912768bcc
+EBUILD liborcus-0.14.1-r1.ebuild 1251 BLAKE2B dacc22dfabd0b60082fac1a0f2d3e3befd7069221ea13a5480db30c159712b1ec448562b10700295713fe3804bc94012aa91691139077feb9b06741b2004b198 SHA512 62dd07df4e38d7b4cc53f7652f2414b871b1c8c3241d10efd3cd84a1f08e48d9baeaecc7651173d5b83839ad0dbb5532d34c75c63abb6567ce23b6a73f740b48
+EBUILD liborcus-9999.ebuild 1254 BLAKE2B bc159c5877c0ca9f8e894f5012a1c633646b11945b2f4d55d0decf11d7546d5b62425c0c12254b6c503b8d748e45de9a3b1feec37f33e0b5bb4969283db4ad83 SHA512 fd18b355a545bdf3c6f8ca11c9368b7c45ca8c1a5e676dc635a79c5770e9878228cd3754133eedcac802fe0053274c9c90990982a82008fccbe50a392edd8f5b
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/liborcus-0.14.1-r1.ebuild b/dev-libs/liborcus/liborcus-0.14.1-r1.ebuild
index fee41849ef82..aeecd518100d 100644
--- a/dev-libs/liborcus/liborcus-0.14.1-r1.ebuild
+++ b/dev-libs/liborcus/liborcus-0.14.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 inherit python-single-r1
 
 DESCRIPTION="Standalone file import filter library for spreadsheet documents"
@@ -53,5 +53,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index 97a7a49aaa21..d6dee020e344 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 inherit python-single-r1
 
 DESCRIPTION="Standalone file import filter library for spreadsheet documents"
@@ -53,5 +53,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest
index da023dd59568..09337e69b160 100644
--- a/dev-libs/libparserutils/Manifest
+++ b/dev-libs/libparserutils/Manifest
@@ -1,6 +1,6 @@
 DIST libparserutils-0.2.3-src.tar.gz 74509 BLAKE2B b9b68a91823181e7a95ec94b1a117da27180afe4ff2b05da279cf59a0b126cefb78712cae382c24b377292e4b5802273b1f9bd8ac52969a3a693da635ec88f65 SHA512 b68cbf3a3260bacea10c8115a1c247de3d7220e94a7f73da84ee4b400678132d8db71b8e84fe92eacafc4945c111f049779c8fead4cf9bd98c6e96340943d270
 DIST libparserutils-0.2.4-src.tar.gz 74521 BLAKE2B 85e39d64bb8365f95da227e3a52ea2a2a85b0f913f861117b496bdff1556b8ca880189325995cf02eeb51f2db76c917a63f59ee1a1fed8fec6ce43dc16f9b66f SHA512 e6a7b618e00e2bc69a0de63c29cc809f250fbd1c10544523c563f4bb9ac3281e02ba36c096518fc0a9074dad49a05346b04cc85b7d972f88f2645af0f869cbc2
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-EBUILD libparserutils-0.2.3.ebuild 570 BLAKE2B 831f0a7473a068b051550eb316c096dcd4b7e5007210eb86d23136967cf7be7769964ceedf1caa77065c1e9e0b3f9f8af2d03cc3274c12e0e29e2d0085d2c1e1 SHA512 cd4cf38173e2231dd443c3c534cf1470566e6ffb8645341d9679fed0d469125141a52a6bc4078035b6f81c6fcc5eaa8521217e6864584a0df1edbe956f0a870b
-EBUILD libparserutils-0.2.4-r1.ebuild 907 BLAKE2B 3baae55074a4df8cb0eb0cc22c88e425c9b1c4d6a37129b8f55a86eb1a60a15fc4a8ba84b975e92ce5211d8833d333ac89dd91c9a819e55a8fd3019979e65ea4 SHA512 101ee3de44ada6a8c4558a7f4b1a827eb19cfda77760ee0b4f0b4ffd8324045f178ed5658b6a167f9bebb772e86f84f9356b5c4bbf6f44a6983a0aa485b3353b
+EBUILD libparserutils-0.2.3.ebuild 594 BLAKE2B de28d631a4441252c99427514903d940386ef97b58dd2c2ab887a99d523c97f18485274e4399d3b0924b4318397fe165699599e2479463403a0479cdcbf1b011 SHA512 da4fe6b526150b45a9bf6d16f412309122564fb1470bf92e5d4f54b425e98ba8ad33aeee0b5ed2f93c9c7383dc4cb320bb3e6ddac1f954ff5e4ec4bc1ea6240b
+EBUILD libparserutils-0.2.4-r1.ebuild 934 BLAKE2B 378fec1f77551f4e4db9c7f252c3c28e8f5c7f2e8f6c7eb5851ea5d94163a5dce7bf76e657ada03ba45e2dcf071437a7f1a6acd9d1855e5f90664e1c91f824df SHA512 cbca327cbe72cfc78d552051439d3254da9c64239fc2ba9cc6f2cf585e33ebd75c7b7be48836dba461a40125ae60ca5576d304d4783cb959868b59af00fb673f
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libparserutils/libparserutils-0.2.3.ebuild b/dev-libs/libparserutils/libparserutils-0.2.3.ebuild
index fbd60a61302f..6a0e8a19d96d 100644
--- a/dev-libs/libparserutils/libparserutils-0.2.3.ebuild
+++ b/dev-libs/libparserutils/libparserutils-0.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="amd64 arm ~ppc x86 ~m68k-mint"
 IUSE="iconv test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (	dev-lang/perl )"
 
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
index 1fa78d758f96..2083bdfe9ea9 100644
--- a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
+++ b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~m68k-mint"
 IUSE="iconv test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-util/netsurf-buildsystem-1.7-r1
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 690166d35474..1c70ca1257fb 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,7 +1,9 @@
 DIST libpcre2-10.33-patchset-1.0.tar.xz 17812 BLAKE2B 7a6e73101ed12676e1acf1beafcb6bc84d99d588a9dc0a957697380d906474f6ac59ab509e6c7ee5a0879b8d6ec9d06a0aceb8b02c7b16f73602d034927dc836 SHA512 4a0e86756cb96e6143df3add6cd6bca4fb9bb8fcb6a4d2df1530847b946b2494132e9842da01d75b385c33555d96e25f1390788b9e41ca320c1d65f31c89b281
+DIST libpcre2-10.34-patchset-01.tar.xz 1208 BLAKE2B 615b7eff085bd52bb3aed30c90ec5b8cec406f96c58bdfb0304dd59311517662067e68f85bc9930ed6f749820ecfe3c483e261616187bc1077ebb053670d4950 SHA512 d881665701bc330f237d19ee48491a81dc8b952b0b8e529eb83c3ffdf14710f68eb934f872ed76ef6b0bee1864261453e7e71e60e14217c004e4e12c6baa499f
 DIST pcre2-10.32.tar.bz2 1641814 BLAKE2B fdd512312547ae90b36b6c9eb86b6fcfea9b03fcfd9766063c901819c6bf7536e1f3da89bd69ae62309069bc07c705e96e81f4a36355bf934c566f343e3104e4 SHA512 3d712e7d6afbaef227952680ded69fadbdec0b1abdfcac17cf071415c3c93edd152d6d268dec80570aedf24f82ba954f74f5f9e62c9b9991be75080a3d6ab5fe
 DIST pcre2-10.33.tar.bz2 1690739 BLAKE2B e59cf47a5068b2ec2d647d6dfe1cb5f8d6cdcc6fc6b47aa65a4c3d5aae256e7f0b090487d372c62aa7ec7f15a1f037650088b53385fc2fe31aa405878855e5d5 SHA512 c6aa52cdbb0c906b02e9a9f255697a1b9b99d9c7dccdaa484ffdb04fe3582d232ba3cb3c421d6df589a387b415dedb0817f58ec5391488b25b4e7bd9da6bab8f
+DIST pcre2-10.34.tar.bz2 1714731 BLAKE2B f731339b3acdb084ddb1462cf4638edefbfc4a95e63e44c8c75ded55fd9b98334336dbda5f31bd8e9410e63ccd83dc7e707cc20f03df4d801f182ff4939b6cc6 SHA512 77ad75f8b0b8bbfc2f57932596151bca25b06bd621e0f047e476f38cd127f43e2052460b95c281a7e874aad2b7fd86c8f3413f4a323abb74b9440a42d0ee9524
 EBUILD libpcre2-10.32.ebuild 2337 BLAKE2B a6659156d613e53ef1bce927e42c1a948a73868278c335bdb49b89bdc1b5dc9090afb994635e0395921748312c84ab1125a3e5acb66d916540795c9733e7fcc3 SHA512 9c8ebe7887d4ae6c6cf4138ec62021bba726a2052cb7b3c1d34ed276310e3b18e4c01d3a3ba0eb048e8234f2a72418e3749141a3bb0121c5193cfcdd72879fc2
 EBUILD libpcre2-10.33-r1.ebuild 2511 BLAKE2B abcd065375574623703679dffbb248dab0262e04a6a664f34443dae45865be1785611107cc5e58d9f76777cd8a87d74be6e785709ea89d0bbcec73a8a3bf8f99 SHA512 01fb195504b20e6fe88cb066fcaecfae1d133958d60ddfd5a9b3c96f16770becdee5e95d8230356e62c8200e2d625c8331068c20cfa3fd57821d82a37d466f10
-EBUILD libpcre2-10.33.ebuild 2357 BLAKE2B ac53d62cdc00e46b508cf3a554342782df4bba0ed0f772a3e33204f80378fe70349df2b2989e79845f6979ac42df99566820439cf26ce401236b30913651fa40 SHA512 93dcd6ed77ed7f193c7409f8847f209513b69d09adb0332de92103547c9fa0f58148dd29702be9c114c423728292446a5335e7b1f85b280e4f60a5bb6ed999e1
-MISC metadata.xml 1228 BLAKE2B da9f4403aa5618f793335621cecafefc6c3a475f7339884fdebe661002cf724e0b27d49270ce4dd4092bf9fe00371c53798988d28376475f630c965e7fbd1c09 SHA512 33c0cbcd3fd188d2c594cda3e8aa100a1528f40af2aad398c6371cf01c639b54d0cca52adf15a123fc036738031729f2950b8409b91b40240211ec7e9fbb80a8
+EBUILD libpcre2-10.34.ebuild 2643 BLAKE2B 649c567b6bc899ae6e66180a2588c2f807de795c22f1798c3b42588ef08043158c275034fa86df8555b389cc7ca68a49571d7398d6d77b94e05cdfe1327b9d7f SHA512 f4325d823527b5c0ea7f5e6fc9601fd38800834384338aff26ba304f996998d76dc657873481d4afb2fe8d9b380c4a6fcfb874baececefeb961e6196482096c3
+MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51
diff --git a/dev-libs/libpcre2/libpcre2-10.33.ebuild b/dev-libs/libpcre2/libpcre2-10.34.ebuild
index eb473005ccc4..905bcad3168c 100644
--- a/dev-libs/libpcre2/libpcre2-10.33.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.34.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript
 
+PATCH_SET="${P}-patchset-01.tar.xz"
+
 DESCRIPTION="Perl-compatible regular expression library"
 HOMEPAGE="http://www.pcre.org/"
 MY_P="pcre2-${PV/_rc/-RC}"
@@ -16,19 +18,28 @@ else
 	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
 fi
 
+if [[ -n "${PATCH_SET}" ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}"
+fi
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	libedit? ( dev-libs/libedit )
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}
+BDEPEND="
 	virtual/pkgconfig
-	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+"
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:0= )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -37,6 +48,8 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 src_prepare() {
+	[[ -d "${WORKDIR}/patches" ]] && eapply "${WORKDIR}"/patches
+
 	default
 
 	elibtoolize
@@ -75,5 +88,5 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/dev-libs/libpcre2/metadata.xml b/dev-libs/libpcre2/metadata.xml
index e043c3761902..1e5257985a69 100644
--- a/dev-libs/libpcre2/metadata.xml
+++ b/dev-libs/libpcre2/metadata.xml
@@ -1,36 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-	<email>polynomial-c@gentoo.org</email>
-	<name>Lars Wendler</name>
-	</maintainer>
 	<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
 	</maintainer>
 	<use>
-	<flag name="bzip2">
-		Add support for pcregrep command to search within
-		bzip2-compressed files (via <pkg>app-arch/bzip2</pkg>).
-	</flag>
-	<flag name="pcre16">Build PCRE library for 16 bit characters (e.g. UTF-16).</flag>
-	<flag name="pcre32">Build PCRE library for 32 bit characters (e.g. UTF-32).</flag>
-	<flag name="readline">
-		Add support for command line editing to pcretest, through
-		<pkg>sys-libs/readline</pkg>.
-	</flag>
-	<flag name="recursion-limit">
-		Limit match recursion to 8192; if disabled, the default limit is
-		used, which is the same as the match limit.
-	</flag>
-	<flag name="zlib">
-		Add support for pcregrep command to search within
-		gzip-compressed files (via <pkg>sys-libs/zlib</pkg>).
-	</flag>
+		<flag name="bzip2">
+			Add support for pcregrep command to search within
+			bzip2-compressed files (via <pkg>app-arch/bzip2</pkg>).
+		</flag>
+		<flag name="pcre16">Build PCRE library for 16 bit characters (e.g. UTF-16).</flag>
+		<flag name="pcre32">Build PCRE library for 32 bit characters (e.g. UTF-32).</flag>
+		<flag name="readline">
+			Add support for command line editing to pcretest, through
+			<pkg>sys-libs/readline</pkg>.
+		</flag>
+		<flag name="recursion-limit">
+			Limit match recursion to 8192; if disabled, the default limit is
+			used, which is the same as the match limit.
+		</flag>
+		<flag name="zlib">
+			Add support for pcregrep command to search within
+			gzip-compressed files (via <pkg>sys-libs/zlib</pkg>).
+		</flag>
 	</use>
 	<upstream>
-	<remote-id type="cpe">cpe:/a:pcre:pcre</remote-id>
-	<remote-id type="sourceforge">pcre</remote-id>
+		<remote-id type="cpe">cpe:/a:pcre:pcre</remote-id>
+		<remote-id type="sourceforge">pcre</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 0311e24f5041..621e5ba21d3e 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,4 +1,4 @@
 AUX libpeas-1.14.0-lua.pc.patch 553 BLAKE2B a86596d6c76e22e3e947709db226a47110f0964ae493d4fd16e506f4666de5fd5214d431a5109ffb0b68a6743bf2aa89aba84b63fabe4e402ac491be01479743 SHA512 ead06352498ff82a4520d4a7ed7b5d03e2d0adcdf2025413851b8385bfdd691c938b456b555d2214ec2dc7b95708f306149d6f1cfa7c5b03ad28a1c90c873349
 DIST libpeas-1.22.0.tar.xz 561332 BLAKE2B 219918f8663cd60c9353f477ef905ce0d1e21bf5b7c09661c4cb3c8adbba3af9f5e93b9de8a1b098dab09b1f4071854a871c8ea1db878bda8fe9e51aa45e5f87 SHA512 9c1da1d4b5688c0f4d0647f3519dbfbed94c8921091057aaef0e41bf5ed3f8faf04a49ce9e4eea3fd7bf4ac4dfa1727d76a5f6dae2a4f52228d4c8c74b420c91
-EBUILD libpeas-1.22.0.ebuild 2196 BLAKE2B 104284675bcec1690ad0ff30de3b2ac38d350774a4ce98f7840a2baf7377f8f1cec8796ceaa113bd9c65564eead8e811f71c18a2ac9b838cfacfd1db5ad91518 SHA512 734a5bec14ee98e35e08cb0df225f186707749f9cba6ad4ff81fff80c94d701f1268420c9538c837ad688ef37f117ac6fc074f6bb731c7922165a293187fbb26
+EBUILD libpeas-1.22.0.ebuild 2200 BLAKE2B a6948a043fae943595a0dfb4dc92130f7f4bf971d818c6e054cd9f4526038ca75f16aeadee17d0881dad898f2cf9395b2497bc163914fb647b3dcb34bd1a5d45 SHA512 97b14c09f1c08b6e8df051fa9a1527d21d3cb5444b5cb1826e4caae21de8e6962639c4422f3e1ef269998aee6dddd9738c214e80104963be981b6dcf6c9b9163
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.22.0.ebuild b/dev-libs/libpeas/libpeas-1.22.0.ebuild
index 458f5c4b5bad..d9d5ac17988e 100644
--- a/dev-libs/libpeas/libpeas-1.22.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.22.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7,3_8} )
 
 inherit autotools eutils gnome2 multilib python-single-r1 virtualx
 
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index 40bf474d6c40..9c42f88a62e4 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -3,7 +3,7 @@ AUX libpipeline-1.4.1-gnulib-darwin-program_name.patch 687 BLAKE2B abf27acb9ee56
 DIST libpipeline-1.4.2.tar.gz 827362 BLAKE2B df85af1ca5c000a54d18d127bdff9286d7aced24e60fd0eff984cc6ae7acde880f71ec998946a7fd925167b5c05360ccb47439bb68eaeeb3fa7df1d320bf889d SHA512 18d4592c142b745e709b9d30e894f1cb95e8006d8d3d3c978a1c4b8fc2393fc40383aa8236587cc7caf576ee9664867358a94c081c0730de9e337ddbd1e57e02
 DIST libpipeline-1.5.0.tar.gz 828765 BLAKE2B e3a0012b7e916a313eb29c5c995755d345777b86b6d5b595814591c38490179a4dc80c375412f6489dc27ac16883bcd75dda418cbe429e7f4f8f70cffdb7a1ab SHA512 4b4d4a4ac347065d89e2092a00f744932422292a014c7176a4b7c4d2e8fb9d2165a3378d9e93b6899e11f80417b9a8c5c4785dab2f3113e33ffa61265e4c9117
 DIST libpipeline-1.5.1.tar.gz 987822 BLAKE2B 672da75a22aebf28e953a9a399d641bae8fb97da20527eb1f72f248d9e0afca10da7426bcbceb50f5bf2574fa7091e7ded5080c4a731327a09cfa74fde3a6c10 SHA512 9252c114bc59925eaf73ec9e8bb76b5649ccf985766edd2dc665630ec6de04c341298c74f8dc31c56e9ce20ad83da59df33eb3cc367e18a8012fd693cb823de6
-EBUILD libpipeline-1.4.2.ebuild 653 BLAKE2B e1ed8ee5a38742913229f070b8fc0689b47a6259c2bca8d93993a717bbe1add7e6fde4c092af8ca62a7d18681a7382451272dce8ed48606ed5c1f4bd32c2139b SHA512 1814f2160eed9bfc791e2dee77890bfee64830660f39ca87ebb4ea7ab25f0993e0ca467aad52b97b50dd2cd54860c38e1803a799ec097c0a815882c41fe81b28
-EBUILD libpipeline-1.5.0.ebuild 768 BLAKE2B f9009c19af0ff71c7e4b3b8f13a85b792eac3bce82729a03163ff70dc8d323827075589a3fc356b4d4f7b097ee1d7724ae486d3f1e6fbc359e7fc045a1d0a5b3 SHA512 6765385cd2d9403ca703c19fea51afcf82d7801ae02fcdb9cd9af64f8ebd19423e0568dd21ce0ce20a887cf599b1688eedc4ff4ae1f74b6b091fad2f1e0a4105
-EBUILD libpipeline-1.5.1.ebuild 639 BLAKE2B 2fb70f4131f46448bdfabdba7069d9be3b018648099c444af9bc6d8d1f61f5ccf7b026fee591e531552b9806a190ae0902421ca168856b158bacecc9646daee6 SHA512 5ee0b9336e71f29931809416a5d4fda013799c23c382fb5815042859a4d1bf685b24b87f70f3aecdbd679f0c217594bf1e8bb93e5f440fbde4d621aedab4e84c
+EBUILD libpipeline-1.4.2.ebuild 680 BLAKE2B abae079904818fd5839482e328afdd876e41864fffe23746286f82fd8f8c812b1f17e6f33bf47b407b565faff62ce9afb1756cde81648aee7746bf1f04924b21 SHA512 403051d510032f9dec461cffc71cfe1b67d83fa9da2664582434e3c7797d6bafbe8c2e7080a3313802484552c2aae1f2d60f5270fd6ec0eed360f750812cdf65
+EBUILD libpipeline-1.5.0.ebuild 795 BLAKE2B 5b0010f661c26e2662f7c69ae91bf2f2d655d923aaef0ea9e8012714fae485dd274e5d472c53962fa0ab4b1ec94ce089ba543d8bdf28e330e2f684d6a9eb70fe SHA512 63084dd69d9d69aecd3c8433ac235178db022732a7eabf86e43fd303bed92dbc2c452305f161eb39251b3e55889a82190d972eda1444e72760f87653045fd023
+EBUILD libpipeline-1.5.1.ebuild 666 BLAKE2B dc816140ab676a875944fe36051d9b02e1b8c7815392b44c5ac1a7caebabba1e38cde6e0482138c0f93ee16944cbb3085770103c73705c8c55ca931d1691b938 SHA512 dccc099da343be2639cb409c5bba5ce1a920092a7e44fdd302ec0202b910e077d8a221fe4806199431ab108befc2d140798fcc2424d297530fdd8c73052fc4b1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
index 5d7946bfd016..a034d176020b 100644
--- a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="virtual/pkgconfig
 	test? ( dev-libs/check )"
diff --git a/dev-libs/libpipeline/libpipeline-1.5.0.ebuild b/dev-libs/libpipeline/libpipeline-1.5.0.ebuild
index d88d6330cac5..b67f1720e463 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.0.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="virtual/pkgconfig
 	test? ( dev-libs/check )"
diff --git a/dev-libs/libpipeline/libpipeline-1.5.1.ebuild b/dev-libs/libpipeline/libpipeline-1.5.1.ebuild
index a5e94a7d2829..cc7c85267ded 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.1.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.1.ebuild
@@ -11,6 +11,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="virtual/pkgconfig
 	test? ( dev-libs/check )"
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index c1bacb1d08f1..21a18c39dd4c 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,5 +1,7 @@
 DIST libpwquality-1.4.0.tar.bz2 450384 BLAKE2B 52a6f1c1bf90f6f01fb07667937b9792935729be77042bfc97dee8faa923212fa02410ad4e5c56f778bc9a8d248655f0b738889f5a0e73dc201d62d0c79093d0 SHA512 b8049f8b71bbfd4d345dbd4c4cffd29e9029b0fca4c95527af54d11a3b06e4708236b630df6c66738368298679c96cb3bf26b1b5d95cb3c5f7e1073cab8a98d9
 DIST libpwquality-1.4.1.tar.bz2 423053 BLAKE2B 305dbad6bba47d489cc5af7a362564cf9d8800e72d2e77cdbb2ea6fbf4d6888ef07ea93a4af474a60e6c25df417d0222ba54ebfa458894508410cec1ffbae654 SHA512 0bbec7e79a4db56c2cbda65c36003758a1044eee2ac8c678447d96d3cddf034a3196a7d8cd7972e9f50701391b8b81e2c3769fd81c4e4605fed96efd120ff257
+DIST libpwquality-1.4.2.tar.bz2 423072 BLAKE2B 7f571e73ed4d12e6780dd47b6579aca3b7413eff23f9c11114ee2f95134893097b3cd183fcfc5482c96ca9bfdd1e137d4064062591f56b3998f3bf85768389eb SHA512 6f395e94797cc565edae6de8f4c7c60736d07ffa849c9878ec4d867f8cb7bea6f08bdd20501791dd05b02d487f8fea66a02a30841c7cea6e86b5903eaf685879
 EBUILD libpwquality-1.4.0.ebuild 2013 BLAKE2B e02c0b8cdbf67f824252221bf8068598512989c31d3b40466f9f078c056d539a73e79ecc10976e07f8270217af9918e3694bc7836e8bd436aaf537c0985b66b4 SHA512 33485f5ef2564b490372a6a6ecee65b08ed40079658ddeed9481707d7d496870f74e05e1c8bb52e4ff13b1a0b9e21d730aeaca05324ec1978621ae488b0fa876
-EBUILD libpwquality-1.4.1.ebuild 2019 BLAKE2B 02511b86c9ca59c10d6a4f087da1c240954778421d3618b9c52f334e05f749a8f737c90a0c70b90e909c3736f8ce7d8b9d0f871d645d4aa00940857548dd2f01 SHA512 4a4f09e2bb66cbd5c4725dc2b2cf17eb31baf428f3d2aab539e9a840fee3044eb436b6350fc6332375a27dcbbf3c522b1ba853b5c742c4fc21d1397a51c96328
+EBUILD libpwquality-1.4.1.ebuild 2012 BLAKE2B c2e9d210c8f61b4afc05eb7869d5f16a1cde6cfad4aa2a6f95fd46b6e87bd7726a648b0f7de27a9fdb0d38eef9a85fea63e71247a6130132d3111cf8aea2f0a0 SHA512 35fe8a6a7df9a79580ca374d39a78cb66d1376c91eec698351e74bb05dffa3fb3389235a377ea5eef61155844efb7eefe737fde271b88599397b3f8ce04e9c6e
+EBUILD libpwquality-1.4.2.ebuild 2029 BLAKE2B 701d8bfac112b7f19f7511516bae9d0f3f832ec661b0234ca02ad46e4827542945a5f8813b99f5e9c1702073f1f9d1313995809219d681ee85217972c576995c SHA512 287996e5e2770c9b75afb94472f418855c72f70f28638b51029b9ea11a81f28e8f5af231ae55a81685425db06fd62d85957ab7ee83e2960f64131adbf567c1b3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libpwquality/libpwquality-1.4.1.ebuild b/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
index 5627f0036e33..78dc44265604 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="pam python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libpwquality/libpwquality-1.4.2.ebuild b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
new file mode 100644
index 000000000000..f14269767cb8
--- /dev/null
+++ b/dev-libs/libpwquality/libpwquality-1.4.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+
+inherit pam python-r1 toolchain-funcs usr-ldscript
+
+DESCRIPTION="Library for password quality checking and generating random passwords"
+HOMEPAGE="https://github.com/libpwquality/libpwquality"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="pam python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	>=sys-devel/gettext-0.18.2
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=sys-libs/cracklib-2.8:=[static-libs(+)?]
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	# ensure pkgconfig files go in /usr
+	sed -e 's:\(pkgconfigdir *=\).*:\1 '${EPREFIX}/usr/$(get_libdir)'/pkgconfig:' \
+		-i src/Makefile.{am,in} || die "sed failed"
+	use python && python_copy_sources
+}
+
+src_configure() {
+	# Install library in /lib for pam
+	configuring() {
+		local sitedir
+		econf \
+			--libdir="${EPREFIX}/$(get_libdir)" \
+			$(use_enable pam) \
+			--with-securedir="${EPREFIX}/$(getpam_mod_dir)" \
+			$(use_enable python python-bindings) \
+			$(usex python "--with-pythonsitedir=$(use python && python_get_sitedir)" "") \
+			$(use_enable static-libs static)
+	}
+	if_use_python_python_foreach_impl configuring
+}
+
+src_compile() {
+	if_use_python_python_foreach_impl default
+}
+
+src_test() {
+	if_use_python_python_foreach_impl default
+}
+
+src_install() {
+	if_use_python_python_foreach_impl default
+	if use static-libs; then
+		# Do not install static libs in /lib
+		mkdir -p "${ED}/usr/$(get_libdir)"
+		mv "${ED}/$(get_libdir)/libpwquality.a" "${ED}/usr/$(get_libdir)/" || die
+		gen_usr_ldscript libpwquality.so
+	fi
+	find "${ED}" -name '*.la' -delete || die
+}
+
+if_use_python_python_foreach_impl() {
+	if use python; then
+		python_foreach_impl run_in_build_dir "$@"
+	else
+		"$@"
+	fi
+}
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index 570799850057..73f1c87c0de0 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,3 +1,5 @@
 DIST libqtxdg-3.3.1.tar.xz 66004 BLAKE2B a676f22144ddbf67e02686fc25b381a911e5d0391e2f735c6d85914362433aad20ad0a3740ea7101d26b5b5692d0504c3798489333b1bf9585c3be88f6636beb SHA512 f0fdb95f20ee49becf770455a513178bb3ce63ee460e8bbaac8d40f50ae47a139ff518021c8fc19254bbd777b67bc7f2754302de7e2bb6cdf929bc559a1b51f3
-EBUILD libqtxdg-3.3.1.ebuild 952 BLAKE2B 700cd5434c978398171cf87d762e35968b598abbc2cb2dfa1303796fdade01ce41da61f6c17a0702f9ddfcbccd43cc7fdd241adef57718f4cf448a2512e400c3 SHA512 d3dcaa7c980c02ea089cceb8de12801f3aa8a907e49ced5f62756e21fe5147fd22e67281d1aa1efc2acb5f691eba96cc414dfa90ba8b1fcfc46ea22c8251edfd
+DIST libqtxdg-3.4.0.tar.xz 73060 BLAKE2B db23fe8bfb6e8b73a76b710f121464e3a8f5b60f1019705bb6a234eb4c0a9a5ad9469ab95eeac8f392ca10a86343f9d0b3040eae4131d1d421800b8054247d6d SHA512 9bd52ae3aa32f8c7de48e562ada1ff2413892c7ac58d5f7a06c0c512a4a6c03e9c5c44930f7781930c9c701894ea38a450a61a3c26afc047c76313ada0a890e6
+EBUILD libqtxdg-3.3.1.ebuild 979 BLAKE2B a99984fbe6ad54829cbfce3fdc6690ea64344acf149a55c521c6484bcc552509aadc3fced9eca9b95c0e92d3fe1fdac7e3505b720df1579726a86736df470f2a SHA512 15422916021f869df5d3bb6b30490fb11a23d8e67096de8b5978ae0488dbdf67c135b8bd43c5016be44b1a3348b95b946abc500449671ee24fc639d1f5f1a40a
+EBUILD libqtxdg-3.4.0.ebuild 982 BLAKE2B ff40efecb82167b4972868994d45e109b52cd4002c9171f2784ae0a1a9c0926b2a1306e1a9437c9fdc7357b4bcfb59a17659802152407919d899ac2776e3447b SHA512 2378ce8cbf8a5b7ba1b616d5c26d26b834fd2ae37671504eb9d92515bff6fe9cd9831da24bfaaa45496d4e5ecbd220f60ba8660826a19ef5650fee1e99fcb416
 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b
diff --git a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
index b9a18597a1c9..8b3ad4f6fb44 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
@@ -19,6 +19,7 @@ fi
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	>=dev-util/lxqt-build-tools-0.6.0
diff --git a/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild
new file mode 100644
index 000000000000..98438d2a03ea
--- /dev/null
+++ b/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils virtualx
+
+DESCRIPTION="A Qt implementation of XDG standards"
+HOMEPAGE="https://lxqt.org/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
+SLOT="0"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/lxqt-build-tools-0.6.0
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5=
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	x11-misc/xdg-utils
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	# Tests don't work with C
+	LC_ALL=en_US.utf8 virtx cmake-utils_src_test
+}
diff --git a/dev-libs/libratbag/Manifest b/dev-libs/libratbag/Manifest
index c12f1858b0cf..d405eba7bff8 100644
--- a/dev-libs/libratbag/Manifest
+++ b/dev-libs/libratbag/Manifest
@@ -1,3 +1,3 @@
 DIST libratbag-0.9.tar.gz 238225 BLAKE2B 74efbed2840103018195a73c11760a2022e42db5e81ba2e9d63a21bc5eb4c1dfed107382b657d2dc208101dfb53eb1926aaccc116ae66e3bf83e1218239dc1a2 SHA512 36215f534f9429c3b182f5502a2bbe16905492a634e327a845d65b638d7dd5ebb5c4eb1700a5196d6b5caac68e500603ced60c3c83f6d0c8e3c776e0161f657b
-EBUILD libratbag-0.9.ebuild 737 BLAKE2B b49fe41fe9b904ba659983458178a7b6a1d61da9a78eccb7523d419c77cc329a818846ed53f538c3f421df8744f61d10cbbd3ebdd9bacafc344d8486976713b9 SHA512 8c69c7e1f3e956a321cce92cc2f4ea6fd76071e06635abece620b974dea3f128925e9e99c6c955c09b6da384c0df856d58f7d23592839eb6470461169ed91e75
+EBUILD libratbag-0.9.ebuild 761 BLAKE2B fbcd3ec221b7c2cfbcd2dbf85dd3c2fa845bf1e7e90b8b1edf607c13418cdbb57f672ba73a4bb8f790725e6a05ce6fe8e4b95cfa29302bf56d395bc90afd3488 SHA512 b2ca3694cdfb145f29b6bb24b9eb14c77cc62250155b1bcac1a2393a7ad065956b1b7e4455744b3d0eecc1e29f4597d0ecec041855c637732e0fffe33ccaa2fe
 MISC metadata.xml 256 BLAKE2B 55800f1afe85cae6b43d53da79dea4169d8f2606b4b5152843c741e59b686be4c5c432d6160031d1337a153576d69f9c24b08d70a26b22289b63b560f3ba3afe SHA512 bb303019614fae3631db582d2515dc71f9e9953e97f2b46724667c760b180173544255700c4f5d24a9f0addf78e0ee6407272c1137e200d17ce7b7708c8bcb66
diff --git a/dev-libs/libratbag/libratbag-0.9.ebuild b/dev-libs/libratbag/libratbag-0.9.ebuild
index 5e85252262df..f85cd3509b79 100644
--- a/dev-libs/libratbag/libratbag-0.9.ebuild
+++ b/dev-libs/libratbag/libratbag-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	virtual/pkgconfig
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 9ffea767aff0..f4da4fc1a1d7 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -2,7 +2,9 @@ AUX librdkafka-1.1.0-remove-automagic-on-zstd.patch 972 BLAKE2B 3ebe1a2895f5e060
 DIST librdkafka-1.1.0.tar.gz 2511445 BLAKE2B 00c20361058d537d045da6961afc45e40e0ac641918df9eb457937dc3ca566639b81d8aa10cc6ed2f57988eded180f3d2eaea72ca4b910a652b93b54b9388253 SHA512 35561399b07278a09a51245c5503c86eb0cc8971692b4e65a332144bfb71e2e86d4ceaf1804534b6a416bcace74cef493b6465c20b32c14de97f45f2854359c6
 DIST librdkafka-1.2.1.tar.gz 2547009 BLAKE2B f55c2f23339294d54c1a3cbe064b0ddb6a638adfd192351a69bba91c81f7d33dfad13b45d50a8ea008e397400c89e90fe267549566a8dff07ca701ae59934126 SHA512 57341a0e4dbe98b9da912f5a63cc82490222bd91aef7c3cda3acaa4807e1d13ac047fbff8898f7459e7a1cb46f02dfc665e8c5bddffd8153d67a2c0546000a62
 DIST librdkafka-1.2.2.tar.gz 2588441 BLAKE2B 27cf73c61a56cd899926a2022f3751f66a2569d3065d5c3d8d542df8c0c92db08095188a08c91e347d2c1439f244d417eacbfb218e49c08fe4b5b2ef76f2bd6d SHA512 ef6fc34989e5e484cb0b9f6a6f8a5c4816d89239c18d65becc2004cdfeedbfb541e18affbb8662b05831003249630cb2119ee496b5b844c963b01eb6d4ebac5a
+DIST librdkafka-1.3.0.tar.gz 2627028 BLAKE2B bee04707047142833c6c27ec25b81678be929ec08995c0cbf79a744b9c211691a2b4dd086782900a4cead73c6885886a26ab4052a7b9d0f6e6057bbee5a11c1d SHA512 94b6202a83d54dfa181466a7ea4e0b492cd695e2bc08e7e46e60efb9c1dacc912fc891cb2bb50d189dc6d0fd6c7553266196dded460957ba0f569d3e08090669
 EBUILD librdkafka-1.1.0.ebuild 1540 BLAKE2B 9060364fe3e3927f991161e72a5d4fbcd1f9386538ab47f9c2640a93ae174a019ebede893281c52e65ac8ae306cfaa78e130ffd14437200cb92d958c91515ade SHA512 5025fd3a0bcfc99d7a771855e2304ae10990c0d4b62532fb7704ccf1e8127fb4ff2667440eb46ca15321294c7cc64773e233d80a07e0524677b0ee092c05982d
 EBUILD librdkafka-1.2.1.ebuild 1475 BLAKE2B c8b5a4d4f4d946e7a1d78b0a92b737686c1dd8f975122923de2994076a13fb7826f889ec893928c82dd206e2a3c9e777723a5ab1e7ff26f8a7f863f0e82f049c SHA512 a5e794ae2bce3f2aae32642986edc962e5861a745656440fd765a557e695a7d8570c0f90ba5bad57e18a399c1d294c2cd696284d598a074ab742ef49e241c46b
 EBUILD librdkafka-1.2.2.ebuild 1475 BLAKE2B c8b5a4d4f4d946e7a1d78b0a92b737686c1dd8f975122923de2994076a13fb7826f889ec893928c82dd206e2a3c9e777723a5ab1e7ff26f8a7f863f0e82f049c SHA512 a5e794ae2bce3f2aae32642986edc962e5861a745656440fd765a557e695a7d8570c0f90ba5bad57e18a399c1d294c2cd696284d598a074ab742ef49e241c46b
+EBUILD librdkafka-1.3.0.ebuild 1475 BLAKE2B c8b5a4d4f4d946e7a1d78b0a92b737686c1dd8f975122923de2994076a13fb7826f889ec893928c82dd206e2a3c9e777723a5ab1e7ff26f8a7f863f0e82f049c SHA512 a5e794ae2bce3f2aae32642986edc962e5861a745656440fd765a557e695a7d8570c0f90ba5bad57e18a399c1d294c2cd696284d598a074ab742ef49e241c46b
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.3.0.ebuild b/dev-libs/librdkafka/librdkafka-1.3.0.ebuild
new file mode 100644
index 000000000000..6d51d76e53fb
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-1.3.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs zstd"
+
+LIB_DEPEND="
+	lz4? ( app-arch/lz4:=[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
+	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
+	zstd? ( app-arch/zstd:=[static-libs(+)] )
+	sys-libs/zlib:=[static-libs(+)]
+"
+
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	static-libs? ( ${LIB_DEPEND} )
+"
+
+src_configure() {
+	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+	local myeconf=(
+		--no-cache
+		--no-download
+		--disable-debug-symbols
+		$(use_enable lz4)
+		$(use_enable sasl)
+		$(usex static-libs '--enable-static' '')
+		$(use_enable ssl)
+		$(use_enable zstd)
+	)
+
+	econf ${myeconf[@]}
+}
+
+src_test() {
+	emake -C tests run_local
+}
+
+src_install() {
+	local DOCS=(
+		README.md
+		CONFIGURATION.md
+		INTRODUCTION.md
+	)
+
+	default
+
+	if ! use static-libs; then
+		find "${ED}"/usr/lib* -name '*.la' -o -name '*.a' -delete || die
+	fi
+}
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 06013fcc2b69..70278578e620 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -5,4 +5,4 @@ DIST librelp-1.4.0.tar.gz 519235 BLAKE2B 9c1e52cc9f666e75f261db65f45e3d954afa033
 EBUILD librelp-1.2.18.ebuild 1240 BLAKE2B 1e5c2a3c09963f3ccb25da31ba90e2cd0ca2ebfa0de68903656fa9727f3b56f1c44dbbb59d2ecf23e913ba0fbfd42cc821826f72b786bd54da66a06032c00ed0 SHA512 772112ff4a073d526c0054a211e11d295641f7583c84716019d007ba2e33654adc4f639d40be6e54ad4d23b4028aa85c039624138550360b20a0e9fb21ef3752
 EBUILD librelp-1.3.0.ebuild 1483 BLAKE2B 668859d6c0a0604e5bf7171b4801b6b8e678379e04b5fd6ae95620dda676905bc320e82b9212b0a6baa5f15ee920625695eddc2c8a1d2575ab1c3439cecf24a5 SHA512 11dbb4bc5b1a0495753b2c264d1b5094903d93acabef402c4022f523666b80862f0a277acc39a0c27fdc2b36ee89d2d964420e3edb8642fd031c4b97f13f1acb
 EBUILD librelp-1.4.0.ebuild 1412 BLAKE2B 58cffd61d12097598bf49ba1289e43167cf5ea8c6327381e011b6f4f71ed7976c42e2f2a6304aa2b71d3ca01f872bd1964d9ced27532f037ab8530ee6528fce5 SHA512 fa257b87409fc6159bd349d9400df7c8181acb617ebd86d3298647f8230f3235b4c50448cefd06d0dc233f2699f58c26ac0d40dc1dc87b44f7bc1c72db1844f0
-MISC metadata.xml 503 BLAKE2B 987b40e4f9b5e33e1f293023237b7d0cb614ea36113d6d5becb780fddc729a2a2a033cab8e41b64a0465d0f14e220c96787e30b7b133979e36ad86a1273ad0a8 SHA512 31f5e4ece41aab561a70c7b9af6119bce8c3cb7fb6720be754dd925ee656faa75ee953cd3d296d1b8bb5f48368d015ec5d2768d217b349f1689e767424786e3a
+MISC metadata.xml 392 BLAKE2B f8320c59b6d3f84ff3e9b782f77d785aa001c5f45dd54afcd0cf726cfc070c076fcebb99313612e58acf6f275900e0641a2fa9bb1151eca0561bae9087e2c5a7 SHA512 d286592d19517966bab79c3bb232ee02a8028b15602fcb6c12edf1523158d07298c33328a808f065de074f701778f9c2fea436d3924a67c2635c911a9e7f15a4
diff --git a/dev-libs/librelp/metadata.xml b/dev-libs/librelp/metadata.xml
index 17b00e2ac3e0..7ccc17cc4eba 100644
--- a/dev-libs/librelp/metadata.xml
+++ b/dev-libs/librelp/metadata.xml
@@ -5,10 +5,6 @@
 		<email>whissi@gentoo.org</email>
 		<name>Thomas Deutschmann</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
 	<use>
 		<flag name="gnutls">Use GnuTLS</flag>
 		<flag name="libressl">Use LibreSSL</flag>
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index d0f0b5f6b53a..a391edd81266 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -8,11 +8,11 @@ DIST libressl-2.9.2.tar.gz 3607549 BLAKE2B 496e993e4f1c85167e0344afab61259d4e3f0
 DIST libressl-3.0.0.tar.gz 3620475 BLAKE2B c1dc1709e60cfbfa9907c206340262b78e1bfb991d3956dfc0a5d8d80f80b61df41059e645f9f096185724470e8466a5b7a444a575f5f09d5a0f9eb35ff3ae7e SHA512 460fa390012218262b7c148a28e6ddfc0dc3d669c4bdd37b68bfa6f50a0cb2fb81a277fb46ae0ac22673aae5b5cc4476fe96e56471a6812176bf76e9c5e10838
 DIST libressl-3.0.1.tar.gz 3668819 BLAKE2B 0e0e9db5018f7fd6c5d3f15dd911e375ae51885321fda2a6bef8f56620ca9d8b63d587f5acdf78afafabdd7ee1243c79bdf9b68a890dfc5f76fa45bbaf060563 SHA512 d2d665734d8aab2b998769492cbb1e7fddead52430ef503650c14786196241a6d1137f47b33ddf2037cc1ff13c240283f591dce83ec0da475619679a051d725f
 DIST libressl-3.0.2.tar.gz 3669468 BLAKE2B 84ad2c1fea8d2119f191ec8ab3f999fb0354636d48aabb76fa1786139c669c9d8ca105d79cc8416dd20683818eccc84490cdadc9ca94cb2b0e411644e923a3d6 SHA512 19226da3bc9776e1da40b8e94dfa53564d5e6acc80edee539ba12d7a75c1bb8c0603e7633f26a6ef8b12adc56bb677ccda448575aa6be2ad3df5447465a4b080
-EBUILD libressl-2.6.5.ebuild 1450 BLAKE2B 193d943fb6ceec65937ff2d47d2f1b677b7e643962c277f045371e9029af3ea7f0aecac2498b0bf74f1c4d7fd0160846ae3ab757bdbe24361f3304faa6f740b4 SHA512 42d2263c867c290d42c08379778b13f36eab1e185d8dff69d8970e09766596bc162d494d2ba3ff9491d2cbe781ccced9e1e4813eade213a9d94ddd22e7e3cfa2
-EBUILD libressl-2.8.3.ebuild 1545 BLAKE2B dc63614ba49a5d077e4be5fbc830fb3a20e7a34b403560f0b803c3eb7c761610eff701b1e79ee0a495eba310726518638951f66ac5f890f1b881ef5edc9a0d5e SHA512 d342dd4eca89a4db529c823161d49ec9292d7d8d98cfa5a10f18e88b1ebc4ecd4cf935269bbc3ad9a5d44a4cdad40929ea5e31830cb40a516def5de71dd51ee6
-EBUILD libressl-2.9.1.ebuild 1679 BLAKE2B 62ac39e1a95e996b33a84551619b4f642c733f8ce4708dd1a4620dd9ef047303c99fe6d9539b87b88bc18ee0932f6724c389eff27b61d6026328ec1f9f8d813f SHA512 cfc4b9b8fdd259d65905035190f29efb273b6e3a6317619d4d7e86413cca8259fe87fd16c1ed7f4e98e0f7438376fb82a1b912a7672aaffca79765a5eda37d42
-EBUILD libressl-2.9.2.ebuild 1713 BLAKE2B 7450f36e1dad66cd156bd346401022f6829ae4feacf1b7d680276ae24611bf18a197906564321fef865d4bfa3ed2717e43bc5a6637535ee0df42ecc4bdcad305 SHA512 8dbe7abdf2738a06e72dd60857ea90f3a62488d8603c5d1ee9d330f5603af617a1a8bc6fbc2ca13fbfee363d10274c0ea182705d244838fbff906e991b42f411
-EBUILD libressl-3.0.0.ebuild 1679 BLAKE2B 07b9911e9603c7b840987bb5f1eae44839f9a03bc66ca95619d3f5e2e20d5774477d6a2b160138020179c8e9d483cb732cf4aec3950febef2458764b9cc4bcb1 SHA512 2e2a11411d8ea417e7d7ccd1c379cd5c966630a9cd787039131b03712f6da92733259875ac5f3ac85cf2b006f9b1f3210d65b803f6ba8ec8e65865d0bd2bc6f2
-EBUILD libressl-3.0.1.ebuild 1679 BLAKE2B 07b9911e9603c7b840987bb5f1eae44839f9a03bc66ca95619d3f5e2e20d5774477d6a2b160138020179c8e9d483cb732cf4aec3950febef2458764b9cc4bcb1 SHA512 2e2a11411d8ea417e7d7ccd1c379cd5c966630a9cd787039131b03712f6da92733259875ac5f3ac85cf2b006f9b1f3210d65b803f6ba8ec8e65865d0bd2bc6f2
-EBUILD libressl-3.0.2.ebuild 1679 BLAKE2B 07b9911e9603c7b840987bb5f1eae44839f9a03bc66ca95619d3f5e2e20d5774477d6a2b160138020179c8e9d483cb732cf4aec3950febef2458764b9cc4bcb1 SHA512 2e2a11411d8ea417e7d7ccd1c379cd5c966630a9cd787039131b03712f6da92733259875ac5f3ac85cf2b006f9b1f3210d65b803f6ba8ec8e65865d0bd2bc6f2
+EBUILD libressl-2.6.5.ebuild 1477 BLAKE2B 0be2a9690082da8103f087e750c1a8d9768f6fd9fe4e1afe9fd160d5341fca03e420513a7023acf1d0c3e4287209cc48cc74797451793431ffd7f96cf8113ad7 SHA512 18060e9bdc894167d13683aa7aaaaddf49096065960779c0bb7561fbf0dfd7f71db87aaf9abec94b2f54df7bcec0df27c5aa70067ab93b8b738c0036f8419f52
+EBUILD libressl-2.8.3.ebuild 1572 BLAKE2B aaeecb5de2282cc7ed5f925a7930abcbdaaa2528e26a7972e070667edb22ae0415a4fc42d639fda455cc25746653a3954b03688075355082d77a080dadc48513 SHA512 bbf59b1952b1892b56df2199613baea4f4bcf85c7b1bbdd25a6a4ed7ba6f645172b20ebfdad8c1cc63c7669f68fd423581677dede98bb9838a14393b6f9c701b
+EBUILD libressl-2.9.1.ebuild 1706 BLAKE2B d5cee2b2dc1e31e7c2efc76ee9b735fac74bea53545b5a4dd3c58a8ecbf962a9ab1a8aa6f82868994beef87c6940ac3b5b6999083b20b5641a337d85f11867e4 SHA512 220f19943bb1a1d2951f680128f87d4dd31d8bdbbe7279e87f6e629af326f9117c1a2ea56c5d2ef4b8c803fe1d88f62b11cf62e3ff4ea342ab912d2e1f4735aa
+EBUILD libressl-2.9.2.ebuild 1740 BLAKE2B 92a1dac4b986486784683a9ad72f7278631610dafb59199b6418c816a9edecb1449e0c6b89c9a9c026e9e42a61b78a1b94ad838e8d8b4831f4ac65daf4880e16 SHA512 09d0a042a062a6ab8bc163fca7e9961861c33b485d0cf0ba2231ca05fc5ef3b87ad9785b7707c96cb3589dbb9f9a44adc0418c07b2a1784ef51e9393d216178a
+EBUILD libressl-3.0.0.ebuild 1706 BLAKE2B 4e52ea77d949b992fb391ac7f5ba0bca0abac46a93cb352dd942aaa82d2b1088273a61e1c5fbfbbcec29b9a03cb3f0d5111253953fc1be5f40568e236d301674 SHA512 7688885e27c01946f0013e3336691973b2d56250d624ef55521493526e753c5229c57ccf62be8d9f39d1d8bc030b34c7cdb5031de3c32a1cdd7682ffdcfdc8b2
+EBUILD libressl-3.0.1.ebuild 1706 BLAKE2B 4e52ea77d949b992fb391ac7f5ba0bca0abac46a93cb352dd942aaa82d2b1088273a61e1c5fbfbbcec29b9a03cb3f0d5111253953fc1be5f40568e236d301674 SHA512 7688885e27c01946f0013e3336691973b2d56250d624ef55521493526e753c5229c57ccf62be8d9f39d1d8bc030b34c7cdb5031de3c32a1cdd7682ffdcfdc8b2
+EBUILD libressl-3.0.2.ebuild 1706 BLAKE2B 4e52ea77d949b992fb391ac7f5ba0bca0abac46a93cb352dd942aaa82d2b1088273a61e1c5fbfbbcec29b9a03cb3f0d5111253953fc1be5f40568e236d301674 SHA512 7688885e27c01946f0013e3336691973b2d56250d624ef55521493526e753c5229c57ccf62be8d9f39d1d8bc030b34c7cdb5031de3c32a1cdd7682ffdcfdc8b2
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.6.5.ebuild b/dev-libs/libressl/libressl-2.6.5.ebuild
index d4870428f998..2e287731592f 100644
--- a/dev-libs/libressl/libressl-2.6.5.ebuild
+++ b/dev-libs/libressl/libressl-2.6.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
@@ -16,6 +16,7 @@ LICENSE="ISC openssl"
 SLOT="0/44"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( static-libs )"
 
 RDEPEND="!dev-libs/openssl:0"
diff --git a/dev-libs/libressl/libressl-2.8.3.ebuild b/dev-libs/libressl/libressl-2.8.3.ebuild
index 1dd097614e8d..03ba04935f9a 100644
--- a/dev-libs/libressl/libressl-2.8.3.ebuild
+++ b/dev-libs/libressl/libressl-2.8.3.ebuild
@@ -16,6 +16,7 @@ LICENSE="ISC openssl"
 SLOT="0/46"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( static-libs )"
 
 RDEPEND="!dev-libs/openssl:0"
diff --git a/dev-libs/libressl/libressl-2.9.1.ebuild b/dev-libs/libressl/libressl-2.9.1.ebuild
index b9ba51552c33..f3e254c6715d 100644
--- a/dev-libs/libressl/libressl-2.9.1.ebuild
+++ b/dev-libs/libressl/libressl-2.9.1.ebuild
@@ -16,6 +16,7 @@ LICENSE="ISC openssl"
 SLOT="0/47"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( static-libs )"
 
 RDEPEND="!dev-libs/openssl:0"
diff --git a/dev-libs/libressl/libressl-2.9.2.ebuild b/dev-libs/libressl/libressl-2.9.2.ebuild
index 5bd4df28dc3e..69d160be52bc 100644
--- a/dev-libs/libressl/libressl-2.9.2.ebuild
+++ b/dev-libs/libressl/libressl-2.9.2.ebuild
@@ -16,6 +16,7 @@ LICENSE="ISC openssl"
 SLOT="0/47"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( static-libs )"
 
 RDEPEND="!dev-libs/openssl:0"
diff --git a/dev-libs/libressl/libressl-3.0.0.ebuild b/dev-libs/libressl/libressl-3.0.0.ebuild
index 65dfe075bbcc..9a52b9353853 100644
--- a/dev-libs/libressl/libressl-3.0.0.ebuild
+++ b/dev-libs/libressl/libressl-3.0.0.ebuild
@@ -16,6 +16,7 @@ LICENSE="ISC openssl"
 SLOT="0/47"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( static-libs )"
 
 RDEPEND="!dev-libs/openssl:0"
diff --git a/dev-libs/libressl/libressl-3.0.1.ebuild b/dev-libs/libressl/libressl-3.0.1.ebuild
index 65dfe075bbcc..9a52b9353853 100644
--- a/dev-libs/libressl/libressl-3.0.1.ebuild
+++ b/dev-libs/libressl/libressl-3.0.1.ebuild
@@ -16,6 +16,7 @@ LICENSE="ISC openssl"
 SLOT="0/47"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( static-libs )"
 
 RDEPEND="!dev-libs/openssl:0"
diff --git a/dev-libs/libressl/libressl-3.0.2.ebuild b/dev-libs/libressl/libressl-3.0.2.ebuild
index 65dfe075bbcc..9a52b9353853 100644
--- a/dev-libs/libressl/libressl-3.0.2.ebuild
+++ b/dev-libs/libressl/libressl-3.0.2.ebuild
@@ -16,6 +16,7 @@ LICENSE="ISC openssl"
 SLOT="0/47"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( static-libs )"
 
 RDEPEND="!dev-libs/openssl:0"
diff --git a/dev-libs/librevenge/Manifest b/dev-libs/librevenge/Manifest
index 31c131df8db8..8735c4c20efe 100644
--- a/dev-libs/librevenge/Manifest
+++ b/dev-libs/librevenge/Manifest
@@ -1,4 +1,4 @@
 DIST librevenge-0.0.4.tar.xz 421604 BLAKE2B 414674e4313f3062dac20a1ad7f1cf1c0a1681bb486f4edef109558fa70aaf8ee407fec8dfa93014db8c8746804e0a2bfec9636d75066b93d84e9bcbdc3f4dc4 SHA512 c4c2c98bac3522c8bd487058f4db19d85ad0d99159c4de4ffde91a10ea3adb7f995ebe8ccf6afcf533d81f50fb654bf265b9cd197508f85b5b68a101ca279712
-EBUILD librevenge-0.0.4-r1.ebuild 1104 BLAKE2B 3f25d533fc325cdeffdfc939f2f1c2fa1d44d9970eb7a7a0c2281ba373d4b00fd844f6df76cba75881281023ff1c159da3b6930ec1b57bd4063b86cbc4ed6fcd SHA512 d71012c3edbca82e1f3b5e8b2fcf26dcacb2cc685c22979b39c11aa1b0b4d51a27a7706fdee92f69550dbe1d87fad918dd0a1001c22490306cbbbbdf32b71245
-EBUILD librevenge-9999.ebuild 1161 BLAKE2B 5f180735a54e063805d0f1fb8cdabec714857458e4d5dd6e8756e435ae30808aa539ccc6f715636de9f21c3ddcc5932ce512b86694649ec3a13c30d4c8a05966 SHA512 5e6a37d70f094b16776e2b6332f6694c7410577dee75db2ccd3f1bd80938843edcd259ce4bdcab8d8f4d5f78ef8b43a106381a2eb72e0e714d3b5baf4b05dce8
+EBUILD librevenge-0.0.4-r1.ebuild 1131 BLAKE2B 66b4dd921674a97e05cd57c1a3748b04c999be9094620ab3f97eec9127a03427ac03569e69e0452c98e1717e1cfb5dbe5e099c6bd0196d7cc27bae74b69a05ed SHA512 95d7723f6abdf48ecdf7173feac4627ee1efec515d05a2228c961075492e284193da0748315f5a9c0fb175e4e4a0c5d7713b7d0f82b38bb1fdd1d4b50ca9ee77
+EBUILD librevenge-9999.ebuild 1188 BLAKE2B aa0340450c8789d5416155a9225a8b7b10d9322ef32946b36fe8433f69a7be02bc6d78126dab3917fd087b8a0eff80a6109fa94700b3d73b86b18b7bd88a2fd9 SHA512 46f2b70a4b88cb7da3791158f11ed2dd254e6cb2e8ac3545cd811a3b45af384d20c0f56e489b415a6eaef375e8613066bab77934f31a0595e8d7d40c7d765865
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild b/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
index d60e8ba6c891..0081867a0c2e 100644
--- a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
+++ b/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
@@ -18,6 +18,7 @@ fi
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sys-libs/zlib[${MULTILIB_USEDEP}]
diff --git a/dev-libs/librevenge/librevenge-9999.ebuild b/dev-libs/librevenge/librevenge-9999.ebuild
index 25f70ed8a4e9..0974dd13bd95 100644
--- a/dev-libs/librevenge/librevenge-9999.ebuild
+++ b/dev-libs/librevenge/librevenge-9999.ebuild
@@ -18,6 +18,7 @@ HOMEPAGE="https://sf.net/p/libwpd/librevenge"
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	doc? ( app-doc/doxygen )
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index 4da4db862b76..89cb1b27691e 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,6 +1,6 @@
 DIST libsass-3.5.5.tar.gz 327298 BLAKE2B 4127722343394bca4ed054987eed6113788e10dc4d03a869778c10b56135406c1fcd72dc101bfe405c96267b628735e8ee74d3812ab392f097dc941b78bef882 SHA512 dcb73a5080c00023b60a19ea037ba5af481253a7b47492bd7114bf45ab78ed931c7b207fa8f12ed200a39760553d72ae92dbe4eb80b826b59a6201fb34008fe5
 DIST libsass-3.6.1.tar.gz 333609 BLAKE2B ea6cb0285a6d741614bb900ff0f3b74660c74ec9ed071abf2d980bfe3f55b02fa2873d3860e5b767ca82b5f202f3d2aef28b73357bf8d2b3117c925b4dc78791 SHA512 e9a3a30851e26145d049c4b20951c663a9d48c781a732acd3cc2cdb30df3449e445b57211f666b58afa137431fbdb149add48ff8a0dec92bd8abb514c90adebb
 EBUILD libsass-3.5.5.ebuild 1121 BLAKE2B 1be11be93f262d319d986335d725388e2fc4b1ea18841e5a89841d761873d24a36aa4d602ee0e8714ca852f4915c4e2e4d9eb9efc07c307253bd1912ac95ede3 SHA512 a955b393ca0180f6ead993584d544a9a2bf6a0d5b0652377369a94716e41167898237ec7c8e9d8c7a7f2e181adb8ec0ea2db599ba30b3bfa9ffcdb9b2a7fd95e
-EBUILD libsass-3.6.1.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
+EBUILD libsass-3.6.1.ebuild 1121 BLAKE2B 1be11be93f262d319d986335d725388e2fc4b1ea18841e5a89841d761873d24a36aa4d602ee0e8714ca852f4915c4e2e4d9eb9efc07c307253bd1912ac95ede3 SHA512 a955b393ca0180f6ead993584d544a9a2bf6a0d5b0652377369a94716e41167898237ec7c8e9d8c7a7f2e181adb8ec0ea2db599ba30b3bfa9ffcdb9b2a7fd95e
 EBUILD libsass-9999.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
 MISC metadata.xml 555 BLAKE2B 5bf541c7be60dbded36d2dbf944111095a7b911809236b110a9d5d79fb99d2315019c8082489699e0c984a5cc6b1fa07b845afef28f887191dd6f9243cb93ace SHA512 b4b4252aefabd61569690f83ec264a19ac00aee9559f7e1857770b560f74de1134aa3e628d12f3d04bebf426d779eb7bbb40a5d714d841ed480c8178763eb8f0
diff --git a/dev-libs/libsass/libsass-3.6.1.ebuild b/dev-libs/libsass/libsass-3.6.1.ebuild
index 7bb47a910936..1ece89467a74 100644
--- a/dev-libs/libsass/libsass-3.6.1.ebuild
+++ b/dev-libs/libsass/libsass-3.6.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 19d5b1adb07f..8ecb1961aa3a 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -2,5 +2,5 @@ AUX libsigc++-1.2.7-fix-install.patch 457 BLAKE2B 70e53fc5931a8f11390da226297edf
 DIST libsigc++-1.2.7.tar.bz2 326205 BLAKE2B b316460178224c0b8177ce9a236c69a8b737bf7356b290b59eaeb60b09285c61d113bfc7de89bd712c3c049a492f5cc36d205ac77816aff73e587e8a42ade520 SHA512 79fd9657219459bce64fc069dbcb054959e324b5d546b5f11acaae5e5bedcc4dca699a21c949e3f6b2ec0dbe1c3dba3981158e5950d0aaba5028445b2ad5740f
 DIST libsigc++-2.10.1.tar.xz 4062388 BLAKE2B 3bd988acae78b7d463c966fa5c8da68b35d8a0b0bf4762811b7a9fdf82357b29aaa48d64e19f4cb6bd0f42ee70ad77a64a4905d1ad609dbe11ca8ff7596527c6 SHA512 e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2
 EBUILD libsigc++-1.2.7.ebuild 953 BLAKE2B bbded60c997517150857e66d1d1bce9123666391c0328862ef3da2abb75519ef06585ff4209803277352e49c5059606975ec963b564a075229d4fe7243d92dc1 SHA512 8fd16c8a79761172d2674ba2935d07d13d16c20db687a00e53241a2f5d7b1c9f7b61510968960e02be85a6f5e52aa622cc0d09af19c2ba19a274e997596850b2
-EBUILD libsigc++-2.10.1.ebuild 1499 BLAKE2B 21742a0c91111f0098f3598dbb7e3c21d18a47cb2474e4d51ae6a1637fd47b3d642d28f2d96a786b5a8685506b4c14b3980e28e1be6df64f9230a326bca66d03 SHA512 e57c98971518d74b4845c0a5c12b2cc8328941c9766dd58194abfad1471599245a113d53a254dcb056736909618a8e054642228f44b2c9854a2effe7897458e5
+EBUILD libsigc++-2.10.1.ebuild 1526 BLAKE2B 650dfc5fc90971e098336186423d89830acdcb6412ef298f82f797de8d9866277d9146c7fe1784630518428ea219d054a41d4521fe4bd87fc1c36f31001fa34b SHA512 b8f861f560c0f226b9a7c4d642bc4efbaff32f1f5d9566c4b9c83d4bebca7704d8d629237f6e7cf93a9803ad1d7d1ef8255d9167d89dac8b2fa9a7b89e5d738f
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
index 101c333b36b4..1e56f67a566c 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
@@ -11,6 +11,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="sys-devel/m4
diff --git a/dev-libs/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index 7db2d0108955..2cb82433b803 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -1,7 +1,7 @@
 AUX libsigsegv-2.12-skip-stackoverflow-tests.patch 461 BLAKE2B 021932c6eeb8a4a3a538a7a2d9c04e777aa49bdff15db9439f4cf835a42f2c7cafe6d560ca4c957a0d57cdb00b3b3f68432ff8528ede15927874a62c6b64e027 SHA512 9bf6ff64bff1dd8550b97bbcabb7ccae24bae7af200dde7c296a237c4c149cb78e42bc7fcad3c76554ceb550ab39ce65134b53ad1e521dc6229f0141ab047cdf
 DIST libsigsegv-2.11.tar.gz 448744 BLAKE2B 3fdf79efd9ce392887e1b133d5ea54637587411c3654b9cc4ae55b8cdfd05d41e56e76596edea7ee3dd09feb865dae56a67d2312033b07b491fbaca291fd1fe4 SHA512 6d60bbaa704b86c12a32a6b0eadd30fa7736d0e0ff8a1c45af1b15b7b7d4524f39902fe3f7f47a100bc2586e32aa25bb575e3d859d9ccb5fd7e99ba4e62f7b02
 DIST libsigsegv-2.12.tar.gz 451408 BLAKE2B 3f2f37965dfdd5f8a7db3d5baff975003200e7ab157498524f8c99c60c285a5a8a1cf978ff3a69977d52604dc44493ac6d6d00476fca3380b285282b35873f99 SHA512 27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913
-EBUILD libsigsegv-2.11.ebuild 873 BLAKE2B b002a1adfc3c2d26211758114ec9ddfef9288e10083b7fe1f4663bfb357078df8b4d5b6a416b86981cf8bca5da3cc3e6c37c4fcc2876f207d8dd6b1d25d9a78e SHA512 70dc26ea9d120835ce750b60405ca296342203da4078319c02700734f226786f5a01defb5fab42718fa1e3b2791fd5d6ab120d9c66cae4ec61a2874632235024
+EBUILD libsigsegv-2.11.ebuild 788 BLAKE2B bc02e09832bc8dd195fa8e583126d035f1a9f0600b6d9c218490939c58c1c4628c2d83f8946297c4237f82539f268686073b5816c7d97fb2aed1be5a834e04e4 SHA512 fa165b6ecf29ed87c8ae2430493426eef808ab596a32ec4f9ce4599a6e7e6d6247fd3c5fdb006618bcb9eac602f1bc99a9c776414085d387d26c7f6f34669bb9
 EBUILD libsigsegv-2.12-r1.ebuild 776 BLAKE2B 9e4ec8b807871a966173f56c6483caf6fbef06774dae9ab07b66f7f09137a877a0999e76ff73dc376dc896cfa5bf17d874c0783a3a388dead6e72b7ff4cefe33 SHA512 25155fe9d642dd196538294f98c24f44efca56fefe0ab7d48ff6663233429ff2a16af1710103067d34598e92b156610e7c6226496b057ad0513713da0f97f611
 EBUILD libsigsegv-2.12.ebuild 789 BLAKE2B 71fee301710353c326e2903a7209de5d3b5642ea2683584ee46e301f5504757360ef84e7c3d798bb81803a03c5dcafc974db1e564ba827ab08afc6184abdeee0 SHA512 b7ba322748ebc4b9b7a5dcd678fa53fcfb3da531d30a881f51b1bc106b61cf00619b7f7c4dbc28bc9b86c0253d80c336c74e2527b1aa8deefbd98d86081cf632
 MISC metadata.xml 811 BLAKE2B 648cadc6a317684a62fcdeceb885b3bb153841d57928e19a84ee20a0c0dbd8626343fecb6cf2367ef195cab26b9909c6c129a4a2afc999353300b48911317711 SHA512 7f985e3e2e50e351fc14e4932f30ceab0989346183ba87c0dd16a3dc874dd0e5534984e4bcc327dc1a4c0d15e78c89aeb8491b5a8c8789b6ae42dfdb89c18fb2
diff --git a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
index 5ab74d80c3a5..3acf972b408d 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-
 IUSE=""
 
 src_configure () {
-	econf --enable-shared || die "Configure phase failed"
+	econf --enable-shared
 }
 
 src_test () {
@@ -22,10 +22,10 @@ src_test () {
 		ewarn "Skipped tests. Please disable sandbox to run tests."
 		return 0
 	fi
-	emake check ||  die "Tests failed"
+	emake check
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog* NEWS PORTING README
 }
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 1ec94d3fc5a1..f8b5633e7a87 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,10 +1,4 @@
 AUX libsodium-1.0.10-cpuflags.patch 1262 BLAKE2B 64c222e8b67fa85968151238bdd397d8babfcacdb857c54c8fe54b148787a111d9246583c312593b8e803c7fb4a21143ef7351ece2d4d2d5d0518f32e05de46a SHA512 eab27424dd5c506b1f371c156f656f4d95189329053c5814d5212f3503f39a02c1583fe8c6ba9bf0f7e6240f8a94ffe448656857e0be174b354f67bae3e1e2fc
-DIST libsodium-1.0.11.tar.gz 1846782 BLAKE2B aadab6c89d11740dca72d7686d06cfeca6c504fca9e78108778817da4071d9e7bb6115df42e9509cd872ae7a5489ef15c099cabaf564f28e90b7f74a63bae140 SHA512 4b1293c4d0e52264beecdd05833857bc4d77d1c2a97eea0138fe04df383b9a2dfcad4a79ccd9aed8f6c0047ba67c49292b0d2ccf987ab0b5046b46b1586ccbd7
-DIST libsodium-1.0.15.tar.gz 1866057 BLAKE2B 220e327f7803c6cf0b1260b313a225d7cc7a965b36920c744379c5939643e588687032478e3d7a79b4614c5fa57b0dd2afd216b2e23ca69ad16ea67764a840ca SHA512 299a208f8342793d13498e95b23f1749f5b5b13ec276db3ec401130615e837ef475b6a1283b6e87a5f8227d23e70e38ca721073dadd5dc88fe4aff342aa64adc
-DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d74bb9f850364bf0670547a12842009c0ca32d36d06053906fb649497406b1d7988e167772d5f1138d23798d8775f7 SHA512 eab917d599c9c1fe971a6ecf915b9a6476ccec2d46cf23cbfbf06dd3833089b422f192de4d55f17b93362f1251ba8d5ddeb95ced1a422a3a2631b4b82553907f
 DIST libsodium-1.0.18.tar.gz 1919817 BLAKE2B a42d898fe77f232dcbb75728e776b88f006e89f734c4d335e75e01d37b1034cc024df2e89d4350ecbe713d3e4b32c08bec537922c81cc63b0e87ee7fd89b2940 SHA512 17e8638e46d8f6f7d024fe5559eccf2b8baf23e143fadd472a7d29d228b186d86686a5e6920385fe2020729119a5f12f989c3a782afbd05a8db4819bb18666ef
-EBUILD libsodium-1.0.11-r1.ebuild 1039 BLAKE2B d5abb8deb7cbe76beec8cc9b5a5b2300d1a6d62117b33525bc1087e1f09a499a4aa0e7e279dc5dd003a3e2f18dae20104262da5822ed6d62ea63bdb197f792de SHA512 93eddc42552a4921d4de77603e8b26fbc29627b44edb889d85fbe9948ece1f0864053a8b09f5f6457eacd6e6bd1da078a91d5c67266395e1e1f5edf20b1dcacb
-EBUILD libsodium-1.0.15-r1.ebuild 1147 BLAKE2B 041f58dcef86c866941a670c23313e2e4fb9804e024beae6950c468b4e55632f3eeba8e73a2b9bbdcc52bebc0000ac36e3d692e72d4b4e32d6935dcae0319e7c SHA512 bc140c2446e4f1aa45d5f4429223996397a9999c374ed6cbb43c7eb211b89531018b4e363ba0d9404be1e6aeace799c783c22b67565fbe70ca1e6153e31a1635
-EBUILD libsodium-1.0.16-r2.ebuild 1291 BLAKE2B e85fe6fd6d491941f43ad1c2dc773ec529fd7ad15c685fed91831d1deb9f9864ff14ce95511067013be9c0639acf4756744e7278ef682ee582162f3afe406803 SHA512 71f7183b465f949564bbdc741d655cc29994a25c17a1537cdff0721e855b1898cf9aedd2b1c89fa706e90f3a3adb5a378a6f286da0d92bd39576026aa2e8c0d3
-EBUILD libsodium-1.0.18.ebuild 1302 BLAKE2B e08567dccec652f95d3b7190139f9141dad2c1a8ac88489c3eb540cd306e25df29c04a2ea2ff05e62e72797755db90d9649050b329fd7d88bac2367a1501df9f SHA512 536476292aa38b36ca6ff0063564142d89534a9f0f7e8b831568e5f03d79f3884b1647ff2e046608760580e7755fccf870038ba8b4cb987ce498a0357dee8bce
+EBUILD libsodium-1.0.18.ebuild 1291 BLAKE2B 90966094f2c5cdabf74cfd125153092f98ae4af365fc7654f185a46dbe36ceabcfcc589df5d2b923f0151bcab32f20135b304a65f5b71fdfece79450b4ec41a2 SHA512 98fa0e6cd66258c6e4aa4f5ff18d128dabc101aff6141c36f321f858b87a47ce70295aae265d503b721934109a829e8f7e3d9254260d65c738badef77eb6d72c
 MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/libsodium-1.0.11-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.11-r1.ebuild
deleted file mode 100644
index fe9bd6598f34..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.11-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/18"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# --disable-pie needed on x86, bug #512734
-	use x86 && myconf="${myconf} --disable-pie"
-
-	econf \
-		$(use_enable asm) \
-		$(use_enable minimal) \
-		$(use_enable !urandom blocking-random) \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_aes aesni) \
-		${myconf}
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
deleted file mode 100644
index ae0419e4c365..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.15-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/23"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# --disable-pie needed on x86, bug #512734
-	use x86 && myconf="${myconf} --disable-pie"
-	# --disable-ssp is needed on musl x86
-	use x86 && use elibc_musl && myconf+="${myconf} --disable-ssp"
-
-	econf \
-		$(use_enable asm) \
-		$(use_enable minimal) \
-		$(use_enable !urandom blocking-random) \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_aes aesni) \
-		${myconf}
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
deleted file mode 100644
index 4bec9558e24a..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://github.com/jedisct1/libsodium"
-SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/23"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local ECONF_SOURCE="${S}"
-	local myconf
-
-	# --disable-pie is needed on x86, see bug #512734
-	if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then
-		myconf="${myconf} --disable-pie"
-		# --disable-ssp is needed on musl x86
-		if use elibc_musl; then
-			myconf+="${myconf} --disable-ssp"
-		fi
-	fi
-
-	econf \
-		$(use_enable asm) \
-		$(use_enable minimal) \
-		$(use_enable !urandom blocking-random) \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
-		$(use_enable cpu_flags_x86_aes aesni) \
-		${myconf}
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.18.ebuild b/dev-libs/libsodium/libsodium-1.0.18.ebuild
index 6032d35011e0..66b613a2b4c6 100644
--- a/dev-libs/libsodium/libsodium-1.0.18.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
diff --git a/dev-libs/libspnav/Manifest b/dev-libs/libspnav/Manifest
index 94b5dfb11b2d..eebf44a103d6 100644
--- a/dev-libs/libspnav/Manifest
+++ b/dev-libs/libspnav/Manifest
@@ -1,8 +1,4 @@
-AUX libspnav-0.2.2-custom-flags.patch 2151 BLAKE2B 90868c4c60627a16c247a99cf3dd1fb1d9a49b39f2062de22a7d35223b86be553b9f76f2b363ece3593dec976eb3144163d3ce3ab416d6f8436e79e97fb84144 SHA512 f0f2ea3dcd689168780d17ca94b7c20378afeae72442da9c62f1d618b29ad7877d6f6a78e06ed276cff67e1fc57c2bf6fe371f1545fda99ce74f5ee260baa320
-AUX libspnav-0.2.2-makefile.patch 926 BLAKE2B 28533b0e1b91de397d150302be3ea35dfab22fd1fe2235ff41c5a755db48a4eac2365e2f5b03306157336cd9b09b422877c63c9798ddd2d8525ece94af7d8697 SHA512 ebaa5f5685fc55c0f5c0783efd20b2970be8a4ce3e5564b23c65348b1c72e1840d8c2277843cb4d7d3899579810228835f4aa59f99188e79a5543dca93522a21
 AUX libspnav-0.2.3-makefile.patch 1329 BLAKE2B 8eccfcfa539703437326b4800597dc7b6074d7bda0246c27a819114969a6906901b6063a11cdf8dd29148cbf9ecef5d5301f842355b86600b3077b34d61cd6d0 SHA512 8cdc05d5b0d4aa16de59752d0ce204dd0db1df63554c53c2e0b9ea04a7a1b32a0fded8ba4f9f5fc94456f6d4b7b87213284f88944931903986f4df81784cc64f
-DIST libspnav-0.2.2.tar.gz 11615 BLAKE2B 470a533d9ae58b37cd1c1603381bfd3a3bca79b2fe15a81464727e2543433df2fdf32b8683464ade9aa9670f3c9af1ffddde58299678d89d977577ed324f1ebf SHA512 78b26e6fe4a98af579738743ac4bc2f1de5ccfa9316a103a58ebb935f281fba04b8c6c28c0d63abda15a52c0288e371231425a3a21b26c083a5de7ab101f1940
 DIST libspnav-0.2.3.tar.gz 11985 BLAKE2B 134a0c3f7c9a7ef7c4f68910e0266880958e2b74e253b75237b0fa8d3e482bcd1f42e715b85f0ffca3a62103530e854090818564d9c241bfc55de039cc4883ee SHA512 b2c452d979d455fc99bfdc172c8a2408a6e8dc40acc52964fa64f4d75a8ee77dda12e5e212c0c4e07a0a24d055f16f85bb6ce6287e24e6bd0665de457e37e6a7
-EBUILD libspnav-0.2.2.ebuild 1083 BLAKE2B dcd24705baba8b43e0cf62f92d5568a7edf84422851c0012349d45fbac7fc775be3d5f3014ec8b395612681565c6d16038392fcd3798ac46f241fb937f56959f SHA512 a6a7ff7c37d855cc4a53908b5dc6f4b9be3e176a409ba7431f9a068339470301d17dfb5e172daee032d7e7f09bcf23bc0d0ba5739f7dca5b2c380249c165bc16
-EBUILD libspnav-0.2.3.ebuild 897 BLAKE2B 1bf386e77eca6f20777979ff4ebac7b52bb4e8f74404108c51a732ab8fbc25531fcf05bf9810f2f7c94b0dc74c8de156ac39e3b32bd201de02bc898e1e2dfa44 SHA512 b452c5865b71a390455fbcfcce18e49d4865ef1f1be679d93431d5aa43799031147fbae168fb7e3ad0f9a60cb0d3f041df5f31fa0389be3e50d2b705c25d3a10
+EBUILD libspnav-0.2.3.ebuild 894 BLAKE2B 7069d849b8e936289ee7c66805c8122038e331503311a607b20dacb34db97529a11b38c7530af70def1073baad08e6505b97fc88823bce3b09367600613709c7 SHA512 e535b119a9a967f262d78e22ba82d438a78a97e8cc56f1cf37c73b6056b48c3bd4a0264bc5c38a3258950358b85ba1e60e8a692b8516c7fc1d0a3eeb52857cae
 MISC metadata.xml 811 BLAKE2B a39e9937eb3d7f59833369b4e983ac30dfdf7cce0e895916c5cb934b03fc41ea9b4a4fef3c7c8c8e98ffb0ff7398a3ed5c94015772481c2cd60a019f1fe714f4 SHA512 61f35f0ad4015cd020f0292d139bed2a5bb3c8ef7f11cc96c816ca6003941de0f8295a75ccd6da961bf4256988b788784ca4b41e98be0a9f96c04e0663d566e9
diff --git a/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch b/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch
deleted file mode 100644
index cc96655bf469..000000000000
--- a/dev-libs/libspnav/files/libspnav-0.2.2-custom-flags.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Npur libspnav-0.2.2.orig/Makefile.in libspnav-0.2.2/Makefile.in
---- libspnav-0.2.2.orig/Makefile.in	2012-01-31 22:34:01.448356249 +0100
-+++ libspnav-0.2.2/Makefile.in	2012-01-31 22:39:20.229350669 +0100
-@@ -7,7 +7,8 @@ lib_so = $(soname).1
- 
- CC = gcc
- AR = ar
--CFLAGS = $(opt) $(dbg) -std=c89 -fpic -pedantic -Wall -fno-strict-aliasing -I.
-+CFLAGS = $(opt) -fpic -I.
-+LDFLAGS = $(ldopt) -shared -Wl,-soname,$(soname)
- 
- .PHONY: all
- all: $(lib_a) $(lib_so)
-@@ -16,7 +17,7 @@ $(lib_a): $(obj)
- 	$(AR) rcs $@ $(obj)
- 
- $(lib_so): $(obj)
--	$(CC) -shared -Wl,-soname,$(soname) -o $@ $(obj)
-+	$(CC) $(LDFLAGS) -o $@ $(obj)
- 
- %.o: $(srcdir)/%.c
- 	$(CC) $(CFLAGS) -c $< -o $@
-diff -Npur libspnav-0.2.2.orig/configure libspnav-0.2.2/configure
---- libspnav-0.2.2.orig/configure	2012-01-31 22:34:01.448356249 +0100
-+++ libspnav-0.2.2/configure	2012-01-31 22:34:39.703355615 +0100
-@@ -4,6 +4,7 @@ echo 'configuring spacenav library...'
- 
- PREFIX=/usr/local
- OPT=yes
-+LDOPT=yes
- DBG=yes
- X11=yes
- 
-@@ -26,6 +27,11 @@ for arg; do
- 	--disable-opt)
- 		OPT=no;;
- 
-+	--enable-ldopt)
-+		LDOPT=yes;;
-+	--disable-ldopt)
-+		LDOPT=no;;
-+
- 	--enable-debug)
- 		DBG=yes;;
- 	--disable-debug)
-@@ -44,6 +50,8 @@ for arg; do
- 		echo '  --disable-x11: disable X11 communication mode'
- 		echo '  --enable-opt: enable speed optimizations (default)'
- 		echo '  --disable-opt: disable speed optimizations'
-+		echo '  --enable-ldopt: enable link optimizations (default)'
-+		echo '  --disable-ldopt: disable link optimizations'
- 		echo '  --enable-debug: include debugging symbols (default)'
- 		echo '  --disable-debug: do not include debugging symbols'
- 		echo 'all invalid options are silently ignored'
-@@ -54,6 +62,7 @@ done
- 
- echo "  prefix: $PREFIX"
- echo "  optimize for speed: $OPT"
-+echo "  optimize link: $LDOPT"
- echo "  include debugging symbols: $DBG"
- echo "  x11 communication method: $X11"
- echo ""
-@@ -74,7 +83,11 @@ if [ "$DBG" = 'yes' ]; then
- fi
- 
- if [ "$OPT" = 'yes' ]; then
--	echo 'opt = -O3' >>Makefile
-+	echo "opt = ${CFLAGS:--O3}" >>Makefile
-+fi
-+
-+if [ "$LDOPT" = 'yes' ]; then
-+	echo "ldopt = ${LDFLAGS}" >>Makefile
- fi
- 
- if [ "$X11" = 'yes' ]; then
diff --git a/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch b/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch
deleted file mode 100644
index f65300c5f58a..000000000000
--- a/dev-libs/libspnav/files/libspnav-0.2.2-makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Npur libspnav-0.2.2.orig/Makefile.in libspnav-0.2.2/Makefile.in
---- libspnav-0.2.2.orig/Makefile.in	2012-01-31 22:40:36.619349333 +0100
-+++ libspnav-0.2.2/Makefile.in	2012-01-31 22:41:52.554347975 +0100
-@@ -11,7 +11,7 @@ CFLAGS = $(opt) -I.
- LDFLAGS = $(ldopt) -shared -Wl,-soname,$(soname)
- 
- .PHONY: all
--all: $(lib_a) $(lib_so)
-+all: $(lib_so)
- 
- $(lib_a): $(obj)
- 	$(AR) rcs $@ $(obj)
-@@ -31,10 +31,10 @@ distclean:
- 	rm -f $(obj) $(lib_a) $(lib_so) Makefile
- 
- .PHONY: install
--install: $(lib_a) $(lib_so)
--	cp $(lib_a) $(PREFIX)/$(libdir)/$(lib_a)
--	cp $(lib_so) $(PREFIX)/$(libdir)/$(lib_so)
--	for h in $(hdr); do cp -p $(srcdir)/$$h $(PREFIX)/include/; done
-+install: $(lib_so)
-+	mkdir -p $(DESTDIR)$(PREFIX)/$(libdir) $(DESTDIR)$(PREFIX)/include
-+	cp $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so)
-+	for h in $(hdr); do cp -p $(srcdir)/$$h $(DESTDIR)$(PREFIX)/include/; done
- 
- .PHONY: uninstall
- uninstall:
diff --git a/dev-libs/libspnav/libspnav-0.2.2.ebuild b/dev-libs/libspnav/libspnav-0.2.2.ebuild
deleted file mode 100644
index b97017ab74ea..000000000000
--- a/dev-libs/libspnav/libspnav-0.2.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit multilib eutils toolchain-funcs
-
-MY_PN='spacenav'
-DESCRIPTION="libspnav is a replacement for the magellan library with a cleaner API"
-HOMEPAGE="http://spacenav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20library%20%28SDK%29/${PN}%20${PV}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="X"
-
-RDEPEND="app-misc/spacenavd[X?]"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-custom-flags.patch
-}
-
-src_configure() {
-	econf \
-		--enable-opt --enable-ldopt \
-		$(use_enable X x11)
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	default
-
-	# Use proper libdir
-	if [[ $(get_libdir) != lib ]]; then
-		mv "${D}"/usr/{lib,$(get_libdir)} || die
-	fi
-
-	# Create missing symlinks
-	local target=$(basename "${D}"/usr/$(get_libdir)/libspnav.so.*)
-	dosym ${target} /usr/$(get_libdir)/libspnav.so.0 || die
-	dosym ${target} /usr/$(get_libdir)/libspnav.so || die
-}
diff --git a/dev-libs/libspnav/libspnav-0.2.3.ebuild b/dev-libs/libspnav/libspnav-0.2.3.ebuild
index 0cde20cb7aa1..b4411a26466b 100644
--- a/dev-libs/libspnav/libspnav-0.2.3.ebuild
+++ b/dev-libs/libspnav/libspnav-0.2.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spacenav.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20library%20%28SDK%29/${PN}%20${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="X"
 
 CDEPEND="X? ( x11-libs/libX11 )"
diff --git a/dev-libs/libstrl/Manifest b/dev-libs/libstrl/Manifest
index 692e44668293..801578a5b1db 100644
--- a/dev-libs/libstrl/Manifest
+++ b/dev-libs/libstrl/Manifest
@@ -1,3 +1,3 @@
 DIST libstrl-0.5.1.tar.bz2 259026 BLAKE2B 9f2b576b1a86361f982069a1e7b1c12e0f47918637ed43add261379c195ba9ddeb5b8ca04b0811b75373235c79ff5b254a42c2e3ed360da410039a913137dd60 SHA512 c79b37aef2cf909529e3afabdf472730f9df2eb3605eeb41a74b56f1c9c43a5be1f23c7f383c4b1c2aacb81b9df1d455a3fe9ec1083d5fcabae4c82ef916df92
-EBUILD libstrl-0.5.1-r1.ebuild 709 BLAKE2B a883f273e70d04c621d126c69ea7377fa4e2abf7052dda2246103420d39489b33a40962186250aeb372ea209cd444157eb08f00a29eae15d90566177bb9516b0 SHA512 df1642ea8970dddfb43d05af15b90ea38782a27d23def97cda10b6401459e8e1144619ac8129663959d4517817a30d46febcc03f217b0b5f44df3e6d391bd765
+EBUILD libstrl-0.5.1-r1.ebuild 736 BLAKE2B 1f87b29a0e88d58fd8a8ed52af3b036c9bd9016cbeb852bb1372ef0915ab71ae856e3178ee7c5c49bb434c4f51ec9437c1ec3c7347eb6ce4e22dfb26667c1b3e SHA512 8a3635c85bde10411e6ddbf1809f16920c84915faa7760fb1255666020c3fa655f4768a230df6d204d07966383cf85a8068f4d63f3a23f0bed8ba25405fa1154
 MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/dev-libs/libstrl/libstrl-0.5.1-r1.ebuild b/dev-libs/libstrl/libstrl-0.5.1-r1.ebuild
index de33883bf831..33b911319375 100644
--- a/dev-libs/libstrl/libstrl-0.5.1-r1.ebuild
+++ b/dev-libs/libstrl/libstrl-0.5.1-r1.ebuild
@@ -12,6 +12,7 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x64-macos"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	doc? ( app-doc/doxygen )
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 5b1d52597a7d..541006d6e09c 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -1,5 +1,8 @@
+AUX libtasn1-4.15.0-noinst_fuzzer_tool.patch 918 BLAKE2B 4b0aeaa49d3c1460f0e333932a5f17e6fa289bac4f014d71a8acdc89748a30018ed8fadfc7e9410e30dbed70889ea2227ecb8e6e30b2b044f435cd44d3d6199d SHA512 be805ec8b11ad97a3bacdcbdcb80bc22a3be8fd1de9d512b7dd44ab207d1cf3f7db1d60af2e4c4634dcda37031a754d678ea8dab76cb23dcaf7d7bbd9683ce86
 DIST libtasn1-4.13.tar.gz 1891703 BLAKE2B 5a8bfefe1a3701505c8a1a4920412a6dd15fe771fb848fbd00f0a332388795dc6108a0fa5a282b4212abe0b0642f205bda53c2c39a4a2d65fa71e082fc76a6d2 SHA512 bf5b60a296795e0a8a4a658c0106492393aa7ce698e785256b3427c17215c2a5b6178a61a2043c93ea4334f754eabece20221ac8fef0fd5644086a3891d98a9f
 DIST libtasn1-4.14.tar.gz 1771184 BLAKE2B fab592db4c62d1ed1201637fdbfbf7b753ff90994245b28bad4fbbb6f28616f0abc65fb5cf4fe9b9cd6cc7c4ffb442686b275a97dcfdbdb6a08b0d8e781576f5 SHA512 efdcf3729e9e057cafbfdc9929f08531de03cf3b64e7db62cb53c26bf34c8db4d73786fd853620ab1a10dbafe55e119ad17bfeb40e191071945c7b4db9c9e223
-EBUILD libtasn1-4.13.ebuild 1147 BLAKE2B e05d3886c3fc9fae4d92f83d26a36bab230bcfa788b7ba35a942f29c476d84238cbbd0abbcc2be17d041f16f8baa9702c38ef40c30395e23cab908faee753dc9 SHA512 d3ea352f75e7745a0431394e3dfed43211fed7a40c577caf7c02b4d8a87e14e9cca24d9aac53269ea41762080fd8ee1a0c23fb4fe2c678cc0ed881539964f860
-EBUILD libtasn1-4.14.ebuild 1170 BLAKE2B 79871f0b944f18144b302c38bcfab822106bbf2aae0e21de66fc0786486bd37fedc74b809c7a2bd9f19f9d069025368c780fc43b70e048fae9f1987bb0639dc8 SHA512 f6329ba4b4ed90fcd0e13f4c557bd0f3bc5f4fd7f0723d1ad13becde188d1e45ef8a942420b1b1d53cd2666b28bf45f6382736322fcb8e9e559700f48f503721
+DIST libtasn1-4.15.0.tar.gz 1800713 BLAKE2B 005a36bfdd89a167d469ef834c00d8b89e0fba42c0c973709be93c1d703b8042d5170df855085bac9945b6512dc3abef9405461988d634cb32ec0fe99f49367d SHA512 a8095aebf57a0b482027d06e0ee6978946f267b57bf2db3c891c4656ca35250cc1f72e2e90f4cc0ddbdf6cd2b1783881a62d495a57ad4a98684f8d037307552d
+EBUILD libtasn1-4.13.ebuild 1175 BLAKE2B 7915a9b1316db2bbf9ce6a618d9bedbe5b677c64119fbd73066149ee50d26512ce56adf8fe976d496cd7ecff6225678ac82a67e166395c897668435c8cb3c676 SHA512 a680eb1537c92555aac3b00add8d6fe65014906d357ddaf1596aeca9e7b0288df06f8c0908e03b4e4ae2287946cc3020d467545135ba26f7153c2ce189ff79c0
+EBUILD libtasn1-4.14.ebuild 1198 BLAKE2B 79f5f4e71758e7e019a8342e0a2e78ae8862d17b2cfaac1b508e09ba00c2379ff611bc6738293fad2c2194a08b42be1ac0a464f44671f705ed535c9938c4ada8 SHA512 a1b4f3a55a866fe4fb5f87b4567d4be7c5779c560ca7a925b4b44ea17e3ee964d2108a41c909f603a46971d025bc4b5fc2fe354adbe818aad30348f73f236de8
+EBUILD libtasn1-4.15.0-r1.ebuild 1296 BLAKE2B de75957eec71b3b4955c1b7109372f4b59c57a000923ca57327891f3573edaa037765e19dd43de13b927010b9eb6ffa4a843fe8f7e279838bd7d9eca97799868 SHA512 a2d407306a86b1562c89c489bc72690c0c2d1514591f725e64a67d0c919738bf78eccf6bceab0d6cb964ffe3166b2a3a41d5e2f4a62df949c77c77fd772cadd6
 MISC metadata.xml 428 BLAKE2B 85413f31c74675764c652ce8bec334384a0696c3eefdb517cde5f73c6385e9f52bad2087613b9fc4f37074fbcbdd6953dd25f87ba6095d13cf08a1aadde1488c SHA512 172d1c137ea4190da305ca987dfecf1db73e4e222cae61e8f7830a539a87ed3e919af93f0415563a9be2f65dd7b8787c22e8494e134c42e701ce1559a66cf5a3
diff --git a/dev-libs/libtasn1/files/libtasn1-4.15.0-noinst_fuzzer_tool.patch b/dev-libs/libtasn1/files/libtasn1-4.15.0-noinst_fuzzer_tool.patch
new file mode 100644
index 000000000000..45360ec8f822
--- /dev/null
+++ b/dev-libs/libtasn1/files/libtasn1-4.15.0-noinst_fuzzer_tool.patch
@@ -0,0 +1,35 @@
+From 49d6e3f0a4b5fd4da31228d23ae9efabef20c1ca Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Thu, 21 Nov 2019 16:09:20 +0100
+Subject: [PATCH] fuzz: do not install generated fuzzers and tools
+
+Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+---
+ fuzz/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am
+index ae6616b..aa621ce 100644
+--- a/fuzz/Makefile.am
++++ b/fuzz/Makefile.am
+@@ -38,7 +38,7 @@ FUZZERS = \
+ 
+ if FUZZING
+   # fuzzing mode, enabled with ./configure --enable-fuzzing
+-  bin_PROGRAMS = $(FUZZERS)
++  noinst_PROGRAMS = $(FUZZERS)
+   AM_LDFLAGS += -fsanitize=fuzzer
+   MAIN = fuzzer.h
+ else
+@@ -47,7 +47,7 @@ else
+   TESTS = $(FUZZERS)
+   check_PROGRAMS = $(FUZZERS)
+ 
+-  bin_PROGRAMS = corpus2array
++  noinst_PROGRAMS = corpus2array
+   corpus2array_SOURCES = corpus2array.c
+ endif
+ 
+-- 
+2.22.2
+
diff --git a/dev-libs/libtasn1/libtasn1-4.13.ebuild b/dev-libs/libtasn1/libtasn1-4.13.ebuild
index a20513fb9226..b15bae173759 100644
--- a/dev-libs/libtasn1/libtasn1-4.13.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.13.ebuild
@@ -14,6 +14,8 @@ SLOT="0/6" # subslot = libtasn1 soname version
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test valgrind"
 
+RESTRICT="!test? ( test )"
+
 BDEPEND="sys-apps/help2man
 	virtual/yacc
 	test? ( valgrind? ( dev-util/valgrind ) )"
diff --git a/dev-libs/libtasn1/libtasn1-4.14.ebuild b/dev-libs/libtasn1/libtasn1-4.14.ebuild
index 29fd0b035fb7..ce8e7f67a174 100644
--- a/dev-libs/libtasn1/libtasn1-4.14.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.14.ebuild
@@ -14,6 +14,8 @@ SLOT="0/6" # subslot = libtasn1 soname version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test valgrind"
 
+RESTRICT="!test? ( test )"
+
 BDEPEND="sys-apps/help2man
 	virtual/yacc
 	test? ( valgrind? ( dev-util/valgrind ) )"
diff --git a/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild b/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild
new file mode 100644
index 000000000000..e3e7c7a51749
--- /dev/null
+++ b/dev-libs/libtasn1/libtasn1-4.15.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal libtool
+
+DESCRIPTION="ASN.1 library"
+HOMEPAGE="https://www.gnu.org/software/libtasn1/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0/6" # subslot = libtasn1 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test valgrind"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="sys-apps/help2man
+	virtual/yacc
+	test? ( valgrind? ( dev-util/valgrind ) )"
+
+DOCS=(
+	AUTHORS
+	ChangeLog
+	NEWS
+	README.md
+	THANKS
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-noinst_fuzzer_tool.patch #701928
+)
+
+pkg_setup() {
+	if use doc; then
+		DOCS+=( doc/libtasn1.pdf )
+		HTML_DOCS=( doc/reference/html/. )
+	fi
+}
+
+src_prepare() {
+	default
+	#elibtoolize  # for Solaris shared library
+	eautoreconf #701928
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable valgrind valgrind-tests)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libtecla/Manifest b/dev-libs/libtecla/Manifest
index ba306db46248..b583cc4a1e3c 100644
--- a/dev-libs/libtecla/Manifest
+++ b/dev-libs/libtecla/Manifest
@@ -1,17 +1,10 @@
-AUX libtecla-1.6.1-LDFLAGS2.patch 1857 BLAKE2B 28bf90e7a33223faa77c079baf9b15b6c5abea062287d469017158e4328c030c8f3dd25a1e970b5b7d7c404fdaff38e2b75ea1a513e55d5ad5cccfe1a570f477 SHA512 784dfa77723a9f29bb09dd83aea00d1e24290990d446aad0d88b2184cbc4d4ded2063588c4f6f2cd1a65acbcac4d5817747576e36163da48479bfb33c59182a6
 AUX libtecla-1.6.1-install.patch 481 BLAKE2B 64aa925e0fba234a97cfa6c484720db27b4a41872b7ae009a1e48353fb58c42d2fb47a39fb7f53bd12aa42e3a7c9fae5ed188af8381be40aa84b5cee53f9d77b SHA512 971f97e15ee0c63df0023477fe6e3f8bf555115e64d90d1ab78b3a312c5b526feaafe825220ad5eee86fe2c4e8cb61a66eda8d36e413abf06c8e4f9fd9261bfa
-AUX libtecla-1.6.1-ldflags.patch 1127 BLAKE2B c56217ca18959e279d3d9a5c78a7dd94b02398ae9e25ff25b2ee7e5260e76bc5c734c08d67bd920671e7d887a76d5fdc08c9fd5a35d6f958e1fe178840678416 SHA512 e7aec721424e3e55b4bf6a6ec3bc360d43af70e27cad273b7dbc7a5a6b42349d24aa6f32b9d0e5ff9108836bafa6e5fda38733adff038026cd5a2a50d4548c8d
 AUX libtecla-1.6.1-no-strip.patch 562 BLAKE2B f1e2c030b2527817703f6aca94b19b4d5b8b6f4a5f4d94d224c497e1b0c85780ac57c0f3e998b01200247f3705c700e3ba27b9e7a3dbd767b0cfbc29078b99fc SHA512 6ae1258602b7e062a81b41d5170fa0af9540653f30111397507f0ad10beb3cd4c02de3d7775d5f7a493f49db84c2eff2650b9c81dc35bf2da39f8624c247a39a
-AUX libtecla-1.6.1-parallel_build2.patch 1484 BLAKE2B 5c9768e04958a9ce38290272786b5b62bddbea3e02502631c7bab0c5716cab3d9d20250f24e2dce5a471d836fe4c328b0cc985e4fe64ec4db4bc986a6db1ecf3 SHA512 de7e74aa47ffc827ed3cbca7456b5ece59396df067375d5d2eb81eeaf7b99aad077cc36413290865820cf59d9a736b3bc362eb80ff46f3179ebf5f52f73949c4
 AUX libtecla-1.6.1-prll-install.patch 1309 BLAKE2B 85fee8b6a41c5c6d5eea5a493ca041a4e6b45424cad212227243569c34e59a1aa5658a8e4e04e8217ffc687f188152477b0dddaf6348aab29ae70e44ffa9dc87 SHA512 263a33d3b16f54ab66542e408c0e9c978b7a2d8c8a44412a2b2adeea332de284a0968e5a76c632baef3f709b74260d1276f5430cb8c2d61fe1c7e84246910ea1
 AUX libtecla-1.6.3-ldflags.patch 1794 BLAKE2B e5e36abda4192129fa8b24e4c422f040d91e0bf3bf1064e366753164d7f59f680312b5a662018e682a889c9e4dad33986346c5869318102abdc6720a2118c23d SHA512 cf00a20efb9c071a759ed4c032fe1a74c44082bbe2221d37d67b5893ed56586fc98621130e3e4fbe6974fb1eeb559c1f80e8cf2a923bf625ff0f2dc6ed0cdd17
 AUX libtecla-1.6.3-prll-build.patch 418 BLAKE2B b93d0f2c31b4675443fa50e804896270f38e72e1fd2f13480a173a4fa5d9a2235c4efde82102ebcb5bdaabd066dee5f3d25690abe7a4da4bd6dbe25c430ff145 SHA512 b769d7db3c40fb91a0eb20088b5a0e1fee2769936a4d19b58806ef933ac14e699e5ca9f9151e8ed7aad6f03174fe43319e1110e9374ec0273dcf49e3dcc5a1f4
 AUX libtecla-1.6.3-secure-runpath.patch 1210 BLAKE2B 87a6dc7fce949e86588bcbbb74050209ebafde1432ec2199bd2147d3bd1e7be22390d3a3e9e0cc3800a2cba5971c2cc38fc19f36993c62b61aaa81946da2b0d6 SHA512 591e2b1bba8d99cee516d32b7974d3108d108bc77db2a4f180eb80ec00618a248e368a4f736fb7a27cadef16992baaf2698f49de1a5e54dd8638bfcb3e17155e
 AUX libtecla-1.6.3-static-libs.patch 1024 BLAKE2B 190508440e2a0323c1991bb2179c495be3e4748d04bc87da9328ae4fd828da331aab7679d2769d2110c02c94eb36aba2962223fbdc7de21e8863d08d3e87d289 SHA512 01483100e837c90cfc604ac6c177f03d8d96ff3972c454d3f720270508356c18be336b77624d6c8c291c12fc1400a9e58531b3b7e12c5afc8aa116c15431e756
-DIST libtecla-1.6.1.tar.gz 518995 BLAKE2B 4aea38ecfbc96dc418a7f652f8a0caabd61625336bdcf611889bbcbfa7e7674877d239e34d7f23aa0b80ba664b97d9553586bbab36529e0761d7150300cf4bbb SHA512 89d550868c99739b5cfd0ddba45f61d9a8fd1454c7044f29db6cced9cd1de83b895409706a8b85024d6c75678469a4b8b39dd184322d01e1ab6b5faf03c90fc7
-DIST libtecla-1.6.2.tar.gz 535977 BLAKE2B 81b9402ae01414a05cfd75de1ec3a4e4a2ff3f3f19c466d9d220a585467b383db2ac2a542932ba361765405759bfdb8865a8c8eca136b0aa9c9bef3b4098ffe8 SHA512 cabfaa4ac386bceee6cd2887010af0c64b98f545ee5c2d367c3594925985df43525bfb5f028890904c66d0f767fc2cb0585a8500cbb06ffd10b7cd7a6d56adb1
 DIST libtecla-1.6.3.tar.gz 531499 BLAKE2B 6cc585ce104a60138c8b1950f455be845f3db014f1b56585a6ff8c05101e187a3f9deb7546a24e28d8797a49c426606ff50ccb49065ec2dfe4999537c66579ba SHA512 e92da3e52f1e06f731378ea8d4529865526b7816f92c3cd41a24ee8b629453564ec1995cf528928dd0673826cdd88f57e057ec0641f9c00fc9ebb255c725df6b
-EBUILD libtecla-1.6.1-r2.ebuild 933 BLAKE2B 3b86761456cd63d19643f592c597ee6db7eb50e6550ee43d5dfec58ccd154a345c347923d808283e130001e8e5b4552c1843eeb0bdfe50b5eff5f6130ea8b639 SHA512 5307c0e5a7c44596d88015edbf187a9ac249eecd65466c71ddbe0a00d8e1d6a3ee16bd156bd6fef96ebc2b3b6e325d4ccb6a0e0df5f462ce818713425eb132da
-EBUILD libtecla-1.6.2.ebuild 1001 BLAKE2B ec3abd043569bb230f6945e4db574449fd33336ae08a8a3703d14ff17ec18bc17442339c4aeef981fbb905982f5b34692d3817792f89b688d1e406c80828dcfe SHA512 78039eea3d6a4eea419e02c259426b0d928928535698fa662c6a787e4b6994750af0e195fbb16ca544e11d1e30bbbdf51f70af9bcb796bdcb2667ce9f208f666
-EBUILD libtecla-1.6.3.ebuild 1025 BLAKE2B efa86ae81bcfaaeed3eef829651f25dd7e7e1295126f88248a7f0a03f0c4f189b8b73d18d1b19b60084126905c2784114dcef4fe6178d6fbec6fecd31ac1be83 SHA512 120557678ab72d18bd72c2fd222f32f3b61589320dc76547d877cfb29e12e2859551e10a3d84bd36a255da882640c3f47ae18e7af07f47b780557d93bee0dc84
+EBUILD libtecla-1.6.3.ebuild 1019 BLAKE2B 4c2c122d870285f3c41c85bff789a01782afad3d2db27d216b06a4485dd7b32c972fc124c301cad04fc86e68ff791cade46fea14c251f4b1828977ba1fffdae3 SHA512 f55f57f366d335bb74d9da6ab25db32a31885956898325940a0e9bb62c5b8fd48a90024eb180d8ef30a2f3f51789cd57d300c179c023344668a2bdd2478d2288
 MISC metadata.xml 794 BLAKE2B 073e5013e838aadadaeb48afa161f06ffc2fe954299d44b80a1f9e527d3e7462e27373480274fffed37f60aaf1894e0d5865dc42e097775bb8c50e0e1f59f53f SHA512 80be7186ebcabddeb32cac439005d885a000696ee59ddf5c25a66b91ce9d37249091c9469c03c82669b706241476d6eed9a1a6aedb592c05778ef31479f31750
diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-LDFLAGS2.patch b/dev-libs/libtecla/files/libtecla-1.6.1-LDFLAGS2.patch
deleted file mode 100644
index c29d3e04c48e..000000000000
--- a/dev-libs/libtecla/files/libtecla-1.6.1-LDFLAGS2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- Makefile.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index e492136..a44371a 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -165,10 +165,10 @@ CFLAGS = $(OPT) $(WARNING_FLAGS) $(DEFINES) @CFLAGS@ @SHARED_CFLAGS@
- default: $(TARGETS)
- 
- normal:
--	@$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="" CFLAGS="$(CFLAGS)" CC="$(CC)" OBJDIR=normal_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS)' RANLIB='$(RANLIB)' LDFLAGS=$(LDFLAGS) CPPFLAGS=$(CPPFLAGS)
-+	@$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="" CFLAGS="$(CFLAGS)" CC="$(CC)" OBJDIR=normal_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS)' RANLIB='$(RANLIB)' LDFLAGS='$(LDFLAGS)' CPPFLAGS='$(CPPFLAGS)'
- 
- reentrant:
--	@$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="_r" CFLAGS="$(CFLAGS) $(DEFINES_R)" CC="$(CC)" OBJDIR=reentrant_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS_R)' RANLIB='$(RANLIB)' LDFLAGS=$(LDFLAGS) CPPFLAGS=$(CPPFLAGS)
-+	@$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="_r" CFLAGS="$(CFLAGS) $(DEFINES_R)" CC="$(CC)" OBJDIR=reentrant_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS_R)' RANLIB='$(RANLIB)' LDFLAGS='$(LDFLAGS)' CPPFLAGS='$(CPPFLAGS)'
- 
- demos: normal
- 
diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-ldflags.patch b/dev-libs/libtecla/files/libtecla-1.6.1-ldflags.patch
deleted file mode 100644
index 423e8113213d..000000000000
--- a/dev-libs/libtecla/files/libtecla-1.6.1-ldflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# add missing LDFLAGS to build system.
-# the configure script still fails to add LDFLAGS when linking
-# the libtecla shared object but since it calls ld directory 
-# LDFLAGS can't be used straight out of the box.
-
---- libtecla/Makefile.rules
-+++ libtecla/Makefile.rules
-@@ -66,7 +66,7 @@
-  $(OBJDIR)/demo3.o -L. -ltecla$(SUFFIX) $(LIBS)
- 
- enhance$(SUFFIX): $(OBJDIR)/enhance.o
--	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
-+	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(LDFLAGS) $(CFLAGS) -o $@ \
-  $(OBJDIR)/enhance.o -L. -ltecla$(SUFFIX) $(LIBS)
- 
- #-----------------------------------------------------------------------
---- libtecla/configure.in
-+++ libtecla/configure.in
-@@ -468,7 +468,7 @@
-     VERSION_OPT=''
-   fi
- 
--  LINK_SHARED="$LD"' -o $$@ -soname libtecla$$(SUFFIX).so.'${MAJOR_VER}' -shared '$VERSION_OPT' $$(LIB_OBJECTS) $$(LIBS) -lc'
-+  LINK_SHARED="$LD"' $$(LFLAGS) -o $$@ -soname libtecla$$(SUFFIX).so.'${MAJOR_VER}' -shared '$VERSION_OPT' $$(LIB_OBJECTS) $$(LIBS) -lc'
-   SHARED_CFLAGS="-fpic"
- 
- dnl Reenable the inclusion of symbols which get undefined when POSIX_C_SOURCE
diff --git a/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build2.patch b/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build2.patch
deleted file mode 100644
index 3f85f5fdb854..000000000000
--- a/dev-libs/libtecla/files/libtecla-1.6.1-parallel_build2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
- Makefile.rules |   16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.rules b/Makefile.rules
-index 0c2f1d1..a3960b5 100644
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -53,20 +53,20 @@ libtecla.map.opt: $(srcdir)/libtecla.map
- 
- demos: $(DEMO_PROGS)
- 
--demo$(SUFFIX): $(OBJDIR)/demo.o
--	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
-+demo$(SUFFIX): $(OBJDIR)/demo.o libtecla$(SUFFIX)$(SHARED_EXT)
-+	LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) -o $@ \
-  $(OBJDIR)/demo.o -L. -ltecla$(SUFFIX) $(LIBS)
- 
--demo2$(SUFFIX): $(OBJDIR)/demo2.o
--	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
-+demo2$(SUFFIX): $(OBJDIR)/demo2.o libtecla$(SUFFIX)$(SHARED_EXT)
-+	LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) -o $@ \
-  $(OBJDIR)/demo2.o -L. -ltecla$(SUFFIX) $(LIBS)
- 
--demo3$(SUFFIX): $(OBJDIR)/demo3.o
--	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
-+demo3$(SUFFIX): $(OBJDIR)/demo3.o libtecla$(SUFFIX)$(SHARED_EXT)
-+	LD_RUN_PATH="$(LIBDIR)" $(CC) $(CFLAGS) -o $@ \
-  $(OBJDIR)/demo3.o -L. -ltecla$(SUFFIX) $(LIBS)
- 
--enhance$(SUFFIX): $(OBJDIR)/enhance.o
--	LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(LDFLAGS) $(CFLAGS) -o $@ \
-+enhance$(SUFFIX): $(OBJDIR)/enhance.o libtecla$(SUFFIX)$(SHARED_EXT)
-+	LD_RUN_PATH="$(LIBDIR)" $(CC) $(LDFLAGS) $(CFLAGS) -o $@ \
-  $(OBJDIR)/enhance.o -L. -ltecla$(SUFFIX) $(LIBS)
- 
- #-----------------------------------------------------------------------
diff --git a/dev-libs/libtecla/libtecla-1.6.1-r2.ebuild b/dev-libs/libtecla/libtecla-1.6.1-r2.ebuild
deleted file mode 100644
index d84b97fb1857..000000000000
--- a/dev-libs/libtecla/libtecla-1.6.1-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="Tecla command-line editing library"
-HOMEPAGE="http://www.astro.caltech.edu/~mcs/tecla/"
-SRC_URI="http://www.astro.caltech.edu/~mcs/tecla/${P}.tar.gz"
-
-LICENSE="icu"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="static-libs"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/libtecla
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-install.patch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-no-strip.patch \
-		"${FILESDIR}"/${P}-parallel_build2.patch \
-		"${FILESDIR}"/${P}-LDFLAGS2.patch \
-		"${FILESDIR}"/${P}-prll-install.patch
-	eautoreconf
-}
-
-src_compile() {
-	emake \
-		OPT="" \
-		LDFLAGS="${LDFLAGS}" \
-		LFLAGS="$(raw-ldflags)"
-}
-
-src_install() {
-	default
-	use static-libs || \
-		rm -rvf "${ED}"/usr/$(get_libdir)/*a || die
-}
diff --git a/dev-libs/libtecla/libtecla-1.6.2.ebuild b/dev-libs/libtecla/libtecla-1.6.2.ebuild
deleted file mode 100644
index 23ac353d4c44..000000000000
--- a/dev-libs/libtecla/libtecla-1.6.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="Tecla command-line editing library"
-HOMEPAGE="http://www.astro.caltech.edu/~mcs/tecla/"
-SRC_URI="http://www.astro.caltech.edu/~mcs/tecla/${P}.tar.gz"
-
-LICENSE="icu"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/libtecla
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.6.1-install.patch \
-		"${FILESDIR}"/${PN}-1.6.1-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.6.1-no-strip.patch \
-		"${FILESDIR}"/${PN}-1.6.1-parallel_build2.patch \
-		"${FILESDIR}"/${PN}-1.6.1-LDFLAGS2.patch \
-		"${FILESDIR}"/${PN}-1.6.1-prll-install.patch
-	eautoreconf
-}
-
-src_compile() {
-	emake \
-		OPT="" \
-		LDFLAGS="${LDFLAGS}" \
-		LFLAGS="$(raw-ldflags)"
-}
-
-src_install() {
-	default
-	use static-libs || \
-		rm -rv "${ED}"/usr/$(get_libdir)/*a || die
-}
diff --git a/dev-libs/libtecla/libtecla-1.6.3.ebuild b/dev-libs/libtecla/libtecla-1.6.3.ebuild
index 954e62a71a87..d7cd7848d68f 100644
--- a/dev-libs/libtecla/libtecla-1.6.3.ebuild
+++ b/dev-libs/libtecla/libtecla-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 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="http://www.astro.caltech.edu/~mcs/tecla/${P}.tar.gz"
 
 LICENSE="icu"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="sys-libs/ncurses:="
diff --git a/dev-libs/libtomfloat/Manifest b/dev-libs/libtomfloat/Manifest
index b07e358f9d1c..4562bb7a869f 100644
--- a/dev-libs/libtomfloat/Manifest
+++ b/dev-libs/libtomfloat/Manifest
@@ -1,3 +1,3 @@
 DIST ltf-0.02.tar.bz2 151029 BLAKE2B a5d34aca69417732f32e2c6fb5ed65ee3492976e0f746199128d1436a7a8bdd1fe79fc10ef4186d7d3beeae2a499dd87dfecbf8c47470194b320170eb369102b SHA512 107af3100acde6fa596c4b15831eb47ab69da4ea5a90fabef60d2d68d238545d22fc363263968d51b87248a9d917ab4457e4a62b7a86300e2fd7ee18b3d29a6a
-EBUILD libtomfloat-0.02.ebuild 672 BLAKE2B 429a56d74ab91911a1a928278fc43efa598ded147f8b2485b12e1060b08ae942b05eb7291a4a79eb07965c3c70c4508311c28d21b24476da57470adc0548ce7a SHA512 ed42587f03c522f69100b62e190099e3a3a49799878489162d50120f6cf28182a7d8011dcb52561fa4172821c7a751cfb7957f1770d8eff2f817ee82b2996d3c
+EBUILD libtomfloat-0.02-r1.ebuild 734 BLAKE2B 728c6c4b864452979abca7769e7d8c482f9819e24636ab8cdefcbf72b5dedc9bb2e0382b0e8a231c505a8865fa40e3978f77ed6dca8ebc4e6822677210346dec SHA512 8f51c9ce5487af0b95d7256d37d28cce95bc07ed31644b26b63b14ae30acf3e18be541e6ecdf313f262e331ce3b8e52214061321f34f34393f363710f797bfdb
 MISC metadata.xml 289 BLAKE2B ece359bbc1cd696797428b31c61c58e5d63559ec8bfb734e3869421e1ddccbebe109c854225c924ba71d0321cea7ef3a63b1dee3d56b728a4d53bfd34eca8e37 SHA512 eb4947560bda57063dd746f397daafccc5d30e8aa694d75419a2dd4da56461fd6c82274c13e1ac01f8bad0d742c00f4116c20ceefe50f383988c9d12be27c90c
diff --git a/dev-libs/libtomfloat/libtomfloat-0.02.ebuild b/dev-libs/libtomfloat/libtomfloat-0.02-r1.ebuild
index a72fc3f8942f..48b02dfaa7a6 100644
--- a/dev-libs/libtomfloat/libtomfloat-0.02.ebuild
+++ b/dev-libs/libtomfloat/libtomfloat-0.02-r1.ebuild
@@ -1,33 +1,34 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit toolchain-funcs multilib
+inherit toolchain-funcs
 
 DESCRIPTION="library for floating point number manipulation"
-HOMEPAGE="http://libtom.org/"
-SRC_URI="http://libtom.org/files/ltf-${PV}.tar.bz2"
+HOMEPAGE="https://www.libtom.net/"
+SRC_URI="https://github.com/libtom/libtomfloat/releases/download/${PV}/ltf-${PV}.tar.bz2"
 
 LICENSE="WTFPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 DEPEND="dev-libs/libtommath"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
 	sed -i \
 		-e 's:\<ar\>:$(AR):' \
 		-e 's:\<ranlib\>:$(RANLIB):' \
 		-e "/^LIBPATH/s:/lib:/$(get_libdir):" \
-		makefile || die
+		makefile || die "Fixing makefile failed"
 	tc-export AR CC RANLIB
 }
 
 src_install() {
 	default
-	dodoc changes.txt *.pdf WARNING
-	docinto demos ; dodoc demos/*
+	dodoc changes.txt float.pdf WARNING
+	docinto demos
+	dodoc demos/ex1.c
 }
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index 83e1f8536ab6..5b61e8463d02 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -4,5 +4,5 @@ DIST ltm-1.0.1.tar.xz 2210120 BLAKE2B e616f0359a1fffe8e1280dc24df1a83eb568d55f9f
 DIST ltm-1.1.0.tar.xz 2125456 BLAKE2B 3aca7993704341f6a81e7fbef35389ac8ecd957dd78b5d576f0305d37493c3ddc32462cd787de2fb67d8e165417b18fcfde70accf991cd9433ff87591d8265ac SHA512 6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91
 EBUILD libtommath-0.42.0-r1.ebuild 1414 BLAKE2B f3562f4687c4f1fc12bdc332935706069858b95a496cb99fc7b492f6e0205beb22bfee04896fe3866a7572043e122c3b51a35fd42ba0b5cc3a7d9c16fd32995d SHA512 de700d60f6df294d40f177f31cc0673df7d6687db8ae199cf97b1e15e197940827b2c75c5e47964e5bdae6e997106b0daca7c9305f1e64378103e8b13ee9b169
 EBUILD libtommath-1.0.1.ebuild 1485 BLAKE2B 0b5c4ba53bfe781804588a997a4cff542c269fdb6c0044fa2666b0eb523f7b6ab2de82e8ff8600f9331d2bf3c869eb1163cacf5eb843a5af4a694af6123df0e0 SHA512 be54807025371e26e1040e50b6b29a31ec1de08e4b0c4da0c85507ee8ea6410237633b4cd735ad9c6e7e830081fdc93a147ec4a43a4b2d1c7c58abfa1e76bda7
-EBUILD libtommath-1.1.0.ebuild 1525 BLAKE2B bed5e70d99a2ddaaf54a2c32a1a634933ed5b277442d0a7d429870514cc1e35a9abda784b6a9ea9d18bafaa9d87b31e373c2b4328c204e11e0b4174284fc61ed SHA512 ea67f9619c23f753dbb9d5d5d1ebcbd5f7ee2c9cadbd87f9da64371817e86b041cedf81624c8cfd25611d88ecdde6b9e86a0002ba91dd603952a7af0e0602811
+EBUILD libtommath-1.1.0.ebuild 1514 BLAKE2B b2cfb5d25cd2d02112d06b22a07ddcf8e84025b52983af713906f5b7b5886174b71f4137ede6821da98c1b582e529809ca0424d98fe720ed9c43638bb699ef42 SHA512 84042a717f4926af0adaa2b3c6fe5d40de8acb33059dc389f971fc785ef5ba77babca0c319f47b9bd789a8275203f4d7c570c112433a8a04e1c30eff8a4d43fd
 MISC metadata.xml 2967 BLAKE2B 8adab466c3bf4d4e4b2368e56c7cf35c6a0e03f0dc9a237070e56bc224333876accb0c229d520f863041c0ee48b380225121d47554bb5aa511ff5689dd0e4e9b SHA512 73ce667c4bd2943f848274ee3952961d8b09c2c1faa4920cb74f9d8630470119c7e55a112b3c7dc2243c3746f75fa15db5c143e05e6739d2c9c19536f09a937f
diff --git a/dev-libs/libtommath/libtommath-1.1.0.ebuild b/dev-libs/libtommath/libtommath-1.1.0.ebuild
index 187678a0c8eb..11edee2c4032 100644
--- a/dev-libs/libtommath/libtommath-1.1.0.ebuild
+++ b/dev-libs/libtommath/libtommath-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libtompoly/Manifest b/dev-libs/libtompoly/Manifest
index 8b88e56e4e84..09969f6ff411 100644
--- a/dev-libs/libtompoly/Manifest
+++ b/dev-libs/libtompoly/Manifest
@@ -1,3 +1,3 @@
 DIST ltp-0.04.tar.bz2 171966 BLAKE2B 748fd04d55bd3dcdcd9510de1e34e2b9d96c38fc4f48c14137676f60c6d89751e8a095e07687d368d9a46e49ed056484cf8971e96fc400cde15b254a7374c38c SHA512 64a0b25eb058fc2475e6c645138729796099081ad7e926b58d2e83468d988048607e26716b4b669f0e923ea74d4d9705ff5a0466eb41cbe160488d0173447234
-EBUILD libtompoly-0.04.ebuild 668 BLAKE2B 74503998da247b90dd0a8641d9369ef477ab9f04c1f009c4336afd3981097e319a58fc197677992e34601e1fef92aa05d30065fdc82f92e506180c7584c9fd71 SHA512 722bb9daa56634a2601e8cac7444fcaf58aff3fd633b00ba35436c4ddd1f96a055e80b1c0f1352140fa5a1c4739e407fd3a42e12e3f226d88c21603b8a57abf6
+EBUILD libtompoly-0.04-r1.ebuild 686 BLAKE2B f6276e6bc9d7b22b4a0b7bd7251505a7c57e1eeffd09b42cfc2d0455a58d08ba83fcc8b20e04cb596cd657c4c22702c2ff61ffb7f6532660f776ad8d3dda0fbe SHA512 6f1cfa6866ac2470764ffca882936ea6c58e3582fdfb81281c7710e46c91ea942f6c6fe30335b07d27a595d6a36913b2c8225c47e28a9255a91291af66c6ed30
 MISC metadata.xml 1004 BLAKE2B 3a2e6908ade2ae67d90b417083876855f6883dc015ed9a81d3f73dacaf5f9df8e0da0dfc0b732ed1550d7bdd739f3eaa136676d939bd1331bfd4f54acc2698dd SHA512 f11dff1fe992edabb996248d3315e020fe1ef8ac9ee429de47522e292f77e00b4772bc61b985681fa12b295625c5cc9251cc8022de5e444840afbe93fd482cfd
diff --git a/dev-libs/libtompoly/libtompoly-0.04.ebuild b/dev-libs/libtompoly/libtompoly-0.04-r1.ebuild
index 038467c5d147..b21e94a8c54f 100644
--- a/dev-libs/libtompoly/libtompoly-0.04.ebuild
+++ b/dev-libs/libtompoly/libtompoly-0.04-r1.ebuild
@@ -1,32 +1,33 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit toolchain-funcs multilib
+inherit toolchain-funcs
 
 DESCRIPTION="portable ISO C library for polynomial basis arithmetic"
-HOMEPAGE="http://www.libtom.org/"
+HOMEPAGE="https://www.libtom.net/"
 SRC_URI="https://github.com/libtom/libtompoly/releases/download/${PV}/ltp-${PV}.tar.bz2"
 
 LICENSE="WTFPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 DEPEND="dev-libs/libtommath"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
 	sed -i \
 		-e 's:\<ar\>:$(AR):' \
 		-e "/^LIBPATH/s:/lib:/$(get_libdir):" \
-		makefile || die
+		makefile || die "Fixing makefile failed"
 	tc-export AR CC
 }
 
 src_install() {
 	default
-	dodoc changes.txt *.pdf
-	docinto demo ; dodoc demo/*
+	dodoc changes.txt pb.pdf
+	docinto demo
+	dodoc demo/demo.c
 }
diff --git a/dev-libs/libugpio/Manifest b/dev-libs/libugpio/Manifest
index c6089c7086e0..7d28c5caf1ca 100644
--- a/dev-libs/libugpio/Manifest
+++ b/dev-libs/libugpio/Manifest
@@ -1,3 +1,3 @@
 DIST libugpio-0.0.6.tar.bz2 252283 BLAKE2B ebdfae8ef400b3deb95e4313fd0ca2ad7b195945c850ce5c84904373bca2f2c9d446aec45b0500f549ab5319a294fbc2f0c37a6734fab69d8571389a0cb5fb63 SHA512 f40517d34509f9f3b5b26a5cb5523863034d48887ef3f26bd38a38e9aeac73e09ecf71099cd5a036e23fe3db5c8c2ead588c49022a398f2a426bc7148cc64ecd
 EBUILD libugpio-0.0.6.ebuild 605 BLAKE2B 48b6c2faca3a050d2624321f70507e56926b428d2bc11445a21d9b5a076e2b5059945c02e9bcaa22814291010504c0eb1878026a1efc1d6590dc9c655916d9c4 SHA512 346a2fad0ef0f6c1db939989520a7e8c290aa2399fd1a68f100c4826298147068ed4a8de249a7e17aa6438420efcb3151ea9a1165c235aff578493e5e7f27640
-MISC metadata.xml 753 BLAKE2B 7480b4a689b0e666a5394f0099d34efffd75465cf320220cd6eb1c046aae16ec10fa2ecb83838ba54de4164cab6e461510c294ff87cb9be8c232e431617b813a SHA512 502a0419fa0f34a7fb9e504e942a6374a64f0d980f4fb67a52615f113bf56f035dbf6b45bd442175076a62bc7d52bddfc96c26ae8dce6cb8ed02d9734b320141
+MISC metadata.xml 634 BLAKE2B 08bf2fa023595f3444926c7fca72af2d2a649ff2ac5b8372447f58113f4667ba4d85b46c0a872cef9ce76f4bd437b6c28a03e5c602c640de465a08ffe3718720 SHA512 946cb753670d9a2bb3c2cb4a35feb3e633e4d3d9a44584ff2e896544e11621aeb31630938d7e64d7d830e1e9fcf7edb4755dbda6fa502d624472e23227dd6d14
diff --git a/dev-libs/libugpio/metadata.xml b/dev-libs/libugpio/metadata.xml
index 1340ccfdad65..a15fbda79bd4 100644
--- a/dev-libs/libugpio/metadata.xml
+++ b/dev-libs/libugpio/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Libugpio is a free software library to ease the use of linux kernel's sysfs
 		gpio interface from C programs and/or other libraries.
diff --git a/dev-libs/libuninum/Manifest b/dev-libs/libuninum/Manifest
index bfc70fbcc0f9..d8c713a44405 100644
--- a/dev-libs/libuninum/Manifest
+++ b/dev-libs/libuninum/Manifest
@@ -1,3 +1,3 @@
 DIST libuninum-2.7.tar.bz2 276712 BLAKE2B 0894c632d7e9081f35d543895809bcc04fde6da674d4e6adc7cdc914f4bbb257a3e683b381e6496a08b65790731f73315d8263970265a351f40fe504f210c883 SHA512 4536a90b9f34fbabd3cc0560c1ff385063151bc381de51e6ca0253d2a42c2290b92329795b1a12ade305c3cb5757b02fe9d92817829977f50da2e34852936274
 EBUILD libuninum-2.7.ebuild 547 BLAKE2B c8e43c650e8ce680e1b6ee849eb04e7c2b63e2f013ea99ce5dd67f423a3fa54fa6274d400233cef5e3655a8d52c119adac85402292678cbe3b4bdded27d1128d SHA512 3de4909ef04b5acb3307279b58c2fcaecff59e0cdf7c395667a5cc71f719160f4d938c3c45325ab0838ff2b60151594845432033d952e717f81fcc915e3ea089
-MISC metadata.xml 806 BLAKE2B 12ab88f8c41b905d21b49c60e5adf9dd30a6d19486fc00f79a625bf04427a8c9588df25ad58e52a04ac521b4c6bff5e438470afb857ae773a6cc46b3e377753b SHA512 9a02d6a9c4a9424e009a2b54661768955918eb2654661e8ce966c919b4b4bf8bb6adc2be158f89088d4e140b65c4421f17e8ad5fffabf611c8ab12d074048b0c
+MISC metadata.xml 687 BLAKE2B af8d0b8844978daa4687a8733739d5eddc75e0751b4c9c9d77ceb3fdd5edac3331182101737f139006dc8491b5d06cb5d73d9160cc52a80785f31b04ffb95d74 SHA512 fbb242df46dd0d2901ff39ed4894a53dfadde74c4906f5bb4435677d3dac0a5c7367e2490edd944bdc6d6c4d60047accebd686f07695e8b4b3335fcfdcfc09c0
diff --git a/dev-libs/libuninum/metadata.xml b/dev-libs/libuninum/metadata.xml
index 0db8928175d3..f48de0221bc8 100644
--- a/dev-libs/libuninum/metadata.xml
+++ b/dev-libs/libuninum/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		This is a library for converting unicode strings to numbers and numbers to unicode strings.
 		Standard functions like strtoul, strtod, and sprintf do this for numbers written in the
diff --git a/dev-libs/libunique/Manifest b/dev-libs/libunique/Manifest
index 068bf474f680..0efc388afb23 100644
--- a/dev-libs/libunique/Manifest
+++ b/dev-libs/libunique/Manifest
@@ -5,6 +5,6 @@ AUX libunique-1.1.6-include-terminator.patch 1150 BLAKE2B 19bb13cc29b4aadd12c52c
 AUX run-tests 500 BLAKE2B ff93701e0eb4c78416581d5758e83654d1c3ce197a1c6834ce1170f6da63bcdedf7502549ad0dadacda7e36cf62695acd897be60d6cb4320438a5496adb0081d SHA512 2ff3662e87cb00f33e68a342740c56ae8294e3cae069f1191156fb58077e7a7c1a1aad75018673b494b0be71f9c7cb15c9e2c5b826fd733a72baa761b4994547
 DIST libunique-1.1.6.tar.bz2 335534 BLAKE2B 79f04c514620c5247609660bf58fa207589e9d1a011837f31d782864bdb5f6dd2ee8a44dddbce746cdb5e62df28d1ab20ee0e069cf21ab3d36e8edb2db06a5fc SHA512 82893e1d51a553b3c1413498e48a3a132e2c05779b4442c3732b5429d698e133741615657432a3d05c82a05c79bb59acc13df500bb08010212155db5e4ee6bde
 DIST libunique-3.0.2.tar.xz 294712 BLAKE2B 6045abb17862188940c81389883eeea88b75166b0dc64aba93dbd59c94cc117dc4d410dcb855fd6f3bc7eaf6d918aafb1a0683ca03315f5df0f2f2cde3790aca SHA512 b053b9f265c751bd581d15bf73246fb087075eaf75760565671c09a4ab80db342b4d2185050a877c4e25276d24f7895f4325ca60b918a7c4acd9d1591e97a8b4
-EBUILD libunique-1.1.6-r2.ebuild 1583 BLAKE2B aa20117e8c5a34be2e43477b1a84837f1d5466299334572cc88299c556194779e00aaf754a35f7846b2608b88e2fdac83cae65bc17abc3a3892b3c8d6b1cbcf0 SHA512 a2eabda8f2824a277f1ab09f91fb6711766d333c14ddad7098ae6adb58be18e688f0329a11fa6e39c78c146d21afa59c030a08b52adf41bdef00f92254019c3a
-EBUILD libunique-3.0.2-r1.ebuild 1142 BLAKE2B f9288618900c95903160e3bc5006a144af2b77e7957a0c3cdeacaa8e09777a5d62e570c1b8053438dbb1e954e230219bc0219a39907a6133dec8a23695e14716 SHA512 dbeca30df63fc920273fbbff4d30f4d25309f54b4bb635b325d85cd0b7a8ea78251a41d66c7cc5604b6c8c1d487a02a5aebbd755c0c32d07cce81d37e5c9d77f
+EBUILD libunique-1.1.6-r2.ebuild 1561 BLAKE2B 898dc5b76a8b8c54180b4b78d06da0bc2b18e814204596d352e3bd061c3c1d814390ac225a8e7f0a98a82caa890a4028a258207cf7fd4fde0c8b290a05af3133 SHA512 80284d90494b066cdd0634d2a51809fc60fccdfff1eff75e53c4b15babab16ad797ebc9a41514df9e119d59c21a3813e1e3082926e87617a3e6dc0868b339be1
+EBUILD libunique-3.0.2-r1.ebuild 1120 BLAKE2B ef51d6c6d770900f2906b9e21f86e73bdc6145603e73081a2418fb45d059a9781f9454f74dd9f50ea5e236bb419d42deb33620379e967c760eff3f11ec5d669d SHA512 d89a30ce0648ae99bac445428a9312b16a87104ec9a2caa4b1ef4173dbc251f90343e0d3b714c0b4ce19111572e6c516e547cb3192576e56d3c4061675e7ac23
 MISC metadata.xml 500 BLAKE2B 3416f2d8574c38adee051c11070f680ec248b554f3945872561aec335a42b712634416b9d1087b7cb6ca8504ae1ecf246f0dc9f4e0ded538c24a1ff0b09bc9fa SHA512 bcdaa87134abaef8a3490e11fb9716a20594a0dc862f5b07b446c266f39d4954e0fe3f7f89d6412687bc7a126387d469454d7d1b7ba46684e8cf174a8f78c169
diff --git a/dev-libs/libunique/libunique-1.1.6-r2.ebuild b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
index 65afdef7455e..1c40f78874fb 100644
--- a/dev-libs/libunique/libunique-1.1.6-r2.ebuild
+++ b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
@@ -60,5 +60,5 @@ src_configure() {
 src_test() {
 	cd "${S}/tests"
 	cp "${FILESDIR}/run-tests" . || die "Unable to cp \${FILESDIR}/run-tests"
-	virtx emake -f run-tests || die "Tests failed"
+	virtx emake -f run-tests
 }
diff --git a/dev-libs/libunique/libunique-3.0.2-r1.ebuild b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
index 9802691e12d1..24b9729876e1 100644
--- a/dev-libs/libunique/libunique-3.0.2-r1.ebuild
+++ b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
@@ -42,5 +42,5 @@ src_configure() {
 src_test() {
 	cd "${S}/tests"
 	cp "${FILESDIR}/run-tests" . || die "Unable to cp \${FILESDIR}/run-tests"
-	virtx emake -f run-tests || die "Tests failed"
+	virtx emake -f run-tests
 }
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index eea4929a4ba5..4219f9c995b3 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -2,8 +2,8 @@ DIST libusb-1.0.19.tar.bz2 521496 BLAKE2B 9f38dcb8f053019511dc2eed93772183c54879
 DIST libusb-1.0.21.tar.bz2 607417 BLAKE2B c76352a19f416ad27b8940e99f38878e248cdbc04ef97752f8c8468ab0391869ab611197e3e143d69e0e23563da59f1691c14fce72958fdf28ebf10dd8c1521b SHA512 015ca07bdb559aa40af5db1302ab0b1c8a30d593699fe2f3c9f45162673dc7b608cecc58d60fde8f3bde2a68370794a045e8efa48fc55402eece11261e525762
 DIST libusb-1.0.22.tar.bz2 598833 BLAKE2B 38d01c1dd1837434c24008151a27cdfb2b2e9aab30fe95e4403bad613a0147a13b9b029814e15520bcfc2c181b00e3c5cc1ffdc3a586a604190bf441d3c89318 SHA512 2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4
 DIST libusb-1.0.23.tar.bz2 602860 BLAKE2B 4eaf8cce0047b85c3057c67b53769739c50a39c4d34e94659b030fb11f02309f9217e93d35d78f699c55256346cf8b14827c8ddf495caeeacc522c51f473abc2 SHA512 73430ad31dd405e76a9c6c55086961003989c44964e2735b5076f9ca849e3f6fe71d10a66b74b111f0c34a0d2cb744b9ca105863c552123fce4ec0bbdd2ec15b
-EBUILD libusb-1.0.19-r1.ebuild 1552 BLAKE2B a7388e27055699a7b4a0aecb45f7291f199bb547b3fa1a66eb992206dbf7c8c28ed57814dcd05895d328313b15b3ea3ef592bae84d8971558f7cd5152cce1e2f SHA512 f32e03f6be3f11ae09ebfb00ee22659681d3171bac1cc1f3435833549ac2b770076699cef16299e8babe59fc86164c619d467ab9ac2e7fc53eb10b7ba934e721
-EBUILD libusb-1.0.21-r1.ebuild 1584 BLAKE2B 40e84dcfa741edec89e9a2d2cd972dff3fde96e67fd4fd73ebb007cb1cb8448ce11aebc972bb2a8724e33007d34b450fc552663ccc7e52ebede7dee2ee6d9cca SHA512 19f9e050fdcb4c6f60a3467d67bacffc9c1b93a9eed3a26f728846a47bbe13576375e472177f804076fb035ebcf900600ad44938c22e4c9781c9712a39e8da46
-EBUILD libusb-1.0.22.ebuild 1578 BLAKE2B 075f7487044435ee609c1fa9795145660689747513eb2611db5b7cf49ce788aad57b54604ff95d03d521bf65adf275f5441500249298a1431cd5dbba280d0cb0 SHA512 2b95e4d08acd8f2912ba3d652f960b99b3fb3fe2d2a6bff35b9b3969035b07cc549afb6d6900bcc2d65103f5b9fc48daf82e5a1b5903513b24dd8f6e3586f6ad
-EBUILD libusb-1.0.23-r1.ebuild 1642 BLAKE2B 07722685e94e8db817a17acae48cbf52667dcd502108116b67478fdf05e06bf5b172ffb32d1691329f82c1da7d544bfedd33da1fa23f0a47da06fc2cfee11860 SHA512 4aeb66d1b3e6c5df76849450309938ceb10342e6da178dfd5a735c42ae5c3eecd31451ac8dd3beb92eaf04c83baf9725c5ee2e0079598c19012b66acab97b906
+EBUILD libusb-1.0.19-r1.ebuild 1579 BLAKE2B d4e872b714ffd2a72d3bde90cb2d702d66bf1b9f744baff3a9dc5f204e8f61ef89952d01b1a8ee713ad2bc2178b92c2dfe8b532790bd92ea4cb3e5ac00e6b392 SHA512 b21908ef3e38217ee26810fb887d7b6ab507ab739da2a9e86a185a6f6bcf9d6cb55d66d118a06acc2abe79c8fb5034cfbf8568d0aed619daf27c69db082a0aca
+EBUILD libusb-1.0.21-r1.ebuild 1611 BLAKE2B b93b98d4e4680bd205a7289d6618888e097d6369cab8db1c18b97b1a65e517a4dbd0fceb0ea3bbc031ffd08fd16d712df6d74eec7215bd2a1af7ec6e0132116a SHA512 91b0977607ae11252403285648b264c5302463974f2696b5a89d02fdf70b8a74e0406348a63be0401f4172e02e4e01f069c8bae5bd1eba14862655150fe9cdeb
+EBUILD libusb-1.0.22.ebuild 1605 BLAKE2B 97a29206f655576002df1f053b858be2ece2bfb2bd559faf070604349210c72aec312cbf2d268e1335f025ab37b9f3dbd2d7b53fb57b748ea9ecacce0733f0df SHA512 d1f421722a3e692a8580693de931ee0b5c54dbf40b3142d4196de2ebf9a15ceb056d1dff371a97ae5a61868b53724767bacb487ebd43501e5dfc8d5f4646ce52
+EBUILD libusb-1.0.23-r1.ebuild 1669 BLAKE2B 843952c929c89316d26aed743846d41a88ca34c891068c9232e451f19a621706b1500bcf56e481fd332b5e5efc44e0582db42fd2db7fd28f4ed6d172270741f3 SHA512 eba8003cd8b67df3e638b1c11aed44f646009ee3fe1cfa5f085355c88b7eeeaab5b6fca47b6a9eb2e77da84fe89d8fd169f8fe8d3003340d87fbf474645ee6dd
 MISC metadata.xml 437 BLAKE2B 19a1ea2b26db27c6441a15502f61ca4240b1180b9aaaaf3942ce5b8cce5ee45724385401ec067901e31a0da785a636ca2e2a9d27efe231094d3952288374d169 SHA512 a67b2294e73782a948e338bc8820bc023e39ad612319a38387b3ee15e63903687ce4d90d8246df93cf2ea498c5c8dab25cb760c3f333d6dffc5d4d7b8c77a0a0
diff --git a/dev-libs/libusb/libusb-1.0.19-r1.ebuild b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
index e06279828041..5704cfef558c 100644
--- a/dev-libs/libusb/libusb-1.0.19-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="1"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
+RESTRICT="!test? ( test )"
 
 RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs(-)?] )"
 DEPEND="${RDEPEND}
diff --git a/dev-libs/libusb/libusb-1.0.21-r1.ebuild b/dev-libs/libusb/libusb-1.0.21-r1.ebuild
index 5b4c6c5e4a70..5b427e81e0cf 100644
--- a/dev-libs/libusb/libusb-1.0.21-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.21-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="1"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
+RESTRICT="!test? ( test )"
 
 RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs(-)?] )"
 DEPEND="${RDEPEND}
diff --git a/dev-libs/libusb/libusb-1.0.22.ebuild b/dev-libs/libusb/libusb-1.0.22.ebuild
index a005d09d3e5d..0035ca645d36 100644
--- a/dev-libs/libusb/libusb-1.0.22.ebuild
+++ b/dev-libs/libusb/libusb-1.0.22.ebuild
@@ -12,6 +12,7 @@ LICENSE="LGPL-2.1"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
+RESTRICT="!test? ( test )"
 
 RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs(-)?] )"
 DEPEND="${RDEPEND}
diff --git a/dev-libs/libusb/libusb-1.0.23-r1.ebuild b/dev-libs/libusb/libusb-1.0.23-r1.ebuild
index 8b719b6c3da8..d3f9f5bd26ce 100644
--- a/dev-libs/libusb/libusb-1.0.23-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.23-r1.ebuild
@@ -12,6 +12,7 @@ LICENSE="LGPL-2.1"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
+RESTRICT="!test? ( test )"
 
 RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs(-)?] )"
 DEPEND="${RDEPEND}
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 147a1bbb1d09..984c694aae20 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -3,5 +3,5 @@ AUX libutf8proc-2.3.0-tests-nofetch.patch 1229 BLAKE2B 501fb727f371975792546eea7
 DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ffee97e735a8cb309d5522df1b5ecd5f313a6d0c681209adb066c16ac65573c9c1edaa336b52de1b057a4b74ed6a7e9ca2671 SHA512 eedaafb2fdb3b6bd47da002a48043c26c1cd3c6b96c447a02f2fea19954c1689dcdb5f64b7c662dd8c5de4f971d75b2d69c8483bd29d49675ef47b362ad0c9ad
 DIST libutf8proc-2.4.0.tar.gz 154936 BLAKE2B a4fea823806bb784c83504de2ade985d3f0e86aa8d64747f389724ef10122953312e398a7a342cf28f25502693ee507be246338dba37c976998f6a1922cd94c5 SHA512 2bbd056b488cd30faca26618389d8af84edc39ade9b705e147b676bf39eee65b40239d01c32c46dfc2a289d79e869ed1bb3c347365603dcaab2f69e34427441a
 EBUILD libutf8proc-2.2.0_p1-r1.ebuild 733 BLAKE2B 68dd96f0621c780c63571ad0c632359e4b37c3b63afe0c3c8b1b88e576a900432dc08b9d85bd950dbad9ebf67d6c25b54fcd4630a88893e00ab664ac33795372 SHA512 d83d9dd9e8adeb9ccdc017e3c006bf7eb559fdbe2ec91b6250962f80333652819d768ecf8834c71f600254fbb29b1c4bca4ca4758fd9e1f6cca5584e002ebd6b
-EBUILD libutf8proc-2.4.0.ebuild 1451 BLAKE2B 8a6f1cc2bdca5f2036732f230b5115c048b260446cba58b351fcd02606a928cf4ce566e3ae888bed70e6f98a386b14d2ed679338dec35443d24f0d96cd41c262 SHA512 8758b048b085e8fc0ae96107c4c868e5ffeed99eeb009c3097a8cb926f82e81c42599810df1b2fc0e9c6e8859ac54ad8bf895ec6e8bd7f5fa619cbee5ea21cfc
+EBUILD libutf8proc-2.4.0.ebuild 1478 BLAKE2B e724ba48f8e15122e8f47a5cf771f9c7c9d237e7c75c3b93c4511114815057f96e5302ebf49497bdcdb895c3e4c4ab64c9057c33ac240a5c73646e3795439e61 SHA512 df275cba446c3be93d13e9dcdae9321855e1a81344fa5ce14b0d3c9e21cced9fe4d1f2acb643209f34e79affa08954a1c700b2322b3e61c019f3cedc9991aad2
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild
index 37472dcfb717..276a0508f63d 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.4.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 903592bc26c6..3f2052ea214e 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,10 +1,8 @@
 DIST libuv-1.28.0.tar.gz 1218769 BLAKE2B 444881479688144b36559a258f998e99e663d856c349086f74a21c3946f8d48d0fd9ed0a7c64c76c18b47edd3df037936fd87c4d47e9ae7c5639bb6e289e026d SHA512 5f49b980b69011897bbb7a00d779fe0e71528d106626bc13fc130cd09afb7c8188007f354cd6320b1eba67f77c938ae3e83f3bd4a3ef5b9ea65a3adf51f66a53
-DIST libuv-1.31.0.tar.gz 1238566 BLAKE2B d6a9b92dc8a6f28dd89f65e6d1b7ff4921c7d591c13965e27304d3ca38f25d0436a1ab690a09238c511bb787bcecbaf2cc34a214a388515eef039fc5742ec7ee SHA512 bb27ab86f2f6e9c2b22e768216097db2b69e468967b48bf1a15d17c36b445355ee4bd356f59bbd1bcf7d7c0d3f68b2c6660f999a2cc0660033eb5e3775499409
-DIST libuv-1.32.0.tar.gz 1242643 BLAKE2B 39520790200c70a417103416a6c2a389aad7b67878872c3733cf0dbca5ace012e45da088b0695e8dcbf55859635b6d67672581bc13c444d078ffa536bd3d0c39 SHA512 3e043a56fd09fdaf3c89f81b3dff70a385ba8a59ec065447c95199a0e45da323b8545fb13b50139c557541357450103a88297fdc921832de661f3e2700173b96
 DIST libuv-1.33.1.tar.gz 1251944 BLAKE2B fc20883dbd96df0d91fbcc75255ae2a371cd2d4e00a747cf23e7b9dbc2e4663ca71be2eef601b18c58e39f64cb3ad348684db4c683bcdd85a3fea4c28a578417 SHA512 0200aae2d38c26f537658955479cbc54fb69d5d8cbbccf3016cea319b2c46b1f311ca7a8fc289f14532acbbf2905cf96b17353b8b92bf09802424c372701d1d5
-EBUILD libuv-1.28.0.ebuild 1198 BLAKE2B e10d86b654ee8671e588dbcf0a509770c828d512a2c7476362c18518254946c52da758549fc20ffcc356349b758cfb518557249e1557211de670bba9cb1162d6 SHA512 cd2c514b8939ca68d0e2c7313dfa3878bce8b2b73e4ceadfe9f7e57024463ab08234e60be2451be1cb7b937e33614de70d91877da8b6001d374e37bd55c766ef
-EBUILD libuv-1.31.0.ebuild 1222 BLAKE2B 949a822dba0c539f7a5119e2478346007a37fef5f51ad67e603bc40586f721efb69e071a1ff45f702c991212874b1012b4f8d6bf86a497437caad77f58612bf0 SHA512 a1f75038807ef26e55189771b6584b66431e4c62b664637ba7e48e73e1af53faf2b11d918995448b9d9e148a11e77263b181c554087d3ef799875d6b2d365f5e
-EBUILD libuv-1.32.0.ebuild 1222 BLAKE2B 949a822dba0c539f7a5119e2478346007a37fef5f51ad67e603bc40586f721efb69e071a1ff45f702c991212874b1012b4f8d6bf86a497437caad77f58612bf0 SHA512 a1f75038807ef26e55189771b6584b66431e4c62b664637ba7e48e73e1af53faf2b11d918995448b9d9e148a11e77263b181c554087d3ef799875d6b2d365f5e
-EBUILD libuv-1.33.1.ebuild 1213 BLAKE2B 27a70224d2326c4c7154de5570eca7a9a6b2967d69ddd5366139ed8817857cdefa266a693c699d27d35725f672860dc214c4a8d028afd1aa091f785ccffbc720 SHA512 5e6ef36fa654925eb1cb235e655763446fdd6b85e8a10305e05f66d9f73e2cd326889e5865f9e03451536df3935c80f7d529906f3cf314b8a27a7a4e6e5c0e24
+DIST libuv-1.34.0.tar.gz 1253950 BLAKE2B 3317709603409e009e24b5ff419bbac03927e75f0c0a37f0c6d8f558d027a25e883eec60a46928bb3533308a6f77a9834841e62ad9162df3c8cca1c3ae24a75e SHA512 30811311268179984fdc44209eb0e9ac4c6df08fa30790b75916ae838b23c2578a8a043340fbde86bcd5a373dcc335dec5fe88209560613876ca3272fd99c9e8
+EBUILD libuv-1.28.0.ebuild 1217 BLAKE2B 33a21622a237229685e37b2ded511f89b9adbd0fa3d1a8c22279b7401b54b73937d5e15e90f535469a58a5d77e83d85a28ff0387d6a53fa002c94d4e09a8a201 SHA512 538967ab753779c9e0a3856ba6a6e89004304e67a5836035ac70cd829e134d527f0dc39556cde9414e4b69bfd613ad7a8736e5239719b7e9f498e72625409b6c
+EBUILD libuv-1.33.1.ebuild 1231 BLAKE2B 0942b8674e167bed40a5eeead29cda417d2cc51a98b017e6f9934bcbf565643da714c1844f2710a94c2ea4ce38ca7792e06b8f46ff1b4f31b738d01a5dffec97 SHA512 7c668d0521d1258e380571b711e59411d9844c2eced1cee414d215bf11e1be09db0faf63ba0d2726a4b3190ff6bd571ab870367651d7aea194bf8beb83e1dd29
+EBUILD libuv-1.34.0.ebuild 1241 BLAKE2B bb32340e87699031eefa1a9363a49a32c578298e8571e2deb903cc8dc9a191d217abbe562613cee6d2c930afa556af7be028c4f5364b641a612ea7d6e3d11d0c SHA512 320cf98aa1af1b7f945f5032a251914a7e6a11e93c6c4a66983a2b43584b64f9342cc8aa1b747cd6f980f2528f819b1a5c856e1b9b7badec31645a28b4d91c3c
 EBUILD libuv-9999.ebuild 997 BLAKE2B 1d82e7c3acd3715c580dda78f0aa6db97f217cdcd1dd58ac04963e43dd077cd62c798e2d676a098c69471bed2b4d035a63da335abe427762097de1bfe947e624 SHA512 d1ad9a68ce54465945cb795d28312eae4615e839889f8a7dadfa6ab54e580925c15781d00fadc99edc8d3dc5b54d18351df17b1de096fe97ab06bdae21fd9870
 MISC metadata.xml 1337 BLAKE2B d054e429ce7e3a6b94910693123645ab6dbfefcb8921b37b57ae156aeb5a25a4b100b45fe6714c498a355015dc3cc37c98852a14be651bd3f55259b8ab78e2dd SHA512 dba39812f31549539955d26ab8e281b4a1a372b8b41f29e68f0ae63bc10d18df5eef106936b31a13344cc11705192bafd4b32a0aca1f16e7927244ad049278ca
diff --git a/dev-libs/libuv/libuv-1.28.0.ebuild b/dev-libs/libuv/libuv-1.28.0.ebuild
index 547421f33400..6d82973a2d0a 100644
--- a/dev-libs/libuv/libuv-1.28.0.ebuild
+++ b/dev-libs/libuv/libuv-1.28.0.ebuild
@@ -6,7 +6,7 @@ inherit autotools multilib-minimal
 
 DESCRIPTION="Cross-platform asychronous I/O"
 HOMEPAGE="https://github.com/libuv/libuv"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
diff --git a/dev-libs/libuv/libuv-1.31.0.ebuild b/dev-libs/libuv/libuv-1.31.0.ebuild
deleted file mode 100644
index 7c0554f35244..000000000000
--- a/dev-libs/libuv/libuv-1.31.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib-minimal
-
-DESCRIPTION="Cross-platform asychronous I/O"
-HOMEPAGE="https://github.com/libuv/libuv"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD BSD-2 ISC MIT"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-RESTRICT="test"
-
-DEPEND="sys-devel/libtool
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
-
-src_prepare() {
-	default
-
-	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
-		> m4/libuv-extra-automake-flags.m4 || die
-
-	# upstream fails to ship a configure script
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		cc_cv_cflags__g=no
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	mkdir "${BUILD_DIR}"/test || die
-	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
-	default
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libuv/libuv-1.33.1.ebuild b/dev-libs/libuv/libuv-1.33.1.ebuild
index 733f3b6463ed..853f23e72a23 100644
--- a/dev-libs/libuv/libuv-1.33.1.ebuild
+++ b/dev-libs/libuv/libuv-1.33.1.ebuild
@@ -6,11 +6,11 @@ inherit autotools multilib-minimal
 
 DESCRIPTION="Cross-platform asychronous I/O"
 HOMEPAGE="https://github.com/libuv/libuv"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/libuv/libuv-1.32.0.ebuild b/dev-libs/libuv/libuv-1.34.0.ebuild
index 7c0554f35244..7e463040f67e 100644
--- a/dev-libs/libuv/libuv-1.32.0.ebuild
+++ b/dev-libs/libuv/libuv-1.34.0.ebuild
@@ -6,7 +6,7 @@ inherit autotools multilib-minimal
 
 DESCRIPTION="Cross-platform asychronous I/O"
 HOMEPAGE="https://github.com/libuv/libuv"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
diff --git a/dev-libs/libverto/Manifest b/dev-libs/libverto/Manifest
index 88b067a29079..c5721c887bd9 100644
--- a/dev-libs/libverto/Manifest
+++ b/dev-libs/libverto/Manifest
@@ -4,6 +4,8 @@ AUX libverto-load.patch 2058 BLAKE2B b0a5fc276fe34cca97b6622f74ce22b56faf4f0a88c
 AUX libverto-verify-cflags.patch 736 BLAKE2B 67b4d65955a8bfa51dac8c0bb2a116ee21ab777ab58da2098132118bfad24701b0bc1dd47233ebd247836be9812e9572732fd666a08ea70fd0cd4992845492af SHA512 83cd538542af376f3875e00cd5732d779b4b0aab920d0d63ead89ffe47c513ee4e55651c8c9e18adb95118b67ba964a7e401b3691992a5c012202962fb3b7abe
 DIST libverto-0.2.5.tar.gz 349722 BLAKE2B fd46b1fd1500d4732baa2d461e4b490386ff54efa8a23f06f40048e1624b4698cfedcfda79cc0a21c9a77050baafe8572835f1c0d174873772afe46b199a6294 SHA512 d57a7f86e714d3fbed391984de3356d8a2769f846985769c1be7d881647c1be95a5fc6a82bba1660ef3241aa1a40150b5e005af6f35dc32473facfdea49c556e
 DIST libverto-0.3.0.tar.gz 380822 BLAKE2B 7dd31e62a4f4d8ce5cdb77ba96b9e4c957b117ade67f2fb8d38c98e05334fd952386f5690bbe49eba60c545c02ef99dcf63dee3fb17910589013b2868ee24139 SHA512 af4fec9cd20058c1db404443004c2b6c98bcacd0742369bb91f46dde6a35358e44f659bdfef30ab113e112ac1afb3156b098f5b5e2f4a58d1f4cd949abf0f57f
+DIST libverto-0.3.1.tar.gz 383390 BLAKE2B 2d8366d85c2a02becf8fa9224d195a8d85f64aab735a0101997a52dd99750537b181a6dd2fc494b435b949b4a9cb785acb7222ba3f2424b7a7ddcf5d3c832387 SHA512 baef4fd280e0cb30167743608fd5a950fb4340eeb89e3630a0f63f8eab4d56f0f894a2e3283583b7ed8774d5e896c44e2c68c25882d95a07350f980af36b8740
 EBUILD libverto-0.2.5-r1.ebuild 1500 BLAKE2B a977607384abbb6fbc95638a6bcdbbb3a4d9bc73ed3ea07268f67ee5546827d477ef881d031ace9366a9f855cd18a2a274c1c7392072233b99d5af85d06de4c6 SHA512 b2fcc86e3f59c3155c684e29b8540738f745052e4755f1f47106372be053638c5c9bcf60268bbbcb1248ee201ec22ec90f39be30fb7261e3257e5d5d614dd306
 EBUILD libverto-0.3.0.ebuild 1732 BLAKE2B fa43bdcd7c99fecaf1f5d0ae062568df8ed31fa2943dc33ed1cf5ea67d080edc19b5b1fbc08dd6b7c9f9c8396f5662866fd136340f9ce7ffe50f3b7365f28b21 SHA512 75a9d850e8f90957996da433f8b4c74853d848560d7dcc17f9acf6102cef4d72d70855f2b198e2b30086b78ca11395e77483702291e2bbca78122455ae327b03
+EBUILD libverto-0.3.1.ebuild 1456 BLAKE2B 01e5c3578c9450467a2f17a59ee3aa35765b551ff266cf9629b3e7e588c53d42e401fffafe9d363332833e9928e77419ebe6824f31b38f6d710cb764d54e48d8 SHA512 d2f47ed7be67238fbb1071b6a61c1fc5e3d90fa5286af874a1919918e86f3bde39fab4f501510233fd171e42b9ffef7413ec1955c1909d4abb9203e45615918d
 MISC metadata.xml 1080 BLAKE2B cb37ba132016891f547bbf860b3353348b3312d770e220b6cd6cadabbdaea8c272c0b66a391f7a74de7ca0927be2d0f4939b7238b5966d553b5a5b834df93bd6 SHA512 88399edcdaa1d9055b6990605fe3bd1a753eac2ffa3b10ccea88a7385323b9de9f123a0032d19493f27603968fa8d07d29aa09f4f0f21ab5998f0ba2af2e4c00
diff --git a/dev-libs/libverto/libverto-0.3.1.ebuild b/dev-libs/libverto/libverto-0.3.1.ebuild
new file mode 100644
index 000000000000..382aef72f9dd
--- /dev/null
+++ b/dev-libs/libverto/libverto-0.3.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Main event loop abstraction library"
+HOMEPAGE="https://github.com/latchset/libverto/"
+SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="glib +libev libevent tevent +threads static-libs"
+
+DEPEND="glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
+	libev? ( >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] )
+	libevent? ( >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}] )
+	tevent? ( >=sys-libs/tevent-0.9.19[${MULTILIB_USEDEP}] )"
+
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( glib libev libevent tevent ) "
+
+DOCS=( AUTHORS ChangeLog NEWS INSTALL README )
+
+src_prepare() {
+	default
+	# known problem uptream with tevent write test.  tevent does not fire a
+	# callback on error, but we explicitly test for this behaviour.  Do not run
+	# tevent tests for now.
+	sed -i -e 's/def HAVE_TEVENT/ 0/' tests/test.h || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_with glib) \
+		$(use_with libev) \
+		$(use_with libevent) \
+		$(use_with tevent) \
+		$(use_with threads pthread) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest
index 5f847eea9453..32db22f21bcc 100644
--- a/dev-libs/libvoikko/Manifest
+++ b/dev-libs/libvoikko/Manifest
@@ -1,3 +1,3 @@
 DIST libvoikko-4.3.tar.gz 655465 BLAKE2B a5c0cfd420d51f873bbd707dfddf2e20ea3df8285a88a13fd6a2af947183be42137aefd1ae088b7b01e938864b3fc9402b110cc8a577efb8331a7ea24f795c2e SHA512 804d55d34deca52f882580ff8699a548d0b62d79eb8e27f8f5783a9e0e57d1ab8986963084df2b5fc7ca9f45546e6e4d66e195a42cfbe0327ca02dc211563988
-EBUILD libvoikko-4.3.ebuild 887 BLAKE2B 1ef2412c5a3142334811ed071b2c155d2bf1aa97d3c056739bc411854ff9bf3fc47a808f2be0f2257acda0846db90ae73cc00f9dcfb30290bcc176ce0122f206 SHA512 b64ba2188d30d79700b29bf57546cd54bd9d7c05cdbbb0025cad438a88bd398c74f0883eeae3d30806365698363c9e3ad93ef5b03c78968f0c283bb5ab9b9b92
+EBUILD libvoikko-4.3.ebuild 885 BLAKE2B 7a346fb4e06715451befd89cf19b9232990e54c6e64fc5bbf4014a73e436b156397a539f9f563a6befb80b9a4fc28a3d61f78578be3d817c8ea5f4495592f90f SHA512 3c616e9890f26e33ec797ec1412d4630c8bbe805c3630beeea896b4587f35acb2db2c34f6da68cdd0bffb96141969fcd82548adcff2db3395d47a78a6ab335c5
 MISC metadata.xml 419 BLAKE2B dbdf2112c9dec7639da8529d60e49c4da9cc413ca6a64d9175428495e73e7daca3d2a31306984d12f3d264fecc9d0258c7849f8533da3880ca287469c749a5fc SHA512 62374b7251abadedc04b5581551429300ba783b1ad02f237d8a73c3bbe60b1c8495e0de5540418c02d79ff14f58b4b7820be9f6f6dd8c529003a7fc6a7584b5b
diff --git a/dev-libs/libvoikko/libvoikko-4.3.ebuild b/dev-libs/libvoikko/libvoikko-4.3.ebuild
index 7bdff963650d..4adf075a908a 100644
--- a/dev-libs/libvoikko/libvoikko-4.3.ebuild
+++ b/dev-libs/libvoikko/libvoikko-4.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://voikko.puimula.org/"
 SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+expvfst +hfst"
 
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index 07144af3a2b5..5f7b7a341996 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -1,5 +1,7 @@
 DIST libvterm-0.0_pre20181126.tar.gz 65524 BLAKE2B 00ad4cbc60739aae173e86ae7aa357869f815658c3c13e04808841e5e1e847732046e212153d4e4d49bbddcd5c661cdb7f7f962e6fd0a305a534bbca074a4ca6 SHA512 9f55c9a00807e46c1c6157fc372d3cad575f2574ac8b3abc82acd26ef6425166ac18ee1b7d77a9dfc617b14bc9eb7dc3a364cef5c0bf6c4951dc755d9c6c5ce0
 DIST libvterm-0.1.1.tar.gz 69044 BLAKE2B 2e521a26238772370718e3c643e2225c9be7877f6312573d54c8cf3b34e38996886f1100ddae12e34ced1c8eace1a307238024fb91b2a96e6b9e2e85d30a5073 SHA512 beb21ae2bcc5f5e7dbc8cb645e004ce923f2b77f756b48a9ec835dbe1c99afa8cdbce12c5f982b5ca880b5b1ea113570d48733a1d043a7b16ae271f5718a6757
+DIST libvterm-0.1.2.tar.gz 69050 BLAKE2B bd547e14ef2b2b7c733a88ccd975db5ccc936ad5df49221cc6877be223e48da41fd8e5cf40dbc8750a95d6efaa6e5b97d337d4a013ec534a4bbfd68279325bc0 SHA512 5d6a17b98d4dda9d0529c3686cadc1f788e48667fa133100bfb0cdc92a6b08d0ea2f1a6058f58941e1408788c4f1d5a86941ec2457e31c6582f5ddd13bcdf7c4
 EBUILD libvterm-0.0_pre20181126.ebuild 780 BLAKE2B 974ac0ab87a5b20ea74e4e89c7e95eb4edacab0b31051419382ddc8a824719cbfdc6304671f717743222fe309042e24068e3031180cb2a1b1183b175f2cc8b2e SHA512 42124f47b3762de058b07abec156c8991d84770d1f6f3c123e98b2a6bddef12921d301371ecd3f92742b17f92edab474f62809a2ad430c32871ac0049bbd0a55
 EBUILD libvterm-0.1.1.ebuild 861 BLAKE2B b6bead0944e8b79cd6730db0b02d675245667a3d469e4175507ea0111b719393d93929c05afa833a213c328ac21f029d0eea4dd44a54a0aa2d82c9a2d1e9ff2b SHA512 5f51122dd4c01c4eae11be5fc8e9690bb3bbd9abf11b55d68622b4c6d1d9095ca02a85c8bf028b72343a647101d55dbf1172376d36a4c82705a513406ce627ae
+EBUILD libvterm-0.1.2.ebuild 834 BLAKE2B 0b35141c8d19f46f68c963aff5f39c5ee922f272b066f470ca5027d8f07d31294c558fb708335c9be961faf69fc7dac4fac444a58cfc85b24cfe9b78a29f1909 SHA512 ea88f4bae314b19452b0e127d68eb7560df1401372b198400da72c81001faff0fb4694264a09693880af95cf943c449bd8c44b94dbea226ca07f5d93371d974d
 MISC metadata.xml 493 BLAKE2B 8f975516716c1da5b84c183162a338e25b8985e10b329254c23cf3320a405e51e931668ee2f5a12dd7d7a38038e2c30f1b4b8614d739f1fb6344d3f78db29fce SHA512 2d75f4dddf3e7cc02f7dc0a31274aa8d30fe69800231a6d83ac57a8fb5692304dbe6a6190270c26ea35c4a52c0f299cf09b82584f7eeec11a081c259ab146e22
diff --git a/dev-libs/libvterm/libvterm-0.1.2.ebuild b/dev-libs/libvterm/libvterm-0.1.2.ebuild
new file mode 100644
index 000000000000..ab5807585319
--- /dev/null
+++ b/dev-libs/libvterm/libvterm-0.1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
+HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
+SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+BDEPEND="
+	dev-lang/perl
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+DEPEND=""
+RDEPEND="!dev-libs/libvterm-neovim"
+
+src_compile() {
+	append-cflags -fPIC
+	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake \
+		VERBOSE=1 \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die "Failed to prune libtool files"
+}
diff --git a/dev-libs/libwapcaplet/Manifest b/dev-libs/libwapcaplet/Manifest
index 9cf18479c360..72611db307e9 100644
--- a/dev-libs/libwapcaplet/Manifest
+++ b/dev-libs/libwapcaplet/Manifest
@@ -1,4 +1,6 @@
 AUX libwapcaplet-0.4.1-makefile.patch 391 BLAKE2B 0536fdc5fd0e8bca72b0fc33198eba058cefc253d9e6ca112e2d7d0cdfb082a024c739e101eec03470319ce766694507d6d4ed2cd3b1810242c5313e8b3af5ad SHA512 62d0e6b7a5ec8c5e5c695933a886002bf81c5ac73e2f47917d9942932045cf66f5023eac039e21b8cf915a145dba2d3c12da4a85e9ae1a7340e522f36bdc3157
 DIST libwapcaplet-0.4.1-src.tar.gz 31448 BLAKE2B a686a357dc84135da902380de17b0f8415a682cdb258ea0a8f7899581d23f6fef3aa1600e2657aa728b5689a8fa31a3fe489a7ce8a339adf958c3c25f6151a04 SHA512 49efb958ee79e932916a956844970780723cc71b4b2e5f442507566b2d632cc17c67d984018b48ae31a9bd7d92797766e39110dec02937b45ead26523e8cc2e1
-EBUILD libwapcaplet-0.4.1-r1.ebuild 840 BLAKE2B 29f3f3df3e2ebbae0702e543427e4ed5f708432ad944946560f3e73726dcf4e05a8d8b31e0856b23fd7bcc51ee85bc7463a85b58391219e648fd752cdaea71a0 SHA512 8ffc409e82a6d17eccd2542c4234c47b56a2813e9acc5f821471ef2901f489fcaa0e0fc07ac854a8c36e6ed64ffd351ef286a9bcfe1734aed4cfaeabac1cd0bd
+DIST libwapcaplet-0.4.2-src.tar.gz 31492 BLAKE2B 1c3b74a15fddf895ac63c15302737915fcbff89d83e990d779d2874778d00c3ec453a7bf0e362f942216c68a3e006c6318ace83164c49cafede73af1ae7a2808 SHA512 296a5f4471366b58089632c10943c0a1c1da8bd3b54231f2204b1159052b5bd5f45769fb2e12e438a29bf39aeea9719773d0b38fbf40fce193c2fb4f0f70ab09
+EBUILD libwapcaplet-0.4.1-r1.ebuild 867 BLAKE2B 98fb4ed30894cf7d52563e632a391d432351e2094dc9b06e8463a5a9205ec7c20caed14c27a2b114f7fb3ce25cb4470154dffe9cc11eb2293994520c2ced9b6e SHA512 15b7ba560f2c305eb77616bf7f16ac6c9d55d5e520e4ba9222723960cdc79b3a51ef8ac0341e782fd56d0289597576e9b885232357dba021dd2db7ab8e536b91
+EBUILD libwapcaplet-0.4.2.ebuild 879 BLAKE2B 2ede4e264670db8f439b9670bc818cf7ec45d8c4d67cfe6e63832450c3f9dc618cec5fc1e32445dda8255704697e4d486295d606475634b8b2166f2fef7367b2 SHA512 7da40ed15625bc1de1a1d7fb56ac3cb1bd5759ee629e118d9b769466c9ecf1532a53ef7d8c9a62f908ab3a30051ea1bad8c945f40fb9b4ede5ffd73c9613f6fd
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r1.ebuild
index c625ebe79b69..fbad93ecf82d 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r1.ebuild
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-util/netsurf-buildsystem-1.7-r1
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.2.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.2.ebuild
new file mode 100644
index 000000000000..439cde67cbfc
--- /dev/null
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="string internment library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~m68k-mint"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? ( >=dev-libs/check-0.9.11 )"
+BDEPEND="
+	>=dev-util/netsurf-buildsystem-1.7-r1"
+
+PATCHES=(
+	# bug 664288
+	"${FILESDIR}/${PN}-0.4.1-makefile.patch"
+)
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install
+}
diff --git a/dev-libs/libwbxml/Manifest b/dev-libs/libwbxml/Manifest
index e6180a396ca8..0dedcde03d9f 100644
--- a/dev-libs/libwbxml/Manifest
+++ b/dev-libs/libwbxml/Manifest
@@ -1,5 +1,5 @@
 DIST libwbxml-0.11.2.tar.bz2 354176 BLAKE2B bedc86dc269c876d788b682b67fbc021a50ee6742dad4424a118edee061e5f745941dff5589c2b4da562822f655b277c09858382615564831317bcb5b51a4c16 SHA512 1eb01e35b1fab548163caca8ba024216926995adaf2e3bd7a001927858c51a792620eb7e9ca111fc6bdf5af5c1a1cbd3eac3fe53d427cd1a6d9e8aadfc51bf1f
 DIST libwbxml-0.11.6.tar.bz2 360001 BLAKE2B 96fca6a457369b7546c50bb4459490e2dc7b2bf97c3c198abc386e099695a3a1912b7292bb541b841fe63a225d8c387bb13100b458ca17a4daf252751a9a861d SHA512 534c647bae41bf703bb48158d63dc0dd168ead5c4bcd6e775e2ce2588e1bce82f3f9f94ebd863fea2a40f0e9d4af39849a673093e66d7b26f77ab012cf6f108d
-EBUILD libwbxml-0.11.2.ebuild 670 BLAKE2B b05a530d9714066a5c673caa21b34d506710f3bca299e51d576e41e08900eb3f0c23b1623c1184ad7ce4a5b67cba277ad6ea59bcb6cdbd4a0780bc2b12cf436f SHA512 c1f41746bc50610a0c90c1aa13188ae0a41741eceaee711ee60d202ac910c854a67d51790670a41f9cfe74d2f3360a07cb38545145348c62f6673a20f249366c
-EBUILD libwbxml-0.11.6.ebuild 656 BLAKE2B 3424c21e4e28a02147a6c18c03613211aaf414affa9159c11e960515fc960efdc559126967432c1062a7656e0d2a4181b9f1f6db70ae7e5c7a1b5fffd71fbfb4 SHA512 b02fab6cd48ee6a8dfdf4cae37a873414487f02a4c34529b8136c1f3134adfa5fdd89458f26cec2d36461437c452d59775ed57f7e3e8d6b1c9d243f4d458196f
+EBUILD libwbxml-0.11.2.ebuild 697 BLAKE2B 78ee0da27aae3fcd2b085f91d93dda03c9d235e96f1ea5444f7a48b66d8ee97d4ff345013bd79587f74379c7ddd22f1924e9180a9ff1a524160c8ddd18ab47d2 SHA512 e503790e5a686dd98224dec664c7467bc30230d71eeb3266395216f8ba8c621417a867364fa36352a2cd2651c11c491cc3466613730e1edaec8c86d80472c879
+EBUILD libwbxml-0.11.6.ebuild 683 BLAKE2B 5183912a0cc18f9337eb70e84d757158184b73511f700350076670e56dee983bf95bb284016ae424f7b8edc44c6cd3c7bc128bebb19792ef3cf0a2a321601152 SHA512 ad413ee62f7c844ce05a8053837b4012dcc766f2043c8d25856de52f1481348e86e243ddc348d66af1e96e1bcf8cff8eb4dc6f5dbb276f5cb64b2363731e478e
 MISC metadata.xml 392 BLAKE2B 9c148f598ea01b331d4713306aef2c864a57b8cc03ed49fe506d607c176692ea791d136109a6c211336b1fb11649358efbf4c3caed7841fa0416262cb7037def SHA512 de468eff8ad127f4bfd862ce944bdb6b7784454d9b0f448c402e402f9813863b462b8a8aa853690c7298010c645b44eda79ff142c35106602747785d20ae464a
diff --git a/dev-libs/libwbxml/libwbxml-0.11.2.ebuild b/dev-libs/libwbxml/libwbxml-0.11.2.ebuild
index eac776740c3c..e836a0d844fb 100644
--- a/dev-libs/libwbxml/libwbxml-0.11.2.ebuild
+++ b/dev-libs/libwbxml/libwbxml-0.11.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/dev-libs/libwbxml/libwbxml-0.11.6.ebuild b/dev-libs/libwbxml/libwbxml-0.11.6.ebuild
index 5837b81e8f4f..928004f0e6b9 100644
--- a/dev-libs/libwbxml/libwbxml-0.11.6.ebuild
+++ b/dev-libs/libwbxml/libwbxml-0.11.6.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/expat
 	virtual/libiconv"
diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest
index 3e84f3b11f12..d704d839ae8c 100644
--- a/dev-libs/libxls/Manifest
+++ b/dev-libs/libxls/Manifest
@@ -1,5 +1,7 @@
 AUX libxls-1.4.0-asprintf.patch 190 BLAKE2B 36c39cce45025c5498fefae2de5f9fb78f377463b4a761ef1abe89d8194b90b798e03dfa82561bc7cecd505abbdd5412b75b05194991257c600e4bbb307167b1 SHA512 c5881d63742b50f923c74dcedb5d2149bb55ea19bc611ba51c879f9ae82b8f87d9ab477fae57ef40814bea42f27a27d3be272b1c9fbd5e6c04d69078c8e7c03d
 AUX libxls-1.4.0-infinite.patch 583 BLAKE2B 2d3dbe60123e6005d6c71fd24e0fee43f82137b2bb47e0240d8cda53bc56f970272bc9324c12ac7eeccd3cf90ddbd7a776c15a212723f3cdde874d8193150e5f SHA512 04ab1274723fbfc485d45a1fafd8fb21ccef0af3670b07ad8e4248a442d98a478a944dcaa0f40343026e3c22ae2dee26c27fcc37e73ba9a0cfb48d475446d00d
 DIST libxls-1.4.0.zip 428782 BLAKE2B 52b67eff4ae315dfde42abd276ace7adaecdd4d88d971a97f9aca1f0cce0c874cbcfa6a060880f1101e4fa685fa566475e753eb34ee621e509fbee8c427e6d52 SHA512 e55c0faa25b17a42d53ca939c80e1d3fd0c0e91de7f73d3d10d1fb6658e58e8f38f4e6288a3e3ecb9ae53ea681629ee66ec173229325eea69e01cbd038e68c95
+DIST libxls-1.5.2.tar.gz 443227 BLAKE2B 3d12357e3c476b203ce7be76cfb828a0353732135303301f26880ca1607e9cf4a6781fafe7ebf4dae0914678de30168d80230dc0d83d189dca63c98d0cd54384 SHA512 83e443713944648d6bb5db03a03b3addff1d925a1c83c49e6bb9b29245da76ff351e6a76239e62c92400e5d513394a33366fb979d2bc0b0d8ed0cc7f024c5fc1
 EBUILD libxls-1.4.0-r1.ebuild 680 BLAKE2B 1f7ca33de37e6ff3e1c5531c9c6ea457ea7bc317cb2e5c1e642e1a184ea3270b05b71000dae6a5af92596503309833ba97e768a782eaf3e9b436939ed8beaad4 SHA512 82929d5fd4bc84f1b5af04a58d3bbca4a51accacdcbc17ea393260eca6cfc43d0c80253c859613e2cad98065b391d86ce14501176d2fdb783fcac6c4d3076cb9
-MISC metadata.xml 337 BLAKE2B d83ec5bbbb5d64ad33a946df5fd82206062d9e443363bdbbb4ffbbfd3217cde0e026aa86db0ae1bf2da14fd8dbc435b22c6b0b6c4b1d6eadd3e23ccc8253cc68 SHA512 6cb16eae4b9d04f9cbb1442854c5d827fa19023c2c69e6de5d0eef7d5f7772b4202101b489136e9813f6598d80cae0963b8eca1e736a9a9218d6b8b532bc0c7d
+EBUILD libxls-1.5.2.ebuild 652 BLAKE2B fd9c577331cd1c82ce9a4b2508cba6da24016e78f0af5945a835962463bd27ee17f2c8e257fe07997311bb8ec2d2c91b2d3533c55e3d5e63ea4c6ddbeec5285c SHA512 158ba69edacec3d9d20e1b0d91fd43e8c795ab1df26f566fe8a66abfe7e49a196feddce1c75ad27a8088bbf504aa129df0631295bd447c3ac894afa88b042d96
+MISC metadata.xml 392 BLAKE2B 77f7b66d8024437b9a7b2b07bb78f451fccc5636629e284d053be66efa136982d026f28912c0a7b407059f8f5e33618ae15c83113f8bd380a168dcc1032f96bf SHA512 ccf08982c319c4e2c3fa94d1920f012207f35c75c445555312d20976612436d21bfa1cf93cf6014697a0210fd549146ea0f3eb73fbeee45d09d15952286fe3aa
diff --git a/dev-libs/libxls/libxls-1.5.2.ebuild b/dev-libs/libxls/libxls-1.5.2.ebuild
new file mode 100644
index 000000000000..9fd4b6191e56
--- /dev/null
+++ b/dev-libs/libxls/libxls-1.5.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="A library which can read Excel (xls) files"
+HOMEPAGE="https://github.com/libxls/libxls"
+SRC_URI="https://github.com/libxls/libxls/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/1" # libxlsreader.so.1
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+
+RESTRICT=test # test driver is missing
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-asprintf.patch
+)
+
+src_configure() {
+	econf \
+		--disable-static
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+}
diff --git a/dev-libs/libxls/metadata.xml b/dev-libs/libxls/metadata.xml
index 8a47f96b1b95..81bdb807379e 100644
--- a/dev-libs/libxls/metadata.xml
+++ b/dev-libs/libxls/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="sourceforge">libxls</remote-id>
+    <remote-id type="github">libxls/libxls</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index bcf80d7910cb..bb9f7a130ef9 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -6,6 +6,6 @@ DIST libxml2-2.9.9.tar.gz 5476717 BLAKE2B 00a67c38084f2effd5d68d7d3e68f0c96cf4f5
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.9-r1.ebuild 6763 BLAKE2B 8dfa7d815a3e3ade3ce2db771d4752f2181e86ac59f5449d909af80a10894d4950f6e73769cb1fd56453ed4cb9cadd0339b2fc060605060cf18c63302abfdebf SHA512 272cb5ed129d546ed25f8b1b043622676457ad3973094ce5f5745d95ac0a5f07f46c643cd030cfa435fe2fd111d17f676217ce00ef389635b63ac6b1a7cf5f7a
-EBUILD libxml2-2.9.9.ebuild 6509 BLAKE2B ba1792bede60aa001be656853d8cb39ab60f46c80df210a559d87f4abac8f2be5ec8f8200d6477ad3661990ef19b66b6448434651d2bf9633749e7a2e18db301 SHA512 b5fcf9671f176bb4281a676ad10dce575c2e626b058a144e6eb08c2b3d69c4760497785b6332126f32d1951b1bfc1827dc8682ffb04e1652ee0d3a04a7e73c89
+EBUILD libxml2-2.9.9-r2.ebuild 6828 BLAKE2B 0e86045699772ec70c467f468c82f4152730a4975da522be8beeb22c4cb49706652e29c4547c064cfc136bd2946501d3854b69947bce6fce016d14ae39ab2f6f SHA512 7194336835ca5e3ebd5081e7ac05fd3ac3311d4aaa05382145e7f481240dea9e288a57aa77c093c2966f006fa66762598b8379bc72072639f246da679a49e085
+EBUILD libxml2-2.9.9.ebuild 6536 BLAKE2B 322138626ab312a18d53c0e6d397cfc7302ad1a667b270ff02ca2189d143f94f1409b994a61c207df44a0b2cca0c0b57d83b1de8ad2a4b94e11c13832e02ce81 SHA512 c7ebe0fe143cb43e12f4f1230ec7f4082660b6d9d119b70818a0d7058e81938bd9e3a895829b525cb556eef1eeec3d3a34832409919458ce2467d0bd54771c99
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild
index 90b38796287e..4181f92e6dae 100644
--- a/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild
@@ -2,10 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
 PYTHON_REQ_USE="xml"
 
-inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal
+inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
 
 DESCRIPTION="XML C parser and toolkit"
 HOMEPAGE="http://www.xmlsoft.org/"
@@ -15,6 +16,7 @@ SLOT="2"
 KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
 XSTS_NAME_1="xmlschema2002-01-16"
@@ -133,7 +135,10 @@ multilib_src_configure() {
 
 	libxml2_py_configure() {
 		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxml2_configure "--with-python=${ROOT%/}${PYTHON}" # odd build system, also see bug #582130
+		run_in_build_dir libxml2_configure \
+			"--with-python=${EPYTHON}" \
+			"--with-python-install-dir=$(python_get_sitedir)"
+			# odd build system, also see bug #582130
 	}
 
 	libxml2_configure --without-python # build python bindings separately
@@ -153,7 +158,7 @@ multilib_src_compile() {
 
 multilib_src_test() {
 	ln -s "${S}"/xmlconf || die
-	emake check || die "tests failed"
+	emake check
 	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
 }
 
@@ -189,7 +194,7 @@ multilib_src_install_all() {
 		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
 	fi
 
-	prune_libtool_files --modules
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/dev-libs/libxml2/libxml2-2.9.9.ebuild b/dev-libs/libxml2/libxml2-2.9.9.ebuild
index cc03219b06f0..494a0644ac79 100644
--- a/dev-libs/libxml2/libxml2-2.9.9.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9.ebuild
@@ -15,6 +15,7 @@ SLOT="2"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
 XSTS_NAME_1="xmlschema2002-01-16"
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index b2afad0616b4..0bfb0444006d 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,5 +1,7 @@
 DIST libxmlb-0.1.12.tar.gz 91256 BLAKE2B b063bed9d7794b300ec40622c7fd0caac974b7f1be57b08ccb1864587b7bf47f892a39d1f4f0df226d3fe7ca03ffcec471a4f28afb8e64ae841d6898a337b60f SHA512 aebd9f41421bb0d78954038b3221bed879d296ec2d3061e7e7747980974e01081e51ea36d4e94545af5006b3dc4714d535aeea1943e42a7f1661ba1177979b31
 DIST libxmlb-0.1.13.tar.gz 91597 BLAKE2B f5b1cffba36f25260df44b85109df22aca9f76a47a71c82b99504ce6f072b5b01c32aa26ae36ee37ff717a25dcbf094def8c3b65c7e53883aad726d919181db1 SHA512 ae2c043db0c3a9719c1527933e087825068f970bde28bc7b507a6535b51133d463b1dce6c8b02148a555bb28868ab563f7bb01e6324661dac92fab556c9a39b0
-EBUILD libxmlb-0.1.12.ebuild 1200 BLAKE2B 5c4791e8a427a8d0147cf42bd6b094e12248796399d73468bc0d35696aa8e1d20358f8f0d9038e6211c21a71e8fa90b9f2a4245861b84a5ae8716fcaee7b74fb SHA512 40c95b03c9d96a82a8dc04e7c73cb27f687f35fcd724cdbb5f7abe9f60c897d1a870f35c784110d4b7cb96ae968dd5656be486b0a75a61d0a8f0f1acc6d94523
-EBUILD libxmlb-0.1.13.ebuild 1202 BLAKE2B e9a493d9862ae51aada12bd72c499a48bc9b54dd1d9125a3e0ebce1fae4fddf448128bf3d5f0f33d1bac31b0a961c7a2b41f392918c3c3efe6a5ad1c171e3500 SHA512 92a52f1ea079624a2680cf0f5f019abf35159f02fa830eb23e7ad2e82eb14890de7f5ca768f3ef47ae2915dc813592beeeeac240594c36266bd0a28003531c81
+DIST libxmlb-0.1.14.tar.gz 92388 BLAKE2B cf3057fadf87c866f456bb2eac773e056adba56e0912c249cd89acff2e9a722414876717c6b2065d836fee66032a3d55d9fd2a824ef1fe480604c36887b47c44 SHA512 906340212ce4a515bec81a1b7a5f04539712a48322d7fcff0992f82e5676cdf15c38b0340c28c9eed65a58321e3e17bac641f05bd403504c87599327ba6d4e49
+EBUILD libxmlb-0.1.12.ebuild 1228 BLAKE2B 79656eb009af08ad79182f359f4152734b9a29f3b379e0db28a6182abb59008697f48f899a65569bd7038d0f0993a7b3eccfbe830130d296a6761a197744a02b SHA512 2346e225eabcbac23d68650400d925879d9e141a60a6be9f43e3fd4f8cc3b5f6e235f4f01f3820852816ce21c393e8eae5f4a0cf4ac0c405fc4d8a7266e672f5
+EBUILD libxmlb-0.1.13.ebuild 1230 BLAKE2B 8a7aefdd921ebb68a43b3239da6142cca3e3e86eb1a5803b41e08d686f16e7aa49e93348b98df600056b7268797fde9713844804179b3bfc9db432fda02e5b2a SHA512 b0291feaa632b54e524dda6eab1ab97e8c53d34428ab159ed73ae566057216523bedba398b35f32f985aca84d401ab21e97b51e7d492de085d3eb05aa505db3a
+EBUILD libxmlb-0.1.14.ebuild 1232 BLAKE2B b16a202cbe6056cc82c2a37c7f8e575573fdc13eceddb7db91d7bf974dff8dee3d6b8e240d4ba384cb0645505cb532df3424083905ec34da36fad71702d37d8f SHA512 54b2934c67743edd812d8eeb86893f08af25b56a95d70b673947fdcf5a02ea60dcb42f7a45127bf22e14d076341a90b7d295f71721dd8532eb79230029cd488a
 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.1.12.ebuild b/dev-libs/libxmlb/libxmlb-0.1.12.ebuild
index 10d2f6649053..6f05d7a416a9 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.12.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.12.ebuild
@@ -16,6 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc introspection stemmer test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-libs/glib:2
 	sys-apps/util-linux
diff --git a/dev-libs/libxmlb/libxmlb-0.1.13.ebuild b/dev-libs/libxmlb/libxmlb-0.1.13.ebuild
index 58eb76296fee..6b3e18f22835 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.13.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.13.ebuild
@@ -16,6 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc introspection stemmer test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="
 	dev-libs/glib:2
 	sys-apps/util-linux
diff --git a/dev-libs/libxmlb/libxmlb-0.1.14.ebuild b/dev-libs/libxmlb/libxmlb-0.1.14.ebuild
new file mode 100644
index 000000000000..9e600b3420f7
--- /dev/null
+++ b/dev-libs/libxmlb/libxmlb-0.1.14.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="Library to help create and query binary XML blobs"
+HOMEPAGE="https://github.com/hughsie/libxmlb"
+SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc introspection stemmer test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-apps/util-linux
+	stemmer? ( dev-libs/snowball-stemmer )
+"
+
+DEPEND="
+	${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+"
+
+BDEPEND="
+	>=dev-util/meson-0.47.0
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+		${PYTHON_DEPS}
+	)
+"
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use introspection && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgtkdoc="$(usex doc true false)"
+		-Dintrospection="$(usex introspection true false)"
+		-Dstemmer="$(usex stemmer true false)"
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index 22b9bd572df0..fb4518036a95 100644
--- a/dev-libs/libyaml/Manifest
+++ b/dev-libs/libyaml/Manifest
@@ -1,3 +1,3 @@
 DIST libyaml-0.2.2.tar.gz 79465 BLAKE2B fd37cac256b40b0c5daa32584d271448e5e1c196a7fa7eeda753fb962c7d916b3c415425170d70db67c3f114b27d03fdd67fb4e380c04027198a601e1bd5a094 SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06
-EBUILD libyaml-0.2.2.ebuild 1002 BLAKE2B 60a0925c00142dfe1f195f6921b698d8d3cbf0f0e944afe298dab5171f89215cf4067cd002246d284ac9349260a091dff5b20fd0c6b02e48206bdb610fbbb277 SHA512 62ffa4402594dd8d78bbd9c2f73cac70df2822da1216cbb96855cee3a06856c469e0bbcf0f7e99434cd160321dd6bcc458e1f9def820ae90dd5ce569b72dd6b1
-MISC metadata.xml 314 BLAKE2B faf993f4437ac11e1c1f301d5c54f54f9bd5d704e0fcbba3dbdfe633e5a209019bff0c734f1fa12bcdf50d58b7da9883d98e801a41effa22630ecf48250f307f SHA512 d84dff0d4f37c633c81224e56d1030c1f623037b5eb9ad485c93fe5710bbafda3e115569fc5877233459d5525175c305d9f94ca0bcf01434493e6ba0553c7730
+EBUILD libyaml-0.2.2.ebuild 1029 BLAKE2B 186ad2b672123c8a6110f67656a2f978667861dd6301b5e6bd822e9a44f51c9d2fd8f4bf00282e87a7bf58974605846f8fcc91db5f8a7b59aaa7e75373fcb703 SHA512 ba4854c4dab905915fe5fd24540e44fc3b395cdb056ec5b1f5af6c56b4cbadb02446fc28acb4f5e27ddd2aa5809fe476cd6e965afc8192b3dcc29e3b9c7a9305
+MISC metadata.xml 396 BLAKE2B f55ccf30afa81617e23963e2bb96cce1db4e06982320b1b53213736a79c15431da54a7ba2312c4b60226b881553d6470c0fa08a1ea88152789254208f302b64f SHA512 a373090c8dc67e0bafec51ee673e9a3c15821c7079061335ab95ec2c87cf629f57fc172fb8e17989a709b4770ab42537f87c22ac065cd24fcc1ca88a2c80bf76
diff --git a/dev-libs/libyaml/libyaml-0.2.2.ebuild b/dev-libs/libyaml/libyaml-0.2.2.ebuild
index 494a1e0a54c2..a1c3a126a29a 100644
--- a/dev-libs/libyaml/libyaml-0.2.2.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="doc? ( app-doc/doxygen )"
 
diff --git a/dev-libs/libyaml/metadata.xml b/dev-libs/libyaml/metadata.xml
index 2e0223066045..8a69437d03d1 100644
--- a/dev-libs/libyaml/metadata.xml
+++ b/dev-libs/libyaml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
 	<longdescription lang="en">
 		LibYAML is a YAML 1.1 parser and emitter written in C.
 		It's in an early stage of development.
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index e36c6a72615b..4af002f0e5d4 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -3,6 +3,6 @@ AUX libzip-1.5.1-options.patch 1297 BLAKE2B d2394b095b59d484269bc29cbbb311c5c585
 AUX libzip-1.5.2-mbedtls.patch 707 BLAKE2B 1905d00a6d8185cd5e6223b9ec6e82ffa5bc910522e38dd05546c995d90d5377cd0419666e4b724448cf6d38110faa640191d98b06bbe08610ae947340658f0a SHA512 e8af90b4559df0a6b2c8d0d1b7797833d0f59c4827082cd5dd8459d57ac1557249030510dcdad5f31a84a99cd79e30bb7b9293b1f19303be750faa40be2892cc
 DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d
 DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643
-EBUILD libzip-1.5.1.ebuild 1879 BLAKE2B 5eaaa6e15daa7d648c6f8538ac84231b23436f339bb24fe474da269e81b300023efb4df19f6edb596d6b192cfc501e122e858d77ea3b59bab806a1169dd30db8 SHA512 2dad55d99b7fa91a1f8be9db15e961e24b2e6fa3f52ed4fd8c2364ba61c0af0191967bf8f2a3d39f1496db1a3d34730a9cda1d3059cc2c37b165db41aa39a159
-EBUILD libzip-1.5.2-r2.ebuild 2292 BLAKE2B 8f242904275ff2fa035cbedc54b9f62654a6356dc6c4967ecd21648558085f11b7b1d82448f11682e9cdea54b83ba3dbd55f80908dbb995924a68bed560aac6c SHA512 778f8df28543a6bac0af9925d087943a40550b67d25b47642150d8618cd3479ba7ff34ce959617a9ad775715b473c2d7d7e2eeb9dbc927639fbce6e45c259d62
-MISC metadata.xml 516 BLAKE2B 8bb4e6c42e27ee5e4547e7323d4464f77f37ca80f06a3830d86edb01228d2bafe670866d56c0ff421ac6a7e14c4085f1d8ef6818ee4edb20a2b996763f0809d2 SHA512 8330247191cf7628e208e0b001492948c3deaee4b65cd9327e708dd3a5b35022476bb52f631c6503eac875fa89c666fda7b973f95a8be2767638207fd7c5f049
+EBUILD libzip-1.5.1.ebuild 1906 BLAKE2B 1fa9eb69305913a45f96969003a415bab5c74a3abd515930e681fd16d5597ff378c55207182170e153f5d49b7d82e24b35f147b752fb21ad978d82eb796368c0 SHA512 f01ffc83940b6f3e9d3eeb96a21a83eec834c518d7da80c631a63673169683472c0e48432dce759fbb6ec17e3fee25e52bc9af94d787806a74fc14f83c96a04b
+EBUILD libzip-1.5.2-r2.ebuild 2319 BLAKE2B 9b45623fc32b7edd54a2998c4a9ae8b11b31af4f4daf767248a6fb780aa5c9f45f5757143b474b92410ab0c75d088ba032a95df6d645a49d1e88adac13e6ad4c SHA512 1c01b3687909a116d21cf39bd24f3a90348cc40854c60207d241d3d024ef2bd6d28c78486e23b30962b07ac28b4bea4ef189ff1407235c4c8d7cc75cffc6ab45
+MISC metadata.xml 411 BLAKE2B 9b9ed5a214bd0ada5651c71831f103af8729535fb0ddc43cbab1ccb14cbfcd4103052b2549b739ded6caca6dc9f65bac346a00ed55806e37c77de367980b1bef SHA512 16b33f8e04a089007c9744141f12d04df43f1a733aed098fc6759d68616849b884180cdbafaf6694c8553de86dddb95864beeb76447f3dc241b83846ef651e3d
diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild
index 666e8909c36c..e28826e21828 100644
--- a/dev-libs/libzip/libzip-1.5.1.ebuild
+++ b/dev-libs/libzip/libzip-1.5.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0/5"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bzip2 doc gnutls libressl ssl static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	sys-libs/zlib
diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild
index 5a25f1c0cfb2..4c386426e347 100644
--- a/dev-libs/libzip/libzip-1.5.2-r2.ebuild
+++ b/dev-libs/libzip/libzip-1.5.2-r2.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0/5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	sys-libs/zlib
diff --git a/dev-libs/libzip/metadata.xml b/dev-libs/libzip/metadata.xml
index 7f6898ece72e..b27a9ea54b32 100644
--- a/dev-libs/libzip/metadata.xml
+++ b/dev-libs/libzip/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>creffett@gentoo.org</email>
-	<name>Chris Reffett</name>
-</maintainer>
 <maintainer type="project">
 	<email>kde@gentoo.org</email>
 	<name>Gentoo KDE Project</name>
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index 043c2e33b9ae..1b69f3cda639 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -5,6 +5,6 @@ AUX log4cpp-1.1-automake-1.13.patch 242 BLAKE2B 17ac8a6529025edf8f46109906ec2bb2
 AUX log4cpp-1.1-cmath-fix.patch 206 BLAKE2B 7caa58dcb66cc184b1f88a99ea6c6c0d21233c9bbd9b7da6727f735f73c98849c0cc95a3e90913847805ecbc1bd84ee56436d3fed6736259251e1c94363f436f SHA512 926e10166d162863c6c1774ce3a6e523a27ae999df68f9423c2ee94042152078d931eda77b07c323890850918832396a3603c3a9226310af90cd3946a7de7ffe
 DIST log4cpp-1.1.3.tar.gz 595639 BLAKE2B fc7d643aa70d739e38ec5aba127b4e760a47a064f4032690586c4698ec83a2b7f219d8476650d3bfc5e25563de0852869429ec45171233c6bd5c08b69476b169 SHA512 88e5e10bce8d7d6421c3dcf14aa25385159c4ae52becdc1f3666ab86e1ad3f633786d82afe398c517d4faaa57b3e7b7c0b524361d81c6b9040dbded5cecc19de
 DIST log4cpp-1.1.tar.gz 547676 BLAKE2B 3fee8e575b404215d308a0d6c72feef612dcfb9c881c97500937d1a94d1c435108a24ae1ad20f19cedb1613735c22a37354226699fe6cafbf6d23dcd12668271 SHA512 e1a723641c75a0b7f9ad2338134b327cd9a0a1bd67ff76bca726389ad76e8ba0ee5a95abe6f29e05a77980255dc08b0aa5c906395b0a0ad094994c9e450e3ecb
-EBUILD log4cpp-1.1.3.ebuild 1191 BLAKE2B c872b68f0941cd8e199cfce00b42887b127ea47bce94cc71e1b2e5f9a922a9d67b94259feca073fd9ce315c980cb59a595c1f1917eefd226285cd7b416f9765d SHA512 f500eb24e26dd1240eed02f1169eb41a86387b08e76af163ba435fc5fc76d1bf6e6b95230452d3451f9fd07495f2bc106f3a8025f660c60f91a2be697b62c8a3
-EBUILD log4cpp-1.1.ebuild 1180 BLAKE2B d2479b287b38fc15721b40067055239de919631624c61f969ae4b7cf42ae493d95e3480ec850eae0f1add7bae2aa421c00faefe4486dc2f16ec29915e7b50e5e SHA512 759252ba0fe75e6654980f45ec40474dcc5105b302545bf299f4918b39570d19e2fe6b57c0f125c7a1a18d1fcee9ffbb8c1bb0fa8e69418b002bd57e17136382
+EBUILD log4cpp-1.1.3.ebuild 1218 BLAKE2B 2e30665d7e6065a89527aa25f9043b24b7b88a4c7842ca457f8cd47f2e43747ece4b1be75dda9c9fbad12df4fbd00f016c79fef0c3cad00bf67ac7a0a5ac90f1 SHA512 3a8714bd9559fc42c8f27ce9b9160244e9717ce936d30925d370eabea36908bfa8d656a8b5321fc1850e09f4365f172ca134ba8a917a42ea513ff3880150f23f
+EBUILD log4cpp-1.1.ebuild 1204 BLAKE2B dd6c9be9cb70665b4a8bbc6bc1bee4b51792c97738b2cfff8cd5ada7d77b6e6013b4ce839699cff71a8ea2402d395c6c7a6cde0b404ad8b88e9a8766e5b57de8 SHA512 87712a5daa9dc26a6305be0ebc6145925659f1736d1cbe5ea208b72d8f1989838a42f579fecb78a3fd617b36b39b3ce0311306d29b745ace15a0f14fade531d4
 MISC metadata.xml 244 BLAKE2B c211d7844d07df7225f7396d520699eb92a3d36a24a42153a7e736aa91ec766fef9ba07b120f90fe0ac295a982123259d294cc7a4cda1375c52e5d55a938e41c SHA512 0adb9b66d52e83eef31fe24ba677684835d998f9cf88054128834a3bff80878aabb6b2b8209f1d34f3e91b4d9c615d632d58c86bcb6fba38c85dc33c05d950e1
diff --git a/dev-libs/log4cpp/log4cpp-1.1.3.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3.ebuild
index 3dbdf540b638..2f4e7a389b17 100644
--- a/dev-libs/log4cpp/log4cpp-1.1.3.ebuild
+++ b/dev-libs/log4cpp/log4cpp-1.1.3.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/5"
 KEYWORDS="~amd64 ~arm ~ppc ~s390 ~x86"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND=""
diff --git a/dev-libs/log4cpp/log4cpp-1.1.ebuild b/dev-libs/log4cpp/log4cpp-1.1.ebuild
index c2371180dd30..406828fdb425 100644
--- a/dev-libs/log4cpp/log4cpp-1.1.ebuild
+++ b/dev-libs/log4cpp/log4cpp-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/5"
 KEYWORDS="amd64 ~arm ppc s390 x86"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND=""
diff --git a/dev-libs/luise-bin/Manifest b/dev-libs/luise-bin/Manifest
index 61446292325d..2a430108d523 100644
--- a/dev-libs/luise-bin/Manifest
+++ b/dev-libs/luise-bin/Manifest
@@ -1,3 +1,3 @@
 DIST LUIse_0.1.1.tar.gz 393815 BLAKE2B be7e35e1f4d5f6227f92bfeb5ed414593215c194e8d7ab67036ac7316cf6faeada839bbef15d8569b6fc276f3bddf41bdaf66e7315f6e8ff1341f8d697327895 SHA512 821b62ed476088c3818cb478a3c525e1d92e9879ef4059da0eb534852a294f802550ad7169066fe439f0cb3645e98656f405594db633061029ae9d7eff86f31d
-EBUILD luise-bin-0.1.1-r1.ebuild 1000 BLAKE2B 5f2f5c5f7d1a75499bb27313931a4dd046c032e3e4f7ac69c211b1fb886c842b2e407a86034cecc2d0d75a91dc106629ac4595a187ffa2da6f6deb429879b127 SHA512 be7a2113830d898804813d778cec3e91200f294afbdc114ce868e86f64ed6e249fe462e6e612d446541591e3665a43739e96b5e6a606ac0d0930dec8702740bd
-MISC metadata.xml 1313 BLAKE2B 18110903546bc63acdabc23a02b0acc5e74a6ae34912a8224e6a7c57b6c235278b3469c9620ea8dc55e461c9aafdeb7d7b53961d8324d5c4d716884c5875b219 SHA512 cf23b2da2f293cbb12caffb1dfa4bc228acdc0eb9ebf454319e1c6875619b43aa64bcbcefb1f50330b135268132f05c0e5ae446b948a8a00960bcded46b80448
+EBUILD luise-bin-0.1.1-r1.ebuild 1009 BLAKE2B 67ab63888084b09ba353115f99dcfc314575b785519ae52ef9731ca78796d8884f265a3b279bb2d3532a931d2e7c4ccb62b47f1ca607e10327313f4211ba3e31 SHA512 d93ef8312c348de0f0a4303af18a93d9413f3d729ca7ac07d70aa1737bebe368fae31c324d79cf2b69d5bf238f97c6603a8c2b076940c268347756552cb1bd3e
+MISC metadata.xml 1194 BLAKE2B 9205382d50d4a6c64f752dfcf4d7c22b8f581dacb7724ecd4255949a843e0fe07b9550f16e75ba8b8305faa3df6942fb532887a62715999d9b151e8c660a1961 SHA512 ad7ed0c143e0efb40eefdcec9d83bb0851f16a4815b2cb2acf1aaf8595a39727d375d4f34c3c9f772df1d31e47a779e91a2f9297c42bbd7bcf540afbb087704e
diff --git a/dev-libs/luise-bin/luise-bin-0.1.1-r1.ebuild b/dev-libs/luise-bin/luise-bin-0.1.1-r1.ebuild
index 0b998ae7bf27..5671c69e0cab 100644
--- a/dev-libs/luise-bin/luise-bin-0.1.1-r1.ebuild
+++ b/dev-libs/luise-bin/luise-bin-0.1.1-r1.ebuild
@@ -8,8 +8,8 @@ MY_PN="LUIse"
 inherit multilib
 
 DESCRIPTION="Programming interface for the Wallbraun LCD-USB-Interface"
-HOMEPAGE="https://web.archive.org/web/20130718114020/http://wallbraun-electronics.de/"
-SRC_URI="https://www.bl4ckb0x.de/files/${MY_PN}_${PV}.tar.gz"
+HOMEPAGE="https://web.archive.org/web/20140102061822/http://wallbraun-electronics.de/"
+SRC_URI="https://dev.gentoo.org/~conikost/files/${MY_PN}_${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/luise-bin/metadata.xml b/dev-libs/luise-bin/metadata.xml
index 31373f78eb1f..2b9a35f1422c 100644
--- a/dev-libs/luise-bin/metadata.xml
+++ b/dev-libs/luise-bin/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		The libluise.so lib provides a very simple interface for programming
 		the USB LCDs ready. The programmer has three independent screens available,
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index 56cc948bfa27..aefdc16fe0fb 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -3,6 +3,6 @@ AUX marisa-0.2.5-cpu_features_check.patch 4645 BLAKE2B 3ccd0b23d881d56d2341e1ed8
 DIST marisa-0.2.4.tar.gz 502552 BLAKE2B aa8e6ce11c35db41f386d1c5d3ffdf56a940f298e10a7f6b1fa14cb80c27c9c4af1d4d61c58786f96e9598effe26379127c69b8fe72b1ca561a44ee2b9cddc61 SHA512 71aee3ae034d1ce725d986bef43472d61bd64f0af3ccda01bb019cce03f0872629b6a1b305e717056bef06e036372323b2a67e5dc69705d6a74e028b5e2553e4
 DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547
 EBUILD marisa-0.2.4.ebuild 2308 BLAKE2B 2ccaed107affdf89a08c081c28d2b8a97c5cedf77662a6149b68cabc0446fe9540d0552cc4e2acc54a9b10ae1e22d3cf3863c6350a0b13645b4155cfcb8a4ad6 SHA512 9040d446400807133f61b1884a52d203c64c7fb81e6533cacd1a096ebbf7b2c50f371abebb62cb239eabac6bcc476944f2f8e56907a66f5b96995ae9dfccfe9d
-EBUILD marisa-0.2.5.ebuild 2234 BLAKE2B 9772704fc76dd4d8fd1e195f75f7e6f1ce6e6df9663ac33cc1111ff2db5d9c1b034a6d86f2c13099061e14545addb0f2c34e898fcca3291fa823f4de8531bfba SHA512 dcbb7759c17ee4556f0975165caab6d213f4a8179a4301ba201180b0975db9bf79b14972db30535f5871fb896cabc706b4448825fbde9723755de1064172e35d
+EBUILD marisa-0.2.5.ebuild 2232 BLAKE2B 0f59ef1f29419c73e5ef31e5fd00978e6c9f952856e11a3a4a84abe5f1a6c19ee11c30912c35622497c2179afb131d8a5be3b542fce649ea2c815628e8683a58 SHA512 fbb2a8f0a42076460c8cdb9b83587b4252fd44449281cd96ea11ab621bc854ca8ce87ef858e5891923c26ac7883450252cf0bc4ad22e89035f13b379cb624d40
 EBUILD marisa-9999.ebuild 2139 BLAKE2B 08fe3511b7340f07991121f9d84e36bd69a0c6a479ecfdd5f4c044174b501fbe1ff6f44226c33aa7ac20fb2b554be3e038a3d2893476e81cb810cec7f61e2c7d SHA512 3306d92fb8d241f09ad57fd1a8f7004ea85be1481d3f808f07821ce295c42566fceb732e358bc49797617767bf06238fc349f48aa0fb0be3f6ce0570b85d3285
 MISC metadata.xml 317 BLAKE2B 16fd28ba01ffdf67af29ea7f6b41be190ecff6ab88706b0cb04b6e9dee5a623087652e666af02cff1c3ed3bd4b42f252adf5fce1b08c2eb9a998e8c112dba922 SHA512 0e782fba322f87cfc0f180f812d0e33630c4295df1f434d497aba1a7f9d922e9674a3c23a821211cbe11d419eee70c25dbabb7508abc7bd56267e9648a1e721c
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index 90b71175c866..df3af8c34a44 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="|| ( BSD-2 LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 794f2733d300..cbf9c79d8bc2 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -25,18 +25,18 @@ DIST mongo-c-driver-1.8.2.tar.gz 7308675 BLAKE2B ca82c2824486cee78b164d1fdfcf1de
 DIST mongo-c-driver-1.9.3.tar.gz 7716783 BLAKE2B 9f5fc8cddbc1c4cf1f85016027e49d4c3bf2ebe50b1df45eda8569d48b88e174fe2c73e76f7afd4f3a36b74c5d02b826f55c610b8c4df273d8ebd4047e823edc SHA512 2c3f915c4f367f5614a904741b4b480896dd521b7039158b2f421d0d7579a45862d5099cd26b6d14cb088f9db49019538aca553c5cf72d9706ec9ab6516ff40a
 EBUILD mongo-c-driver-0.7.1-r1.ebuild 1268 BLAKE2B fb31f03aaadd1ae781d0a61724de4d2a829f2502084e7ff0a58c01ca459b5eb6ec36d0e1b615e078bc569c0e1caf820011c5cf730a91e4680a37e05407396aeb SHA512 374908c70bab6fd56b24de7762ccead366a06354b5c0ec7f0d47126bb74b040d8f8628927fa295f3e3b2b7fbf4abd6783d71ea02885648818804c7d677983a64
 EBUILD mongo-c-driver-0.8.1-r1.ebuild 1207 BLAKE2B 30cc1e8458715268163499488bed324e0aeb525941c7a19b8b06799aa21af93e17209afeb5485624511eb12c88cd145808f475925b4374b978f2a28099bfdb12 SHA512 00ac5c82565e5cd2ebc3442acf5a32160119e4c64229647982087b564b3d1866f8e3ab96d3136c351180603b039f0450e79c406c7c0c37e0f50388fb79effdde
-EBUILD mongo-c-driver-0.98.2.ebuild 1824 BLAKE2B 99d9288936eb903dbd2cc1da9e53705155d3c61f341091bb29c6378449b6723a8ec0b40ba5fc0515078b4dcb8e5e05a7bc75c6375a71ec99d32a952e266d80bc SHA512 68c687bf962ab771dea6744a8ca42fde228c56f731647f0f51367c097384956cb197c148941e75910a672ba9ec8aad29bccae9fe47ae271a20a10fb63a3e8329
-EBUILD mongo-c-driver-1.1.10.ebuild 1935 BLAKE2B d3330c54bc9a5bd7c577689cbd13e6a798eab413c4a4854216e4a1e70737c640d1c2e7e1e8c9d236adeea361c013666525cf4d207abad431a817f7e0e5626340 SHA512 09b3c7ed91d2cb00003f4a82b419f9b7be24ba9cc872aa3c2fa60c0981809f898070651bd38ef386416c4ad7e826e8644845ac85195d9c8d1965ba738f931958
-EBUILD mongo-c-driver-1.1.2-r1.ebuild 1932 BLAKE2B d38adcd13b644648cbbe35b289abff6be2ffa5fa387554ebb5dbd11f36043cc45c4e8ef6ce8fd70d0bb4de75cc9ed67961d7c53f1ec9d3210d66a53dfea250ed SHA512 f2987ee6a57582ae24ac3391e64b54f9eb6588fe2e667524f2d57f774c1b6624cd51ee5ec1380bb9de102f700b113d396d771f2e214a56052c9d0956d1a2c19e
-EBUILD mongo-c-driver-1.10.3.ebuild 2194 BLAKE2B 1b645037e88c559fbcb8e601f6b130837c8518c7877366c8461257cd5cf134f85981dfa0b84319cc8b0e2b3ab116b87844cec0b55421f4bc6754c96de0076dea SHA512 c0018403f359d7cfe8bedc6f75a5a1bd7963a7aa7b83be3252264a83778304184d22e50214d0790c60cb25bf1572c8db4b0e016534d8c0f24b8374f69115787a
-EBUILD mongo-c-driver-1.11.0.ebuild 2296 BLAKE2B 58e82ebbbab0773a1a261f25de8bffca05bf0df6f0ce2df46df9e6729ffae59d75a5194759dddf0e77771a56c5a6b1ef284aadd1a7cc8eb73743413677e6fdc0 SHA512 80e4d8c5b0a153776564ed9049e5ac295caf431529acf1614f5d3bd65cfb8adfb4bb0f585b81652bcd43eea06f61eddf73df3742826b1be485a995a95ca2f99f
-EBUILD mongo-c-driver-1.12.0.ebuild 2343 BLAKE2B e711508f266ed482c496fce0f593e62ef692522565dd36472591b97a7b3b8f5e27e6c7fed0b5f29401a14f9cb5aafc0959289f481c7ee1f09634a274f7b107fd SHA512 a54a2343caf467d59f7b5460e8c1865dd6f44f327542d535a5eaac7ad6a3bd59c2e30466dd584c7f6165ce195ba35b5e655a7c8349fbdb8b01deb5af3229efa1
-EBUILD mongo-c-driver-1.13.0-r1.ebuild 2431 BLAKE2B ca1cb9c45b3e7b5a78763afbdd0e4105d6eb1d2c60e647081923fcf5c460b9b56568ee2e47dbcf743cf5d15870091546981bb7f68c5903da46c40849d948cae7 SHA512 8cb7d48ee5d1f1a7bf66042dc87ebe685db83b96b8ffa107d72b1faa5b9266b139810e3cb9cbbd3dbb1d3b752b87bb8dd810f43a5ac02dee5c16af6f9784c7c7
-EBUILD mongo-c-driver-1.13.1.ebuild 2466 BLAKE2B 8f5e8d47c5e0b69876f6701986d70c3db75b6e4d28a817f3e880aa630eef6e1eb8307bf91bd98fc170aaee702aec9e8961058d83cae0d009457213bc1088fcc7 SHA512 2c2cc1f028ddcd1b93227a8022ecd47655aa43088ba8e4f5d782a31cd5122752be80d6904d85353c92cde040fae6f5333ca91e1fe678a3ed1bdec4b7aeee024f
-EBUILD mongo-c-driver-1.14.0.ebuild 2535 BLAKE2B 39a56e6dcac4bacd8c18d4c78d7186833533ffe9e998576a38edddeffc88b27a18707b93694fdfccece8029a26431eb5b3d82eb059d14dcacced898e536d5d6e SHA512 c47c698ae7e76969a8cc5c778a0a5b121628a6fb625a7cc90e114a6943872d3520cac0e8cecb5a7066226d140711b40077ebd098de30b6052687a18f97a1eb31
+EBUILD mongo-c-driver-0.98.2.ebuild 1840 BLAKE2B 2fb16cd97763ff2af007e76670f3d424dafc90c56171be4afca356811a2df7f9c2d6bc21f99d7195f4f09344b6910ea8003807ca9be006a6ce443ba662c9344c SHA512 9c3a12d619c20f018aebd9585504621bfb18067390c5cdfe1a61f3ea449377905718c5bcbd98c2fdbae4c0a8266d79b5482ca3eb8884a47512eac36d591b95c0
+EBUILD mongo-c-driver-1.1.10.ebuild 1951 BLAKE2B f2b3a15a6aa9a0887ae6ab52d7ee1e79d7b3fa06bb1b3684657719dc69f10894070d002ce0f06abad742ee753daaa4dd85e586785e29bf84e7bf9a2a4f2ec46b SHA512 7226237c58d4b94fa052ac455e7b67aaebac2bc14d285f74829fab289eb4d3a0dc4f3b7e5fdbc6ee28b6eeea59dbe0bc0cd3511c959844f0915cd2b1390875f3
+EBUILD mongo-c-driver-1.1.2-r1.ebuild 1948 BLAKE2B 65296d043f84794efa8d8c69c174211097c73f14fbc945f81d6068663c2b23cd2a0b4eea33b5832a32d0bd1adf05e051c481625f767ddf708dc2b2851a5999f8 SHA512 9c8b583be17df5d3a32ab71483c69f2974e6c3634285c1ea6ddf46ab305ffe8852bff95b26361efeca0b0051632b69b267c40041dc13dc8f90a0f766ceba486a
+EBUILD mongo-c-driver-1.10.3.ebuild 2210 BLAKE2B 70d4b065d7b14b605665f03b231162156f30fe099a5fcbe273142be29e10fbfc26d0008974d750a06b079f536bf66eefb526463f85b826d9a482ae45f1f4fecb SHA512 db43cf703c2c4b26d116d4c2c57c4a50777bb8d0cde2d88542399ddb42c6055027f20a6e24b26ea933d258074929b1f37c1c4e8f067549be61c1e1f7b1247762
+EBUILD mongo-c-driver-1.11.0.ebuild 2312 BLAKE2B aa3443f6ff0d5b8d14878fa692fbb746c1d3af47a9c95bced9c0ff51db2cb6c702351b2d730c2825b4a22ba95021a127383e46f5bd76429d02b17b2c70eb46ba SHA512 da4c8f2b4f4f85f188f7546a4275ea60903ff85e1326fb01f9c559f48da40c75f6cb25a165e4dc5be46cb56f4820f183e01a3059842f9caec4468355113c46f4
+EBUILD mongo-c-driver-1.12.0.ebuild 2359 BLAKE2B fdc03adb7e0d826777a84a15137d5901ff5a8ddf56d5a89b6a0899f473d8e3bd9d9357a7f42961398b655bfe2d7a61b5b488375fae96e4995f23912e1a948adc SHA512 12e54afd326cb5697c46e792a54416bc745669c48928457dd7581dc74e953b7f0940bd3b839f26ac11eb503fc703ec14ec773ba5621ba6df7cb174fc74644daa
+EBUILD mongo-c-driver-1.13.0-r1.ebuild 2447 BLAKE2B 9d78225d7dfad62360686f37b607c101ef25718224dc627fdc0d8d6b01733e0cec823cc951e5ee955bdd205c421e48ebed98e7e802a3dc974bd1a55b26b178a6 SHA512 d63b7db0564ee4443b72aed22f043f367004716509f4b91374a07cf70ae6dafe627efa936082ad7cf62176e412f0bc179b7bb3e6df88a2979824de00790df23b
+EBUILD mongo-c-driver-1.13.1.ebuild 2482 BLAKE2B a023ec4ab0d023c30e6f664eb1209136429c19321f07fbdf7def6b2fcb7d66f873fd394d48db98f08f2466c4c46a9fbba8f8a48e57a355b09c2d9e4582d1ebda SHA512 f587c3e03233039d8869b5d75b8fd1cee617da4a1b4fd6acd97a043c78a7604320c42e78e5e21df0783da98092252e4301011804384988df548449a350e89a47
+EBUILD mongo-c-driver-1.14.0.ebuild 2551 BLAKE2B 63c599838498a5893429ff5def20a62f50205e9c6eb8cbc09fd32bcdacd8b70531cc46041023999a634f990c4982a3b94a027cef2314e1b6d5e0a8edb8d9768a SHA512 3ad5c4651b4c3d00c9c01159648750f46cc52e8c9c910ca5534518c7ee7255bba6069ef5a26f5734d52b7a978cdf089ffac52af10fcc15c41a573e6cd6f7fcb6
 EBUILD mongo-c-driver-1.15.1.ebuild 2536 BLAKE2B b4d2263f92d32b3605188b6ea91d8dd1a3100ad13e73c300b6efe5a684483a9669c389d591c6681c5f6a2a1501bbc1d2fc4c1db88533c868ca1b4fe30348203c SHA512 393ffad442d3db5ad0661459f3ef9cbe9d37a5087079436ac6c534dee378d207c802f928b6dbef13626d6c77026971215c52413e8ea7bf21167f74526b9b6560
-EBUILD mongo-c-driver-1.3.5.ebuild 2155 BLAKE2B 45fe20fe538367ac6005a6029fe2607be500aacc9558cf24bc16931bb6eaf5629f8b7d6611ff745876707d04a30776604b09a73b7d09d2dbe8ed8c9f7347aa04 SHA512 a80ee2ed4231f6da38f4cc812258efbc768e4ad3c0b2632aa8fab30a25361dad4ed4a9ec98c4ffab05ff0976e0b85a5c1080439ce8899bfec42c5ebef8ec59ff
-EBUILD mongo-c-driver-1.6.2.ebuild 2095 BLAKE2B 25dc744ab32604d799ed4af21a2495ae146920b93ba8e8cbd318e2b912c94903514631c592e493593e7b5b2e629b77aeec2cc44bc718a6a794a3921a9f581a9e SHA512 f75d4ff29770a6ca306a8414d29f23b90d3dbd56e9a897d51baf6eabb9be19fdf247eb0804989d1052079a01f55b52086921fe24152ab45ac53ca5f492c0efc7
-EBUILD mongo-c-driver-1.8.2.ebuild 2153 BLAKE2B 404dd02861d6acad7d2622254759e817e3d993a540cada00576752fc688120532cc07e9ed934da403337bc829baaebd6de0eb1b2d50b73bf7305eabb33c17c5b SHA512 172a89e04ea99583b7587949dde56b1a79ed7d5db00897ada797fefb6d8e8a94338ea4e4b00ad2792275a241468158e055832a783f018f9281023e0f37e76619
-EBUILD mongo-c-driver-1.9.3.ebuild 2156 BLAKE2B d1914470e4f400405e5f71dfd87da5c5398ab300fdc96deaa613339bb9bb57704a35aa64d02b061466bc7556207c83075e5d5db51f5cdfab16316695dd0820f7 SHA512 94868f5dd9f0aa99bcc9a098173e2fd1f044965da48daa286dc5dfce69cb791d8de7c411c0ad506e09c55225cc67b05da3e569884ef7fe324b237255735b0b63
+EBUILD mongo-c-driver-1.3.5.ebuild 2171 BLAKE2B 62807837e21c6ce5c098fb5160aae99b01d6dd01550d3bd837ca727616036ec453a9e37f0b4ae71979bdce01344a265d0ccc23d324d9827084bfc302b980a6d1 SHA512 1b22d611b3c235883d4115fbf82d800fae0fd81453d2b4dff8abe8dbeab065b04e2abd506ad6050c10862a7bb7f28cc7ad41b08bf16a53598c20eabcaaec4cd8
+EBUILD mongo-c-driver-1.6.2.ebuild 2111 BLAKE2B bcbe79dce0d232531c12b14ad8b71e331890e69edbbcb99bef624dc4ec6a7ec5a15c9eb690ebff6ecfa02aa29b0a6399f60f703c48c8296fa405a47174bf0f72 SHA512 443893f785cb06ff8fda8e8282e3b30ca5aefbc5494bebbed8a3a6b5767d35eb48b558c0b86f8d205d99bd5589c8526b0550daacbcc32f7e00f8a6e57ce17766
+EBUILD mongo-c-driver-1.8.2.ebuild 2169 BLAKE2B 44401091a3f3c1a29c98aa96c5b23dbf9577e8bcb6da015d2e1e03bdd63fe754405b46dc41840875b02dd80051b8d8f1ca812e393e32344335b7697bec9dab17 SHA512 7ad66c5e6016f19f2e22e103c58be133f3d20d9cb4895a0be9a8b7145fcadae7c42d86b98b236253a6177498a852a1e7fb9158765ccd1d2ef2c92cf8ea4fb81d
+EBUILD mongo-c-driver-1.9.3.ebuild 2172 BLAKE2B 91ad7531fbfb2eef3515f876571419cb99a322b54af2ee289b5972e36cfe92c64f5cc7a3a265ded6688731644fdfca58d7625197215f65a9395bed0396979ace SHA512 117aa59dcb014d1b51fb26295998ada692db5ec4a5f4033bbaff31fa8c4bad07764b15e31501ef443da6fa25040a694db51d12ad34dc1c73d15d63b857a7b586
 MISC metadata.xml 334 BLAKE2B 7e10c3396a8bf28586240a95cc10a42de507d995b9f67dcf3b016cd586a973ce7478fe3974188dfb215123c8ca7188479d0d5be46ebcbb6b7790472f4e6ce225 SHA512 80ff1ae78c264618a7d5253d80ea5f4d1a15a568d5215d03dbe3062a591ec1c99d6625feff3b7baabe314bb284b5e5340c873b8846d05fd932f8cbc78df00d34
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-0.98.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-0.98.2.ebuild
index 73a6478fd07c..e57a3560443f 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-0.98.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-0.98.2.ebuild
@@ -27,7 +27,7 @@ DOCS=( NEWS README.rst TUTORIAL.md )
 
 # No tests on x86 because tests require dev-db/mongodb which don't support
 # x86 anymore (bug #645994)
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 src_prepare() {
 	# https://github.com/mongodb/mongo-c-driver/issues/54
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.10.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.10.ebuild
index e7ca688a3cd1..06580e8e4bb9 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.10.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.10.ebuild
@@ -27,7 +27,7 @@ DOCS=( NEWS README.rst TUTORIAL.md )
 
 # No tests on x86 because tests require dev-db/mongodb which don't support
 # x86 anymore (bug #645994)
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 src_prepare() {
 	rm -r src/libbson || die
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
index 46adaf6e0c40..8bb38f883513 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
@@ -27,7 +27,7 @@ DOCS=( NEWS README.rst TUTORIAL.md )
 
 # No tests on x86 because tests require dev-db/mongodb which don't support
 # x86 anymore (bug #645994)
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 src_prepare() {
 	rm -r src/libbson || die
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild
index e9641be05a99..7e671d96e059 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 
 # No tests on x86 because tests require dev-db/mongodb which don't support
 # x86 anymore (bug #645994)
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-enable-tests.patch" # enable tests without libbson
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild
index 9555f7a1f3cb..ec8f06577251 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 
 # No tests on x86 because tests require dev-db/mongodb which don't support
 # x86 anymore (bug #645994)
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-enable-tests.patch" # enable tests without libbson
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild
index 8b1af6b106f7..0755827f8491 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 
 # No tests on x86 because tests require dev-db/mongodb which don't support
 # x86 anymore (bug #645994)
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.11.0-enable-tests.patch" # enable tests without libbson
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0-r1.ebuild
index 78ede21f8526..415dc7078333 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0-r1.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0-r1.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 
 # No tests on x86 because tests require dev-db/mongodb which don't support
 # x86 anymore (bug #645994)
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-no-uninstall.patch"
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild
index 9c37da616632..e61cc887ea3d 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 
 # No tests on x86 because tests require dev-db/mongodb which don't support
 # x86 anymore (bug #645994)
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.13.0-enable-tests.patch" # enable tests with system libbson
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.14.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.14.0.ebuild
index eaea5a9fc5ac..4ad9e86cd71e 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.14.0.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.14.0.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 
 # No tests on x86 because tests require dev-db/mongodb which don't support
 # x86 anymore (bug #645994)
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.13.1-drop-failing-test.patch" # one test fails
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.3.5.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.3.5.ebuild
index e48c6b583445..dd8921b43802 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.3.5.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.3.5.ebuild
@@ -27,7 +27,7 @@ DOCS=( NEWS README.rst )
 
 # No tests on x86 because tests require dev-db/mongodb which don't support
 # x86 anymore (bug #645994)
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 src_prepare() {
 	rm -r src/libbson || die
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
index b637d1e84498..f66b7f0c74b9 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
@@ -27,7 +27,7 @@ DOCS=( NEWS README.rst )
 
 # No tests on x86 because tests require dev-db/mongodb which don't support
 # x86 anymore (bug #645994)
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 src_prepare() {
 	rm -r src/libbson || die
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
index beb5282faaf3..1c81a8f60b99 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 
 # No tests on x86 because tests require dev-db/mongodb which don't support
 # x86 anymore (bug #645994)
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 src_prepare() {
 	# remove bundled libs
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild
index 825f4a506112..ab6b5baaaf37 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 
 # No tests on x86 because tests require dev-db/mongodb which don't support
 # x86 anymore (bug #645994)
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 src_prepare() {
 	# remove bundled libs
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index ac69b0eb93f9..8d5478c5a87f 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -11,8 +11,8 @@ DIST mpfr-4.0.0.tar.xz 1406244 BLAKE2B 2d1e356ac1f7119aa8896c438e7e30c4b316780d7
 DIST mpfr-4.0.1.tar.xz 1412692 BLAKE2B 3e8d5cf558071571c21417088e74b8cb94a2e179667af41f734a68c7bd89d4beff245b9344c4c37d2f6558036a1a8c9ad3ea5ec8fbde16d2c7ebbf37a22cf424 SHA512 137ad68bc1e33a155edc1247fcdba27f999cf48ed526773136584090ddf2cfdfc9ea79fbf74ea1943b835b4b1ff29b05087114738c6ad3b485848540f30cac4f
 DIST mpfr-4.0.2.tar.xz 1441996 BLAKE2B 4c1a15208c2dc3dcc1424974de506198e9cc479c70255149876c7f541133499ada5c89f07393b120b7079e6bbaf8ea03e5e496e1350b295e687392a6e0341c1c SHA512 d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88
 EBUILD mpfr-2.4.2_p3-r1.ebuild 1487 BLAKE2B fff9daf8465e44cb1975fc83cd502a664e65a801b1a96fdf9de23e4d336bd27be7fb5c85243e2361460ecbf13e472c8c900fb010b730fe28b54605560ccc82e7 SHA512 169d8d6d97ded0b04b918a06baefb1bb5dc194c9c0b4f0e343b03954e26d21d503b66d8470b36d460cb099b622ce7253da3567ffac56a266f33b2d6121b466c6
-EBUILD mpfr-3.1.3_p4.ebuild 1790 BLAKE2B 41cdbde1b6a04fa46f5388750e6737796ba1a7077523001cb148679eb613d7d8418ef091961c80aad05244509a70c898b8b746a618b885b8fb44e70afdcc6813 SHA512 f30a3d039429937bb57f198e36f3455bc3e2354bcc94e95bd1c7c5b0133e862b0975721f9e2ae51a77f94093ea6130d2b9f5a81f2621bc181d2411c9a9ea5bd5
-EBUILD mpfr-3.1.4.ebuild 1612 BLAKE2B 66923f0112057a2a7d72825a2ea38c758bf9d8f71a71b816d28e3d0537182763b4ff22813bc5b5d3a702715152ab3572f8470142aef48413795c91083b49a391 SHA512 c1cd489f1491e2dd19f995d7f09408f248378f0fb4bc0e1200057fd17e2695fe8d38152545df4a1ba0fe781af23f412dc0336af587e21833ef2cab80262ca10d
+EBUILD mpfr-3.1.3_p4.ebuild 1788 BLAKE2B b224a802b46ca93c13eed74c7ec12b815ce2d9901bbebf75c24cae051e7d0b68d1a8b747a0a6bbc357817fc390e1c1bd8961bc7f53ca5c411bf1458197e62000 SHA512 a386833cb4f651dbdfe82a7efef974007c474d13af7576f0dd1bb4ae90069d552eabb53244035926598c4e15fb55fb243e6e81bd7e0ffd3c929805494dce3d22
+EBUILD mpfr-3.1.4.ebuild 1610 BLAKE2B 557aaa3ee1253dfdcb92c784840f8244a7e618df289b01d274e19c8257a64a71a1f6e510eb11f155fec82a84726a7727cc253554d7c7ff697c624f7cbf692b44 SHA512 50ee30de97dadb782d165584234d3ab37ef9e5876f7f755b57ff1af3971fb88f948915dd0b280ee6d5884031946d19e1edd22bbf356af7784fdabfd397b01d9e
 EBUILD mpfr-3.1.5_p2.ebuild 1672 BLAKE2B 4cb61b40f2d8495d460ad6e804ec8ecf6bf4ca0a376e0f05ad8c7e05fa36213738a754c715d5c14b07182b7fe667a7465492fd4c9a64e34a8b46b53a606e5f57 SHA512 2f12a3322a252cf29b21189b8456b4e429165303e123d4e0c88b0c96eadd8a8c34c1f94ef2c69e2bd46169454b9cd98525e34e6bddbed8cdbf5b953a1402ecd9
 EBUILD mpfr-3.1.6.ebuild 1591 BLAKE2B e83822443f4cefba6133397afadd04771cd4e5fb93598bf64fa9d94bde0bed823bc61114fe315488dd82a03c969ff78825d772a04e2fc643fd41f1d03a4f613b SHA512 3e2871fd594f7799f28e67e25223febdadbfec6fc96928d13ef1e0a394d69a88634a8ac490f22df9ec6827b0aab7926e377f10830d7bd74d87df163d64fd106e
 EBUILD mpfr-4.0.0-r1.ebuild 1698 BLAKE2B 6357828969ceaa9854aa801fc52cb02a273d8f25cf20bc082fc3e4226b8eacaf8a6f28cafd6db7c58f6e1d597d7b179a95f6052f19ee0ad89351c87f7a01b8bc SHA512 e68e3ca70ab845ea8762be1ba670d533ca714963f8ddf03af07575a7ad0603810e9b22871413c17d6828068e07f06bbec6ca8aeeb2c161d3cc32dac9e346cbc8
diff --git a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
index 4c65b8c578d1..6784eb0171f7 100644
--- a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
@@ -49,7 +49,8 @@ multilib_src_install_all() {
 
 	# clean up html/license install
 	pushd "${ED}"/usr/share/doc/${PF} >/dev/null
-	dohtml *.html && rm COPYING* *.html || die
+	dohtml *.html
+	rm COPYING* *.html || die
 	popd >/dev/null
 }
 
diff --git a/dev-libs/mpfr/mpfr-3.1.4.ebuild b/dev-libs/mpfr/mpfr-3.1.4.ebuild
index a832b4410b00..6067024dc290 100644
--- a/dev-libs/mpfr/mpfr-3.1.4.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.4.ebuild
@@ -50,6 +50,7 @@ multilib_src_install_all() {
 
 	# clean up html/license install
 	pushd "${ED}"/usr/share/doc/${PF} >/dev/null
-	dohtml *.html && rm COPYING* *.html || die
+	dohtml *.html
+	rm COPYING* *.html || die
 	popd >/dev/null
 }
diff --git a/dev-libs/mps/Manifest b/dev-libs/mps/Manifest
index 1f3533f08f71..f958faa591f7 100644
--- a/dev-libs/mps/Manifest
+++ b/dev-libs/mps/Manifest
@@ -4,6 +4,6 @@ DIST mps-kit-1.111.0.tar.gz 3197286 BLAKE2B 464fdd2144da219e0407875c1295a3c923dc
 DIST mps-kit-1.114.0.tar.gz 2461796 BLAKE2B bc065708f8b4df6a4d7dcf415efd120ecb18461949a000430731ae34cd25bdf90f857bc711b6cc05c7ddd9a50ff8660ddbda146ce2175116d4fc6a8098d8bdc1 SHA512 78ec4f470a1c7e1aa377a61a6ccefbc77fa6e84de73b209cc3544452843ecb09a0d889121e51cfbe64d788c658c68b12a4ed150b7f82df78d4416987ded21fc9
 EBUILD mps-1.106.2.ebuild 741 BLAKE2B 7c93ebeaa6e6131649256864acd3cab8b9130d6762ba12d46f2f92b79c6f230adf01ee3f7374a590648c00deb7016fb8b3de3f27ee03db193afc640006475f11 SHA512 9e239ec00c697a6836a19b09bb1e080f251e06a4199f0533f6ffbbfa69899b1291e2ed9c1bbbcb98609f4c1bf88e4850904faa1d7203e9038190b7efc7489dbf
 EBUILD mps-1.110.0.ebuild 573 BLAKE2B 5dd9a54c038d7b16d691625aef7c9bde772314e27e9a2ca7fa98e32f4062b84733e4d792c95150209d94dec31ffa1bee66d9be4677a8ab8c9d7bc03836ac7fb3 SHA512 09374dab57283ee8e3deda4319e2acd86a33148d88a20c242066dd33e3b6a59a91305486dfdc0c264b2f0623f1205a76bc7543d5aaf54f425f501be13080d8aa
-EBUILD mps-1.111.0.ebuild 629 BLAKE2B 8911327d46e2fce0e8795182fe629ea81c0a91772eba54a412410571b79486534e771dc2123bd425dd6497c7af72162a30b500f76f528a3e15ec6137cb120bb9 SHA512 e98099462d678f6e396a81022515c5952b76b8da70979917a967cb500f8b36932c59ec8256e5768de89914aeee95682e1da84e5c0172da23cccaf843ab22285a
-EBUILD mps-1.114.0.ebuild 629 BLAKE2B c8d8e5591ee335db695e9af2adb984d2a3fecdae07172dfe27e41da57cac2470e14913b87025149c357372889f820d3da9a0a1bd7c49c6ddf07bb17f8acdef6b SHA512 08411796f1eb8f846c9f5fd16c01aa08b8c95cf0378b0f09de4acd67f43af0b8f2160d8983209d5843b97083e8be7255618cbd147ba3871f95c4dcaf5fab9b1d
+EBUILD mps-1.111.0.ebuild 622 BLAKE2B a3bb1864a41d50cfe1ecbc280e533c4af86d5b2e41e47a22722437cf40837a9d1b3dc0945515478b1d7e52e40479a47fef5f3542efec12b9efde01d421530fd8 SHA512 d7185abd95d870f08b161c566a1cfd33a896af4e5fec6c9b569bff7f2836a4bd65e82bc2c965fb7966e1ae0af842ce5476398bdbbb348389c42ade9b47dce057
+EBUILD mps-1.114.0.ebuild 622 BLAKE2B 0a1b13a527f97a31cffad4956688a8b351a49aa4f18915d83378012dd50b96a08a5d824e6458e3c4666a7099da8ee0c68e852ee0f5f099f349e6865a68fce3a2 SHA512 c08dfdd54b791e727879332b8ef6509554349ce00cd2244bfefa1613512b68c4752ccc92bf63d5fde1b8fd1765154ce90bc39a2f9e9f0417806b4d5524179e6a
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/mps/mps-1.111.0.ebuild b/dev-libs/mps/mps-1.111.0.ebuild
index 1bd9a1f18277..685b7aef5c9e 100644
--- a/dev-libs/mps/mps-1.111.0.ebuild
+++ b/dev-libs/mps/mps-1.111.0.ebuild
@@ -27,5 +27,5 @@ src_prepare() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 }
diff --git a/dev-libs/mps/mps-1.114.0.ebuild b/dev-libs/mps/mps-1.114.0.ebuild
index 7adf0b24abc9..767c250c487b 100644
--- a/dev-libs/mps/mps-1.114.0.ebuild
+++ b/dev-libs/mps/mps-1.114.0.ebuild
@@ -27,5 +27,5 @@ src_prepare() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 }
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index 1da785f2dfd8..ab9bee3bc634 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -4,7 +4,7 @@ AUX msgpack-1.1.0-gcc6.patch 900 BLAKE2B 770cce3486efe6b402a5d8a54c317cc31e603a3
 DIST msgpack-1.1.0.tar.gz 493551 BLAKE2B 3ee162fcba5ae61c7c69945a567ac4d39526e7941f42cc2ed55bc5885b823af84eea212c4e75e8e8583e8ea8a5e12f75e969409193c5e7273430e2e02d33a02c SHA512 6823fab090c2146f871a45736c29b8f81434f0d72c597ebea2e947e4a9a17554e163bc88fbbc3dd0805b2ef0df029b10ca30c09dfbd1111252b9861a1e373901
 DIST msgpack-3.1.1.tar.gz 495858 BLAKE2B a99b7edb2a6de80e018d5c4084ea199518e34045a6293c622c8690147ae353abdb63856eb031962a02ce20903d4443ec2b01a3c033e756c339f8674ff801d4c3 SHA512 cc634ef38b3844bf994159024441fe72d99055c42b0a4d81245b0629fd1f3147587eb36537cfb85e4cae2edc1dc23d7fa400022efa5a10dca295f9a6acd38346
 DIST msgpack-3.2.0.tar.gz 499188 BLAKE2B 6e5fd59a96ca726d3429b173b3db4c74163eaf6d314b289845237b6ace6208478dbbbb60397c630d515f6f6eed344b74f76225d1a4ca143b91ebb9b3a1369c14 SHA512 f3d011adfaa71b3c5d5f3eb43f0addbd461ae82b8ac22f367ddba7ef762d3bea500477501cf394d1770f0c47809bc363fc1088819ecfdfa668e93529885f4b88
-EBUILD msgpack-1.1.0.ebuild 1028 BLAKE2B 7575338048901640067f8e3cacb78855faed2de8f280ae4c5e9ba09165c76d41ad787b2fdbb1fef28e82cf1d22b93f5ea6b96577512cd913b3afa81b6511463f SHA512 c592c97419e00e566adcacdb24231895f936bfd9c9d765ae4813e26bd471c7cd25d40e711da5edfaedf91f5913f9ce290c5c60de12c01b9130259430df986ac2
-EBUILD msgpack-3.1.1.ebuild 1690 BLAKE2B fab3034636c04118bc98f0be18535743b319d83d9e97e1a12e721b04041f8c1ed9d091121664fb9d609bd88dffcb4956a315623c0dacf41f69935d95c8f0dd3a SHA512 298fd5db2c1f673b6448de944de31b18355e323f5a29a1429665f7267b4062ec6a8a90e6697be5b1bee29be2108631e0dd99453634f621089cc0e1b0c579dc7f
-EBUILD msgpack-3.2.0.ebuild 1690 BLAKE2B ba7928ab5438c60554c5fc98763a5f539a78e9e8642b7b2c3f00523f97c99d40be4a66686b09a1edc799cfc645540231fe53e8c9db26f7be40c7082856f3bf72 SHA512 fca2cf3273580f9e1d039399f7bb107d7a7d76ff0e179a9c81a0c0bc07839748568a928e3b14f792d5a1a23465b990add3bee2983a8e6e89186bea419105bff9
+EBUILD msgpack-1.1.0.ebuild 1055 BLAKE2B f50c69aa071803feb8fe923a4013555713f275c0efe59d6fb72664275a590b45f5b6c95e3514d8afb170c85f68ea9e3f5d9cebc6baa12b7ee3b02a09c80c3994 SHA512 39c31dd96a67f9c8e36b68c6c4f7392eb90305934696b47464eb2677323e0a59cbe1100d06d2e23455e75b8fb671f90d4a6347abb13b8c43f35608f185cd69ef
+EBUILD msgpack-3.1.1.ebuild 1717 BLAKE2B bf44d36d1b0c747d054699dfbc13b4d51badbc80575ec44769ea1f27459ec50fdcabc6b1b3c76273ee686fc843561ce6e02ba883c159ffcf48fecf21bfc24e32 SHA512 a1bab4c161c0493441413584d0eb8957b5d074809c5008d1084bb2da9c1bc9741bdd5562dacd461cc96f873a2181abdb5f209a0a8ee716752089e33cf2bb47cb
+EBUILD msgpack-3.2.0.ebuild 1717 BLAKE2B bf44d36d1b0c747d054699dfbc13b4d51badbc80575ec44769ea1f27459ec50fdcabc6b1b3c76273ee686fc843561ce6e02ba883c159ffcf48fecf21bfc24e32 SHA512 a1bab4c161c0493441413584d0eb8957b5d074809c5008d1084bb2da9c1bc9741bdd5562dacd461cc96f873a2181abdb5f209a0a8ee716752089e33cf2bb47cb
 MISC metadata.xml 409 BLAKE2B 7656515e9cbf76555dd77ba3350bfc3720d685f061aa2a4c9ef793c7d0eb0dcf327bd707f00a01b0d2be706ec79d62778cf7266998457a62f4291ccb1a5de194 SHA512 f56436ccd3ab6d2d5cf453e4eaeb8e3b79cd8d89a73c1c0ff17c2a47b1802641b20e41d75a12ea161f0a47e0236c84425a02cf8bb16e4b9d5b406fba4d2f1ec1
diff --git a/dev-libs/msgpack/msgpack-1.1.0.ebuild b/dev-libs/msgpack/msgpack-1.1.0.ebuild
index d7c174ef7c5a..934638604a4a 100644
--- a/dev-libs/msgpack/msgpack-1.1.0.ebuild
+++ b/dev-libs/msgpack/msgpack-1.1.0.ebuild
@@ -19,6 +19,7 @@ HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="+cxx static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	test? (
diff --git a/dev-libs/msgpack/msgpack-3.1.1.ebuild b/dev-libs/msgpack/msgpack-3.1.1.ebuild
index 9d401bce9590..9f05ddf33b7d 100644
--- a/dev-libs/msgpack/msgpack-3.1.1.ebuild
+++ b/dev-libs/msgpack/msgpack-3.1.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=7
@@ -18,6 +18,7 @@ HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
 LICENSE="Boost-1.0"
 SLOT="0/2"
 IUSE="boost +cxx doc examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="boost? ( dev-libs/boost[context,${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
diff --git a/dev-libs/msgpack/msgpack-3.2.0.ebuild b/dev-libs/msgpack/msgpack-3.2.0.ebuild
index 877a72fa3be8..9f05ddf33b7d 100644
--- a/dev-libs/msgpack/msgpack-3.2.0.ebuild
+++ b/dev-libs/msgpack/msgpack-3.2.0.ebuild
@@ -18,6 +18,7 @@ HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
 LICENSE="Boost-1.0"
 SLOT="0/2"
 IUSE="boost +cxx doc examples static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="boost? ( dev-libs/boost[context,${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index 1f2861826841..c4094cdee95e 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,5 +1,5 @@
 DIST mxml-3.0.tar.gz 9266886 BLAKE2B d5d3481cfd1d015c620ef897bfc21e839ad2a70f5ffd58973f8435e0e6a66abd477f8fcaacfab05ce608314fed27241702becb60b49b8492560bcc9418b317f5 SHA512 3c540348022226b122ce014f183368cda6631600a11d8f4d43c99c62fba2f3ca4b23dff4122082f63915b59a46a5475d1d12d0081f9315c65f5c044ac3c751d6
 DIST mxml-3.1.tar.gz 9267206 BLAKE2B d5cee24804978b474bf5b58c7a5932b50d7197a35e65da20c2517ce7db01d22027449348d6b15ddf0d186219ac81993055deaa4af9f48439273f8d2d74b27edd SHA512 8f8923b394093db5c471c52c17185916bc3c91f66c97de66919bfef2a09f271879a52f285e5fc4ded03484a3f83ba8fdb588d985b06e0c25ee001f1a80ffa586
 EBUILD mxml-3.0.ebuild 1402 BLAKE2B 5ab3a112c010bd0a9a16ddc35c702138b22b88f4fc44dd0caa0f6227247ab19476978a81faf632753fba510e82fe2aa441e7e1ed81f041627c69dc9fb43d585b SHA512 1dbcf5b958c0e952d80c56079f0d3e21f91ab8a5b4e55dde68c71f152a0f4ea208f97b7f9fadd11178ef7379466c27df43674bac5e5f5cdaa08cc5645e2b0dad
-EBUILD mxml-3.1.ebuild 1406 BLAKE2B 586c9c5fb0b435cde055a066a6e74a8132df0716abd9bbb02ffba86b4ee17c13bcbcd3737e36a55d04b93094ac780a51221b0ba10fd7658df50d08765c0c399e SHA512 fed12172992949893b290de62c37ec5ee9409cf59ffc097c9957548fd9180597186599fc3e52d27079668b9f63f347e5ad53b31db47e315fb4e265f9ab142dad
-MISC metadata.xml 1498 BLAKE2B b0ff99450cec828ef5614c2b3819d02cc97e402b60ce7b9bca20962166c47a9e3053e2457eb7b29210886aa7b0297e97340b55cf74a0aabc20ecb4c451d576c6 SHA512 5ead3d76daa42879139a96cceb0a12a84a23df8372a8e2e9e9d1e38ede0266b480ca404f03047f4e66ed7d989171d37333051e2a111dfa0900b9cbba703b22d6
+EBUILD mxml-3.1.ebuild 1405 BLAKE2B 286c0a7a0d1f27c33fb2ce3e36c2035902c646df96d91855a902e99611f9296b32efcc0c114ebf27a9eef25191aa34e26e57f7918494fd253ec6eadcac61c8cc SHA512 46a932b365de48e6f646797a7abea283b390ea7f922fd6e2ad91f575fc41f084976b9a55c6db1e75f23f650d0139898aa85ae8e4147331408db85a84e74957e3
+MISC metadata.xml 1379 BLAKE2B 9980eb701a13296c1f307c52427336ae892bd9905d86619bea889b3e4ad9fd3cd8dfbe23454c8a562a512628e83fd9cbd2100a2036e607bdf27585599481a9ec SHA512 d3a3de9e7b8ad130622bfa2e689bb1a944e1fb344961fda5ea39ad9fdba754e44bcb225a753834387e7bc490f25667a28422c79ef78ce4324ffb8706d0a71108
diff --git a/dev-libs/mxml/metadata.xml b/dev-libs/mxml/metadata.xml
index a4af87ab4c46..10d4d9795cef 100644
--- a/dev-libs/mxml/metadata.xml
+++ b/dev-libs/mxml/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Mini-XML is a small XML parsing library that you can use to read XML data files or strings
 		in your application without requiring large non-standard libraries.
diff --git a/dev-libs/mxml/mxml-3.1.ebuild b/dev-libs/mxml/mxml-3.1.ebuild
index d229322c4d4e..72c732d5c059 100644
--- a/dev-libs/mxml/mxml-3.1.ebuild
+++ b/dev-libs/mxml/mxml-3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Mini-XML"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs threads"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 28b2b5612ee7..90649742772f 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,6 +1,6 @@
 AUX nettle-3.4.1-build.patch 1598 BLAKE2B ce10cb8a59bf8e2d1dea57ceff5bb2fcf2da1320034672abed770fcce54466704a6b3820a135d04d2d52881cb0d701bdd252d388bcc1ddd80b508fb3828cd237 SHA512 6b95ec112471895d3fb7c7c2c82517d113c0da604285f19b4d14ef3e4bfda6b5d32b869b97a0510c8a9f8c5828c410d99d67bba09f57a14115a6a7ed0d677b3a
 DIST nettle-3.4.1.tar.gz 1947053 BLAKE2B 354318c46c28aeaaca611abe70298024ec12ff70aed53c741e43c1b5373361e5cffb03df7b8e86ef103a3b7770b2b4fe39fbca00b128f2b7ec810b3a4d9fd0fd SHA512 26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f
 DIST nettle-3.5.1.tar.gz 1989593 BLAKE2B 40e527a4cc541674acc39072f2ebbab4b6ed1b043687d88c776ce9c58374538b111d282e0eea5424059260b0876c5cf01f97470c850e082c167b05a57e6c591a SHA512 f738121b9091cbe79435fb5d46b45cf6f10912320c233829356908127bab1cac6946ca56e022a832380c44f2c10f21d2feef64cb0f4f41e3da4a681dc0131784
-EBUILD nettle-3.4.1.ebuild 1765 BLAKE2B 02021587799cc2b5ccc35f1a829c4abccbee1449ad3abffec4772b8e25ad7021fc0ccd6a8c33dc9333873fd08e861a5336b48b1551e938fe1a136a69880e1077 SHA512 ca5bd2e0e4a8a698ca59a1f4d22f5b40b4aa73ddf19677e2348325e6307777e862233a68f6db83d2690be64660de4ffb41ddead1991b620ab0ec59b85fa117cb
-EBUILD nettle-3.5.1.ebuild 1672 BLAKE2B 00a3a2f2960334b88f8fb5c2e57b760d8a8b515d4c9b9527dfe738375050d8896f848738f62865e1d53c7bc755c43913743e7a569f17ba24e2d7b1d4e62b072b SHA512 b12b641ca7826ea6028aa79dd07ea9c7e481d1c1c438c9db0a548cdab7dbcf22ee5564e4a5443889b464d648df2e95b589463fcc8331fd1241215c41688f768b
+EBUILD nettle-3.4.1.ebuild 1792 BLAKE2B 5b861f64d91824bc3e4e6529b8b590fee0d60369db9e65b098bbdfab5d059552026d42fb0794ff827c60e2b5aad1e7f78176b5bc8a84f2d90e22f0923a911a38 SHA512 263df01a86b7dfac2bc7f02a2782acfa502c785923060bb252f184cc6a68e68eb600265dc72c0241cd66168168581e4b065a3db91f35e2d4c5e8621ae3a86027
+EBUILD nettle-3.5.1.ebuild 1699 BLAKE2B 7e15bb54acf48b15dba1fe06ccf58f02ac6aacab97623ed301c9bb15cb7485978da589c9a9fbb3c465e40d1d9d317ab6e99d7679edeba8724ab37f6f161c0579 SHA512 892f4a42faf586b7f171f05434aa90c9607ea4bb0057d72b7ba3a852093bb4d2ebd783822eea3cd5237e20eeb0d72f4ae1aa296ff7dc34cf51218e102585f290
 MISC metadata.xml 330 BLAKE2B 5133c1f98f3dadfef214d46f49e17ea1de8164d9dbe1d334fb2f8009bd40e302db7c1286a3a1cc184fd5240724a63410764addc3a2a4eb65964fcd22f2a7e082 SHA512 e872c0c186725e35f84b691049f8689d5bfcc24da81a2e29719509933f3a1019427b84da86c1dea634b6c05890663c712dd2d66b4513d72642c3037ec38e338d
diff --git a/dev-libs/nettle/nettle-3.4.1.ebuild b/dev-libs/nettle/nettle-3.4.1.ebuild
index 6d2e54b033cd..60f774b7801a 100644
--- a/dev-libs/nettle/nettle-3.4.1.ebuild
+++ b/dev-libs/nettle/nettle-3.4.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
+RESTRICT="!test? ( test )"
 
 DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[static-libs?,${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/nettle/nettle-3.5.1.ebuild b/dev-libs/nettle/nettle-3.5.1.ebuild
index 565e7dd9f5d9..9d9314d3edc2 100644
--- a/dev-libs/nettle/nettle-3.5.1.ebuild
+++ b/dev-libs/nettle/nettle-3.5.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/7" # subslot = libnettle soname version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes cpu_flags_x86_sha"
+RESTRICT="!test? ( test )"
 
 DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[static-libs?,${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 95cc1ea3e7b5..8183deb8ea47 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -1,8 +1,10 @@
 AUX newt-0.52.13-gold.patch 362 BLAKE2B 2f40cfe7e4b2b01b755c787d22d2006c2c55ca055c02f6ff2d807dc36fb15c15e67c2aa5d3ac4ae11288e710e6e0e4830dced12a0817e395fcc2331547228eb8 SHA512 6f3a68b75fae6693ddbb47b88f8ede4a6994daa4476b3ca472b3ec62db26e36785e3bb7fe7375a9e78ffd0761a4d82351f5d02c30f8ddd55fa5648257526e98f
 AUX newt-0.52.14-tcl.patch 3269 BLAKE2B dc542330cf49a43d63ca6e3edea141ae62664a701038c1086715b7de899f4b987c87069be8fd3a57f1f4c3fe8292d298876cf01f34e9d1f66f59ab7c08134d50 SHA512 6074f53b4070f4d8c7e1f4dfc4de7c549ac63a4af4bae70a3ebc3ebb03bd588923e8a952ffd93139041f5454318958a50a8ca8b0ecd98fb5d2ebde74b42aa313
 AUX newt-0.52.15-makefile.patch 403 BLAKE2B a7d85c4d99961894b21d051bb143059c6efbcd29fcf187de1e37344850d545ad98b974346483f2f1aadf1ab029d9d9a0fd64416e6892188cbd2bcfb60a64bc05 SHA512 146430581aa1811ac2f5aa03f6da6f193afda153eb3c3efd8576631f591f3671f05d9479182f593faedc79be17fc91852641259df93faa1231d3eda5e9dfd73d
+AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b3ce01c502bd1a6898c6c56e5ecedfcc5672ab619f52d3ad3828569996d11302bdc24cc484f3d65a85d27b5e8c564e12311 SHA512 3583b352d2e46e12f03a1d3b0fcaab606018765b1ae8855a7160bced34b36235a4ed0cd2b4cda1202e40680d6d8a7ad7a93aec0b46d2ee17a091509cf079c9b4
 DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f346fb7bf71de6fc5a59ee3d9d43bb4ad3bdfab7535d4d2eddeed62f72cea1861ac537f2bd7a62e7f76069c692 SHA512 0c10c373c6a5299a85fc38f32d3590fff3b26c4be40e6c85ed73c20724ef2fb094bf37a8c3b1b80a4bcdfc14fe59254d4419c391245c298a4e16788954b88236
 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
 EBUILD newt-0.52.20.ebuild 2012 BLAKE2B fdfa42cba47f46dfde39eff8f47083438b358fc9b37bfc7dffd72307418b8610ef7b00e981a5be495197706b6310e469612ed9c96415103c6deb3f7e06400344 SHA512 69b3ecdba8e9f64bf0aab827f4a63d60b599cc800f64050375c809026d8d3e40f32fbd878f8da713326b746e974a8d4a191c460ba5637c3ea96d371e767abf42
-EBUILD newt-0.52.21.ebuild 1979 BLAKE2B e32d200f5224f084d3961aa71c7193d75802fd335b3515b287217a54ecf0f469dc9701d376fae107394b93fb20b067960e076d979b7d75cbc52faf9310d72b4c SHA512 6a52360a46defb9388f928dc0f4ba7335eb803bb8f2e1e57feac415473ec7cf9d9e6f9acac9cf5214a2545f96d26cb6908aacbede50d653ecc004f619d0356dc
+EBUILD newt-0.52.21-r1.ebuild 2246 BLAKE2B 51502c4f84dbd7aee54fa55a96c1ebe615e6e18e053ef23267d5121bc40a4763fe595de39caf5a046cb1fe666a144b55916296c9aa4e6aff7a4031cad1e90bb9 SHA512 2f5c90bb90d4fe1711f04005101224c9ac8936097b86389b3e31bce4d3cae3570492b5e8cafd3c3a0c75baeaa42b294a23aef770cef6106b1a516e6c613d4389
+EBUILD newt-0.52.21.ebuild 1968 BLAKE2B f09fa26936070237a972abef0cf2da4752a9bda24d3918a23ea91f7fa43bd10950ee8acac48ce9ccc097fe0aed965ef82571a382ba49c4098b5816c808229533 SHA512 8bf8de94b631a99279042692b2efc08ef0e2f34dff4c242ad63f21cbc1e64b06e00c10b3d8cc5f17c3cc5a9cebf4e609834e5adf40c2b175db20e9a6582ab284
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/files/newt-0.52.21-python-sitedir.patch b/dev-libs/newt/files/newt-0.52.21-python-sitedir.patch
new file mode 100644
index 000000000000..6b535b683cd4
--- /dev/null
+++ b/dev-libs/newt/files/newt-0.52.21-python-sitedir.patch
@@ -0,0 +1,18 @@
+It is not specified whether the python sitedir is located within the native
+ABI's $libdir folder. This breaks Gentoo's py3.7 and 3.8 installations.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -154,9 +154,9 @@
+ 	ln -sf $(LIBNEWTSH) $(DESTDIR)/$(libdir)/$(LIBNEWTSONAME)
+ 	[ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.$(SOEXT) $(DESTDIR)/$(libdir) || :
+ 	[ -n "$(PYTHONVERS)" ] && for ver in $(PYTHONVERS) ; do \
+-	   [ -d $(DESTDIR)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(DESTDIR)/$(libdir)/$$ver/site-packages ;\
+-	   install -m 755 $$ver/_snack.$(SOEXT) $(DESTDIR)/$(libdir)/$$ver/site-packages ;\
+-	   install -m 644 snack.py $(DESTDIR)/$(libdir)/$$ver/site-packages ;\
++	   [ -d $(DESTDIR)/$(PYTHON_SITEDIR) ] || install -m 755 -d $(DESTDIR)/$(PYTHON_SITEDIR) ;\
++	   install -m 755 $$ver/_snack.$(SOEXT) $(DESTDIR)/$(PYTHON_SITEDIR) ;\
++	   install -m 644 snack.py $(DESTDIR)/$(PYTHON_SITEDIR) ;\
+ 	done || :
+ 
+ Makefile: configure.ac
diff --git a/dev-libs/newt/newt-0.52.21-r1.ebuild b/dev-libs/newt/newt-0.52.21-r1.ebuild
new file mode 100644
index 000000000000..a7c6a11c04da
--- /dev/null
+++ b/dev-libs/newt/newt-0.52.21-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+
+inherit autotools python-r1 toolchain-funcs
+
+DESCRIPTION="Redhat's Newt windowing toolkit development files"
+HOMEPAGE="https://pagure.io/newt"
+SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gpm nls tcl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/popt-1.6
+	=sys-libs/slang-2*
+	elibc_uclibc? ( sys-libs/ncurses:0= )
+	gpm? ( sys-libs/gpm )
+	tcl? ( >=dev-lang/tcl-8.5:0 )
+	"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# bug 73850
+	if use elibc_uclibc; then
+		sed -i -e 's:-lslang:-lslang -lncurses:g' Makefile.in || die
+	fi
+
+	sed -i Makefile.in \
+		-e 's|$(SHCFLAGS) -o|$(LDFLAGS) &|g' \
+		-e 's|-g -o|$(CFLAGS) $(LDFLAGS) -o|g' \
+		-e 's|-shared -o|$(CFLAGS) $(LDFLAGS) &|g' \
+		-e 's|instroot|DESTDIR|g' \
+		-e 's|	make |	$(MAKE) |g' \
+		-e "s|	ar |	$(tc-getAR) |g" \
+		|| die "sed Makefile.in"
+
+	if [[ -n ${LINGUAS} ]]; then
+		local lang langs
+		for lang in ${LINGUAS}; do
+			test -r po/${lang}.po && langs="${langs} ${lang}.po"
+		done
+		sed -i po/Makefile \
+			-e "/^CATALOGS = /cCATALOGS = ${langs}" \
+			|| die "sed po/Makefile"
+	fi
+
+	eapply \
+		"${FILESDIR}"/${PN}-0.52.13-gold.patch \
+		"${FILESDIR}"/${PN}-0.52.14-tcl.patch \
+		"${FILESDIR}"/${PN}-0.52.21-python-sitedir.patch
+	eapply_user
+	eautoreconf
+
+	# can't build out-of-source
+	python_copy_sources
+}
+
+src_configure() {
+	configuring() {
+		econf \
+			PYTHONVERS="${PYTHON}" \
+			$(use_with gpm gpm-support) \
+			$(use_with tcl) \
+			$(use_enable nls)
+	}
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	building() {
+		emake PYTHONVERS="${EPYTHON}"
+	}
+	python_foreach_impl run_in_build_dir building
+}
+
+src_install() {
+	installit() {
+		python_export PYTHON_SITEDIR
+		emake \
+			DESTDIR="${D}" \
+			PYTHONVERS="${EPYTHON}" \
+			install
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir installit
+	dodoc peanuts.py popcorn.py tutorial.sgml
+	doman whiptail.1
+	einstalldocs
+
+	# don't want static archives
+	rm "${ED}"/usr/$(get_libdir)/libnewt.a || die
+}
diff --git a/dev-libs/newt/newt-0.52.21.ebuild b/dev-libs/newt/newt-0.52.21.ebuild
index 34e47df4a1ab..15d258b1bf05 100644
--- a/dev-libs/newt/newt-0.52.21.ebuild
+++ b/dev-libs/newt/newt-0.52.21.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit python-r1 multilib autotools toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="https://releases.pagure.org/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="gpm nls tcl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/nmeap/Manifest b/dev-libs/nmeap/Manifest
index 7fe4503e7669..02d7cce12878 100644
--- a/dev-libs/nmeap/Manifest
+++ b/dev-libs/nmeap/Manifest
@@ -1,4 +1,4 @@
 AUX nmeap-0.3-fix-unitialized-variable.patch 275 BLAKE2B ad143d8be7c773eceb10413d2ac7c06474ac4a565da9afa09c6b2e3d2c16de8b9ac905a996420dfd5239a5eb3d060bfb2306241fff13805a05a1af5691f65e06 SHA512 cc8626e1b6e71c45550f9bb1de83c1f3aba41dbd05da904d29825179107bb79df88a19eb96955aa9f9a811cea25d46f58a0f6a94c534f8ed872b84ce01b01e59
 DIST nmeap-0.3.tar.gz 29380 BLAKE2B d4828a1a3d8a66ae529e40c034bf180da9657c2a3dec1ab09f32a9062430952a568612d2071acb887c6f1afdb19de82cb4b6d1788c6e9c2e1e859d9914209b3a SHA512 064a7fe27a192b4abe1393f8f343c8956bd9dd1d0de1441ca96597ab1f155001905b9b0b35d47b61e1f68891b820c602c024e4c74fb809719108711c5b1df815
 EBUILD nmeap-0.3-r1.ebuild 1217 BLAKE2B 52d29e1606fe38f1813d5fc0259e37c694767ba5f51754c2100e7a9c9fd2e7ca2c60a09a127af73e92d84c4e42abc3fb1527bafae972d7755331f40acabda739 SHA512 56a9bd6d0acf9d191678175af27b444e7b7872f03f815617723bfda649104c9c781c3b6f729d87971c3bdb8ec060d24f93d712bee4eedd7afc399ff8c7ccb735
-MISC metadata.xml 713 BLAKE2B dd782c425806e40afa0f98bc8d54b90fbcb47f830f79f6258418de215617ba86059a666354db7947dc91f114516a14652f236658f78baacee8c9f5b59e58a5b8 SHA512 994674b694ac64762ec12af6dd76c6ca1c3a9062bb3d0d35dbd1d8203385820dbdf792bb344dac7a021d2ebd29550de114021491c3da1d0287602550027b3a5f
+MISC metadata.xml 594 BLAKE2B e3a1979b0f92e21be1221c01098c1ff25462ce244ece52e675632cb812dd34ce02ef8f7241da70e1427fccaa920b212b47a03c4cbb99fc679f73795233152a07 SHA512 4f104de142ef75158b7bdd371aab0fd19c318c7d34d51cbaa030ace243cb609788f88d6e548f1659ba891d3d6827c2fe24611bc9a78a67d32315a245eac50f75
diff --git a/dev-libs/nmeap/metadata.xml b/dev-libs/nmeap/metadata.xml
index 8a6d20835c54..a585253a379b 100644
--- a/dev-libs/nmeap/metadata.xml
+++ b/dev-libs/nmeap/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Extensible NMEA-0183 (GPS) data parser in standard C.
 		A directly linkable library intended for applications
diff --git a/dev-libs/nsgenbind/Manifest b/dev-libs/nsgenbind/Manifest
index a369e59030c9..ae9fe5fd8916 100644
--- a/dev-libs/nsgenbind/Manifest
+++ b/dev-libs/nsgenbind/Manifest
@@ -1,3 +1,5 @@
 DIST nsgenbind-0.6-src.tar.gz 106862 BLAKE2B 9b40ae6298921736f7d876ae664207eb71102adbe44f4072ea46b08b63cb5cf608df4c96f3ade1c8cca964d8d8b32d68aad25431f6fd455eb8392d8313faa9e9 SHA512 3083b48e48fcf8c7f32b09d040998470d5917469e020c4ccbfb8ffdb7d1252fd27dd02f590f5a2485c6984cdbc005ea87adf0db45077aee0a91f68037c542ffb
+DIST nsgenbind-0.7-src.tar.gz 117110 BLAKE2B 9695a88f058aaf885853c1de62746d19219ad198508dadf8e6ffa602721c3eb4338a4d8f5a65b2c14434796f9f024e093e5a0975c745eb5462c81594bc70d92f SHA512 b96b10bc39b3db13f44802b0c70f0a8b197d4ee714a98f571ba4019bd9efb6460fb2cd6d22a7fd3c8a5cb25dcd85211122a45b02e17ee0f52bac1db0cf06b482
 EBUILD nsgenbind-0.6-r1.ebuild 689 BLAKE2B e2992845a2fe26aa5b2cee030abc4889cf487942153409d5887de62befcfb52478d5eb296e63e2f69a525ce337d4d887ca44a3c08ac769de9b63194433f4a70f SHA512 928673eca4f9fd02c5d75acdd12e783c4a73c0d203af02edd331617c8cf76dd6d676cead44d2d204afffb46e3d2ff53f8d9cc3c50146aac3dad9f2300067f243
+EBUILD nsgenbind-0.7.ebuild 689 BLAKE2B e2992845a2fe26aa5b2cee030abc4889cf487942153409d5887de62befcfb52478d5eb296e63e2f69a525ce337d4d887ca44a3c08ac769de9b63194433f4a70f SHA512 928673eca4f9fd02c5d75acdd12e783c4a73c0d203af02edd331617c8cf76dd6d676cead44d2d204afffb46e3d2ff53f8d9cc3c50146aac3dad9f2300067f243
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/nsgenbind/nsgenbind-0.7.ebuild b/dev-libs/nsgenbind/nsgenbind-0.7.ebuild
new file mode 100644
index 000000000000..e85a58a5c920
--- /dev/null
+++ b/dev-libs/nsgenbind/nsgenbind-0.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="generate javascript to dom bindings from w3c webidl files"
+HOMEPAGE="http://www.netsurf-browser.org/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+IUSE=""
+
+DEPEND="
+	dev-util/netsurf-buildsystem
+	virtual/yacc"
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=binary $@
+}
+
+src_compile() {
+	_emake
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install
+}
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 05048bf19403..85b4b3be6d38 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -8,8 +8,8 @@ AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
 DIST nspr-4.20.tar.gz 1140892 BLAKE2B 2cb96b7a40c307f904dac038f016b5c0e527aaf673463cbcb59d8bb6c9d0239219402587d624f48804e33f43abd4427c87f267bf1a88a0dacffcc408ac15dc49 SHA512 22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949
 DIST nspr-4.22.tar.gz 1078701 BLAKE2B 8b37031ffebf79320c91ce674d7c3a0cfbef25bfb006cb9aaff44f090110b35ea2768f83dae4a793723f8e2f3aecabc1a4b8042cd1b0ab0aade30781e43f9d62 SHA512 d34271f0692905162f71b02cf6f62a8ebf779159335e4ed286ee8d51faaad633a61c9392bada86d976bca2b5aa47c8760085de30dbd13c9cfa423582c31db37b
-DIST nspr-4.23.tar.gz 1078660 BLAKE2B 4599684e1bb80238e409472f41d0e9ba9bc731b48fb17578c99426b277bbfa9f3c8348570b58f679ad7fa94421a1c6b5972f9218e9d56fb5d1d49d45cf04363c SHA512 19f964f11a6ae8acf83a6daa0c9ee141c6f2793fd79113f3d283e9590bc2c90bfa4e46814f902f376f15c0668fa9c283cc44f975d88461d8854b87b67c0a21c1
+DIST nspr-4.24.tar.gz 1078825 BLAKE2B 3a773768c31334fa4f3f406d838d430dccfbcf5f7bd34dca422b199265f17fc08ef3d5d1e6df5468efeeeace8b5f8a38ece518e6bdbcdf811c2642d43be80c6c SHA512 b020031ed7a8997099c11e0772779c7b10d15b4f6b14e2b1832732943e8b8224afa952ce04a1914c1553af9d3973a6d9cacf08058ee6fff35102e3b2ec0943c1
 EBUILD nspr-4.20.ebuild 3770 BLAKE2B d27554e938728d5dda0bbd6da5223b994bb106b2bf9af1631c4f0f66cfee3eea384f4f665356bffd5b1cb87c82f475c9099e767235cce02c06408e5987b9cd09 SHA512 cc0067760312e923bad46dd322ea193decb62f8deb6d50519f3373e837d1c0aaf8cc75f28b8b0439f9f89566ebcba1c15837713535446abef7b583b7b2680af1
 EBUILD nspr-4.22.ebuild 3865 BLAKE2B 69207a7090aac468f09ac874cf1070e33fef8338ad3c7900373ca39f29845cb3f0fef1c197c3fb90ab78c7d1efcdd25edc5185a9ef84df82cf2414c96c9fd69c SHA512 9877374a313c217c8c17c17434ae243446be9ef1beb20c58683207135f2a18c1085f4bff0d8b8ce20bc57cd730825fcd97f59813b91dcc081c15277dcd839826
-EBUILD nspr-4.23.ebuild 3943 BLAKE2B 425caf054f7b308e6c9a6a9b911bd7f594959f566fc691dd821e8d6fbdf3e98a5a0689dd3fcf0772da6989e1ed69b615fd86ec394ac963ab7cd58002371ffa13 SHA512 c01b2d44c50bdf750daaaf53647b0423865c8e72f80ca6e5feba4cf77f81b288421d1fe54f34ead168ccbf3aa87da82d64d02a4e2db3a1ded31b10bf9bc56ce0
+EBUILD nspr-4.24.ebuild 3943 BLAKE2B 425caf054f7b308e6c9a6a9b911bd7f594959f566fc691dd821e8d6fbdf3e98a5a0689dd3fcf0772da6989e1ed69b615fd86ec394ac963ab7cd58002371ffa13 SHA512 c01b2d44c50bdf750daaaf53647b0423865c8e72f80ca6e5feba4cf77f81b288421d1fe54f34ead168ccbf3aa87da82d64d02a4e2db3a1ded31b10bf9bc56ce0
 MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23
diff --git a/dev-libs/nspr/nspr-4.23.ebuild b/dev-libs/nspr/nspr-4.24.ebuild
index 1f11ed37ec18..1f11ed37ec18 100644
--- a/dev-libs/nspr/nspr-4.23.ebuild
+++ b/dev-libs/nspr/nspr-4.24.ebuild
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 05c237da4841..acaba2be79d4 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -5,14 +5,10 @@ AUX nss-3.32-gentoo-fixups.patch 6443 BLAKE2B cfe0380832776b7e51f95f800e70436622
 AUX nss-3.36.7-fix-cms.patch 15889 BLAKE2B d58e656215e805461bc43ec10c95d8646fcddb93bc3a9870cc4c406af7de3ab2f5e474bbbcfa53cd8d405f96dfddc393e880c9528e156f87a7951bcb4b693e5b SHA512 930b032538eaf76ba354767790a75566b34e83334a1d382d3583bcc31c3cd721d46da8f268903bce2950bf73d705933c7a3887107cbf9bc5caa717b14eb7ce72
 AUX nss-3.47-enable-pem.patch 167 BLAKE2B 2b0b5e93ef43303008786280fe3b31d4ea5d92385134bf5574eef7a6fc3fb3e93b94b3a39857dd7ff5cb0f788af6b3c23a77164046b30a349666d0b050c715b2 SHA512 0fbcb0d2f0bce5fad6dadfe3d63288db98394384b901fbcabe98e86765bf029fac26eef96be5858113dd916fcf57595a3890904fe99573a652cfab4c13a112b7
 AUX nss-3.47-gentoo-fixups.patch 5365 BLAKE2B e439dbf10b560369fda15ce21ede20d243373f1d93e111af75ebec029816c2ddd1c41f209bfa9f86e9272ef3ec5116530a7653e774fc8a16906adf0c57d22daa SHA512 b9a984697f71cb263eb6955e20584689325f1eb99ca124494944194bb0a57f20184a4c11ea862edaf564930ecb2e0f2f9317245e1c782d88b598a5a0587cd66d
-DIST nss-3.40.1.tar.gz 23311074 BLAKE2B 9cd723e983a3f70748b0734bb2a6cc1ddfa280f1c167c3b1b371a58900fb3d9b3bf3482293bb8614d39ffb538bcca815a2aedbe03d2d643731817452f82bc2ca SHA512 464ae843161e8deb911975d2117e8bf1194a968689b4ce70f9a12d5a33dba7ddd69f1248ec45244139c30fcc87678b206a4e124f032b26ead8bf894e4e8d0564
-DIST nss-3.46.1.tar.gz 76417797 BLAKE2B c65679a7eb50991958858afe2a20824dd9ff4c0f554f3c1964ccec269c2da9de1fa674a6ebf24fd3c8465315e491a9b50188382d1032b0cfe74c289d49049926 SHA512 f4c24f0e31d11413cbbf791a24687c02cd934b9baf4a3e9ce27406638a1d497654fbeec79c22ab4ad29374dd0063c05104c9514580b1b8156ed8d18404e1681b
-DIST nss-3.46.tar.gz 76417155 BLAKE2B 18e22a60df185764f434779211289a78d05270d8493766100e378e2ecfdb3013feb73359088d53667fb3c57a5b29633c9f800d29739cff5aab2af81e7ddbe2d7 SHA512 de309ec8d6aa2c3cf4d5ebfe9fa1f8bf5def717d22018d5c88c1de963b4ae7b0d69ad64e68d830574fc85613483fd538cb2f319ffb3fa2e1b97ec02f85d37c48
-DIST nss-3.47.tar.gz 76461837 BLAKE2B 8b11b5330cf134f2f94c2b4a07d52e153ff40006770e31cbba379ff623b822778bd8ae4510493912263299bbb8f6e0706f30d59633256a3141cbd8faedd1f257 SHA512 99d04d28c38092826f5aab125662780865de49a97743ff0ab49a191bafae3ba3a937369cd6909ab23e7dcaf06482c8852b31ef057dc12c758f2681e03822e247
+DIST nss-3.47.1.tar.gz 76462846 BLAKE2B a26e858e06c494adb4059f8cc73993b0f3cff90a0785ed7eed3760931aa6b4ae5706cf7994c6c1421d9ed8bc36d1a4c199988bd9c59c06bb95fd03521c20f141 SHA512 ddee53f58929e5f3849c9f88a3a6735453a258c3c32a7e3e73cc949e0b7ad2dff81b21db31c9c5e1ef3eb79d63c31660e38ce76c06ca54a5681dd611dc2e2ae9
+DIST nss-3.48.tar.gz 76481237 BLAKE2B aded12d9f917d87e6fe32bc6c57b19e478507919c7d87b3f95e86ba10717d30da25632e60753b5cf7a24fbfef8fab6529ae373eea25d633d8164164bac97357c SHA512 71aefe323501dd8d750ed36606554f2e67ecb2bca85b55bc798d5dfc3a47f3d454348ca950971aaaafb16f6d847c098d2b1c40d40b50380e0c2540ed1b9a9e9a
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
-EBUILD nss-3.40.1-r1.ebuild 9479 BLAKE2B e4f33cbe94edef476eafe96a25eb1a1000ff89a57f3854a7496c3dbec5c0f525d68a86db95d46265ab34743f244d1dd6c1b8cfc012f267d62221ed85bbdea42c SHA512 52e48ae06d22044a2321a40b8f73aac3056952c12f1221d988ad9bc72e0313fc9f891f8db51aa27eed6453414c5b67efa32b3c3dafa0920de209401bcb024388
-EBUILD nss-3.46.1.ebuild 9466 BLAKE2B 99b1726c838605322c530734cdcf3c5e15475df1a580c9eac8b6124a5e2670aa0ef31fb43442f5d7373ae756b19d342086086d13d10590a68df3d1f0de0ab94a SHA512 5142bbe118d58dcd8f394bb98d152bf9c0545b908f17a5e536daf6721d68229ef87dffed18abcd967cb5cf51a7d4d60f58ccfcf2147e70ee2ac3806e0ae071ee
-EBUILD nss-3.46.ebuild 9456 BLAKE2B 93216fbe0317bdd50bd4a3ff6606c1144363342c67215c0d28af4030d8a44dbb0f5654ba4280e901376c4cc2148492117b30bdb78fb4d6b72c6cdc564f3787e8 SHA512 9cd8a8dc99bf10caab8b4f93694c56e6d89d0e9965c1431d7ef0dc9bc06ee804d345a351e31e192eec8f3dd2ca44e0c96ae53af03b430874e8ca9b788991f08e
-EBUILD nss-3.47.ebuild 9466 BLAKE2B 466ff346c4ba7e6c320840f0b45bc85546853ba9f3fca49e6caa5c3da28e803c37926e5abe9005942e1c7a32c1b08c38f75c02a7ba585e3f8da26babaffe0ade SHA512 99d63942d0bb4207eba15fd7778f3773b6aed6b16fef3ecc381b76b1c46712107c1d208408eea9ff0fb803651b2390004f85b0ecc0483ce346ffd0d74c684c8e
+EBUILD nss-3.47.1-r1.ebuild 9421 BLAKE2B c68d6f35beafa76d0a661d05d3f2588f42749d8ebd66611330763a1e3d6877dc7ddef88177cd6449c1dc7317ff37f1b5ab4c085eda7c5ba79f655998c5bef78b SHA512 3f501ecda5ee130a4f26eee0dee1c00e951892e9bf20b09908e1684d823eb47d8779957afd2bea6deaf5f75c8c6a3aaa0638c4786edd883179a6e3c35edbfc8b
+EBUILD nss-3.48-r1.ebuild 9432 BLAKE2B 1fce14bbf780d6c44a7cb2a0b6e9a144096a76f41f975d5562a166c69d30cda9d4f15a2f1e8e85533faa4b511186670138e63356b93ef34fc13df7ac58955534 SHA512 32a79a4bb10a5b60ff8fbedb541e72ac248b0b5cdbcb98b6a7371b984420e735838ac86495e058c937a593870b0f49053033dc999d1ac3879504433ed5885b64
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/nss-3.40.1-r1.ebuild b/dev-libs/nss/nss-3.40.1-r1.ebuild
deleted file mode 100644
index cf653745a3c8..000000000000
--- a/dev-libs/nss/nss-3.40.1-r1.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.16"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
-PEM_P="${PN}-pem-20160329"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
-	nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-	# fix for bugs ported forward from 3.36.7
-	"${FILESDIR}/${PN}-3.36.7-fix-cms.patch"
-)
-
-src_unpack() {
-	unpack ${A}
-	if use nss-pem ; then
-		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
-	fi
-}
-
-src_prepare() {
-	if use nss-pem ; then
-		PATCHES+=(
-			"${FILESDIR}/${PN}-3.21-enable-pem.patch"
-		)
-	fi
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	# Do not let `uname` be used.
-	if use kernel_linux ; then
-		makeargs+=(
-			OS_TARGET=Linux
-			OS_RELEASE=2.6
-			OS_TEST="$(nssarch)"
-		)
-	fi
-
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
-	export FREEBL_NO_DEPEND=1
-	export ASFLAGS=""
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits:-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d}
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED%/}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED%/}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.46.1.ebuild b/dev-libs/nss/nss-3.46.1.ebuild
deleted file mode 100644
index f99ef74485f3..000000000000
--- a/dev-libs/nss/nss-3.46.1.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.22"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
-PEM_P="${PN}-pem-20160329"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
-	nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-src_unpack() {
-	unpack ${A}
-	if use nss-pem ; then
-		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
-	fi
-}
-
-src_prepare() {
-	if use nss-pem ; then
-		PATCHES+=(
-			"${FILESDIR}/${PN}-3.21-enable-pem.patch"
-		)
-	fi
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	# Do not let `uname` be used.
-	if use kernel_linux ; then
-		makeargs+=(
-			OS_TARGET=Linux
-			OS_RELEASE=2.6
-			OS_TEST="$(nssarch)"
-		)
-	fi
-
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export ASFLAGS=""
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits:-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d}
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED%/}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED%/}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.46.ebuild b/dev-libs/nss/nss-3.47.1-r1.ebuild
index 1385aed733c4..deb76ced6d58 100644
--- a/dev-libs/nss/nss-3.46.ebuild
+++ b/dev-libs/nss/nss-3.47.1-r1.ebuild
@@ -19,16 +19,17 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+BDEPEND="
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+RDEPEND="
 	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 "
+DEPEND="${RDEPEND}"
 
 RESTRICT="test"
 
@@ -40,7 +41,7 @@ MULTILIB_CHOST_TOOLS=(
 
 PATCHES=(
 	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.47-gentoo-fixups.patch"
 	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
 	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
 )
@@ -55,7 +56,7 @@ src_unpack() {
 src_prepare() {
 	if use nss-pem ; then
 		PATCHES+=(
-			"${FILESDIR}/${PN}-3.21-enable-pem.patch"
+			"${FILESDIR}/${PN}-3.47-enable-pem.patch"
 		)
 	fi
 	if use cacert ; then #521462
@@ -174,6 +175,7 @@ multilib_src_compile() {
 		)
 	fi
 
+	export NSS_ALLOW_SSLKEYLOGFILE=1
 	export NSS_ENABLE_WERROR=0 #567158
 	export BUILD_OPT=1
 	export NSS_USE_SYSTEM_SQLITE=1
@@ -255,23 +257,23 @@ multilib_src_install() {
 	pushd dist >/dev/null || die
 
 	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
 	local i
 	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
 	done
 
 	# Install nss-config and pkgconfig file
 	dodir /usr/bin
-	cp -L */bin/nss-config "${ED%/}"/usr/bin || die
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
 	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
 
 	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
 	# bug 517266
 	sed 	-e 's#Libs:#Libs: -lfreebl#' \
 		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
 		|| die "could not create nss-softokn.pc"
 
 	# all the include files
@@ -346,7 +348,7 @@ multilib_src_install() {
 	# shlibsign after prelink.
 	dodir /etc/prelink.conf.d
 	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED%/}"/etc/prelink.conf.d/nss.conf
+		> "${ED}"/etc/prelink.conf.d/nss.conf
 }
 
 pkg_postinst() {
diff --git a/dev-libs/nss/nss-3.47.ebuild b/dev-libs/nss/nss-3.48-r1.ebuild
index 3c41aeeeb56c..124eca85b0b4 100644
--- a/dev-libs/nss/nss-3.47.ebuild
+++ b/dev-libs/nss/nss-3.48-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
 
-NSPR_VER="4.22"
+NSPR_VER="4.24"
 RTM_NAME="NSS_${PV//./_}_RTM"
 # Rev of https://git.fedorahosted.org/cgit/nss-pem.git
 PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
@@ -21,14 +21,15 @@ LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+BDEPEND="
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+RDEPEND="
 	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 "
+DEPEND="${RDEPEND}"
 
 RESTRICT="test"
 
@@ -174,6 +175,7 @@ multilib_src_compile() {
 		)
 	fi
 
+	export NSS_ALLOW_SSLKEYLOGFILE=1
 	export NSS_ENABLE_WERROR=0 #567158
 	export BUILD_OPT=1
 	export NSS_USE_SYSTEM_SQLITE=1
@@ -255,23 +257,23 @@ multilib_src_install() {
 	pushd dist >/dev/null || die
 
 	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
 	local i
 	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
 	done
 
 	# Install nss-config and pkgconfig file
 	dodir /usr/bin
-	cp -L */bin/nss-config "${ED%/}"/usr/bin || die
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
 	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
 
 	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
 	# bug 517266
 	sed 	-e 's#Libs:#Libs: -lfreebl#' \
 		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
 		|| die "could not create nss-softokn.pc"
 
 	# all the include files
@@ -346,7 +348,7 @@ multilib_src_install() {
 	# shlibsign after prelink.
 	dodir /etc/prelink.conf.d
 	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED%/}"/etc/prelink.conf.d/nss.conf
+		> "${ED}"/etc/prelink.conf.d/nss.conf
 }
 
 pkg_postinst() {
diff --git a/dev-libs/nsync/Manifest b/dev-libs/nsync/Manifest
index 742b2bb90e17..eb69cc9dc8ab 100644
--- a/dev-libs/nsync/Manifest
+++ b/dev-libs/nsync/Manifest
@@ -1,3 +1,3 @@
 DIST nsync-1.20.1.tar.gz 154106 BLAKE2B 94eeb647de2ca58a3f3837119ef30805f0a72a9d12c19aa705f815955723ddefa1de4d2a3fe5fd0b227ffdd70d5208ab9a300e40b2aff2591a1cef28c79b450a SHA512 d7b9be1052b7d11d896d3fade822f7b1eebbd0a772c9f6e2cd827921f1adc29ed18f7587ebc7d29623d230be384a7a2356c1da3abd53567fc934979d89c70e0c
-EBUILD nsync-1.20.1.ebuild 573 BLAKE2B 9eb352d16dc6532682346b492cda68225b53f7ed92227bc62db477a4bd1b6efb48d0f26335bd77e365b70f91cb2cfe7308203a5f965fefde08b717d605eae09f SHA512 252e9e8a0820d873945374c1d36e8df1bccc1a21ffdf46fe62105a17783fc5beb35782c5e990799e9b9208d7de4b952d25b07d33e21c0c8fb1553b4ad0948a87
+EBUILD nsync-1.20.1.ebuild 600 BLAKE2B cac757b2f36d018dd2a8e7f5c1d5273fb7dc3d30412dab74ffe3d606a036fe223577edb67cb3e08ec837bcca18ececd89cf62ba87557b34e9f625ccf8021e8c7 SHA512 f4b204b322b4d45a915608c17c00221ca122b48e360dbb8703d74ff3f5a5b1b524d00fac58b90d93b775caa80d0d6ba563dce4ca393486183711967d1e4f4f96
 MISC metadata.xml 384 BLAKE2B 62c11261ccb01d4913cd84ed44abed5a2ae13d362c755db7102cb412ff9c4b55c4dec5e9a5b71ac970cd83e676d2a806d20d9b5cd7f63e1051b898927b064bd2 SHA512 83954282b0ca2a61a49222fef2e018057b7d02c4d68bd826a81a96bfcb4371e60c8c90a4c792607b337885154fcad49db872351c3ec27266631bb955ede097cf
diff --git a/dev-libs/nsync/nsync-1.20.1.ebuild b/dev-libs/nsync/nsync-1.20.1.ebuild
index cd34bebab49d..c30d1d46e540 100644
--- a/dev-libs/nsync/nsync-1.20.1.ebuild
+++ b/dev-libs/nsync/nsync-1.20.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DOCS=( README )
 
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index 41f22213b52e..a213c0006248 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -4,7 +4,7 @@ AUX ntl-9.6.4-sanitize-makefile.patch 4049 BLAKE2B a5ed15742628e3880ae4804672d19
 DIST ntl-10.5.0.tar.gz 1278729 BLAKE2B a061ac4e0989ea671c51a22904851e5b7919f3a7e55624048c576d6f48d2ba3d6f88baa6c656c9ef43ad2145a03df9d891372f8462a1c5b6b53bc1d05301d9f6 SHA512 b299dfc29005079470972c2a9ca02acd0ebdbc31ff8923df02f3627dbc66daa0f527226972cef032e1e488c4272554634a96456e94653fdf8b01356160319aa0
 DIST ntl-9.3.0.tar.gz 888710 BLAKE2B 153a6f1bd11f27ef2944e4df5e941c4ddbb1783449e2a72aa1a272fcf169997b01646cfac63ac3af5a85a7f9a4db99a664503615d323ba54784849e764316b0c SHA512 dfb4ac7a66aaddcf5d0d0c9fcaff253b0196a9d9f727788127dd18e131528fe60dedf8bfb864503225fc5796987aec9c7019b74e0fc12cd12c20aa33a9cf9d7d
 DIST ntl-9.6.4.tar.gz 915256 BLAKE2B 78d8415bb1fe858881f997383ca9adcc8af2499251fc1b2e8e2211a8c7b8edc249ef28f3705e302d438c19cc07bd31d8b36681cb6b5a846d4f0b35ff09d310ff SHA512 ec8a4deb6996b31140edff978e07844ea8e30327491a6777d3982bffec01599b0cb5cc5dca297c8610ecb7ac9a4eae3407a59736fed840a2415a52a159370868
-EBUILD ntl-10.5.0.ebuild 1445 BLAKE2B 522b14c8b09cdd96ad0a9a9ae7440df24d19484c25b434cdbdd70d65e95459dbb9182c2258afcccbcc454625e1700276bdb389367951cc58b196b7b633de5906 SHA512 03d0f3b39d728b86c372d95d55d36dc3bf7c2c7f4a21f856d9dfb1f5162fd42f232465b737c47b9cf3c7f3d4903f5c893a226063449e07b977d55b1202c0b3ba
-EBUILD ntl-9.3.0.ebuild 1778 BLAKE2B a11c61d452ae6643df2c3081baa389d92be3256eea634a4e0fdc50a4d1f3cef3843dfa12e780851e90b66756fce174edcf08a92ecf5bce6c98c0738106ee5e59 SHA512 4f7d415cdf3e94655983fe1795af856ef01a0f953a7b9b8eae9d10be0b691d0b49036cebf45afcad8e4ae097681912af6728e7e455ba0d306fd0a5c323515022
-EBUILD ntl-9.6.4.ebuild 1706 BLAKE2B 104e8b1887568681ee7cc67b17b18078fdcc5d05b266e5de2213a135df730f42ba9085ddd2ae5e2d6b8c3daf3bf8841fb698a0d13a48ae7c7c666333a220a93a SHA512 1aa1887d2665aaf3294b87404febbf941118be291a5111a92bbfce88ca163683661b396db358d2cacfed7ec63a72090ff96cc59b5723edd8bc56b1441fc0c857
+EBUILD ntl-10.5.0.ebuild 1469 BLAKE2B b569fe1bbeece4c4de5468b719d61ecee7f8a81e6d85408ff55dc9c40f793c5c20380d264f004a5e8047d6f16ebd0654999756acfdf6f3b43665c5faeb60035b SHA512 f6ab5ea38db80c2d5bd149519c617bb3717b524a8d23dda5ae13664cf441bd83ef6faca021ab40dbab65046568866877665ce70f72bc7e560379227dbcf1fcdd
+EBUILD ntl-9.3.0.ebuild 1802 BLAKE2B 32198f507fef9c63bf04ab635d864064bfb6b3546ac24b0473cb0a26477e2a067a699037bd1383d1a8c365a8240679a5fe66d447a1b642b476da746994ff69c8 SHA512 b42a5db2046c7479cd9d70ab34d86bf4e46586bfe89eb54b817c3afa582f0ab7686498901be5772379c896a67bede573d7f403578a55954915c3d2a079f3bc61
+EBUILD ntl-9.6.4.ebuild 1730 BLAKE2B 92cbfb4ee75e6fcb06ef6ae9917ad7626857f2d1f6a14e96266b2587e7a74b216ead29c70503fc8208184b56441f3935d8d658c1b4bba6d1050d3262dac0301d SHA512 ebab0acab8dc7e7c6fd57a87ed4bc58f613d617e6ea9ee02d83be15f68cf07dcdb0d4c6da2f620c359d1cb5a693b03548d150fcead468cf0958d711b19a13c6d
 MISC metadata.xml 552 BLAKE2B 86ae637ba8e3735d4bc3fa5c31d044a0fad0cf62706e73b232af2ffafa8bd90c90d07e672cabe4a14a555fa314bd8d82f4a533f07ac08adfa6144296d42f320e SHA512 001c3010e5ac7e00b79a6415c91313b90afc64be532b71bbb909a88deb956f3c9aa053f1affbba42eab7c1ffd0de5948076ad7fcbe290865d22988a207ecd25e
diff --git a/dev-libs/ntl/ntl-10.5.0.ebuild b/dev-libs/ntl/ntl-10.5.0.ebuild
index 00821f04ef33..ebd6e909e886 100644
--- a/dev-libs/ntl/ntl-10.5.0.ebuild
+++ b/dev-libs/ntl/ntl-10.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0/35"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test threads bindist"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/gmp:0=
 	>=dev-libs/gf2x-0.9"
diff --git a/dev-libs/ntl/ntl-9.3.0.ebuild b/dev-libs/ntl/ntl-9.3.0.ebuild
index 29ace84f8f4a..50bb3ea10db7 100644
--- a/dev-libs/ntl/ntl-9.3.0.ebuild
+++ b/dev-libs/ntl/ntl-9.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/gmp:=
 	>=dev-libs/gf2x-0.9"
diff --git a/dev-libs/ntl/ntl-9.6.4.ebuild b/dev-libs/ntl/ntl-9.6.4.ebuild
index 40c071f7ddbc..971d4e14c572 100644
--- a/dev-libs/ntl/ntl-9.6.4.ebuild
+++ b/dev-libs/ntl/ntl-9.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/gmp:0=
 	>=dev-libs/gf2x-0.9"
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 62cc75bf962b..53ae41379ec5 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,5 +1,8 @@
 AUX oniguruma-6.9.3-fix-heap-buffer-overflow-php78559.patch 454 BLAKE2B 8ec384d21dd283cabd7b3a567bacc2375c489a78f71ccf4373a88b707c31bee0ca2f83c538e1d760e52314c6ecb168c2cf80a5049eb96d993ec08bb38136f641 SHA512 2fd3df7ad7c7bd75967250ec89153c0c6c6859f2833419e134c5aa6463cfd26bb9e7e2a1121cf59973bd6b3451476743b1fba79dbf61cb5cf45040ea13d67311
 AUX oniguruma-6.9.3-fix-heap-buffer-overflow-php78633.patch 777 BLAKE2B 06d47037678d7e6bf757f879e319545a434d9301ab31045132ca3ae112e8f86f2797c544533b031536d40646859a4a3bc5d66abafb963b931b32b2b3aa8ccbf9 SHA512 03ea9386547b7f7c19d1067b0ec4dede30c3656d2403ac60338d6aa3bf1ceca1a80eb19a08fa83bbc4766ffc63c4871bd91c37731b259f2395839e724f3314bf
 DIST onig-6.9.3.tar.gz 902349 BLAKE2B 4b20290a2d72b638b13a2e2edc89e072a8d17f89f6a273b58d0e408d01726ace948dd390bb2f4c478b87d01bed9fa344a4933060736a40981219301529957aaa SHA512 6b038879cb9cbe8cc756159eb53125e1d4dc7365ca434d07b99a59f3602987e573da120506bbd88d0f51dcdde5866bfa48d45803f8869503726c4d9a47d62861
+DIST onig-6.9.4.tar.gz 908702 BLAKE2B e6e9939f284569408ba01b8551960bc939bbfdca425f8470499f5bb83ead7b6b09898f6f6a09d5d8c26d74d5416f6e5e9e2f00fbe7aa9eb820edb8aa4a3050cc SHA512 ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b
 EBUILD oniguruma-6.9.3-r2.ebuild 1112 BLAKE2B fde34ed55491542010421c2b6510edb7ae7d00d88234202cc527de6ce8b73926d979a049577215f63975a7c02da48bea7fb832ba8d5821a9f23664ab21374c13 SHA512 ec78dc10570e912890d4cd08efa9adbf1e4a1586a005930d536faa71db67adad17621770c073c925594d70b6bc7b0e2c9a4435ea0b224b62d581fdde961bf193
+EBUILD oniguruma-6.9.4.ebuild 1510 BLAKE2B 434495ce5b418821952baedfd610c70ba79375547284c636b9f1f0150f5838ba39675ddc0e16b3a528999bfbc9761dabe83707a8380a67fb1c6af766296cc0ba SHA512 2a593008b0e0798ad8d590f706816940e975b1b4aa62b9b05412a802820c12e0e6c0b4e5a7dab9084c108221c436c6e8f0017ee015764d4349de2d5833996677
+EBUILD oniguruma-9999.ebuild 1103 BLAKE2B 82646a83124feadc0ff37f9cec6f9664ca188814596bd2c4b739abf7055a133be7025710fcc195b4940d9637a552f75516f84a4054fe058b2af0bbaca982dd00 SHA512 65e62e9721012a8c8f582f90680246bbaa9050767a085ff0a87c809f818f2f5e7f501ae6e48a19129feb9279b884ce5bbebe9d9f691229ae8c655f66a9d908b0
 MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
diff --git a/dev-libs/oniguruma/oniguruma-6.9.4.ebuild b/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
new file mode 100644
index 000000000000..68920df164bb
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-6.9.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2003-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit autotools git-r3
+
+	EGIT_REPO_URI="https://github.com/kkos/oniguruma"
+fi
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0/5"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="crnl-as-line-terminator static-libs"
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/onig-${PV}"
+fi
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
+
+src_prepare() {
+	# https://github.com/kkos/oniguruma/issues/167
+	# https://github.com/kkos/oniguruma/commit/603f4db48efb49307b7515500496e9e7a92fb779
+	sed -e "/^#define MATCH_AT_ERROR_RETURN(err_code)/s/best_len = err_code; goto match_at_end/do {&;} while(0)/" -i src/regexec.c || die
+
+	default
+
+	if [[ "${PV}" == "9999" ]]; then
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name "*.la" -type f -delete || die
+}
diff --git a/dev-libs/oniguruma/oniguruma-9999.ebuild b/dev-libs/oniguruma/oniguruma-9999.ebuild
new file mode 100644
index 000000000000..8efae9394402
--- /dev/null
+++ b/dev-libs/oniguruma/oniguruma-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2003-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit autotools git-r3
+
+	EGIT_REPO_URI="https://github.com/kkos/oniguruma"
+fi
+
+DESCRIPTION="Regular expression library for different character encodings"
+HOMEPAGE="https://github.com/kkos/oniguruma"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/onig-${PV}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0/5"
+KEYWORDS=""
+IUSE="crnl-as-line-terminator static-libs"
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/onig-${PV}"
+fi
+
+DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == "9999" ]]; then
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable crnl-as-line-terminator) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name "*.la" -type f -delete || die
+}
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index d988bf294067..209534e10c7a 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,4 +1,4 @@
 AUX opensc-0.19.0-p11test_common.h.patch 2969 BLAKE2B dd5e309fdaa847da43fa811f3cb8219930b0314aceb52a2e317984172fa432ba2032f8ef2c2c71780a2c3d442a353163987f81f743c43f45603040f446e998d8 SHA512 d1959887631ddc60e7df445d12641d366749cb09002c1d3e37dbcb606c61bbdb0fb335b8d4b433110bd8e37f8116cb7a6a87226c6504a9e0f735be67775352b0
 DIST opensc-0.19.0.tar.gz 2080320 BLAKE2B c07df317f26562107680ed586e9a1ea83252c10a7dd227cffe51de709d9c888874963f6835a68f83f212d83f264b0231ea7428ed8d3ecce74cb9265d8191040a SHA512 90659133fb593cbf82ed6502e3858f34119bff051e3090489b7622659dcb1c26d389a4715892aa60a5606bc0ce115bd6c504521abfb965de9ad46441e4ed2b8e
-EBUILD opensc-0.19.0-r2.ebuild 1650 BLAKE2B fef733e027e8d7e7d57830bc42797680558f55f64ddc97c7501cc16ca571db5f65c35c0fb224f3659963eb8151ce85d6b2078e1dcfeb2916206ed4998ffb7935 SHA512 acfc69f72ddf2e9f9a95e97e133a406df5f05d21520184334c5fcd68f4b32d97eda49d1295061ee2cbe6b1d6c543f714a6eb76924c043b8b69e42e576b6ce2f6
+EBUILD opensc-0.19.0-r2.ebuild 1677 BLAKE2B 979c4377b0c7ad3e53315b39200a35d52b3dab90f1e5ee399103730f142110b3958904042147cf07825bd45c2b8b94d51a9ef92d14608b30585f9c5217f8472e SHA512 606d3341d01f6c471cc4e8f979ec5a9811ee245ff8996bfbab96925ddf857bfbcd69de9eec91968503307ac75557b28f1dccfa067ee74b6f39ce5b79b84426aa
 MISC metadata.xml 1214 BLAKE2B 5d2a0bb352a11969d1f959c4d19171f3f274461f4dedc2558bb89d8ad114dc3796a49e04a35773340de2b321f4be86ea389f1b9733126785d0991771b254a891 SHA512 f37c2a234cfaa304bb41e17147e6970960fd909da2ab2bd924b61be20175d0b6351be98551451c95dcf8e5a77edd4c8c546d93b2bd04012ae667fbddb372e33e
diff --git a/dev-libs/opensc/opensc-0.19.0-r2.ebuild b/dev-libs/opensc/opensc-0.19.0-r2.ebuild
index d3734d86e9f9..38f37ba9dd9a 100644
--- a/dev-libs/opensc/opensc-0.19.0-r2.ebuild
+++ b/dev-libs/opensc/opensc-0.19.0-r2.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
+RESTRICT="!test? ( test )"
 
 RDEPEND="zlib? ( sys-libs/zlib )
 	readline? ( sys-libs/readline:0= )
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index b0dd52106175..bcab3e705f22 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -4,11 +4,10 @@ AUX openssl-0.9.8e-bsd-sparc64.patch 1484 BLAKE2B 6cfba6ee4fa849e6d7799fbe749abf
 AUX openssl-0.9.8h-ldflags.patch 1151 BLAKE2B b215e46c380e571f153445f902803cf5d03d44f6f8b95a677c08bdf542e6d199c58f1f4699eb7dbd9de8bdc02b697a7971a9a06157d96c3dbd4295090a778723 SHA512 7f98c5ad310710aeceefd6fac440682bf2baaf41ce17de535add54af88c45fa0689e6e6c26bafb4fe2290fd3b6d80c51d85ffda1e276a73a3d66a319585aab11
 AUX openssl-0.9.8m-binutils.patch 684 BLAKE2B 35650e98595910d2e6b6fc846b49fecbb2a8e4a8b647bbec009a829ae4af8afdc7e7edac7a1eec8f13af1ad69b7036ca6af28bfd9509e6bba58f2b3906d6bdd5 SHA512 5e8a20111bd4809e7375c7323dab2c2edd6a131d1ec2377ee99c5e06ceb7b4b000e9606ba6d0e68cd67d8e001cc8194e11e301eace0feb066d5f3c5b331b5f04
 AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162a8b931e455f35f9e045372102d1461e3e3fd4cf4e4f544ec06a0b46a573d2009c8decf22678df03707c2487bade64f27b5 SHA512 b8e745ff90e447b000ace9cfd5f746c1bc8f3bb8249064d1d2f1072a1a628f5a89c405c7f384c73f0310f2a2f7af672950a9b7adbc583b1ee94b41d911b8a708
-AUX openssl-1.0.2p-hobble-ecc.patch 10875 BLAKE2B fc8240a074f8cc354c5ae584b76b3fc895170e026767d2d99d8bd5e5028614c861dd2b3c7b955c223883062f9a057ee302ae0deecfbbed00ddc53ae8a4d50919 SHA512 29f64bacac4f61071db6caf9d92131633d2dff56d899171888cc4c8432790930ff0912cea90ad03ca59b13ca0357f812d2f0a3f42567e2bd72c260f49b2b59aa
 DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2t.tar.gz 5355422 BLAKE2B dcbc883151ff6c5b60f5849d8789c2e76a384cb3d5eb5f08a6109776d0edf134580dc33fa8b946ae2344542560f04ecef17f218406952dd8d31e4200c4882022 SHA512 0b88868933f42fab87e8b22449435a1091cc6e75f986aad6c173e01ad123161fcae8c226759073701bc65c9f2f0b6ce6a63a61203008ed873cfb6e484f32bc71
-EBUILD openssl-compat-0.9.8z_p8-r1.ebuild 4959 BLAKE2B 0b188cd8b933cf5edbe4a35737a104a94cdb1dd79e39401d5561226394b90105b9ade4bd26026076d10d7cc64483586fc2920ec721b56fb0af643a8b718a9023 SHA512 4f87a3d45f94b399471664d2e2ece94b0fd15c4c83d8cd161b8e929f0a904d43725e4594a8d3628518e111bd95f6cd05183b20230f865a7350620af3a5395b8c
+EBUILD openssl-compat-0.9.8z_p8-r1.ebuild 4965 BLAKE2B 30513357640938bdc57ce4ee1325989e9d712fc58428aef000aa260c664996fc9229c8c090d192fd86d90341933fc96d840d0b30917c7ae650fdd4be0ae66ca9 SHA512 01c486f72f8ef9d41849066d25b7b7662745767330ef1a57908a0398ab67641f02a719ae162741493072c8f744d242ea039bae6e56e35c7cd707f0ee72b90da5
 EBUILD openssl-compat-1.0.2t-r1.ebuild 7585 BLAKE2B 8e9b712a582e98f2f1bd03d503cb7c9d1b9658c5a2d4112c0c5ffb41838e77f94dc51d3cdc752b843eb09d0572f7d28c356fb7d17d3faf4c3702a455acbd4d00 SHA512 34058ec84602f4556a1a944eb59b87a2994de73c5c35b915c4923db38e9d1b9bb040f1c4a25e05bc7b271395da699a6dce8d081e0fccd97f8e6319b70ac07369
 MISC metadata.xml 967 BLAKE2B ed2fb20c832fbd18b7834f35e21072d419e8da5d88c165b7113a3835af1408f10e8c649dd2ccdffac35b6ed297320c18c0ae76b7a124fd3db6ab1a316f11c31c SHA512 12392dd6d10877fd78b8f54d6c51a5b5d50db3690fff0084112389a1ff3d28a0a37ec09262e4e817337eb04133877de8aa06f341bf9c96e73cb36c31e77f9e0f
diff --git a/dev-libs/openssl-compat/files/openssl-1.0.2p-hobble-ecc.patch b/dev-libs/openssl-compat/files/openssl-1.0.2p-hobble-ecc.patch
deleted file mode 100644
index 3a458a783603..000000000000
--- a/dev-libs/openssl-compat/files/openssl-1.0.2p-hobble-ecc.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-Port of Fedora's Hobble-EC patches for OpenSSL 1.0 series.
-
-From https://src.fedoraproject.org/git/rpms/openssl.git
-
-Contains parts of the following patches, rediffed. The patches are on various
-different branches.
-f23 openssl-1.0.2c-ecc-suiteb.patch
-f23 openssl-1.0.2a-fips-ec.patch
-f28 openssl-1.1.0-ec-curves.patch
-
-Signed-off-By: Robin H. Johnson <robbat2@gentoo.org>
-
---- a/apps/speed.c
-+++ b/apps/speed.c
-@@ -989,10 +989,7 @@ int MAIN(int argc, char **argv)
-         } else
- # endif
- # ifndef OPENSSL_NO_ECDSA
--        if (strcmp(*argv, "ecdsap160") == 0)
--            ecdsa_doit[R_EC_P160] = 2;
--        else if (strcmp(*argv, "ecdsap192") == 0)
--            ecdsa_doit[R_EC_P192] = 2;
-+	if (0) {}
-         else if (strcmp(*argv, "ecdsap224") == 0)
-             ecdsa_doit[R_EC_P224] = 2;
-         else if (strcmp(*argv, "ecdsap256") == 0)
-@@ -1001,36 +998,13 @@ int MAIN(int argc, char **argv)
-             ecdsa_doit[R_EC_P384] = 2;
-         else if (strcmp(*argv, "ecdsap521") == 0)
-             ecdsa_doit[R_EC_P521] = 2;
--        else if (strcmp(*argv, "ecdsak163") == 0)
--            ecdsa_doit[R_EC_K163] = 2;
--        else if (strcmp(*argv, "ecdsak233") == 0)
--            ecdsa_doit[R_EC_K233] = 2;
--        else if (strcmp(*argv, "ecdsak283") == 0)
--            ecdsa_doit[R_EC_K283] = 2;
--        else if (strcmp(*argv, "ecdsak409") == 0)
--            ecdsa_doit[R_EC_K409] = 2;
--        else if (strcmp(*argv, "ecdsak571") == 0)
--            ecdsa_doit[R_EC_K571] = 2;
--        else if (strcmp(*argv, "ecdsab163") == 0)
--            ecdsa_doit[R_EC_B163] = 2;
--        else if (strcmp(*argv, "ecdsab233") == 0)
--            ecdsa_doit[R_EC_B233] = 2;
--        else if (strcmp(*argv, "ecdsab283") == 0)
--            ecdsa_doit[R_EC_B283] = 2;
--        else if (strcmp(*argv, "ecdsab409") == 0)
--            ecdsa_doit[R_EC_B409] = 2;
--        else if (strcmp(*argv, "ecdsab571") == 0)
--            ecdsa_doit[R_EC_B571] = 2;
-         else if (strcmp(*argv, "ecdsa") == 0) {
--            for (i = 0; i < EC_NUM; i++)
-+            for (i = R_EC_P224; i < R_EC_P521; i++)
-                 ecdsa_doit[i] = 1;
-         } else
- # endif
- # ifndef OPENSSL_NO_ECDH
--        if (strcmp(*argv, "ecdhp160") == 0)
--            ecdh_doit[R_EC_P160] = 2;
--        else if (strcmp(*argv, "ecdhp192") == 0)
--            ecdh_doit[R_EC_P192] = 2;
-+	if (0) {}
-         else if (strcmp(*argv, "ecdhp224") == 0)
-             ecdh_doit[R_EC_P224] = 2;
-         else if (strcmp(*argv, "ecdhp256") == 0)
-@@ -1039,28 +1013,8 @@ int MAIN(int argc, char **argv)
-             ecdh_doit[R_EC_P384] = 2;
-         else if (strcmp(*argv, "ecdhp521") == 0)
-             ecdh_doit[R_EC_P521] = 2;
--        else if (strcmp(*argv, "ecdhk163") == 0)
--            ecdh_doit[R_EC_K163] = 2;
--        else if (strcmp(*argv, "ecdhk233") == 0)
--            ecdh_doit[R_EC_K233] = 2;
--        else if (strcmp(*argv, "ecdhk283") == 0)
--            ecdh_doit[R_EC_K283] = 2;
--        else if (strcmp(*argv, "ecdhk409") == 0)
--            ecdh_doit[R_EC_K409] = 2;
--        else if (strcmp(*argv, "ecdhk571") == 0)
--            ecdh_doit[R_EC_K571] = 2;
--        else if (strcmp(*argv, "ecdhb163") == 0)
--            ecdh_doit[R_EC_B163] = 2;
--        else if (strcmp(*argv, "ecdhb233") == 0)
--            ecdh_doit[R_EC_B233] = 2;
--        else if (strcmp(*argv, "ecdhb283") == 0)
--            ecdh_doit[R_EC_B283] = 2;
--        else if (strcmp(*argv, "ecdhb409") == 0)
--            ecdh_doit[R_EC_B409] = 2;
--        else if (strcmp(*argv, "ecdhb571") == 0)
--            ecdh_doit[R_EC_B571] = 2;
-         else if (strcmp(*argv, "ecdh") == 0) {
--            for (i = 0; i < EC_NUM; i++)
-+	    for (i = R_EC_P224; i <= R_EC_P521; i++)
-                 ecdh_doit[i] = 1;
-         } else
- # endif
-@@ -1149,21 +1103,13 @@ int MAIN(int argc, char **argv)
-             BIO_printf(bio_err, "dsa512   dsa1024  dsa2048\n");
- # endif
- # ifndef OPENSSL_NO_ECDSA
--            BIO_printf(bio_err, "ecdsap160 ecdsap192 ecdsap224 "
-+            BIO_printf(bio_err, "ecdsap224 "
-                        "ecdsap256 ecdsap384 ecdsap521\n");
--            BIO_printf(bio_err,
--                       "ecdsak163 ecdsak233 ecdsak283 ecdsak409 ecdsak571\n");
--            BIO_printf(bio_err,
--                       "ecdsab163 ecdsab233 ecdsab283 ecdsab409 ecdsab571\n");
-             BIO_printf(bio_err, "ecdsa\n");
- # endif
- # ifndef OPENSSL_NO_ECDH
--            BIO_printf(bio_err, "ecdhp160  ecdhp192  ecdhp224 "
-+            BIO_printf(bio_err, "ecdhp224 "
-                        "ecdhp256  ecdhp384  ecdhp521\n");
--            BIO_printf(bio_err,
--                       "ecdhk163  ecdhk233  ecdhk283  ecdhk409  ecdhk571\n");
--            BIO_printf(bio_err,
--                       "ecdhb163  ecdhb233  ecdhb283  ecdhb409  ecdhb571\n");
-             BIO_printf(bio_err, "ecdh\n");
- # endif
- 
-@@ -1242,11 +1188,11 @@ int MAIN(int argc, char **argv)
-         for (i = 0; i < DSA_NUM; i++)
-             dsa_doit[i] = 1;
- # ifndef OPENSSL_NO_ECDSA
--        for (i = 0; i < EC_NUM; i++)
-+        for (i = R_EC_P224; i <= R_EC_P521; i++)
-             ecdsa_doit[i] = 1;
- # endif
- # ifndef OPENSSL_NO_ECDH
--        for (i = 0; i < EC_NUM; i++)
-+        for (i = R_EC_P224; i <= R_EC_P521; i++)
-             ecdh_doit[i] = 1;
- # endif
-     }
---- a/crypto/ec/ecp_smpl.c
-+++ b/crypto/ec/ecp_smpl.c
-@@ -187,6 +187,11 @@ int ec_GFp_simple_group_set_curve(EC_GROUP *group,
-         return 0;
-     }
- 
-+    if (BN_num_bits(p) < 224) {
-+        ECerr(EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE, EC_R_UNSUPPORTED_FIELD);
-+        return 0;
-+    }
-+
-     if (ctx == NULL) {
-         ctx = new_ctx = BN_CTX_new();
-         if (ctx == NULL)
---- a/crypto/ecdh/ecdhtest.c
-+++ b/crypto/ecdh/ecdhtest.c
-@@ -501,11 +501,13 @@ int main(int argc, char *argv[])
-         goto err;
- 
-     /* NIST PRIME CURVES TESTS */
-+# if 0
-     if (!test_ecdh_curve
-         (NID_X9_62_prime192v1, "NIST Prime-Curve P-192", ctx, out))
-         goto err;
-     if (!test_ecdh_curve(NID_secp224r1, "NIST Prime-Curve P-224", ctx, out))
-         goto err;
-+# endif
-     if (!test_ecdh_curve
-         (NID_X9_62_prime256v1, "NIST Prime-Curve P-256", ctx, out))
-         goto err;
-@@ -536,13 +538,14 @@ int main(int argc, char *argv[])
-     if (!test_ecdh_curve(NID_sect571r1, "NIST Binary-Curve B-571", ctx, out))
-         goto err;
- # endif
-+# if 0
-     if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP256r1", 256))
-         goto err;
-     if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP384r1", 384))
-         goto err;
-     if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP512r1", 512))
-         goto err;
--
-+# endif
-     ret = 0;
- 
-  err:
---- a/crypto/ecdsa/ecdsatest.c
-+++ b/crypto/ecdsa/ecdsatest.c
-@@ -138,9 +138,12 @@ int restore_rand(void)
- }
- 
- static int fbytes_counter = 0, use_fake = 0;
--static const char *numbers[8] = {
-+static const char *numbers[10] = {
-+    "651056770906015076056810763456358567190100156695615665659",
-     "651056770906015076056810763456358567190100156695615665659",
-     "6140507067065001063065065565667405560006161556565665656654",
-+    "8763001015071075675010661307616710783570106710677817767166"
-+        "71676178726717",
-     "8763001015071075675010661307616710783570106710677817767166"
-         "71676178726717",
-     "7000000175690566466555057817571571075705015757757057795755"
-@@ -163,7 +166,7 @@ int fbytes(unsigned char *buf, int num)
- 
-     use_fake = 0;
- 
--    if (fbytes_counter >= 8)
-+    if (fbytes_counter >= 10)
-         return 0;
-     tmp = BN_new();
-     if (!tmp)
-@@ -539,8 +542,10 @@ int main(void)
-     RAND_seed(rnd_seed, sizeof(rnd_seed));
- 
-     /* the tests */
-+# if 0
-     if (!x9_62_tests(out))
-         goto err;
-+# endif
-     if (!test_builtin(out))
-         goto err;
- 
---- a/ssl/t1_lib.c
-+++ b/ssl/t1_lib.c
-@@ -271,10 +271,7 @@ static const unsigned char eccurves_auto[] = {
-     0, 23,                      /* secp256r1 (23) */
-     /* Other >= 256-bit prime curves. */
-     0, 25,                      /* secp521r1 (25) */
--    0, 28,                      /* brainpool512r1 (28) */
--    0, 27,                      /* brainpoolP384r1 (27) */
-     0, 24,                      /* secp384r1 (24) */
--    0, 26,                      /* brainpoolP256r1 (26) */
-     0, 22,                      /* secp256k1 (22) */
- # ifndef OPENSSL_NO_EC2M
-     /* >= 256-bit binary curves. */
-@@ -292,10 +289,7 @@ static const unsigned char eccurves_all[] = {
-     0, 23,                      /* secp256r1 (23) */
-     /* Other >= 256-bit prime curves. */
-     0, 25,                      /* secp521r1 (25) */
--    0, 28,                      /* brainpool512r1 (28) */
--    0, 27,                      /* brainpoolP384r1 (27) */
-     0, 24,                      /* secp384r1 (24) */
--    0, 26,                      /* brainpoolP256r1 (26) */
-     0, 22,                      /* secp256k1 (22) */
- # ifndef OPENSSL_NO_EC2M
-     /* >= 256-bit binary curves. */
-@@ -310,13 +304,6 @@ static const unsigned char eccurves_all[] = {
-      * Remaining curves disabled by default but still permitted if set
-      * via an explicit callback or parameters.
-      */
--    0, 20,                      /* secp224k1 (20) */
--    0, 21,                      /* secp224r1 (21) */
--    0, 18,                      /* secp192k1 (18) */
--    0, 19,                      /* secp192r1 (19) */
--    0, 15,                      /* secp160k1 (15) */
--    0, 16,                      /* secp160r1 (16) */
--    0, 17,                      /* secp160r2 (17) */
- # ifndef OPENSSL_NO_EC2M
-     0, 8,                       /* sect239k1 (8) */
-     0, 6,                       /* sect233k1 (6) */
-@@ -351,29 +338,21 @@ static const unsigned char fips_curves_default[] = {
-     0, 9,                       /* sect283k1 (9) */
-     0, 10,                      /* sect283r1 (10) */
- #  endif
--    0, 22,                      /* secp256k1 (22) */
-     0, 23,                      /* secp256r1 (23) */
- #  ifndef OPENSSL_NO_EC2M
-     0, 8,                       /* sect239k1 (8) */
-     0, 6,                       /* sect233k1 (6) */
-     0, 7,                       /* sect233r1 (7) */
- #  endif
--    0, 20,                      /* secp224k1 (20) */
--    0, 21,                      /* secp224r1 (21) */
- #  ifndef OPENSSL_NO_EC2M
-     0, 4,                       /* sect193r1 (4) */
-     0, 5,                       /* sect193r2 (5) */
- #  endif
--    0, 18,                      /* secp192k1 (18) */
--    0, 19,                      /* secp192r1 (19) */
- #  ifndef OPENSSL_NO_EC2M
-     0, 1,                       /* sect163k1 (1) */
-     0, 2,                       /* sect163r1 (2) */
-     0, 3,                       /* sect163r2 (3) */
- #  endif
--    0, 15,                      /* secp160k1 (15) */
--    0, 16,                      /* secp160r1 (16) */
--    0, 17,                      /* secp160r2 (17) */
- };
- # endif
- 
diff --git a/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild b/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild
index d9b04231afd5..6516e0257f25 100644
--- a/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-0.9.8z_p8-r1.ebuild
@@ -20,7 +20,8 @@ LICENSE="openssl"
 SLOT="0.9.8"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test zlib"
-RESTRICT="!bindist? ( bindist )"
+RESTRICT="!bindist? ( bindist )
+	test"
 
 RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 9d29f288b472..8e0a79928788 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,11 +1,11 @@
 AUX gentoo.config-1.0.2 5158 BLAKE2B bc8b8c0558f84bcbd7c55e4b974458041aa5f31f82cd740f1c4c56729ecb63d940ac6e23390b83eb1e7ed36dbed5663801415830f306bdbf56f081aec63fb48c SHA512 d39cb5824556f2c064ad148ef40b175bd124c6e58a6e59f9da6167645f98e2a5755b4c01b41a37f30c172d3a3c5d9753d1f7835d7380a429bbc0dc1989125472
 AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2b8dbb9a7ea63a816d3a5de544fbffd8b4216d7a95bd44e718c7a83dd8b8b5ad85caed4205eab5de566b0b7e5054fc1 SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c
-AUX openssl-1.0.2p-hobble-ecc.patch 10875 BLAKE2B fc8240a074f8cc354c5ae584b76b3fc895170e026767d2d99d8bd5e5028614c861dd2b3c7b955c223883062f9a057ee302ae0deecfbbed00ddc53ae8a4d50919 SHA512 29f64bacac4f61071db6caf9d92131633d2dff56d899171888cc4c8432790930ff0912cea90ad03ca59b13ca0357f812d2f0a3f42567e2bd72c260f49b2b59aa
 AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828
 AUX openssl-1.1.0k-fix-test_fuzz.patch 485 BLAKE2B 4dc2ef2b2c1935c8143c939ed6b7168fb070edced8ae47732f1ae9fdabe19887f846d75c15cea33680a54058c9a99f981a3c6a35fc84c3a6c360b4d2b920bc04 SHA512 68590479f096f3da920a5d293f27babd541ce1946944d5540f78d8341b59eeda92fe24743f7351b565e06421d7a2da77e331ebe1e5168023f6602aaa7376a038
 AUX openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch 1235 BLAKE2B 26997a474013c379a7d019d69203a5199ee17df07b28c86d06cebad3093ee62af9e4e568f3bc44ff4a5e8b555a5634d666446b35ce850c9c8668d920ef32bba6 SHA512 8ddfc077d3035b766175810b2554310935c8d1875044bf95abf8590ab5eeeb68357545566e7e8a50f95d9e62be68c72fdb58fef28497b154d44f08169645a08a
 AUX openssl-1.1.1d-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch 4247 BLAKE2B 5e181869569f9ca34190ba11fb1c66c12cfd6760aa85f423a65761886f15c120d0262528eb81847b1ed18a5e2c7610ff96790da7dac6815ddf3d025530c06349 SHA512 eafa940295b3cdfb0e9f1d1e337b4ce793f0dc8fae0fc5d0fc8e7029b9d6a99071b6b3d2b25002b715f3d5d7dc129f48700eb19e60e115610a8c4752a6d6bbfe
 AUX openssl-1.1.1d-fix-zlib.patch 1567 BLAKE2B c83a3016caa8ae6f3588a6649929d32ba890f7df776a39656bc870965aa305f89c3253b284a1f1b7bcc78b88042a01ab6fc93735d972bc4a2da1fd4f2ad225de SHA512 0b073723910cf4bd72d2e922e280cafbb807b040f4afc84f06973a45ff386b4a8505297af4894953d3fa61b8a68b42858345523705e43aa58846478976e2c566
+AUX openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch 2434 BLAKE2B ffe10db9977e70379d957df117f9e73469279673c531dd70fa78d84299efed1cc30402ca0bb5ae944b2aea649a1da1d3fa47e6b747b0f488a84f5eec2cfc10f2 SHA512 ac800f2ae4a88fcd51b61f5de5e77765b18f4a997dc334541dce995e6d3e04784752ef273fef033cde21c3d6aaf379751715b98cbce491bfd31ea4770fe78f63
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2t.tar.gz 5355422 BLAKE2B dcbc883151ff6c5b60f5849d8789c2e76a384cb3d5eb5f08a6109776d0edf134580dc33fa8b946ae2344542560f04ecef17f218406952dd8d31e4200c4882022 SHA512 0b88868933f42fab87e8b22449435a1091cc6e75f986aad6c173e01ad123161fcae8c226759073701bc65c9f2f0b6ce6a63a61203008ed873cfb6e484f32bc71
@@ -13,7 +13,7 @@ DIST openssl-1.1.0l-bindist-1.0.tar.xz 13184 BLAKE2B c09e023458faff17b10d6f20c28
 DIST openssl-1.1.0l.tar.gz 5294857 BLAKE2B 0e4f30f9e8a22414325bd780dc4e875e962487fbe72967f0392ace959955429192541881a98d097d7bb75ed7238b1817b0c3c2c4da04421512bd538f2b07cdd7 SHA512 81b74149f40ea7d9f7e235820a4f977844653ad1e2b302e65e712c12193f47542fe7e3385fd1e25e3dd074e4e6d04199836cbc492656f5a7692edab5e234f4ad
 DIST openssl-1.1.1d-bindist-1.0.tar.xz 13180 BLAKE2B 680bd7400d3dd3930067ee7efa9718b74b30afa9be2397ad80f88031920806b6603b6469beede02b6e7a742abf5f82ebdd7c9b8e69c1ffe223e4860dc9581128 SHA512 9e4296326852010d5cebc204d1a34a34198d8d65460bc91a2bd37c80be892a5ae519513e4b0109e6b51b6faab0e171ef6cdae868868c158711558d147083c06f
 DIST openssl-1.1.1d.tar.gz 8845861 BLAKE2B d3155f07b487ebd8dd4fe25396c874f9af18b5cfd7e622298d29c4f2c8ce14ad4534609d321314a4bcd0d44414e1306190340daaacd3c8fca061c04498446244 SHA512 2bc9f528c27fe644308eb7603c992bac8740e9f0c3601a130af30c9ffebbf7e0f5c28b76a00bbb478bad40fbe89b4223a58d604001e1713da71ff4b7fe6a08a7
-EBUILD openssl-1.0.2t-r1.ebuild 9848 BLAKE2B 27e23ff21c452778cf65563c571fd89837ba5c60fd783f9b55da5b40bfc1981492e172bc2757fa4dbcef553cc848ad378d37e3bb79583a850239be3e0e5fc008 SHA512 53c3a31e3dd8226ef8c24a11b6a82c97dba4251d8b09986d5d48547f0d53e93c05cb30d9591ecd945f670a4d142fc3595b1c2c44034fca4e53eccd29c4d26caf
-EBUILD openssl-1.1.0l.ebuild 9579 BLAKE2B c60a96f76591ac3e913d28e86bcfd53cabe5428707d1ce0f713908ae7c88b0624f34b6334b2745f1817b4f173d581c11eff1b4ef7a22b7a5c660523b54b8c9ab SHA512 70222a86f55a87e7811c17af0f6d642290024b7635dc3f3c6f5bebb27394c797ed021f9390b33a3fc303ef9b6c600a69e63ecf6d0713c68f0710d72bef8cb4a8
-EBUILD openssl-1.1.1d-r2.ebuild 10306 BLAKE2B 4865788cfb9f3dc1e03e1f1748009c6970f867329c8e42a7c03d56e77f671193511adffd9cc4738cadc7bf9401f8f8b51a8a1cbf15c9def30b857b0210671ffb SHA512 916025522d0f5fac0f9db404bf9898b0c71f870e309eb3a6f55dd082669783a0d7763e5d747a5c4677099feaee15e0879ca0ea71ce3692a6bab83f6b3573ce40
+EBUILD openssl-1.0.2t-r1.ebuild 9865 BLAKE2B fb3ded9fcca4a9fc97ab578747f107e1dea4ed17edaa2b0cf8b787035af9637bd1a78318f1aaedc9336686800cc6e9a564ba7fec09476bda842eaeccd946a5d1 SHA512 33be79f564388c1aa6aa093877d6012d93782257271320282377b93e4cb0e890377f24a4ff5ef0452c25c1e621c7c7880452496d0e07ece1bcdd5433e2c50c4c
+EBUILD openssl-1.1.0l.ebuild 9596 BLAKE2B b90dab20cb55693a944efa1cd6a2e9422fd7f01e618d50ba74f7f2c46c7fdf6d91621d1380e000ea9e531997dc43c38324965d1abb3c4f668cfcf0986e599c8d SHA512 699210aeaeb1796c2cabd33c917a9dec91f1d0ae7a6fd8ed3ce62f90b02e9001722615eaa767d4d479df1c3e79e6c69025f65a4353a5800a0003f36a886d9f89
+EBUILD openssl-1.1.1d-r3.ebuild 10378 BLAKE2B 43732766ccd06933805c3b5133f0a606a57340e975b10768ae044beeeaee67ecf4e4ad469364a9257b05d0dd567f602abc1b703862b74b656811ce33b20dfe75 SHA512 5caba682680e1c877c1fbfbcfdb1a8513167aacde4b2be1c96ee1026b82178d4685d1f8208616aa15c30e5b65437f294d28cb22d326e3a8adab25f3a3d43cf83
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.0.2p-hobble-ecc.patch b/dev-libs/openssl/files/openssl-1.0.2p-hobble-ecc.patch
deleted file mode 100644
index 3a458a783603..000000000000
--- a/dev-libs/openssl/files/openssl-1.0.2p-hobble-ecc.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-Port of Fedora's Hobble-EC patches for OpenSSL 1.0 series.
-
-From https://src.fedoraproject.org/git/rpms/openssl.git
-
-Contains parts of the following patches, rediffed. The patches are on various
-different branches.
-f23 openssl-1.0.2c-ecc-suiteb.patch
-f23 openssl-1.0.2a-fips-ec.patch
-f28 openssl-1.1.0-ec-curves.patch
-
-Signed-off-By: Robin H. Johnson <robbat2@gentoo.org>
-
---- a/apps/speed.c
-+++ b/apps/speed.c
-@@ -989,10 +989,7 @@ int MAIN(int argc, char **argv)
-         } else
- # endif
- # ifndef OPENSSL_NO_ECDSA
--        if (strcmp(*argv, "ecdsap160") == 0)
--            ecdsa_doit[R_EC_P160] = 2;
--        else if (strcmp(*argv, "ecdsap192") == 0)
--            ecdsa_doit[R_EC_P192] = 2;
-+	if (0) {}
-         else if (strcmp(*argv, "ecdsap224") == 0)
-             ecdsa_doit[R_EC_P224] = 2;
-         else if (strcmp(*argv, "ecdsap256") == 0)
-@@ -1001,36 +998,13 @@ int MAIN(int argc, char **argv)
-             ecdsa_doit[R_EC_P384] = 2;
-         else if (strcmp(*argv, "ecdsap521") == 0)
-             ecdsa_doit[R_EC_P521] = 2;
--        else if (strcmp(*argv, "ecdsak163") == 0)
--            ecdsa_doit[R_EC_K163] = 2;
--        else if (strcmp(*argv, "ecdsak233") == 0)
--            ecdsa_doit[R_EC_K233] = 2;
--        else if (strcmp(*argv, "ecdsak283") == 0)
--            ecdsa_doit[R_EC_K283] = 2;
--        else if (strcmp(*argv, "ecdsak409") == 0)
--            ecdsa_doit[R_EC_K409] = 2;
--        else if (strcmp(*argv, "ecdsak571") == 0)
--            ecdsa_doit[R_EC_K571] = 2;
--        else if (strcmp(*argv, "ecdsab163") == 0)
--            ecdsa_doit[R_EC_B163] = 2;
--        else if (strcmp(*argv, "ecdsab233") == 0)
--            ecdsa_doit[R_EC_B233] = 2;
--        else if (strcmp(*argv, "ecdsab283") == 0)
--            ecdsa_doit[R_EC_B283] = 2;
--        else if (strcmp(*argv, "ecdsab409") == 0)
--            ecdsa_doit[R_EC_B409] = 2;
--        else if (strcmp(*argv, "ecdsab571") == 0)
--            ecdsa_doit[R_EC_B571] = 2;
-         else if (strcmp(*argv, "ecdsa") == 0) {
--            for (i = 0; i < EC_NUM; i++)
-+            for (i = R_EC_P224; i < R_EC_P521; i++)
-                 ecdsa_doit[i] = 1;
-         } else
- # endif
- # ifndef OPENSSL_NO_ECDH
--        if (strcmp(*argv, "ecdhp160") == 0)
--            ecdh_doit[R_EC_P160] = 2;
--        else if (strcmp(*argv, "ecdhp192") == 0)
--            ecdh_doit[R_EC_P192] = 2;
-+	if (0) {}
-         else if (strcmp(*argv, "ecdhp224") == 0)
-             ecdh_doit[R_EC_P224] = 2;
-         else if (strcmp(*argv, "ecdhp256") == 0)
-@@ -1039,28 +1013,8 @@ int MAIN(int argc, char **argv)
-             ecdh_doit[R_EC_P384] = 2;
-         else if (strcmp(*argv, "ecdhp521") == 0)
-             ecdh_doit[R_EC_P521] = 2;
--        else if (strcmp(*argv, "ecdhk163") == 0)
--            ecdh_doit[R_EC_K163] = 2;
--        else if (strcmp(*argv, "ecdhk233") == 0)
--            ecdh_doit[R_EC_K233] = 2;
--        else if (strcmp(*argv, "ecdhk283") == 0)
--            ecdh_doit[R_EC_K283] = 2;
--        else if (strcmp(*argv, "ecdhk409") == 0)
--            ecdh_doit[R_EC_K409] = 2;
--        else if (strcmp(*argv, "ecdhk571") == 0)
--            ecdh_doit[R_EC_K571] = 2;
--        else if (strcmp(*argv, "ecdhb163") == 0)
--            ecdh_doit[R_EC_B163] = 2;
--        else if (strcmp(*argv, "ecdhb233") == 0)
--            ecdh_doit[R_EC_B233] = 2;
--        else if (strcmp(*argv, "ecdhb283") == 0)
--            ecdh_doit[R_EC_B283] = 2;
--        else if (strcmp(*argv, "ecdhb409") == 0)
--            ecdh_doit[R_EC_B409] = 2;
--        else if (strcmp(*argv, "ecdhb571") == 0)
--            ecdh_doit[R_EC_B571] = 2;
-         else if (strcmp(*argv, "ecdh") == 0) {
--            for (i = 0; i < EC_NUM; i++)
-+	    for (i = R_EC_P224; i <= R_EC_P521; i++)
-                 ecdh_doit[i] = 1;
-         } else
- # endif
-@@ -1149,21 +1103,13 @@ int MAIN(int argc, char **argv)
-             BIO_printf(bio_err, "dsa512   dsa1024  dsa2048\n");
- # endif
- # ifndef OPENSSL_NO_ECDSA
--            BIO_printf(bio_err, "ecdsap160 ecdsap192 ecdsap224 "
-+            BIO_printf(bio_err, "ecdsap224 "
-                        "ecdsap256 ecdsap384 ecdsap521\n");
--            BIO_printf(bio_err,
--                       "ecdsak163 ecdsak233 ecdsak283 ecdsak409 ecdsak571\n");
--            BIO_printf(bio_err,
--                       "ecdsab163 ecdsab233 ecdsab283 ecdsab409 ecdsab571\n");
-             BIO_printf(bio_err, "ecdsa\n");
- # endif
- # ifndef OPENSSL_NO_ECDH
--            BIO_printf(bio_err, "ecdhp160  ecdhp192  ecdhp224 "
-+            BIO_printf(bio_err, "ecdhp224 "
-                        "ecdhp256  ecdhp384  ecdhp521\n");
--            BIO_printf(bio_err,
--                       "ecdhk163  ecdhk233  ecdhk283  ecdhk409  ecdhk571\n");
--            BIO_printf(bio_err,
--                       "ecdhb163  ecdhb233  ecdhb283  ecdhb409  ecdhb571\n");
-             BIO_printf(bio_err, "ecdh\n");
- # endif
- 
-@@ -1242,11 +1188,11 @@ int MAIN(int argc, char **argv)
-         for (i = 0; i < DSA_NUM; i++)
-             dsa_doit[i] = 1;
- # ifndef OPENSSL_NO_ECDSA
--        for (i = 0; i < EC_NUM; i++)
-+        for (i = R_EC_P224; i <= R_EC_P521; i++)
-             ecdsa_doit[i] = 1;
- # endif
- # ifndef OPENSSL_NO_ECDH
--        for (i = 0; i < EC_NUM; i++)
-+        for (i = R_EC_P224; i <= R_EC_P521; i++)
-             ecdh_doit[i] = 1;
- # endif
-     }
---- a/crypto/ec/ecp_smpl.c
-+++ b/crypto/ec/ecp_smpl.c
-@@ -187,6 +187,11 @@ int ec_GFp_simple_group_set_curve(EC_GROUP *group,
-         return 0;
-     }
- 
-+    if (BN_num_bits(p) < 224) {
-+        ECerr(EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE, EC_R_UNSUPPORTED_FIELD);
-+        return 0;
-+    }
-+
-     if (ctx == NULL) {
-         ctx = new_ctx = BN_CTX_new();
-         if (ctx == NULL)
---- a/crypto/ecdh/ecdhtest.c
-+++ b/crypto/ecdh/ecdhtest.c
-@@ -501,11 +501,13 @@ int main(int argc, char *argv[])
-         goto err;
- 
-     /* NIST PRIME CURVES TESTS */
-+# if 0
-     if (!test_ecdh_curve
-         (NID_X9_62_prime192v1, "NIST Prime-Curve P-192", ctx, out))
-         goto err;
-     if (!test_ecdh_curve(NID_secp224r1, "NIST Prime-Curve P-224", ctx, out))
-         goto err;
-+# endif
-     if (!test_ecdh_curve
-         (NID_X9_62_prime256v1, "NIST Prime-Curve P-256", ctx, out))
-         goto err;
-@@ -536,13 +538,14 @@ int main(int argc, char *argv[])
-     if (!test_ecdh_curve(NID_sect571r1, "NIST Binary-Curve B-571", ctx, out))
-         goto err;
- # endif
-+# if 0
-     if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP256r1", 256))
-         goto err;
-     if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP384r1", 384))
-         goto err;
-     if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP512r1", 512))
-         goto err;
--
-+# endif
-     ret = 0;
- 
-  err:
---- a/crypto/ecdsa/ecdsatest.c
-+++ b/crypto/ecdsa/ecdsatest.c
-@@ -138,9 +138,12 @@ int restore_rand(void)
- }
- 
- static int fbytes_counter = 0, use_fake = 0;
--static const char *numbers[8] = {
-+static const char *numbers[10] = {
-+    "651056770906015076056810763456358567190100156695615665659",
-     "651056770906015076056810763456358567190100156695615665659",
-     "6140507067065001063065065565667405560006161556565665656654",
-+    "8763001015071075675010661307616710783570106710677817767166"
-+        "71676178726717",
-     "8763001015071075675010661307616710783570106710677817767166"
-         "71676178726717",
-     "7000000175690566466555057817571571075705015757757057795755"
-@@ -163,7 +166,7 @@ int fbytes(unsigned char *buf, int num)
- 
-     use_fake = 0;
- 
--    if (fbytes_counter >= 8)
-+    if (fbytes_counter >= 10)
-         return 0;
-     tmp = BN_new();
-     if (!tmp)
-@@ -539,8 +542,10 @@ int main(void)
-     RAND_seed(rnd_seed, sizeof(rnd_seed));
- 
-     /* the tests */
-+# if 0
-     if (!x9_62_tests(out))
-         goto err;
-+# endif
-     if (!test_builtin(out))
-         goto err;
- 
---- a/ssl/t1_lib.c
-+++ b/ssl/t1_lib.c
-@@ -271,10 +271,7 @@ static const unsigned char eccurves_auto[] = {
-     0, 23,                      /* secp256r1 (23) */
-     /* Other >= 256-bit prime curves. */
-     0, 25,                      /* secp521r1 (25) */
--    0, 28,                      /* brainpool512r1 (28) */
--    0, 27,                      /* brainpoolP384r1 (27) */
-     0, 24,                      /* secp384r1 (24) */
--    0, 26,                      /* brainpoolP256r1 (26) */
-     0, 22,                      /* secp256k1 (22) */
- # ifndef OPENSSL_NO_EC2M
-     /* >= 256-bit binary curves. */
-@@ -292,10 +289,7 @@ static const unsigned char eccurves_all[] = {
-     0, 23,                      /* secp256r1 (23) */
-     /* Other >= 256-bit prime curves. */
-     0, 25,                      /* secp521r1 (25) */
--    0, 28,                      /* brainpool512r1 (28) */
--    0, 27,                      /* brainpoolP384r1 (27) */
-     0, 24,                      /* secp384r1 (24) */
--    0, 26,                      /* brainpoolP256r1 (26) */
-     0, 22,                      /* secp256k1 (22) */
- # ifndef OPENSSL_NO_EC2M
-     /* >= 256-bit binary curves. */
-@@ -310,13 +304,6 @@ static const unsigned char eccurves_all[] = {
-      * Remaining curves disabled by default but still permitted if set
-      * via an explicit callback or parameters.
-      */
--    0, 20,                      /* secp224k1 (20) */
--    0, 21,                      /* secp224r1 (21) */
--    0, 18,                      /* secp192k1 (18) */
--    0, 19,                      /* secp192r1 (19) */
--    0, 15,                      /* secp160k1 (15) */
--    0, 16,                      /* secp160r1 (16) */
--    0, 17,                      /* secp160r2 (17) */
- # ifndef OPENSSL_NO_EC2M
-     0, 8,                       /* sect239k1 (8) */
-     0, 6,                       /* sect233k1 (6) */
-@@ -351,29 +338,21 @@ static const unsigned char fips_curves_default[] = {
-     0, 9,                       /* sect283k1 (9) */
-     0, 10,                      /* sect283r1 (10) */
- #  endif
--    0, 22,                      /* secp256k1 (22) */
-     0, 23,                      /* secp256r1 (23) */
- #  ifndef OPENSSL_NO_EC2M
-     0, 8,                       /* sect239k1 (8) */
-     0, 6,                       /* sect233k1 (6) */
-     0, 7,                       /* sect233r1 (7) */
- #  endif
--    0, 20,                      /* secp224k1 (20) */
--    0, 21,                      /* secp224r1 (21) */
- #  ifndef OPENSSL_NO_EC2M
-     0, 4,                       /* sect193r1 (4) */
-     0, 5,                       /* sect193r2 (5) */
- #  endif
--    0, 18,                      /* secp192k1 (18) */
--    0, 19,                      /* secp192r1 (19) */
- #  ifndef OPENSSL_NO_EC2M
-     0, 1,                       /* sect163k1 (1) */
-     0, 2,                       /* sect163r1 (2) */
-     0, 3,                       /* sect163r2 (3) */
- #  endif
--    0, 15,                      /* secp160k1 (15) */
--    0, 16,                      /* secp160r1 (16) */
--    0, 17,                      /* secp160r2 (17) */
- };
- # endif
- 
diff --git a/dev-libs/openssl/files/openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch b/dev-libs/openssl/files/openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch
new file mode 100644
index 000000000000..dc8fe7146b74
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch
@@ -0,0 +1,62 @@
+From 61cc715240d2d3f9511ca88043a3e9797c11482f Mon Sep 17 00:00:00 2001
+From: Richard Levitte <levitte@openssl.org>
+Date: Thu, 3 Oct 2019 08:28:31 +0200
+Subject: [PATCH] Define AESNI_ASM if AESNI assembler is included, and use it
+
+Because we have cases where basic assembler support isn't present, but
+AESNI asssembler support is, we need a separate macro that indicates
+that, and use it.
+
+Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+(Merged from https://github.com/openssl/openssl/pull/10080)
+---
+ Configure                          | 1 +
+ crypto/evp/e_aes_cbc_hmac_sha1.c   | 2 +-
+ crypto/evp/e_aes_cbc_hmac_sha256.c | 4 ++--
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 811bee81f54..f498ac2f81b 100755
+--- a/Configure
++++ b/Configure
+@@ -1376,6 +1376,7 @@ unless ($disabled{asm}) {
+     }
+     if ($target{aes_asm_src}) {
+         push @{$config{lib_defines}}, "AES_ASM" if ($target{aes_asm_src} =~ m/\baes-/);;
++        push @{$config{lib_defines}}, "AESNI_ASM" if ($target{aes_asm_src} =~ m/\baesni-/);;
+         # aes-ctr.fake is not a real file, only indication that assembler
+         # module implements AES_ctr32_encrypt...
+         push @{$config{lib_defines}}, "AES_CTR_ASM" if ($target{aes_asm_src} =~ s/\s*aes-ctr\.fake//);
+diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
+index c9f5969162c..27c36b46e7a 100644
+--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
++++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
+@@ -33,7 +33,7 @@ typedef struct {
+ 
+ #define NO_PAYLOAD_LENGTH       ((size_t)-1)
+ 
+-#if     defined(AES_ASM) &&     ( \
++#if     defined(AESNI_ASM) &&     ( \
+         defined(__x86_64)       || defined(__x86_64__)  || \
+         defined(_M_AMD64)       || defined(_M_X64)      )
+ 
+diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c
+index d5178313ae3..cc622b6faa8 100644
+--- a/crypto/evp/e_aes_cbc_hmac_sha256.c
++++ b/crypto/evp/e_aes_cbc_hmac_sha256.c
+@@ -34,7 +34,7 @@ typedef struct {
+ 
+ # define NO_PAYLOAD_LENGTH       ((size_t)-1)
+ 
+-#if     defined(AES_ASM) &&     ( \
++#if     defined(AESNI_ASM) &&   ( \
+         defined(__x86_64)       || defined(__x86_64__)  || \
+         defined(_M_AMD64)       || defined(_M_X64)      )
+ 
+@@ -947,4 +947,4 @@ const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha256(void)
+ {
+     return NULL;
+ }
+-#endif
++#endif  /* AESNI_ASM */
diff --git a/dev-libs/openssl/openssl-1.0.2t-r1.ebuild b/dev-libs/openssl/openssl-1.0.2t-r1.ebuild
index 53f5acad6bab..37ad94c9f5d1 100644
--- a/dev-libs/openssl/openssl-1.0.2t-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2t-r1.ebuild
@@ -39,7 +39,8 @@ LICENSE="openssl"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
 
 RDEPEND=">=app-misc/c_rehash-1.7-r1
 	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
diff --git a/dev-libs/openssl/openssl-1.1.0l.ebuild b/dev-libs/openssl/openssl-1.1.0l.ebuild
index deccd8443de1..1d5afcf680c7 100644
--- a/dev-libs/openssl/openssl-1.1.0l.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0l.ebuild
@@ -28,7 +28,8 @@ LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
 IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
 
 RDEPEND=">=app-misc/c_rehash-1.7-r1
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/openssl/openssl-1.1.1d-r2.ebuild b/dev-libs/openssl/openssl-1.1.1d-r3.ebuild
index 1b8d0ea6945d..774605b4bf1d 100644
--- a/dev-libs/openssl/openssl-1.1.1d-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1d-r3.ebuild
@@ -29,7 +29,8 @@ SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-linux"
 IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
 
 RDEPEND=">=app-misc/c_rehash-1.7-r1
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
@@ -40,6 +41,7 @@ BDEPEND="
 	test? (
 		sys-apps/diffutils
 		sys-devel/bc
+		sys-process/procps
 	)"
 PDEPEND="app-misc/ca-certificates"
 
@@ -47,6 +49,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
 	"${FILESDIR}"/${P}-fix-zlib.patch
 	"${FILESDIR}"/${P}-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch
+	"${FILESDIR}"/${P}-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -62,14 +65,12 @@ pkg_setup() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
 	# must check in pkg_setup; sysctl don't work with userpriv!
-	if has test ${FEATURES}; then
-		if use sctp; then
-			# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-			# if sctp.auth_enable is not enabled.
-			local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-			if [[ -z "${sctp_auth_status}" || ${sctp_auth_status} != 1 ]]; then
-				die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-			fi
+	if has test ${FEATURES} && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
 		fi
 	fi
 }
@@ -118,14 +119,10 @@ src_prepare() {
 
 	eapply_user #332661
 
-	if has test ${FEATURES}; then
-		if use sctp; then
-			if has network-sandbox ${FEATURES}; then
-				ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
-				rm test/recipes/80-test_ssl_new.t || die
-				eend $?
-			fi
-		fi
+	if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES}; then
+		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
+		rm test/recipes/80-test_ssl_new.t || die
+		eend $?
 	fi
 
 	# make sure the man pages are suffixed #302165
diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest
index 3c18bf532d55..882519732454 100644
--- a/dev-libs/ossp-uuid/Manifest
+++ b/dev-libs/ossp-uuid/Manifest
@@ -10,4 +10,4 @@ AUX ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch 253
 AUX uuid-1.6.2-php54.patch 6096 BLAKE2B fcfc58f1c1e1e7b00b669a212d6154db0c2512da137c1cf43efc6703c0e7cbe3623cff2a30607e971f25a8bdd59fb5fc18b7532397ecf7cfbc9ce05e98011069 SHA512 6e3919ffa87e2bb16487761e1b33c0096c8db51bf49e6ba82c3c8f7275d2585c7a7196651a679827c547d8d73ce3739b9f44e44d3f3866aca10ded520547c527
 DIST uuid-1.6.2.tar.gz 397048 BLAKE2B 2240c2e19a09c7b7df0428fc316b46a69b3476ec852321f1ca43c0688b73da647cebf06e8efd8a89f55c11108ef4b9627a33ae1ec235cdda1ac7922389903c3c SHA512 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e
 EBUILD ossp-uuid-1.6.2-r6.ebuild 3025 BLAKE2B 60e909e2aae3ec4d81c7bca9e332ebeb9f0b844db63d6a541cfb9adc0bd7f3c936d747fda766d06f76e35c4f6572240dc78e05e4166e1eda7c0f662a7661f210 SHA512 75c38940f5004ea8d2d599a1eff43a7e38ef9ec4d861740b54e37ceff9a8ba73cc8fdc761c42bdf583a24b7143be18ab0b3a90cdce774250c060b62a4a63ad73
-MISC metadata.xml 248 BLAKE2B 491e9ad2de37296d9a80e8149cc62db2e8fbf8c8fea001ff675c244f9f61740ee1dbceef0b5f467b88ad105f9be751fc99420eff8429f4a1dbb4a00e2b763e6e SHA512 ceeb1d27ec5afa7cd117c05220a5191629c08a008f5640050fab3deb9610d48610a314cff6f1a73577b3e771c3015e14fbc6273377cad6c559f277982f1b0b80
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/ossp-uuid/metadata.xml b/dev-libs/ossp-uuid/metadata.xml
index 82f6562fd7e2..6f49eba8f496 100644
--- a/dev-libs/ossp-uuid/metadata.xml
+++ b/dev-libs/ossp-uuid/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>dev-zero@gentoo.org</email>
-  <name>Tiziano Müller</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/pcc-libs/Manifest b/dev-libs/pcc-libs/Manifest
index 1e8de2719704..a9d8e75660ea 100644
--- a/dev-libs/pcc-libs/Manifest
+++ b/dev-libs/pcc-libs/Manifest
@@ -1,4 +1,4 @@
 DIST pcc-libs-1.1.0.tgz 198204 BLAKE2B 7cd665ba6a1a69514ead9a778cb24fe35561a34ae72cd5e53b63027ae7d4261261542434e3ead68f74056f228c35fe599dd76982280d3fbd2f71f5dc957b30d8 SHA512 89d90f246300ab1da652f652c685756aa038017f5b7d57d050bb5c88e01e70b594ffaef8772230fbeb9461e07c5b1df60e85e550ec4717008159218d50c8697a
-EBUILD pcc-libs-1.1.0.ebuild 549 BLAKE2B 7f0169ae4bdcee16fe4f8159c3d47d140f049ea8ad439d74a1b900e87653ea233d4e24a6fc2bfc1dbb2790c21ad3b57f6d78ac5f36df35491e7dce47ffb4a7b6 SHA512 006f9ce2cc29ce65999fc846c72818f4c33be20c666375fe75ea182d0ea7eeceae25c4aca1aa01554f9f79e343e4b3029572f8c4eb9790a55b4942f8ac7df143
-EBUILD pcc-libs-9999.ebuild 662 BLAKE2B 4717e61287665fe2f6a2797a9bacd780fa0da8e17ea47e2ba6d196791b2cb00985724b7a36d2bc9621af7a3afb2dd9e5217a76b5e78238a8774b96ee1c54874b SHA512 826a8f117788651fff1a1e277bde00b136cb40a141d84df35c4985a44924d3566180d89fedbfd73a7b0e6ab9f99810dcf10e7550c21a784a0efddb3c3d780b66
+EBUILD pcc-libs-1.1.0.ebuild 497 BLAKE2B f0647265c5d4fc49d9f1bce77ec535857bb523071dd6aa0b8dad589fa43e930e294b29c76f9f93d6803e94a2af07e12f9d26ceb92951b2141d090360c5c95727 SHA512 647442082dd5e636feeaf54557c415ef21527bbbaa5ae5a9657f9ea6ecf067a43bd4b61424f1f37911c6747ec90e70373893ecc235922b32be248df2641a3935
+EBUILD pcc-libs-9999.ebuild 610 BLAKE2B 9a9351313660db38c39196ddf23887384a88ca9c72d4b244a1dbd403ae52e42279c63b61d4e28b2a7751c6fca0341d1ab41dd031018c9dda179ad706dbabcea7 SHA512 525262c3bea3acfcdbe06987ea18fd3104ce677863425bd674123f9b302c41de7568314a4241b22b6c986e3c8bba376cdbcfcc7a9eb57946545ce8e8eb4bd14d
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild b/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild
index a045911ed6cf..1c1352594b89 100644
--- a/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild
+++ b/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild
@@ -20,9 +20,9 @@ S=${WORKDIR}/${PN}-${PVR/*_pre/}/
 
 src_compile() {
 	# not parallel-safe yet
-	emake -j1 || die "emake failed"
+	emake -j1
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 }
diff --git a/dev-libs/pcc-libs/pcc-libs-9999.ebuild b/dev-libs/pcc-libs/pcc-libs-9999.ebuild
index ce43fb4adbd4..d15e96041f3d 100644
--- a/dev-libs/pcc-libs/pcc-libs-9999.ebuild
+++ b/dev-libs/pcc-libs/pcc-libs-9999.ebuild
@@ -27,9 +27,9 @@ RDEPEND="${DEPEND}"
 
 src_compile() {
 	# not parallel-safe yet
-	emake -j1 || die "emake failed"
+	emake -j1
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 }
diff --git a/dev-libs/pegtl/Manifest b/dev-libs/pegtl/Manifest
index 04b9b0191477..34666a64384b 100644
--- a/dev-libs/pegtl/Manifest
+++ b/dev-libs/pegtl/Manifest
@@ -2,8 +2,8 @@ DIST pegtl-1.3.1.tar.gz 67183 BLAKE2B 1aef425e5777c44e30068d7b0f5bac813ef9af8e61
 DIST pegtl-2.0.0.tar.gz 154718 BLAKE2B 775eccb11a44eca30ebf72cfa4dcb27e0f46c741efc8071d77232104cb7f6841da847b37b8dab19efcc07aac175558eca949d4c2d4d5d66fcf89793ae3cf7db2 SHA512 30d48bd4a02b7d089c09a6265cd52442d5d9812cf24ae992ea3f264ef8ea27b605771675558f5510e96aec425577beebeb150361001bbce58bd06217ee587f58
 DIST pegtl-2.0_pre1.tar.gz 146966 BLAKE2B e6894dce0df7d41126619523aae866b1335afaac70d0cce2852674e691c93d7f16b550fbc7bf626602a46e044a33f41e9d2e2aa24361088ba99111f23c8bf617 SHA512 180bd8b44ccfe406c818af6b3f5f22eb4cfc7bea6043af5141c6c5ed9b2770624326e67d6dfc47a22aaee3697e5cf1d2744d0a3d3d01a4ce47457189f2b19839
 DIST pegtl-2.1.4.tar.gz 157890 BLAKE2B 5d999b2d5471ff115a0ba38b0b874a031f875ae24b54c25d985bd8bdfd815f6b35b825a0ac5a183e3f87f90445fb98a4b8d7dbc4e8a79e2f6332daf57b6f89d9 SHA512 b4c227e795ab29221bce91b520c5965d48fec85ba53bb070b93e966dc20792189682850b106585ad8bd3e4f34ce8bdb72b576f5f329b2f160f9034b412c93768
-EBUILD pegtl-1.3.1-r1.ebuild 631 BLAKE2B a71c95df3d9a2c51c8efe4a9e00697953519d5b3426d57d99aa6ec1b3de88b4ecb30f80a7a22c5c643b547374891bfe475abe108c97c7f69ccdcb3aaa8a714f2 SHA512 704bc2ba86559d6801109872a839ea0e23e8c680e8cdf00c47257b00605d13db2040d8d82ee18349b0d64fade15b3ef7c28add0014a7eea42de4896c5f3e4206
-EBUILD pegtl-2.0.0.ebuild 451 BLAKE2B a238e5d10dbdabc23d444e32323b9400df17d628bd452bd95004697969747cad60e7433adb7b33bbab8117fea85b7f49af86eedd107ebabdaa60bbe405b7fa6e SHA512 7b0257c71304b569c544dcaae3f7d29a60a1b2dbb2a6f028755b4bc9a2451636f5ef5e8fa7e61862ec68f44f8d1b6f9da619fe1c83d3cf2a5c3e7cd0c266ec71
-EBUILD pegtl-2.0_pre1.ebuild 490 BLAKE2B a0f79e5343c24cfd72b905d9e56c915099cfdc1b50a1ed3a3f44cccef7e88395f46e32eb002337cf81f3e8ed9676c75ad444037f85a7b757259297c8a7f193d9 SHA512 81490d80f2dd0d484a8ed15562004418fd2e647a73cb0e1b9ee8eeffdc9f9fd0ea5e73e1d1f1aca4d05bb2ad6b875e90a0fa380423d7babf0ff8d0b62ccf0dbf
-EBUILD pegtl-2.1.4.ebuild 451 BLAKE2B a238e5d10dbdabc23d444e32323b9400df17d628bd452bd95004697969747cad60e7433adb7b33bbab8117fea85b7f49af86eedd107ebabdaa60bbe405b7fa6e SHA512 7b0257c71304b569c544dcaae3f7d29a60a1b2dbb2a6f028755b4bc9a2451636f5ef5e8fa7e61862ec68f44f8d1b6f9da619fe1c83d3cf2a5c3e7cd0c266ec71
+EBUILD pegtl-1.3.1-r1.ebuild 655 BLAKE2B 0be049ce58b29f0a381cc75c0b738360c3abdc2522ef00c0db54902c407a93cc9d04ce9a6514e35aa5d94703a1f8367492e3817dadcaf74082257e00dfa25b9c SHA512 4bf7168ba0cdab9248112ae8fe97a26b003447e9be5d2e9e893802e0fe9f4fe5ec3c19875d7f99c7dbbcc37128e2b0ccbc9a53db266e932337d53a8d96fd184c
+EBUILD pegtl-2.0.0.ebuild 475 BLAKE2B c71abaabebbedf52f3c4069b53786ea20c45ba5a8705fc370eb84242094dc0d99e5994b3098f2f913b4f5e0e0934b70ead88da553a9ba326a649092edea8b945 SHA512 0982b2a5591eba5880cfc632302de047ed2d0a649d2163a97443438ee2ecf266a3923f9d39f00d50afc0af8f123aba19c17ea32e58c2db262a19c6ddeffd4d35
+EBUILD pegtl-2.0_pre1.ebuild 514 BLAKE2B 1f69cdb687a0be6850303bea98b028e16b2403058727bf3e766851588cb97d0360dfaf91a2e2a71978df13fcdc96d9228f7f96e2a020b301d125cf24a69afb45 SHA512 3e0898e3756f52ad993554b146f9ca5ab77fd642c4398d3223db38099a05c9739673193103ef9f7f4f704514cc7c9a64d1bcce335f76afc904ec7aa512a43cc2
+EBUILD pegtl-2.1.4.ebuild 475 BLAKE2B c71abaabebbedf52f3c4069b53786ea20c45ba5a8705fc370eb84242094dc0d99e5994b3098f2f913b4f5e0e0934b70ead88da553a9ba326a649092edea8b945 SHA512 0982b2a5591eba5880cfc632302de047ed2d0a649d2163a97443438ee2ecf266a3923f9d39f00d50afc0af8f123aba19c17ea32e58c2db262a19c6ddeffd4d35
 MISC metadata.xml 444 BLAKE2B 1d99f8967121f36fd6f54ed70c698d28419eac7dc88cc58183bb7ad3248481c404f4b55419eb42492ae81389c694df86e39ec4fcecf3284680f32411ab8f69db SHA512 5a412986a17cc8d2cc16eba8e20c269d60b75d53db2bf04fb87b8a0c2dfffe6d30108c9390af7565d5442bc513b302f26dfe970c9c3149fe999cad90ef4c5410
diff --git a/dev-libs/pegtl/pegtl-1.3.1-r1.ebuild b/dev-libs/pegtl/pegtl-1.3.1-r1.ebuild
index 27485cd73385..7ea2419da502 100644
--- a/dev-libs/pegtl/pegtl-1.3.1-r1.ebuild
+++ b/dev-libs/pegtl/pegtl-1.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/pegtl/pegtl-2.0.0.ebuild b/dev-libs/pegtl/pegtl-2.0.0.ebuild
index ebadbdeda819..e597fab28ed1 100644
--- a/dev-libs/pegtl/pegtl-2.0.0.ebuild
+++ b/dev-libs/pegtl/pegtl-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/pegtl/pegtl-2.0_pre1.ebuild b/dev-libs/pegtl/pegtl-2.0_pre1.ebuild
index 30237ac2126a..1290e13ad05b 100644
--- a/dev-libs/pegtl/pegtl-2.0_pre1.ebuild
+++ b/dev-libs/pegtl/pegtl-2.0_pre1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/pegtl/pegtl-2.1.4.ebuild b/dev-libs/pegtl/pegtl-2.1.4.ebuild
index ebadbdeda819..e597fab28ed1 100644
--- a/dev-libs/pegtl/pegtl-2.1.4.ebuild
+++ b/dev-libs/pegtl/pegtl-2.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index b76f1f86e633..f1177048fb0d 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -1,14 +1,16 @@
 AUX pigpio-67-makefile.patch 2074 BLAKE2B 7f8d9e294992301d64ce0c0f6d6446ca97b790057cbe5eeed67a12d91966d5fa9053cf69ee284a7d2a3a39c8c53ac4599ad38c7f47bb630bf5e0ec9fa10e63e7 SHA512 443052a0db49c5a5b9fa4be6e01a7b78efd392f157de6a2855e66fe3da9353f5dfce2f30aaed86ea6f05e0fd2b75e3c0f51c8b9996561db968f160cc3aba3d97
 AUX pigpio-70-makefile.patch 3244 BLAKE2B 3a8155c52ec15227c815a5bac7b42a1fddf9682fbc10dd4513d6c5d7da8b2e1ea9189bc4b28560650b69a857e65c3db00b7af1de30970e23d1bcd988bbba0255 SHA512 096af62d64e61fa6d6394484c58e55dcbe4aa22551c5b3448209e6dcd707688dc3033d219eba954c0e78635d2480b7c7de044aeb18a80d0ac0d701b4d4cc4fa8
-AUX pigpiod.confd 188 BLAKE2B ce3d491b4e333492d42ed84d9f6728631263eb57ff54c56f44479e5567b165666feac78be4aa118bb71d77932bea4c243ea0dad2907d8986b017249c8182a523 SHA512 83903a28e3f9a341b9a709408a2df6b0f89120fe5db529e982e473e27abdc80a0d1f861d1011021ddb04c5c3f9cf040d8dfa6fbb41f216848187c272581b503a
+AUX pigpiod.confd 201 BLAKE2B 6707d0f0f8772110b6e1167abcfcdcdfdb22936024f3c1234f05c198853cde3b55c5474922fdb64dcdf49440e9ad163216c0b11ffb80ebea2fd413cc17fdc685 SHA512 96431969640fef1b5ce317f0f9ce93fae081f186dfa89c00b4f469e3657a7792c5d157ccff7d019ea4bb4848a6657c8bb8f111f5a208440cc8a0723772e7c708
 AUX pigpiod.initd 215 BLAKE2B d7797cc0d1d388fd21831e33cbadd031e2cb974e26367596dd4c9ba054fbdd4b04200d0ff61dfe797520d2e0745420a5d973b44a41e15713800a7828f097cec1 SHA512 e1db38677a248c3dbc33aae6809eb8df1dd6253f60ca852d98d8d6d428d23d7a8a31a031da3b786b7105d90f0cc52687bfbfe320e5c6cbf0fbf02b5ad5c6e606
 AUX pigpiod.systemd 121 BLAKE2B acb298046861f0dc0ee65505e2fa4c62cdfee3e628044d07881891f630e70507d27f253e1735457d56b6f7d9e8602c5a1597765c808f8cacaff96ce0efb52df9 SHA512 bb67874841fc629f5987dc41115ac6cfdd477264d5022bac06bcb3762394818a27f4f6357d537408c2cbcb81959e60ab894fd7e5c45f9a138a45f6da7208ef61
 DIST pigpio-67.tar.gz 369268 BLAKE2B a9d59369f5eed4b733e0e5c0e85013a132e55ff63a2393d79a3fb52d1fcb2513559d4dfeea84c4842d6281936b6e116bd81cd63e4542bbcffaf813ee356ee0d1 SHA512 9792f8402ee0dd204f4a975ab0513099a1fe3d398a28b766f412c08d7908e8e307de4cc92b2a2519b6484f15a043bd40008b7707486015c08bda5f97b1e7e00b
 DIST pigpio-68.tar.gz 371251 BLAKE2B c0118854d18ce158a3d5c96380289cc8bc68f35f72ce28f207dfbb827f97f538acd82cec2af11590e59985b77ef08834d55b3ac7578e1f6b6d1a0b5d5d594632 SHA512 125364eab9dd33c39fda148c6018679ac91b099914d7f0c6362f61566a9c957065189ace03ad4668b29f25d4d542b81d42c0befe0712867b48977b755dc03edc
 DIST pigpio-70.tar.gz 374569 BLAKE2B a2caadf0e1307c8c3ce936d5fd4d31e18185aa53900f6b2cf8b92a31f423b9a82bf4d2b7212fa8cd5b2d26773598a138ef8331884410f3f418542f43ca1fe2d4 SHA512 00db37b9c0f9751e6179b19e7018583abd9e11d78d01ff9f99b713004cf4e6a224e93644206599378a34dd46fd75c08557021b706015b0bc2bd8b34e363691db
 DIST pigpio-71.tar.gz 374952 BLAKE2B a79a408915285674211e50e30d3cafa433a9ee364cacced501e109d6c31a3a03c14f9d25c3c18e3df252801de65c60ca67cd5f1a8e08f05be8098ad591a14fee SHA512 c3bf029bebff9a7ee02b48597f624a5dcdf277c5c1a7ffa2f6cb83885a93cd6713935d9502127d11c4e9c11e7f6f6be49c8af367707eca2fff469728b5248e2f
+DIST pigpio-72.tar.gz 384220 BLAKE2B ff3466df80adb6ee9bb2f6bc8aa9589bb6789746eedfab410d2a23dcd4986c29297f71469c8330c55603d8aabba7a4b2171390a63c21a12464b45cc4e24645d8 SHA512 c090962cb11204774e4a97a3dec37146882d66abef4d3e4de62e116b64650d6c66f95646f6350e3a45d8b2ba261a8d16c74f7648869cd0e94f42a80d88bb6d6e
 EBUILD pigpio-67.ebuild 1086 BLAKE2B ead6c79ddc9eb0132ed8a8829c882b6eb7e52e62d754f5368cefd3c06d1beb44703aa19936fd6f1a0ca6cc165e575a786ad83c85d28cec5cf62007a2591336f2 SHA512 835c65eb698fc746181a5062a433a0eaef7e3ad5e86017863ed62ce5d8feb903e77ac6dddfcc27cbfba1ed3f823ac20c3d4bc3a381bab35425368010b13899fe
 EBUILD pigpio-68.ebuild 1099 BLAKE2B 90b8f83e25a1146557411ec07a09f82dc3dbe2ecc9df3fcd60ed4265bc6f18301ba743364144174e9feb0a69ed5705f54ac89ba5daeeae2231b43270a2bf69f7 SHA512 b1eaa643b9bc949664c417efcef64317359b58898e7df9810ff0d7d01f884151a531a10d66dbc68f9a3e45abcf8485fd6051a9053bf26316af07dd538ec875de
 EBUILD pigpio-70.ebuild 1099 BLAKE2B 0565c98714cf0c5159817543f7d29a41cb21334a4425c81d8b45768c6d69989bf33cab7128dad03e21afdcc13f4e92f6a4e882c6110b0f598ef461d68fbcfb11 SHA512 e82831ad43f6eb0d40e358120e763b70af14567b5e88fc87576cff1a3646113084b5b2aa25a9350b2815e582c5fa6cb25b6df5fa6651894b08f89fc486ce4042
 EBUILD pigpio-71.ebuild 1099 BLAKE2B 0565c98714cf0c5159817543f7d29a41cb21334a4425c81d8b45768c6d69989bf33cab7128dad03e21afdcc13f4e92f6a4e882c6110b0f598ef461d68fbcfb11 SHA512 e82831ad43f6eb0d40e358120e763b70af14567b5e88fc87576cff1a3646113084b5b2aa25a9350b2815e582c5fa6cb25b6df5fa6651894b08f89fc486ce4042
+EBUILD pigpio-72.ebuild 1099 BLAKE2B 0565c98714cf0c5159817543f7d29a41cb21334a4425c81d8b45768c6d69989bf33cab7128dad03e21afdcc13f4e92f6a4e882c6110b0f598ef461d68fbcfb11 SHA512 e82831ad43f6eb0d40e358120e763b70af14567b5e88fc87576cff1a3646113084b5b2aa25a9350b2815e582c5fa6cb25b6df5fa6651894b08f89fc486ce4042
 MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
diff --git a/dev-libs/pigpio/files/pigpiod.confd b/dev-libs/pigpio/files/pigpiod.confd
index dbcf8a4c3efc..02c1442322ca 100644
--- a/dev-libs/pigpio/files/pigpiod.confd
+++ b/dev-libs/pigpio/files/pigpiod.confd
@@ -1,4 +1,4 @@
 # Only listen on local interface by default
 # use evironment variables PIGPIO_PORT="8888" and PIGPIO_ADDR="::1" for pigs with local interface
 # PIGPIOD_OPTS="-l -p 8888"
-PIGPIOD_OPTS="-l"
+PIGPIOD_OPTS="-l -n 127.0.0.1"
diff --git a/dev-libs/pigpio/pigpio-72.ebuild b/dev-libs/pigpio/pigpio-72.ebuild
new file mode 100644
index 000000000000..f4a86cfd1b13
--- /dev/null
+++ b/dev-libs/pigpio/pigpio-72.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1 systemd toolchain-funcs
+
+DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
+HOMEPAGE="http://abyz.me.uk/rpi/pigpio/index.html"
+SRC_URI="https://github.com/joan2937/pigpio/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~arm"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-70-makefile.patch"
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
+		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
+		mandir="${EPREFIX}/usr/share/man" install
+	einstalldocs
+	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
+	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
+	systemd_newunit "${FILESDIR}"/pigpiod.systemd pigpiod.service
+	use python && distutils-r1_src_install
+}
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index 9af3bb709485..c2d66ebfa9c4 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -1,4 +1,4 @@
 AUX poco-1.7.2-iodbc-incdir.patch 321 BLAKE2B 640c0b69e8c925d48da6f2bfc59cd2c77a02662ad1d8d447bb8c7ca23234ca1859c4aa9497d5703ef5f675d9096606254a9142770c6fffa4334cf71b1ca6953f SHA512 f3a0b4032fd4f71f0281d58c00241b1cd2f92da1a23a8501c420949621167d1fc7e2a2ed3ec48b6f75d35569f6443e3391eaf19a8c8fbd17e24d1cbd9ffd892d
 DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
-EBUILD poco-1.9.0-r2.ebuild 3848 BLAKE2B 997744d759075ab074b611237b98327a162eca4778e8a6cb14e6823ce4b21f182f27e2c63e10aed205c18208f43abbf0fc268d61d7cdbc4b799da0c2a563202a SHA512 7b05546ae7dfb9faa3cec811e5a7300aee3eae3f8ed74aeafa6056ac16d9a290812cf90d3796c0c24f7606f5d436f39a820d8c7ecf05a219d033ae119a631f25
+EBUILD poco-1.9.0-r2.ebuild 3875 BLAKE2B 1167b9fcb6eb6c92fd2637074688b0119485982e7c0c2be05add52ad959db0b391f428d7262dbf2d4da0dca5f28c82fa9e5ecaf39276baf934df405d27b15b5a SHA512 63bd64a13e8f200ebbed2440edba4f3724245243a11b74dcc004768b42bb708fa9e560e6b1e82a53d11ea63dce5f1b85779d2fa58dd15b158980a84d6161e8c4
 MISC metadata.xml 2354 BLAKE2B c376c105867c39c9bd2fbeb553f40acd95d71307b5c89b0e2d685862fa901b06c3056ff7996b4a1bce8b70f70bad45678c6a0d41567564dc009841f520fe8b3e SHA512 9263939c5e0120e2687446859db4fbfd84072f1d1ae37cb993b1eb69c39dddc828aadf95ef9fed86f8bea65ce24e041740dd48523ad68756b45ef47454c64a8c
diff --git a/dev-libs/poco/poco-1.9.0-r2.ebuild b/dev-libs/poco/poco-1.9.0-r2.ebuild
index f2c9dd98dac6..c122dc9b1642 100644
--- a/dev-libs/poco/poco-1.9.0-r2.ebuild
+++ b/dev-libs/poco/poco-1.9.0-r2.ebuild
@@ -13,6 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 arm x86"
 
 IUSE="7z cppparser +crypto +data examples +file2pagecompiler iodbc +json libressl mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	7z? ( xml )
 	file2pagecompiler? ( pagecompiler )
diff --git a/dev-libs/processor-trace/Manifest b/dev-libs/processor-trace/Manifest
index 16a9d425cb24..631dfa882e4c 100644
--- a/dev-libs/processor-trace/Manifest
+++ b/dev-libs/processor-trace/Manifest
@@ -1,7 +1,7 @@
 DIST processor-trace-1.6.1.tar.gz 250843 BLAKE2B 0fa3f97f14e6fb931ea787261e84c65cbce0667db7adc709bdf386f5a87a9eb9af71b3b5b45c1c0f17d6b8e6800b92e9417955dc5496f3f6d3022620153fc2ad SHA512 c7c9c8ba78021fff3fde12a216f5729c6031114e5a727f49b7ff1a31c53b5ddba24d1b3aee252d8278ecd1fafe78a44ed059c12b9eb29eca33093e0720673468
 DIST processor-trace-1.6.2.tar.gz 259982 BLAKE2B ab394dd37eab924e841d77911f90e0b3ecceac69ae1b8fcd911c0bc26c2ac4aedf8bde3e0d8197b3341159d6b35458177f0c795eb9c1b146e38fd278135042fe SHA512 10f4ef6bcca9a4b39b0cfbfc82d79a6adb206aaa1a78961b0dea0926f7e2e462ea3cd5430dc82e71ce9dede18550f3c84d38fee26e1b2065668767fb5f796995
 DIST processor-trace-2.0.tar.gz 338965 BLAKE2B cc536139ab0e6f7e0d4a99e906a32e9636e55444e4c5fc37fb18a0df538bb5f6ae4c0cf4bc207afab6d0490a2fa7678fc8a0696dd1b16055869d6fdbd73618db SHA512 ec63151e842c81cc73ea11ba560b63e005cefbe19d98de24ae5c8caa4de7c9c1d71d1ec5b6214a347592eac675b75a3d2b26d4691ca86f91020ebfea8e912939
-EBUILD processor-trace-1.6.1.ebuild 543 BLAKE2B 0a4155b01d2de88da40c6786cb052e8de930350a90a72aa734f25660b4e7441f74705f4a5808f091da2e540485e1544183817d60a8d94d69213d6d3443881f87 SHA512 6fb6b8239ac8ee0eb3d1f8d1c15980df0b0338bf9e78d3ac0b4b3dc1e22bdc9ca2db8d2e760e70682087748aa25d9eb6a440445493334f31ca00534115fb7f61
-EBUILD processor-trace-1.6.2.ebuild 540 BLAKE2B a44ae143be81d5cb72cb63fbd04b4a22407ea8a4f17a2ebecce0753d9c85e1a80a314a267d93551fe6d68efd0b9663cb17903a8cfd0d82bce343bf2debddfe1a SHA512 a3bbdf085cec752deaf4023eb99c58e246ca837dedc39e46f0809b5c430df9df995d98e7e7e131531a65fbe08b7a8accf40864894751a0ebd4f4001b96bfb47a
-EBUILD processor-trace-2.0.ebuild 544 BLAKE2B abd9ee3819ffdb9458f48da3d1c8eb5c32ecb65f902fa5791d9edd87476e5f00105c2cb883e35f474927d8e4a7fb24eb0cb180a96afcbef88a3833884b72a125 SHA512 b72dd17cc2f06c009164ff6f051231092b2befa9055590ddf39a5527c6a3c90db2997214f1f2083b637d1089d7b88bd70572ae142489aa546152e5b6d5b385ea
+EBUILD processor-trace-1.6.1.ebuild 567 BLAKE2B bcac1b2a0d401e99dec6b5fbee8c812762fbad8726957f8fbed959b45569fb08b9920f9f7c646fc006aff51ae581f06087ee702f5abb22d88b9785a869d57656 SHA512 6d0cc083b32c9eebfb9a8ca8b8549297a81ab2da0a56e7546cae7f9c5a180eac341bc6b3ac854f41f9ed3fdb8c959e2b9fcc27bc0b4afd4905f0d0ee710d6912
+EBUILD processor-trace-1.6.2.ebuild 567 BLAKE2B bcac1b2a0d401e99dec6b5fbee8c812762fbad8726957f8fbed959b45569fb08b9920f9f7c646fc006aff51ae581f06087ee702f5abb22d88b9785a869d57656 SHA512 6d0cc083b32c9eebfb9a8ca8b8549297a81ab2da0a56e7546cae7f9c5a180eac341bc6b3ac854f41f9ed3fdb8c959e2b9fcc27bc0b4afd4905f0d0ee710d6912
+EBUILD processor-trace-2.0.ebuild 571 BLAKE2B a5077681da3182ef6a2fd8f3e881b81e166730d8f214343370b616bd9664794a70836b19d47bace9643ca6fdb23b4fbf8622dceb5e81af446b7cb35eace3e11e SHA512 70553ee2b00358a367a3f7b1edd676e3e775b54e733dd53c3dbe31463064da66cc1d40a7246f638f62860617f009f1bd3ed5f2384a9a849d910f0552a5c623cc
 MISC metadata.xml 369 BLAKE2B edcef74fef3ee485f69eb5c78d78dd917969ca0caf6d0e1df3829abafe94c88bc5c1b098c79f1c7f9af67108a3d31f841ec749a386d25785db20f160091f450a SHA512 2f19cdf8f8f3bce36e4c7f904e16b8068cdf41fb01e8031c13afee9a413e1d65084fa69db2198ba0b239ccd05ade12bc13ec042b689eb86ee725d51167d9a9e1
diff --git a/dev-libs/processor-trace/processor-trace-1.6.1.ebuild b/dev-libs/processor-trace/processor-trace-1.6.1.ebuild
index 5e70a10ca37a..8d50273392c6 100644
--- a/dev-libs/processor-trace/processor-trace-1.6.1.ebuild
+++ b/dev-libs/processor-trace/processor-trace-1.6.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
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT=0
 KEYWORDS="-* ~amd64"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="doc? ( app-text/pandoc )"
 
diff --git a/dev-libs/processor-trace/processor-trace-1.6.2.ebuild b/dev-libs/processor-trace/processor-trace-1.6.2.ebuild
index 58e645476adf..8d50273392c6 100644
--- a/dev-libs/processor-trace/processor-trace-1.6.2.ebuild
+++ b/dev-libs/processor-trace/processor-trace-1.6.2.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,6 +13,7 @@ LICENSE="BSD"
 SLOT=0
 KEYWORDS="-* ~amd64"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="doc? ( app-text/pandoc )"
 
diff --git a/dev-libs/processor-trace/processor-trace-2.0.ebuild b/dev-libs/processor-trace/processor-trace-2.0.ebuild
index 253935c1743f..9d3e61966693 100644
--- a/dev-libs/processor-trace/processor-trace-2.0.ebuild
+++ b/dev-libs/processor-trace/processor-trace-2.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
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0/2"
 KEYWORDS="-* ~amd64"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="doc? ( app-text/pandoc )"
 
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 24a657d00600..4ebe5032b0c7 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -2,6 +2,6 @@ AUX protobuf-c-1.3.0-no-build-tests.patch 1020 BLAKE2B adda0e4764283d00093709bc9
 AUX protobuf-c-1.3.1-protobuf-3.7.patch 562 BLAKE2B 4319e91d94a0f3f47bba3dfca74e5a9b7813480719c64e84c011483f3fca03f629083d4493567c0da83395adf969a8d9b08af42c6886eee7556c989c5f7d0e67 SHA512 2ff16a126b751a2faab7d1585c898cfeb07da46e8c636dc4cd44f25bb70575358943ee3e4a6ed316d93714a9668a6dec27e5e7414d458d606ab67c809ce215fb
 DIST protobuf-c-1.3.1.tar.gz 498779 BLAKE2B f9ecb2cccd8e01a2ab5bd797883f245db418a76ac73ba3e756e997e944637732d45b3fca2a45d3caf4cd89f35259180fa05e64b8b02b63537005420f2233ba37 SHA512 b32920130b4be5e8a8373c2ca37ffe7eb263accf163d93e25a9eb4b6336ec40b05dda2458fe8f0c3cbcf6e0e08e9541fdff004d696f30a5d135b7a3bdca8b2c3
 DIST protobuf-c-1.3.2.tar.gz 500100 BLAKE2B b8bcd4ad6f9ddc05f28526f7cc58778b21a34fc18c7c7aa2a5bb45ae7fdc7c5d8957f989fe1bbfe353214ca87b02afed8cf0ad43c0f0e39f7e13059a5dfd6b7d SHA512 d94d2c6f11b3e482fd3d1b8cef5b2d896ad37a679068f393d29916311deadc5b6b86f946b046d7ee49260b0223e3128e052dc76324b4a8cd6ea184d566ad9aa6
-EBUILD protobuf-c-1.3.1.ebuild 1017 BLAKE2B 68efa1e2a1ccbfa08263d05f59c21712302e9e3a3264a0cea011ef96c310d45b564662add4f1aba095bca18deb7f5191be9f33ac81045c77443d947accc2a468 SHA512 8efae9b40e88d6d9d61eed0826324bec9a5d941b8a69ba39f1611c011dbb538069c3cfc885074113bea2f260921b73dcf0ad20515452ed94159c1490154fc240
-EBUILD protobuf-c-1.3.2.ebuild 969 BLAKE2B 1dc51b298ffd27365deb77eda682dc2f5ea493a1b7f35547b4d94473495e7b2cb95727d2e0a31de872f997ebbe6f952a7e71ee6714603ea96e0ffd40900b1fa8 SHA512 51176dc900fef8772f2945e14b854040e9c8f57264ebf04ec6191054bff8da47818e3fab74057041e25e793a602140b723f6893bf1e836c1ef918ad94bfccc8a
+EBUILD protobuf-c-1.3.1.ebuild 1044 BLAKE2B 661b1aec34516657130cc0183d429ebf9fe9f2bea1d56afdfb454c1d4137346067dc3da500d7202998e6a8397eeba79d2e2135f9a1823152e2048aa0011962e2 SHA512 67463e441eaf6e2e13a7a92f6d53675ba1877529d78ecbda8a9ee1c2dcd94beb21fa15b1f71802be684650836ea121e2c88cd0265b4d9db187aaaa31df3d78fa
+EBUILD protobuf-c-1.3.2.ebuild 996 BLAKE2B ca19872d0c308dba1f960d5c8fdff2e84d1b1dade9e877493348431c283699deeb9647cff8a5a34fe92ffb8673b587a20ec51341fd3972ddcb067602c25af944 SHA512 f8e639254db6c1c7b8d0b3e537c24c20b6c4dcddb7650299c05a1e5d34aea5a44231890a21f3d8dbe6eb58a0bfbd2ea207159ce7ce096c990bba1b94cc0934e3
 MISC metadata.xml 258 BLAKE2B 4600b6e0e51f9c280726dd71ec122d3c51e0c2b1f8b4ef208a1c9838a01d405bedce2cfd6949bb2dbcc448f76f45c717a630eed98fb9d0ad06c91dafdc2ad288 SHA512 92e3b05f2cf1d2ff09b852d2ad8707f55b4cd3fc78df317fa5234a9c0018405cfad67d90211435963983440228dfb75de28ab7ee62f1a80bb97192768d93ce92
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild
index 7c0ba929cee4..84e9cb58fae1 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.1.ebuild
@@ -17,6 +17,7 @@ LICENSE="BSD-2"
 SLOT="0/1.0.0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="dev-libs/protobuf:0
 	virtual/pkgconfig[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
index e666446a3b08..b53ee8f1a856 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
@@ -17,6 +17,7 @@ LICENSE="BSD-2"
 SLOT="0/1.0.0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="dev-libs/protobuf:0
 	virtual/pkgconfig[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 8e660fc0307b..1fafe461c84f 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,24 +1,20 @@
 AUX 70protobuf-gentoo.el 170 BLAKE2B 6d9a92bd3310ca09d18dd762bc0bbd4b0b36184c17f95c80c02183c457fe4ff1142ca1e3207e5a77c078fe5f768cb3e85abc712abc1f4c85774ca1ebf178059b SHA512 ed73cd6b1bf6c0019e4da73c3a480b0f917e949dfad2696336e805263c81610b2a8a0514840e389db0f0e78252cf053d754c5e07731dc5e9c93c9e88f0b2923c
 AUX proto.vim 49 BLAKE2B 9b6d31105811a8f8cbcf76328172fda5b66b33351bb16573ed1ed08d4c553af2805962a6d6609fbdad4a2644bf9cecd1e771a557f138111ad2c0be959b497ee9 SHA512 65c1f49887c17973d1dfce07fa86d04c5079d2382826eaeb22e128570717f181c53d22ba50905252021f7e476a90ecd29f9d18799c1ccea64b01f4638323538e
-AUX protobuf-3.6.0-disable_no-warning-test.patch 965 BLAKE2B 6ec0b1fc9d9d0be4f6dc9bc023d65b6b04c98d624ca4d1926cff0554d774d7cffd8d3597383acff1b7aca1a92dff4dd8368d5d86f1612aace16ede836f025af5 SHA512 82e601a26e51903e6b193c50960024240aecd3ddeeba8b29f437c550ad0bd277573ea4f83bcd70b2a4187c7df2b25af2790de22fb6f009640c403a9502d703be
-AUX protobuf-3.6.0-protoc_input_output_files.patch 9632 BLAKE2B 6466f6f6cf08e7a9a89ced8281790593fa9ea85e029d59ff20bba8c9add16bbb039a44d1839516bb109b9a2b269773640b43e6137fb9ccf5f100ef4109ad2b8d SHA512 8ac3c42684869e1b45d0d1ec70912610eaaa6962bc14d9a89b1244f424af7d638b4905b6dbd7445cd5f54bc4520fc1fbae88c66d9f4a9169db879abd1fba2faf
-AUX protobuf-3.6.0-system_libraries.patch 6323 BLAKE2B 0fb8e389a58b76c592b592782900b48bb6c68e85fc159d4b9a59a43ab5a116916f7d9ef15cca392e5751f015a887f855631abb124b4d4109d51f6ba401059549 SHA512 ab58b9aa9d1398a15346d6e85611ad826f8e52744aa137ca4f138348b4738afc7c6cd27129f925f5142edac7e272d56da880a83b216b2ce264804d6967997728
-AUX protobuf-3.6.1-libatomic_linking.patch 1753 BLAKE2B 50f8ac92dfada973ebcd187fa508a46ddd5d4e034e2eade2a3fcbb35ffab771578b241fa9a5343b46e91c90c4507e1d3a75a1bebc3426dbb1694c0fbb8cc03bf SHA512 c8bcb885dcf7d2871136a6410750aad69a61450b5a4bc80df56246a5875e1e9895d2d63e9e9e6deda3c4e516cd07344b92619457ef41f4f2ff0710c774957466
 AUX protobuf-3.7.0-disable_no-warning-test.patch 965 BLAKE2B 25bd6deb1ed863826b6e940af58b8cfdae6259ef49172cdbc9bdd9625098401680329e07c53c50f1f777b496415face4c69cf4dacc908fabeb0e10d268f96800 SHA512 195edc8144ef7bc53c00d3327c56b3e6e389ea9a79f5059d15e1d1d78ca5ccdbd0567f32a0226047eb9e93eea1dc6cb36fc210833cf99415a698d4cfbaba23e8
 AUX protobuf-3.7.0-protoc_input_output_files.patch 9901 BLAKE2B ea663e63bee282e33066c03b1e73222eccc7cc20afea62ebe9745f67fcbee44a41ec750f1db7a822c65a62fcf1b454a3ade625ad56ec0241f499c7314f8575b3 SHA512 bbe6562afc1bbdb9cd641cc25a00092ac53734c194a32d21a974084af01f0836c515f6e00e730c307491b5ffa31b872154c50e67cfe16f0caecbc707d8d87527
 AUX protobuf-3.7.1-system_libraries.patch 6352 BLAKE2B a5c09076c28aefd951847da75dc280c05f7da9c408ea3c1da9b2f08a2ce92a6cd57e684dc0b516b31283619399c96d288bdf3a44e126a45113fd695af4122a51 SHA512 0633a1ad4dfb5be879e11abe4ed769e9d6c08a505f45c6d302f80a4706b0234e0e11d90d77356f09a640657eed353c48e0ce4ba0816cda84c3ab3f21c8252245
 AUX protobuf-3.8.0-disable_no-warning-test.patch 965 BLAKE2B 0183ed17104e192fbd9efb4739a41ec2d6f39e31cf6aacb141f4e5015335096321491d68748613ef18eacdc57437b111a15b5b4762b0b339c716b98dc1b7041d SHA512 37846745f1e88fda8dc84a829e266e8f8d2c98a075750b2e548fa2b8f34a97d37b6b5200e880fc29a9682fb95a8c75567b53bca532859068a7b379540940067a
 AUX protobuf-3.8.0-protoc_input_output_files.patch 10351 BLAKE2B 54115688e2fb6a7b8c33cd2efb4dddd777f4d536f4b078badb60d6e458766b69c915fe4091f4ca379eee59d75875bcab9837a96bc461b6a60c15b93000fa7e38 SHA512 2e18b47aa82a035a76c45d6f80de7818449f6358e0e253cb6330158bf9d5b213052b372797189246eaeebea8497b289e8a0de16441f25bcae81ab807733bcf60
 AUX protobuf-3.8.0-system_libraries.patch 6352 BLAKE2B fde8a49ac3034320d9ae03479127946b1b50a0fe64d388132a129d8cd0a5cb6eb82565e82089fd1dada83848ef494fa87eac8dec4cd4b90dde580123dbe7f006 SHA512 0264d20c585312345315364a4732905abcca569535460d274528ddb6dcef6cdcb9661804f22c8cb209a7123fb41df7974ac739baa65debe0b676b2b902482d4a
-DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963 SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e
+DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
 DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
 DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
 DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
 DIST protobuf-3.9.2.tar.gz 4947582 BLAKE2B ff0150970286d1eb452bd2f252fa8200617ddf491dcb3b9b60cebb36268c5a3072df3d24142ca9863306df6690f53ad4d4761c7846c677c4610716ec22e0838c SHA512 510349ddc59b4e53087b5247ca8784e9f852d66d755e1b014c6214e14c003f31dd336a724e9eb87a5b85a70e22793eb3211744c85a514b24b687346563717bec
-EBUILD protobuf-3.6.1.3.ebuild 2632 BLAKE2B a56bc323756a435869076bb5e85d7aec0c777b1709dde5ba78c40cceac648802366710d00508296928cb8b7f8b3fe9f089a38c4bea32d3b877902970cb6a9c82 SHA512 afec4771997a723c61c223465fa7b18d4d8c66676dcc606a1e2d7ca06dc45f7b16c2fc12c816a08507e09c6b98d0271154310125849356e72ddc7b28b9d84a3c
+EBUILD protobuf-3.10.1.ebuild 2896 BLAKE2B bface58b3d583644626356a47d4b7769674cd6613a7b7a7a5dddd281193a38d2f521f69edf8383940237a67fae802e07c915848c295a3c98541711afe14732d3 SHA512 09e72d8095e13ab78a54f458545fe6cc53688fd3b10939a5593e480dd984999ff981eaee2a9609cf288618e619ae4a7f50010c354edce5650c483bfce3c908cb
 EBUILD protobuf-3.7.1.ebuild 2943 BLAKE2B 896edce997fcecd5c16e03906333fce045a365c387b42a9880af6b6ff4ffb8a8a585a80db1833ea1b215830e0fbf8eb7b915bea3b1b13db8fb68ffe98153cc1e SHA512 f0c19b39ecc5c9ef7e2fc0fd5bb5479f6d467c82cf260d943aadfe5e8c7616b9a9e2753213e2d88c1b6cd77bbe5d9253dafee65ab892e88d2e6b36285e8f3faa
 EBUILD protobuf-3.8.0.ebuild 2885 BLAKE2B 22e6ab723460715b5869c2fcc63cb99940c2eb816e0abe9211669cbe7513b667e95bf2c7c1ba160506ef84719ce4aead47713d879d0acc2092c509e2f49a46c5 SHA512 becedb4a1b364bff5ad47430dcd688342c4fb5094f0e54cf0d9579fea5631789b3bf68400db6254f21e072b8bda9f8fc95c43efd279403fd2696d519ae62e2fb
 EBUILD protobuf-3.9.1.ebuild 2896 BLAKE2B c893d4fd10dc19eb708804bb6c65ff9c349ead7e318e87a44aa6e6554ca8989227de888b5ff733d788ab2a425d1c6342f67ef549705559efddee8deb2fc2c69e SHA512 27e0441ce650a4981808dd5fd25b88ae33371e012be0e522635907bfce65e049d2095a14dcfed8c261d5c2ec3d3a34e0bb214bd133cefa5e5c28aa8c3be61332
 EBUILD protobuf-3.9.2.ebuild 2896 BLAKE2B c893d4fd10dc19eb708804bb6c65ff9c349ead7e318e87a44aa6e6554ca8989227de888b5ff733d788ab2a425d1c6342f67ef549705559efddee8deb2fc2c69e SHA512 27e0441ce650a4981808dd5fd25b88ae33371e012be0e522635907bfce65e049d2095a14dcfed8c261d5c2ec3d3a34e0bb214bd133cefa5e5c28aa8c3be61332
-EBUILD protobuf-9999.ebuild 2664 BLAKE2B 91a5ee25ea6ac2ff3f15be0b2dbc320df7dd1ade591cdc370cc66d31c67332eb1575623365d75c8181fc37e909f53426b3389088f06c733b88333534b8e47df2 SHA512 8776d66984da869ea25afc82206d151b64fbe1efac6fc903210ffceb2616e4202dc461c58cb85411b471726fa5eb5cf8443af5363d6838729596cf66683bb76f
+EBUILD protobuf-9999.ebuild 2664 BLAKE2B ce3271e6b62debde93d811843966654eee37cad6b7f2be149e519b3c5647ae64703415327862456d5a194ea2922f6cde80af54515a6a65f71258789dbdbec3f5 SHA512 97590b5caab8d9815753ecee8f7cff8ec8c737700e5a0555769a36c1a663e26816bf9e4c72616d8b740724753f230bc20cc5d5684fc9440494a0a4a6f038a419
 MISC metadata.xml 627 BLAKE2B e908d6d2ab7bf7886f09af02f2a2828bcd9d6909ad7b421e0879551c24ab382733c2140def8132c70d7b6a0f8074651773476e9a645c64440ef596a7f62319d0 SHA512 2f60739bbea23091942893776b29257ed556c3d98351e0e9455852e8ea6b275d3ecca613c81ed35c009431c3e5fb378a77259f13c470359526ccbdff4033d86b
diff --git a/dev-libs/protobuf/files/protobuf-3.6.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.6.0-disable_no-warning-test.patch
deleted file mode 100644
index 834f6b0d1ab5..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.6.0-disable_no-warning-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Disable no-warning-test which is compiled with -Werror option and whose only purpose is checking if compilation results in any warnings.
-
---- /src/Makefile.am
-+++ /src/Makefile.am
-@@ -717,7 +717,7 @@
- GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
-                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
--                 no-warning-test $(GZCHECKPROGRAMS)
-+                 $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-                       $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
-                       $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
-@@ -900,4 +900,4 @@
- 
- TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
-         google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)     \
--        protobuf-lite-arena-test no-warning-test
-+        protobuf-lite-arena-test
diff --git a/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch
deleted file mode 100644
index 8b583522f464..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.6.0-protoc_input_output_files.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-https://github.com/protocolbuffers/protobuf/pull/235
-
---- /src/google/protobuf/compiler/command_line_interface.cc
-+++ /src/google/protobuf/compiler/command_line_interface.cc
-@@ -931,6 +931,28 @@
-   }
- 
-   if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
-+    bool success = false;
-+    int in_fd = STDIN_FILENO;
-+    int out_fd = STDOUT_FILENO;
-+
-+    if (!protobuf_in_path_.empty()) {
-+      in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
-+      if (in_fd == -1) {
-+        std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl;
-+        return 1;
-+      }
-+    }
-+    if (!protobuf_out_path_.empty()) {
-+      out_fd = open(protobuf_out_path_.c_str(),
-+                    O_WRONLY | O_CREAT | O_TRUNC,
-+                    0644);
-+      if (out_fd == -1) {
-+        std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl;
-+        close(in_fd);
-+        return 1;
-+      }
-+    }
-+
-     if (codec_type_.empty()) {
-       // HACK:  Define an EmptyMessage type to use for decoding.
-       DescriptorPool pool;
-@@ -939,13 +961,20 @@
-       file.add_message_type()->set_name("EmptyMessage");
-       GOOGLE_CHECK(pool.BuildFile(file) != NULL);
-       codec_type_ = "EmptyMessage";
--      if (!EncodeOrDecode(&pool)) {
--        return 1;
--      }
-+      success = EncodeOrDecode(&pool, in_fd, out_fd);
-     } else {
--      if (!EncodeOrDecode(descriptor_pool.get())) {
--        return 1;
--      }
-+      success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
-+    }
-+
-+    if (in_fd != STDIN_FILENO) {
-+      close(in_fd);
-+    }
-+    if (out_fd != STDOUT_FILENO) {
-+      close(out_fd);
-+    }
-+
-+    if (!success) {
-+      return 1;
-     }
-   }
- 
-@@ -983,6 +1012,11 @@
-   for (int i = 0; i < proto_path_.size(); i++) {
-     source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
-   }
-+  if (mode_ == MODE_COMPILE &&
-+      (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
-+    std::cerr << "--protobuf_in and --protobuf_out are only valid with "
-+         << "decode operations. Ignoring.";
-+  }
- 
-   // Map input files to virtual paths if possible.
-   if (!MakeInputsBeProtoPathRelative(source_tree)) {
-@@ -1571,6 +1605,12 @@
- 
-     codec_type_ = value;
- 
-+  } else if (name == "--protobuf_in") {
-+    protobuf_in_path_ = value;
-+
-+  } else if (name == "--protobuf_out") {
-+    protobuf_out_path_ = value;
-+
-   } else if (name == "--error_format") {
-     if (value == "gcc") {
-       error_format_ = ERROR_FORMAT_GCC;
-@@ -1693,18 +1733,29 @@
- "  --version                   Show version info and exit.\n"
- "  -h, --help                  Show this text and exit.\n"
- "  --encode=MESSAGE_TYPE       Read a text-format message of the given type\n"
--"                              from standard input and write it in binary\n"
--"                              to standard output.  The message type must\n"
--"                              be defined in PROTO_FILES or their imports.\n"
--"  --decode=MESSAGE_TYPE       Read a binary message of the given type from\n"
--"                              standard input and write it in text format\n"
--"                              to standard output.  The message type must\n"
-+"                              an write it in binary.  The message type must\n"
- "                              be defined in PROTO_FILES or their imports.\n"
--"  --decode_raw                Read an arbitrary protocol message from\n"
--"                              standard input and write the raw tag/value\n"
--"                              pairs in text format to standard output.  No\n"
-+"                              The input/output protobuf files are specified\n"
-+"                              using the --protobuf_in and --protobuf_out\n"
-+"                              command line flags.\n"
-+"  --decode=MESSAGE_TYPE       Read a binary message of the given type and\n"
-+"                              write it in text format.  The message type\n"
-+"                              must be defined in PROTO_FILES or their\n"
-+"                              imports. The input/output protobuf files are\n"
-+"                              specified using the --protobuf_in and \n"
-+"                              --protobuf_out command line flags.\n"
-+"  --decode_raw                Read an arbitrary protocol message and write\n"
-+"                              the raw tag/value pairs in text format.  No\n"
- "                              PROTO_FILES should be given when using this\n"
--"                              flag.\n"
-+"                              flag. The input/output protobuf files are\n"
-+"                              specified using the --protobuf_in and \n"
-+"                              --protobuf_out command line flags.\n"
-+"  --protobuf_in               Absolute path to the protobuf file to read to\n"
-+"                              encode/decode.  If omitted, file will be read\n"
-+"                              from STDIN.\n"
-+"  --protobuf_out              Absolute path to the protobuf file to write to\n"
-+"                              after encode/decode operation.  If omitted,\n"
-+"                              output is written to STDOUT.\n"
- "  --descriptor_set_in=FILES   Specifies a delimited list of FILES\n"
- "                              each containing a FileDescriptorSet (a\n"
- "                              protocol buffer defined in descriptor.proto).\n"
-@@ -1983,7 +2034,9 @@
-   return true;
- }
- 
--bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
-+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool,
-+                                          int in_fd,
-+                                          int out_fd) {
-   // Look up the type.
-   const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
-   if (type == NULL) {
-@@ -1995,15 +2048,15 @@
-   std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
- 
-   if (mode_ == MODE_ENCODE) {
--    SetFdToTextMode(STDIN_FILENO);
--    SetFdToBinaryMode(STDOUT_FILENO);
-+    SetFdToTextMode(in_fd);
-+    SetFdToBinaryMode(out_fd);
-   } else {
--    SetFdToBinaryMode(STDIN_FILENO);
--    SetFdToTextMode(STDOUT_FILENO);
-+    SetFdToBinaryMode(in_fd);
-+    SetFdToTextMode(out_fd);
-   }
- 
--  io::FileInputStream in(STDIN_FILENO);
--  io::FileOutputStream out(STDOUT_FILENO);
-+  io::FileInputStream in(in_fd);
-+  io::FileOutputStream out(out_fd);
- 
-   if (mode_ == MODE_ENCODE) {
-     // Input is text.
---- /src/google/protobuf/compiler/command_line_interface.h
-+++ /src/google/protobuf/compiler/command_line_interface.h
-@@ -272,7 +272,9 @@
-       GeneratorContext* generator_context, string* error);
- 
-   // Implements --encode and --decode.
--  bool EncodeOrDecode(const DescriptorPool* pool);
-+  bool EncodeOrDecode(const DescriptorPool* pool,
-+                      int in_fd,
-+                      int out_fd);
- 
-   // Implements the --descriptor_set_out option.
-   bool WriteDescriptorSet(
-@@ -405,6 +407,13 @@
-   // parsed FileDescriptorSets to be used for loading protos.  Otherwise, empty.
-   std::vector<string> descriptor_set_in_names_;
- 
-+  // When using --encode / --decode / --decode_raw absolute path to the output
-+  // file. (Empty string indicates write to STDOUT).
-+  string protobuf_out_path_;
-+  // When using --encode / --decode / --decode_raw, absolute path to the input
-+  // file. (Empty string indicates read from STDIN).
-+  string protobuf_in_path_;
-+
-   // If --descriptor_set_out was given, this is the filename to which the
-   // FileDescriptorSet should be written.  Otherwise, empty.
-   string descriptor_set_out_name_;
---- /src/google/protobuf/compiler/command_line_interface_unittest.cc
-+++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
-@@ -94,7 +94,7 @@
-   virtual void SetUp();
-   virtual void TearDown();
- 
--  // Runs the CommandLineInterface with the given command line.  The
-+  // Run the CommandLineInterface with the given command line.  The
-   // command is automatically split on spaces, and the string "$tmpdir"
-   // is replaced with TestTempDir().
-   void Run(const string& command);
-@@ -2337,6 +2337,17 @@
-     EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_));
-   }
- 
-+  void ExpectBinaryFilesMatch(const string &expected_file,
-+                              const string &actual_file) {
-+    string expected_output, actual_output;
-+    ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output));
-+    ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output));
-+
-+    // Don't use EXPECT_EQ because we don't want to print raw binary data to
-+    // stdout on failure.
-+    EXPECT_TRUE(expected_output == actual_output);
-+  }
-+
-  private:
-   void WriteUnittestProtoDescriptorSet() {
-     unittest_proto_descriptor_set_filename_ =
-@@ -2427,6 +2438,18 @@
-       "google/protobuf/no_such_file.proto: No such file or directory\n");
- }
- 
-+TEST_P(EncodeDecodeTest, RedirectInputOutput) {
-+  string out_file = TestTempDir() + "/golden_message_out.pbf";
-+  string cmd = "";
-+  cmd += "google/protobuf/unittest.proto ";
-+  cmd += "--encode=protobuf_unittest.TestAllTypes ";
-+  cmd += "--protobuf_in=" + TestSourceDir() +
-+         "/google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt ";
-+  cmd += "--protobuf_out=" + out_file;
-+  EXPECT_TRUE(Run(cmd));
-+  ExpectBinaryFilesMatch(out_file, TestSourceDir() + "/google/protobuf/testdata/golden_message_oneof_implemented");
-+}
-+
- INSTANTIATE_TEST_CASE_P(FileDescriptorSetSource,
-                         EncodeDecodeTest,
-                         testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
diff --git a/dev-libs/protobuf/files/protobuf-3.6.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.6.0-system_libraries.patch
deleted file mode 100644
index b1408f050e00..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.6.0-system_libraries.patch
+++ /dev/null
@@ -1,121 +0,0 @@
---- /Makefile.am
-+++ /Makefile.am
-@@ -11,28 +11,10 @@
- # Always include third_party directories in distributions.
- DIST_SUBDIRS = src conformance benchmarks third_party/googletest
- 
--# Build gmock before we build protobuf tests.  We don't add gmock to SUBDIRS
--# because then "make check" would also build and run all of gmock's own tests,
--# which takes a lot of time and is generally not useful to us.  Also, we don't
--# want "make install" to recurse into gmock since we don't want to overwrite
--# the installed version of gmock if there is one.
- check-local:
--	@echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
--	@cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
--	@cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
- 
--# We would like to clean gmock when "make clean" is invoked.  But we have to
--# be careful because clean-local is also invoked during "make distclean", but
--# "make distclean" already recurses into gmock because it's listed among the
--# DIST_SUBDIRS.  distclean will delete gmock/Makefile, so if we then try to
--# cd to the directory again and "make clean" it will fail.  So, check that the
--# Makefile exists before recursing.
- clean-local:
--	@if test -e third_party/googletest/Makefile; then \
--	  echo "Making clean in googletest"; \
--	  cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \
--	fi; \
--	if test -e conformance/Makefile; then \
-+	@if test -e conformance/Makefile; then \
- 	  echo "Making clean in conformance"; \
- 	  cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \
- 	fi; \
---- /configure.ac
-+++ /configure.ac
-@@ -209,12 +209,5 @@
- 
- AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
- 
--# HACK:  Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
--#   since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
--#   too.
--export CFLAGS
--export CXXFLAGS
--AC_CONFIG_SUBDIRS([third_party/googletest])
--
- AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
- AC_OUTPUT
---- /src/Makefile.am
-+++ /src/Makefile.am
-@@ -711,19 +711,11 @@
-   google/protobuf/testing/file.cc                              \
-   google/protobuf/testing/file.h
- 
--GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest
--GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock
--GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
--GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
-                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
-                  $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
--                         -I$(GOOGLEMOCK_SRC_DIR)/include
-+                      -lgtest -lgmock -lgmock_main
- # Disable optimization for tests unless the user explicitly asked for it,
- # since test_util.cc takes forever to compile with optimization (with GCC).
- # See configure.ac for more info.
-@@ -811,12 +803,8 @@
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
-                       libprotoc.la                                   \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
--                                         -I$(GOOGLETEST_SRC_DIR)/include \
--                                         -DPROTOBUF_TEST_NO_DESCRIPTORS
-+                      -lgtest -lgmock -lgmock_main
-+protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
- protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lazy_descriptor_test_SOURCES =                        \
-   google/protobuf/compiler/cpp/cpp_unittest.cc                 \
-@@ -837,11 +825,7 @@
- # full runtime and we want to make sure this test builds without full
- # runtime.
- protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
--                           $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
--                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
--                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \
--                             -I$(GOOGLETEST_SRC_DIR)/include
-+                           -lgtest -lgmock -lgmock_main
- protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lite_test_SOURCES =                                           \
-   google/protobuf/lite_unittest.cc                                     \
-@@ -853,11 +837,7 @@
- # gtest when building the test internally our memory sanitizer doesn't detect
- # memory leaks (don't know why).
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include  \
--                                    -I$(GOOGLETEST_SRC_DIR)/include
-+                      -lgtest -lgmock -lgmock_main
- protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lite_arena_test_SOURCES =       \
-   google/protobuf/lite_arena_unittest.cc \
-@@ -867,8 +847,7 @@
- 
- # Test plugin binary.
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
--                    $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
--test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
-+                    -lgtest
- test_plugin_SOURCES =                                          \
-   google/protobuf/compiler/mock_code_generator.cc              \
-   google/protobuf/testing/file.cc                              \
diff --git a/dev-libs/protobuf/files/protobuf-3.6.1-libatomic_linking.patch b/dev-libs/protobuf/files/protobuf-3.6.1-libatomic_linking.patch
deleted file mode 100644
index 2b357b213170..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.6.1-libatomic_linking.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://github.com/protocolbuffers/protobuf/issues/5219
-https://github.com/protocolbuffers/protobuf/pull/5227
-https://github.com/protocolbuffers/protobuf/commit/56b40a8f055cfd05633054aed5d3466a6e058b72
-
---- /configure.ac
-+++ /configure.ac
-@@ -165,6 +165,22 @@
- ])
- AM_CONDITIONAL([HAVE_ZLIB], [test $HAVE_ZLIB = 1])
- 
-+dnl On some platforms, std::atomic needs a helper library
-+AC_MSG_CHECKING(whether -latomic is needed)
-+AC_LINK_IFELSE([AC_LANG_SOURCE([[
-+  #include <atomic>
-+  #include <cstdint>
-+  std::atomic<std::int64_t> v;
-+  int main() {
-+    return v;
-+  }
-+]])], STD_ATOMIC_NEED_LIBATOMIC=no, STD_ATOMIC_NEED_LIBATOMIC=yes)
-+AC_MSG_RESULT($STD_ATOMIC_NEED_LIBATOMIC)
-+if test "x$STD_ATOMIC_NEED_LIBATOMIC" = xyes; then
-+  LIBATOMIC_LIBS="-latomic"
-+fi
-+AC_SUBST([LIBATOMIC_LIBS])
-+
- AS_IF([test "$with_protoc" != "no"], [
-   PROTOC=$with_protoc
-   AS_IF([test "$with_protoc" = "yes"], [
---- /src/Makefile.am
-+++ /src/Makefile.am
-@@ -163,7 +163,7 @@
- 
- lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
- 
--libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS)
-+libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC_LIBS)
- libprotobuf_lite_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined
- if HAVE_LD_VERSION_SCRIPT
- libprotobuf_lite_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf-lite.map
-@@ -209,7 +209,7 @@
-   google/protobuf/io/zero_copy_stream.cc                       \
-   google/protobuf/io/zero_copy_stream_impl_lite.cc
- 
--libprotobuf_la_LIBADD = $(PTHREAD_LIBS)
-+libprotobuf_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC_LIBS)
- libprotobuf_la_LDFLAGS = -version-info 17:0:0 -export-dynamic -no-undefined
- if HAVE_LD_VERSION_SCRIPT
- libprotobuf_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf.map
diff --git a/dev-libs/protobuf/protobuf-3.6.1.3.ebuild b/dev-libs/protobuf/protobuf-3.10.1.ebuild
index d498903c8c4f..52c0b29c2cc4 100644
--- a/dev-libs/protobuf/protobuf-3.6.1.3.ebuild
+++ b/dev-libs/protobuf/protobuf-3.10.1.ebuild
@@ -5,27 +5,37 @@ EAPI="7"
 
 inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
 
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
 HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
 
 LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0/21"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
 BDEPEND="emacs? ( virtual/emacs )"
-DEPEND="test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 RDEPEND="emacs? ( virtual/emacs )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.6.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch"
-	"${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch"
+	"${FILESDIR}/${PN}-3.8.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.8.0-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.8.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
@@ -37,6 +47,12 @@ src_prepare() {
 
 src_configure() {
 	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if tc-ld-is-gold; then
+		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+		tc-ld-disable-gold
+	fi
+
 	multilib-minimal_src_configure
 }
 
@@ -79,7 +95,7 @@ multilib_src_test() {
 }
 
 multilib_src_install_all() {
-	find "${D}" -name "*.la" -delete || die
+	find "${D}" -name "*.la" -type f -delete || die
 
 	insinto /usr/share/vim/vimfiles/syntax
 	doins editors/proto.vim
diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index 25600eba82fb..1ab97b0ea66b 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -21,7 +21,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/21"
+SLOT="0/22"
 KEYWORDS=""
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/qoauth/Manifest b/dev-libs/qoauth/Manifest
index 541397aec9a6..53c600e343d7 100644
--- a/dev-libs/qoauth/Manifest
+++ b/dev-libs/qoauth/Manifest
@@ -1,5 +1,5 @@
 AUX qoauth-1.0.1-disable-ft.patch 629 BLAKE2B c466bf98a007c645b4b38e804dce9454954b92307c268d96ac2d8db3991d70eda2b41a44628533c7191df5f1c11c2e363e78f522b535a9921d32fce5733b4080 SHA512 04d06d1989866e208510f9c726fb3a447df2020ba0c7ec169534b39075343c03e05f2dc854696c87cd007ce980dc747f0658d8e88d0ef96b77dc0c70dae923d7
 AUX qoauth-2.0.1_pre20160315-prf.patch 312 BLAKE2B 06da99ad51db25d6ff8069bb9e202cb7997b1fc7ee1d657386ccafba26d57b35b4ae22272e31ab5f71b615d4cd8ab7824be01f795e52a3dec5b82a039fc97758 SHA512 2bdd73d0b43325359edcff59d717ec18b2fc87d720d068cc8e8d04ef25eeb213050ab5ebc7991ec59c91299a5c49a2b727a5e5ad11677641b17cbd424092753f
 DIST qoauth-2.0.1_pre20160315.tar.xz 45604 BLAKE2B 290d768e8661c6e8f9ae8094ec140da22f00c53cbfd9ed6ebab1f159ae82c2a0a111a9306eeab0c08ea5b0a349e07d9b7f402f14812a5688ba9860832991494c SHA512 ec44c597c7b9729645ab98e2c71c805d01eab4c0684b7ea0da6b015a052b0ad6e3aa9352ef53e36a67ff99b9f75fb9b89156ca8b23c639a70cc49aab656366c3
-EBUILD qoauth-2.0.1_pre20160315-r3.ebuild 1325 BLAKE2B ee6831f1c1dabafbceca4a9ba9967a99c27697be5678cd1939bbe37edba9bcee058452ee900e8b86ce37148e694b1998ee05a41c067726e68ba225c9314ba085 SHA512 c6f3fa0b4079a82e27fffb74439e2a098af496bfd563214509c8c2d94192a0fa75997d06188eca3dbfbaf57ef4cfcb5058ac38f9f51edc523b95da9f685466e3
+EBUILD qoauth-2.0.1_pre20160315-r3.ebuild 1349 BLAKE2B 58e487b57f5542175b718e4109e4bc28aa7b97762dbc445e34c4b8b09d3815551b2bf21e5d9c3aaaae477fdb83e9de4d409074af6265440e1d944c3745875d61 SHA512 10ad4fad328f898452b7d5dfa1f8a36020c9b5e7f0a215304fa2e81cf943b65a11fd3a72d0dd7d8a4c896f125f57bc2da8866c03c2ec2b70675cd2b588cae911
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-libs/qoauth/qoauth-2.0.1_pre20160315-r3.ebuild b/dev-libs/qoauth/qoauth-2.0.1_pre20160315-r3.ebuild
index 6e88c34a7a64..cfb89ca9cbaf 100644
--- a/dev-libs/qoauth/qoauth-2.0.1_pre20160315-r3.ebuild
+++ b/dev-libs/qoauth/qoauth-2.0.1_pre20160315-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=6
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="5"
 KEYWORDS="amd64 ~ppc64 x86"
 IUSE="debug doc test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	app-crypt/qca:2[debug?,qt5(+)]
diff --git a/dev-libs/rapidjson/Manifest b/dev-libs/rapidjson/Manifest
index 618d0e7c233f..e8e841cd7ec9 100644
--- a/dev-libs/rapidjson/Manifest
+++ b/dev-libs/rapidjson/Manifest
@@ -1,7 +1,7 @@
 AUX rapidjson-1.1.0-gcc-7.patch 1393 BLAKE2B 71affc72ebbf714788e243b75f9157e9423dcc34eb43efb3479125e2e269c6fcdcfc4d9e9334979b3f5463d97e241dfa3f335d893729282109ce6c768023ec92 SHA512 4f24f37a3c106698b871438675f2b06f2389d724ab8484a616586b5810aec5d8bd11eed759772affa627493314d3f47757af3a54519f3659df1d218cd12c3cd9
 DIST rapidjson-1.1.0.tar.gz 1019402 BLAKE2B e1564b3cfa020f76437b0a35048a42ff2cd98b5ce285e63f228e158885182e5cecda13407cdf30c03fa39b47cbc579ff0065f6c2682d04b806e8f9ea8d36fc4e SHA512 2e82a4bddcd6c4669541f5945c2d240fb1b4fdd6e239200246d3dd50ce98733f0a4f6d3daa56f865d8c88779c036099c52a9ae85d47ad263686b68a88d832dff
-EBUILD rapidjson-1.1.0-r1.ebuild 1072 BLAKE2B be1b8ab17394ecf0383dd8c7da4a814b881683e7c33a36a24dfd60dfe56f0c751343f67af703c9365d279ba0cdd79d54b129b4316552315789199556a46ebcac SHA512 6bd802f9e22115b54afafa5f8a9b37090382c66717b3e2153c75bf2200c6261c54a02438d644026568a30fc5de361c44529db48eed914816d8f0dde9b1c5ec8a
-EBUILD rapidjson-1.1.0-r2.ebuild 1179 BLAKE2B 27f0fb924598ef8d87c791451574b0005a2e43e0744bc22a172a295c5100155f3c9e31d9d068cafb8d7ae2adb57da0a8d8a662acca838a4f828c5c03660f4cac SHA512 b8e92580670dcb564924984748047b9b3680e2b0f945c40543546be3c46cea85a83446131b9fb3178e38c6199078fd78fd862f999923cf95290288fb80f4d23f
-EBUILD rapidjson-1.1.0.ebuild 883 BLAKE2B 9ef8ad122d007cf254f5b2ec2f0a19c5f2d79ef0b0d6a210e0f97131caa119a00231d165403c5040fa920e9d88b847474858278923f4bad30f6d28e848defa90 SHA512 622cf41a55c0a773125638e63f7b99d05bebd6e2ad6a20d3c553e37186753284f5ec75e77235519539856817b9c443fb97e5c568da0b1701e4f8d5bf3ca507c9
-EBUILD rapidjson-9999.ebuild 1154 BLAKE2B eef9dc938b3ae18b4964c3f41f48d76231bb2d9137dcd257df850f63bebe058df69cb6b77e56db26b734825334dcc621b3db431bea1640c9b460437e3390b568 SHA512 1756b13132c2dcd155e464773e71c49312344411c2886fa1132b7b34346d9f3ea4782977dbb60c56ba9b59063f440badfca8137a32e19fd3b8918bf4a2e9d161
+EBUILD rapidjson-1.1.0-r1.ebuild 1099 BLAKE2B 355d7cc8a583a2fe0ba2d033376f81d4f8cd6879461afdc03b6caf2ed947fedfd5eeb389cd546c0a978c66bdfa4be120e815140b1e0e9d9910fe4909af318430 SHA512 373409249dd5530a5619e1c5d7c29edea6246c1d238b820d98d058a0a1afdaa62311d8ea61ea99c02c971866fbdb626a8d9e68ceb78e18e1a5e1aa3d046e8f71
+EBUILD rapidjson-1.1.0-r2.ebuild 1206 BLAKE2B 1afe1024b8864b3c30acc101db869749ee1fa29cd5fee471dba6a8d4cbd83fc743baa25e2a6ee2bc62fee02f62abe63ababa4e24939ae2a9cd1890ce1bdc57f3 SHA512 e18cd1b1e12461cc6a26dcfcd5c77c0c6afd2b2e53d57039513ee5f545f0fe12d3bfbc9e3703139f4e54da3e430471f6f931ddabd72fc5dcad5a79ff857f0e1c
+EBUILD rapidjson-1.1.0.ebuild 907 BLAKE2B 6d3d531856301c37083b50f0d9a2454b305df7f02e5fee3ba22b3063943afc726f976820fc8a081d77cca87b0f1081e37165962cb272d585dad73eae855c129b SHA512 d049d8687b714f5d12142da93ab170a2a9081f7a50181347c5b6ff1f5096eac40fd231fa65072f30db705b008130990d10f51d68ff7f9c2ac943c5829a2efbee
+EBUILD rapidjson-9999.ebuild 1181 BLAKE2B 189daab019fe8cc7bdf60b5896e4a11ff6198c23d9c1fe4783df17762e0576b53e1577f0c1cb69d3795f8b406059eac8b0ecc05d6ab4cfeee2eef24fc9dba11e SHA512 86d3e5ea07141c328a85797a22d42d84ec5a51e2436a7a3223b928d26d2a902858c4f6a66bd9dbba72cc04b198797552741ef618b934c37dbd4e29be455d8574
 MISC metadata.xml 395 BLAKE2B acf0adcc9af1a50757d72f4b52d73c2481fda7bb48ebf2b71e7440c81788e1633b45a4af9ee0adbc1984b0667207706d162e1bdb7177ce8f4e85b819f789b708 SHA512 678196ecc89abed8aa3c1699844573b78103f1ee77dd193b68ad1ae1d5518cd46469b0a5850b00a201c41be381c730ced2aec79f8d4230cf61419b3a20a88935
diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r1.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r1.ebuild
index 31257f30dc02..89b31664240f 100644
--- a/dev-libs/rapidjson/rapidjson-1.1.0-r1.ebuild
+++ b/dev-libs/rapidjson/rapidjson-1.1.0-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
@@ -10,6 +10,7 @@ HOMEPAGE="http://rapidjson.org/"
 
 LICENSE="MIT"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild
index bd6b5e3e3671..f2c70a5e3612 100644
--- a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild
+++ b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild
@@ -10,6 +10,7 @@ HOMEPAGE="https://rapidjson.org/"
 
 LICENSE="MIT"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/dev-libs/rapidjson/rapidjson-1.1.0.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0.ebuild
index 5d6d2183e515..ca44afce7199 100644
--- a/dev-libs/rapidjson/rapidjson-1.1.0.ebuild
+++ b/dev-libs/rapidjson/rapidjson-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,6 +10,7 @@ HOMEPAGE="http://rapidjson.org/"
 
 LICENSE="MIT"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild
index 392fbf7059fe..34b5854db22c 100644
--- a/dev-libs/rapidjson/rapidjson-9999.ebuild
+++ b/dev-libs/rapidjson/rapidjson-9999.ebuild
@@ -10,6 +10,7 @@ HOMEPAGE="https://rapidjson.org/"
 
 LICENSE="MIT"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/dev-libs/rasqal/Manifest b/dev-libs/rasqal/Manifest
index 427b20969ab6..283661308878 100644
--- a/dev-libs/rasqal/Manifest
+++ b/dev-libs/rasqal/Manifest
@@ -1,3 +1,3 @@
 DIST rasqal-0.9.33.tar.gz 1595647 BLAKE2B 87bca86b2f0dceb0801f5a34dae9ae1f87d8a7d0dc1e03fdf04998a0d4885ed76be2719d3e01489a5510a26715bb093a75ce194cc42f3cedff88f64161d6a2fb SHA512 05728682797470db9e51d156012e8fde9dec1554d107372faa11cbe6cdc3356e92386f4f8de6d7c41e3100b76f9b1c6809102a913829cddbd2ff29043c04d522
-EBUILD rasqal-0.9.33.ebuild 1687 BLAKE2B bc0eae7f53e1b5ed651fce0b62438be185270f52f6aadacdb0b80f02467b8b069209bb384da9c4bfe0ca319494b010256e7ab276e032958dd441ff9b3d5ae04a SHA512 b8a0cf216a6878d71a12c449938f8caf3107b61e613d6e700008f0c5a4a785a0e15b33de269c4f077326e63e1aadaded86481eb12643773c2e7c659f742ebb41
+EBUILD rasqal-0.9.33.ebuild 1714 BLAKE2B f48c2fb0759020722f5c0c2db98703232c599f4e33c4aa7ceff2e763d7a7a09dab05ec50915bf850147a80e1541d3026a0a32cfb7e46c25a34ae204db0ce607d SHA512 9f1fe9a31c38aaec0d23a651032b08d2e0a829117fc0fb84f61dad7d15cea9f3a3c40ff60123ed50243253aca63c2492e24f571c80c1752ecfd0e9f60d7f6cc5
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/rasqal/rasqal-0.9.33.ebuild b/dev-libs/rasqal/rasqal-0.9.33.ebuild
index 57b679ac91c6..fe950c90110d 100644
--- a/dev-libs/rasqal/rasqal-0.9.33.ebuild
+++ b/dev-libs/rasqal/rasqal-0.9.33.ebuild
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+crypt gmp kernel_linux +mhash pcre static-libs test xml"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=media-libs/raptor-2.0.15
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 0a2d73f35e7a..890fe9855efa 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -5,10 +5,12 @@ AUX rocm-comgr-2.6.0-find-lld-includes.patch 1886 BLAKE2B b06fc169e9271f9476e170
 AUX rocm-comgr-2.6.0-unbundle-yaml-cpp.patch 1082 BLAKE2B 0b44c1731884d225056a18b81c52c99f59a9a3e9d16e06cbe77e683b10703cd83cb96446ff138d6c4c14c48f931a1df0f37699153e0b6f253f89d42f93feebbf SHA512 74190c23d86792bac64b09f3724ad98a3c7b89dd0bbfcbc051d7821222a97e37de9138eee32abb8982ce78982dbddbe640c3f05ad560ef29c287c9196afdef89
 AUX rocm-comgr-2.7.0-llvm-interface-change.patch 6792 BLAKE2B 67977f845b35d5c26da13b123cc2e273161e1614b353a5acfad7cb6b3cb606d0abd55989c4e615b8addc98326d8fa225c949cacec93132d94a2e3af776b88a8f SHA512 df455a07bf3e168be3c18bc9033b984eba8046dc6bdad02e8ebe4cb9b05728e889156e1ad5cfd858ee59e22a07ff224437b96b10e6958b298ab13a2d1d9e51b1
 AUX rocm-comgr-2.8.0-dependencies.patch 2120 BLAKE2B 4c5b50d122b2f92ea35419111e9eece967c09e4b1014639c8f81b5df8a674ff0758ecc8a8b7b1984a6d27b4581704d9b8f494089abc477b221effb2d3652308a SHA512 791d36e56e50c2734529d3bfe286219c6ab8b5769f65c7e993a8c7ab961e52f90239871b31fe63ffbcdc5f2e0c06bf60e33943cf68d797ecdebd37d237849777
+DIST rocm-comgr-2.10.0.tar.gz 87111 BLAKE2B efc9d395f6c0445e3f0af847edb66094905b38a8134d05b938a5bc48f1d71d37db664afc8e6125f82a6618cd4657d4316105f6587937010cd120f68c01172cac SHA512 ce7e698c042291910a27bf261e52ac420dd5f9f676bb86e72b903e8a751753b9b0d2d15fb3dfabafdaef75a94844541b37df81e70db28496545348e93cd4018c
 DIST rocm-comgr-2.6.0.tar.gz 1484343 BLAKE2B fcb496b4997d672640e3f75622e74085eeb9dfe83c88ae025530389d3cdca7628155168060e71f7a3ff915e933ffe70c7026720dc124d128d16ef4df397525e7 SHA512 b14e90603d2b6e17f6b0335ea35da2e5d7e31710f301d7a7f7751a45d996e3dbbfbf84a03e2e911e8798e72e77b87b5cd88317e897cb4de3ee5cf0e7c3222d68
 DIST rocm-comgr-2.7.0.tar.gz 1500771 BLAKE2B 275ad4cab34d554f8a131101eda474926f7270a44a0af9941d8f1233c29b44b3efb3ba83c6b541d501a3e2fc751c591c0f6a993563bbacf539b5bcd04b23963b SHA512 afb4a7318c2e137db6ac0502041ed53e63783ec1ab458962b1b16f0f2f28e09ce2ae70d048b858740eca8bf06328858400a68bed4e91d7cfc4b7714a66d85bc9
 DIST rocm-comgr-2.8.0.tar.gz 85502 BLAKE2B 14e18191a475c3d05e324f15e3b2d0829eed56bfa625b48e217e6540836e005675a4ffdd0813664c7f61177431d0987499eb9a75ec83acfa0e554e954770fbc9 SHA512 516832f2a1be5e66d93dddfd1275861605afcb6e3410cb518e6d8647a25c18da058e37cbce8434d5b7133a2147c8c84dc48a485f7b855b74a3b49c9f7dae4a0e
 DIST rocm-comgr-2.9.0.tar.gz 85505 BLAKE2B 5e69bcd2fb6769cd315a18eb626d00161acb4a2f9922eb67dba6cee081c236ec25798011d4112c37d5e6fba06531e5e7b4f42659080a8dd23d9a8579b71bf2c0 SHA512 8e66c01eee71154d261a8f2a8651f90dc7e60b6d74625aab3f3a0b51226c69059cde66d7a1eab8aacee7d0653cc881ec442849483f21616ee4cd27d4ddad7345
+EBUILD rocm-comgr-2.10.0.ebuild 1094 BLAKE2B 7347448c0f1e812b5932e833971c65a267db520af9cc2084bc919a4e8feeb6eb955d908268f6ee6ffca770e2d18b949263c9047f9ddc1fb490cf1463cead9fcb SHA512 afb18417ae9931bb2a9a8af877b6b85939a2f7cadfd61745cabd879cfdbefcb66270f9a5725f45456b0382a8edf35e89a1831660b3a0cbc6d1efc8c040b6bed3
 EBUILD rocm-comgr-2.6.0.ebuild 1189 BLAKE2B 29d9b7ad1e3dca202024101223422b667c82d58eed20da01492e955c39e768f85b677d9fbbedcb7b22aa41855dd68acf11562f7083303f9d00749fbfd5af9c84 SHA512 ab54afa2597fc0133db00c42fec5226da8118b4d79eb67c6d6af1bf3c111296b9b72c5675469594c403021a00446e68b8ab5ab51b678dec0958ca21e9bcc83c4
 EBUILD rocm-comgr-2.7.0.ebuild 1295 BLAKE2B c6f40531be4c82d2d3c82967bb9f890e8af1f95125857d2cc1d0b9a2c29ddca5574f34abbe42daf78df8b4cf74244478e6afea69a77661a6a65e44442205304b SHA512 7835addd86dfd1878993c5bc0cb9728123623815e678b90008953cd4258abc8ca7e227fd43d26fd2959ed2d5d1cd448ae61c525527c9d56742c3b009b288c509
 EBUILD rocm-comgr-2.8.0.ebuild 1094 BLAKE2B 7347448c0f1e812b5932e833971c65a267db520af9cc2084bc919a4e8feeb6eb955d908268f6ee6ffca770e2d18b949263c9047f9ddc1fb490cf1463cead9fcb SHA512 afb18417ae9931bb2a9a8af877b6b85939a2f7cadfd61745cabd879cfdbefcb66270f9a5725f45456b0382a8edf35e89a1831660b3a0cbc6d1efc8c040b6bed3
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.10.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-2.10.0.ebuild
new file mode 100644
index 000000000000..ff0ede91ae21
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-2.10.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/lib/comgr"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
+	KEYWORDS="~amd64"
+fi
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.0-find-clang.patch"
+	"${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch"
+	"${FILESDIR}/${PN}-2.8.0-dependencies.patch"
+)
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocm-device-libs-${PV}
+	>=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index d4ba81a8a76a..9c4df52b5531 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,7 +1,9 @@
+DIST rocm-device-libs-2.10.0.tar.gz 227626 BLAKE2B a5a17f1ed4699f613523bc39bd25a566bafe53865025ccdf84cca1210d26da1f97e989d8acc35626cb21296b3c004adc6e1a985c8096c4de88c4f42b6abbb9a3 SHA512 1863f797c369b6f4097e3c966ce4f371da5f87893ffeb2d596dbb0b31aa3f6142e7359bcaf6e884754bf7a5ae246df674cd1020ca8c8e9114605ac7300715641
 DIST rocm-device-libs-2.6.0.tar.gz 221981 BLAKE2B 6350fafb31453daf015886bc2d3d2ba59b805fafdf12372fcad8f328c9e7c74d4e54093817b07961d7be77b990780038f7a7b91d5ab63650a92bf107e0be4a40 SHA512 4262c956ea8c212c2707acf74ee27f609a6faee1bee7c3fd436b2a4adbedf1b072b611e6143cc315bd4e9d1e306d874aa0f4629cff9301bd28be65fd16867180
 DIST rocm-device-libs-2.7.0.tar.gz 226395 BLAKE2B 85c5b7ebfca1570d9653428d4aa7052f784443c774b224b563471638caac01f9d800d0bb5d52dace2b54a447cfc00c0f39ed87ab1612f1e382fbba10c5e30e80 SHA512 2277ff4037b25d32b473b3b046708b2ce4aeb28c1df7ed4ce51893c204e5409c931083b3ecc38c6796581c1233e0d25dd0f0c5710961be8d1d60118e9a1de88a
 DIST rocm-device-libs-2.8.0.tar.gz 227320 BLAKE2B 5263acd01cd9e1002a3991232b704bfa0675d8a825b47ae9a09e1b0acadbebaeb0a61fe3df1880027a65006d4065e6d75de093c0516d41e6fd78618b08b1d258 SHA512 8c3b16096e325c9f4bc74bbd189f73c178b93b011492a9c0c38017cd53b4afef55e8f55a36c596272b7dda91811ef83ed4e1d0cbb0a623eb5647012e72a64524
 DIST rocm-device-libs-2.9.0.tar.gz 227785 BLAKE2B 903e1139d0813aaef298911a7e3c9c63c3141355c404a282ec0c1eb2532ded0d303f0550cfd142d8fc9a6219160755e658efd0d7d69302ecb23997314e502873 SHA512 d68820a6450d9b402a427df365dbd6be32e711f24256b68b887df8c78cb774c85b0a55f6033afbb7e97c951ad9cd83637194fbf5f575c2a9c8a68ea20e0bd046
+EBUILD rocm-device-libs-2.10.0.ebuild 867 BLAKE2B caec1c5ad1e4f7b6a643720d469ce6da76c0e5951b0c9b81a972427ac4e4308f772d4df40eb4f30fc4be9a98ec6241d53908e1bd5613ee69e06094049b963a6f SHA512 74b9fa8b676ab3e75afe13099367cc7c915ad7c8ac3a2f7c594e791c8cedd127c8a107005c5823864fe305ef665d3c94fb657dc1057bd078b04cde03f85d8fdc
 EBUILD rocm-device-libs-2.6.0.ebuild 851 BLAKE2B 7e07a2b6f56b52b2245af3084cb021b496aef361ecb554a848901679341e6733e168951c7cb1ba29b92d118380ba6c5ab9565384892d455db52df35ee7df547a SHA512 0954cabec7c11b7eb1c54acbfd0e23c1f1746c50ffbbb60b1042509111380686aa9b21b426cc9281e17c4cf74b6033dfc9ccb4f5612f031913a37b0b66f4c5e6
 EBUILD rocm-device-libs-2.7.0.ebuild 867 BLAKE2B caec1c5ad1e4f7b6a643720d469ce6da76c0e5951b0c9b81a972427ac4e4308f772d4df40eb4f30fc4be9a98ec6241d53908e1bd5613ee69e06094049b963a6f SHA512 74b9fa8b676ab3e75afe13099367cc7c915ad7c8ac3a2f7c594e791c8cedd127c8a107005c5823864fe305ef665d3c94fb657dc1057bd078b04cde03f85d8fdc
 EBUILD rocm-device-libs-2.8.0.ebuild 867 BLAKE2B caec1c5ad1e4f7b6a643720d469ce6da76c0e5951b0c9b81a972427ac4e4308f772d4df40eb4f30fc4be9a98ec6241d53908e1bd5613ee69e06094049b963a6f SHA512 74b9fa8b676ab3e75afe13099367cc7c915ad7c8ac3a2f7c594e791c8cedd127c8a107005c5823864fe305ef665d3c94fb657dc1057bd078b04cde03f85d8fdc
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-2.10.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-2.10.0.ebuild
new file mode 100644
index 000000000000..e0264de7479c
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-2.10.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	>=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/rocm-opencl-driver/Manifest b/dev-libs/rocm-opencl-driver/Manifest
index fff320e0602c..0ddd0885ad77 100644
--- a/dev-libs/rocm-opencl-driver/Manifest
+++ b/dev-libs/rocm-opencl-driver/Manifest
@@ -1,12 +1,14 @@
 AUX rocm-opencl-driver-2.6.0-install-correctly.patch 1931 BLAKE2B a0bb45e0bf08b777e88804cfe77eadebe1181aa4488885333c9996bbaa0177f7211b16f1fac30e743d53efaa63f59c28b2e928eb2ed6e5396ee2fa6862782caa SHA512 547bf0901a7ef8ac3ae3822dff77ab3409f39c6038c906acfa49579c7652dcd44d235331bd44cab2e5abb9ce1adcc75320f7476cc88666a45d303352e09ef20c
 AUX rocm-opencl-driver-2.6.0-install-header.patch 828 BLAKE2B 5640501a48f6d8552edf7fc89608dc7ff3d7ebe353c88759707e37ec9597a2b6a4cd982a17bf87e30f8f6def80a3a1fd866769b3f2d2572dd8506804ce7e3143 SHA512 f8569519b47f194f58fcb3a2b54f51157be792200004c7bebfde6fb7fea574eac3bec69ab0ea73ff4ef030a9335fdaa21ae22e8655661fab65e11a1a0492395f
 AUX rocm-opencl-driver-2.7.0-libraries.patch 1062 BLAKE2B 9c95bf1928542e0eccaec1927ed6bfb3d81624e29c4bc1873ade263312f5f97c896d6d19922d471c99fbb7eef3e5e7aca2f06a73ac0ed1b475386e5807f9c893 SHA512 3f490d80d08e8ffc7b843dbe33425240820eadc66973e148aca38aadc82c39e80b0e22f2937bff3b0e95cc53f73bf2ffa4fc50c80ba755b251d83e95275c8194
+DIST rocm-opencl-driver-2.10.0.tar.gz 21380 BLAKE2B 0ffdeb00b8d35a2619f37c6aa5efa53259151b2dfca8fd2dbd2dbaa49c9806599199340043a310cb8b855384d276d482e401ccbdf60cbff8c9efc1a80241df66 SHA512 dc6ba05c2a641c0379590af71ca28425495297b753eb4bcc5ff37f44f15a5d0a7f5477c3a426aa5350df969a6a6dabbeb4a71b3ae4b4ad63abd28b28ec87837e
 DIST rocm-opencl-driver-2.6.0.tar.gz 21311 BLAKE2B f17219b577ccd58de052d5936953fd78588a0b042ce002853b10c05e6f6d433edcd90045c15dcd2f2c31ccef89f8b420ef756a1dd1613702efcc8868163878d1 SHA512 7b8bf646d9a36b09d75a0408301c2f1771daad95b8075b1671ca0c8b1f5826e8cd9de8935946858268dc89863a0ee054b4dde3040c84dd37e90f28c7ffa6e097
 DIST rocm-opencl-driver-2.7.0.tar.gz 21312 BLAKE2B 8c7233e8c5de2d92d0604a832475a474e5a171853f435908dbe73ab41d077f9f4c2d7069546b4e660d900c02cccf1f77d85d2fbe5ddb52fdde4c32d6c26910a2 SHA512 ee14bbbf502ffc00fd9e1e04224ae8109c8603d44438cddde8951c2d2caf5d45b94d39eb184af66462b4029759064aab0e2312b44fdd3f925064ebe6097ac49b
 DIST rocm-opencl-driver-2.8.0.tar.gz 21345 BLAKE2B 91ecfaf145cb4c9cc9407ca79d90fc480d25b0d2afd1b0ed7c5af7d970ed729255c7ca0a27a5729640d4ea42a2ce2450fdf5eb92aa124ad95340afea185dcf16 SHA512 d610f0e50714efa159440001a67ec7589fbd366fde953e9c789a737875dcd82a8c30fcefc3825467c1e5db7c53bcc26eb9658f2f71662acd5e021ef117ddf336
 DIST rocm-opencl-driver-2.9.0.tar.gz 21351 BLAKE2B 341e0e648f28740695dd16dc4039c1f800b3225af96a407594ce200fd6f7ff74278a8e80c44b83218cfd9fe76b33ca3b5ab0d3ef4b69156c88a6c063ce650bc0 SHA512 87a304b0864f5d0a09aff0f355d62ccbe3ea2c46f462da7acaec138d013b5e9e1f92d97afb81c86768184e05a26f3dd43d0a63cbdab3a651b410fb8c71bb1882
-EBUILD rocm-opencl-driver-2.6.0.ebuild 1166 BLAKE2B 4e94bb069a67cd2e0e4dfed81fd46cd331b980b5c2d615932adf988be6708f8d27a000672b81b00c34cc29ce2660aa71f0960bb716c43d1d1dc824c7e3f1b0d5 SHA512 ad72eef3737a65c333d26539150271d82a1ce31618d345c9b9acd485a72948e291ccd147985323ad724544efe9298e4369037213410565f5a37514aedbafe5f1
-EBUILD rocm-opencl-driver-2.7.0.ebuild 1239 BLAKE2B bb47e63fe59633acb288b90836bbd7c2e0d5260c72ccbfb75af8add555fe2c5a82a340629870545cd42359d122d1b347d0458ef265e645e3746b1ce5e7cf4109 SHA512 08ded2734804e22d9fcd86426335c912cae6f9e43f78cf73d136f6e9bfe7989a5db013522d7a379f510f3975a9149a97fd0af819a1aa5f9b786ea2078454d1de
-EBUILD rocm-opencl-driver-2.8.0.ebuild 1188 BLAKE2B 791c36c25e19d5e67db7df791679b18c83cc2f2f6fbf5930a495e69e07038269ccfd7b96802ac868017c3706a9d51a590250d5fdedf05066c92fc088be71e0af SHA512 9c11c091ca9d0344c08befc2afffb12be30bb465c595210bded99b4fdb738aee4b9abee0a4eb494692ded702d24ea8cd7eae6d101d83fa824b9db72a6a41cf6f
-EBUILD rocm-opencl-driver-2.9.0.ebuild 1188 BLAKE2B 791c36c25e19d5e67db7df791679b18c83cc2f2f6fbf5930a495e69e07038269ccfd7b96802ac868017c3706a9d51a590250d5fdedf05066c92fc088be71e0af SHA512 9c11c091ca9d0344c08befc2afffb12be30bb465c595210bded99b4fdb738aee4b9abee0a4eb494692ded702d24ea8cd7eae6d101d83fa824b9db72a6a41cf6f
+EBUILD rocm-opencl-driver-2.10.0.ebuild 1111 BLAKE2B 5889949bfae15b1fc4306ab8fa7e3db954c094fa5c730d77dc762572872825e24afaf8765826e0bac1adbcafa1034912da50f651c6d15e971e03bb97b1337a39 SHA512 b47a5d08fc879673e20afc4a4d74779dba2436837ac7da5766139db4161ae98481549ef83ebf87f6223a7d1424a4ef039041f63e318179ce37294a7da8439072
+EBUILD rocm-opencl-driver-2.6.0.ebuild 1193 BLAKE2B 524c81f5e129efe47dff911dbe0a15c88d490d8b24849794e5f5ffc4f42a43bb690b262b2682b0a70245b9d6bbe20fb2fcf6f8866ec6aeff1b5e2f69a0a3ab81 SHA512 63f94d3915640420df9ecf0e55c11fbb59011be624d0a9b9a35522f39ac6038a1b90d87d90741b6703082672c8d3abe1097a9f22631eb39182c9139a5d574151
+EBUILD rocm-opencl-driver-2.7.0.ebuild 1266 BLAKE2B 8936a5da49a5e8318c36ed3ac1b49bf14b812c17b7f3a01bc05d5f5866cc666d00f1888ccf779c34cfa8372b83d1e6a5986422bcf34919d6e02dea23b8c2309c SHA512 4094f24576c450cf81b33509fcc80f44e142d7df62fd8a508bbb4b86c690e51fc02c25f61bb1c781ec7ba10c0f59ea7e1c3baad94743507ba014a074c9171031
+EBUILD rocm-opencl-driver-2.8.0.ebuild 1215 BLAKE2B 0a7943af5cb400223b58aedec47711f04306372f79e05e9dd1e05f430957b8613c488b75d4af9c9f766ea5a39ec3ac14febb7a8843c0bf29700013807441d1b3 SHA512 5d4f4d4e5d04d7437dd69fb377dae3012e5a298d7879845ef8baa0627ffa62189e7089254f5d88500a17e9120853fc7648fd5f1a4f20f715c40f7183f008714e
+EBUILD rocm-opencl-driver-2.9.0.ebuild 1215 BLAKE2B 0a7943af5cb400223b58aedec47711f04306372f79e05e9dd1e05f430957b8613c488b75d4af9c9f766ea5a39ec3ac14febb7a8843c0bf29700013807441d1b3 SHA512 5d4f4d4e5d04d7437dd69fb377dae3012e5a298d7879845ef8baa0627ffa62189e7089254f5d88500a17e9120853fc7648fd5f1a4f20f715c40f7183f008714e
 MISC metadata.xml 489 BLAKE2B d989103f6ed0e6a7406558565a5d0453046f640fbef964eb84e51fc911dac4bcc57bc3f1c5222bb5f6d2fb6d10a7f83b4172161070029b0d537b475ef8473f04 SHA512 3bfb9c1ed4cd559aefaf7a74567daf0952359a9fa3e703f1dfaac48d9bb7a25d134afe16e7509c28dff8a5cdabe09870d8f541898756c028b5c5996577956f0a
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.10.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.10.0.ebuild
new file mode 100644
index 000000000000..7d1b111fda23
--- /dev/null
+++ b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.10.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-OpenCL-Driver-roc-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute OpenCL Compiler Tool Driver"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="test"
+
+RDEPEND=">=sys-devel/llvm-roc-${PV}:=
+	>=dev-libs/rocr-runtime-${PV}"
+DEPEND="${RDEPEND}"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	# remove unittest, because it downloads additional file from github.com
+	sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild
index 6ab3d1073d10..944093474098 100644
--- a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild
+++ b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver"
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="sys-devel/llvm-roc:=
 	dev-libs/rocr-runtime"
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild
index e4e2818a7ed7..4d9d844cb8f2 100644
--- a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild
+++ b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver"
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=sys-devel/llvm-roc-${PV}:=
 	>=dev-libs/rocr-runtime-${PV}"
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.8.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.8.0.ebuild
index 31cc476dd0d3..976d316de6ab 100644
--- a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.8.0.ebuild
+++ b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.8.0.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver"
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=sys-devel/llvm-roc-${PV}:=
 	>=dev-libs/rocr-runtime-${PV}"
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.9.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.9.0.ebuild
index 31cc476dd0d3..976d316de6ab 100644
--- a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.9.0.ebuild
+++ b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.9.0.ebuild
@@ -20,6 +20,7 @@ HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver"
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=sys-devel/llvm-roc-${PV}:=
 	>=dev-libs/rocr-runtime-${PV}"
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index fe5f95990e61..df6b4da3c90f 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -6,9 +6,11 @@ AUX rocm-opencl-runtime-2.8.0-change-opencl.patch 3886 BLAKE2B e9833c84867572148
 AUX rocm-opencl-runtime-2.8.0-update-README.patch 1263 BLAKE2B f6fb48bc8ea55480c157d0963b859b47acd914adc77a1ba2780b058f50dbe820100355ec2f73badc6e0618c0b2fb39285b6589587efcf2ded1b9cce62354ec7c SHA512 4351eb77a2d5f7cdf8e014965428624b35a2314edb63f65a34f5939fab9975733b3cfa4f70a8bee2e1c3368c6ed6bbbd568a941ed370b5a9a07cc347795577df
 DIST OpenCL-ICD-Loader-6c03f8b58fafd9dd693eaac826749a5cfad515f8.tar.gz 63248 BLAKE2B 7c311d98e5a209d01f1f1dbad7471ceb3de66e10f7cee48686ed176efcde1e7ba48ea12bdbf2af61d5f72e5b8eda69b2fae6829d265a8b88ad46c4ec4995d8d4 SHA512 5033d6fb0ef2515e56b0d9c31baf6fe02e90613989c417fbde20efd79e0ac2841df1a98ff799e60cc469b79244cdc756d15950df6c9baead7d31febe7cad0418
 DIST OpenCL-ICD-Loader-bc9728edf8cace79cf33bf75560be88fc2432dc4.tar.gz 62858 BLAKE2B 931fb7ade12debda99512d8b9fbfb987f47e3b68568863e480de406f842a014d39f0321c44420fb8b68b8757d49cc02cadf82e767c9d2b71e53bdb8e9763cace SHA512 2ab9035fbc0a80a529d1b2f454b0b9a263b6eff601121750e81e2e32581f06189566cdcf201ab741ff3f1491ead825a7858000901f8042af67b1304be622e9fa
+DIST rocm-opencl-runtime-2.10.0.tar.gz 965836 BLAKE2B 2eeb3449939389d684b016a5eabfbac6491079d4a2ebb78ef3baeb47dcd0e6e2f4e32fb788ad28f704f2564b463759b8e433517eb6bb63d3c3d43d25e524f846 SHA512 c5142391bb2d0ff92c509745da63eda8ebdbf2dd7223dbd545e394b5b716b4f0c666de3ab48f0eae94f51967185930cdf1f0cc4822d24932a2473c1a2db5f76c
 DIST rocm-opencl-runtime-2.6.0.tar.gz 986155 BLAKE2B 43469ec3a368e2ee9716a38d08df48c28165a233bd80de54f286011df25782a197e252e8e41ffa8f59eecf93d6beae5434497e8d4b648676252d32a0859ba59a SHA512 bbbbd29bf23f93440135786600cca28a806714bb207b7ad0947d26471fa38470820e7801acc84380000d43d55ff2ec1d95cee9e64b500628b6a3b026744c67df
 DIST rocm-opencl-runtime-2.8.0.tar.gz 976851 BLAKE2B 4191c2f027f615a8ba7a38d30364549df509e6bd432e5bfe3d30d40fb6bade15b58fe824b5aa9704e5d93421f28e1067d283738fa85e7ec59a444f5be25c963c SHA512 6c070d3e2f455d96f028f614f0562c0b8983b457c6295c398d6d4574133d4a7384573caa1f32e39550887861aa09aa19c9e34fc8bbae6ddc41ae395969d33540
 DIST rocm-opencl-runtime-2.9.0.tar.gz 980980 BLAKE2B b72c9659ca8ac6b12d0c5c8c204a2a481c9e057e1b6aa80e24b57e141538c345025bfe74143ee2450bb013ff1b45a314538965fdc071a6e925967368baabfb94 SHA512 9d9742da94d4dd7326e6f64042418726f8fcaa05b3a02b6a7760b2f17067747a2a5f37183a4245697211ceb21e4fa0870dfeca9970b4fd3794985311d6ff7d0f
+EBUILD rocm-opencl-runtime-2.10.0.ebuild 1793 BLAKE2B 9b3909bced5bfbf8bbd352eb07b461ed56537738ab78aa6ea3c2636d8249fce0666ae15014732b3bdeac87a307aeaa0ddaf7d3f1b5811d46dd3f8b2f06aa8148 SHA512 87b6780b899bb1642855e6191d632746e037e9424260c57a5577cad279cf6510ba370107664315971a30459b7b2cb10abce936d3ebbb2e2d30deec41ba5dc1e1
 EBUILD rocm-opencl-runtime-2.6.0-r1.ebuild 1483 BLAKE2B 7271f4b536f08c31031d4e4a38a5b9741cbd7d24799c508205dd3c9f39905173426aac248528864c41de8598bc798c55999c2c1c79d44c7ec84909dc0090a892 SHA512 81180ca79e5d5d4b3b1518f3e7a1947ff57abfb50c71006511a08f15e1d94761496eb8e8c36b76a8493bc2ac1ac43ea836c8663e1130c03b4df638d012aed49c
 EBUILD rocm-opencl-runtime-2.8.0.ebuild 1758 BLAKE2B 2dfefc99a572eed6ba4283aa11afd45716145000599967d43e77dfb6b61fb0c61a801d44f4d389b4f69a84928f1328adbe0c0cced46f3ad73ce8f2947963ebc0 SHA512 ba6ecbe7d355c4494bc68a0c1dbb4760147cb4c8ae43977055635a1f5e4d83054aef90f784db55b14af32af709077902a8a90bf776fb6b8d0949ff1db944a87a
 EBUILD rocm-opencl-runtime-2.9.0.ebuild 1793 BLAKE2B 9b3909bced5bfbf8bbd352eb07b461ed56537738ab78aa6ea3c2636d8249fce0666ae15014732b3bdeac87a307aeaa0ddaf7d3f1b5811d46dd3f8b2f06aa8148 SHA512 87b6780b899bb1642855e6191d632746e037e9424260c57a5577cad279cf6510ba370107664315971a30459b7b2cb10abce936d3ebbb2e2d30deec41ba5dc1e1
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.10.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.10.0.ebuild
new file mode 100644
index 000000000000..f62a0a3951c2
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.10.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
+SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
+	inherit git-r3
+else
+	SRC_URI+=" https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	>=dev-libs/rocm-comgr-${PV}
+	>=dev-libs/rocm-device-libs-${PV}
+	>=dev-libs/rocm-opencl-driver-${PV}
+	dev-libs/ocl-icd[khronos-headers]"
+DEPEND="${RDEPEND}
+	dev-lang/ocaml
+	dev-ml/findlib"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.8.0-change-install-location.patch"
+	"${FILESDIR}/${PN}-2.8.0-change-AMDCompilerh.patch"
+	"${FILESDIR}/${PN}-2.8.0-change-opencl.patch"
+	"${FILESDIR}/${PN}-2.8.0-update-README.patch"
+	"${FILESDIR}/${PN}-2.8.0-amdocl64icd.patch"
+)
+
+src_prepare() {
+	mkdir -p "${S}"/api/opencl/khronos/ || die
+	mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
+	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_COMGR_LIBRARY=yes
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
+		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index 54208b48c6e3..fe0fe1b6ecd7 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,11 +1,13 @@
 AUX rocr-runtime-2.0.0-cmake-install-paths.patch 2151 BLAKE2B 4d52316dae6fae72c85dcf0d042f97dc94910278ffecfc4ca2c4f51fe7ed9afafef994626d7f58e8f806eb3620762adfe4523630db982f715ccad6f90c120e97 SHA512 d8d3862d018582c3c4c5551ffd75dbfccb0d005bcaf0a005de07a2c0ac7d9060c21a348b2ac01b447a9ede007ffd63ba11a8a8e24d4c15c0044e2e86d6266f95
 AUX rocr-runtime-2.8.0-fix_doorbell_map.patch 2384 BLAKE2B 3fd7ca719788a48a40adfabd6543510d586f6414c19daec011fa09d801254e9a3b5169feb26e8fa787bb9f05f254b83a59552d226e0537adbe411609e12bbf55 SHA512 e2f506bc6d8a942b57d46561e29bb9b17aab5e7a8afab92e147ea6be2670c82ad7f624549a4ddfa847a2ec2984f842eaf3a12fc9ec9f5375ba8ff88c2199a041
 DIST rocr-runtime-2.0.0.tar.gz 313087 BLAKE2B 5fe5ea99728f7d7337c9e8a174a31d4ca8bdd559fad3400955ba6d86947d5bf9004094d78548cab2cb2089bfd028d0e4dfdd4d5fd7b41bed73feeebf2f33b705 SHA512 662d3d8fff8aeb17557df67207d885edc1266bb9800ec46ecab28bbd6ace7fbffb9e4092d74beb0366cacfe8873b1b257bcf2f8345d81a9b6657a7adcfc53c0c
+DIST rocr-runtime-2.10.0.tar.gz 325165 BLAKE2B 482fde76d909e40478237ade1dcf9c0d28e1d6b9f541876d91f513d68c1882ae823d08b852a7c1b112ebace68f7860305cb962aeb79d7a4e8ef9a0ad249c69b5 SHA512 92ae7ff016bec7f8c5e781633d95a01e6b3e3aee5ad702d9e5b329d8b4141722328a17a67327f4aace747cce3e22a53d1e21d304dfcd2d83dd71f2da113adfd2
 DIST rocr-runtime-2.6.0.tar.gz 318296 BLAKE2B c04e04db32f650def8a7973fa73f0c0e9b99412b13676a05e9c4283ea07958ffe14f7c54002db469ddfd506f349087bd66fff138b7e7b19c41f4ca8789a7c384 SHA512 3b88cf4e1cb6fca6b4361a612abc2c02466d4f716838665d02f16b6fa975b5f69795622d6b96a01b796165980d2888be7eedd77957a7fd44fac19a0ea581f6b8
 DIST rocr-runtime-2.7.0.tar.gz 321669 BLAKE2B 99f7a62019aaa893ff032a7ed492720c1d0d8fc2c8a730f2e6833d1ad34af57e1045ed480a7d5ba72123bebfa6accd6282be4299bf94d77404adc5bbc9d13624 SHA512 46926a711665df4e232a6dcbcb1f67a4a133bffac927b70404e3cefe624be31dfc5ffea49ae9b834076cfcdf94a6e61b6804af6aed75f433e1842c980bc6e54d
 DIST rocr-runtime-2.8.0.tar.gz 324868 BLAKE2B 5c46ffec7482e09032c67270a352543465f9f8a0a7c45e9884c37104e9e12a7e4dccb60bf3904d1398ffc00d9e934fc055190ba9ba4c1104bdb83be6c758eded SHA512 428b7d1d17a82c841a4d9a2c163670464416afa3ca3c579cc63ee712880940c0150e365922ffdafa44ee81fb76295cc19b66a1a4cb0a7e9a366f56782d826061
 DIST rocr-runtime-2.9.0.tar.gz 323220 BLAKE2B 7e6338185f23011ed4105c6797431677e657c6fc198f83399daab4d3b2d3333ebd6e86c0d669bf794f984ea0346b8e528449eb5d81aff2ecf3f1871663458df6 SHA512 fa68fde0f79651956096ee506ff8b6760a9623e7d9cb099229b3951b7434bed5b501a3c6785c5767902c7dbf6c478ada5d2c2a5c5984063f0d0d0db8bca2bda2
 EBUILD rocr-runtime-2.0.0.ebuild 862 BLAKE2B c9262812cdfdc159248b81cb168b5d2465f2bd7544d576d4d7407919a0f9764a6c2eaf53731294c424755e05915ec47647435ce7524d276acbc7786bccf6ede9 SHA512 8c02bd29599c6cc7ad77dae4f8759cd4f3c2840800ecab30953d325b0ce1aa6bc5bee51ad2b5eca60eb420d5c4fce74e746cdf1efc470a4262eb5a360531399d
+EBUILD rocr-runtime-2.10.0.ebuild 967 BLAKE2B 847b465d805b6d30129b3bafedd2471bc093fd3bb91dbfec11dae0a086ec625e4ce087af08e405942d4677003c4c6d9794488932da754588e4567878edaed5ab SHA512 02dd1a0fc265a44a2250d475733c1aa3ea1fd046651291b457991a433676007828e082380b6593eb23dc2dbb5d0293b07072925706002dcc2aaa3d8f12306abf
 EBUILD rocr-runtime-2.6.0-r1.ebuild 869 BLAKE2B e5a736b834cf77ee056ed3497bcdd3bdb0c525e3ed117164d0a28a9c49ffd079909967110af94c5c87f9e1429e58d36511f95b8bb60c3158a27800fb8679269d SHA512 f883e3f6e2354a2bdab1f5dce33eb9ae6b6405d158414f8016276b25e8e50420489419d4bd3727981bba04ec2311afa7ac3c2590148ab1f45116b7c66124cfbb
 EBUILD rocr-runtime-2.7.0.ebuild 967 BLAKE2B 847b465d805b6d30129b3bafedd2471bc093fd3bb91dbfec11dae0a086ec625e4ce087af08e405942d4677003c4c6d9794488932da754588e4567878edaed5ab SHA512 02dd1a0fc265a44a2250d475733c1aa3ea1fd046651291b457991a433676007828e082380b6593eb23dc2dbb5d0293b07072925706002dcc2aaa3d8f12306abf
 EBUILD rocr-runtime-2.8.0-r1.ebuild 1010 BLAKE2B f94721331deaa6b107be62380a09fb2337359275fda8bf814f93fc119485aba974219833db78d92a438d91f706eb46e3a704d086661e24fc1bacd969eb010bd6 SHA512 0aa37210c6ccd697b483dbe856017e382e0b46a168f420910371e46f405e0e300a5d05f77548b29a989dde6f4065be07ceffc618fa9864baeb2ced7681a2738c
diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.10.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.10.0.ebuild
new file mode 100644
index 000000000000..507d471dc104
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-2.10.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.0-cmake-install-paths.patch"
+)
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="nonfree"
+
+COMMON_DEPEND="sys-process/numactl"
+RDEPEND="${COMMON_DEPEND}
+	nonfree? ( dev-libs/hsa-ext-rocr )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/roct-thunk-interface-${PV}"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index 190381846a79..48008f60917d 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -4,11 +4,13 @@ AUX roct-thunk-interface-2.6.0-correctly-install.patch 982 BLAKE2B 75306fd9f457a
 AUX roct-thunk-interface-2.6.0-do-not-install-kfd_ioctl.h.patch 1182 BLAKE2B 824b99754d9a6c9ab61b9e195e34eb2927b436bf9a1080d0645e220a76199797169616518fa36154c8afaafbeacc85c3d5ede2abb4acfbc5cb4b420222deb4ca SHA512 ab8ee4abc9418809ecc01fccd91bfffc8d189405c533ced32d6f6a28ca6c4d8da0fe9b5a2b225e2a7bfb7275c3a018d1290f743d816071a1b930f608eea10c5c
 AUX roct-thunk-interface-2.6.0-pc-prefix.patch 860 BLAKE2B 93118ca68359edae385b8842512ebe37c7ba1ec88e11a90bc6ee561eb22de87364cc716830575b00dff99638a6f429060d1f90e7e46911f2c49a7aa301bf4396 SHA512 18d91c568e76c09fb6d49648b0ae425684ba5fbdb138943722fc7192b223343c7ae63f7e2ca96beadb4eb53ce090a4b3dda496d413bb16fbedcb95ee42753032
 DIST roct-thunk-interface-2.0.0.tar.gz 1958218 BLAKE2B c1ba89cac9a18964e040e6b1e57a464216e7086c400e3360cfca6f376ac90b0b1afbb3a2a4d995581d1829ca57afe62bf6f2ac59cc103a48d384a8e52b1457d0 SHA512 7d2e35df2bec201bcc977328d7d36b921f76b57a0c54fc2332eb1faf3a722b6a3a1e3b1658e93b216ed68b965426c463a2dbf52a22af64ce1dcc9fad0f27ca9c
+DIST roct-thunk-interface-2.10.0.tar.gz 2683289 BLAKE2B 54e4eb6e5d6b0e6e99021b8ce441401cf5a8e1847cbb81d7a3bbf73ecc42d3296b067b0dc5fb1e90b406bf4f909e94bdd57a4c64e730f9f579a85d6d0c70df69 SHA512 95ca5ce1136ef576d86a642cb413f66ee3d407cf564f44ad0f9ee9cf6ee8aa411977beba33bebec2dfa6c650f7bf50be85de45e7debc058a3a3de662f4327c7f
 DIST roct-thunk-interface-2.6.0.tar.gz 1957383 BLAKE2B 0335d4e219978d16bc8dbc77c6e1fb315f424ddf9225eb14968d4f8233348b358151f2baf279dc2a6e422da7839b704c847f1311b21d69e07738f3fca3235452 SHA512 e54f7cefa1854fb9967e373bd3ef5a0236987ebb26c21728ef5676e73cf63be6e9a49c1ce52d1156caa970473f214e02f25370e2cd7381c1f74a0b8cd5b2bc7f
 DIST roct-thunk-interface-2.7.0.tar.gz 2677696 BLAKE2B 44e15d772f3e86994739ca28300cac0dde56a173daa3789a332d58ed7ac4f5e8705b778e1096d022225a8b89fa5ceb4e3e40b456d470e7ab325721328e04292e SHA512 325444d6b457dae03779730324bf683712acb07ed9379675b025456a8dfcc4f6ebf1d2e10bcf03b6474ad8353c20c8fa1d380a671578e47f9a7e27caf946ecab
 DIST roct-thunk-interface-2.8.0.tar.gz 2679724 BLAKE2B d7e1cbb0a21800016926caf6d644d10d0643e46ed888cb23414f92a55fa994c7f1de1982b025f9d116b3e596ff0224397180d6c974940f1b5038b331f1527c8b SHA512 c1c64192f5687744a069bcc1067d3edbd833b6e784e114e8772abc89940d24b7a0dbc0479f41d1252a4b69ca6a339b00bf849682ae235cb6d5fa76a6c84f3193
 DIST roct-thunk-interface-2.9.0.tar.gz 2683269 BLAKE2B 0dd5d4f6b4046711e2fc535012fb164b463000f19a3043398ca8e1382d373cfa4a5ba00c8861a3b0fdc8a34843fbcec644ef2c1598fdd08b4bf2fdf18ef3988b SHA512 ac6bd1550b56996edc7e5cc49200c8cb0dd8da42d6fca5eac27e48c45ce74583c6510847fe747bd528089d054faecefcfe630284b8cd1f9d692838d47643c0c0
 EBUILD roct-thunk-interface-2.0.0.ebuild 893 BLAKE2B 1b3d076a1042d862427afdd98d149f3f2716395f275407eafae0df0a8bfb1a410bae65ab16b18a8394d3d6516eabb4a358c66667b55555d871213929263a0461 SHA512 472c9f047007f97f15c9cece71aaba8473698f1e3a1b8a72f1e42b4e7aff298ea092fec272bfc0134550f7c31d74cd7476133c614337405ba824d96957a10ffa
+EBUILD roct-thunk-interface-2.10.0.ebuild 1174 BLAKE2B 625ddc28494adc232ebc7fb5efa0ef17f183e37b6835d7bbd00cf007b16ba64e67b2ade012a0db1234847a2eabb115be6308f90e40812dba5cd0ccbbce70bae4 SHA512 3d1d715996fd8a0a62c668bb8fb42182d8fe761c062fbb132d92130d4b14f1615760b40dd2f926eaf76269aa457866c6cd07760df89d58e2c19a1e2f00333169
 EBUILD roct-thunk-interface-2.6.0.ebuild 1162 BLAKE2B 625d067629a44d62e9f9b874bb74098226c6fd4bcc0afe520edcd6c815403137d28274d42b42bcce7ae1e2db6b8e5410cc8b03dde505377ffce4b2e285629279 SHA512 c04811fe533d4b06770ff1e19d0e9572d8f45f932aab8f60052a86d0749bbc082f39401e3fef701cdd7857c85754f8f57e49dedcde2b4974492612eb93ef8fdf
 EBUILD roct-thunk-interface-2.7.0.ebuild 1190 BLAKE2B 68654588a3a2a3bfbe5d50536c518e5be81fcd9edf69db25e8b7e4ecab42d8538c7575b770a5c359ca41955384ebf11e5841773d140af851deadcf21f821d877 SHA512 dc0e98aacaba2e3f24f86a7241224536021a9569fd8923a164af41b17b28e146c1bc9e4e40f65ee88f107b7ba8cc8210bbc129cec7958bc245ab1e3501afaa8b
 EBUILD roct-thunk-interface-2.8.0.ebuild 1196 BLAKE2B e76798567c890f59faa5964ca734ebdd3235bffbe950802797dfe7ee46e635aef32cf69563f455c5fa33a4034608eea55f952085decd84f7b5efb35323b256f8 SHA512 eaab8c6baa03d56bbf4486eb71b65c71f69e1df21ac05ed825092598b942468183dd0dc360ca941240459bfe4bf3f8a686766ec9d9222b60ea9a9e51ac1cd1c8
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.10.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.10.0.ebuild
new file mode 100644
index 000000000000..8309cffdc300
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.10.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
+CONFIG_CHECK="~NUMA ~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl
+	sys-apps/pciutils"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
+	)
+	cmake-utils_src_configure
+}
+src_compile() {
+	cmake-utils_src_compile build-dev
+}
+src_install() {
+	cmake-utils_src_install install-dev
+}
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 3d696c59942b..023b549fbd3b 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,3 +1,3 @@
 DIST serd-0.28.0.tar.bz2 371592 BLAKE2B 143e858b5947cd52d01341ec7ff5fb36f98aefceda4e748b2a999c2e6d2c972b2f5d30053d8538f04f236597da93a595d0fabbfa4c667397e27d4c897458d1ee SHA512 b25cc70af17ff821812ab2a70c2812c1713ff811a0f18fb5d5c54f3b67e0c68293aabedfacd687afe6b7acdfd81602ef81764d7e11bc0d933de738bc6d4fce3e
-EBUILD serd-0.28.0-r1.ebuild 1123 BLAKE2B 90252d5465c9d289c18ad84be948c9d2ad643ad4c886a7a5f6588a2fe5e335ace7f73973eaf2a296887d70a75bb611da64ee5f5eef0d69d56efcf1795c83b9eb SHA512 33e4152c226fc3ec2ff840ebeb72ace220597483337fd1e769b6e60de696dd6187c4c99ea2f093181827365dbd92173562b7516cea7537240af0d789ba9cc916
+EBUILD serd-0.28.0-r1.ebuild 1150 BLAKE2B eac294763bd73110213756378114c176524f64e9c50c4104206796299bc95decc185b51514bca8b5b7f31d0fa6cdfa7384667853decc678c6b6605fe59844615 SHA512 76aa9ec1eca2e0452cf42cf95f4396bcf03fe7da10c01eb81fb9fd15d94fbdfc714a5486e12e168f2e315e6629aceaec4ef5884dad741bb0bb3e9ab832df2bb2
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.28.0-r1.ebuild b/dev-libs/serd/serd-0.28.0-r1.ebuild
index 6b2f25739ab9..d3d37b89f09e 100644
--- a/dev-libs/serd/serd-0.28.0-r1.ebuild
+++ b/dev-libs/serd/serd-0.28.0-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="ISC"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-libs/serdisplib/Manifest b/dev-libs/serdisplib/Manifest
index f74bf80f72d6..e2ff2c09b133 100644
--- a/dev-libs/serdisplib/Manifest
+++ b/dev-libs/serdisplib/Manifest
@@ -2,7 +2,9 @@ AUX disable-static-build.patch 3327 BLAKE2B 677d3dcc121cbc42345e987055aa202ea811
 AUX use-destdir.patch 3400 BLAKE2B 77d9adc8c9a44586cbe352c6273677704d7335fc75c82d50a681c361a10a45484ae0dfb3241bf9d99ba242f6548df9cb036992b46e157f9c4ec3ca098397be7e SHA512 370ace46b39ba5e67d7f728a3cb3980b75a2c7e6e5fb25273f9c3bfbe10f33479bfcff92e3074a2cb80985c114d161b78115410dd88330810f654875e57d7575
 DIST serdisplib-1.97.9.tar.gz 293190 BLAKE2B f11406acaedb724d51266510d10f5cbae7e3bf1a69e3378ed8a0f8c4551336e3d662eb104ccc938f72821aec3406e1eed27754c990e17940d8dbe7dd8c5d6805 SHA512 ab45202fd1fd85b12f1ebf7a7e1a4575ad363f6faffd45949300840456e26dd521c70b67ff57c32e1ff6c0a9f2668b3be6a653afb57ba6da701fbae6e8db3118
 DIST serdisplib-2.01.tar.gz 472998 BLAKE2B 7ee78703d1d2cb4172e44db443825dd0fb3080284e832c60a102b853a1df6e0812a30a40504b8eb3e5ecda83f57138d78b43c3c40b8e4efabb7071eff7ad1b3e SHA512 0474cce4353edb3640d8432272905859e90efe6140e6791c84e1cb51df7f533734a9c78447d8d8448a70e62dda6d65061bbcc515ee346354825029874ae5e9a9
+DIST serdisplib-2.02.tar.gz 497028 BLAKE2B f35b6df60303a288b2a279d821a510089802019f33b7ee36b9c2fd1d1d6bef0b3118793e6d965076c1665e1e2555a553186ef1a9210712ef9d2bc1e090ec0a98 SHA512 d9936c25dc14e24eb02876f203476752340e621d8ee5c87ee99862575e45199bf46ff8487dfdd80b16a89543958fdf5a16a2aaf78d5cade06811cfb1592c45eb
 EBUILD serdisplib-1.97.9.ebuild 689 BLAKE2B 046e5cbc15c905f6e9ce98cd91798a7b08e93f0ab5409d3ca46a0f52f2cf5c600d53521720e584146c001dcf1a414ae65c98f469cfd203a89b427193cdbad07d SHA512 f1d713fc3c1005ad81b074a4b75638015f06b57141d2f83e02c4cf11a2b2cdaac56b89f1c3fbfc1b3e38d33f2c48e0e22a7ac6af31c47e50b1d4431231c613a9
-EBUILD serdisplib-2.01-r1.ebuild 2560 BLAKE2B 1857bbcc27ae21c882f30309047b0e82ed95e971683e996ce3f79a54aa61aee9ae7d0f7086be2a5635649f4ee68ded50e9522b82516150f0997c3a02a2bf6ff4 SHA512 e14108c215f9690e0d931bf328b086cca420ef5eaafaab85f1274d3176903202fdd4fd4a51a52316dee360b96a9b99b012939509a08f6bb9ef6234ee62b075e7
+EBUILD serdisplib-2.01-r1.ebuild 2558 BLAKE2B 0556b6f2ac51a53ae8160cfbbdd490e7ec0f0f65ed177d457a84f865c541c9ddb953d3d21700719f404dc8ca4bb8488e21ae3e15126fbb882417344c33b67720 SHA512 29036de8863534cd54ec9f72f7bcaf131d5a2b0c3ec63c5a3908481f0f946e3c339b92dc6bfc037d8ad67e4af46dbb6f5cceb4ec9848fac1a4c8ce7eaccb227a
 EBUILD serdisplib-2.01.ebuild 2508 BLAKE2B 4efd666b305375c65be803c8e79d91b9f8caf72cc74d2f655a6ccd790e80099fb44749d46749a8504b0f74902187fb2501402c330301e01d3de62e9b721cfe65 SHA512 cf3279873e09b74ef7c3c357c94fd8bc2a23840d4f606011c2cecad5a3a3972337c4f5ae4c9ca93afe1200aad54b0f8b958e9f80aa2591c525412286c1b9dc26
-MISC metadata.xml 781 BLAKE2B 39a77b8c97974cdd41d31afa7bc47def2f23f1137b00f79f6574c4f4236702f2ac12219520c7afb7346c4b51dafce61ae901f64da618972fdc44d80b918ab5bd SHA512 fd9814780e1fde17eacd0424f757b9d2b905cbf2116d44cc0966d703cbfe7878580a1afe7b2da4e02d641617922b3e057e9daf8213091a69b0820bd7d92186fd
+EBUILD serdisplib-2.02.ebuild 2559 BLAKE2B 9d19520bb7762b794b49c6c0e110f680f1340b8b1cbfe8bf9e914a58f025f99b62950f95b1a56dc05e382e571bd903067df58d29d85b10ebbcc1edcce9482a6a SHA512 e0eb83121bd6e33b01c67f286733bd46aa48dd7fc3c5352b11be786e7f15bb7d72393dec569b15a791c18097dd3729e72846f41975a67acc7e45b1365c93ab96
+MISC metadata.xml 662 BLAKE2B 08a9e0f6642a8e77f31b102b1874b32e43728451e92ad3db770c06b93a3653c575844fdb1b92d4969640327b94ea56aec3caffe3afd48540709fde7c541644ac SHA512 5f67e02b44a93b45ac7f08be8e569d2974a761f54c4ddc90cc541459adc3e41b5702405d971f29c094e4b7755975d9f5cd4ba4ad0f6d9ee116e5fd6f4a2c2b91
diff --git a/dev-libs/serdisplib/metadata.xml b/dev-libs/serdisplib/metadata.xml
index 74d9cf8a6041..b1114ec09a32 100644
--- a/dev-libs/serdisplib/metadata.xml
+++ b/dev-libs/serdisplib/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<bugs-to>https://sourceforge.net/p/serdisplib/bugs/</bugs-to>
 		<remote-id type="sourceforge">serdisplib</remote-id>
diff --git a/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild b/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild
index 3511b8bfa006..19a3e815ea2c 100644
--- a/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild
+++ b/dev-libs/serdisplib/serdisplib-2.01-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="threads tools"
 
 # Define the list of valid lcd devices.
diff --git a/dev-libs/serdisplib/serdisplib-2.02.ebuild b/dev-libs/serdisplib/serdisplib-2.02.ebuild
new file mode 100644
index 000000000000..3014edbec361
--- /dev/null
+++ b/dev-libs/serdisplib/serdisplib-2.02.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit udev
+
+DESCRIPTION="Library to drive several displays with built-in controllers or display modules"
+HOMEPAGE="http://serdisplib.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="threads tools"
+
+# Define the list of valid lcd devices.
+IUSE_LCD_DEVICES=(
+	acoolsdcm ddusbt directgfx displaylink framebuffer glcd2usb
+	goldelox i2c ks0108 l4m lc7981 lh155 nokcol pcd8544
+	remote rs232 sed133x sed153x sed156x ssdoled stv8105 t6963
+)
+
+# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
+IUSE+=" $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) "
+REQUIRED_USE+="
+	|| ( $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) )
+	lcd_devices_framebuffer? ( threads )
+"
+
+# Specific drivers will need some features to be enabled
+RDEPEND="
+	media-libs/gd[jpeg,png,tiff]
+	lcd_devices_acoolsdcm? ( virtual/libusb:1 )
+	lcd_devices_directgfx? ( media-libs/libsdl )
+	lcd_devices_displaylink? ( x11-libs/libdlo )
+	lcd_devices_glcd2usb? ( virtual/libusb:1 )
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( "AUTHORS" "BUGS" "DOCS" "HISTORY" "PINOUTS" "README" "TODO" )
+
+PATCHES=( "${FILESDIR}/use-destdir.patch" "${FILESDIR}/disable-static-build.patch" )
+
+src_prepare() {
+	default
+
+	# Fix Makefile, as it will fail, when USE="tools" is not set
+	if ! use tools; then
+		sed -i -e '/$(INSTALL_PROGRAM) $(PROGRAMS)/d' src/Makefile.in || die
+	fi
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e '/@LDFLAGS@/d' serdisplib.pc.in || die
+}
+
+src_configure() {
+	# Enable all users enabled lcd devices
+	local myeconfargs_lcd_devices
+	for lcd_device in ${IUSE_LCD_DEVICES[@]}; do
+		if use lcd_devices_${lcd_device}; then
+			myeconfargs_lcd_devices+=",${lcd_device}"
+		fi
+	done
+
+	local use_usb="--disable-libusb"
+	if use lcd_devices_acoolsdcm || use lcd_devices_glcd2usb; then
+		use_usb="--enable-libusb"
+	fi
+
+	local myeconfargs=(
+		$(use_enable lcd_devices_directgfx libSDL)
+		$(use_enable lcd_devices_displaylink deprecated)
+		$(use_enable lcd_devices_displaylink libdlo)
+		$(use_enable lcd_devices_remote experimental)
+		$(use_enable threads pthread)
+		$(use_enable tools)
+		${use_usb}
+		--disable-dynloading
+		--disable-statictools
+		--with-drivers="${myeconfargs_lcd_devices#,}"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	udev_dorules 90-libserdisp.rules
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index b2621b4042d1..c78103ceec94 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -4,10 +4,12 @@ DIST skalibs-2.6.3.0.tar.gz 224463 BLAKE2B 0b051cb027b2c7335c5b6d581aeb8ff4fce82
 DIST skalibs-2.6.4.0.tar.gz 226780 BLAKE2B 80d01d3696452b54d0247c8e523c059bb5ecd59fdea0d18a80992c3db70deab935fce13b5559835f98ccfacf81a2a81e8a6b432b67f851a42f8441f7f7ecc19e SHA512 19062853bd9df0dadeceaab96aca9d2a68d93aada7552d306902d1b13c55d421bbff7fd37dccaf1a81d66bbecf43ed2242961fdb7bd51ff22e9b6114c1b2bb77
 DIST skalibs-2.7.0.0.tar.gz 226543 BLAKE2B be626eed2f6b898c3b1cf6026f527730146a5c4175a76e43a2c9e0b22d7063de84378668e7e1c28c183b8ea9e187e92f86a1de06294ab708562f17ae7ae70b04 SHA512 33624b606a0846478e6fde10057633b43e76bda299d067cff269582c252f05108ebf28c539865c7f24b67e99575328fc7789326dfbb2e81bf209aa51445f04a1
 DIST skalibs-2.8.1.0.tar.gz 227598 BLAKE2B d5121299ee13cbc12908778e8fab2eb4b7ec3c6e3ed59fbda29a66e8e37b02dc3639c9f00628274f430f1c49ea1a2fb32459f2720686ee046016c7a6e200bc5c SHA512 d2717e6f034af22a7b2ce31b019f30cfa270f64c61549db7b60b319defc5236fc6b58d29a4dae0f740ffdf32180b1940630f4239ea40cbedfcc5861398d20d86
+DIST skalibs-2.9.1.0.tar.gz 229792 BLAKE2B 82102e98ed87941b8653785a3a26b4dec01608d1b8d81b4caed4e0040d50c68ff31aa22f3f39382d8ecf6a646c50d0cdceaef3b79138222527348a85d5a2ae8f SHA512 a85a9397cdb10cbc42fd7ef4984a77802cf8c42abeabc8ff18de6d2e11ff97d950418aeda5f2dd66a04bd30004a5c4608e7cc6f4c7e23b91f56ef1ff59f4b6d5
 EBUILD skalibs-2.3.2.0.ebuild 1030 BLAKE2B 9a929766737a4e0a0f32fcdfe31d37d6bf1a0a12d921b22f4c25947183b59eff0ae70dc74f350b2043a4ab1b864b763a65014542ed3a69b9ff34672adf465f78 SHA512 ff52e56a44d1ec81ed2e21fb0bfd91e42b88228f19b63b32b843b90b103cfb971e7f9e94086e2afbbe0ae37d64d24aa637a8f54ce7c720f12eed2efefeffc578
 EBUILD skalibs-2.6.1.0.ebuild 1102 BLAKE2B 6e9f79ea36986f7695841068d69eb5fdf791b0dcd4982deb854983e9d2f30b2616b265e51c1b860df6b485d6178d94f9bb1a12df4d240182814d0e7f9aec5283 SHA512 f9afc8de965ca315a935cbccffc1083a165f8d2a6ac1742b431f21b666def320bd5ecad49a02bfa30c64fb97cc0bf2be3a77660741cb60af7c8c369873f956a4
 EBUILD skalibs-2.6.3.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0d9c3a86a7d4c716c246749b158638f47f0e5b2506a0ed107c0c804b43e750d45b16df818626e689ae481531a6a2 SHA512 74f5e20314288d3d4b3fbf2c09278966f7a0b4315c60a34452b295c4eeacdb382ead485bb7d9d78d87c43d5af1499857f7e960980a079cb84e7f6425b5950762
 EBUILD skalibs-2.6.4.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0d9c3a86a7d4c716c246749b158638f47f0e5b2506a0ed107c0c804b43e750d45b16df818626e689ae481531a6a2 SHA512 74f5e20314288d3d4b3fbf2c09278966f7a0b4315c60a34452b295c4eeacdb382ead485bb7d9d78d87c43d5af1499857f7e960980a079cb84e7f6425b5950762
 EBUILD skalibs-2.7.0.0.ebuild 962 BLAKE2B 9021ed99abba3ade6a91c7114f82dbbbd67d74e0fe6a25d161899e15c8a3633bb51221dd8a23ee3c71047d006333f8cc2322a01a91ed0bb8ca5525cc0d71bbdf SHA512 99aba2aea0c3160111ad3e405df848f77862a13caa96c654ddfc8a803190ffc8662e064f7a64096a0d3dd41a78f049e9a55265f5e98dcd55043aa6c958e18710
 EBUILD skalibs-2.8.1.0.ebuild 882 BLAKE2B f3740ba8bc67c046903273f9afb3694f8333df95da37fe23a1a52143a0b1b7ebd803d7f42c0adda6ed6271c5782fa4da54e17eb1647df86818c1712a43ff4938 SHA512 4d7e3cf600955a6e34b9c540c24d54ef6de8094cf6ec2082064f1802e7f2adb3d29dbff2cf67674ac743c526b0cdb614053f42c6e49f35f21c00b676a2678f05
+EBUILD skalibs-2.9.1.0.ebuild 860 BLAKE2B 65d7eefa6cadf7f8681efe4a6fc40f3644bae136b839a3f8817e38a576aaae1a22404c0b95a0139bb4bab3ae84756cd888099a17f9fc6c3ffd769acc3af09dfc SHA512 1e5af656751aff2ecb1dd09a81b5208959f0ae80511ff30eb2984680bd337b45a9bd1d16a4e4d949dd4182f6b6ce5aa790525658b5ed773db592f61d805c345e
 MISC metadata.xml 578 BLAKE2B d5f0ec32e0f6466121a5e91ddfd707a488517f4009fbb999e2ef04d5425dadfe16d4ff7792b64b65065a24b3723aa3076999ca2ce576bb7b134916e0a723b7e6 SHA512 837e8b1a0a2cc499f6431f3ea91a6b240c74d3e6087457d1282f1389f80a501446cd49d65de4233e1a58ce5ecc8191ddb7583d1a03486c35f77c7cd47eaf4890
diff --git a/dev-libs/skalibs/skalibs-2.9.1.0.ebuild b/dev-libs/skalibs/skalibs-2.9.1.0.ebuild
new file mode 100644
index 000000000000..73dd8d6e2540
--- /dev/null
+++ b/dev-libs/skalibs/skalibs-2.9.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="General-purpose libraries from skarnet.org"
+HOMEPAGE="https://www.skarnet.org/software/skalibs/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc ipv6 static-libs"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
+		configure || die
+}
+
+src_configure() {
+	econf \
+		--datadir=/etc \
+		--dynlibdir=/usr/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--sysdepdir=/usr/$(get_libdir)/${PN} \
+		--enable-clock \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable ipv6)
+}
diff --git a/dev-libs/snowball-stemmer/Manifest b/dev-libs/snowball-stemmer/Manifest
index 0cb608af3847..bb4b830da2be 100644
--- a/dev-libs/snowball-stemmer/Manifest
+++ b/dev-libs/snowball-stemmer/Manifest
@@ -1,4 +1,4 @@
 AUX libstemmer_c-shared-library.patch 850 BLAKE2B 864f1f7f34a35b04a57899f0ac3dd743121c4f6270ad1f5cd127789d79e2f70fedab1cbff72d492b7e0f7a048609650e2315b8cebef013fb711f812deeddf32e SHA512 36f96bf9661a71d7aa77619202d7c4d48cc494da6287ecf5a24ffa9963aefadf9f825ec52058534aca908e6c2641af71bfc1bf14ab880d9ba480add7a8cac12b
 DIST libstemmer_c-20140325.tgz 129506 BLAKE2B 46040a864b8111bcca1c858a16081542a9900e435e6154582e422e1687b8230b0a5f63c7e349e1ef47128eaa898891df7b87fd2a4d97d0c1304fb8af7ebb627b SHA512 938eb12d4fe9e229f21536a6cb8a4322e0b664a7fbc15685e7ad46b4a6ccdfbefc55cc484f86bc738791d6f3e6d1b61ba777a4332a62cf76a8b0a5efd2c2762b
-EBUILD snowball-stemmer-0.20140325.ebuild 1413 BLAKE2B 872cddc7506ab1d3d6af32271aba2f2214bb9a185a03a0babf05798367fc49925b2b42a30cc01a39fbc3b13129aea241812df7b1d244e149af6f9b0e15061254 SHA512 28b6f45099a8a93631e259ebd2bb8c2a944079fd30bac898149b327f360f79a96b0d68f3e7c3b0531bb470cce74c7c0923862dccd98dd5f7a2f242b0c15b9a9b
+EBUILD snowball-stemmer-0.20140325.ebuild 1369 BLAKE2B b209092a79ee2c12cdee431619c82881564a40277b69d6d8a7c03f26efabde2b36d1709308b51c3c040e65f7a41c9909b08d265aef9704338283e48530c39a57 SHA512 215e38e4421c9de4ab9511bba3a5477eb07a53b1a3d2385ab360890f77b096fb0673b29620e4757b69cc769d04deeaa6ea3b27dfee9f1aed859f5d4ae0be822f
 MISC metadata.xml 215 BLAKE2B f7ca08c496dce81653514ebb4de27022bfa50165d664a6ecd7201dae8a9914470fb4f2909cff468fdc235772b0ba86ba3f80cffa4f9051484992a0d6ae3e4367 SHA512 e92f7c910939f1ff7b7cd5df19679d7c08f9b62d58a9dd1dfda4e97d14772ea23a569d822bce780cc09d407165ea203a872f6137f00c1b2ec0147df7dece0829
diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
index 4eb1aa6c4305..644a3a6f436d 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
@@ -30,10 +30,10 @@ src_prepare() {
 }
 
 src_compile() {
-	CC=$(tc-getCC) emake libstemmer.so stemwords || die "Make failed!"
+	CC=$(tc-getCC) emake libstemmer.so stemwords
 
 	if use static-libs; then
-		CC=$(tc-getCC) AR=$(tc-getAR) emake libstemmer.a || die "Make failed!"
+		CC=$(tc-getCC) AR=$(tc-getAR) emake libstemmer.a
 	fi
 }
 
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index 7783b6bc848c..7ff732f1563d 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -1,4 +1,4 @@
 AUX softhsm-2.5.0-libressl.patch 1046 BLAKE2B e647878998493606d9941f1b4683be8f072f5c5779fb6aa6606857a12af7aa0228d349b722813449ed33a026ea5e8bec9b0e6235ac6c271f34c61fca7eafb4b4 SHA512 23c8048ef08417422194eb84d4581b4a1c443de6917608f953cdcb5b2433446272d937e05eabc6bae17d88061a0b3aa997355b7b47e71702dc52d69223972809
 DIST softhsm-2.5.0.tar.gz 1078439 BLAKE2B f96f9e08f3ea568daccb64a5de94ac91b5efcee3dea09f460e98491e7fcdca1277ed52c339a2ec10dac2f78c9e7e44fe5c4a7d36c58e97afba6e749979d4d7e0 SHA512 a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9
-EBUILD softhsm-2.5.0.ebuild 1085 BLAKE2B a86e64d8a8bd46cd7f63b35fd6c1aa241ec688a8bcd0f526fb31aa96880b5f8093dbceb107fbfac76929421d06e4f6a14772795e3f35087d68dcce326ffd36ea SHA512 e1399d22f68ec1ede572605ba1d37f99d14338bff0fbc30ec2c332806959bcf248787b0da9be2c22ad679c1ed2f8b543f1b8c0960c9362518203ef9be046c9bc
+EBUILD softhsm-2.5.0.ebuild 1112 BLAKE2B bec60391d1bd029ad7904113fb97acd9a1407cf355463f0a958ca6faeecda12e59cfde0ac4fc727d63d607936cb7b13e8beb7493eaeada5f179ded9490bb115f SHA512 56c3ddfadaeb674d1f9e56473729f8d99667933357a8fbc366384d5efa264f7edc8a1faafed0066848c52c9956e8cae92ff14bda340ea14bdc24ded7adc345e5
 MISC metadata.xml 365 BLAKE2B 1661f2dba2653a4fd4ca4ed53b9d10ca647c3e13ec93eb21062505578489e4d403c497f304f18be655e116f7bdad253f79de7cf185af9512676c43ff5fe3f8f0 SHA512 a5641e507a0fb5bb77278a39c5dd3f9f228438f650e8ea8710855c0499521b88b7197d89d7c5866471826485e840863258520b026c3ca1b2eb7555bc842dd262
diff --git a/dev-libs/softhsm/softhsm-2.5.0.ebuild b/dev-libs/softhsm/softhsm-2.5.0.ebuild
index c05dee21086a..c9d44cfbb66f 100644
--- a/dev-libs/softhsm/softhsm-2.5.0.ebuild
+++ b/dev-libs/softhsm/softhsm-2.5.0.ebuild
@@ -9,6 +9,7 @@ SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
 
 KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bindist gost libressl migration-tool test"
+RESTRICT="!test? ( test )"
 SLOT="2"
 LICENSE="BSD"
 
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index a009074a3de3..7d2ebf7a6f1a 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,3 +1,3 @@
 DIST sord-0.16.0.tar.bz2 316331 BLAKE2B 27702600e48e14c75be18cc2b83705cdea1eed7158223ee685821ae80b18b61f5db82f804ee6a32236143cf8287ee875c3b3354edc6ccd1d4f25eaa3a04c785b SHA512 e18c6de62f2cbffedd4c200f6452f4fd37f719aed764ccc1b77c8da04a0f3394d47e8b57e19eefd6d600770926f505fdfa5da91564bbff5f4ead49f1adaba249
-EBUILD sord-0.16.0-r1.ebuild 1125 BLAKE2B 7167f65364463d14851dca667e947bfef1e61db25df71616b9f9a4a56cb4420cacc9b4e1bf4a8da14bde3ac4c8946b824edb267f35f125295bec0f6394c1090d SHA512 d2ad558ace4d122a0b61ed7b45481d2285c6f319f94a202da81e6070e7f72a2299bbf36a1d33616ab9e21350ed289373abea4d3f9af720c580a5f9be143ee81b
+EBUILD sord-0.16.0-r1.ebuild 1152 BLAKE2B 92408bb67bc656c14968fae1db0ce2204e1c54c71eb976b4ba0ecb2982e8edc9a67df1f95d22fb508f9480885548c2a1432119747e24c16890490e43ac963281 SHA512 a3bc9158b6b8a6919092d81be2d1fd8abfcf0d67e660ee664e7483b18cffe5e7efbe863cb0f29680a95043f788dbb59d79a3b89d107db4b6781c142d1fab6d13
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.0-r1.ebuild b/dev-libs/sord/sord-0.16.0-r1.ebuild
index de6e5be97a22..f6f3996f2d3d 100644
--- a/dev-libs/sord/sord-0.16.0-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.0-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="ISC"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/serd-0.28.0-r1"
 DEPEND="${RDEPEND}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 685244702ba3..107de96a66ba 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -3,8 +3,8 @@ AUX spdlog-9999-unbundle-fmt.patch 1307 BLAKE2B 40bdef65614b1c3f0bf288a7b8bc3529
 DIST spdlog-1.2.1.tar.gz 188284 BLAKE2B c3491a9c44d8a94c51d50c9ef36a2105f77e8fb61bb7b2b81a341609f433abbe3a74e7b4a467dd715a5d906f976740716488d07b4510f366556ab59d160ceefe SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1
 DIST spdlog-1.3.0.tar.gz 202637 BLAKE2B 97027a3672b826e294dbdc202afa913a42ddae5a02a569ac28c41d79b96128de045ac5df30a76d888d6b3bea5093fb75b006365d7b1b296842750a39f43835d6 SHA512 019a52d4b6c66287ee2a6e8177457ecbbb78e1cb894f4a0a90b83a84d66cd37b397cdf77892d9116e4c34113bd3277d606d578bc96ec6521ae7745f08b1aa54f
 DIST spdlog-1.3.1.tar.gz 202634 BLAKE2B 2465a8d1a38af1527ae66d92f5dd91ad504d01e44ac47702e315f7448e19f01743627357132f0561e48807315df9b102f337f95cab5a7aae3ec0ae7ceff940b9 SHA512 a851a44b6384f493dd312ae0a611d068af46bbfe8daf1c2f61f13d8836a3801f41b339074fbe8da8e428131c82fa5c4a9e3320a55cbdd4b7aff8bb349dfff7dd
-EBUILD spdlog-1.2.1.ebuild 771 BLAKE2B 73173edc649e39d90d4a0cac4406b9739d52b36db0fa2625f3919df1aeba23f79fb09aaf4e631e5348f3819c579065fc0d253469eff21557fdf026b0fae8c244 SHA512 0d1d2cc4492ab33e43be9b1a2b8eb045870c1917dba7d6440ca3c1e8ec68085dfc4a0bef589e3a3db4d507c1aac6b17581b2a8b74ba754e1854e12080ab9be9f
-EBUILD spdlog-1.3.0.ebuild 800 BLAKE2B 1b4c9b500f46918c1a124003cf8d1c0cbbb07aa9be815cf9d28ca326a18aa5c6d3e1e9bbc7996706f8ded5fcb21b025be0796a639baf9b1558ea60f269f7bfe6 SHA512 fbb75ca0dec6a85547fb24fc12763ed8b044cb5bcab35a90659438ae86c1e4d45a404328dfa022a9da15e51380b706e3b5c39607fbae4530e0501c4b69d4247c
-EBUILD spdlog-1.3.1.ebuild 795 BLAKE2B 7e3308b9d5361ab778407e52cc7ffe9f8dbf77a96115d1d2c4a7d6b490f76fa8413ad47d0340b9602a593a7f6de1e10e3b58230cf09850564e7ec9ce2bf8f364 SHA512 df3faea5c086186560b466ad85b0484947bc241f2e349fc4bec243f64156b63590a1dfc1704217b98e876686c810ffd6066a077ff35ff6005d650042e9ee75ab
-EBUILD spdlog-9999.ebuild 798 BLAKE2B 5122612fce41d8c3bc09395ba99692900790ae51daf3a7f01ef30b0f228120c170395b2c9488286bb05a279e0a3f66d12deb98ce456b9e4d4b45947d44b09784 SHA512 9693c2549a926893acb2ac9dee57f18dcb0ba36cd7fa134195ecbdb7e711106c6db661a5fadfcb882e348d2620defd53d643c6d9816657361195604842adc005
+EBUILD spdlog-1.2.1.ebuild 798 BLAKE2B 8ffe4e5f77b92df1224f720f5b3fa80343d2e4ebd358601993c55cc2a461e50acef7edf02a3114d0c6131d178a9ec5dd8e5307b0a09fae5077ddb756bdd0df35 SHA512 f9aff80aa1788c66653038857412a90b8b117f6d49a624f4b59734f8eb0dcc292914b42090389e3a2781543ae87193b7e4546398e6e1a988c7daf99769bb4610
+EBUILD spdlog-1.3.0.ebuild 827 BLAKE2B c295ba9be84849f8905ab0a5810c9627c4382b4a0ef3d398f94e1ba7cd50b6abe2f718beb954a9c6e3d8d12f0998b803f8eea0febf511799a668a29de0dd72ef SHA512 ebb8dec579977c05b6b26160b975a49f8c1993f6348904e4ca04487a74fdf1c6461417a452ccbe79e5de634f1d07f926062f774940340849cea3def63dbaa43f
+EBUILD spdlog-1.3.1.ebuild 822 BLAKE2B d532e3df48442ee93a256b55b7aaf28bd5171091f85792ff4efaa7c6a611a9f56677fdead4e77b072b3840feb2b2bfb82e440303fa61410869229dbe0ab4f48e SHA512 d043fccfe2209d64285a8c84b6790c77fa5d1cb52557e1357cc019ec90a1f843e400f83664f2ff835fc811b82f5e70c25de56702d54918c2f75398b7bc02b751
+EBUILD spdlog-9999.ebuild 825 BLAKE2B 4726e4acdb3f32de70ac18412e968968f9b68793b4bca8fd8751644c7aea179504250ccedf9667308ce02ccc56742b73d866f06c1ae39fcb29ac1c9c4151f922 SHA512 7c358d725df9d7433332e7a401a283dfd52fe40811a9679d07583a970449749b3e4cb18302b6cba997b21b032995224e938d0b5c561929094e6caa1581e3c159
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.2.1.ebuild b/dev-libs/spdlog/spdlog-1.2.1.ebuild
index ceab2bad83e9..3d2b30260e2e 100644
--- a/dev-libs/spdlog/spdlog-1.2.1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.2.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
@@ -19,6 +19,7 @@ fi
 LICENSE="MIT"
 SLOT="0/1"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/libfmt:0/5
diff --git a/dev-libs/spdlog/spdlog-1.3.0.ebuild b/dev-libs/spdlog/spdlog-1.3.0.ebuild
index 497e7da9b419..d1e170a969e1 100644
--- a/dev-libs/spdlog/spdlog-1.3.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.3.0.ebuild
@@ -19,6 +19,7 @@ fi
 LICENSE="MIT"
 SLOT="0/1"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-libs/libfmt-5.0.0
diff --git a/dev-libs/spdlog/spdlog-1.3.1.ebuild b/dev-libs/spdlog/spdlog-1.3.1.ebuild
index 4713c61feaba..ddf07aa21ca6 100644
--- a/dev-libs/spdlog/spdlog-1.3.1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.3.1.ebuild
@@ -19,6 +19,7 @@ fi
 LICENSE="MIT"
 SLOT="0/1"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-libs/libfmt:0/5
diff --git a/dev-libs/spdlog/spdlog-9999.ebuild b/dev-libs/spdlog/spdlog-9999.ebuild
index a9cbb03ae992..3381d35fd4b5 100644
--- a/dev-libs/spdlog/spdlog-9999.ebuild
+++ b/dev-libs/spdlog/spdlog-9999.ebuild
@@ -19,6 +19,7 @@ fi
 LICENSE="MIT"
 SLOT="0/1"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-libs/libfmt-5.0.0
diff --git a/dev-libs/spsdeclib/Manifest b/dev-libs/spsdeclib/Manifest
index 67989d752e51..5654790a14ce 100644
--- a/dev-libs/spsdeclib/Manifest
+++ b/dev-libs/spsdeclib/Manifest
@@ -1,4 +1,4 @@
 AUX add_symlink.patch 804 BLAKE2B 2b0eec3a3a9008b887cd4af8f2900631fa347890cd37ced2930fbbe21b05cf213e6b088d2798173ae6c89a75467db0e6111e3e3e738d37eca7fbc884725b66ee SHA512 ca370e101057851e214009ef6880afa4a96711407d28e3ce34592317200c7da623996c7fcf7c31aefe55ffd6b649ab5ff970fc0134435114234f4436919b93ad
 DIST spsdeclib_5.1_source.zip 282236 BLAKE2B 6f37a3f0791baf9ca7a6bb3532be4cd7bcf90cdc2fc51def4d5daf4419c6b8c08aef87275555f359394e37e5ab6cf34d1e4903bea542ff99f7dc317238dd52b7 SHA512 26db037096c7c98c1af800577ce298c6b572541f665b512e80c6268818075d3c46d296b282268bd27a73a34f4063607ae8dd9d6d7a9301c441eb9cfce780f439
 EBUILD spsdeclib-5.1-r1.ebuild 1187 BLAKE2B 6ed2973600e1ae4fbc54911938d6f36f84c0acb4aa749b7bb4ffa1717b657ac3349a7b9e109b0e40aac5513c97a7b2c2ebbc72296d059f3ba618c68ccc4a4719 SHA512 1d4c1d231511f1bee310149da3fa5df9f06e9171d5b1238a6f47a32491f913df48995ac684ee47baf586ca48204ccbbdb7cbc02805d7bdefa576e0a14e4e8190
-MISC metadata.xml 564 BLAKE2B 12f28c6acaf31c25b52acaf1bd5853216ffb6f0924c9f815e814c56b50aa657603ef0f3e0e89daf072e463feb34c135d59c7351174bdf3a4b347215937311ce1 SHA512 42781e4e7c15a066141221c92421c174dbc748de3ef94cd419d23c0c9ff85cadb90295543d126362ca8e346ba5171ec3a527a46f6018d0b16beda68c7b432b45
+MISC metadata.xml 445 BLAKE2B cd513b1151b9d2811bc031b7772ac4ebd3d8fe69a08e2e7f1445db48cbca0556611440e82a42b1e01c8533fb00f62a33da18e535f180edb0bd04843b97db7d3a SHA512 212dc445119943fc6968ce83b0e5e29177f72dd14358e10d7925ce80515ca70093bd23dae7ac4a64890fcc74f8f095f599643113477a2cebd126fe68f93cd047
diff --git a/dev-libs/spsdeclib/metadata.xml b/dev-libs/spsdeclib/metadata.xml
index 29b8f4c73b66..ef0dbeef9f71 100644
--- a/dev-libs/spsdeclib/metadata.xml
+++ b/dev-libs/spsdeclib/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		The SPS decoder library will load IPF and CT Raw files in the emulator of your choice.
 		Kryofluxes <pkg>app-misc/kryoflux-dtc</pkg> also will need this.
diff --git a/dev-libs/squareball/Manifest b/dev-libs/squareball/Manifest
index 5219fb12f04f..d2399c893e07 100644
--- a/dev-libs/squareball/Manifest
+++ b/dev-libs/squareball/Manifest
@@ -1,4 +1,4 @@
 DIST squareball-0.2.0.tar.xz 231844 BLAKE2B 831952ae3d3fb14abe978b04300b6e365217ab80b2cad863d6db33dc856816121cf2688adb56c59d50db9a62322c602eda57dd1fdeb830b97b557abc1157ece9 SHA512 be039d2e2120e87bb7289e75185c9ad46452fe6ae167dda2b60944d0a32f7ff7e89504f5ddd8343e0150d12ef22d71c51ab9290e90c43a930773bd39576bdf31
-EBUILD squareball-0.2.0.ebuild 1027 BLAKE2B 86f9deef705e8c63790844367a1d5160037cfd19a2e5aadb7f96b7240214374bb0f10527afbc0620b1735a18e85ca694a35205c3ff881ff5e8a904b0c5b7191e SHA512 f089f6f975b5aceb9a6cb618a57531451c87f5bc1dbdb84ab61c0762d8bcec7f346063e7380ce3aecdc9333fe92f8be76ebfbafa5f031ffadad030fb5ad9459f
-EBUILD squareball-9999.ebuild 1027 BLAKE2B 86f9deef705e8c63790844367a1d5160037cfd19a2e5aadb7f96b7240214374bb0f10527afbc0620b1735a18e85ca694a35205c3ff881ff5e8a904b0c5b7191e SHA512 f089f6f975b5aceb9a6cb618a57531451c87f5bc1dbdb84ab61c0762d8bcec7f346063e7380ce3aecdc9333fe92f8be76ebfbafa5f031ffadad030fb5ad9459f
+EBUILD squareball-0.2.0.ebuild 1051 BLAKE2B 04fb5ea11537faf8a35a9d784531ba3cf32d298ac179f02bb9ed300f6d9020241bfab885c712858738a2c07c2852095a95748ebdf08ff3251cf8830c0dc62776 SHA512 48bdc231100560bdd65322411a0980d6779edf7b0aa652e92ace55d56176ef384d81669ca4be275133196c9184357317ba848a68e40dfbbf56223ff4df5008b9
+EBUILD squareball-9999.ebuild 1051 BLAKE2B 04fb5ea11537faf8a35a9d784531ba3cf32d298ac179f02bb9ed300f6d9020241bfab885c712858738a2c07c2852095a95748ebdf08ff3251cf8830c0dc62776 SHA512 48bdc231100560bdd65322411a0980d6779edf7b0aa652e92ace55d56176ef384d81669ca4be275133196c9184357317ba848a68e40dfbbf56223ff4df5008b9
 MISC metadata.xml 473 BLAKE2B b3f04b2657f7515a6b0801f67f44bbc63822f346e05cc9b9a8778d0a7f8393e74d6f481693b3d7bf5d2dd1b57c3dbea33349248c0f5696a397607dbc6bf5bb00 SHA512 d1dfca386535029bedde689a3b33678eab1ed345e823143384450cb4bb415f44e08922f2f6c38f97436cef684edbb3c0b2d27d7071a73dc764e47cc968682ebf
diff --git a/dev-libs/squareball/squareball-0.2.0.ebuild b/dev-libs/squareball/squareball-0.2.0.ebuild
index ef32270e8cfd..42d531e38772 100644
--- a/dev-libs/squareball/squareball-0.2.0.ebuild
+++ b/dev-libs/squareball/squareball-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="doc test static-libs"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-libs/squareball/squareball-9999.ebuild b/dev-libs/squareball/squareball-9999.ebuild
index ef32270e8cfd..42d531e38772 100644
--- a/dev-libs/squareball/squareball-9999.ebuild
+++ b/dev-libs/squareball/squareball-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="doc test static-libs"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index 6bff67c0064f..26d70dcc01ae 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1,3 +1,3 @@
 DIST starpu-1.2.6.tar.gz 8911397 BLAKE2B a73cb3b230282b0b828fdaeb65f5491928fde1b2e5797f739a99c87318fa29511196f7121a72ff91bf0d663938b50f200d108fdce2726eb7ea8c7e997156dc13 SHA512 5971f8875dd54c73486583456bd0bc81c2865cb5b8bba6d47a5085d76fa6294c869efdd1c1d14144d08e6c14cbbea3a773474d46aa827ca24f58d9fb57ccbed7
-EBUILD starpu-1.2.6.ebuild 2227 BLAKE2B 212da55cb40d84cadb2e8ce3e6aa90f0af42569deaa7174395990cc17bc96aaa99dc0ccf17f267d88ed13aaedb3210a7ecc4a20318fd532db5326474ecaa08a3 SHA512 1c4ed76780c1a2dfef082c47502d086c8a01b4f9a411f370ee1ad2a8b10511de03c30fc9762f26aa27caf30be840f8debedf8a802f7cc35b6e043ce53ca1d465
+EBUILD starpu-1.2.6.ebuild 2254 BLAKE2B 65b90719ddf42fa1fe791a933e05ed6883f51ad0737d598d955f94c7c0d3a6ddccb1f74ab2b682e0be2998b8b3b1cc4f40e411119ec4f142d528598f03238f50 SHA512 8b8d4f100f94de391fbbd74d882f5dc2263854ac00a595b393e8a2adf367ef78e9af61c23ffbf4db2736acf20cc55ef54491e3c43903344110707b420d50ea43
 MISC metadata.xml 987 BLAKE2B 7b8a207da7c02ecbc5e1daab83666d19d8c1128c6e05376167707ea6b411b4bed2673d9f0c9840284ab5c6f684bed3a67fddb8fc6f25289799470a4e33792e11 SHA512 97e9412721fcec2cdee55d75ce4d8c6eb20af75adfc21bcd556a336a8ee57c138be47afb881fa77180cdc4c27975d000be965f2170f7f29db85056bfbb01cee9
diff --git a/dev-libs/starpu/starpu-1.2.6.ebuild b/dev-libs/starpu/starpu-1.2.6.ebuild
index 5417166bdf11..95988d425023 100644
--- a/dev-libs/starpu/starpu-1.2.6.ebuild
+++ b/dev-libs/starpu/starpu-1.2.6.ebuild
@@ -18,6 +18,7 @@ IUSE="
 	blas cuda doc examples fftw fortran gcc-plugin mpi opencl opengl
 	spinlock-check static-libs test valgrind
 "
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sci-mathematics/glpk:0=
diff --git a/dev-libs/stp/Manifest b/dev-libs/stp/Manifest
index 7b40427ab190..ee0c08ca8051 100644
--- a/dev-libs/stp/Manifest
+++ b/dev-libs/stp/Manifest
@@ -1,3 +1,3 @@
 DIST stp-2.3.3.tar.gz 2577550 BLAKE2B 9ebedf3cb8e6b50d037cfacbc14826bd4e6505d29a53b1fcc6580749f0637fe5f96619c166babdb3a52b18fb6337e49c02f5693e233effe84d0131d0e7402381 SHA512 a0b1bf419d8230e40ce0aee90d9c8c9d814aca300831c24b3576c75623362942abf20673c419f9f0ea1e0505bfae000dc65fdd818179f5759879b0b255f1b99a
-EBUILD stp-2.3.3.ebuild 975 BLAKE2B 0cef0581142eaccdc0df77e7ece8dc0528e8390583b86e70dd263495a12f9234fd1806d721bca8168531d2902610b2ae5bd9f52ed02207266a9fc017becdb55e SHA512 a96b98f8afb1293fba8865b509cb0f04595ebc435e699d55075df3756843c0316629021347c73d954f579dc6ca487e620eb1964953a3d8820b292706c52df259
+EBUILD stp-2.3.3.ebuild 1002 BLAKE2B 1a79e33d06bcf6ff3300268970d2eceb0d30b186e3c424a60c6b440aea4f9b16b090d8138739adebc50bbf1369a8fd1be3ed5156b16a749c7d170a1e5a6f5275 SHA512 95e67894fff3a2bca4313f86c1de94f6088cd51c03e145ef58ee0e414a0e214f096f6a740504ea6dfc663bf22cba41126e897cf95a26ebc3180700932e612c1b
 MISC metadata.xml 881 BLAKE2B bb604f1cf823b06a4d7bff96ec805bc2418dfcdeeaa17ca88f98c509b687b7467f7c6864d25294d8f1f1e4cbaf0e7d99b82edd27fcdc552353fe5510d1fbe375 SHA512 4b3e243ae419cb974f49b6d37e3e807f5ff0676cd989dc145fcd716c23bd2292177935658ea899afd9fc37a18dffc8c0949dee4a25b2e493db0f3713703ad2cb
diff --git a/dev-libs/stp/stp-2.3.3.ebuild b/dev-libs/stp/stp-2.3.3.ebuild
index df1fb807e5e4..a900384b2178 100644
--- a/dev-libs/stp/stp-2.3.3.ebuild
+++ b/dev-libs/stp/stp-2.3.3.ebuild
@@ -12,6 +12,7 @@ LICENSE="GPL-2+ MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="python static test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	sci-mathematics/minisat
diff --git a/dev-libs/svrcore/Manifest b/dev-libs/svrcore/Manifest
index 671be72465ac..98791ab37683 100644
--- a/dev-libs/svrcore/Manifest
+++ b/dev-libs/svrcore/Manifest
@@ -2,6 +2,6 @@ AUX svrcore-4.0.4-gentoo.patch 3063 BLAKE2B 1ab4e7eb0dab6990ca7d2c85ab1b05d1868c
 AUX svrcore-4.1-gentoo.patch 3066 BLAKE2B 0acdeac026704f78470289025500a4a8da17d871eb820961aa991f3c230dff0b72f87bc1b769e58c44c72a694e393b16e57b0926b4b63c966c406519f9104ac9 SHA512 f5a16cadbef104c5658176e3684cd0de03245b6ded86d14965d7f98e2d2c65e4eba43d0630199c8c6f18f922302027ab856d1c96f592cbe79207cc327db786ab
 DIST svrcore-4.0.4.tar.bz2 217076 BLAKE2B 1d5b1c6d397552f299554a19c21a81d1df8f449480095102d46bd2c9db8e4b667302f06fd199579dffb854f47fcb6f6ba54d505e3e6d3ccdfcf54dca07363f81 SHA512 4a63e2618ef8f508e71adf212eefae56e3c9d9898b924f405399bb99793de57bd178a3417f9e837c474e7960b6eb8a3cbe775b420c8fecbd974e89b4196b78fc
 DIST svrcore-4.1.2.tar.bz2 263891 BLAKE2B 4d546406e18099857c1d77d479123332bdc721b51f5ad6bae74812b77704d3d6f8fa2ab67848355be7050fc3ee161c534fc7ee1692811fe9829da513f7cba29e SHA512 9d148ec9c568f1183e44006fec83b4e43b0cef56d5a04fce122fab1e9a0c0bfe39919de81c5a4d7adb2258fb7f16b4d327da20cdb4d948810e968c422d62ad40
-EBUILD svrcore-4.0.4-r1.ebuild 837 BLAKE2B 309d9419d26117395c0bb618537c978dbc9c61672633d9e928632b01e491eec61ecd28fbad36c4f3ac9af70047c6918e69737e40523de60877e8fd9ba48be153 SHA512 7c10b47f3270b6149b99881a969e889743bce88cad4f1b09cd1519b7e38a77af51a5ec3e073e06132ed24e2f2e1bb23cb4c941d6bdd2d7aaad4a66c5cb121dbe
+EBUILD svrcore-4.0.4-r1.ebuild 810 BLAKE2B 4b5628e4ddab4efa8a1973fbeda6c28791ec1a52e16fb11c5157dc205d8fd7439bcee46c23537976312e7c57db174fa67ecb03b224eb5932c7495af04a9545fe SHA512 86ef888b06b3911e5c9dfdc06df9db13ad9051d25f837bf71a912222eb2bae9e300cfac2a3a05c0d25d02397f2e691a92017a924e1c71b7e9ab70fea685ca213
 EBUILD svrcore-4.1.2.ebuild 692 BLAKE2B d4a2ef8b78ffedc502a6a666dc16fa555d5d012aedf7362da87f6b4092f7274a00d3c06d643919ac6532e3700265ee244c0424a000c73fd41394f50c5041ae33 SHA512 105c0e603d9acace34ad5ab9705eec19822cedfacc85fca1940409d652a2bb3eb1621309f690efdca8705ace076ae0e45d63f232da4e6e98d31c3bd21dda103e
 MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild b/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild
index b88e4a800e90..86751402c273 100644
--- a/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild
+++ b/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild
@@ -25,7 +25,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf  --with-pic || die "cannot configure"
+	econf --with-pic
 }
 
 src_install () {
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index d8669db9fb1b..a98c30e21d5d 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,7 +1,3 @@
-DIST tinyxml2-6.2.0.tar.gz 585870 BLAKE2B 6f79ffe0894d625e3a2cccaf897c13962672f090c477b6b13e8685585a304b5cf0f5069d88d61650882e55f23768514dcbeea4795e3a4758b016cb177eee44d4 SHA512 ef784240aeb090ab04aad659352ad4b224c431feecf485f33aca7936bcaa0ef4ab9d0a2e0692d3cf6036ac3e8012019d65665e780a920bbad3d4820f736445b1
-DIST tinyxml2-7.0.1.tar.gz 590384 BLAKE2B ea055e9b85c8f1ea789f91d406e549abf1d6e8aacbbf89f5d887b6cc0d8678562810b4352c158de0ee4adedf8146016f970e1b2a221dcb8fd36aac0486d45d9f SHA512 623cd7eff542d20b434a67111ac98110101c95a18767318bf906e5e56d8cc25622269f740f50477fe907a4c52d875b614cb6167f4760d42ab18dc55b9d4bf380
 DIST tinyxml2-7.1.0.tar.gz 592717 BLAKE2B 5936356d472b8642bebb9f02579e6beda14446d57749f1e7a869ff941a03a5ad30624c4db4b2eaaaca48d7f339e3100fddfd58f96bbcfc22737a23d9c9198c9a SHA512 09d5f37018f79a593ff35e33d4296c9ec643a22e83c0cee4c37949300f86201eee07e9b7e6ba55044d8abb438d5d21b70d5843a96ae4652389bb164047ec31e1
-EBUILD tinyxml2-6.2.0.ebuild 623 BLAKE2B 62b554c62e9e1a022b2e02587fd915edbd71dae0112bd87a444485920fac5466e3e430ea2f2d5c0225fb3a5d98dd2f94ff50f1ebd950c527ced46394bf0d6f92 SHA512 24c5dafe5be94a5650dccaf189f9115ec28feb22fbbe9bcf9191e61b5ceba93e00143ecf45d0a529b2e78cbde133fe1639e7356b926055f52042e5fc4e302b41
-EBUILD tinyxml2-7.0.1-r1.ebuild 572 BLAKE2B 7ffac3676ccbebde87288fca78c7137f088412ae0e3d94f582d8b7b139d8f297429a4298d8f2a8d3fadc891e6b1a43c3eebf6b6d4bb5bdbb89f6a372fa757e4f SHA512 b2cb8225ecc17d37c5fbcd938b6da6b14fb1b680085617042885995011ec4c541b36bd17a244747f0f9b7ec0ef62579b5198f7bd575fd2670a06fb49a9409676
-EBUILD tinyxml2-7.1.0.ebuild 599 BLAKE2B d2572fe5712b32384ffe7af229e27bea71dcf1ee13542e27ae62908f38140c87c68c78bae7d1e5f8cd8d4a3bbd901c84e24c3afcaadfb00e3a705264206cd579 SHA512 1912d01fdf8f3f60d830e289e0ca61f7a5eb4f579e6f6a65b38b341e6bff0e5bbdff009e996542357373019bdb762432c3d0cc5e85c231cf5547fca29e0a11c5
+EBUILD tinyxml2-7.1.0.ebuild 593 BLAKE2B 4893cd8515d5b30501f9469acfc56be9f9259372ac8f14ddde970fe4107627beb292895e9dc59e74677521f25dffd99bd279b856852fa20cdeec9a4352b7450b SHA512 190bbecdd9f18d0ecc51f6e911a43b927e9d4d92e97f3cc5cdba0ba1c39bc546be86db8a36bb6fe0c5b798a79049ee66ff3eddf43b0f893a4bbdc72f68e64519
 MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild b/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild
deleted file mode 100644
index 8e411cbc2677..000000000000
--- a/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A simple, small, efficient, C++ XML parser"
-HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
-SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/6"
-KEYWORDS="amd64 arm arm64 hppa ~ppc64 sparc x86"
-IUSE="static-libs test"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/tinyxml2/tinyxml2-7.0.1-r1.ebuild b/dev-libs/tinyxml2/tinyxml2-7.0.1-r1.ebuild
deleted file mode 100644
index 5e24e7bc18ae..000000000000
--- a/dev-libs/tinyxml2/tinyxml2-7.0.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A simple, small, efficient, C++ XML parser"
-HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
-SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-multilib_src_configure() {
-	local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild b/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild
index 57a8d746e1b2..32bfbfb71ac9 100644
--- a/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-7.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="ZLIB"
 SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/tntnet/Manifest b/dev-libs/tntnet/Manifest
index 9a5300f5960a..d3b01019880c 100644
--- a/dev-libs/tntnet/Manifest
+++ b/dev-libs/tntnet/Manifest
@@ -1,6 +1,6 @@
 AUX tntnet-2.0-zlib-minizip.patch 1432 BLAKE2B 137e4deaa5c2e6bd57695e19d643657c932c268adfb22f3c593e2bfb312fa979ecc87e14195bf42690883c1fdcde773e91af33823a3abc5ccd592a1cd705bac8 SHA512 13909d58fa2ea73c074816498faaa94dadc3fb750179b8f290600eb8a1adaf6a45464d0ee412ea9d038ab5e524a13da0e44fb07424388f28f16df538845dda07
 AUX tntnet.initd 669 BLAKE2B fbe3bd3fef3cc7519b26b1e15f1eb353c6d7afedcb59cc1a594bc7a53c19814e4107115dd6877f23c7a5de1305f859f5980fb3784df3bda4924a9f6c425ee67c SHA512 f67aa89030da69a7278af9c2b7c2b887373be54e711b31fc362df938baf4c5d09df6bc04568ef70a9eacd73582bb58891a9651782d29392cad3d0a1cd0bb8ccf
 DIST tntnet-2.2.1.tar.gz 1127500 BLAKE2B bdb55c879ed00afdde1bfe1560ad4228effaa05b35996df3860631c90c93e57096f590b5ddfd8e8ff0356837e839e2f6ed8f4f6fe8ed478275926dd1143b2051 SHA512 78a26713498fd6eabb0b4a247bb20c130ce967ed22ce5c54da4b1300534dd40155aa62a2dc770be4eca720cadeceac283978a5dc3ce418728994af72e4d8eac1
-EBUILD tntnet-2.2.1-r1.ebuild 1889 BLAKE2B 5205f1c8c547cad508c6c8528dd23001e57f90a25988f73fa892042c80c0a694cc81c442e8ed003afc988bf6d31c2c23e24586ee6b47b61c3b84e27c206c4667 SHA512 c74171d0347eeaa84b64c988c06ac40cbe56c0b5df2e55ab946ca10e1639ed96d1e2ea279d2229a8f3c29cbf3cb4823ef961ce3ec62f3681d72a57c19e4e8272
-EBUILD tntnet-2.2.1.ebuild 1817 BLAKE2B 07c9432256c041dc21fcfb6691f4fe4f07b0f694317119517c446f1169baa77f4eef14a7b4fcde8eef1300feb3b8d24748b099713af273a34f5b9af8ba1b82bc SHA512 f67099b4cac43aefd68a0d4f819bc9f9d4cbe825d03356e2587e2f0832d0423f60df9e8817f71fec61fd2339af3eaac70d83a8bbe6a1e36c3c27a4a3abcd4998
+EBUILD tntnet-2.2.1-r1.ebuild 1868 BLAKE2B e1422014d363fb713ce03d9839a0f7ecfe8db08ece7dbac8d0f530d899f957fd0366444dc5021da43ac38093c921e68e31275825e253e7bc348bacd890ef3221 SHA512 21a748990f78e1ea45ec5664b9928c81d5c11118cc9138355c5cc4c81117c5d47d3bafe3b327f959bd735af3131eb09a62a5b05d0eb867af79e23fb1f8b398a3
+EBUILD tntnet-2.2.1.ebuild 1796 BLAKE2B 64ff6856799c154c0eeeac127883043c30e6236cbfe5ae11b151e67712dab7ca2b2e7b8fccf03e7c79a8839921389f153fad2f54ac82d6f724b4d8e86bb4b52c SHA512 8b3d3805a2498c06fd58b83a22e21b21c697743992b248e0b2b896b3c8381ab6665ad9ce92bbb6b2b3a68bea6fe67ad3748c80ba056f05e2ff0a1d35df7e10df
 MISC metadata.xml 239 BLAKE2B f2ef9bcdc2a3034a37a49206e8f14b7cd40fbd0305562d1c642c37a55587e9d23bd32eebf28985ebbbb7553f57100fd09cbc107f5f66cb5300da6c2cd2b56edb SHA512 e6905ccc2f98e4c858d49f5e54b4de2762488fc33b9be4edf3d2419f4f1b3ca0db6ba64086198c731cd9e71df816a05ae579c2612d2751bcff808e3c4d3644f1
diff --git a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
index cc25ab03fdfb..0b0c372cdd83 100644
--- a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild
@@ -66,11 +66,11 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	dodoc AUTHORS ChangeLog README TODO
 	if use doc; then
-		dodoc doc/*.pdf || die
+		dodoc doc/*.pdf
 	fi
 
 	if use examples; then
@@ -80,7 +80,7 @@ src_install() {
 		cd "${S}"
 
 		insinto /usr/share/doc/${PF}/examples
-		doins -r sdk/demos/* || die
+		doins -r sdk/demos/*
 	fi
 
 	if use server; then
diff --git a/dev-libs/tntnet/tntnet-2.2.1.ebuild b/dev-libs/tntnet/tntnet-2.2.1.ebuild
index bd46d16526d7..63a7484d2e88 100644
--- a/dev-libs/tntnet/tntnet-2.2.1.ebuild
+++ b/dev-libs/tntnet/tntnet-2.2.1.ebuild
@@ -63,11 +63,11 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	dodoc AUTHORS ChangeLog README TODO
 	if use doc; then
-		dodoc doc/*.pdf || die
+		dodoc doc/*.pdf
 	fi
 
 	if use examples; then
@@ -77,7 +77,7 @@ src_install() {
 		cd "${S}"
 
 		insinto /usr/share/doc/${PF}/examples
-		doins -r sdk/demos/* || die
+		doins -r sdk/demos/*
 	fi
 
 	if use server; then
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index 8fbe235ee167..2401e61518ad 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,3 +1,5 @@
 DIST totem-pl-parser-3.26.3.tar.xz 1314216 BLAKE2B 24b1c7e111456b454022ba7262a1e1483420dbd97b6ec99c0e2631acbb8057134b51ff991d2619e6bda57da6c133e211f949915b0fd62d497905fcd58738b43d SHA512 f059fd9447627268ce5029ed48551b0a2b6c30ba28c50a360d37808ad63fa8423824eef29c7f4d7a752f24861d4c7a7139f321fa2e19085085446e7ed15130cd
-EBUILD totem-pl-parser-3.26.3.ebuild 1903 BLAKE2B 487456163abb628185f5b51353269ae552346e383aaf4f08332acf2c62c4f5a05e78f6dc58cdaa5564f19d64efc6be7933e518b56ff93afea4e9303a3f25e4be SHA512 f96aff903b505e89d74e95bb3784983f1a80f36f348e9a783167fe81a271b6796bf0880d7d01214ccf7baa9ff1b619ebadfa5731bdf365eb09caf87070d62a32
+DIST totem-pl-parser-3.26.4.tar.xz 1314800 BLAKE2B a069a7b7c394ab5686e827804dd13df06c6af7b8e515e0a0f5023919ecbf720eb8d52643e35bfb99ff4474e67332e072a3c832ef91232bb4108f282b0bc84bce SHA512 afb02a7c70f2fda9cda67b9daa8bab5f15e68a4afd983fb865fb29de71fe8f5c8fdf716e714e3835ac1c3476ce188c6147924a840c4ba82f0c05c3d3c23f5173
+EBUILD totem-pl-parser-3.26.3.ebuild 1930 BLAKE2B 840f460efe1d98b7778751a6eb5692ffbb2609089dd74269e1a8f578a7dff0e5402ab8d2690c22c6a6dfc1ceb3863c9038bd244b6f26f0ebb560754410389dd7 SHA512 adaaba47806b4d525f8920684dfc7baec49eb8ffb11e1d7aa745f761b3cdc6ec28187d0315079494e22fd80b606d4141e1b09b852ab3c0f724b3358c32053592
+EBUILD totem-pl-parser-3.26.4.ebuild 1933 BLAKE2B 25da8ae56556bae1667232135678176aba903748a75a79f407a5bf74fd71c214ad061fc7440db1807e363b4400f8273d249e34ed62df2f736397745cfdd92e92 SHA512 222711531c4c216ef4b8185cc4c12a63409cce94c2a975d074219b910558faacf88c1b110e0a4f7e7988b3830d4ae460fe6d819b3e6b42c73755ccc759011535
 MISC metadata.xml 522 BLAKE2B 733f895375a3a264b84359f121bf92fd602b62eb562a37e5c5cf8ae7947e8138b32067d276cdc13f7a98f8941130fe93f0a5cac7d8f02ee3238ea7ab5cae4266 SHA512 07c6a9bf474a64950ba6e557b3df879e9c8399c0b09a9e7f585821ee540ea40b7459ad8b7c3af728e8201fbe50193417b3298f186c9caedb1b89b538c7c70206
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
index 2e2c85339e86..ee9851afbf07 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.3.ebuild
@@ -10,6 +10,7 @@ HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
 LICENSE="LGPL-2+"
 SLOT="0/18"
 IUSE="archive crypt gtk-doc +introspection +quvi test"
+RESTRICT="!test? ( test )"
 KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild
new file mode 100644
index 000000000000..c9bbdbd5fe9e
--- /dev/null
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson xdg
+
+DESCRIPTION="Playlist parsing library"
+HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="0/18"
+IUSE="archive crypt gtk-doc +introspection +quvi test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.56:2
+	quvi? ( >=media-libs/libquvi-0.9.1:0= )
+	archive? ( >=app-arch/libarchive-3:0= )
+	dev-libs/libxml2:2
+	crypt? ( dev-libs/libgcrypt:0= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		gnome-base/gvfs[http]
+		sys-apps/dbus )
+"
+
+src_prepare() {
+	# Disable tests requiring network access, bug #346127
+	# 3rd test fails on upgrade, not once installed
+	# Leio: I consider network tests important for ensuring full functionality, thus trying with them again */
+	#sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
+	#	-e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
+	#	-e 's:\(g_test_add_func.*/parser/parsability.*\):/*\1*/:'\
+	#	-i plparse/tests/parser.c || die "sed failed"
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# uninstalled-tests is abused to switch from loading live FS helper
+	# to in-build-tree helper, check on upgrades this is not having other
+	# consequences, bug #630242
+	local emesonargs=(
+		-Denable-quvi=$(usex quvi yes no)
+		-Denable-libarchive=$(usex archive yes no)
+		-Denable-libgcrypt=$(usex crypt yes no)
+		$(meson_use gtk-doc enable-gtk-doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# This is required as told by upstream in bgo#629542
+	GVFS_DISABLE_FUSE=1 dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-libs/tvmet/Manifest b/dev-libs/tvmet/Manifest
index f4ca80297720..edb2e4f13c78 100644
--- a/dev-libs/tvmet/Manifest
+++ b/dev-libs/tvmet/Manifest
@@ -1,4 +1,4 @@
 AUX tvmet-1.7.2-respect-cxxflags.patch 1112 BLAKE2B c4d7208d0f2ba6db58ff5d77ec84000c071553b844300443ce96bca10b4db369d5fc297871d9322f1be88398daeeadb805815b2e65fdd5a450aac8c08d6e82d4 SHA512 3ef1ee581d4aec3398c1013b0f10d41d7afe31892996456788e352af8b058d524e4c2126b4e496c7104f971c0f88943b3a4d136ae9efbe57ea19e51832d00ea9
 DIST tvmet-1.7.2.tar.bz2 532599 BLAKE2B 27c3c37c579ab7bd2fc8153a74389c303df9465b75ef7c9f9d553bd307b5441c1dc6764021cc47d0b108ac317f380db612048404acc7626e33d5479050d9cbba SHA512 0e57d2ec68566d02c09c3d8b35662b3737e6f074271e5e90c1354956636d2ada74859bb867d63684edaa93d7ab6a470a3141d02a04164101ff9d8d14f3d6c5fb
-EBUILD tvmet-1.7.2-r2.ebuild 1122 BLAKE2B 2ae98a5fd63505dcfb9cde12746f63cdb35ce4e2d60c9dc57fcc03b1d3f165807348eb1978a5eba87cf13fe1eed974e703df5c6de9dc329f9c8b09b36aab0432 SHA512 b61e94ae46ff5e72a849eac0649b0329669d9518f28063e364c97235eb3dc30a9a0ca79f1a7b240b99125389dbbbbe28fc0f6980319d976feac7830c477f0447
+EBUILD tvmet-1.7.2-r2.ebuild 1146 BLAKE2B c5911d8df069022f01455c8d09905330b828946093bd57dd1b62fd042daea578240ec76797f81fa9f2a885156949ccf6d5caa86f261e3cafb7b9ad010dcf18da SHA512 2515ee19098409279563f2bc1b37cfb2d599e1b933452683811ab43f1cd28f1423caa8087327e25eaa3a49cee9f85369f2c550310cd83ce3c590862a8702a190
 MISC metadata.xml 242 BLAKE2B b2f1aa27e63431b25e02985d8da8f1dd90b5224ac8ce4a6a2c450120040e0330892e06456d689b079df5de7f7612e25607feadf581bcabcae8fa24f6b8a1cec5 SHA512 be67932e1a51ecec6ca5b24333af20574bfbf46bb3f294c51641cdee21cb894fc2b20411168a7dc750bf0772ae86667b8af860b201d68bcb814e7a9e848a5fa7
diff --git a/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild b/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
index a4eb9e36ebe7..b9927da76c91 100644
--- a/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
+++ b/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,6 +12,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc test"
+RESTRICT="!test? ( test )"
 
 DEPEND="doc? ( app-doc/doxygen )
 	test? ( dev-util/cppunit )"
diff --git a/dev-libs/udis86/Manifest b/dev-libs/udis86/Manifest
index 4ab39457782e..996a6a98fbaa 100644
--- a/dev-libs/udis86/Manifest
+++ b/dev-libs/udis86/Manifest
@@ -2,6 +2,6 @@ AUX udis86-1.7-yasm.patch 907 BLAKE2B e27f90003cc54d926b1bd39a274e7d030d6701a883
 AUX udis86-1.7.2-docdir.patch 644 BLAKE2B 7929a12d9dcc43035b3ed0ec6da5dc54e7a51c19b50e4405eaac83ca351a7b9c367fa1754b1adde419ad04c19f90f8e83272b2b34e7a01974ab84a01a1f2a1f1 SHA512 4b552f30ad2c2a33ea5f3b51f01a287d0e19571368187ee5c7ab625e39a46ebdb9aaa3aa8aecb89cfc3481309a511bd37d29260377fd153bd7b427ee4adcf3da
 DIST udis86-1.7.2.tar.gz 445085 BLAKE2B 0e67a1ae28688a5febdb4502714a6d99b1fda9028470bac1ecf9314d33c2f081726e3706e9616f352fbf1561283429cb96b92ea4a88e454ec21eadc84bb336d8 SHA512 8cb35d70ac020cd74ced22252aa735a266e5db98d89df565a560baa4ace0cd730e9db838241b70c3b93c27d6b2c75a88edf9c357c864d0f0104323925371c96f
 DIST udis86-1.7.tar.gz 696651 BLAKE2B 5d0a97e06b6bc7b263b6f080e12f832d4bfc9a4791a495e49cd2f4ee6d37d13e593891e02fe9ee3c3fb5e7ec23bf25ae7aa1dccd1f95b5c003f6a6e45bbb7f8d SHA512 df0f802d4c0cf6b39b5b996cfd721cb7d0bdd1b0e2f2f7bcb7165514541b94d795c653e885d9f928d9a27f19464ed6fa948f4315fc1f3887079201fcbb2a241e
-EBUILD udis86-1.7-r2.ebuild 703 BLAKE2B a020d7de8dce1b8f862642af7fd1f2375fa24a787dc3ae33e1908fa3ac1779f3d00bf34488e4183dbbf63d4a238661f67505afc0cf336669dbe4fabefb6ce1d5 SHA512 291a13293efd06132d38f4494046ce59fd9e7e6fd42ae7ca910e7171101e4c15a5e6db55218e8cb06a5cce7d79ed46dbb2316e6a8ddd4d98efff585e356d0062
-EBUILD udis86-1.7.2.ebuild 752 BLAKE2B 7ff7a7421880647330bc046977aadb5edcf066a71c2032f1ccc1400aaea270448a3137dcf65ee476c38dbe2d7a851503ee916a2181dad4f73401bd31a922a4e0 SHA512 2ad52db7d4c7b4f5170f5466877245e704e8c40b4dac7cf6d2c9a43e9bc113e1a497f0506ed6e61f06e6aa88f668b3d3591c2c4a6bf30b2889b7c6ddadf9c9bd
+EBUILD udis86-1.7-r2.ebuild 727 BLAKE2B 9435654d37e1dba515e815fcdfb6f07bea96b9743dbd22e9a11400924f89a1fbbba30203216184fed53abe71501326e11708a01bd19dc4517e1b30a545f36788 SHA512 1901dd09fae0f12e1c4a41b905460704794708803f1c68e04203f0612a63d1a8057991fdbbcf24bb0e1757f3c2814f4793ea698bf45265dad3806e05fda96e15
+EBUILD udis86-1.7.2.ebuild 776 BLAKE2B 78438d44d2516ec727484afae78f0aca1309a5f8a29ca74a71d0d4a8a103e9672571e8e119e5a856d3baed6d03f02d5c33406535b70d12eaee68da9f4918e1e0 SHA512 257a06801d4cbb23e9659f8445396cebb27ed674471fa17b94a0f743d401d3727a9c63cce1c3087b4d470505a1ed086568d2a484732fda219d128cd9b65074bc
 MISC metadata.xml 342 BLAKE2B 5f721c4727a6ee72b711b6df53a260dd420e4389f02091326483aa69995817965b8375097d3abd519b6c25e5cbceecff3de7efdc23178a2d98ee5d64522522e7 SHA512 042c3b3a181b435308c2c6cb6fb411cf5c00fb0403736a7fdd4048553c5d3ce7b2130421dd785511ec97b2c0e55f0e6e3cc603273ae5f87d19a61f9da0914a66
diff --git a/dev-libs/udis86/udis86-1.7-r2.ebuild b/dev-libs/udis86/udis86-1.7-r2.ebuild
index 788849146dc2..130c1b7981a6 100644
--- a/dev-libs/udis86/udis86-1.7-r2.ebuild
+++ b/dev-libs/udis86/udis86-1.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,6 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 		amd64? ( dev-lang/yasm )
diff --git a/dev-libs/udis86/udis86-1.7.2.ebuild b/dev-libs/udis86/udis86-1.7.2.ebuild
index 25d81a928da1..f002f5148133 100644
--- a/dev-libs/udis86/udis86-1.7.2.ebuild
+++ b/dev-libs/udis86/udis86-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,6 +14,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 		amd64? ( dev-lang/yasm )
diff --git a/dev-libs/unittest++/Manifest b/dev-libs/unittest++/Manifest
index d263b46bfba9..d651b7fdf517 100644
--- a/dev-libs/unittest++/Manifest
+++ b/dev-libs/unittest++/Manifest
@@ -1,5 +1,5 @@
 DIST unittest++-1.6.1.tar.gz 52536 BLAKE2B 0a5e7cbe1131565631c0537a1a262b6053b5010497eeaf76690f465cdbca45157feb6686faaf37a37f4554e37b54051161c3183651315509ada143975d7211f4 SHA512 2bb03def8b6ac84dbb6e5e440e5be8648199096fdc93d6666b704386e2c2279b329be6bda47c81bd8a8c485334059fb2a53fdd90358005a95b8add6f057c25ce
 DIST unittest++-2.0.0.tar.gz 54100 BLAKE2B 5aceda6e76f4536054c8de0fb4a4a17027d0707101fb323883734d420f038aeb094fb6567e41145804f012c952a5807bdd6fe1bae1e4a09a6e36c5f1bbc5717e SHA512 39318f4ed31534c116679a3257bf1438a6c4b3bef1894dfd40aea934950c6c8197af6a7f61539b8e9ddc67327c9388d7e8a6f8a3e0e966ad26c07554e2429cab
-EBUILD unittest++-1.6.1.ebuild 784 BLAKE2B 180ae7fab2784dbbbaeeb05d7564e2eeaf4f2e17cebb1c4727ff575dffcc1c0e8c3e0d3e60caab5a7cc5d7f4b8a3c3171e4fe1f3593a9a4ed01b0e10c0e40d01 SHA512 625f414a32c4b0614ed7acae5772717efa108d1b6dc8341b55dc4e1ea88ab91c6591171cec81cf3d097f3ca887250c11d656f1fc914de55ac9534691e25be73e
-EBUILD unittest++-2.0.0.ebuild 830 BLAKE2B de37ff1bfc114e10da9e40501f4c08a76ca2173de18004fdbb9a062f1de0cfe8c388ec7d1ec52daf3db9d3154bec8137b69807d69631260918a71634e2884cda SHA512 349b77efe280e25d653e7dd90195281c1f7c46fb828f6479f5a416c669ad7e3cfe46c653e73210c32d2033862b900f179c88b9292c898f5c3e51591d21eb1245
+EBUILD unittest++-1.6.1.ebuild 808 BLAKE2B ef668c0aac98729d9f5aab1e1784c8003b33bc6de8d673115e1f327fea61a5ad99f897284919342b9ab6afdf976a7e84d089c95ec1cba2ce7f15412b51bf6ce1 SHA512 70c02578ddf917f2ad2b5614405b5cb23a0ed5d9d3ef67638dfaef1e192edbe9350e9dbd2a152fffb08981dd053ada940a36a2b25ccd82fe59f9e2b440e609ef
+EBUILD unittest++-2.0.0.ebuild 854 BLAKE2B 664366a4e93f8808b9ef366c45a00a741beb2e1b61be1547755d6eff93e20a9d9536caacdbc96982c192f8539cfd392751668d520d5b471cac9f17c46693eb4c SHA512 4d34c047f476ff0464602cb86da6a97f54da7b64e01c6d1f5675788b1b6c0201ac5b433886615df2876480e1f7a763b79e877a1a311fa6cc53dd2e05a7a042fe
 MISC metadata.xml 408 BLAKE2B 79c6d8551125de4ae8c262513a3c8a7fa46d1518418312aed741eebc9f60ca5be8032ad4df6ca08b67d5fe65a46b11eb99533817556248df44dd04da741bee88 SHA512 6fec64fc5f6ecc1971d0cf79caac9d3529b4e9a7cc32b0b1a39254761de8c487df692b9730221866276f44a79ab7bae0e4fc8cccdacbf7bfec8e4c372fdada25
diff --git a/dev-libs/unittest++/unittest++-1.6.1.ebuild b/dev-libs/unittest++/unittest++-1.6.1.ebuild
index 7aeeae67d821..5bba0de8b8cc 100644
--- a/dev-libs/unittest++/unittest++-1.6.1.ebuild
+++ b/dev-libs/unittest++/unittest++-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-libs/unittest++/unittest++-2.0.0.ebuild b/dev-libs/unittest++/unittest++-2.0.0.ebuild
index ed98c39e6260..af6ca1612495 100644
--- a/dev-libs/unittest++/unittest++-2.0.0.ebuild
+++ b/dev-libs/unittest++/unittest++-2.0.0.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
@@ -16,6 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-libs/univalue/Manifest b/dev-libs/univalue/Manifest
index 14e9a70e4cab..2ccc3340907b 100644
--- a/dev-libs/univalue/Manifest
+++ b/dev-libs/univalue/Manifest
@@ -3,6 +3,6 @@ DIST univalue-1.0.3.tar.gz 16820 BLAKE2B 40dd6c4e08e8f4a27731aa0fd6931162f8427a7
 DIST univalue-1.0.4.tar.gz 19677 BLAKE2B 1565a8aabe9b4dfddb2a8b577077bfe50a66aca62e63cfafaaadf1429ad08c0d8aa9f69469b063b2f3c51885addd0a6ab820e06f1ae1b9850de163dd2d1065fd SHA512 cd503ad2f59ea47afbce4acd352ba2baa06b8237f9cfec669353556cff85761e85717ba16c2dc76094b9a9554e5cb27e73e726f2c2d1e6dc5c76e4a5c4cd8edc
 EBUILD univalue-1.0.2.ebuild 595 BLAKE2B f945bffcf5b8f07c272fe9ec247b39ab1eaf376e419832041d63b236a0a0cd47b57898daa6c445aa1f6c77aa0f91790726b10bccf3b715803c80f8d49770fa36 SHA512 2c1a589eb63205ee66fca0205b5977cf442b5e45df606f7898980faeae7ca6c3f37c3b3d095b6b1e272d29e10ebf66f2ba05689fbebdd98be1b6a41fe982b7b6
 EBUILD univalue-1.0.3.ebuild 611 BLAKE2B 5b04edd36949349c453c46ee2305307e131db0e0c99e112965c186da6ddf3fc92c6fbb66572eacf2cec431afeb2ff967b3802e4cf48fa5f857506e7aed8429e9 SHA512 df499ad6fe120c9facaa1c7b3493e923a8c9bbb683a3e4846093ebbf9c7f702c571b3bb0755a9604caf03fa70c016362ed4b871b556973e4f7873beb418359d3
-EBUILD univalue-1.0.4.ebuild 727 BLAKE2B 20207eb6e56b56a0643c19268b47d654aa73a4bdcd8295ecdb6aa441c3e71a3ec87452d7e97eddac0141b8f1f34c8fcd7d08ab90c3b8c1f6913ccd89c6d18b5b SHA512 30c06c6566cfb1e4df255a36de6e6d50f03f2354e84cb9ffbcf9c64ff7afd43f219dd0667542296c49bff81457e31a927a0aba2b5e44140de38b5b34b167b449
+EBUILD univalue-1.0.4.ebuild 725 BLAKE2B cf62f7f6d380a213adfc2df16f2845946132d5c129b109130e2c62f635cb26e8100239903d6394763f049f0a01262b1e43d0781bcbaec045aff7e23a1d399add SHA512 0872f6506fa73e0ec6f5d7eade2c6d30c65f2f3b34099ca7e11a0c87bf6cef89a8f8172206038a3b8917156b25067be12376556b6861de7bf8ca7102dba316ed
 EBUILD univalue-9999.ebuild 720 BLAKE2B 625f17f804ae73f4698e5d46c0b20e213a66097e781abd5043ee634895d785dc6a961ce5119a12dfc298eaf55ea124627e5a5dfebc8cecf2ae9a6b83fa90ec97 SHA512 6f0170b7368a12f6ac1acb83c53626d9c151c7d81ec2460d21c5f060803c28c63b93be9a38a94bab03ecf82d194decd566905ea1402a2240c4d06f55fd951d13
 MISC metadata.xml 471 BLAKE2B df69918c0c8a76f7801782856f7f95fd5108153da22239012d4f333be6e099c70ddd560055eb8a1d806a72d9e37465816171e60771c1c94c3c67f0e1a55238dc SHA512 d64632af71d51e5aa814bd58fa773fbc877abe1e59774e18fefcfab2949f08d8cf4e0482fe5acefb2dea3e0873e7d269d950c09ae4b65cb474bdd8a3407b2e39
diff --git a/dev-libs/univalue/univalue-1.0.4.ebuild b/dev-libs/univalue/univalue-1.0.4.ebuild
index d0f789dcb1dd..38bce8052ccd 100644
--- a/dev-libs/univalue/univalue-1.0.4.ebuild
+++ b/dev-libs/univalue/univalue-1.0.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
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index b1bf41fd6a28..81973ce99aab 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,6 +1,6 @@
 AUX uriparser-0.9.3-tests.patch 724 BLAKE2B de0681eaa68e4d846853d58804646c2a528f9a2be9bf317111d4b54521fa07fb6834df375c512c8bfa2b48832591706c01beedead9f1e199df5df3526606a205 SHA512 bde6f137503540dcc8a84eba2f97b8c21244d1d0dbf132b9bea07430e615804c4ad639663497955dc97e6bb8292bf2f1ac87b349dbbfc04f6230ce82b8077c17
 DIST uriparser-0.9.1.tar.bz2 372722 BLAKE2B 6fe21d1f5a98564f3e08094b1e27a13ea00baff3c4e09645236d8b08cba5455d49862a2d66fec02057efbb3b3d2e36040aeab31630f516eedd1ef36c84211638 SHA512 c6a4f3b737d4c53ba14148a5be363d93947c8c32755b369726ccdd6e01e8a2293d2c94d448700fc97bb56092696b67965646ae07c9ef31be253e2279d0bc3821
 DIST uriparser-0.9.3.tar.bz2 173073 BLAKE2B daf4d4ef2801850b8b4b3622ec195c7bfdc105cca085ea4a9d3ed9427bf7cf2eedcce4954b679a0ed1a79b7c57c98a1998b0cac27bd2b1de540aa79fdd4b160d SHA512 424419ea7b5f945b37ea06091d59e731c6a7ee76e7998f8a4e598036b3de8b593d62d1af6c6ddc7c31b43fc6795d4a5fa8d50da2508ca19de100a2222106fa3e
-EBUILD uriparser-0.9.1.ebuild 948 BLAKE2B ab6519668f0707732161e4a9c9eb6bc00c9ce90cdc6ed8b5bef1c71b784188a670abdde1a5fd921dfad8a72b26c9c5d8180e4c98bc25bf3c0e730810c983515f SHA512 9e999afb83368a25e17ffc8feed3307837673581b715ac41743ae42da77540704e7ac51f4e441f452553edcc42b2aa9bf7f8f787fe2ba988aacec49039878cdc
-EBUILD uriparser-0.9.3.ebuild 1183 BLAKE2B 5f71c34077aae2d1959bf1ffc5318b7f4bccc00f3ac1f1e309884c45dc7d2cc6ad1bcbac28f2614777f2aaa8e0c531ff94c15ec83ace8eed2b2584b34bbad4ae SHA512 1b3c13d727538086f1afab9f8d3b2246794ea44e399f291fafc91623e575dd07935e039156556d7821b5025e6de13bc40b31cd6724b1d2d0b5ecd8ae8758f34a
+EBUILD uriparser-0.9.1.ebuild 975 BLAKE2B 895468ed4daa08600ce4b93f42f4e891ab125a687b2febe79c02a74b683b337da3f3b77897b69ae2f839a06f29c1e52179c5edfea228e1814bc9104b729d8054 SHA512 12a65f12912213287a5ddfa7acfaee0de6652812371a8a9d1500a7a9f2f2d9f40e2573dc8d87b9f3a6de4a109db04c9efdbbec2d2d42a2b355fc2486787a80a3
+EBUILD uriparser-0.9.3.ebuild 1210 BLAKE2B e5de6e838c817756985b67c567328f90bf3bd9a79151db76bd57d4ab09bff0bf620437040c3eeb1b91946e0b34f9b230a22535b4b6bf029ad52c1803aaa884bb SHA512 7b1f78fdd8d432972f5e1b52ffdcc2629b437bf7d826d940f065ba91d8c2a0b65b567af4ae0995a2022e003dfce5ff2e6a976f12a79b4d0d10b8dfb847c01196
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.9.1.ebuild b/dev-libs/uriparser/uriparser-0.9.1.ebuild
index 42ceadef9be0..b7f5ae2164e9 100644
--- a/dev-libs/uriparser/uriparser-0.9.1.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.1.ebuild
@@ -19,6 +19,7 @@ DEPEND="virtual/pkgconfig
 	test? ( >=dev-cpp/gtest-1.8.1 )"
 
 REQUIRED_USE="test? ( unicode )"
+RESTRICT="!test? ( test )"
 
 DOCS=( AUTHORS ChangeLog THANKS )
 
diff --git a/dev-libs/uriparser/uriparser-0.9.3.ebuild b/dev-libs/uriparser/uriparser-0.9.3.ebuild
index 0c33c807ef45..48cecff8844f 100644
--- a/dev-libs/uriparser/uriparser-0.9.3.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.3.ebuild
@@ -21,6 +21,7 @@ DEPEND="virtual/pkgconfig
 	test? ( >=dev-cpp/gtest-1.8.1 )"
 
 REQUIRED_USE="test? ( unicode )"
+RESTRICT="!test? ( test )"
 
 DOCS=( AUTHORS ChangeLog THANKS )
 
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 773ecb0657b0..2a2457cadcbf 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -3,9 +3,9 @@ DIST userspace-rcu-0.10.2.tar.bz2 503833 BLAKE2B 17e2102e096903f301d1a08d606cf98
 DIST userspace-rcu-0.11.1.tar.bz2 527799 BLAKE2B b81ab5b3fd23e5666d422c1f627bc3c2cd095770f4f054f5d0d4ea6bc0007f12a4c6b05446e179b7a33775f7603e3be8ebf2c844be77b47ed80305da208151ea SHA512 112f7be1b72edfbad61582bb9962e2cf3c83415d12886cecb8239ab3263d1d07310b097813ac206aa9d4622953099100f0f54375d5ba345a3c87159c4b27bdc3
 DIST userspace-rcu-0.9.1.tar.bz2 468197 BLAKE2B ac2ae4ea788feef5463571e1a0d5dac35a5d6e298f628e0b0b2acea68d01e52a513cd5d1b58886d8b42d07455823fdfb91c1548caffb969cb9fe8c6b4d17adc7 SHA512 958234d72319decef07093c13b067e398c1b285ac714ab1dda89c2ad2ba0627d053e0cdabb07d480e399ebd60215445002876bd99f2829ca1e5582ada639f730
 DIST userspace-rcu-0.9.2.tar.bz2 468871 BLAKE2B f8a13b9683e8c32942a3d675ca94715de82b40b1a39be8161e1ea6009373f2ea6ae57b2e9ba4068544db2c9064457aaa8e83bad5e4af600bede248bf0780d11f SHA512 36264119d68569565a7b1222c4b0ca90128d121f032b388f27204ceaa9c964901f35be25584e1553b1a7613aad01d11766983ae245860df09444eb2f8ac913fc
-EBUILD userspace-rcu-0.10.1.ebuild 673 BLAKE2B 2524941a62c95d2511da008f6ee0ff4751e49e8321c93c2f24399f888e3d786ddb81251d76c89b75ecd119012626f81a784d5e3d29d34cf499f1b86af9b4ace9 SHA512 8dd0e48b45c781297f9bf37ec36677c8c995e623ade8c36a45a66b3043de5dd7c970919b8212efb65107cb87a23270d7eb09c3fc48248299cc74f6742517a425
-EBUILD userspace-rcu-0.10.2.ebuild 680 BLAKE2B 45f02f09faae2fd0a10eaf5bbe8b385e4bebe2af15e9aa9a9a65d4e7b7e25f13af41d150c363823a2d9914cc555b863f4547a457114afb931fc285ba619843f0 SHA512 e0d4eedaa1420a5e7d4a4f5c3cfefb28c47a8789c4a48711d541cd8204fce7958cca7de85599f25427cfeae8109d604977fd484bf5921a0f534de863f00edf2a
-EBUILD userspace-rcu-0.11.1.ebuild 680 BLAKE2B ebf41f7a87a238275ed19713fc52c8ea58e482e1a8e101eab2153dad8f32edf11506ff0854d3a5af87831c3ba3593b0fe836962b0267ad4d78c725568b86e860 SHA512 a0833a3953bb6be60a25eaa217ff970e713e63e15ff78445a2c880d8f54991e37cdafb7e7227b51b0d6e2e2adfa54f9a2b8bdd70144bf9ef903c822cb2f09fc8
-EBUILD userspace-rcu-0.9.1.ebuild 740 BLAKE2B b14e6a5df0fe84b42d932333de46b1c370ee594ddc37e33805ef00e6af75a42fc72df610ea083dd5b818e7b77d8177b86bab602f864e279fabbd99356943de77 SHA512 b12eff3a56fefb0fb9c1a181b47f25eb1278d171f919c1a0dae2f788f95437eb418d8ddb64cedba9e7b95b81f4ae9ea8b8b125fd07f816a2511871f692a69322
-EBUILD userspace-rcu-0.9.2.ebuild 746 BLAKE2B e47e73ff204d61dd97063ce7c00df11750fe27406ca7c3166d947e55c094eee04142658917841bca424b4d6614fd33694f932f16876182f963c53a50f251d1e3 SHA512 ff838cf89d63324f8a9741bf5064abe2fd814b5758930046cfec333ccbaad16fd0d682371978ea6382ae84772278409fa8e7c0822de379503eee852a828dc8a4
+EBUILD userspace-rcu-0.10.1.ebuild 700 BLAKE2B 93a6ddde87848343a209b0848d004ff552c5075f7b78d9c38ccceb7282511d593d8388741996829db598d48a936ad7b55b13c8318a45293c0e1b118b012b633d SHA512 cb428bdce9ca3a788979533932ca713a5dea79f669f6586c158f8af60440b77fe556c97ddeb6e03ea2fa7eff4c804dd2fe3cff9bf7f0212a561fd99d65ab9517
+EBUILD userspace-rcu-0.10.2.ebuild 707 BLAKE2B 590e0ca861bce65d2fdcf719bf7c286109c3210bfa2a5e81a981fc2f0db7409807a334dbd6d72fedf75c39009f6760344b8163adb5b90cc54efcfd00702d9473 SHA512 5fc4eb2befa1a2f9e4bbc1bd8b0c5febb9f172e304f46687389b8c9bfd705ab2b66707c5cbad0165f918993e0bf10fac93e0ff05241133b58cb38fad0c67e2a8
+EBUILD userspace-rcu-0.11.1.ebuild 707 BLAKE2B d8e595a8c0c8895055bdc53bec05e72d958a359d4b8053b488ba1fcf5c38d072d498f96ab6791a82b651f1df5bfaee8792039e282056001a3a5e870932021c0a SHA512 e1b4b4c438e7774b50f3f21dc014c124677729d833e92b47980ecdce91840d9f9f59df65bf45b4810abd26d74888b52d7e7487f5a07eb4d5aba4e3b66093b9c8
+EBUILD userspace-rcu-0.9.1.ebuild 767 BLAKE2B 640626c84e8e8d73c952c60c5ef1ae254b962f8ed6c267cae337b09f6fc02052c32c9f4ca80496b8f19a30909726af0a594c7bc19b5d64c9761072d52b090393 SHA512 167061897eb085a5ce1a23579c432cbe67863774efbc878c7605fb4626bc051b30080ba4e348d0f91aae8f4e8286d6636fcd05282791f796e35f4e855726b663
+EBUILD userspace-rcu-0.9.2.ebuild 773 BLAKE2B daa3a0f6575c41a25c92932d4823b5387b4c9895ca984373a8a2bd770b078986c6519a0ebaa360544437878a335d26694bb48c8cd3308ac672f9514d9f0126a6 SHA512 6e1ce7780fb22d2f0d382f3d3af5872162c6ded4f434fd1b300249bbc410b1d431beed61469b3c6a1a55518c2843a095da1308963f60aa95c1eb0bb36989c4ad
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
index 38ef33a68087..a2d12af12b2e 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
@@ -11,6 +11,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname version
 KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="static-libs regression-test test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( sys-process/time )"
 
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.10.2.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.10.2.ebuild
index c0740d639c7f..981b27090047 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.10.2.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.10.2.ebuild
@@ -11,6 +11,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs regression-test test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( sys-process/time )"
 
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild
index d69a055733c8..169f8cd28f1a 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild
@@ -11,6 +11,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs regression-test test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( sys-process/time )"
 
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild
index 1df5f3e366fe..bc6d535ebc8c 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname version
 KEYWORDS="~alpha amd64 arm hppa ppc ppc64 x86"
 IUSE="static-libs regression-test test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( sys-process/time )"
 
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.9.2.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.9.2.ebuild
index 0169d3b94b72..6cbfcf9a4f55 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.9.2.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.9.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname version
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="static-libs regression-test test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( sys-process/time )"
 
diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index 07a36c2d7fed..b5b5586feead 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -1,6 +1,6 @@
 DIST utf8_v2_3_4.zip 22422 BLAKE2B cf736876a99068c7e5cb1b0b892d1d63cb38906c993c60b78c8c5625aef86fac3a849551771d0840c3cccf04f1a3617216cbd4684fa5cdde0037e3901c70ff4b SHA512 0e85e443e7bd4ecbe85dedfb7bdf8b1767808108b3a4fc1c0c508bcf74787539ae0af95a31a70e715ca872689ac4d7233afc075ceb375375d26743f92051e222
 DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bbd33ccbbaf07b57a28c4e485d596725297fc2de83c23fa3c66872519883727714d236f4a37e07ed4825fc9 SHA512 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5
 EBUILD utfcpp-2.3.4.ebuild 536 BLAKE2B f0ea01b1af4dba1fccb992c590e419941123a123fc451c335a160ea8ce3ecde2a2cfbe82dc99555ee374663ecc7555a6462624720a42299c39a59b3b09477846 SHA512 b769ca26494a135688895450b48b914e6af28c3f52398b3b5e7d5860efac7253acac3ee523f9a6e7742bd4e72aba14b674ad09ecc52274e90c7ecc3e514c91a9
-EBUILD utfcpp-3.1.ebuild 953 BLAKE2B 6a720484675821e5d573f61dc3ccaf8137cf81bc6e0f289a8f9b8db43cc5e2120c2e6c091ff3c3a31d254289a809592c6d16ee0c12bed69009e7acca81a9ad96 SHA512 e64e0dc995ce290ea855966f39f76814314e029ef6297a02a47a2033820b9b5ea2e1e0afb3da78a06550ce190e6cba11cfb416a83d6a0cb1691f1b737176d500
+EBUILD utfcpp-3.1.ebuild 951 BLAKE2B c515df5484135924152bfcbd12c7b0a99067ad1a4d114562e73961c52e09ac0de079ed1e5c9147d91c0cc0a54f650782f9690bfdb22f656d0ed93e30c2362f4c SHA512 7a348c70799f8bcafb3d9e776c06d955424c1a22d75cbd255dffb48db1218693bb9c4aa7184a6d776bbf4bc21882a758e1e73bc551cd849b9c4f5b0975e47896
 EBUILD utfcpp-9999.ebuild 916 BLAKE2B 8a7a1e05ae84fbb8d875e0b7fb0558cfc0c9835090b0253343648d6d9c1833724f99de9b64702d1976a89f93bfdb38f36cf7c41979e73cae9a39bdf66338f5d0 SHA512 e7d512b80328c68fd6037d08796ea88ffabaf903d18e33ebed26253f03c5cdd02c050450a38980e23d83356c3bb30f90ecdba1c8125fb86f877c846c4bb33b01
 MISC metadata.xml 494 BLAKE2B 9e52a09505cc2bdae2fd434169a21ca63d48d62dd917bf2fcf15a54378b1894191cacc0c676705c731cbc05720723604b18c1bc982da036168d6b9bc184d1b71 SHA512 af81373c64b07a3650d3a613d0b260a55740ce140546db9f7b839c5b5b7f7b02abd85307e033a980da8a1182fcbc5182c0415a3bb8a89d3fdfaaee8eeb648612
diff --git a/dev-libs/utfcpp/utfcpp-3.1.ebuild b/dev-libs/utfcpp/utfcpp-3.1.ebuild
index 4b052b326ee3..bffcc704a84f 100644
--- a/dev-libs/utfcpp/utfcpp-3.1.ebuild
+++ b/dev-libs/utfcpp/utfcpp-3.1.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index 1684cd3aba25..c2d4f95121c4 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -1,4 +1,4 @@
 AUX uthash-2.0.2-cflags.patch 250 BLAKE2B fc632cc23ffb5ddc89e3d91ea753f0a8f2803890203c7227a01b694603842490027e411e304e3db3960b0920f53f1390010f570bffa38d94a449864cbec938eb SHA512 d87dfbc7be1df49d5c6f06c413800693491f2bc4d0b4b0bddff5f1519a7de4d4ab95d3642e15273d6ddca6a19a9d511859ec999aebf81c8739bab4a7caaebfc3
 DIST uthash-2.0.2.tar.gz 191173 BLAKE2B a4a2ddb19fcc9af1105bc07deb8ccbe9c3f04518b609f7cfd16f0a05ec3e16ffb25fb5f0a5f258413f9f52facaa26adf4ea0683415416c12ab36bf11883976ae SHA512 0c2e686eb5a1d6a03a6fa1d42e803fca4e9b60b2d965c635a5a33d487c8d115f1f8155ff99a0e1874b69f6b66c04ea7d8866472a39abe5d1a23ae73f6fa956d7
-EBUILD uthash-2.0.2.ebuild 630 BLAKE2B b50b7ecddefaeb260db7ea4b13dbdbf1b27e452391884227dfd21dfaa94d6b72050343cb75713a78bd4a969e986ebc28ebb20c3294231573d4e51c4b3301b1ea SHA512 3018148d04673e7200c560546bafee8077a67bed5ed1b100d8d5054e6113004fd2ebb69e67f7745382a8e7ace9e0f488614586ef8eddc3ca788760f01c72dd59
+EBUILD uthash-2.0.2.ebuild 657 BLAKE2B f46b84a586d1ed7508316e8d9a196762eefe6e59fdc783d6404fad760b820e8f3c3d1ffe69b3a9354278223704c02c27438880a03da35fce21f4856879fd0c7c SHA512 c78a76a782147701bd6506967070150fbcf6c1f2ed9756572ab981826d6120888cef341c6f9adf4e0eb80d82474687a414ddcdf115fcfac02af9c4e8434adceb
 MISC metadata.xml 255 BLAKE2B ab14729a41f74f763ae36bef2284978ccc3d74ac40ed604ff797c16ea13029db8add12376bdc72c944356971a31e17a0f8fba2f08a822cf2f69de7792ace0423 SHA512 e251c1de46006091df4d8a908a540cf1251d4e3b0f4f8c3710221e25d9d822a66d9486b3972fb06cfcfeb1f488c351b38b0aa7fab54433f70d63de7ca9dcf479
diff --git a/dev-libs/uthash/uthash-2.0.2.ebuild b/dev-libs/uthash/uthash-2.0.2.ebuild
index f0cf8cb9ad68..95707126da3f 100644
--- a/dev-libs/uthash/uthash-2.0.2.ebuild
+++ b/dev-libs/uthash/uthash-2.0.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD-1"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc ~ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-lang/perl )"
 RDEPEND=""
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 06edf3625f66..195e1bffcc2e 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,13 +1,9 @@
 DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8
 DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
-DIST vala-0.44.7.tar.xz 3355928 BLAKE2B 172e9fee6edec63324b9babc125d2bdb53c2025b2cb86339b54a4c8017ccdf78a848076fdd6a8f5200c15c48864542d711896160f78790d36a29d30980177d34 SHA512 5a645e1b1929644ec6b53d06895afcf62d41d6fd63f82c3be3aa4e28847173071621ec857cb973df38d36e60eb960954c2fb48fb4189e1afcbb25a2376ff0d77
-DIST vala-0.44.8.tar.xz 3360352 BLAKE2B da1c8bd909db712567fecee138b464bb304628c6bff1e33901c788728ae0abea9e2df85263b60d97053cd6b25c0fd434f2df0c81b8e8af46e76f588850f945c7 SHA512 75d0e3815e958c2067764069d3582186a4ae025f2a7bb1f7aa184af51d8d0797be9c21d6bb1485c8e2102fb6fee2d39b3b373660e80f2ad6b0336ba772e01062
 DIST vala-0.44.9.tar.xz 3363004 BLAKE2B b87f8f7d9cda5a77486720b8c542c42ed448cfbb6a1bae899591a799dcf25882a0539c3acef282d0ba42a7ea78d68e7a5d99aa4daa306a70afe6938732d03c25 SHA512 9af559a6cb1680013886a4d425e619503d60394f2c7b1ab897cc7830ee566f8122dcd4380b78b551fbf556cead623c245adc1f7f3357b8315be8c120412a3e9f
 DIST vala-0.46.3.tar.xz 3367124 BLAKE2B 795e1615c91ac0324df2f5304951204caf9c024ca9e0d1ba768d0613f6e21393648bc3654c8cc9d386a8bef2009b4c842b1b924b1fd079e2689e6c64a7e7749b SHA512 f932fbcd42e6c82c4543efcc507abdb1e1d1af9c0eac125981c55cb052357e7723cb2a08a5aa56c02ac5228d0125c9906a133ce66f8b59fca84c773060174d0c
 EBUILD vala-common-0.40.14.ebuild 2495 BLAKE2B 0729152dfedf4b36de709f45975d9b2fbebaf96e07262e6a76377b78f81808f09ba644381d260de5a45eb015a8ce531826839279ce72e2b013ab77a2a4d4d34f SHA512 894766387ea556640229c2aeed1dcc07ccd0c43d990a4f15e84ec50957b11a15f5cb8b3bcbe4e450202c0d88a7c537b61f603f8cb3a7e35b29bf91a8154c144d
 EBUILD vala-common-0.42.7.ebuild 2496 BLAKE2B 9227207a2e94dd78a5f3fa53a32f5ded118d8345e760edc51794046e574051de3d1ed5dca1c004013383ccdbb71e5ccb637ff3b892c90f9f7645e0cbf6cc66c5 SHA512 233cdae34cbfa1985a059da4c180cb40c1d3ae1a5ff705407772d17e5dbeab51a034a9ac0ab83eaaf2ae689fb55df484d35861dffea4865a7ba0afac6af36830
-EBUILD vala-common-0.44.7.ebuild 658 BLAKE2B 586f1e5ce72e5462f9d5dde289dfe2149e516559d14b84ef514b1d11844021c7c0fa2c6449d770e1a6a2493f8940bd45e8b431c9649606960e574063ee4b521b SHA512 b097872ea867e3c51717e9320440b2f4d9df38a5ee88e123ab4a9b60c53415e6eab34c8f2f26567b300ff77579a1364a0e191f510d3bfb1e7d00220f440ff67a
-EBUILD vala-common-0.44.8.ebuild 658 BLAKE2B 586f1e5ce72e5462f9d5dde289dfe2149e516559d14b84ef514b1d11844021c7c0fa2c6449d770e1a6a2493f8940bd45e8b431c9649606960e574063ee4b521b SHA512 b097872ea867e3c51717e9320440b2f4d9df38a5ee88e123ab4a9b60c53415e6eab34c8f2f26567b300ff77579a1364a0e191f510d3bfb1e7d00220f440ff67a
-EBUILD vala-common-0.44.9.ebuild 658 BLAKE2B 586f1e5ce72e5462f9d5dde289dfe2149e516559d14b84ef514b1d11844021c7c0fa2c6449d770e1a6a2493f8940bd45e8b431c9649606960e574063ee4b521b SHA512 b097872ea867e3c51717e9320440b2f4d9df38a5ee88e123ab4a9b60c53415e6eab34c8f2f26567b300ff77579a1364a0e191f510d3bfb1e7d00220f440ff67a
+EBUILD vala-common-0.44.9.ebuild 650 BLAKE2B 0e09e3f69025cc7ce005ee788a54ac963d455fe27cca4efa4783f55889ba6a78cf1908120d69c561af808a8466769145897544899e09c4332e9a841b45a34c70 SHA512 12fb3218c79418124408195f043d913113ce54fa81582c33cc9a59e904fc175914672dbb08f8c2e81ae2791ef8c188818c78d29b550b069d7bea066e33a0aed5
 EBUILD vala-common-0.46.3.ebuild 658 BLAKE2B 586f1e5ce72e5462f9d5dde289dfe2149e516559d14b84ef514b1d11844021c7c0fa2c6449d770e1a6a2493f8940bd45e8b431c9649606960e574063ee4b521b SHA512 b097872ea867e3c51717e9320440b2f4d9df38a5ee88e123ab4a9b60c53415e6eab34c8f2f26567b300ff77579a1364a0e191f510d3bfb1e7d00220f440ff67a
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.44.7.ebuild b/dev-libs/vala-common/vala-common-0.44.7.ebuild
deleted file mode 100644
index f66b34153af7..000000000000
--- a/dev-libs/vala-common/vala-common-0.44.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.44.8.ebuild b/dev-libs/vala-common/vala-common-0.44.8.ebuild
deleted file mode 100644
index f66b34153af7..000000000000
--- a/dev-libs/vala-common/vala-common-0.44.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.44.9.ebuild b/dev-libs/vala-common/vala-common-0.44.9.ebuild
index f66b34153af7..124b1a58250d 100644
--- a/dev-libs/vala-common/vala-common-0.44.9.ebuild
+++ b/dev-libs/vala-common/vala-common-0.44.9.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/vc/Manifest b/dev-libs/vc/Manifest
index aa402ccff5fa..8f22147dbb04 100644
--- a/dev-libs/vc/Manifest
+++ b/dev-libs/vc/Manifest
@@ -29,7 +29,7 @@ DIST vc-1.3.3-reference-sincos-dp.dat 3600000 BLAKE2B 2f3a4d208d8b8cccc7c6f84a9f
 DIST vc-1.3.3-reference-sincos-sp.dat 1800000 BLAKE2B c0993d43ec2c88edcbab2ade63f1a960ed64ccfd78fb5355aa0a6940b3860669dfafee75190a67e77f53d6005f9cf7e9e82abdd270e171606ebbb143b7326907 SHA512 0760409ae093c7d897e6ac0b689fea5c1cf9cf58e3c39e2880fcacf56398e9c3ceb897f725ef54730b95847f11ca73a05fd96e108aa153ba6d22c21f7104c009
 DIST vc-1.3.3.tar.gz 781361 BLAKE2B 8e98cd983e7ef132e8d2a74f53d95e1ae7ba52b90da8878512ee4df33751ddce40dca6e70c8384048a86e495c6387d425db6cc5df0b7d15afd14f0fee94eb2b7 SHA512 dbc6f5bc723c52d3116301798b600b08bde510cff9e6777312d1970c61ad1b71fd83335ce65e9993a9f582a20b9de73984d553039452908ef229c4bde3b334f2
 DIST vc-1.4.1.tar.gz 638797 BLAKE2B 38feab898a4ce2b15c4db508369426a6b470f24b81e6676ad0e667cc08efaf30e96ed1455c667372104192fe6eb2340fdbd367298fa68e3168350c2e134cc0b8 SHA512 dd17e214099796c41d70416d365ea038c00c5fda285b05e48d7ee4fe03f4db2671d2be006ca7b98b0d4133bfcb57faf04cecfe35c29c3b006cd91c9a185cc04a
-EBUILD vc-1.3.0.ebuild 949 BLAKE2B 3c9537875a996b34205d5092d448a605215e10de738695c2f9dd71d0fa5b41ccc46b871d2671a3f85a2233f86b409373843d693d08fc9e1cc17a6b71b891fa65 SHA512 fe507595e252c0f396e4c1e4107e658b6f6ab92d650385e5ffec87d1c4478a66a5a5fd51db16c7d7d52edcd68df63d87274117a75d436e064c8b0a5abe252b1d
-EBUILD vc-1.3.3.ebuild 954 BLAKE2B b88596880883fdb3611644783fc6da739cace3881bc3577d08cb25b9ebe33912d662b9613cb60210a44465be4c002ab86b6400e12bdf851552179aabcf8315bc SHA512 5c3a96be341de9d7f91d606af3dd2434b4c2c6683e24132bda3b92b5cc0ccd26aa90db38e07b6b81c17a2103e328c80de67b6af89163773ba294d47e16cc63e6
+EBUILD vc-1.3.0.ebuild 976 BLAKE2B 4faa72244db950a63a2efea204ddf28f5b61f1552ae805f6b3c814854b5f19a8f95cdad0390a85c3c2723d35936e941651eb8566a09ae1ef2b741c132013c647 SHA512 091c36a69065c550968a4bfaa4e4ba4f782fd2ad0cda23eaa8072213271deb10137d3ec40cce6605cea2d1cb6a3bdaf628f2b40939eddce4d8b60359ac178d00
+EBUILD vc-1.3.3.ebuild 978 BLAKE2B 8f4825108848d1fabaedb1a295771ec19cae07bcd68118a88c6b3d97dddd1d2ca5951259ec2d60c9c7b2fbfd81a0a71f366a467fb8644142850d8ba796e6b9c9 SHA512 a9bdc27b7ec75a6becad5546c4035c8c58832d658719173f11babc74563038a0e321674d59ea7ab3569a9f690a7b7781588728065d44785d94c52750b326e599
 EBUILD vc-1.4.1.ebuild 445 BLAKE2B 5e039bb3768b6d2f1fbf98e51de939048c84b9a5e6e4c224285dd8652069581258ba32ba37e8c956bb6d19936a7aa0426e6d4958abada2a8f0e7486cf8664614 SHA512 9469167cf55941ea4687938c8ca24cc766f081a90208b97016c8db474a1cf961716c1f38a041e47277115ae047790f206ed05279d97eeac8bb5a4d817ef4ef24
 MISC metadata.xml 292 BLAKE2B 895bf66b71e43684a437957b5ed370cc274a808714f96567956512c561d1fdf18402f5d9340d9c11bf585044e15c081648964df9640c120f74acee9790f532dd SHA512 e30b480889c2fb22f22af6d46f64399012da00bf045a4c9bb2c46b3f3255c4bc50f5970a0b3902ea90024d2ad371d1577ce4dc5a86923eb55634bfd26dafa22a
diff --git a/dev-libs/vc/vc-1.3.0.ebuild b/dev-libs/vc/vc-1.3.0.ebuild
index 36f0890c4fff..9de3bcbd57dd 100644
--- a/dev-libs/vc/vc-1.3.0.ebuild
+++ b/dev-libs/vc/vc-1.3.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
@@ -19,6 +19,7 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 src_unpack() {
 	default_src_unpack
diff --git a/dev-libs/vc/vc-1.3.3.ebuild b/dev-libs/vc/vc-1.3.3.ebuild
index cb16f01344d6..4118e6c931bb 100644
--- a/dev-libs/vc/vc-1.3.3.ebuild
+++ b/dev-libs/vc/vc-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 src_unpack() {
 	default_src_unpack
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index 5e0fad397904..c8f839a5ce5f 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,3 +1,3 @@
 DIST voikko-fi-2.3.tar.gz 694602 BLAKE2B 454afaa76be00645b8640f84c2c91ed0b31be5b46c98d31bba0f4967dce27919eee6a6c452941b3878b498c7f913a413a3d143d658bc38da2a07b32d876ac317 SHA512 b3478cbb6aecebcc25e1c4bce0881a657d664c11190a22c1c2c4ca7e7c62b4c4fd5d396718fbadc8c5ab3c9db5d4349d6cd81440a1394cf4c2f77c52ae608018
-EBUILD voikko-fi-2.3.ebuild 695 BLAKE2B 6d1f636c6195ff077904553e0af107310dc4c7c9a81d62c6783c08530d3e6fd3c346b041866f7e0f70144f0fb7b112aa72c48c1b0c4710b591f1fb162da790e1 SHA512 e10ff8100d3de6fc3efbefdbae5382f196cff741da5fa54130c31993d4a077864f11765a5939ad7f184d0a7370089de720203fa117f3430e0680dfed52206278
+EBUILD voikko-fi-2.3.ebuild 693 BLAKE2B 4410d3281152f4586c41a65c97cf9091d8cbb438ce72b1c9be6e3c3555434c7b755cccfff24cb271d8446b501a86b9a5141e1979a299b26a44bd0f6ba24ca145 SHA512 c4f8d66f4b5d494a3836f59bbe5593e081cdf76d369a25b2d390c0112c5f4e3f7273d4da43f2c6c9cf171c348a39cf78dba00aef0c01f97b9fbf37ffac9e4029
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/voikko-fi/voikko-fi-2.3.ebuild b/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
index e267dbf7a4c5..ea6ef0415a86 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://voikko.puimula.org/"
 SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index 76ee7fb37a14..d92589e69a43 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,5 +1,5 @@
 DIST volume_key-0.3.11.tar.xz 484936 BLAKE2B f7bde79d290617a82de60a2105b6374dd03c2203804e3748336c8d09fbf749bf47157cf5e6b856477475d0074f3e4475dc85e0765308d60b9c6d0525685f73ea SHA512 b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
-EBUILD volume_key-0.3.11.ebuild 857 BLAKE2B fa53fd9c8c8d98545c56b4f2691f8a115b65369296e2e6a37aef2d4351e257b8c29b0e83f01b9a994d00f319aa56b875d9127b387302320a4cc7889cad4a432a SHA512 3098296cfd81b0d62d6b0e8b404dc0836e5b9fdb6690c5b86ad0deef9d48f7d738d5758ae7f94ba0e0208596ce90138e6ce519d8ee2cc3a082df625b29c35baa
-EBUILD volume_key-0.3.12.ebuild 922 BLAKE2B 2305af3ad6640ba4c0328a3c52c46c03a1082c18565d6ce0f44bb586a66357f9d0f557d8614b2401e6c75b95fa9f8848b4a56d3956d983700e738cf5d831e036 SHA512 42048c250105e28afda9916692b68c0d197480c997e443b12a72017c77c526fda698dc8d42d7d928eaf6ed35b1258d68243dbea103fbe02548d4746dc6a653b6
+EBUILD volume_key-0.3.11.ebuild 883 BLAKE2B 61cd00272bac2513b9fe847e40608d9f9a004e6b1f9baaebfe617f992d2770229db1fdc9817b6413234261d9536d761629e8753ac12cc7e8e433c5a76bf9df69 SHA512 d5f488ca913977fc4be85098e7f91b5f2c0604d094a67f740ac9fcae19028b4a87442474e2521a1e1a79873e94c76cf0172f3368dde77244555af5b9313b1ef1
+EBUILD volume_key-0.3.12.ebuild 949 BLAKE2B 7f6cffdc5385d9ec6a295840be4310cd83872b622d3618dad9079dadfc183889eb68924813974f2a6e08037d7dabee03263623838a2a293d495e760beef7c4b7 SHA512 a1f79bf60d9b134f66565e7a4249c4fdc5c47ff1f2b9b2b8dc7130578bd67c8cf018a5baceaa0c46f62b50cd955c421cbc24ebc8dd2b6a890e3bd159c32aee0e
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/volume_key-0.3.11.ebuild b/dev-libs/volume_key/volume_key-0.3.11.ebuild
index ad55dd225f32..fe1f873c43b4 100644
--- a/dev-libs/volume_key/volume_key-0.3.11.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.11.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
-
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-libs/volume_key/volume_key-0.3.12.ebuild b/dev-libs/volume_key/volume_key-0.3.12.ebuild
index 125cbd4b1be8..70e2b885b754 100644
--- a/dev-libs/volume_key/volume_key-0.3.12.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.12.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 53f891532fbd..143392d5c3c4 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,7 +1,7 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
 DIST weston-7.0.0.tar.xz 1086028 BLAKE2B 84bd16b9d9b191be79bd58a2eecf189971f859edd922245df426ef7871533f5e2a99d484a91241953d182047a6d70d9ee64e8754ea7638637aaf777e4382e793 SHA512 fa14467ab89fb12175830d9cf29d89dc04899fd21d801e60e85836e8e52e17e144be78098b3eedfab6c51b7fb055ecfabb456a8a74f4e40485134da59ac58ea3
-EBUILD weston-3.0.0.ebuild 3498 BLAKE2B 066de40c7595bd86c63143e8dcc1b56991b09b23755530247f38ac2a35ceb94f16329e46ded39f0e9d4135fac47e9127477afc124c119f48d220c09022ac0bb8 SHA512 e3ef428c5f03621f8860463c69d7a124e7f16f6e92523d9e309dcb623b75f9c41c73268a54579e1c3849e1100aad534f289fd0e3465dfcd9d02b846695ac5237
-EBUILD weston-7.0.0.ebuild 3643 BLAKE2B e66f8b47dfdb9284e7b67aaa98723cccd7421f4126ee043fed580b1a95b729c78b71fb5f9582520f0ccdfbc3c6baea636f00c29e372ac38cb31d6bd5f37be85b SHA512 9998de0daa279b34010f34889d427bf4e2ce8334a611b273c7b61e71babfa17c65b86dacb42b6e5c636203a64d20f16e6704e2493c9a8f4ae99dc316c7f00092
-EBUILD weston-9999.ebuild 3643 BLAKE2B e66f8b47dfdb9284e7b67aaa98723cccd7421f4126ee043fed580b1a95b729c78b71fb5f9582520f0ccdfbc3c6baea636f00c29e372ac38cb31d6bd5f37be85b SHA512 9998de0daa279b34010f34889d427bf4e2ce8334a611b273c7b61e71babfa17c65b86dacb42b6e5c636203a64d20f16e6704e2493c9a8f4ae99dc316c7f00092
+EBUILD weston-3.0.0.ebuild 3525 BLAKE2B 8258f44f7ffc7bbe23b223a349ae3d1b147b3b79d2efe1bba9a063318bd03e51d11a18bd7d1349c5c5895ab3235f8495840be88da37b9e80e3041b9f35cf465e SHA512 e36227378b2fc8f333b38e136077a6b188e8d1ff9fcb96dd26a3f9cbde0e54eec1e1993770193d10d7af02170af29a62069cc274de7471301719538eac14a16d
+EBUILD weston-7.0.0.ebuild 3670 BLAKE2B dc1a943666a406dd2f5755be858d1ccd80be230589e3205cf6e743ac6038303acaa196a6cf5089a08e7686be38e7356644635857ea46345fa15d9b91f3374246 SHA512 06119fa8dbd5f060f1a656b017501bd218ba7e5f3650d2bfa4b11c8237d519404cf55c4d47e4e4721231cc99c94f6112817230e21c8bd0bca888d7f81233f418
+EBUILD weston-9999.ebuild 3670 BLAKE2B dc1a943666a406dd2f5755be858d1ccd80be230589e3205cf6e743ac6038303acaa196a6cf5089a08e7686be38e7356644635857ea46345fa15d9b91f3374246 SHA512 06119fa8dbd5f060f1a656b017501bd218ba7e5f3650d2bfa4b11c8237d519404cf55c4d47e4e4721231cc99c94f6112817230e21c8bd0bca888d7f81233f418
 MISC metadata.xml 1506 BLAKE2B 7b66fcfbb46edb8480df35f1aabe87c167f02d3cbf505939523248dabadcaab41f395f6ed10eee33c08ee3fbbc2b49d391f61811a75699d4864d6f1eaea3e6fd SHA512 833531fb156a41c3d0996c50e9e72a920b315ad41b7f9a12b82a0f071b621ef9f0b73f8fe2cd63bbce7c1d63d54f41180a3496e3479ef5d0dab725a8af3330dc
diff --git a/dev-libs/weston/weston-3.0.0.ebuild b/dev-libs/weston/weston-3.0.0.ebuild
index a3061e69cc02..2a914c848f1e 100644
--- a/dev-libs/weston/weston-3.0.0.ebuild
+++ b/dev-libs/weston/weston-3.0.0.ebuild
@@ -26,6 +26,7 @@ LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
 IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp +resize-optimization screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	drm? ( gles2 )
diff --git a/dev-libs/weston/weston-7.0.0.ebuild b/dev-libs/weston/weston-7.0.0.ebuild
index 0af0f01a4a0b..bff2ce2e638a 100644
--- a/dev-libs/weston/weston-7.0.0.ebuild
+++ b/dev-libs/weston/weston-7.0.0.ebuild
@@ -26,6 +26,7 @@ LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
 IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	colord? ( lcms )
@@ -120,7 +121,7 @@ src_configure() {
 		-Dtools=debug,info,terminal
 		-Dsimple-dmabuf-drm=auto
 		$(meson_use examples demo-clients)
-		$(usex examples -Dsimple-clients=damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
+		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
 		$(meson_use resize-optimization resize-pool)
 		-Dtest-junit-xml=false
 		"${myconf[@]}"
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 0af0f01a4a0b..bff2ce2e638a 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -26,6 +26,7 @@ LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
 IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	colord? ( lcms )
@@ -120,7 +121,7 @@ src_configure() {
 		-Dtools=debug,info,terminal
 		-Dsimple-dmabuf-drm=auto
 		$(meson_use examples demo-clients)
-		$(usex examples -Dsimple-clients=damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
+		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
 		$(meson_use resize-optimization resize-pool)
 		-Dtest-junit-xml=false
 		"${myconf[@]}"
diff --git a/dev-libs/wnn7sdk/Manifest b/dev-libs/wnn7sdk/Manifest
deleted file mode 100644
index 442423ac69ba..000000000000
--- a/dev-libs/wnn7sdk/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX wnn7sdk-gcc4.patch 810 BLAKE2B 652cb2c3de591199a519adcc1b5a6c01dafd8fdf4ad9e6092c1dd787145ad15d86f92c65b154027297490d266ed7f24aa97cfb45d85831faefeb89ceb9394475 SHA512 b0134c1393a98eff49eaf5f31a0cb9d99e4e40675f1c6abddfc7f790c70ac0ae1d0c79397beb46bd665e8da8cdae3cffb76200b447d16dca94de4db1b2722809
-AUX wnn7sdk-gentoo.patch 2120 BLAKE2B 1fd66badbc4e55478bed5c456da4b4945a49b1b37db253d47d3aa9162f9541b298feccd5b534c730ce1b245753d5d0211953405c32755e3b10a89a893aa27b6b SHA512 554c189689d5028eca6ea61f41dcf51e5bbbbdf724974c17fe94c8dfa4177d56dea50ab609c2736cf142ed2bf6edcc6f00fabd5ca930973ad7467fe22696f04e
-AUX wnn7sdk-malloc.patch 366 BLAKE2B 3bfdbf3e4ee8eed98f2e54364d29a533793acf5ff54d04986d614387daaa005653313bb1db6336fb70b3f7f786a5e4ba36b559eaf95c6f763f1d953920719a13 SHA512 cdc2142a1bdd16158b765fda01983cd530dc8271383177b4bb7e534ba192e07dcccd042c234f4160d346ce69ed1b0eacf366ee86fe7209b4d54fe91befbc3b89
-AUX wnn7sdk-qa.patch 1459 BLAKE2B eb56155148fc9c8f75afe719d217f14626e5468056c0f4ff499e3e04a440beac9705248db4d1cbc701e1bf5e5d8c779a62aff9bf4096c7c41dba12194cad95e7 SHA512 0f29f0e3b26b0038473f9601cd9179095422882dfbc62c371e17055d9a9143b8b35f5d7ad2165301f935bfabe2b90768591789a8a5cbbcc931e65c16441b681e
-DIST Wnn7SDK.tgz 178403 BLAKE2B 9dfccd0bcbe38cd1d782fd2b331c6349a1e1788c328dc121eb91ed362028c18661dc08d761b31722cd19fd3c76970a2566c2641488cd4b968f898f6d1e76ea76 SHA512 d6e24357c0071eb29e3a91cd3484c8fe7901a5e1537bff6632fa04eef21d0e56d7a5f3d7d899599401f607eee259cab36026321f09eea45590d00425d1963f52
-EBUILD wnn7sdk-20011017-r1.ebuild 1255 BLAKE2B a35145875061478f7af335c5b75e749306a465c4c546ca1f9419a8a5c0c65d3676df4dc229a46f6c0cd5c33baa470cd2d9cca248616f0e30a37cdcc991d6e716 SHA512 79c8b1c611f2dbdb495f3a50b2be7cff13d15d289feb78b9d9058e1d00b4e4b0375a49740cc66cb452993a642995d3b1eee7f6324a54f8a0f837ba010ed6c9b4
-EBUILD wnn7sdk-20011017.ebuild 870 BLAKE2B dbd30567852a26fe4d8f9d09e5db5ec752133456df925fd957ba8714e099352393a678ac855e7dff491886e263f7f70eaf5651f1423b54b5e4af7ffd8ae0c350 SHA512 4dff59f1b82a45959eb9a2d7907683c533f60c19eb9612f5ee81611dbd595940128062fe0773ddf7cfffbb2b900cbb904a1422fd3b46b3261012bde8a70e5cfe
-MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch b/dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch
deleted file mode 100644
index f97845f449f1..000000000000
--- a/dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN Wnn/etc/bdic.c Wnn-gcc4/etc/bdic.c
---- Wnn/etc/bdic.c	2001-10-17 10:37:17.000000000 +0900
-+++ Wnn-gcc4/etc/bdic.c	2006-11-06 01:31:31.000000000 +0900
-@@ -177,6 +177,14 @@
- #define max(a, b) ((a < b)? b:a)
- #endif
- 
-+#ifdef WNN_CHECK_INODE
-+static int change_file_uniq1();
-+#else
-+#ifdef JS
-+static int change_file_uniq1();
-+#endif
-+#endif
-+
- /*:::DOC_START
-  *
-  *    Function Name: dic_fopen
-diff -urN Wnn/jlib/jl.c Wnn-gcc4/jlib/jl.c
---- Wnn/jlib/jl.c	2001-10-17 10:37:17.000000000 +0900
-+++ Wnn-gcc4/jlib/jl.c	2006-11-06 01:33:13.000000000 +0900
-@@ -297,6 +297,8 @@
- static int insert_dai_or_ikeiji();
- static int jl_dic_save_all_e_body();
- 
-+static void jl_disconnect_if_server_dead_body_by_jsid();
-+
- static struct wnn_buf *jl_open_lang_core();
- static struct wnn_env *jl_connect_lang_core();
- 
diff --git a/dev-libs/wnn7sdk/files/wnn7sdk-gentoo.patch b/dev-libs/wnn7sdk/files/wnn7sdk-gentoo.patch
deleted file mode 100644
index e203c8b5fa83..000000000000
--- a/dev-libs/wnn7sdk/files/wnn7sdk-gentoo.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- work/src/Wnn/jlib/Imakefile	Wed Oct 17 10:37:17 2001
-+++ Wnn/jlib/Imakefile	Sat Oct 19 17:15:25 2002
-@@ -60,9 +60,9 @@
- 
- LibraryObjectRule()
- #if DoSharedLib
--AllTarget($(OBJS) libwnn.a libwnn.so.$(SOWNN7LIBREV))
-+AllTarget($(OBJS) libwnn7.a libwnn7.so.$(SOWNN7LIBREV))
- #else
--AllTarget($(OBJS) libwnn.a)
-+AllTarget($(OBJS) libwnn7.a)
- #endif
- 
- 
-@@ -75,23 +75,23 @@
- SingleProgramTarget(kankana,kankana.o,$(WNNJLIB),)
- 
- #if DoSharedLib
--SharedLibraryTarget(wnn,$(SOWNN7LIBREV),$(OBJS),.,.)
-+SharedLibraryTarget(wnn7,$(SOWNN7LIBREV),$(OBJS),.,.)
- #endif
--UnsharedLibraryTarget(wnn,$(UNSHAREDOBJS),unshared,..)
--LintLibraryTarget(wnn,$(SRCS))
-+UnsharedLibraryTarget(wnn7,$(UNSHAREDOBJS),unshared,..)
-+LintLibraryTarget(wnn7,$(SRCS))
- 
- 
- 
- instlib:: install
- 
- #if DoSharedLib
--InstallSharedLibrary(wnn,$(SOWNN7LIBREV),$(WNNLIBDIR))
-+InstallSharedLibrary(wnn7,$(SOWNN7LIBREV),$(WNNLIBDIR))
- #endif
--InstallLibrary(wnn,$(WNNLIBDIR))
-+InstallLibrary(wnn7,$(WNNLIBDIR))
- 
- #if ProfileLibJlib
--ProfiledLibraryTarget(wnn,$(OBJS))
--InstallLibrary(wnn_p,$(WNNLIBDIR))
-+ProfiledLibraryTarget(wnn7,$(OBJS))
-+InstallLibrary(wnn7_p,$(WNNLIBDIR))
- #endif
- 
- #if DoSharedLib
---- work/src/config/Project.tmpl.orig	Wed Oct 17 10:37:18 2001
-+++ config/Project.tmpl	Sat Oct 19 18:04:30 2002
-@@ -599,7 +599,7 @@
-      XWNMOJDSRC = $(XWNMOTOP)/jd
- XWNMOROMKANMSRC = $(XWNMOTOP)/romkan_m
-   XWNMOINCLUDES = -I$(XWNMOROMKANMSRC) -I$(WNNINCLUDESRC)
--      XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn_m.a
-+      XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn7_m.a
-  XWNMOLIBRARIES = $(XWNMOJLIB)
-       XWNMODEFS = $(XVERSION) -DUSING_BUSHU
-      XCOMMONDIR = $(IMTOP)/XClient/Common/src
---- work/src/config/X11.tmpl~	Wed Oct 17 10:37:18 2001
-+++ config/X11.tmpl	Sat Oct 19 18:08:32 2002
-@@ -599,7 +599,7 @@
-      XWNMOJDSRC = $(XWNMOTOP)/jd
- XWNMOROMKANMSRC = $(XWNMOTOP)/romkan_m
-   XWNMOINCLUDES = -I$(XWNMOROMKANMSRC) -I$(WNNINCLUDESRC)
--      XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn_m.a
-+      XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn7_m.a
-  XWNMOLIBRARIES = $(XWNMOJLIB)
-       XWNMODEFS = $(XVERSION) -DUSING_BUSHU
-      XCOMMONDIR = $(IMTOP)/XClient/Common/src
diff --git a/dev-libs/wnn7sdk/files/wnn7sdk-malloc.patch b/dev-libs/wnn7sdk/files/wnn7sdk-malloc.patch
deleted file mode 100644
index 0a0ce4337080..000000000000
--- a/dev-libs/wnn7sdk/files/wnn7sdk-malloc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Wnn/jlib/js.c.bak	2005-01-20 12:33:10.000000000 +0900
-+++ Wnn/jlib/js.c	2005-01-20 12:33:10.000000000 +0900
-@@ -159,7 +159,7 @@
- */
- 
- 
--extern	char	*malloc();
-+extern	void	*malloc();
- 
- #include <stdio.h>
- #include <ctype.h>
-@@ -199,7 +199,7 @@
- #include "../etc/pwd.c"
- 
- 
--char *malloc();
-+void *malloc();
- 
- typedef struct _host_address {
- 	int address_len;
diff --git a/dev-libs/wnn7sdk/files/wnn7sdk-qa.patch b/dev-libs/wnn7sdk/files/wnn7sdk-qa.patch
deleted file mode 100644
index a41223af8e6f..000000000000
--- a/dev-libs/wnn7sdk/files/wnn7sdk-qa.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -Naur src.orig/Wnn/etc/msg.c src/Wnn/etc/msg.c
---- src.orig/Wnn/etc/msg.c	2001-10-17 10:37:17.000000000 +0900
-+++ src/Wnn/etc/msg.c	2008-11-22 10:38:22.000000000 +0900
-@@ -148,6 +148,8 @@
- 	    <message id>\t<message>
- */
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include "commonhd.h"
- #include "config.h"
- #include "dslib.h"
-@@ -156,7 +158,7 @@
- 
- 
- static char *
--bsearch(ky, bs, nel, width, compar)
-+a_bsearch(ky, bs, nel, width, compar)
- char *ky;
- char *bs;
- unsigned long nel;
-@@ -244,7 +246,7 @@
- 		return(NULL);
- 	if (cd->msg_bd == 0 || cd->msg_cnt == 0)
- 		return(NULL);
--	bd = (struct msg_bd *)bsearch(id, cd->msg_bd, cd->msg_cnt,
-+	bd = (struct msg_bd *)a_bsearch(id, cd->msg_bd, cd->msg_cnt,
- 		sizeof(struct msg_bd), _search);
- 	if (bd == NULL)
- 		return(NULL);
-diff -Naur src.orig/Wnn/jlib/jl.c src/Wnn/jlib/jl.c
---- src.orig/Wnn/jlib/jl.c	2001-10-17 10:37:17.000000000 +0900
-+++ src/Wnn/jlib/jl.c	2008-11-22 10:18:36.000000000 +0900
-@@ -143,6 +143,7 @@
- #include "commonhd.h"
- #include "config.h"
- #include <stdio.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #ifdef SYSVR2
- #   include <string.h>
-diff -Naur src.orig/Wnn/jlib/js.c src/Wnn/jlib/js.c
---- src.orig/Wnn/jlib/js.c	2001-10-17 10:37:17.000000000 +0900
-+++ src/Wnn/jlib/js.c	2008-11-22 10:27:04.000000000 +0900
-@@ -162,6 +162,7 @@
- extern	char	*malloc();
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <ctype.h>
- #ifdef UX386
- #include <X11/Xos.h>
diff --git a/dev-libs/wnn7sdk/metadata.xml b/dev-libs/wnn7sdk/metadata.xml
deleted file mode 100644
index c921b96adf6c..000000000000
--- a/dev-libs/wnn7sdk/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild b/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild
deleted file mode 100644
index 455ccb1d772e..000000000000
--- a/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Library and headers for Wnn7 client"
-HOMEPAGE="http://www.omronsoft.co.jp/SP/pcunix/sdk/index.html"
-SRC_URI="ftp://ftp.omronsoft.co.jp/pub/Wnn7/sdk_source/Wnn7SDK.tgz"
-
-LICENSE="freedist"
-
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-# x11 is required for imake
-DEPEND="x11-misc/imake"
-RDEPEND=""
-
-S="${WORKDIR}/src"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-malloc.patch"
-	epatch "${FILESDIR}/${PN}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-gcc4.patch"
-	epatch "${FILESDIR}/${PN}-qa.patch"
-
-	# Fix path to point to Xorg directory
-	sed -e "s:X11R6/::g" -i config/X11.tmpl || sed "sed 1 failed"
-
-	sed -i -e "/CONFIGSRC =/s:=.*:= /usr/$(get_libdir)/X11/config:" Makefile.ini || die "sed 2 failed"
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
-			SHLIBGLOBALSFLAGS="${LDFLAGS}" \
-			World -f Makefile.ini || die "make World failed"
-}
-
-src_install() {
-	dolib.so Wnn/jlib/*.so* || die "dolib.so failed"
-	dolib.a  Wnn/jlib/*.a   || die "dolib.a failed"
-
-	insinto /usr/include/${PN}/wnn
-	doins Wnn/include/*.h || die "doins failed"
-
-	dodoc README
-}
diff --git a/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild b/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild
deleted file mode 100644
index e9c8516d8c5a..000000000000
--- a/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Library and headers for Wnn7 client"
-HOMEPAGE="http://www.omronsoft.co.jp/SP/download/pcunix/sdk.html"
-SRC_URI="ftp://ftp.omronsoft.co.jp/pub/Wnn7/sdk_source/Wnn7SDK.tgz"
-
-LICENSE="freedist"
-
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-# x11 is required for imake
-DEPEND="x11-misc/imake"
-RDEPEND=""
-
-S="${WORKDIR}/src"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/${PN}-malloc.patch"
-	epatch "${FILESDIR}/${PN}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-gcc4.patch"
-}
-
-src_compile() {
-	make World -f Makefile.ini || die "make World failed"
-}
-
-src_install() {
-	cd ${S}/Wnn/jlib
-	dolib.so *.so* || die
-	dolib.a  *.a   || die
-
-	cd ${S}/Wnn/include
-	insinto /usr/include/${PN}/wnn
-	doins *.h || die
-
-	dodoc ${S}/README
-}
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index e3e0fd70b5f6..4179594b9cb1 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -3,6 +3,7 @@ DIST xapian-bindings-1.4.10.tar.xz 1125168 BLAKE2B cb864021362098243993560724a66
 DIST xapian-bindings-1.4.11.tar.xz 1125716 BLAKE2B 0fd4204b4d18c04e017385f5eb116df68daa2f76f528f2b1770e61e5ab5062498aed6ccb57f51ac26ced58912d41c5f5a6f076e0f721a7eb1c3f83e01f2b9523 SHA512 326b08b9959143b92e6c10bd9b6b107ce2779e6ef1a3b5570abd07802a5988dd7df4e890d820f7da355f9f9e64df9a3ae08a0664d70d10ba6f876fca3dc44ecd
 DIST xapian-bindings-1.4.12.tar.xz 1132048 BLAKE2B 56ab098a4d2da4de7e8be2a07581f57957d03cb84b31878c5f449d267060aa620a887f79c968f0ec28cb3a2c9f1f77f8e9e8d29e052c228109b71b0c137d7b71 SHA512 08190a70fe2548be50d82192f94158fd5d6839534b5ba7e0fdbcec7e99df29f0be6517603e7a66a474dffef94ea6bd2e6b7a3315717056687c6a205c25908b45
 DIST xapian-bindings-1.4.13.tar.xz 1132592 BLAKE2B f9498f67da907fba6f58209000bd8056c6654ea53d79806a53d8b17bfedbcb2afb1b91da189feab2bdfd39a3749d4ac20a21ed17c09b99345f575e705f125968 SHA512 20f5f8842e401ba1c1407f336d1a03fa8bc6faa1fcc9533bad1772644ad3ae878a51f10c2f7810f89e3f14683a73c0c089601af548cdf3fbe7feeead4d2d21d9
+DIST xapian-bindings-1.4.14.tar.xz 1132008 BLAKE2B 3057f8f98cfd11e82555df4b554ad1ffed793ea92bf0f077ef4a495d09250da47116d76ded0deb07621f3b14ddd7f653aa0bb19add01d88fe077e637bee21ec4 SHA512 6d35c6c011c6d841254934f4dd59f4a2b842fe826af108e526cde9acbccec67b43517974331b21cbee5e828d0743aa5b9b973a96e1940065fbcfc342b8f23ead
 DIST xapian-bindings-1.4.5.tar.xz 1118884 BLAKE2B 507b06f0121e5a56224250bfe7b19795eb9fd2fba977d12022d054e7b832fd70af70085ad576dab41efcde261f9ecd48179646f1ea67aaa266fb6272358eb69a SHA512 e39ece495e25077990db3d06554306567c52c6f45ad55a65005cb97e18086ee18947e41d0d612157b891b61e015881385bcb082a03aa0c6452565e90d09e8275
 DIST xapian-bindings-1.4.7.tar.xz 1121700 BLAKE2B f8492113b76aba322c975aa2b957a627a32e5209d8b79f435dc85c899cf14619af6165265e624e2ba8806f3c91dd35d71d98c4a47f5d6f4fba1b7fb83700c0d0 SHA512 c904cd3abf19d68495b0487ea77265fdc92a3cd8b1c2437b89034efd349ce41198bbc4abca49f259f71a1ba0fd269b2cf9b6dd4c1607678a73cbed4de9c5a1d5
 DIST xapian-bindings-1.4.8.tar.xz 1123812 BLAKE2B 5aa496ff3cfe06a40fa8db6a04cdc9041f4a0d9f12c7a61565f10c7d360490a7c8a7c745d91c9eda45b9d9bc58bd6a2bbae02aa9dd7ff1949ac59f7e09b090df SHA512 f979c32b096ecdc7a71b2bd032c6d0e7131f3d304e47e44005989ca79ea1f940c39626c60a8e52ff3cdb2cb380aa5ddf82a99bae08e06629c0bd47d8e0bfa7cc
@@ -12,6 +13,7 @@ EBUILD xapian-bindings-1.4.10.ebuild 6533 BLAKE2B aca3605ecf7afbfcd5ac80ced0aefc
 EBUILD xapian-bindings-1.4.11.ebuild 6533 BLAKE2B 3075c874eca6c1aa5eed1c4deb5c752163de860127a9f2aceae8eec12203dddef413374a1299816c8da79450d041658a1520cad611b1e03178d3ab0475602a71 SHA512 762066aeaf088ec094ebbed3ab487b77c105f57f84f051e0b4616bdda0c6c4a6c44acdbc130a0cf4288342f8133e836d182bcfb861ed058a81bf6da5656f40b9
 EBUILD xapian-bindings-1.4.12.ebuild 6533 BLAKE2B 3075c874eca6c1aa5eed1c4deb5c752163de860127a9f2aceae8eec12203dddef413374a1299816c8da79450d041658a1520cad611b1e03178d3ab0475602a71 SHA512 762066aeaf088ec094ebbed3ab487b77c105f57f84f051e0b4616bdda0c6c4a6c44acdbc130a0cf4288342f8133e836d182bcfb861ed058a81bf6da5656f40b9
 EBUILD xapian-bindings-1.4.13.ebuild 6533 BLAKE2B 3075c874eca6c1aa5eed1c4deb5c752163de860127a9f2aceae8eec12203dddef413374a1299816c8da79450d041658a1520cad611b1e03178d3ab0475602a71 SHA512 762066aeaf088ec094ebbed3ab487b77c105f57f84f051e0b4616bdda0c6c4a6c44acdbc130a0cf4288342f8133e836d182bcfb861ed058a81bf6da5656f40b9
+EBUILD xapian-bindings-1.4.14.ebuild 6536 BLAKE2B 94ec9999823108ba7a01d65a9faec5975db1f7cb0fa6c5537f16114d793123532352f2dc62d626d2c97f203b6c3b541ca14bba1fb6ef299a27fc9b9027f8e16a SHA512 3750c7e13ea753cc3d1dbf4aa8356f65bf28ba4bcaccdf4102a8a4a004acc1a994df967aeb6558860dab97a9ab8f8d640779ba3ef4fade6ee7ccc681f99c7c8c
 EBUILD xapian-bindings-1.4.5.ebuild 6491 BLAKE2B 29b71eec911c53f3377c1b1ed6bbfc6fda2357b5311f50b28eea850fca465a39e8131e44db9ae72ab040c0d1938e43f987922a6555edc0bf52b3b2f0180505b3 SHA512 f5a8731bbde8be861dcef0c544c4e2b8c12863aa4c4378c055fab2f4b2d4b7b30e63a54bb4490c0379ead90360e60cc5bdc101ca46186a43f573d3436d6184a9
 EBUILD xapian-bindings-1.4.7.ebuild 6493 BLAKE2B a48e6fa3bda13e2d0b43bf3cccbdc3dc23ebd53d00a2462351d11cac50003c15f3f409fd8514bca1fc8631ba6f61cffc0dd62fe1cb1e19f5cc6fbc82cd492249 SHA512 e04b3df07efa3a2fad53ebea36d05ca1f488e05b712f2c785d2b9ed37e9334a05207363a0d8dd260b0050d50bd37fbc9e57ad3d295e2bbc697b7c5cbebb6c296
 EBUILD xapian-bindings-1.4.8.ebuild 6498 BLAKE2B 1f69dae02f5e48291349b97022797062d2bc46783ff4cad3f82e87ac4c5e330ba391beaf44ccdf7360fb23349c4dcf51fab261fb279b9336db9644af7777e685 SHA512 35ca5ee0609d4c11d93418f2bb8dbabda6fe99909bd6d78cfb134868ca6d2b0047065b1b1beb2ea8e4a421ee32345ed361e389b152b10db8e968ee113ac9b248
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
new file mode 100644
index 000000000000..dcc5b928a135
--- /dev/null
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_REQ_USE="threads(+)"
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+PHP_EXT_NAME="xapian"
+PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
+
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_OPTIONAL="yes"
+
+inherit java-pkg-opt-2 mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
+
+DESCRIPTION="SWIG and JNI bindings for Xapian"
+HOMEPAGE="https://www.xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="java lua mono perl php python ruby tcl"
+REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( $(ruby_get_use_targets) ) )"
+
+COMMONDEPEND=">=dev-libs/xapian-1.4.14
+	lua? ( dev-lang/lua:= )
+	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:=[-threads] )
+	python? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+	)
+	ruby? ( $(ruby_implementations_depend) )
+	tcl? ( dev-lang/tcl:= )
+	mono? ( dev-lang/mono )"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.6 )"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}/${P}"
+
+has_basic_bindings() {
+	# Update this list if new bindings are added that are not built
+	# multiple times for multiple versions like php, python and ruby are
+	return $(use mono || use java || use lua || use perl || use tcl)
+}
+
+php_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_copy_sources
+}
+
+php_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(php_get_slots))
+	multibuild_foreach_variant "$@"
+}
+
+ruby_copy_sources() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_copy_sources
+}
+
+ruby_foreach_impl() {
+	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
+	multibuild_foreach_variant "$@"
+}
+
+pkg_setup() {
+	use mono && mono-env_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			# Unfortunately required for php-ext-source-r3_createinifiles().
+			mkdir "${WORKDIR}/${php_slot}"
+		done
+	fi
+}
+
+src_prepare() {
+	use java && java-pkg-opt-2_src_prepare
+
+	# https://trac.xapian.org/ticket/702
+	export XAPIAN_CONFIG="/usr/bin/xapian-config"
+
+	if use php; then
+		php_copy_sources
+	fi
+
+	if use python; then
+		python_copy_sources
+	fi
+
+	if use ruby; then
+		ruby_copy_sources
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	if has_basic_bindings ; then
+		local conf=(
+			--disable-documentation
+			$(use_with mono csharp)
+			$(use_with java)
+			$(use_with lua)
+			$(use_with perl)
+			$(use_with tcl)
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--without-ruby
+		)
+
+		if use java; then
+			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+		fi
+
+		if use perl; then
+			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
+			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
+		fi
+
+		if use lua; then
+			local -x LUA_INC="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_INC lua)"
+			local -x LUA_LIB="$("$(tc-getPKG_CONFIG)" --variable=INSTALL_CMOD lua)"
+		fi
+
+		econf "${conf[@]}"
+	fi
+
+	php_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-python
+			--without-python3
+			--without-ruby
+			--without-tcl
+		)
+		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
+			myconf+=(
+				--with-php
+				--without-php7
+			)
+			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
+			myconf+=(
+				--without-php
+				--with-php7
+			)
+			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
+		fi
+
+		econf "${myconf[@]}"
+	}
+
+	if use php; then
+		addpredict /usr/share/snmp/mibs/.index
+		addpredict /var/lib/net-snmp/mib_indexes
+
+		php_foreach_impl run_in_build_dir php_configure
+	fi
+
+	python_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-ruby
+			--without-tcl
+		)
+		if python_is_python3; then
+			myconf+=( --with-python3 )
+		else
+			myconf+=( --with-python )
+		fi
+
+		# Avoid sandbox failures when compiling modules
+		addpredict "$(python_get_sitedir)"
+
+		econf "${myconf[@]}"
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+
+	ruby_configure() {
+		local myconf=(
+			--disable-documentation
+			--without-java
+			--without-lua
+			--without-csharp
+			--without-perl
+			--without-php
+			--without-php7
+			--without-python
+			--without-python3
+			--with-ruby
+			--without-tcl
+		)
+		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
+
+		econf "${myconf[@]}"
+	}
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir ruby_configure
+	fi
+}
+
+src_compile() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake
+	fi
+
+	if use python; then
+		unset PYTHONDONTWRITEBYTECODE
+		python_foreach_impl run_in_build_dir emake
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake
+	fi
+}
+
+src_test() {
+	if has_basic_bindings ; then
+		default
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake check
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake check
+	fi
+}
+
+src_install() {
+	if has_basic_bindings ; then
+		emake DESTDIR="${D}" install
+	fi
+
+	if use java; then
+		java-pkg_dojar java/built/xapian.jar
+		# TODO: make the build system not install this...
+		java-pkg_doso java/.libs/libxapian_jni.so
+		rm -rf "${D}var" || die "could not remove java cruft!"
+	fi
+
+	if use php; then
+		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+		php-ext-source-r3_createinifiles
+		# php-ext-source-r3_createinifiles() changes current directory.
+		cd "${S}"
+	fi
+
+	if use python; then
+		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	if use ruby; then
+		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
+	fi
+
+	# For some USE combinations this directory is not created
+	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
+		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die
+	fi
+
+	dodoc AUTHORS HACKING NEWS TODO README
+}
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index ec9e16f6d157..65ac1bb03e1f 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -4,6 +4,7 @@ DIST xapian-core-1.4.10.tar.xz 2973780 BLAKE2B 6ef86a4c02e6721f434e33ea27a37ddac
 DIST xapian-core-1.4.11.tar.xz 2975524 BLAKE2B c912e527ef1454c0b4b3e1aedd91a8a63d2e0b2dd186759eac00d6a0f64104669467c6c5b0bf3f132d4fa04bb2ef72d07ccfe92137a3360ba699e3420ee8bea4 SHA512 72ab7b0c774390f38319d241689b2dc3c2837fbbf933616574f6ad167f14a25c2eff747910022065508dc7c44f806dc2b71dae80a1b4f1f47e1675fb951bc785
 DIST xapian-core-1.4.12.tar.xz 2979052 BLAKE2B 26b20b22105493679052827a5e6b2890da922cdaa97fca1266b26f6ddb3de6b76d491c37ca10210ef5119ce4250700d87fdd22553456958f6869bc3af51b78ae SHA512 230b39e012366267cf5ea09d01d3b463818c0d05861b8c8643bc6fc238be21bd3f4862adeba864b4af2962b1c0748b3d380dfe845da467f5164b0d938288c430
 DIST xapian-core-1.4.13.tar.xz 2985532 BLAKE2B ffe40998f62625eb9b2ee0ebfecbbccaa1838d27229ff16e88a545a6ba514cb61d647c60560c5fcb425588511d1c03836eeda3dfd61a063e96e4bc88b9ca8692 SHA512 aa7b2262dd9d631339131e814f7c96acd85e386a4c4b6331eff86fc7227663589132779bd6b8c340a2b6f19bd66f8b53acbbe5bc985c74f9bdbe3ce3ccf4c1e7
+DIST xapian-core-1.4.14.tar.xz 2970624 BLAKE2B 5bfa5ab36ad4626fcc9a214427f88bdf55e60166939db3a65d3118b426b0ec6754efc10dbcf32456e033292eba3b29f7500679f69a49df15d40c4111322249ed SHA512 c08c9abe87e08491566b7cfa8cda9e2a80e4959a647428b6d82bce7af1c967b4cb463607ffb8976372a980c163923ced36117a66e0b5a1f35659393def3d371b
 DIST xapian-core-1.4.5.tar.xz 2810612 BLAKE2B 7784e69e3ca064751d829173949fcde65661c2c2070fdc8392cf2b6d40874a3e5b1265e61f25dd39b33e179b3fe3842b67f33a55523c3a18e9b65528e6a23a1e SHA512 cff97a856a406583ca81164ddb704a0eeae7d8d6f94ce3b3f53d5208d657423e87dd06bdc7acb5e5904765bce1cefbc98365cde315c1d46f7b18cfba7b022ae6
 DIST xapian-core-1.4.7.tar.xz 2874172 BLAKE2B 917a35ca717ed4437f4a617ce0b6ac07d5936e07aac6bfa9d6878c12ed0c38e7ca994ad943b6dc7a5cd2fe131a445c5a7859f2286c2201dd048020569ce1a0bf SHA512 9e77a78bd63036966ebb9bbed91e36fef17b37c9465c8d4b7dc8041f0e24b040e6520de645babfeeade952771d145176a204328718cfa8bc2291bb6fdbe840d2
 DIST xapian-core-1.4.8.tar.xz 2880432 BLAKE2B 8468a33614d8c7617755cfe4cc79e72ab42612a79be9fb684525e268efe80c42ce902a60a44dc5548c70b719d752e15927ce24b4ab457905022ae806bffb1f11 SHA512 9ed1f34ec1bf53a4dc628ebb8d080af79a4ac6a315bf1ae52441f0ac3a63e5478ed02887382116b28157b926e685fdc730489426edce560aa4bba27cb7295e48
@@ -14,6 +15,7 @@ EBUILD xapian-1.4.10.ebuild 1880 BLAKE2B 0bec305e70baf1405b213aa35fb2be9dea8dbe3
 EBUILD xapian-1.4.11.ebuild 1844 BLAKE2B 0ef54276319620157c37d20dd624ec50245d04f46d480e54fc1306491ff7b9989f426ae0659095efc0278e3114f19ab96630896e0ca6ac0f4c1059b1c915f33b SHA512 58d8597e88cb312251661f469c3ee5711e19ad39b6c7de0e0ca6756b2d1105dd3894229c854d8f59dcd39d61c58b17294d90b0904abbd18b7f60a85834f6ad61
 EBUILD xapian-1.4.12.ebuild 1846 BLAKE2B d4a59440e986bfeb590a7176d829f74bfdf6778046e9a5a9274f29cdc320125283aa0f78febbddc18a45312a37be86182b69d8ad660e1e3d9bba050aeab26b18 SHA512 559b4ed1ac024a7cf3095382a245cc1b21aa40e57c0559a3bdfbb19a4678af6b6d3b8881e3c0bc874545b9bf056fc57cb85776c6ca476f1c636332d1fe9a7c7f
 EBUILD xapian-1.4.13.ebuild 1805 BLAKE2B b9bc48b5a638640d06558cb64b8ee69f85b34339772e9c417bd3028d932057bec33405f6d1c165d1c2cf495405f4e38ea6375b577cab5f48a212e68b90b51183 SHA512 679ac62036d6a4832e906a4677a0e2812a8ccb34c026a7782defb9096f264d42c6c5dd9d15b61faab53a8cf714dd1957b435e446d59d4d4db5a0bfdca13b94f0
+EBUILD xapian-1.4.14.ebuild 1805 BLAKE2B b9bc48b5a638640d06558cb64b8ee69f85b34339772e9c417bd3028d932057bec33405f6d1c165d1c2cf495405f4e38ea6375b577cab5f48a212e68b90b51183 SHA512 679ac62036d6a4832e906a4677a0e2812a8ccb34c026a7782defb9096f264d42c6c5dd9d15b61faab53a8cf714dd1957b435e446d59d4d4db5a0bfdca13b94f0
 EBUILD xapian-1.4.5.ebuild 1852 BLAKE2B ba4dc37a4fcbfd32bd26a02c38dce4fe10667335c54b06184128b2fa9d062ddca7550f9e655b487f66c49c3ea9990353c7998e632de5d851499268e29388bfa5 SHA512 d7375562ddee64ea9b414eafffe3dbb168497000aa6b13613dfd2163a6bb1c05658afa85d4c5dd1177edd2be8af7f82e6ea289542a4e90896fabaaf37d9e7a92
 EBUILD xapian-1.4.7.ebuild 1853 BLAKE2B 1463f8d478722ac2dbf314df8bfbd66fcc6d15dcf9c27ed417afaa415c9bd780b7902c916145b213b67f7aaba59823b197943f4ff1aa35c1e619f618364d86e4 SHA512 cd76e9a9306d5dc9e34cfc5aca0d7f90c90da32b9bd48495cd16531af43e4f1c8cfb3f3048514589a36a51b6c79b54ac092408d0709d2a501ad56802abd15b08
 EBUILD xapian-1.4.8.ebuild 1860 BLAKE2B d613a766a6c6751176e41563e38722bce17775e9c0a8a088ecd76bdbbe245eb99e8cbbfb5b5bfd93af6951fbd2caf2743f6103932d427e301a8aeffedf3be229 SHA512 143942fda76f3fdbecf939e53e7d9eeb71f3a5007ead97a5f345d35daa00aed4409aee773f4a82d2982c4860a10a8a29d7e867e098c074b0ce4ce6f341a32870
diff --git a/dev-libs/xapian/xapian-1.4.14.ebuild b/dev-libs/xapian/xapian-1.4.14.ebuild
new file mode 100644
index 000000000000..26a3827b326f
--- /dev/null
+++ b/dev-libs/xapian/xapian-1.4.14.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils multilib-minimal
+
+MY_P="${PN}-core-${PV}"
+
+DESCRIPTION="Xapian Probabilistic Information Retrieval library"
+HOMEPAGE="https://www.xapian.org/"
+SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/30" # ABI version of libxapian.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
+IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +inmemory +remote"
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local myconf=""
+
+	if use cpu_flags_x86_sse2; then
+		myconf="${myconf} --enable-sse=sse2"
+	else
+		if use cpu_flags_x86_sse; then
+			myconf="${myconf} --enable-sse=sse"
+		else
+			myconf="${myconf} --disable-sse"
+		fi
+	fi
+
+	myconf="${myconf} $(use_enable static-libs static)"
+
+	use inmemory || myconf="${myconf} --disable-backend-inmemory"
+	use remote || myconf="${myconf} --disable-backend-remote"
+
+	myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix="
+
+	ECONF_SOURCE=${S} econf $myconf
+}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/xapian/postingsource.h
+	/usr/include/xapian/attributes.h
+	/usr/include/xapian/valuesetmatchdecider.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/version.h
+	/usr/include/xapian/types.h
+	/usr/include/xapian/positioniterator.h
+	/usr/include/xapian/registry.h
+)
+
+multilib_src_test() {
+	emake check VALGRIND=
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		rm -rf "${D}/usr/share/doc/xapian-core-${PV}" || die
+	fi
+
+	dodoc AUTHORS HACKING PLATFORMS README NEWS
+
+	find "${D}" -name "*.la" -type f -delete || die
+}
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 1a3b7d84dbc2..17d6be86c55a 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -2,6 +2,6 @@ AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19
 AUX xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1 SHA512 04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5
 AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aaf6c637ba04761c12c5d8b227d466575b056d64846bced57651c70926a78403da16fd0e86ba4b267dfe70a144bcf3cced3d1536 SHA512 c5c0e753d22b61fa5047cef3748cf3baaf30f4c6ba4d89152d856f2f65fe311841ea590ec0c9291347b5b7f96047f3e9c7b524798ac2ac96bcfbc8b40d634596
 DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
-EBUILD xerces-c-3.2.2-r1.ebuild 2946 BLAKE2B c8302b268d7c0de7b7eda1a74ea30150e38ab3c3c31b023d9490cd575da285f9488a31d31d8c34598b85a3841e743ac28770d6a2891e8bfbc4406c31f0a34d8b SHA512 a0fe1b547c8fa08dac2fa7be0bb1cd018930f2a74b0d21dc8cf58b05980646613a133e3bb2e60b91666f3cf6612ac35b0db4e30870531ba567c191797c0c0f23
-EBUILD xerces-c-9999.ebuild 2858 BLAKE2B 9deec4677f531579e1940474396adf1f7f8883d551a95890dbe36a136568d71bb2b84049727f2dbe6fbd3222abe775b3e690e9767af9b5e3f52a4343766b66e7 SHA512 d9294f193c5f2fac2c3d78a49b228ae5eac0e6d9e7d8266af65a5635df9f41eddec73014b108ae01e8efb0eadbda78a0e044f08c00603a4173d65aceb1a48265
+EBUILD xerces-c-3.2.2-r1.ebuild 2973 BLAKE2B aa7e34197069af717b12de5d2a6b50454d3a71838718a32a4232454736f8bb076ae6792c2aa1800205768c044a35b5070895ea6be05d74cbcc42d864a8bc6e1b SHA512 3d10a580f5aa3cab581b6b766d5c15140a7a5928e008a8cd8780e71ab58b57bec988f206a6d1947fed5cb7ab2bb02afd6501eb38d8fae8de9b1c88b2ed923e8b
+EBUILD xerces-c-9999.ebuild 2885 BLAKE2B 9c708f9ecba39d4c466a8a461169e58404acd4967855c4d5c2e15baa0a0f4ca5d52b00f935cfd4696bfba305d8d7d8ac67dc549b421c98eb2add67641ec433de SHA512 bcab58b4292237e7d71b284d058f0a3fa1b50c1a4b9c7d26f7b4458fa9ae75a6ec6313baaa9ce15885c65d12e6a43d428b26cdf3e73f133a23e9e7a56a1b82f0
 MISC metadata.xml 768 BLAKE2B fabc57ee82dc82444461b1ec25ebda2af68a8eb00c6f44cc24de70daf96fd245acafc04d1bb75ffbb780e1b0877d7862a119264b81402df2e9c2f20ff252a166 SHA512 e447b67df2d7e7c3fb7cddc1dfeaf7c4da734ba71b1b0138abf63f8d0c5c42d0f2dd8cf6a281d4a88da32f4c073d81fab91f3fbca92d50d6bc9855a64814784f
diff --git a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
index 1276aaf55f59..a800f146f65a 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
@@ -21,6 +21,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads"
+RESTRICT="!test? ( test )"
 
 RDEPEND="icu? ( dev-libs/icu:0= )
 	curl? ( net-misc/curl )
diff --git a/dev-libs/xerces-c/xerces-c-9999.ebuild b/dev-libs/xerces-c/xerces-c-9999.ebuild
index d431cd570770..58bfc849abd0 100644
--- a/dev-libs/xerces-c/xerces-c-9999.ebuild
+++ b/dev-libs/xerces-c/xerces-c-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
@@ -21,6 +21,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads"
+RESTRICT="!test? ( test )"
 
 RDEPEND="icu? ( dev-libs/icu:0= )
 	curl? ( net-misc/curl )
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index 71d97313092f..f0a41fe540b6 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -2,6 +2,6 @@ AUX xmlrpc-c-1.32.05-Wimplicit.patch 593 BLAKE2B d26e051b264d2db4c52e192a5a904c4
 AUX xmlrpc-c-1.39.11-cplusplus.patch 374 BLAKE2B cacbc4fc8737d5e3f675a9579281fb44367fab1082340162e9d9929f6b829c612071b8535b36fa41a4f22488e0717febaaef64e4c51e7abf4fc46772aead1278 SHA512 b5182181f7c0ffa150c977b6e206c2fbfdcd979369dbf55b2c4197378edb7136629df02bb7cc5f89df522451fef3c04a7b901dc3f34bc895f55020f8d5e03ef6
 DIST xmlrpc-c-1.32.05.tar.gz 769040 BLAKE2B 6c7475114ed299ea924a4fc8da4c01a6153d03a5106c812c8e0c6cae56478b9ce4ec57a41c858bf807f7a86b2053492d9c7ea47e4083870e0606cdf320cac0cb SHA512 40813ad97010684e346ce4f286d9d7314547572f8681cf99d4c3c36cb7aa38b1cb72b84d63ab46e44282dc2bd95b85dbb022e3039700caa939469c6f7bf08d1f
 DIST xmlrpc-c-1.39.11.tgz 815463 BLAKE2B 7d169d51835e64e5ac822c48b1a6d7622293c1ce1e7379985ebf6c10f3ab331c55eeff9f655cf914c4cf7e3c107fbdbd741d664489f4ad7aadb5e576ceb383c2 SHA512 13e7ddf5264436671437c0bcd698380baca35c4469f592edf79cb4cafda254fe8207ecb992ee728ed20ec70457a20bd0cf8e180ce5cf0561a38a21f1e588f584
-EBUILD xmlrpc-c-1.32.05-r1.ebuild 2918 BLAKE2B c0bb65ad3084de14fb8ed56c0cacc77d6b06ed24ae33728a3573d0608e8d3d15a10c21087e5a17ac2dedf99fd5a618847130f21f773563b620e1798927373d98 SHA512 7ea67e4d801c58a632a181adb0519ce9d850ce33669cb48bca2b33309d6217ffb5eb9331cf68c2593aaca95eecd05669766ce2235dd2cadf3fce13375a075b15
-EBUILD xmlrpc-c-1.39.11-r1.ebuild 1896 BLAKE2B 861badc0c411603c14b26087998204ce718b7ab5f5eaf79221585237a51b49fe1553c4d51df022077c0b5fbe1a4453c0bbe2913a6b274aecde4df016ad9b1d8b SHA512 2d9589b90c1b47287a15e1d2ded30cbba9b3bd99c3057c6a9d988e2ea88d3787fcec477d02570d4d7ae28a7c5730a5c98394fd8f1d1ec32b21c145fcad01b21d
+EBUILD xmlrpc-c-1.32.05-r1.ebuild 2942 BLAKE2B 162c3f394f78068b2c2fb7f7b6b853362400942a364c036aa00271a8b60ee525b5abecae37ef4f8fb6f3bf415aae2ed029d636de7b5fe9e8e3f640cecf0aae7f SHA512 86078c6d993ef5075893a882467b05b13fbf61ad79a7123b0652223fd3cafaf779960b367f99c3bf47d44128ebf20916abf56fc088841218e7e02d6b604ab5a6
+EBUILD xmlrpc-c-1.39.11-r1.ebuild 1920 BLAKE2B d0144f58a2392e63a877ff9bbe5eaf78efae97c8adf5f369e4012edb72a033c52cd908e37eabc232ba0ce79666601a0aee13490a11a25d014c8313676bf9786c SHA512 5b44df9a75b8b445ca79edb90260dfb5503201eb379e9566dc56e11c4c5df2a7abee92a983001a92602facc39bfabb435ff6315e699bf8a742e254f859e80c90
 MISC metadata.xml 669 BLAKE2B 04f88706453ca3f6c7960b6a8d9fa0201cc620386d00f5e709070095e58f689ad7492d3b2a0effc9de985f642f55a347f3678f734170d36e141f1eca231612de SHA512 6009e48c681fd9a98054a37eb9ee78d87eff527d617094b55d6f3af6fe59f81328a03ccec47ab7fc1b4e54bdec50629b76b522e8943e2be43c1adf57e74caecb
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05-r1.ebuild
index a941bfed35c1..25571d06bc68 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -24,6 +24,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="abyss +cgi +curl +cxx +libxml2 static-libs threads test tools"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( static-libs abyss curl cxx ) tools? ( curl )"
 
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
index 71bcbc4488e5..6179400429a6 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.39.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="abyss +cgi +curl +cxx +libxml2 threads test tools"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( abyss curl cxx ) tools? ( curl )"
 
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 74ca4c019bf6..ec3085083e94 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,6 +1,6 @@
 AUX xmlsec-1.2.28-test.patch 2418 BLAKE2B e5cf92fd7f72be16d95fe67da99c96fc8e1bc8e7dadbfdbf5970ff7c148aa95868c2a4db8a03e86a2b67dd54c6bb71f0409bc4e075ad2b7148da1f489e672dee SHA512 48e72e197a23d4a0f3c7679dad438b1d9e140f2c9a311959748d432c543e4f48d32a52a4f65bd971d0263038cf6fde4a753e0eb2616ac6d5db092279cdc08b46
 DIST xmlsec1-1.2.28.tar.gz 1995599 BLAKE2B 5d90646d9a72024856da2638adb6d0d00d5142f8d3eaa5b12a993e2e6ae78ad49aab69822ebe331191bf1fc5b98431b85e113545aec84e2bb7d5c5add9028df0 SHA512 17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480
 DIST xmlsec1-1.2.29.tar.gz 1989360 BLAKE2B a0057ddf2d641745933f8d788c5358b4bb17892ed175ef11a9041a34ff1f91d0ffe6cb90316308805b5bc2157b9c2e211b37731ff8cfc7723a85f349543aa7a6 SHA512 07c3012179da4392f0a9d41a51ed51d692ca8b491310488b955d5fef0637f104d3f82374754b0ef175fadc663a8ca8c996178198c5dd77b3a8b34393d1482e4d
-EBUILD xmlsec-1.2.28.ebuild 1371 BLAKE2B fc6c926519bf9172d3bc4e868e2b97cde93a63cd170495d95141d4270ed7df1763196e3cf9d5f78204939c5470a4b93a0bdb944401da650432eca4c71c2d6c09 SHA512 b6f80d712fb05f116b8c62cfd65a4332360149031428e62a96b830af149c18769a427e20203efde0004c56220269a696ecc0597dde03a17b13e6cdba0c9874fc
-EBUILD xmlsec-1.2.29.ebuild 1332 BLAKE2B 3e447bf61a7a446f9c4ac70060070d5d29bacf089ae37d43ab2d6a43883a403e55e1c5034e19eefa448588e5018930fc34fcbfbdf421d61f9688898156d3b2d4 SHA512 716f2b2d210cd8e672d52d2bf78cbf3ea4e74cb93b18034258b0019f96b5605c07d50903b2d86c7498c81ff1e0a55357117e4ed3c5bfff84004b3f6a3cbfd501
+EBUILD xmlsec-1.2.28.ebuild 1398 BLAKE2B 577a2435ca1e9602124663b49ee1e26fde53ab7fc663cec6d1ba7b59bd59c4fb7d5a59639305bf14bfd344a5c78ae94be807511802e43ba824a2108b5dc0b684 SHA512 11992998c302c12264340cadeb23a6d57e41a824521dcc90bf98530855cd7143f651870529357684bffce2da5aa52925756731a17ce950df39f7e185e090db84
+EBUILD xmlsec-1.2.29.ebuild 1359 BLAKE2B 004a90178fd0fbea93a3424460ebfb8af3bdb19ec7a04902a222651953f9ae73c5ceb0b210776a58013b6238ce35e6e3b4d8ef0fe069a7fcf2712b4523121df8 SHA512 d864c1e1e87056688e8a83b3da041b2195deeb6ed0fdd2f9930bbf8caeeca2b5893e3b94f3b2f1d90d99293069c80086c0c3c3f0edfdbbebb7062d6fa4cf3523
 MISC metadata.xml 487 BLAKE2B 0e191be30487c618789a7eaf8c2ca9ba0e801649213674adc85e76a5402853055d384efb9d6b534099683de4b2935dafa613ac029fd810125993d039cf9caec8 SHA512 1be5c6aa74ba9542e7b4b85adb8dd743fbeb72b4fee345996ee1b5bc662d9455d910f00ca37b16e644f53039a346ef44afc5e49abba19c5f8d4d00cbdf37d660
diff --git a/dev-libs/xmlsec/xmlsec-1.2.28.ebuild b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
index a47903e5571f..e81558aad10c 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc x86"
 IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
 	gnutls? ( gcrypt )"
 
diff --git a/dev-libs/xmlsec/xmlsec-1.2.29.ebuild b/dev-libs/xmlsec/xmlsec-1.2.29.ebuild
index 1785b858fc66..547b993cd220 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.29.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.29.ebuild
@@ -13,6 +13,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
 	gnutls? ( gcrypt )"
 
diff --git a/dev-libs/yaz/Manifest b/dev-libs/yaz/Manifest
index 9621e2512cc1..94716349d684 100644
--- a/dev-libs/yaz/Manifest
+++ b/dev-libs/yaz/Manifest
@@ -1,4 +1,4 @@
 AUX yaz-3.0.47-icu-automagic.patch 899 BLAKE2B b6eafa42b369a76f085efb0b89424c4c182c1604a68bebd7f8fee47a925fdc859973bfceab912b8aeeef2aab288f326fadc0ba2fb63e6e13d047c9811ea326d4 SHA512 55185162a381ae3cb7a880568b2a0a04c1b2f7d8e579e1494df0c2047d021648bce15d223f99a36f59e8b1a14fea161a128a2c01ea7f0e5b2e167e09cf6f856e
 DIST yaz-3.0.53.tar.gz 2164681 BLAKE2B e42a97d63e031f14234258c7c44735a615ebc83774c1532d7e1b50f1f231dc933168e41a1b35a139ec193e694f6253336a666daad627a4aae9a0c7ffe34ca360 SHA512 537d54757e401c1b29ad2120209b2cd038f26ff7f43ffc3c1e22808e12a1580aedee3880478e951fd4b3057ca9af4a34afa2a64c0b8ffcbec24f76deb83ddc89
-EBUILD yaz-3.0.53.ebuild 1437 BLAKE2B b4187ddd63305758e9061ceeda4a587a5977cbc6c55748fd69260f786c6088676e87344f00b721f88dd1bda374dcfbcd628d1c1fdf3d181e111880bcd2ef985b SHA512 4b904ed96171ef485e2a9134add44ed368a7acfde4878933b0fd3b5ac607ee69815390a0a43790375cfce0e21e5364aee42dac5066d1dbb65163ae3b18d05282
+EBUILD yaz-3.0.53.ebuild 1391 BLAKE2B 80f8d7ed06350257a5d7d8796cd238df72cbfcb0393d7f3348f1c7114581486ed4731cdc97679d1e99e3c20a301b288fb8feabc4cfb0ae9be4726e4a0c3ee281 SHA512 b744dfca8224b9c57e244fd919584419feb6343a4c217a9b982e04681947beffe322b2fa68925e2cac9437f3046a517082989f76614c9093b5d42713d5c1c28e
 MISC metadata.xml 256 BLAKE2B 318bf6f45e4874d05ebcc06bd5a382e319a403f7b22f1b51bf1e04da415cafa199ce19e824b373cd38ad831c20d3ca3696d61cb68bda85b4c5c17d60ce32194d SHA512 60f3694b1a080bbe91b43f5164f21459526f0901618d68c8d77f942813ef8338b31cfbc585a73e56cbc5d8ab18f91ec9ad97814f6b98f6443b5ccf06fd68f4d5
diff --git a/dev-libs/yaz/yaz-3.0.53.ebuild b/dev-libs/yaz/yaz-3.0.53.ebuild
index 66af93b48754..028369d37be8 100644
--- a/dev-libs/yaz/yaz-3.0.53.ebuild
+++ b/dev-libs/yaz/yaz-3.0.53.ebuild
@@ -40,12 +40,12 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 }
 
 src_install() {
 	local docdir="/usr/share/doc/${PF}"
-	emake DESTDIR="${D}" docdir="${docdir}" install || die "install failed"
+	emake DESTDIR="${D}" docdir="${docdir}" install
 
 	dodir ${docdir}/html
 	mv -f "${D}"/${docdir}/*.{html,png} "${D}"/${docdir}/html/ || die "Failed to move HTML docs"
diff --git a/dev-libs/zlog/Manifest b/dev-libs/zlog/Manifest
index 36424960f715..bec934718e15 100644
--- a/dev-libs/zlog/Manifest
+++ b/dev-libs/zlog/Manifest
@@ -1,6 +1,6 @@
 AUX zlog-testsuite-flags.patch 599 BLAKE2B d94678371fb64eaf64d48c0d6980cde20bc9ccd3f0865a02c8f0374af553ff8db25601c5bd548e8f83bea1be80f8da2444669be621a4546710643c9d70e326ad SHA512 003c62b10274102dcec16c4064ff8cd93767bd34ac8c56e71cc07dec7d24a07e380341324f6d19141f43e6d8bffc3f4678a7b7ac493341e83bc237ab069ff164
 AUX zlog_no_werr.patch 497 BLAKE2B 506c3709043fa5d64475011dac251598d3d153bfdeb61947badc2d0937bbf62342370df3afba8e86a536ceb395376b311c7f5ea4f625ad24c2ef5b5c510492cd SHA512 5f5d343824a4d8ba02ce7e588b5e6a7aaf5465c1e76d1b26aa4f412d34d5a61d33a307d4d0521220267eaf883cb90ac382fb849fe406375f04c2a1ae9050c77f
 DIST zlog-v1.2.12.tar.gz 120048 BLAKE2B e9f48d8ee3e0bfc14674e96426f9343c27e0f666541b017a438800a6707bb158ca79f564e6cb10d953e4bff6dc839d76a3d3fc0f54c128bfb4b00e5fc86dbecf SHA512 4e1d773f33f9202702bb5e80f4dcc6f8ab28480a8515ad8b9562ee68703c065c2f18113124535c7163e240013ad121a6ce311a0fc04ac6c32971509ec33615ec
-EBUILD zlog-1.2.12-r1.ebuild 719 BLAKE2B e4f403206a4368f222208845079bc7ccb5ffb7f0cfe358797818afb96bb1754cf81ca714c63a0c300c36d04422870d835208d3ff153164b6c718cabdb5d1fc21 SHA512 9ec4eb07a9e20251fe1c92c938f72fc7ba7804cb7fcf0bb9e8b8aa9c4ed9c17824e15a46f17c319d465da2f1ee944f1abde035af6a1a8207bc74ab5e1a992b48
-EBUILD zlog-1.2.12.ebuild 625 BLAKE2B c6ae9a810dd1e34c941d93d12180a1c6e2a0a562a2cb173e2b6ca6bafc1a6def63fe36cb20afc824864c694d32b94cf52feec08469523344ecfbb47afba79571 SHA512 0bb1dd33dcf297c647c66da1f1d3bfab3574045ea5eba044f27a7972305769619ca2d6fdf8f9b1323de2c241c6f86b466b025535e99a89a1d383f8efd8196dbc
+EBUILD zlog-1.2.12-r1.ebuild 720 BLAKE2B 25d21a53d58adb32529aa94c457c63423fe6f90db485696b206fe513f0b4506787fe9bdda385fffda502fb7384152d22fd8e5113552bd804c0c7fa402db66b9b SHA512 67ca62b1b5a3cba60a223f6695ec93921ff1dcccb2a4d3bbd1d00be3ca6d54522c9eb3dd4e916640084b03cb5b6f392983a9b0e860752d3c072a5e0e34d209e6
+EBUILD zlog-1.2.12.ebuild 626 BLAKE2B b26fd8b3f5b2421f8eca8a0e7b257124c7332abd92a86ab707788f6667cbabd4db1578c8b980ddc8622cf833d01ad81831a3f12e9eb37e82aed874565269c732 SHA512 22122d73e3c3218eae890a224b503e2d8b8f79df749cf54195382e985a74a3739f2d177acd99bf22c8fa2e066d77ca5b8d805f388af4e41f3a41343fe3d36c00
 MISC metadata.xml 343 BLAKE2B cacb9dd07a85e4fa26b7fa703ea340117be968590c91b6e243d34642a38e6af506cc9d6d39c48250ffd288fa8dce7296cd02d37b7d5620af4d8d1edc74806af9 SHA512 1332dbac3769edb28e8c4241821fe5977619ae93b7fe29c58759ed4305b1a28cd51dd4a4d74b4d7db086bf6383e2f771b0e79804434ccd5ff6353e0d1b8d0f61
diff --git a/dev-libs/zlog/zlog-1.2.12-r1.ebuild b/dev-libs/zlog/zlog-1.2.12-r1.ebuild
index cd97f558f0b0..d49daa11b495 100644
--- a/dev-libs/zlog/zlog-1.2.12-r1.ebuild
+++ b/dev-libs/zlog/zlog-1.2.12-r1.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
@@ -13,6 +13,7 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/zlog_no_werr.patch"
@@ -24,7 +25,7 @@ src_compile() {
 }
 
 src_test () {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" test || die "Tests failed."
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" test
 }
 
 src_install() {
diff --git a/dev-libs/zlog/zlog-1.2.12.ebuild b/dev-libs/zlog/zlog-1.2.12.ebuild
index be45a805faac..ca74561e511e 100644
--- a/dev-libs/zlog/zlog-1.2.12.ebuild
+++ b/dev-libs/zlog/zlog-1.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
@@ -23,7 +24,7 @@ src_prepare() {
 }
 
 src_test () {
-	emake test || die "Tests failed."
+	emake test
 }
 
 src_install() {
diff --git a/dev-libs/zookeeper-c/Manifest b/dev-libs/zookeeper-c/Manifest
index 74ecb86e2ac3..765a411c9df5 100644
--- a/dev-libs/zookeeper-c/Manifest
+++ b/dev-libs/zookeeper-c/Manifest
@@ -1,7 +1,7 @@
 DIST zookeeper-3.4.10.tar.gz 35042811 BLAKE2B c17100d2179688665cfc9efededd378543492e2a839df9da7ab72097b954200c527375cadae1d7b30d83c511c21c1470d0b86a4a19df5abe0c82980920cad92f SHA512 4c54e40ac8d0b267db4a188a30e39ed0ac2c3e8a8fadaf244be45ff5adee956df28f6cb9f1eb56f175e924fa3629b64f98286a090c46764c91c017613c80a51b
 DIST zookeeper-3.4.8.tar.gz 22261552 BLAKE2B 618c46dc891888275166d4ad49fb59c9247f79c9886bdd438297ad682463d56a5088471ee5e0f8935771df9f220108d36cc78d695d6b28820f23344b4623030c SHA512 a5f0eca3c66655e0116aeddd92af228402d3d68350b30f9400b3638ef09610d903b7c87a2bb49a5594b12a4d082048c259ba3da121c1c6da4752dd5f5812bfec
 DIST zookeeper-3.4.9.tar.gz 22724574 BLAKE2B 5792b79068fb98cc0ea8ba53d41bbf7b33556c7c9eb1b042acfa2f8de45381b3f0d42360686386d7254f534639f25530911f668e5aa2dd55fd48c349c69176ea SHA512 4f3e003c6ce5e3338f642f7deaa0fd2cfd1b30591d3ed4fe880492dded6c4bf01d30483e28f3a38b43bb6d2696ff4d819fc9577733224cec07e236437e88a657
-EBUILD zookeeper-c-3.4.10.ebuild 835 BLAKE2B 1d34e044bcc8390944949e73b1c9183782f91945690a4befd358da9d8d0f857faa400faf0c78789dfd9e9ab2f5e9aeb7a97ed9979fa928ec07f7b85efd016dba SHA512 f92bf0b23efae967522dcbe983f008b9c3b66e1c2dc699e34324203acc8b0479eb22a002a25c468581709ed3d5acb49889bdef75c12636a1fab704933a179e12
-EBUILD zookeeper-c-3.4.8.ebuild 695 BLAKE2B c6f43cd83247d2e3e12aff92e86f04d74c8fe9c59f2766f240f37d03c65071efe4afeb981e12db8fc5cafd5c57fb55ed3f4cc61123a1b179ba3b6312234e3713 SHA512 cfa42168f19c36305c7c3e8b7b51e50e9d5999bf1b71c7148bf2116b59cab2c0ce0477ee7964af2ff32eb5287709fed773718675f16d89a3135151e401108683
-EBUILD zookeeper-c-3.4.9.ebuild 695 BLAKE2B c6f43cd83247d2e3e12aff92e86f04d74c8fe9c59f2766f240f37d03c65071efe4afeb981e12db8fc5cafd5c57fb55ed3f4cc61123a1b179ba3b6312234e3713 SHA512 cfa42168f19c36305c7c3e8b7b51e50e9d5999bf1b71c7148bf2116b59cab2c0ce0477ee7964af2ff32eb5287709fed773718675f16d89a3135151e401108683
+EBUILD zookeeper-c-3.4.10.ebuild 859 BLAKE2B 407a7d16a612179d11342297a2abd5c603ca6dd5f52f2c76161e9b9c0d35ccad36b54b5533debaff5752c28e782801079238f02f8d85d8751703800123301666 SHA512 c515fdb3a4617faf7c6900152c8db1c624fb79b0de9e2c06bf10d362878f1df63ba825559ce196f6500b6504256c97a35e01d054366b2602421b2b6b8231b171
+EBUILD zookeeper-c-3.4.8.ebuild 719 BLAKE2B 14696d54a69ceae9a3f3f390922634a85f4220c798cb337b850453afffbcdbcb51b30841a84d4d665daadb4f2032daf9c57bc1290aa40d38a7dad3689cff5025 SHA512 a0c974d626d27ece43465cf588340eb9598223fcf1521927f47386c23a369b4537e2ac5a9bc98cce556549bec5786b341c889e962d2af09bf833f307c5408514
+EBUILD zookeeper-c-3.4.9.ebuild 719 BLAKE2B 14696d54a69ceae9a3f3f390922634a85f4220c798cb337b850453afffbcdbcb51b30841a84d4d665daadb4f2032daf9c57bc1290aa40d38a7dad3689cff5025 SHA512 a0c974d626d27ece43465cf588340eb9598223fcf1521927f47386c23a369b4537e2ac5a9bc98cce556549bec5786b341c889e962d2af09bf833f307c5408514
 MISC metadata.xml 249 BLAKE2B cf8bde991a84e1daa292ec8a9ab6f76b5ea2c82bdf5375cdb64fe8eee1e5ac132e74bfc315fd22903bf14c74a4e85cc652d5159890513cd07b7d1ccc50d6432f SHA512 35adb9836c7231ecab604ae693f0650dadb8480d719531dbad1ac29ee66974d8abeecd8164e83103d6c1f8fb6a149018be349e93b8a7caa033af44dfc11fd419
diff --git a/dev-libs/zookeeper-c/zookeeper-c-3.4.10.ebuild b/dev-libs/zookeeper-c/zookeeper-c-3.4.10.ebuild
index 50be8b701a08..e37688da99f4 100644
--- a/dev-libs/zookeeper-c/zookeeper-c-3.4.10.ebuild
+++ b/dev-libs/zookeeper-c/zookeeper-c-3.4.10.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
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-libs/zookeeper-c/zookeeper-c-3.4.8.ebuild b/dev-libs/zookeeper-c/zookeeper-c-3.4.8.ebuild
index 5d004c8938b6..41d0ea16403d 100644
--- a/dev-libs/zookeeper-c/zookeeper-c-3.4.8.ebuild
+++ b/dev-libs/zookeeper-c/zookeeper-c-3.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,6 +11,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-libs/zookeeper-c/zookeeper-c-3.4.9.ebuild b/dev-libs/zookeeper-c/zookeeper-c-3.4.9.ebuild
index 5d004c8938b6..41d0ea16403d 100644
--- a/dev-libs/zookeeper-c/zookeeper-c-3.4.9.ebuild
+++ b/dev-libs/zookeeper-c/zookeeper-c-3.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,6 +11,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 1ee11e9961e8..8c64ed6d5bbc 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,4 +1,4 @@
 AUX zziplib-0.13.69-SDL-test.patch 453 BLAKE2B 645e55b034ec72abbab26fad4062cf9f7137aeeac2cc33aad89d9b86f4b616b5bdd256d383bfaa3252459caa2150f1b6426d3ca31ce8c055d0cae92d81547cd1 SHA512 2a524efc04721459cfb744ce7d0e3b6a4412e791250442632093116e181642184ba3cfa4a93fff8bdb792a03c293ab317696a78aed422ec75c26448552bc5721
 DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
-EBUILD zziplib-0.13.69.ebuild 2293 BLAKE2B ac4ab1038202486065661f5cc151e872480752aa34e43085600068b6fb3481aaba31b74c698853ec334b033e63f80c7fd8c00b4eb3876bb17889a607388dec79 SHA512 1c17f556edb55706cfe2d76b9dcecd77d1c63288da37b805a50a909d93a0cc524ad453177dc838e970c15af6b9d39da87f952559eb9f88b30c483b4ce5650e4d
+EBUILD zziplib-0.13.69.ebuild 2320 BLAKE2B 86d2e5148cfb1b89a322c611d9240d59a303b2433a767718e7bc53ef1e5db6e3d7867a8e28bbcf32b610b34576dbeb0dd3f2817c5b5d1960f7e95dfc94351f38 SHA512 aa7fb89b20dbcabcbcbc800bbf07058538d30eb5de9fee6f8e6766645ececf2691ba5ab4586a6494f2299d1abc9760b780841ffd65c7ea05253e87984f7c9e69
 MISC metadata.xml 244 BLAKE2B fc7489e331f708001ddc94cbb6b4e2c22d80c32883cb48c8044da1c8326143eed049e7f867342bb5b389f9252949f89dcb3084369729d52e49a8924d842d4693 SHA512 73f6d031dd2239ef69ea83120b253dbd61d8db15603514a673da83c3cbe9f7f881613e5fa3387917428b994bab1bd466e49ebe2c7a68829f0f2551e0124620a0
diff --git a/dev-libs/zziplib/zziplib-0.13.69.ebuild b/dev-libs/zziplib/zziplib-0.13.69.ebuild
index 2ce5760dafac..1292bc0fae04 100644
--- a/dev-libs/zziplib/zziplib-0.13.69.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.69.ebuild
@@ -15,6 +15,7 @@ LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc sdl static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sys-libs/zlib
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-libs
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)