gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
commit: bb72e65b6d6ce95abb5d486dad35d37dc105e89b (patch)
tree: b31a9263d386dcae4cb06764136672508dc5efdf /dev-libs
parent: 9b1e6d491f32eb4caf0c8e197bdec075713c97ca (diff)
750 files changed, 4413 insertions, 6771 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index f2b824cbd602..e44478f987d4 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/actor-framework/Manifest b/dev-libs/actor-framework/Manifest
deleted file mode 100644
index c30b86d4068b..000000000000
--- a/dev-libs/actor-framework/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST CAF_0.14.5-benchmarks.tar.gz 46245 BLAKE2B 1e9477faa604bad9ac73ee7d8fe58bb793f0120a733eddef881fea0c0717f292059190e813358bb089219bc75ad3e581ea120dd84553ee4ef33809ebafb427ec SHA512 11edb5337be18b106c852fe95a7a0d50c9eaf2c21d9e64cee84a60d2e8443083447440a463a24d6cf376bcae421a0d5942b1b3fa6debb7f7102dc8648d1bb15f
-DIST CAF_0.14.5-cash.tar.gz 8182 BLAKE2B 59c1e66b05f509d3d126cd5026949105d9ffaae12013262749e7775ef41b01e725769ea2cd2bcf762827a9b8be1bc970cf1d39c8405ca6fd31a0be949c1f9621 SHA512 0e4fe9dd433a6dc353404eb1a10b898c8589db455f550bafefcea3b0f04659cab3e2b63e353b5dab709080aaa1319942fd56d9eaf3c2d0e244f6eed202f81deb
-DIST CAF_0.14.5-nexus.tar.gz 1510 BLAKE2B 43d09f1b1d4e6202d7c4e4c0b09402f8cfdd38920d9e6b99c0948602fa267fbdd6f285a76935ed7f58d9abae6ada93da6459a1daea5204a4763e9113ed543b27 SHA512 e71cfd629adf83a3fe5a0a33656d9cb499bb4de10cd73fdccf81c9235cc69b277de63dde035f9cd28c8dbc9a6311ce45af13e3d40d14b6c07c5ad9b714dccec1
-DIST CAF_0.14.5-opencl.tar.gz 22047 BLAKE2B 1ea9c4c76b5711a0f4122c1f6a8982a39319f3a8e9accdc1985a39fc01ea83894bc6f51ec0d4bd0f1dfd0ab55f3ebf06def23cd875ddf2fdc30844a8fc106811 SHA512 fb8ea40b16be7646ede25f054688945b21b90719526bdefc786f80581b3f1472945c643f4cc1641f1688252e73e0a0d388e4477c8055b685318d6bf1639cda00
-DIST CAF_0.14.5-riac.tar.gz 8452 BLAKE2B 31e06f80e90b877e085038439a5437d392095b10a0d9f5c643a53ca8c0b0f215fb308030df54bbfde05ab6b130d78c87325271f9418e1352906c25300e58c212 SHA512 b4a70548dd2a839dafadd091334a367d1ba7c8632c47f8df8f6c3ee730b4b4b75c8e00d7c335d719dd9f044e0d40436ea265b7717940ac81531b266b8cbcb5cf
-DIST CAF_0.14.5-sash_cash.tar.gz 36600 BLAKE2B 85e698f774948628779736a69631862e07a6a579c0d05b739fd2730b518701c6910c5744b5f685f45987bdfb76a868206fcefe1087b5b248ea6c2f5493005e6f SHA512 dc90af883553ac67ff8e7bfcc2213200892137a5f9bcbaab95561898bacddaa5687a39a23eef7fd08b9be54fed2816d4c7d6bb31848cfbbc337ac81312f68542
-DIST actor-framework-0.14.5.tar.gz 1239461 BLAKE2B 33fc2aee5decc138d3489df9168364efd73781d963b8b5d371bfdbbeb0b1b812489c982099692e2125f4a58f4c0e64c13fa4954b95ed738336ad614cd7bdf162 SHA512 6bf9cd9868b633cdd249f4e5d503bb9d489a68f5a86e9ba505b3b65984ecf5d931878620ace504a8baed34da7a396a68a7c425ba8c8afef15e0557ed9aa19be9
-EBUILD actor-framework-0.14.5.ebuild 3605 BLAKE2B b8aea37d42f8120c27d3232f3382dff58741dcf18d59c2df47b7fd31abd73e507e0dce65307c9c449649184ba1dbd633256135a544034720288df4f079571ca9 SHA512 3b4978bf1ab416e79ded80ccc679e988fbe54d40ad5b3f977de27e4c2d442077bcd0536f79982d20cdbc338cb79d5527a107aa6ed8fe976e94e75dc6f82e7e46
-MISC metadata.xml 1327 BLAKE2B 9019ed54e682bb647a7bd0168d17e36efcaac7966ad1bf1164bfdabdff51aec613e6a568b6eb957f7249e5cf117a6a80417e19936a11d6883c6fba6cb171d8f2 SHA512 a984b1557bbe7845f587ba500bdc3396fb878868ac8b04295c2a2aedeb139ea1d18ab926ee484aae79a09e6c995428afaee92ee79f396db3cda9ff6be3783f6e
diff --git a/dev-libs/actor-framework/actor-framework-0.14.5.ebuild b/dev-libs/actor-framework/actor-framework-0.14.5.ebuild
deleted file mode 100644
index 09e25ff578c9..000000000000
--- a/dev-libs/actor-framework/actor-framework-0.14.5.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-bench_ref="2c45d8c1c2b934e062baf378809201ac66d169a7"
-cash_ref="38bcdedf7df5536899dd4373969e6653380d2a86"
-sash_ref="75e68c37ccafbcb7b7da8c0afe564d59bcf10594"
-opencl_ref="200eb3f43fb243515d0652324e6d606dede3f676"
-riac_ref="83de14803c841a7113c4b13c94624a55f3eec984"
-nexus_ref="254fbf76f83bb06e6001943b78838644345211a4"
-
-DESCRIPTION="The C++ Actor Framework (CAF)"
-HOMEPAGE="https://actor-framework.org/"
-SRC_URI="https://github.com/actor-framework/actor-framework/archive/${PV}.tar.gz -> ${P}.tar.gz
-	benchmarks? ( https://github.com/actor-framework/benchmarks/archive/${bench_ref}.tar.gz -> CAF_${PV}-benchmarks.tar.gz )
-	cash? ( https://github.com/actor-framework/cash/archive/${cash_ref}.tar.gz -> CAF_${PV}-cash.tar.gz
-		https://github.com/Neverlord/sash/archive/${sash_ref}.tar.gz -> CAF_${PV}-sash_cash.tar.gz )
-	nexus? ( https://github.com/actor-framework/nexus/archive/${nexus_ref}.tar.gz -> CAF_${PV}-nexus.tar.gz )
-	opencl? ( https://github.com/actor-framework/opencl/archive/${opencl_ref}.tar.gz -> CAF_${PV}-opencl.tar.gz )
-	riac? ( https://github.com/actor-framework/riac/archive/${riac_ref}.tar.gz -> CAF_${PV}-riac.tar.gz )"
-LICENSE="|| ( Boost-1.0 BSD )"
-SLOT="0/14.5"
-KEYWORDS="~amd64 ~x86"
-IUSE="boost benchmarks cash debug doc examples +mem_management nexus opencl riac static test"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-tex/hevea
-	)"
-RDEPEND="boost? ( dev-libs/boost[${MULTILIB_USEDEP}] )
-	net-misc/curl[${MULTILIB_USEDEP}]
-	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )"
-REQUIRED_USE="cash? ( riac )"
-
-src_unpack() {
-	unpack ${A}
-	for i in cash nexus; do
-		if use ${i}; then
-			mv "${i}"*/* "${S}/${i}/" || die "died copying sources for ${i}"
-		fi
-	done
-	for i in opencl riac; do
-		if use ${i}; then
-			mv "${i}"*/* "${S}/libcaf_${i}/" || die "died copying sources for ${i}"
-		fi
-	done
-	if use cash; then
-		mv sash*/* "${S}/cash/sash/" || die "died copying sources for sash"
-	fi
-	if use benchmarks; then
-		mv "${WORKDIR}/benchmarks-"* "${WORKDIR}/benchmarks" || die "died moving benchmarks"
-	fi
-}
-
-src_prepare() {
-	find "${S}" -name CMakeLists.txt \
-		-exec sed -i 's#\(install(.* DESTINATION \)lib#\1${LIBRARY_OUTPUT_PATH}#g' \{\} + \
-		|| die
-	rm examples/CMakeLists.txt || die
-	append-cxxflags "-std=c++11 -pthread -Wextra -Wall -pedantic"
-	append-cflags "-std=c11 -pthread -Wextra -Wall -pedantic"
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCAF_NO_EXAMPLES=ON
-		-DCAF_NO_BENCHMARKS=ON
-		-DCAF_USE_ASIO=$(usex boost)
-		-DCAF_NO_CASH=$(usex cash OFF ON)
-		-DCAF_LOG_LEVEL=$(usex debug 3 0)
-		-DCAF_ENABLE_RUNTIME_CHECKS=$(usex debug)
-		-DCAF_ENABLE_ADDRESS_SANITIZER=$(usex debug)
-		-DCAF_NO_MEM_MANAGEMENT=$(usex mem_management OFF ON)
-		-DCAF_NO_NEXUS=$(usex nexus OFF ON)
-		-DCAF_NO_OPENCL=$(usex opencl OFF ON)
-		-DCAF_NO_RIAC=$(usex riac OFF ON)
-		-DCAF_BUILD_STATIC=$(usex static)
-		-DCAF_NO_UNIT_TESTS=$(usex test OFF ON )
-		-DLIBRARY_OUTPUT_PATH="$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		emake doc
-		emake -C "${S}/manual/build-pdf"
-		emake -C "${S}/manual/build-html"
-	fi
-}
-
-multilib_src_install() {
-	DOCS=( README.md )
-	use examples && DOCS+=( "${S}/examples" )
-	use benchmarks && DOCS+=( "${WORKDIR}/benchmarks/" )
-	if use doc; then
-		HTML_DOCS=( "${S}/html/"* )
-		for i in pdf html; do
-			DOCS+=( "${S}"/manual/build-${i}/manual.${i} )
-		done
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/actor-framework/metadata.xml b/dev-libs/actor-framework/metadata.xml
deleted file mode 100644
index 9e4f4846bfbc..000000000000
--- a/dev-libs/actor-framework/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<use>
-		<flag name="benchmarks">Due to the number of out-of-tree deps, these only get installed as docs</flag>
-		<flag name="boost">Make use of Boost's ASIO functionality</flag>
-		<flag name="cash">Build the C Actor Shell for introspection and debugging</flag>
-		<flag name="debug">Raises log-level to DEBUG, enables runtime checks and address sanitizer</flag>
-		<flag name="doc">Compiles and installs the documentation as PDF and HTML</flag>
-		<flag name="examples">Installs the provided example source files</flag>
-		<flag name="mem_management">Enables built-in memory management</flag>
-		<flag name="nexus">Nexus is the central component for CAF's runtime inspection</flag>
-		<flag name="opencl">Compiles against the provided opencl implementation</flag>
-		<flag name="riac">Runtime inspection and configuration</flag>
-		<flag name="static">Provides a static build</flag>
-		<flag name="test">Builds the provided unit tests</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">actor-framework/actor-framework</remote-id>
-	</upstream>
-	<longdescription lang="en">
-		An implementation of the Actor Model of distributed computation in C++.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-libs/amdgpu-pro-opencl/Manifest b/dev-libs/amdgpu-pro-opencl/Manifest
index 144c31858c26..48ef84ef8987 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -2,4 +2,4 @@ DIST amdgpu-pro-18.20-684755-ubuntu-16.04.tar.xz 229474380 BLAKE2B f589aad71f093
 DIST amdgpu-pro-19.30-838629-ubuntu-18.04.tar.xz 301833044 BLAKE2B ffdd49be431906c5ba20e9b285b44e368b40a70678177412d2329489c987567612f5262b64a9a1aef137cef603f77f768127d674c13488e13dddbc8732cf729c SHA512 7e8091dd37ae176d1ff131e5e2b13961f5a33fc7243052dce074dffb1468476f267d50a920182358188e44f4a93d0cbf39c5d430d56a9a2e09a67409e3478904
 EBUILD amdgpu-pro-opencl-18.20.684755.ebuild 2574 BLAKE2B 5a0803e196fcb4a232e60a7102689f1cdd602f221c81a36048ae2fcd4c8dd971f3e9f46155193369914b120c5a6a3e82956dcaf57017332c0c140f4a63a93d65 SHA512 feac3ec718dff28ca8dbb49e86f0bba8113ea3da4b52129e2f6f26732033bb28f478a99dd04eb80dab1dae2db403bb263fd06be39c0ca50a6d4c9eab9367d42c
 EBUILD amdgpu-pro-opencl-19.30.838629.ebuild 3182 BLAKE2B f1e24bde49315be0f6415d4e8c2c0a2660df7e4ea461ad458913517e1e287e37a7839c7e82a3069dec35b0c3b265ddb3cd4fecea663c728c244af7c60eb6905c SHA512 b600cc8ec5104bd6a2a466608470841329a054833defd680d4295f31a4f7845d0fb4b7248481c6ddc597344cb5b0eca61631bc517d97f1a3f2367564a589db0e
-MISC metadata.xml 536 BLAKE2B 788d99a058d77cc3992b953dd8761a224575480b29dd37bc6fc5a5f914fdc03a7c9a9eb70d9d9cebf79394f6e21d966e273ad27a02f93ca887ea48f491b797ad SHA512 912ff2f26e27d5c20219a26505f3a4545409773f1f761de4591cbd7086cd1ff241fca18d7ae5081ed12e04c1b5dc46deeb02b4a68e2a3787d1d20739a818325d
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/amdgpu-pro-opencl/metadata.xml b/dev-libs/amdgpu-pro-opencl/metadata.xml
index 8c9e58cc4d24..7a38bb900964 100644
--- a/dev-libs/amdgpu-pro-opencl/metadata.xml
+++ b/dev-libs/amdgpu-pro-opencl/metadata.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<longdescription lang="en">
-		This package contains the libraries necessary to enable OpenCL support
-		on AMD GPUs supported by the amdgpu driver. The libraries themselves
-		are part of the proprietary AMDGPU-Pro suite but work fine with the
-		free amdgpu driver stack.
-	</longdescription>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest
index bea888bafbd7..1367bcceb3e5 100644
--- a/dev-libs/angelscript/Manifest
+++ b/dev-libs/angelscript/Manifest
@@ -1,3 +1,3 @@
-DIST angelscript_2.33.0.zip 1954948 BLAKE2B 61fa597cb36142230dd07103d6782bb2e195268b664643314d4bae3908ceb530ce5661376a163cc91bb13ecd386d540554e5cce74c289983536cf7f70dc881a1 SHA512 eaf972ecf965fe4f72e55755f5e796499018e918f93cfd835b1ca20f9338e299e8dbd707240341eef81ae920f07d2280646151f515f5990a62550689445c86f0
-EBUILD angelscript-2.33.0.ebuild 988 BLAKE2B 92d955c60d04d0485fd4951059715511366249a8ce320bd9f28d05cd1f2e836ac5d585d06a2bc9c51e51ba38851bc3df991f079c5c0b94342fc6cdbe0f7b2e9c SHA512 128b82aededbc1948d7d5f462d545bda6112e7daf9062d858fdc64684431365986546074ac769ec94b482df1f135d514ce16e5cad653f3a21da8b5312c34c99d
+DIST angelscript_2.34.0.zip 2020026 BLAKE2B f002c67d812cc6453d1e93ffba4aaa4c300926996b74f8d596642625e251ccd14b97473f8f0ff595e3233a3ebc7654c94420ae761eaa0b67439e18472f8df977 SHA512 c26dba452ab52c300da9c95fde8398acf4840cbc0e653ededf978d4a3e942cfe5b77292c74c49dc0279250a27cfd324c696c49d139a97c844b2a1eead9aae2f4
+EBUILD angelscript-2.34.0.ebuild 988 BLAKE2B 92d955c60d04d0485fd4951059715511366249a8ce320bd9f28d05cd1f2e836ac5d585d06a2bc9c51e51ba38851bc3df991f079c5c0b94342fc6cdbe0f7b2e9c SHA512 128b82aededbc1948d7d5f462d545bda6112e7daf9062d858fdc64684431365986546074ac769ec94b482df1f135d514ce16e5cad653f3a21da8b5312c34c99d
 MISC metadata.xml 406 BLAKE2B 0c09c377443b9bd89ac3d6b59c77bb306835e1640cfc58715a71cbe0dfbff13ed08c9e4b429a5a968c2738638dfdb87bba93293b6a09a92b7ab04c38a9786f06 SHA512 a9d0b8fdf4cc34c08dfc521920e54c42cd23e6ce65981a9ab895cae55be6e51bcdfce6fe5889c1daf812094cddfc44bb20c5439ba5d668b6a45d74fd9db3e891
diff --git a/dev-libs/angelscript/angelscript-2.33.0.ebuild b/dev-libs/angelscript/angelscript-2.34.0.ebuild
index d2bea73121f6..d2bea73121f6 100644
--- a/dev-libs/angelscript/angelscript-2.33.0.ebuild
+++ b/dev-libs/angelscript/angelscript-2.34.0.ebuild
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 070c880becf3..d227d1520897 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,5 +1,7 @@
 DIST AppStream-0.12.7.tar.xz 1958948 BLAKE2B 51a70395e4801ceeb3e97ac081f4c45be242cca14728f8efc5eec0d4b3cfa4cc9fab9ef7429c18e9bbb0dedb693a847258be1b11491155658a6ffa2a28358e35 SHA512 53ca7ebde3fcd345a895527da2ac5d829a09f25d28836a867b500282fba3465bde657cd75a4030cb831022f7a0d9f50aadb36078d62924e4d0edad6bfe3c5561
 DIST AppStream-0.12.8.tar.xz 1992072 BLAKE2B ae1d6801119798f360b7eae36b0c46b0511a93ae00adb2437e7dda830d5293c622b04475664055bee392dc824f398d42c6a0a4000392f82fc8bdfc828fa0295e SHA512 4354ef1840d919102647feffc38687f508b14fe9c047c868448347d888aa821dd8a4d25787a2ffb55247f8e9e20e9e03ba330ad74ad61d476be0c414c04a7c30
+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.8.ebuild 1595 BLAKE2B 34b1c48910d151e7a603efbf9b95aa96a54c6d676824a11a01a38ada5e81bbf518393fb51b56a29da8c1cce0cbbd01824fd2e0679bf0595d18998ecebf69f510 SHA512 0f537725005bee2b72e28ae0ea29741f388689199406652ee1eec2168a26e557c010266d2390262c0cb8c1d5ac3b990abd76bbc20cd42b2e70efef194090cd19
+EBUILD appstream-0.12.9.ebuild 1624 BLAKE2B 601740e5e85b497741afdf50dea87406aaf3ace959e0e3e5926ec9c73211ea756a48f2cfee0455aaa3a4fc7e045486d3c5525ea7ce21e9716b4866177223dbb2 SHA512 0baa93cc9c0605400add5633e9f413d77e0e0e31fb6029df538e6ae4bd39788e5de610b1acdc56f6c4d3624c83aec26dc62d1facc8e840495b8f9c9e1509251c
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.12.9.ebuild b/dev-libs/appstream/appstream-0.12.9.ebuild
new file mode 100644
index 000000000000..82e775582a5f
--- /dev/null
+++ b/dev-libs/appstream/appstream-0.12.9.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ximion/${PN}"
+else
+	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/AppStream-${PV}"
+fi
+
+DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
+HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
+
+LICENSE="LGPL-2.1+ GPL-2+"
+# check as_api_level
+SLOT="0/4"
+IUSE="apt doc +introspection qt5 test"
+
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	doc? ( app-text/docbook-xml-dtd:4.5 )
+	test? (
+		dev-qt/linguist-tools:5
+		qt5? ( dev-qt/qttest:5 )
+	)
+"
+DEPEND="
+	dev-db/lmdb:=
+	>=dev-libs/glib-2.54:2
+	dev-libs/libxml2:2
+	dev-libs/libyaml
+	dev-libs/snowball-stemmer
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	qt5? ( dev-qt/qtcore:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
+	if ! use test; then
+		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local emesonargs=(
+		-Dapidocs=false
+		-Ddocs=false
+		-Dmaintainer=false
+		-Dstemming=true
+		-Dvapi=false
+		-Dapt-support=$(usex apt true false)
+		-Dinstall-docs=$(usex doc true false)
+		-Dgir=$(usex introspection true false)
+		-Dqt=$(usex qt5 true false)
+	)
+
+	meson_src_configure
+}
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 78a7dc6f80dd..e9cfa9ab8fc1 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -2,7 +2,7 @@ AUX apr-util-1.5.3-sysroot.patch 1234 BLAKE2B 58e66e338ae936b7c206eda88a97f99785
 AUX apr-util-1.6.1-fix-gdbm-error-handling.patch 2272 BLAKE2B ca68b87d6f19614cfb18e1df4fe0122fbf08167de7781fb58ae0219f766c1795109ee050b2900daf63e597a455c647f5da274e90aa0e4a436e8c87c19f962c45 SHA512 9f246ff853407fe59d135481c9afff6b3ef26c753c41b52134dde44df269e25c1f3249980994a000b24417f30692bf62a044d450a47af259cdfb76fbb6b70b8d
 DIST apr-util-1.5.4.tar.bz2 694427 BLAKE2B 6de337fa48f0ca3775ba5b054b3a59726e25a35c9b2ea67323edde52c88e4affc0ea0a25a0a64f42c82f0927482d22dc6049286df8cb6048f8bbb61659beb0ac SHA512 ca877d8e444218c4ba0f28063ee075ddcd6c0a487b692dc80ef442fe775ec4eeb337c6957853772e8082e27edcb450d7e909c2c6c3ab4a95bbf0a5ee5ea4a2d1
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
-EBUILD apr-util-1.5.4-r3.ebuild 3685 BLAKE2B 6de15972c714d4077aeeaf62771b0427c96d7022ffbe8f639576d1c422562806ac5daf93b6d6841f581f0d8e2419a33692abe392bdb583b1722ae3734865af9c SHA512 576d513d8716117cbbe854d14e183c13060408f187a22b000e5e21f2f6b71c8774bf197612ae27080a3d97ea0bbbb078579db2551c54c12a6a1b75dd63fb2c7b
-EBUILD apr-util-1.5.4.ebuild 3214 BLAKE2B a90ae943aba394503d08cfad961e603c5aaf1460b28f040e35c0a330ad59ea333606cc909e6d8543f1c24a4a0898492dc50d988cfcf6e7ea681dd12207870838 SHA512 a419670fc4df0a4b7c7f1c2d07b67428dda3d72663e45ab1c2cd72268c33100a4d9319398086666530d69524f61eae196198e4622f0dc889f7413b763c3ec5c2
-EBUILD apr-util-1.6.1-r3.ebuild 3749 BLAKE2B 8ecf1f4437c01f14476224dc4c9fa2db85c6a47151bdeee212e7d4f50ebb1dbe17dc14d1cef4f2015cbc2c44af18da588d9e67c62b5356a60a7ee8ae10e37716 SHA512 0a3cbaf9475af0b49e95a1a3bd5fd0d67376608e82b213dc2329af1863faff391621cae045fccb493dc064f3a242cdaefdcac4c839275607d092fe47c3bf4561
+EBUILD apr-util-1.5.4-r3.ebuild 3663 BLAKE2B 3ac1fdbf387feac1530a38a5df55e5a1d749c9f09c978f994c5d84c59405b59624ae4edb4609df0db93e7a0fa550e08d3cda0286946b28d6af7308ff5e21a6ba SHA512 a0a5ea6e7858c820a5043b6cda4996851c1219ee9a3831946753fe73aa490a16486be050b78df97561b0041a6087d0a3b5600fe5ee3b729a68cb43da1497b615
+EBUILD apr-util-1.5.4.ebuild 3192 BLAKE2B acca90abfbf304e6d760c4a7be0d9bc02832230c73dea3bffa4733a7afb15ff2bd427dd4b327a63438a1b983fce851a6de6e5f0c71ba75e1277299a8befa7685 SHA512 2a0d3b5a93a79b87a6a61d8279191efd60237e206fb9c469d7acc0435488004895221b6ac76b1b0a8ebffe3a3726973e47cd04ce5ca437b3eaba53909b69dd13
+EBUILD apr-util-1.6.1-r3.ebuild 3727 BLAKE2B 48672ffd944893c31c11c036117611d48d28c1588605a5797f38567cb380a3fdfb0c941e7d3c770ae0bfb299e2426767ded858cbef84a7f3ac664acef84e74d2 SHA512 96a21b33cf45af1c3b1f699e84b4ab86ffd54b1975d8506f7f5308877bd324af62cb637af440094a6acb45b316a7f08ddb88154396ec990161bf9924fce7a4b3
 MISC metadata.xml 515 BLAKE2B d300be91135a6a7dcc55a61b484b5dd1785663b9f3b51d621dcacffd9ec5747b69bb227f60dce1bf30a57fe93629de3c82fa7138a5f056e4f349ce6909453020 SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158
diff --git a/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
index c9a2d794b218..05a79fc756d3 100644
--- a/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="berkdb doc freetds gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/apr-util/apr-util-1.5.4.ebuild b/dev-libs/apr-util/apr-util-1.5.4.ebuild
index fca0234d9e7c..ce02048009f1 100644
--- a/dev-libs/apr-util/apr-util-1.5.4.ebuild
+++ b/dev-libs/apr-util/apr-util-1.5.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb doc freetds gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
index f5a1fba08fe7..97072c003439 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 44d477f03407..bc0ad96d6ebf 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -8,7 +8,7 @@ AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4a
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
-EBUILD apr-1.6.3-r4.ebuild 4399 BLAKE2B 8add7035d166291e2c65161dfc33942b87b08d66b67050a7ae7c11bfe264b537a99743f7ba0eaaa3bdd3d02d82ba8d9dc3223f26cd6523ef6ae61090229cad57 SHA512 2dd58a8a032de1888dff02d063fbd97f0b50c69fe0e236793bf8b4b3f3438bb84bb767af498de6587b1d2db194e27fe4a63084ecf30d98e4410372158582b186
-EBUILD apr-1.6.5-r1.ebuild 4349 BLAKE2B b445e1deba15b15700c7e10f821bb6616ed396ba8aa3a6f42015ba7ce4b458d0a9eddd39881315087c5d75cb7dae883de3406e64fe47a61a6492a63664a8da13 SHA512 452d9db94f4a57267d964815504aab528d90428fe556e2b79df53c77071295020d5594cc2945d45cc17ae4987501fa49110fee841a96107a42f0d86ecef62429
-EBUILD apr-1.7.0-r1.ebuild 4265 BLAKE2B 20d2ff9bcf61b735960cb41a1eb007fdef78d34ddac2845a685fd9d809be252d6aab26afcef26ae1e5d6dd2fe4493044f377331d4492bb573b61409de418cfdd SHA512 aaf1c39e3c3248e376b74c669e2dd5333dacf83c7bfb8151d0695ffc454a31b97de09439ee467bd1af7f9977070302aa0a068d282785a5397061981538c7c175
+EBUILD apr-1.6.3-r4.ebuild 4377 BLAKE2B 4a20b50fcd8f1b4175d999b5756adbc31ecf47b75f4262c6e89b9279445ac8f8b66ed3e05a6044cfa89eee072500d44d34fd9bb14d24a13ea8c9369b37310d77 SHA512 abd824e9fd7f0488c2bb27dd6b0c2d57f9fa9224ebe61ef738822e8a29acf5c3f7260055c3e10c54ea0c425ccfa282ec1573d438ad28bdab31fac596dc44050d
+EBUILD apr-1.6.5-r1.ebuild 4327 BLAKE2B b58a4b7c1fe1b63b8a28de11820db0f639328e4a89e3898c669de14604e0fc91c0d4e6c5a329fefa80a8ccf54a254bf5ffdb376d7ac82a7db9068c7f82683574 SHA512 c015285f219499ceece08e233d8663cff5d5e4b85c05a7ff28b78660855fb14fc268764c114528752c775e4c93771cb1b14380e73f899e4ded520b80523cf378
+EBUILD apr-1.7.0-r1.ebuild 4243 BLAKE2B b05aad3b350b3bf974654a23c461f8d3eba70c3b72e354a8bfc41fbdfe95b822652a50ac091d0eb7de4af58f1544466dba8bd480ec0e80dd01071c56878fdb1f SHA512 10c6a49f7f38bd8e84d117cc28a8f9402fcab4259eabd1c97a3b60e8e21d4c8a2417574449e1a62442307ed57dbbd6f98399a2182c8b2eb05bf23f37903d67ed
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.6.3-r4.ebuild b/dev-libs/apr/apr-1.6.3-r4.ebuild
index 35740d4ef048..f020e35048aa 100644
--- a/dev-libs/apr/apr-1.6.3-r4.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/apr/apr-1.6.5-r1.ebuild b/dev-libs/apr/apr-1.6.5-r1.ebuild
index 5d7c7debd7d4..84509fe2a091 100644
--- a/dev-libs/apr/apr-1.6.5-r1.ebuild
+++ b/dev-libs/apr/apr-1.6.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/apr/apr-1.7.0-r1.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index fc5639976512..3680f8ae00ad 100644
--- a/dev-libs/apr/apr-1.7.0-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/asyncresolv/Manifest b/dev-libs/asyncresolv/Manifest
deleted file mode 100644
index 7358e50d0e9b..000000000000
--- a/dev-libs/asyncresolv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST asyncresolv-0.0.3.tar.gz 310716 BLAKE2B 39b751996f5b422d41e5a4e4ede14595b61ef88675503e7b61fe96cf0a98c0d90a890d6505bfe7ce9e878b41a443dcd8fd20cde76c7fe4c22712785ebab79648 SHA512 956eb5d793c58b98ddd95137c74552801131fd07cf97e5f69fec366ad6919f720023115ad50e78186f448b840446108a0f5dac9e66c650ef98fe61f0985572d4
-EBUILD asyncresolv-0.0.3.ebuild 576 BLAKE2B d40d8af7b10d6560f11f009aeb1fb149704ecc9356ae3016bbfd6a15be901b057d5e2738699164e26cc10e558ccff94a46a1dafb186b4dff1789c1d1206744a1 SHA512 92dfc63ea3ab9a6ac68618eaa1d7a59e7f798b1f893e031ccefa3b6f97aa33cc41ecbdd95f7f1534eeaf952ffc9ad8f09b58f15df9ea4b83db80a93af1b3c3a1
-MISC metadata.xml 248 BLAKE2B 1e7511ebac5bd2b9bef215d61acee6b59f8fdb94c2d4436572b0396307e4bb1e79b25ccb3151e3f938811370510ecaa5bd807c34ff6a31f6a8376897fb637b4e SHA512 47dda831828e89e4a6e9faf520e446c97dad4c83e195b979656b02cb955f9a390f3a9b46f752798869c9c32afdcb411bf115f51f2b5f7a89c74ed0c8898a5495
diff --git a/dev-libs/asyncresolv/asyncresolv-0.0.3.ebuild b/dev-libs/asyncresolv/asyncresolv-0.0.3.ebuild
deleted file mode 100644
index f394470b074c..000000000000
--- a/dev-libs/asyncresolv/asyncresolv-0.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Asynchronous DNS query library written in C++"
-HOMEPAGE="http://asyncresolv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc x86"
-
-IUSE=""
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	sed -i -e 's/-Werror//' configure
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "install failed"
-
-	dodoc AUTHORS COPYING* ChangeLog INSTALL README TODO
-	dohtml doc/index.html
-}
diff --git a/dev-libs/asyncresolv/metadata.xml b/dev-libs/asyncresolv/metadata.xml
deleted file mode 100644
index 437e9d649d85..000000000000
--- a/dev-libs/asyncresolv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">asyncresolv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 6c6df73b4081..ef5eee451903 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -2,7 +2,7 @@ AUX atk-2.30.0-use-basename-instead-of-filename.patch 2528 BLAKE2B 7a81c6ed9c73c
 DIST atk-2.28.1.tar.xz 712508 BLAKE2B 71aee8bc937e1e37d40e6a9820d0002bcc763dbf87385ede2484ec6fe17a9924d5753d74dc3a769602746c915d0c46da8eea78cc80c706e3c38faca2e5050364 SHA512 aa61e7718b3f4d9c33ec2b4747e35f894a51550ef39ecc4a7af5705811c029645bd3c728071f446b075a0b7aef0c35c1b73406a210cd30171838f24a8dfc0abb
 DIST atk-2.30.0.tar.xz 290264 BLAKE2B dec44abf3bd4937f417cd0b75bee32fdd073ccca1e44d883293d060afbbc30909aac483007e293231fafe0c5481df94d1113d287a0002a823f4e9c8e7bd647c2 SHA512 03f311378fdb91442f27ed542fa36edd2c9c036837c9f25ff37468bf7f743277d0b9253621563d15894e0da9d37e8df0a0e2c0e47e6aae33a38b13744c3b8b8e
 DIST atk-2.32.0.tar.xz 292088 BLAKE2B 15f093db60cc54d1a5a18dc78cb9d64fa73e18dadb724fe5143956199f4ff1aa4ea9daf0796b14f228a1d91f1d44e88749c67fe5a6a84bd001916d78be4680f9 SHA512 8cd2a3ee006f21835f3e564f2e1de4ae61bd9529b4c0b4f2e3ece88e905e2dd36b67affb089f41582806a1397576602a526a4b8698303708894f20af97ecac22
-EBUILD atk-2.28.1.ebuild 1441 BLAKE2B c1283a8624ebc62e5bebd5d7593413be5030a7dc3206440e07630f29b0b06bcb93effe354fa52552706a557e5a965396f8c0a800322595589137ab56208d9f3e SHA512 04ffcc74623d10bf92d3401deec43395bf4cf8c3093481af7d46369df7e0e563ae91655be7fb78a6a232e76dd4fe0cc43d7330af3b3147e9aa6f12dfd8ce2513
-EBUILD atk-2.30.0.ebuild 1249 BLAKE2B 7616b74cb47076cb4076b09b912548d922b45e46f9edb2f25419361b26b8d23579ec04fc228ccc602ff37a4a74d726588a38a788ebc0ca3806adaba0a1ee8ed8 SHA512 8af7527ccf22d4e9ee3e37631c057bca06b31d084b774f3c86877caf8d8322c6e8fadf6eb7ff90ae5bf0072c67d75632de1892a1489a3438fc2492d050f7522c
-EBUILD atk-2.32.0.ebuild 1197 BLAKE2B 14906c3c92c98e9f2c851e01e96af0303782652eab215c13a545006be83306d3792a838ce04fd9b377d16f0cc0329103e92dbfe535ce3d7e0ca310a118812d10 SHA512 ba19045a5421b323baf6d4f69c4a4e7948ab618d2d3942439eca8b7eede2e9a2c562d4eb94ee81acd09bac1c8d22c7adb8ca229673394d276b4492fcae59e677
+EBUILD atk-2.28.1.ebuild 1419 BLAKE2B b54bfca44773cc5d28023f6a80b13d3c65947d08f76cd4cd3fcd61bcc87b1916989bbeccb188499b5a9dfa0448cc30bf24110f29c6dc9157918489324fc708e7 SHA512 e36d9b19836b966cdb4d547dcce195f8169ac3b3e132c8871a553be7ce1b0719a5ddd9604dbddd64f92928462429fecd208900a066d07b2ce95b2165abf99af0
+EBUILD atk-2.30.0.ebuild 1227 BLAKE2B 0a21234fffdf74308704e199dd20ae4c4b6229c29d0265ce2734d0ece6b5fcfb9298ce65e6496b53f0a757863856e73dcc7d7a8287ab33b9371c65b0cb064c8c SHA512 7a23da2f804ef760dd5fc941f77f745c259203cb7e58c6cc218300a52c901e75c1efbd427245e7ec484ad8eaa57802d8855a0005c48e25a086b6d52e34863aa6
+EBUILD atk-2.32.0.ebuild 1175 BLAKE2B 8e6da9c1bf673c7e4e8c81e0b6181d60054e63b2cc3c61b76e77e05edb0fab820a03ef2c1bf7905ffba6b39e9ca81f174e8fe1e99413b1de78b3e86db2d852e5 SHA512 e6d4be88b1cba082260d4a95e597403369d7c8b063fbac3cc68ed5c8aa85da1b2aeb9a7cf8060110b71f0301d386ce4595728861ea051f3f548126e17b1c4e02
 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 fdece1deb180..7d62480588c4 100644
--- a/dev-libs/atk/atk-2.28.1.ebuild
+++ b/dev-libs/atk/atk-2.28.1.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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~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"
 
 RDEPEND="
diff --git a/dev-libs/atk/atk-2.30.0.ebuild b/dev-libs/atk/atk-2.30.0.ebuild
index 298e68d20e93..29a7ef911b61 100644
--- a/dev-libs/atk/atk-2.30.0.ebuild
+++ b/dev-libs/atk/atk-2.30.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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~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/atk/atk-2.32.0.ebuild b/dev-libs/atk/atk-2.32.0.ebuild
index 3297fc0c6049..1f0c98bf665c 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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-event-stream/Manifest b/dev-libs/aws-c-event-stream/Manifest
index 03cf92de0495..ae58822175df 100644
--- a/dev-libs/aws-c-event-stream/Manifest
+++ b/dev-libs/aws-c-event-stream/Manifest
@@ -1,8 +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
-<<<<<<< HEAD
-EBUILD aws-c-event-stream-0.1.3.ebuild 622 BLAKE2B 4c109ef9a79998f5d8e56402b6fd1ecc67cef7a724b64c4e1c0964d0757737afc85043e53d28a08a8ce5b7568cb835e2edd695763859659ef76f74f885486ec9 SHA512 561e3d02bf6799f095c3d21d52e58a42ad7b4c53fe4717b39da1839d78a37efee491596d3382150ad0c55e4325c99e220e09ac6f8c86e6aa731198ea73b7d49e
-=======
 EBUILD aws-c-event-stream-0.1.3.ebuild 649 BLAKE2B 6180176ac83ab02e6ae800686b8445b2439ed8499b95eb68fbfa8ca876f5423f57fb90da039810fe3a2a16be00a006a8ecdc6a387d4e29ca0327dcf96ebef796 SHA512 c54ba3465d9220d7f163e7c3140426f38e2583b558d45b6669661c350c0610aa2af5d45bbcdfa67fd4e78a653067555ebbf9662cc897f9c6b827d0e267394c95
->>>>>>> next
 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 dd367d2e10ac..b45aa6f30db9 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
@@ -15,14 +15,10 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="test"
 
-<<<<<<< HEAD
-DEPEND="dev-libs/aws-c-common"
-=======
 DEPEND="
 	dev-libs/aws-c-common
 	dev-libs/aws-checksums
 "
->>>>>>> next
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-add_missing_cmake_install_prefix.patch
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index d5bdb99aab8f..e295f26fa326 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -5,10 +5,10 @@ DIST gc-7.6.10.tar.gz 1143650 BLAKE2B 5dce84de2e842c98dc552b4a6fc28311e241f419a7
 DIST gc-7.6.4.tar.gz 1120784 BLAKE2B e7cad27d2144fd37aebad44093e1a0814fe9a1cc887701e485681cdd01f3ea4477150697d535d0873a1255abff0765084119096c7ed61d3caeda439cf2a7644f SHA512 2c85be3e24b85732b3dc6f08fe98cf1a82b6fb2a22ec73090f80920721c737ef92cee8f0cd7ea7228d686005d164e7da54ce3907c3a1ba5eefa43355a472085e
 DIST gc-8.0.2.tar.gz 1159207 BLAKE2B f3dfcecbc9ba59c2abac868278eb6fdca4bda46a5303393a8fb63717f01bc19fa007b6530a536c32600db30f3a45d8d5558fe72adefecd9b97075dfadb3eddc2 SHA512 b1401abb2e82b143b9a2a9013f5b2efa4015b256e7ea8ef2c897ef3c0d2d41fc893413bf6a49efc1845018e8ab823adb485fb3358eb47715982259ace9ffd7c6
 DIST gc-8.0.4.tar.gz 1160528 BLAKE2B ec42378c964fc573e53f6f58aa22fa63a0b421c91b81336acfeb2e2afdb5c89514edace3a9500699e13ff1cadc4205ea245af4f0dfa5e439ed9b78cabf6058f7 SHA512 57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e
-EBUILD boehm-gc-7.2e.ebuild 1333 BLAKE2B 398be6ccb9df21a385df0bc45f0502db6e2f09849543d8b91c76451fc59ceaa0d6e7c430689163b9696bf2fa92aef1eae2c555083d5cfa76f0824a428a71b315 SHA512 e0fee4afc7b0f8b00df366d2856c3355e4832ebd1952f3ad3e23231dc7f34dc5471ced41624593690edc39b47a06274ca82c5dc90efc6181b50fa6a2e94b11b3
-EBUILD boehm-gc-7.4.2.ebuild 1248 BLAKE2B dfc41bb8278e4dc25ce02f6ee6c48d741119043762409acfe37ca3a3475bf0d38f88b3cbdb58143d7f8a7036c4e3cd591b83fbfdf107d14dc5fbad6dd47d0b4b SHA512 68df71e5393048b52929dd73a60cf8cb5b980dfddf854aaa842c78d2d8a077f6c8fb235ab507f38c0f1c8045342492834433dd77264450114d7439b4457cc806
-EBUILD boehm-gc-7.6.10.ebuild 1382 BLAKE2B 3de675fa3d346ca7ea2c94ab32e1b7f09fc28a5632365e159e6081785c95e3fe302c1a54d2be3b4ada0ed4ce81080c331cbd52b40afb3b422bb4690a9cc35628 SHA512 1ded4ce2941cd04c7f06991803c6402435d43f587bb5c7e98ee6da0642115284d2b859636e0f6d65d12225bf84e21ad905046bd2c8a89bd9e6e70d01ec89c124
-EBUILD boehm-gc-7.6.4.ebuild 1371 BLAKE2B 6639a3da75dcd877ca4d0396619bc5256040b3e3fb9f2b38dec22bb72bb4f51687cc5722cac8b564632459fda7e69f44417f15ddc22e0c03eb14a5ed0a0bbc0c SHA512 940f6d91db5904b846f4e10108c472d9402ebe383ba76ba74b025336f1eca867c7361bfa8127588ad612494cc1c79b74b52b8972bd8fa78e2109f17d17ef0f0a
-EBUILD boehm-gc-8.0.2.ebuild 1380 BLAKE2B 74f6b8a142175c187959d6041b930fce4e96461677312de1cdb418d6983093da979eaed7c0fef6d9d3e9dba8952168348706b866a064e18cb000e892783552aa SHA512 8e56b92e1d1654ae1f7b74dfaf6feb975adf6e07ad8a07bdf3b61d7ed55b24312e7dfeab6e18edfdb34a511e90885942138ad48c934cc02fffb3bc0403cf19e7
-EBUILD boehm-gc-8.0.4.ebuild 1404 BLAKE2B 68399981ba6dd3eb50f8f3e9f858e13b8101f6f94c1cdd1f5e06204e4359ced1404a8147fbd84bc4c855bf6bb073f162ac7642b214be4f053d8374ea00aaf88a SHA512 1db3d69067eb2cf712f950bbf57b93e716fc1e0f1ee3c6f5a9f6f09d170c0442154ab22f9f471b20712836c37621f8f927b2622145bc7a56c8d37ec517dea5e0
+EBUILD boehm-gc-7.2e.ebuild 1323 BLAKE2B 561c204460337982755efa5330e5065630f610f0ccf894abb71f6b3da958137c39a178cb5365fc8e1b320497923ed95f6b7f10bc4f65fba5272d1f70023cc89a SHA512 115b98f3abffd1d0363f1c94ec3003e503c6b802b1679937c7184d2ce4ed34fe01d15f28d093a57c21e412fd501de5c9dc1ba9abc5c573150d1b1a8f98e9f929
+EBUILD boehm-gc-7.4.2.ebuild 1238 BLAKE2B db76c94532ff49fed18517ab43363bfde8e267daaf6b98ebb3205a5c9bffd1aefba3a5bead362577a9ab3d97a305b2ca0e8df23dd8bdc3867f4d3435b735cd5f SHA512 5cc6d74756e7c9c9f1984b73dc3627487226e1398399376e295480e9432abb9c13feb08ad89db6ec4995c7df62e1d7c9979240a6a0973a9a6c522506838e1056
+EBUILD boehm-gc-7.6.10.ebuild 1360 BLAKE2B 4ecb71e1e01a277cc5aa95c16394037946f1dab46f8818bb9c168d57b4d5a0e37a4ac7c467b07dc9eccd1bcb6cfee3a38be1e92850d02bc84d790574b3c7da87 SHA512 38ab835f7d2e2701a4023425ce60d5f8d8816935c9ccf8da1d3b57c609d9dbe03dbaa68e3e5cfabf5e1d0ec28406f609fd54dc0135d967c004d53bee93a1576d
+EBUILD boehm-gc-7.6.4.ebuild 1349 BLAKE2B ce0f3df2c93471bf8c109295efbd4054544faf6717a6d71ce1049a8d0c1e6ab8d4e5928805089834042b41aa86b9cc9fb4f1b9989583d2baa08eca398eae24dc SHA512 7f62ad8810224a35d6eb31b2c435ab5f3fa7e491f12ca2e402781e32fc51f2f37211db7905b442e89deb261ee97d53aa002f394255a37dac4acf5b9a3c86bac2
+EBUILD boehm-gc-8.0.2.ebuild 1358 BLAKE2B 5e67c09c36170c6291e27005ddf8807f3d4ae69322c4c294b02ebd94d7fe115a37f6a0c810a2589eed56c21d49083f7a3f5e580b63ba17a36f217d4f7f71574c SHA512 05f3a3d8ae22d05d4238475c3c019a4ab43d40a63cac0f4115b4c85eadfc0504b56e53cd94971479b462ececa8755dd083bde96c43af8eb01a00e2fa240023db
+EBUILD boehm-gc-8.0.4.ebuild 1382 BLAKE2B 9cca475a48372734a32ea4eb8a9bdb17d1d6aed7f40570620f1927f9fd881d8b334eb19174b18506f804d055ac837c8d225c0d93c7d21b5b19d81023cf7e59b7 SHA512 7bf5ffb109e04af137923570a013763a841fd2ce69a39f2e63d4c4fd954bb7f4bdb64824772b726eb05b919ec2f4d90b116d355da96abd159c98af19aaa17399
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/boehm-gc/boehm-gc-7.2e.ebuild b/dev-libs/boehm-gc/boehm-gc-7.2e.ebuild
index 02c94d5ed7c8..59ec2bd7d212 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.2e.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.2e.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.hboehm.info/gc/gc_source/${MY_P}.tar.gz"
 
 LICENSE="boehm-gc"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx static-libs threads"
 
 DEPEND=">=dev-libs/libatomic_ops-7.2
diff --git a/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild b/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
index 6a945b47e50e..f3b4936c05cf 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.hboehm.info/gc/gc_source/${MY_P}.tar.gz"
 
 LICENSE="boehm-gc"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx static-libs threads"
 
 DEPEND=">=dev-libs/libatomic_ops-7.4
diff --git a/dev-libs/boehm-gc/boehm-gc-7.6.10.ebuild b/dev-libs/boehm-gc/boehm-gc-7.6.10.ebuild
index 6ec93331183b..0da64af2b440 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.6.10.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.6.10.ebuild
@@ -15,7 +15,7 @@ LICENSE="boehm-gc"
 # SONAME: libgc.so.1 libgccpp.so.1
 # We've been using subslot 0 for these instead of "1.1".
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx static-libs +threads"
 
 DEPEND="
diff --git a/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild b/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild
index 3568a5fa1348..33dcfa26fb12 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="boehm-gc"
 # SONAME: libgc.so.1 libgccpp.so.1
 # We've been using subslot 0 for these instead of "1.1".
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx static-libs +threads"
 
 DEPEND="
diff --git a/dev-libs/boehm-gc/boehm-gc-8.0.2.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.2.ebuild
index 4a0a28955f20..d76e217151d7 100644
--- a/dev-libs/boehm-gc/boehm-gc-8.0.2.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-8.0.2.ebuild
@@ -15,7 +15,7 @@ LICENSE="boehm-gc"
 # SONAME: libgc.so.1 libgccpp.so.1
 # We've been using subslot 0 for these instead of "1.1".
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx static-libs +threads"
 
 DEPEND="
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 e1f3293eb0d4..df283205da84 100644
--- a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="boehm-gc"
 # SONAME: libgc.so.1 libgccpp.so.1
 # We've been using subslot 0 for these instead of "1.1".
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx static-libs +threads"
 
 RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 672e0b4df17f..a79b58551488 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -6,7 +6,7 @@ AUX boost-1.69.0-context-x32.patch 1116 BLAKE2B 16b6ddbdc47d72d5afd39e61441f9f09
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
 DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
 DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
-EBUILD boost-1.65.0.ebuild 12435 BLAKE2B 6d676b8dad7340828f95a16aece6296c006cae693a1ee7bf2e8dbcb82da443f8aa0c460eaf2ab1f5f0a5c26ec50073db463919c3a3cff2015065d371b1bdc375 SHA512 f04be75c396b21449cde08f40a79e40a733fba706a7170fa233d0c6a4e568bb55d9a539ec9eaa65316de41e24c0b5e739f3ca08fd6a8760e1999caf6c2b0a688
-EBUILD boost-1.70.0.ebuild 10162 BLAKE2B 67b85064587e5f5efdd73492914dd650c53fbd00d4fcaaa02982308db30f77f7adca171b22f0be37d478a56861a61ac74d30f1582e8d5e053c770a19c331d893 SHA512 85c2302eb83645f0e9033efae07acf8b2c66ba1bdaccc8597509a8ba6e001913ac1e235257bf248fab2590761db881f1a2fca8ca093b0331d52cdc6be48eab63
-EBUILD boost-1.71.0.ebuild 10656 BLAKE2B f36fb6b9c96b63846d6a53c0142520c116154a5f0ed564042c86a10e06dec038551e1b7144517fad6aae37dd16bede3999fd175ca90bd1355e8734ac0dd2912e SHA512 b6bbeeab9df7ef94ee9adcbdc7072d95f6b78677ad733c1652f6d56d13fd8b0e4db1fbf12595198417966470051d8e2282eb4448c2a6e75840cfae55d518c27d
+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 10634 BLAKE2B 44c6a146303aa2e6e35c6fa99d775b121adabc18a9d76f495d264be4085210591c79f31a73915cf1f2260a08ef6235c60c74f49382ffb83857a6c4f43cbb3a83 SHA512 080e1223a342f235f61876c30b70631a2dd939c231c87624fc20b95f1feecdaff11fe2020059193cdfcbf47395d0b830c0c940b086edb07568f1edc07628602c
 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
index 25d033ea698d..7db346d24331 100644
--- a/dev-libs/boost/boost-1.65.0.ebuild
+++ b/dev-libs/boost/boost-1.65.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.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-fbsd ~x86-fbsd ~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="context debug doc icu +nls mpi python static-libs +threads tools"
 
diff --git a/dev-libs/boost/boost-1.70.0.ebuild b/dev-libs/boost/boost-1.70.0.ebuild
index 570df6cc8443..4f826fa75b46 100644
--- a/dev-libs/boost/boost-1.70.0.ebuild
+++ b/dev-libs/boost/boost-1.70.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.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-fbsd ~x86-fbsd ~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 )
diff --git a/dev-libs/boost/boost-1.71.0.ebuild b/dev-libs/boost/boost-1.71.0.ebuild
index 1cb3422d121a..97762b39de26 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-fbsd ~x86-fbsd ~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 )
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index d4249ea7eb7d..e24a33f771c2 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -6,8 +6,8 @@ AUX capstone-4.0-no-fuzz-tests.patch 367 BLAKE2B 890047c65669c6d323fa5f8bb80df44
 DIST capstone-3.0.5_rc2.tar.gz 2829338 BLAKE2B dd35fc6c31ec008f78840410ea0d20de56ea8f01c3af1d28488beaceee7fa06ce03c8cd0f56d834eb738d23f528d240693586122b9c1e353365f7348fb6f8362 SHA512 31bafdb0b3183d0c054a4244cc135db9a3c3dc5cb2e2af706bfede0d53cca8cba81d74b74ef9a4adbfd6c79cc408864dd80b8203791e17bd6c98bb69ea4f6894
 DIST capstone-4.0.1.tar.gz 3434276 BLAKE2B 585e0ee19b76d96116c67b021bbe19fd01d8db600b565094ff71a01d8a87b1123a8c5e2f944f1551c411565d5a25dfbfbb3138ca220b1281044a31004002399e SHA512 43c52024065b41b45eff9423341db3f3d5163fa7aa01b360faa30437786740c8f2c34c36faa04dced5308e09d8bd78df3bad0ab9c06f98612169edb176f83c36
 DIST capstone-4.0.tar.gz 3411532 BLAKE2B 3e60a946e81f6d6ea88c314ad066e1855e2401cd9e8e61a67d48071b0fe4b705b2276b0d2b52d0979f472895a69cbe7609f6a2c60b79be668730f41ea98bf92e SHA512 5a10c67e88b246ad905364c62c56b4741df242c22f1b62bdea171e4d1d43e484f42f30b33e17324be6cff4c6fb10365528a9c3f4b2a5339ad24b0564fdd40bdb
-EBUILD capstone-3.0.5_rc2-r1.ebuild 1437 BLAKE2B a3867e2cbc40acc823bbdbb2908aac3b70ce7abaabff84e98b393ef38a07872c9553f3e2ec225b72a1dd67fba61986b661f6b0faeb46d43545f377c079b65606 SHA512 732b223711c0e7b5c3f1cc935de1d7f28ea7d70b77a733ff25c40fefce6dcf3cee0a180876c79812187a40223f27030d119e7fbfb245efa418a016ea3e5f59d0
+EBUILD capstone-3.0.5_rc2-r1.ebuild 1441 BLAKE2B 12c70e34b8d4f1d948f10c492122f02ac11e3014b0d4190604c1342f66b3e70d6a13705330d21d806feb45a829b0500e91e8d32578dec09bb834e342ba01bcf2 SHA512 3ac32e4f00bae9728bbb1d0229423ac92206010928582a17b71b9e5ace92214b32a25b315ccf5fb2d0b33348986f0c90778926b966aeb6554c2bfda77754c834
 EBUILD capstone-3.0.5_rc2.ebuild 849 BLAKE2B 8954f0ab824ca3532d0fba48e7b41abcc2b463a26bd7795553d8299f64f3b27e850c79bb04f210c3eeb4b27263390e2a0990be5ca76e4774bdfb16aa2921f748 SHA512 7896e5759c146a82b47239bf0fede1c67f49ec9970d3ca82ff1db6d4c53c7c8f3a3a657491ed12a8ca5de585ffcdaf032f3c3d1b9db6db0d4c75e613ef4dfc70
-EBUILD capstone-4.0.1.ebuild 1643 BLAKE2B 05e9ce54ba332dd94085bb4ab0a0d31fd2ccf8deba31b4a85aa11c511e0e4fdae9706c25c8c3b2fe72b871276269fa258333306a89396a88a95ec26387a23db1 SHA512 3a3329642d5bde8fd95c0180b3e83d5c6ac54a0b9d3f1dda753f419106f14be119abc83d13f6d0e2fdfe6a108ff5d7b0da1cb67b044d827d926ffed0068e4443
-EBUILD capstone-4.0.ebuild 1504 BLAKE2B 45d6ef6ac54959b9f8f0aacf2e09f22aec1d7c843aab4922f80e50489b00524c9de8e50228982b7650a44efdf879b1a6300966ab1ae19f1d77d89a1013f85874 SHA512 71bbb0ce3eb8dc5b88a1c93fd5d07221ccda696bf3a86476974b7762054bb6a67202be96204ffc947fcf60e5fda40680b8a2bd9e755cbce82a54e74b4baa7bb9
+EBUILD capstone-4.0.1.ebuild 1647 BLAKE2B af35af2e175af85de9339bdc94c8e9594626d0cf4793b776fa4669c844dbf235544387a9731c9376a4329e45f03f8832e448deaaf3878c38791c789bb6518ac3 SHA512 034b39d4b57a6e34505db08c469cb52db55eaa1bab3b55094ba888272de18978c1a9cc6693b5679ddbc1355b93cdfcaf28217e01a6215f3dfbd4d77288179a57
+EBUILD capstone-4.0.ebuild 1508 BLAKE2B a83acf938b0e6d90855bf8d199b49458db34000e54d226e6cc20409c716e7b1609268c0e50547bff8b8bb646926e51e7a9448541bff6578cc9dbae7c80d0facf SHA512 45e5c83938c97786c9dc6b1e076c605c7f24197d199960ba8a0c9aa77e38a2dbb6cb7746296fe65419ebfd0f054801d98656f720ef7b5580dfb1bbfdac19a678
 MISC metadata.xml 332 BLAKE2B 944b66779658094b7b1020400c1821dcf1f5138c85531fb83e853fa6d38219606f0f92673f57b3b621ffb3149eb50d60da281acaf469e97fc4c826b90c06b5a3 SHA512 a4952a89d043c4c8aec5a7a307d37d895880d49b381e5b881ffecf74b61c9c22cd854a68a1d1de3926431cdfad4f8ba70812be36bb7cac2df5dee8efe96dc269
diff --git a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
index a371dec0b3b5..f33b120cb404 100644
--- a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-libs/capstone/capstone-4.0.1.ebuild b/dev-libs/capstone/capstone-4.0.1.ebuild
index 77b9b960a583..668f96bde919 100644
--- a/dev-libs/capstone/capstone-4.0.1.ebuild
+++ b/dev-libs/capstone/capstone-4.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-libs/capstone/capstone-4.0.ebuild b/dev-libs/capstone/capstone-4.0.ebuild
index 2f0796ab51f8..18d7547f3dd0 100644
--- a/dev-libs/capstone/capstone-4.0.ebuild
+++ b/dev-libs/capstone/capstone-4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest
index d822e36033e0..7e6d8d979c3a 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -1,4 +1,4 @@
 AUX cdk-5.0.20120323-parallel-make.patch 181 BLAKE2B 2e69c15f66e63837dd430d0d22fbbcdc020d38c6faa23622020a69dc9cee0a22577427b5ed8eca2bcb386d635c970d7bde575ec9a44e5675660fa6ba398a267b SHA512 632f272cb5e5e9f927d7cd608ac7a001bfe560a035cde68e0243d80bda5cb1ddce2263fd8823455c96044676ab36067306572e6ed0347b83d4b630956b611c3b
 DIST cdk-5.0-20160131.tgz 516298 BLAKE2B 5e899afea1f034a48e46fef073303d0069e14310194342094392da517fa47793a1ac3ac33774369842daa1966dc9a4ad7404046874bc9cae24ceaa98a3dd7c47 SHA512 f8f7fc5fec3c040cdbfc2a0d886e9d9d9d231e56ed69adae0b91e03243b5edd550c5435f973a93d4cf7ab723bd27b55712af75162c4bfd3ae28b3c16cd68f755
-EBUILD cdk-5.0.20160131.ebuild 1184 BLAKE2B 973c1573acdb51726ad3f3701bd86e1b7a57ad9de6d1ec87650cdb840dc992d22129c81c0f888ac94d42724ddc882548743b9489c326d790fb5503b8f20b9088 SHA512 03eabdfbfe446da5c711601e29286bdb2bb9cce79058adabb319ed4199a4cf3f4bb75202704a3432e95456b9fcf6770a35d5f56950a4cdd60b924a37be4df8ea
+EBUILD cdk-5.0.20160131.ebuild 1174 BLAKE2B 55cc11c68f68ad09824efffeb92309e9b41327c7a85bf1ed9d9d48fc6f3ac0bdfa37b3a16c721f14cf82870ea059b2be1b70781cd760cfbd2d40eb0e27f5f84e SHA512 fa323d0684e2ad45d15d483dca56dd8436fef671993e4ccb26e444cb61529cc26a7f8dd54319133cd1025631be46488505751ac61c9ff36613f9c7a233cd3418
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/cdk/cdk-5.0.20160131.ebuild b/dev-libs/cdk/cdk-5.0.20160131.ebuild
index 4a42b99812b4..0ce34f6ccf76 100644
--- a/dev-libs/cdk/cdk-5.0.20160131.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20160131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="examples static-libs unicode"
 
 DEPEND=">=sys-libs/ncurses-5.2:0=[unicode?]"
diff --git a/dev-libs/cgicc/Manifest b/dev-libs/cgicc/Manifest
deleted file mode 100644
index 2b2c8ba73561..000000000000
--- a/dev-libs/cgicc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 3.2.10-fix-pkgconfig.patch 419 BLAKE2B 345f161cc6365dfc34e9740e83d44378fee197849dc2a79e96a40e205ab979970ce530a4e701efd5c3fd9e02e0de96987648b6244bc7b2b09514554b8c747789 SHA512 f2b688795317f11f67070b94227ef75afed02353cba5d0d98918a6107fc3a1ec107ab1b33ec29b32047098ca0d2acfda087016eef7de16be58af72ea7dd53977
-AUX cgicc-3.2.16-fix-doc-building.patch 812 BLAKE2B fe7a218331dca0618ce473d60968241ef19d5cce0008bb20018f0effdaa63a5f5c607b0f78df3eefbfb49cd2ed37e2f77d8a65bb781fccaa6014311986618f2d SHA512 c31d72d32dc0df5ec5b5d2286865e969d4ec432b3551c533d2b23c1acae8c4a821ea7891980f2af22da16c71f0561a19a38070a4394f43b4cfc4ec9ec5ed51e1
-DIST cgicc-3.2.16.tar.gz 1409037 BLAKE2B 414f0f9e1cfe8cac0bc55ed34bdd6d745595e2fd55329923fa47d269bb7abb3f1d2761ff9810c96930657c563f5f8aa5285c58943fca072273af3088205629ed SHA512 3334777204f3de57e80f759503db08076fe8e7a12cf779bb50345e7d06c6be4cc612b473bd74eded5debd79684b49c5bb79bcfff1b631a815c7fe9d14960d537
-EBUILD cgicc-3.2.16.ebuild 937 BLAKE2B 1770a5d37e03b1fa9ea56ba19393ab75fa3855ec6dec254df8a3efc079ec122db7da54757684d18dec53f022a5299d7bbdc6fb8075a14becd3ce80423817acfb SHA512 71f02a35b62b36e57064776817b4407f5ab32d404f8760e92a93c4131fce786536cdbd0807636df5c8fff23f11589b9b36d7fd1b21596b176291c37bc6d0047c
-MISC metadata.xml 796 BLAKE2B 8b502996ad54d8dabf3c8279440115f39fb64bb70c1e72bd5ddb90b224f0103c0e011dc0f5985b5fd279a3bd24a05e98d6ea2f408d13cf7881b90bf71efb230f SHA512 5cf675335892f7f230841d62bb77fb947207869083f340c735d3a5b78d39b43b9f0cb911e206f854c2291481420e72fea1abcde2853566b2e6fea858b2695fbc
diff --git a/dev-libs/cgicc/cgicc-3.2.16.ebuild b/dev-libs/cgicc/cgicc-3.2.16.ebuild
deleted file mode 100644
index 55dbede7198b..000000000000
--- a/dev-libs/cgicc/cgicc-3.2.16.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A C++ class library for writing CGI applications"
-HOMEPAGE="https://www.gnu.org/software/cgicc/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 doc? ( FDL-1.2 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/3.2.10-fix-pkgconfig.patch"
-	"${FILESDIR}/${PN}-3.2.16-fix-doc-building.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable examples demos) \
-		$(use_enable doc) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc {contrib,demo}/{*.{cpp,h},*.cgi,README}
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-libs/cgicc/files/3.2.10-fix-pkgconfig.patch b/dev-libs/cgicc/files/3.2.10-fix-pkgconfig.patch
deleted file mode 100644
index af1c069334e9..000000000000
--- a/dev-libs/cgicc/files/3.2.10-fix-pkgconfig.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cgicc.pc.in b/cgicc.pc.in
-index 2006be8..e42c9bf 100644
---- a/cgicc.pc.in
-+++ b/cgicc.pc.in
-@@ -7,5 +7,5 @@ Name: cgicc
- Description: GNU cgicc is an ANSI C++ compliant class library that greatly simplifies the creation of CGI applications for the World Wide Web.
- Requires: 
- Version: @VERSION@
--Libs: -L${libdir} 
--Cflags: 
-\ No newline at end of file
-+Libs: -L${libdir} -lcgicc
-+Cflags: -I${includedir}
diff --git a/dev-libs/cgicc/files/cgicc-3.2.16-fix-doc-building.patch b/dev-libs/cgicc/files/cgicc-3.2.16-fix-doc-building.patch
deleted file mode 100644
index 4430ffafaf95..000000000000
--- a/dev-libs/cgicc/files/cgicc-3.2.16-fix-doc-building.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Fix build system properly, such that hacking the Makefile.in's
-is not required anymore.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -77,6 +77,13 @@
- AC_MSG_RESULT($cgicc_demos)
- AM_CONDITIONAL(DEMOS, test "$cgicc_demos" = yes)
- 
-+dnl enable/disable the docs, if specified
-+AC_ARG_ENABLE([doc],
-+    AS_HELP_STRING([--disable-doc], [Disable building documentation]))
-+AC_MSG_CHECKING([whether to build the cgicc docs])
-+AC_MSG_RESULT([$enable_doc])
-+AM_CONDITIONAL([DOCS], [test "x$enable_doc" != "xno"])
-+
- if test "$cgicc_demos" = yes; then
-   AC_CONFIG_FILES(demo/Makefile)
-   AC_CHECK_FUNCS([gethostbyaddr])
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -10,7 +10,11 @@
- 
- ACLOCAL_AMFLAGS= 
- 
--SUBDIRS = cgicc doc support $(DEMO)
-+SUBDIRS = cgicc support $(DEMO)
-+
-+if DOCS
-+SUBDIRS += doc
-+endif
- 
- CLEANFILES = *~
- 
diff --git a/dev-libs/cgicc/metadata.xml b/dev-libs/cgicc/metadata.xml
deleted file mode 100644
index c65be4a96414..000000000000
--- a/dev-libs/cgicc/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		GNU cgicc is an ANSI C++ compliant class library that greatly
-		simplifies the creation of CGI applications for the World Wide
-		Web. cgicc performs the following functions:
-
-		- Parses both GET and POST form data transparently
-		- Provides string, integer, floating-point and single- and multiple-choice retrieval methods for form data
-		- Provides methods for saving and restoring CGI environments to aid in application debugging
-		- Provides full on-the-fly HTML 4.0 generation capabilities, with support for cookies
-		- Supports HTTP file upload
-		- Compatible with FastCGI
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index fb4ea7878d15..aceefb06e9ea 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,6 +1,6 @@
 AUX check-0.12.0-fp.patch 1727 BLAKE2B 8643aa3b1ebaece72c9bb6bad52077f554baea2d51b27bcc310c409c054630c5dee7a0d1159c929d08524fc1bd2fa6e596a9098684d5353c111bb5a09e519798 SHA512 f4d6066d194f19ed46c0fe773fdf3d80b833df2d6e84d90d409c43577ee871f400c0a6cd4cae115d64109232384e924d4d8f4fee5ff3b856f1e921cc9b38c384
 DIST check-0.10.0.tar.gz 769119 BLAKE2B d5e256bef4aa010322844ce748e620ce884658d74b14e1ea5b0e1bbd4565ef7b0cb7b86d315a36f7a5e4d225e40f242ff9730790bd55fc036757b4296396d153 SHA512 82103a98382c41cf16f172ded66c0399d3da6eceb6728aab11120c028e8796f6d545a98dc4aa5f76ee68c0bfd1f842a4dd371f5d670c8ba84ce4209812bf1ac5
 DIST check-0.12.0-github.tar.gz 281127 BLAKE2B d7dc89c10022594a37e9a4bc6b9fe1e8f355af864a5012c292cc3f1152e9e3e9be01fa34b39e5168f65650e540f36dbc8195952908a871d1c111283429f2f538 SHA512 f7b6452b69f999a90e86a8582d980c0c1b74ba5629ee34455724463ba62bfe3501ad0415aa771170f5c638a7a253f123bf87cbef25aadc6569a7a3a4d10fce90
-EBUILD check-0.10.0-r1.ebuild 1814 BLAKE2B c8bd82aa70b80c9926fc5116b75f550af44dce1d7c0fed25102c469030c8ff234244c4d0e1e42c043263a6dbedfe3d0e48df199d6e1eb524233eb64d80cc6b97 SHA512 4b562cbe03cb7626fba1be6b2661d7e7622927dd7f4e85eb79bacb2cb335006738b3c3b9d89e75b5c5bf838e074e7e617496e6e0bedaa0c22c105695e6123c39
-EBUILD check-0.12.0.ebuild 1805 BLAKE2B 928305e320c6984b464ee7f1d70e1f07e1b13af58e0ed124b3d05a24efd8fc98eca119d4dd493dca2e3d3452a5bfc5a3853f1ea22368f5b715728799b1339d48 SHA512 87365e656c451cfd9ee56147dc2615c7ffa90d22e66bdd749ff0332ff5918755183853bafb655827d97f66f3685f2ef5d579b7f7d4228becae2752b024dde9b8
-MISC metadata.xml 389 BLAKE2B 760424e280668d9b139b3d7e5da8e679759ea30fec10bde3655192e6f78c131ba1d16c928381573c3f369c0fbb1c6111c82ba37ce65ecd966afb3ba4bd6b86d8 SHA512 6227f1f7423c7f96c8d731f0078a1f6a9b9ff71c4b9f2ff8d9d87e46944f46ea18d66e1526002360e6763d5734d4f0c3c47230e094e212bdb88ee7be74d7bbd4
+EBUILD check-0.10.0-r1.ebuild 1792 BLAKE2B 258840e8effd0212bda0d7851ebaf09b8685a479566e8cbb50660b00f133b4b5d129db93e4022297757bba8ff2486353e4767d6279c430bf2f9d0cbc864bb359 SHA512 b058e308c58f2988a63d0b7e4fa0c3c1cac7cb34afbaab74d1b032eb0512420bd0330c20df527e23b5211bf14a1c5212f3e2bb79feeeef89952ce430f3af0dc0
+EBUILD check-0.12.0.ebuild 1783 BLAKE2B da5d9b52a93cb886150e906f778578aaddf923467b4275bb38eb94388fd01b55a16d02ce43309259a349616b1c200b2c2708932a05145cf652ce5e94bd518cf3 SHA512 03b6274c56da34948c52843cadbb610e5eef33a67a6da2203c037d71e87719ffdd9f9f9b76098822b494617689387955b2a1c3784a417dc523a15746e846c92b
+MISC metadata.xml 488 BLAKE2B 27eb0323a4d7cac50b2f4ee935c75e7a35c34066a0dbc5bf21f8b4fb93abe82aa79a5fa1fafed0e623417ceaa553dc8395f201a24c3e0123df3104be44106bb7 SHA512 4b69b4b1ca91bfe4b04d03935d3d6e9b8ca10ecaa538884834f357708db5380a90e9cf1fdcef7996b7c4d8a23c0cb8e1d9eb9d34faa584637804ebc67657be69
diff --git a/dev-libs/check/check-0.10.0-r1.ebuild b/dev-libs/check/check-0.10.0-r1.ebuild
index 338e7eeda110..fd4b910c3824 100644
--- a/dev-libs/check/check-0.10.0-r1.ebuild
+++ b/dev-libs/check/check-0.10.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs subunit"
 
 RDEPEND="
diff --git a/dev-libs/check/check-0.12.0.ebuild b/dev-libs/check/check-0.12.0.ebuild
index 58717a22bd61..131ec484ae50 100644
--- a/dev-libs/check/check-0.12.0.ebuild
+++ b/dev-libs/check/check-0.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}-github.t
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs subunit"
 
 RDEPEND="
diff --git a/dev-libs/check/metadata.xml b/dev-libs/check/metadata.xml
index 2f39b9d091bb..9db0afcb5fff 100644
--- a/dev-libs/check/metadata.xml
+++ b/dev-libs/check/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
-	<use>
-		<flag name="subunit">Enable support for the subunit unit test protocol</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">check</remote-id>
-		<remote-id type="github">libcheck/check</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+  <use>
+    <flag name="subunit">Enable support for the subunit unit test protocol</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">check</remote-id>
+    <remote-id type="github">libcheck/check</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest
index cbd43f50943e..112957ab87f7 100644
--- a/dev-libs/cloog/Manifest
+++ b/dev-libs/cloog/Manifest
@@ -3,9 +3,9 @@ DIST cloog-0.18.0.tar.gz 3776262 BLAKE2B fec90c701f2042c0bfdd68099ec6ef66ecc2611
 DIST cloog-0.18.1.tar.gz 3857324 BLAKE2B 5898cb8d8f36e55dbe38e7866e07c0abaf8ca0b9e619a5ff963ae975148166fc9bb1c77a33aef1ea2014e739e4ea1c37e4bc2ce5e7411d900fb472192e6fed7b SHA512 0b12d9f3c39a2425e28e1d7c0a2b3787287fe3e6e3052f094d2ab6cffeb205ce19044100cbfd805659b3e6b3d21ac2f5a3c92848f476de54edfe6b1cbd2172e9
 DIST cloog-0.18.3.tar.gz 4577597 BLAKE2B 179f13d4cf1f3c13ed5afcbad9226a1fc496aac5c56f6129457516a8e52ec753c8ac3532f7ac975b62e0dc09ed4b84523ebb7146a7bd991bee04d3416558c8c4 SHA512 14fc2af0da62cd17b1a9f5a7a1704da6bfe5dc78639928637588203e61847795a652ff788c313c34b6e7dd85fb329678eb4f72e0e1c9c149be6619ebf046cff8
 DIST cloog-0.18.4.tar.gz 4796456 BLAKE2B 9d1f281abe48d40f726c3fc66c58c0d7cb90f6d3ca47af02c8f00b5cc69c6de6b0362b2dc406a8cb6310e07c6b2991f6de3b6b407ad7db0190b9bc69ac82773f SHA512 d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23
-EBUILD cloog-0.18.0.ebuild 862 BLAKE2B 7613752201f4d1b140136a3178e9d91f46c120ad5a6a470d35d9f435f29aa5a88a663c6659d84a7d6fb2cf075d67270ad8ef677fdeafbebeb32133e6e2f84442 SHA512 f0d9140ac09082aa481163f47ec368fa1be4cbf032a5d7cbaf1eb7759ef503a2bbe7d175f3efe52e160c9ea6a7d941be094cce7781003f5fedbbcc4af32e4ba0
-EBUILD cloog-0.18.1.ebuild 1002 BLAKE2B 8062382984618aea7eb682c374ebb3408c37408c5b925b825bf5f0de2a5099d9b76e087ec6e2a90477963b5bbb035e72b04c60a217f02aa454690f298f46b329 SHA512 33e934d5e59ce9fccd558cd669378076bfc717b778a65a1c8449f1abd0948b57f770396735c62f073c5fdbf4f7038a2c6bd2c67e0cd71b150a21d9266843b43c
-EBUILD cloog-0.18.3.ebuild 1481 BLAKE2B 806521dd1613a52fab0c27a116b58d4d3a4f43ab300a1e40781352f763a5bc88f522f9ef97a546777cf1617d7fa283cd1924c1b06bc5edcb6e99772ea2d906b9 SHA512 f19c0945bde9d4fdb7d9ab7ccf25f1e7c346512a0fae91b8c0da4f282602d3ad4529eff4abccd9e43a1f1313722baa57094bb8b0b8a62fa4b0a1dd18f5a8bf9d
-EBUILD cloog-0.18.4.ebuild 1426 BLAKE2B 2d0c6e34606f959c698416c3c2ea8f52a935c3f36bedf3afbf234b3a35c1efd7bb7289060ce5993e2ca5e830df0fb8895cb55233ce3c17c1f898d1a4b073536a SHA512 5f1ffef0aec96c0ae78e3feccca6680b0d0e52ec26f92231137975ff51b9cf24a3c645e934a1be95f49000f19a23020f06c27a3a63948cab96117f9682b1d936
-EBUILD cloog-9999.ebuild 1466 BLAKE2B 9b79f41f96f2ceba0c147725c669722fc527a86bd8d96cd8104d3c6317222a7c4910e54c03e64d73cf532c85023a432a940c58968e7a348b39ee1fda2a74f806 SHA512 e5c4f4ce715b271ea05fa2ec866356a4c0b113bc4c58964a99651a06c47633468a74f844df40213531b688904d4df6995c1207b401496cc3a6a6a1035de1ed77
+EBUILD cloog-0.18.0.ebuild 840 BLAKE2B d63d1b1784224c0899582ee6ebb5db655fb8b200b7eeffc4341e6a4ff2c7ca9aa09e44ad68b471a60f47d41dd38dd34c790333c2f831ecc64450d3afde8e5f30 SHA512 d54e4fc522de8958bcf9646ea93d75051d69d2fb2513bc688a878a171958958159e7e8c8a878cd270d36ece4bf22475c7c5bfc9c22cdfd36f737a5dc8d53541d
+EBUILD cloog-0.18.1.ebuild 980 BLAKE2B 215f1dcf700347cb08524aaa48c59280f219a92030f2e66477cec0fb78743cb8ab7764b158a6870b2dc1cd223e59903cdb9062485065f66841b1da360c724c76 SHA512 bfeb6d8c65bd0fc0660202096d1ed81ef1f12b39044e7510c332778a66525d79ca1da67e5e3091fec49d57e237b874d806997049b58ca6c1d48a6d135e296595
+EBUILD cloog-0.18.3.ebuild 1459 BLAKE2B 825d4835090613a1c3c1afaa268df3ccbc3a144ae448e6249579d8c0d17eb67c34f87e248e6455183f3e1638729bc691622492f63d24a9b8cfe0684a97f73908 SHA512 6015ddc56d837da19424d3ea9c8ed1e22574ce74cd6e2a5956af6c4747decefef7c0fc6821eb89aca740dbeb0bfedeaabc873885621cbccf0980dca567ae6fc5
+EBUILD cloog-0.18.4.ebuild 1404 BLAKE2B c4b1fff243f356387c1519f6656ec5c5597edb5792aba006b5993c4081b877bc0507fc05b178dde6a14984fce516addf829c62b3d9babbdfbf16791c94b856b9 SHA512 80a9e7a7dce501f3b0fcf03db3659fe1bc4c59eb7f95105941fed6064394bce50579f5df84faa2ec226a2b620d7ca918ac9a7720109f12f6f43408dc5db5622b
+EBUILD cloog-9999.ebuild 1444 BLAKE2B acd027483a3a3722c216caff695c1cb10e7110c4b42a99ab56810d6909747c32d10b2ad8b4d16f843d6646cb7b590a778843d521064ad729da8c33342811341d SHA512 25d3f5b6e24f118f2fb65df7400e0a077063593186034dbe86665b452d95d3fa76f6c8a0cc3ccb0248b83ea5b11e16da3fc1a7ba288288b7370ff772595709b0
 MISC metadata.xml 221 BLAKE2B 79f6de476af31c1da59c7aeebab26fa0db49c902398f6f73beeca03d3077820240bc51a25d2945642d9a07470470f2ca9548c2d8f1c63a8592966f6df9955926 SHA512 edb14bd2dae6ad57f77c07fc601cf2782589165c7e48e1e123eff7e47044febfdb1e19d18cd0b240fd2ca494e3401b5aa1f1243480769e0faf5dbfa377d20a3b
diff --git a/dev-libs/cloog/cloog-0.18.0.ebuild b/dev-libs/cloog/cloog-0.18.0.ebuild
index b8484bae5fd1..8e70a9c5c215 100644
--- a/dev-libs/cloog/cloog-0.18.0.ebuild
+++ b/dev-libs/cloog/cloog-0.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 DEPEND="dev-libs/gmp
diff --git a/dev-libs/cloog/cloog-0.18.1.ebuild b/dev-libs/cloog/cloog-0.18.1.ebuild
index 51d577587042..9d689ab51e63 100644
--- a/dev-libs/cloog/cloog-0.18.1.ebuild
+++ b/dev-libs/cloog/cloog-0.18.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/cloog/cloog-0.18.3.ebuild b/dev-libs/cloog/cloog-0.18.3.ebuild
index afba131ead94..12ab4e9cdeb5 100644
--- a/dev-libs/cloog/cloog-0.18.3.ebuild
+++ b/dev-libs/cloog/cloog-0.18.3.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/cloog.git"
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 	SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
 fi
 
diff --git a/dev-libs/cloog/cloog-0.18.4.ebuild b/dev-libs/cloog/cloog-0.18.4.ebuild
index dab39664621a..e02d356227a4 100644
--- a/dev-libs/cloog/cloog-0.18.4.ebuild
+++ b/dev-libs/cloog/cloog-0.18.4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="git://repo.or.cz/cloog.git"
 	inherit autotools git-r3
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 	SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
 fi
 
diff --git a/dev-libs/cloog/cloog-9999.ebuild b/dev-libs/cloog/cloog-9999.ebuild
index 44fb3bc55495..fa0e96d64965 100644
--- a/dev-libs/cloog/cloog-9999.ebuild
+++ b/dev-libs/cloog/cloog-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://repo.or.cz/cloog.git"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 	SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
 fi
 
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index 56c705dacb1c..979d2187d705 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,5 +1,5 @@
 DIST confuse-3.0.tar.xz 449144 BLAKE2B c8e913aa8b074d55535c35ddce7de1a0f21dade78839f66723272780345d4b5c5f265c2040a4abc9b473a09e221b50450382dff60103198f72384d28d1ab068e SHA512 12279045b772e94d2e29201ab1d7aef1ef8e698780a22d6a282d12f51ccd9a437e7817a4dd5e39bdfc8dae79700b72aa0783b4b983a935d751403d2cffd1161e
 DIST confuse-3.2.2.tar.xz 473912 BLAKE2B d8df03f4543291afa6d46a36c48f78d25aee7cdcd0fab7a37a639a73cd0562b52a70057075f83f7e4e56bb542a27561a65e3217c458d757345c46a29203e6187 SHA512 c6baea65e064fe7f2d1bde187c6dcbb7f03c31f5d777cb04576f9cc2d94e9c96b7ee202e030e9a2c7eb619deb240d9e76fb12b3528ae5aa0d3abe231354d12c9
-EBUILD confuse-3.0.ebuild 1147 BLAKE2B b093e1e0ae54d28daacf0f44053c03e028dff3e39a584105a0a98089afa064876ae733838eae4eea571fbf5045dc96ebfcff02509ca3d239ab7e492aa0bba91b SHA512 a25765ee079b156f33aedd4e9ba0c76a497452ab993c373e67b2d5eee1b74999ff88bd1741c4b5b7383d7d8d71ec720bb69d779e79758479c27bef2d9fb08416
-EBUILD confuse-3.2.2.ebuild 1176 BLAKE2B ccf43f41a046556423e2cf72739fe108d6c647218a7e54b7045c575e4412001b9f9a61446d9be9f259eaddef12392b8592477fff58b3930897811513fd927523 SHA512 c435f6b693d892840adaf9d9e33c4a0306666c864cc4215397380495660e553c2787525be1e7f313b09049261a701f94f18c92c4c74adc862b73696f42823e0b
+EBUILD confuse-3.0.ebuild 1137 BLAKE2B dd3f6c9b21cb7de4d283b761e3ed9862b49efca671428aa68fb94c3d8be565393f4f7324fb13e97a307073f22ffbbb0d6355a094eaf9dc5f42f71a00d41c7a76 SHA512 94da0c70730a57e0471dfedf6961fff224afb6d71f62ac441baf055497964916048da099c496e870927a35b73dd96f8da5f58aeaa18a551905bb548c475069bd
+EBUILD confuse-3.2.2.ebuild 1166 BLAKE2B d1cc36dc2714940b29af9c75fcfe50b8ffc7ca23fd37759fdecdbf84493098b923c4a03ef20e36998b4babd8d810ec3a398a2b877131bcd3bb8f767c93201bfd SHA512 08013b8392e51852abf619d717eb1e36a76c2d4eef8b3f29823e642cf63bf30c21d049153c07334384c6ab16920e8683c6ef0747130fe924656e53ffeab5452f
 MISC metadata.xml 403 BLAKE2B 5d262f11d79e80fdec33ec5f50e2d008a2ab9610ef1823a38a6db0a9e211d63200bb33ab2251b46b117ca7f68ab061602eb664cfe8758928696bc260c463c905 SHA512 85ff2055d87b94e9da3afa22885ef494764fcaa686e1487f7a9c87a4f172333d1c9effa28544e2683da507e2b6e52ac0fd1d8662a0cc97a9ce5f462d98d703be
diff --git a/dev-libs/confuse/confuse-3.0.ebuild b/dev-libs/confuse/confuse-3.0.ebuild
index 516a677978e3..957aadb77b40 100644
--- a/dev-libs/confuse/confuse-3.0.ebuild
+++ b/dev-libs/confuse/confuse-3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar
 
 LICENSE="ISC"
 SLOT="0/1.0.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~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="nls static-libs"
 
diff --git a/dev-libs/confuse/confuse-3.2.2.ebuild b/dev-libs/confuse/confuse-3.2.2.ebuild
index a36fb39e57e8..76799f458701 100644
--- a/dev-libs/confuse/confuse-3.2.2.ebuild
+++ b/dev-libs/confuse/confuse-3.2.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar
 
 LICENSE="ISC"
 SLOT="0/2.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~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="nls static-libs"
 
diff --git a/dev-libs/cpl-stratego/Manifest b/dev-libs/cpl-stratego/Manifest
deleted file mode 100644
index 2b35c6b8d9a4..000000000000
--- a/dev-libs/cpl-stratego/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cpl-stratego-0.4.tar.gz 146956 BLAKE2B 72cc0909abe273bbc7e275a874449e8497cd534d88273dc3a1ff070fc4941b4966b76d76c37a5247b22235181cd87b2870a4752db4ac4f0f6e99199e963c4229 SHA512 05253a10b7359bedb99d9c8150018808d3961545f0b3e83a19acb8be94fca12a45503b14f96d02605b6a3453ffbfff542017e1e35e9c5ff48e719640a601f675
-EBUILD cpl-stratego-0.4.ebuild 650 BLAKE2B 3ecd0a9684a7250fc4e22ac444f383f1f5f86b1c8a8c440cfbbc42714015041863c74e1a26beac279b172a1222019719e5c0441d72ea4a1f3ea661895450d6e2 SHA512 500e44f09638d7060a2f9c1b43138b45e842ba06eff34f408abc9b3698b694761f78a33f0a2bf51004d23bd9e104f138380a42aed96f65081b3e5e4a8756cb3f
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/cpl-stratego/cpl-stratego-0.4.ebuild b/dev-libs/cpl-stratego/cpl-stratego-0.4.ebuild
deleted file mode 100644
index 60994f6f2508..000000000000
--- a/dev-libs/cpl-stratego/cpl-stratego-0.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="Choice library mostly used by Stratego"
-SRC_URI="ftp://ftp.stratego-language.org/pub/stratego/stratego/${P}.tar.gz"
-HOMEPAGE="http://www.stratego-language.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf || die "./configure failed"
-	emake CC=$(tc-getCC) CC_DBG=$(tc-getCC) CC_GCC=$(tc-getCC)
-	CC_PROF=$(tc-getCC)  || die
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README*
-}
diff --git a/dev-libs/cpl-stratego/metadata.xml b/dev-libs/cpl-stratego/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-libs/cpl-stratego/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-libs/cvector/Manifest b/dev-libs/cvector/Manifest
index 0758d0af9db8..44fb3da54087 100644
--- a/dev-libs/cvector/Manifest
+++ b/dev-libs/cvector/Manifest
@@ -1,8 +1,5 @@
-AUX 1.0.3-LDFLAGS.patch 1152 BLAKE2B ad6c7d92261225d32e2d409e8d664f24dcbf1e17bc29041147680b3d9aa3f573b2665012add031b24f36e65d8e4b8abd3388ba72e53c203cc962fa45b2344885 SHA512 f53243764a7c0b93244fb7a4ec969b560886c3f6f87827d8984e7d81a4b103c50868cf1b8f401d079a019f9cf1c4df73403eb07fb5ef03e7e3680d17b9ed2a0b
 AUX 1.0.3-dynlib.patch 1341 BLAKE2B cb2349fe5f797f9bfc973a7dea2f3121124765cf6609a528dbb153f1cab5bc0d76aadb715819902d06c1b61d001ced7a3012cd8b24a77b1984e9eb3ccdd59477 SHA512 3901169267fdd3ccd6999f1fb64a2f2929636d47969950a59297254ab9122e7e9e1ded33a5804ed989e96a0ab7c3368b7812a46c7e4898e1095b76bdeed65405
 AUX cvector-1.0.3.1-LDFLAGS.patch 1153 BLAKE2B bf13c263faa0efa5b5778c044ffee151d0a88dcd9af7ec50561294050ef7369b6e1c0d2fb233aa18b93f1b182453f416428fc92db5d5da8dd1309f8faf19fa52 SHA512 be79a156fb138c71af9d630133769d8f37d8ff5357d97212fd9082964c93d8fe0d09ebc4e393378eba73aee4c0435362e6930d6b5c18a1b6f3d6af0d6f42cfcd
 DIST CVector-1.0.3.1.tar.gz 19761 BLAKE2B a744e810018c1769a3f9d623c43e86a52d5f1c7b6502761768686e5b52e88c34c32f056d937a395c903a82224d503d2843bb3516c297b61cb87cec589ff9758e SHA512 41300e46873efa8a2cfc44c76788025385fa7b7a108cf9dd95e4e28d515d825d4a44786a7ffb130d727a42907d56e4f62e6f75a02c96333b6afdc06c336d538e
-DIST CVector-1.0.3.tar.gz 41642 BLAKE2B c8e536340a703ea7363efe763d9cbea58af68278d0c21eed926704af52a28082785bdcdd67f2a1c5a47732cabe3ca801c7e4fba204c2a8d7c2d8298e272035cd SHA512 f43030d95aeb6ef230dada13903ad56049acd15379a0c04e08b6ce8d7df7baffa3bac166af0c3c93f018e00058e07680af655e71bc0d542a6da2ad1f18e95788
-EBUILD cvector-1.0.3-r1.ebuild 1075 BLAKE2B af6bfeb367da2d7c1426c8906cfc28825a320eb18e9dcd173e097b4c769a707d7ab351c42c35415be1dadad52319e315aa4ec846f2b97d15402e596e9fd95410 SHA512 6de21d0fb679bfe86508562461914a59bfc4f3175326688721bd6db90d8bbd1cdba4a510863e89d1b5db532e1a8af7cec27a07f561c8378326ca2a70374bae8e
-EBUILD cvector-1.0.3.1.ebuild 990 BLAKE2B 7076ef81193893ead8303911b183d3c834a56f3e24a073489e9f3cb154c863283ba04f7242767c5733edbc1222ad64dbdd8015f2ae4fdb027437cdd959555d67 SHA512 3775af6355682df815b68adf75c6db3242db85e05fe1a9c902557a9a0e087fa126a3b8d6e6dd30d45b703e35cc1ce0cfcda8238c1985a224647bb0a9ed91f399
+EBUILD cvector-1.0.3.1.ebuild 984 BLAKE2B 495d99e67c4786565b7c4d5046cfb26d0e3855b2209f5c3a8f805a3e3753dde1b93e927c9928614c23a0e4b821742eb352a163589fa8a6e2b78f1a996a700ce4 SHA512 3e677f52840f3e6b6da0a33d0dc6ae76a815d58c07eda34968008e3d787d2566323dc50568e6a201ff2efd251cda262867cd99da6175aca5d17be7583ca1df3b
 MISC metadata.xml 292 BLAKE2B acd46df483f27dfba0857ead97a9c346d48985f9e968e7cf5f5ca78fda8ed2357b15ea36902d05cb88fb298eec92d66878bbc424012c4058935fd7bd02f0fae4 SHA512 bb912139330ed5ceef2570a6c08b0b76f908005ce2c8fdb060e4b52aa63c0854c2e534bd5eff1257ef70e96b0b4137186dbb95f1dce0edc0da50304ccacfb480
diff --git a/dev-libs/cvector/cvector-1.0.3-r1.ebuild b/dev-libs/cvector/cvector-1.0.3-r1.ebuild
deleted file mode 100644
index 66e34fe08965..000000000000
--- a/dev-libs/cvector/cvector-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit base eutils toolchain-funcs versionator
-
-MY_PN=CVector
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An ANSI C implementation of dynamic arrays (Approximation of C++ vectors)"
-HOMEPAGE="http://cvector.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-LDFLAGS.patch
-	"${FILESDIR}"/${PV}-dynlib.patch
-	)
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		CFLAGS="${CFLAGS}" \
-		all || die
-}
-
-src_install() {
-	dolib.so *.so.${PV} || die
-	dosym libCVector.so.${PV} /usr/$(get_libdir)/libCVector.so.$(get_version_component_range 1-2) || die
-	dosym libCVector.so.${PV} /usr/$(get_libdir)/libCVector.so.$(get_major_version) || die
-	dosym libCVector.so.${PV} /usr/$(get_libdir)/libCVector.so || die
-
-	insinto /usr/include
-	doins *.h || die
-
-	dodoc README_CVector.txt || die
-}
diff --git a/dev-libs/cvector/cvector-1.0.3.1.ebuild b/dev-libs/cvector/cvector-1.0.3.1.ebuild
index 8ed823a39a98..83e0ee6f0d48 100644
--- a/dev-libs/cvector/cvector-1.0.3.1.ebuild
+++ b/dev-libs/cvector/cvector-1.0.3.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,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_PN}-$(get_version_component_range
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-libs/cvector/files/1.0.3-LDFLAGS.patch b/dev-libs/cvector/files/1.0.3-LDFLAGS.patch
deleted file mode 100644
index 7e54e8120245..000000000000
--- a/dev-libs/cvector/files/1.0.3-LDFLAGS.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile	2009-07-08 04:02:56.000000000 +0200
-+++ Makefile.new	2009-07-25 11:59:27.000000000 +0200
-@@ -89,10 +89,10 @@
- endif
- 
- COMPILE_COMMAND        =  $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(INCLUDES) $(WARNINGS) -c
--LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined -rpath $(INSTALL_PREFIX)/lib
--BUILD_COMMAND_LOCAL    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES)
--BUILD_COMMAND_DYNAMIC  =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -shared -I $(INSTALL_PREFIX)/include
--BUILD_COMMAND_STATIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -static -I $(INSTALL_PREFIX)/include
-+LIBRARY_LINK_COMMAND   =  $(LIBTOOL) --mode=link  $(CC) -version-info $(VERSION) -release $(RELEASE) -no-undefined $(LDFLAGS)
-+BUILD_COMMAND_LOCAL    =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS)
-+BUILD_COMMAND_DYNAMIC  =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -shared
-+BUILD_COMMAND_STATIC   =  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -static
- INSTALL_COMMAND        =  $(LIBTOOL) --mode=install cp
- INSTALL_FINISH_COMMAND =  $(LIBTOOL) --mode=finish
- 
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index f92fbeae7c74..c43342bf0e04 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -15,5 +15,5 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
-EBUILD cyrus-sasl-2.1.27-r2.ebuild 8139 BLAKE2B 1221f7bd37df906bf75b6dd46dd57e443ae429315b85dbd644acb12e02437b6a2d725e1a1a10b19bc140e7acd0faad5ec9750c6b5553bf8f3aaa3f578d0b89c1 SHA512 64fb3438115b5c2539d788bb4067c6f279720b0342cd87c830e8045bb20142dfec7ab8633757c100fbd8fb029f6733126f1e7a9556e9f0d927129ee0fa231fd1
+EBUILD cyrus-sasl-2.1.27-r2.ebuild 8118 BLAKE2B fab752538f93a5a09ebfddeb45d8274a25a68f8fb65bfe633503aafdba1e5f8772cb3265a29a9f0c09e9ff9dd0a91e2c186bd5b7c5dd33700968fa7199257f2b SHA512 db586ef972936f3f8d2d007a799cadfb16e00ab3caf076acf06d1b7344a495825d5128cd3789b4e25b513ab48f39ab4eebe586cdd631c28b88511d79cd67636d
 MISC metadata.xml 630 BLAKE2B b24d644395a824cc17a25bef92679a2dd50656722223ded02b3311cd9b386470f4f2dafe8c8d604fd042a096d8f0f2d532e2bbc261e3c0affe4dc8d7a1db816c SHA512 45178682e8cfab5eda20e3244f42ce37be7f0e16c87405d0a1e198f561a73f8105df384055f6f228864030f4a196dcdd6b2eaf51b65b7e49f84827df9b56fba4
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
index 459226cf0147..e35b1e65fd2a 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
 
 CDEPEND="
@@ -25,7 +25,7 @@ CDEPEND="
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
 	mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] )
-	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
+	pam? ( >=sys-libs/pam-0-r1[${MULTILIB_USEDEP}] )
 	postgres? ( dev-db/postgresql:* )
 	sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
 	ssl? (
diff --git a/dev-libs/darts/Manifest b/dev-libs/darts/Manifest
index 3b4eec1eaf94..9bfd6d58d1bd 100644
--- a/dev-libs/darts/Manifest
+++ b/dev-libs/darts/Manifest
@@ -1,3 +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
-MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
+EBUILD darts-0.32h_pre20181117064816.ebuild 1355 BLAKE2B d3be92820ddbb72b77ca357450cbe13172d010f349c64f668656f5c544649c629c9f6029d889318792aacbf9d2849237b8814db8c4fdfcae469af2f4a6592c25 SHA512 e62e473d08d7d3e72fe1a9d86c05e3bffb5c8d791bfa63a0e35ff587cf99591966266280dd82735154da3faa3f3f7cb2509e19f5e143656d2e011ffd09f2bd52
+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
new file mode 100644
index 000000000000..a379bd2b6cb6
--- /dev/null
+++ b/dev-libs/darts/darts-0.32h_pre20181117064816.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2003-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/s-yata/darts-clone"
+else
+	DARTS_CLONE_GIT_REVISION="e40ce4627526985a7767444b6ed6893ab6ff8983"
+fi
+
+DESCRIPTION="Darts-clone (Double-ARray Trie System) C++ library"
+# Original upstream: http://chasen.org/~taku/software/darts/
+HOMEPAGE="https://github.com/s-yata/darts-clone https://code.google.com/archive/p/darts-clone/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/s-yata/darts-clone/archive/${DARTS_CLONE_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+BDEPEND=""
+DEPEND=""
+RDEPEND=""
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/darts-clone-${DARTS_CLONE_GIT_REVISION}"
+fi
+
+src_prepare() {
+	default
+	eaclocal
+	eautoconf
+	eautomake
+}
+
+src_install() {
+	default
+
+	local language source_file target_file
+	for source_file in doc/*/*.md; do
+		language="${source_file#*/}"
+		language="${language%%/*}"
+		target_file="${source_file##*/}"
+		target_file="${target_file%.md}.${language}.md"
+		newdoc "${source_file}" "${target_file}"
+	done
+}
diff --git a/dev-libs/darts/darts-9999.ebuild b/dev-libs/darts/darts-9999.ebuild
new file mode 100644
index 000000000000..556c583634b1
--- /dev/null
+++ b/dev-libs/darts/darts-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2003-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/s-yata/darts-clone"
+else
+	DARTS_CLONE_GIT_REVISION=""
+fi
+
+DESCRIPTION="Darts-clone (Double-ARray Trie System) C++ library"
+# Original upstream: http://chasen.org/~taku/software/darts/
+HOMEPAGE="https://github.com/s-yata/darts-clone https://code.google.com/archive/p/darts-clone/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/s-yata/darts-clone/archive/${DARTS_CLONE_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+BDEPEND=""
+DEPEND=""
+RDEPEND=""
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/darts-clone-${DARTS_CLONE_GIT_REVISION}"
+fi
+
+src_prepare() {
+	default
+	eaclocal
+	eautoconf
+	eautomake
+}
+
+src_install() {
+	default
+
+	local language source_file target_file
+	for source_file in doc/*/*.md; do
+		language="${source_file#*/}"
+		language="${language%%/*}"
+		target_file="${source_file##*/}"
+		target_file="${target_file%.md}.${language}.md"
+		newdoc "${source_file}" "${target_file}"
+	done
+}
diff --git a/dev-libs/darts/metadata.xml b/dev-libs/darts/metadata.xml
index c921b96adf6c..bb2998c433a2 100644
--- a/dev-libs/darts/metadata.xml
+++ b/dev-libs/darts/metadata.xml
@@ -1,8 +1,11 @@
 <?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>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">s-yata/darts-clone</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index 4a03a2960408..c7663057427e 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 1920 BLAKE2B 2c6b6ab4e50f6c57ef4e94c09f69c063941ce5a7441b1139fda3e8374d21442fe555313a99b12171eea44535e6d7e77979791643a24dafa938ecbd5cb87aa6e5 SHA512 5b8fac53497ab7a2fdfc8ec058c2243a0fe14cfa6c2ea5c3ccf722c1df629fbacc907d9fb244a1e178b2661757e65093ac4f205e2560f731791935e34ed0ff69
+EBUILD dbus-glib-0.110.ebuild 1898 BLAKE2B 51e814ef0cd61157c269994517bdd0455a24e2f5c9baa7b2d73eb2301d88891396bea801f881a7353dc4d1e8a7cb2fbb1ec2e75ac1bc84f926dff72f5a002711 SHA512 de39d088f57af158163a2c987e4905ce7318437b54da98bb328385bf0d433664a56c89f67d6e1ed5935eddc41499c3d28c0ee4da511ff8dc7a17a9ae612044b6
 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 4530cd58f357..9a13087f2463 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+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"
 
 CDEPEND="
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index 1678c77b570c..b544ca901b03 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -4,6 +4,7 @@ AUX dmalloc-5.5.2-cxx.patch 546 BLAKE2B 6f85a3024d417c81f3a4dd4f50cf444f09eb3b53
 AUX dmalloc-5.5.2-string-macros.patch 367 BLAKE2B 7fd3e6ae9b4564ec519da953c5116b9a8d19fa446c1d3e24ff736ce3725fd7425881dc07272a3f5dbdee1202e1dac8f68f19266296f5c8335976e5287fa90ddc SHA512 61d0015e7997ecad97e722a1b308ec90e996e9d53b9f475c911f1d9eb929d8007881e52699e9f3427c5cecb9f0b2d202d12a7d607d23434913afbef455f08617
 AUX dmalloc-5.5.2-threads.patch 165 BLAKE2B fee0be1573996dc7460735a94c645989db6fb9570e1140ec64e87e4bddd6b84227d072454bd64c4e0f261e81da0dd27a6ebf310b60e8a74539a21f83370e291f SHA512 b561c715c19604128c046b36bfe09794922176ce1cd12947da277631a410bbc19c5a1f7e998f0b61d7564e3b7516bee0fb4deddb13e036bb9e667f3502e56d0e
 DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93
-EBUILD dmalloc-5.5.2-r4.ebuild 1772 BLAKE2B 791a089b3da139f5511447fa9d8e428b6e4a30d6b14488b0d68649c17c838f27a1708c2e09483b0230f86bfceb09e737405f35dfb718f8e641cc3ce942caf7d0 SHA512 fd498387c1f74667570d46ffa7dfd8cbb59ef004054c9296b889cad0a273e5d76825ec6ee5cf087015f1f6ca95edf62c44c65739225da425778d85325e4a4ac6
-EBUILD dmalloc-5.5.2-r6.ebuild 1938 BLAKE2B 8c85ec02cc25cb8f022731181d23591b1781d7d54b35c24631dbc6ce7b309bbee17c05f67eeeb3f56d0b777c5b06c41acc5b64db8e2f5dcba5e5ec26e25299e8 SHA512 aed2ed6e1402a2669a031fa98a9969ec0e0613299a7e138c66e0b0bd33762825662ed59f151bf979ae96716027acd41c134de2d2f6f7236748536dec37d0c7fc
+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
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild
index cfc84a7048d0..e4aec86af70b 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dmalloc.com/releases/${P}.tgz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs threads"
 
 DEPEND="sys-apps/texinfo"
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild
index db39b903e2d4..f154f33e3ad0 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r6.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 ~amd64-fbsd ~x86-fbsd"
+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/dmalloc/dmalloc-5.5.2-r7.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
new file mode 100644
index 000000000000..8c427e5ca7b3
--- /dev/null
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib toolchain-funcs
+
+DESCRIPTION="A Debug Malloc Library"
+HOMEPAGE="http://dmalloc.com"
+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"
+IUSE="static-libs threads"
+
+DEPEND="sys-apps/texinfo"
+DOCS=( NEWS README docs/NOTES docs/TODO )
+PATCHES=(
+	# - Build objects twice, once -fPIC for shared.
+	# - Use DESTDIR.
+	# - Fix SONAME and NEEDED.
+	"${FILESDIR}"/${P}-Makefile.in.patch
+	# - Broken test, always returns false.
+	"${FILESDIR}"/${P}-cxx.patch
+	"${FILESDIR}"/${P}-ar.patch
+	# strdup() strndup() macros
+	"${FILESDIR}"/${P}-string-macros.patch
+)
+
+src_prepare() {
+	default
+
+	# - Add threads support.
+	use threads && eapply "${FILESDIR}"/${P}-threads.patch
+
+	# Respect CFLAGS/LDFLAGS. #337429
+	sed -i \
+		-e '/libdmalloc/ s:$(CC):& $(CFLAGS) $(LDFLAGS):g' \
+		-e 's|ar cr|$(AR) cr|g' \
+		Makefile.in || die
+
+	# Run autoconf for -cxx.patch.
+	eautoconf
+}
+
+src_configure() {
+	tc-export AR
+	econf --enable-cxx --enable-shlib $(use_enable threads)
+}
+
+src_compile() {
+	default
+
+	cd docs
+	makeinfo dmalloc.texi || die
+}
+
+src_test() {
+	emake heavy
+}
+
+src_install() {
+	default
+
+	newdoc ChangeLog.1 ChangeLog
+	dodoc docs/dmalloc.pdf
+	dodoc RELEASE.html docs/dmalloc.html
+	doinfo docs/dmalloc.info
+
+	# add missing symlinks, lazy
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV%%.*}
+
+	for lib in cxx th thcxx; do
+		dosym lib${PN}${lib}.so.${PV} /usr/$(get_libdir)/lib${PN}${lib}.so
+		dosym lib${PN}${lib}.so.${PV} \
+			/usr/$(get_libdir)/lib${PN}${lib}.so.${PV%%.*}
+	done
+
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die
+	fi
+}
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index d3595cce9fc5..4165842e2261 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 1398 BLAKE2B 3ce942a00feab680f84419f6c0856a3183d92a9882ca2693bafb15a3839a43bd793f2b74f77e04d8e4203979601f0a6ae1378c8ff628148be61fa4cb57970543 SHA512 62fc3748978c6d7c111566a83006eb0799a545b6b2fc4acb82250f5af523aebe32fa1473a33f538ce02f2b639b882b76b18613fa1a5670848838f534a0b9344c
+EBUILD double-conversion-3.1.4-r1.ebuild 1386 BLAKE2B 6ffc915df784623810a39fac77a8f93a353932bfd1931e4e0ae2b6a8cfc917c8adecb5870b05232f60fae73bca2157e0711bf3e6b83486b3ac2a2be646549f08 SHA512 04ee9fce5fc4db356cc3c119673c78d97af1a02c77c6734ca9754570a26499b6946bed3b089e60bd5013b0aecd684dbde03bd23ddefc628367559e383879812f
 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 39708b29059a..07d645b51f2d 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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 
 PATCHES=(
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 09c3fe5ed709..5e64ebb3a1d6 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,10 +1,7 @@
 DIST efl-1.22.2.tar.xz 71320272 BLAKE2B b1eb66228ec5a92f5d89bf38d95439f9bfb0b09a074e418094474d7c7d0de6a4ae998321a02273a5c9bbcfcba260a7ff3d8cef0af445293869c82c57dec2cca0 SHA512 7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734
-DIST efl-1.22.5.tar.xz 71358856 BLAKE2B d1b9c8263608bca61760adb129eb5ad3d507caaa2d4e03847d9c06c99494d6dcaa0756368f700fde64d15dd33147a1f58f5391164902c1f9f586ef7307b14510 SHA512 87d10ab244778fc8452ea85cbf698a6b0ccd065964941f7c04d073cf7db9632b09d7956d86bd5c4e9fa102efceb1057269322e84504c70ee5f740176cd4bb26f
-<<<<<<< HEAD
-EBUILD efl-1.22.2.ebuild 6877 BLAKE2B 5569c1e68c66b5bf103f71e526eadd1ea58ead7e37d2cfa367a557bbfbfa3e0764a81338ee8f046a988984540c0a875b79097f62661fe567dfea7df7fb723cb6 SHA512 c1bb384fc318c85a7cefe6cd68c0f776f7319ff80c98389907e373f1880c00c1ce1f50befe097c207c227da87978e19c5031b590e0773ea395395f7c5a271369
-EBUILD efl-1.22.5.ebuild 6879 BLAKE2B 7d51377cfb1356054b7ab9562d77d8310591625b2af614e4cd99067eafa8f170cfb2fd66fca2e311bdc4f688aa48b61b15b7f65591810b8510d5e83797ab8bf1 SHA512 e8ce2178fd494b7e701e4e56d70573439db2ff1a6eddbbaf89b111a6b3388af49bf98367563a0c131c55a46c6df4bc982dd4582caf1110d8117ddfd35aa55d3f
-=======
+DIST efl-1.22.6.tar.xz 70641848 BLAKE2B a6644f25934d3c9776b06edd7a9ffc321da42ee039b703c1af317d14e757b489c6d42add281febde5e81b48e38fbfa31f5b201ade4d27cd50cc70d16b9028fdd SHA512 adf2b9275c295b61928134ce1af53d8830b46815d8ba09d221c7659b8a2aed6e4593b35919a98f0e33ec9b7930c5b09de8e6680536cccb21c551908b25158f56
+DIST efl-1.23.1.tar.xz 77466768 BLAKE2B a8507777f84ee356bb53982d2b102eb6413ab274ce98dbd87b62a11b6a89eb7d12e0d858b5dfcbbe3da0e1bcc753c338d4c4b7060c569ee621e71afa2477397d SHA512 9c81f28bb0d87e1a3e5d2204c0e2401d9b3f6dcc34f47cb2b41711ef033b3134f4cd283e87a216a0ce4ee903f721a1f8c2f003577444c5781e7f47ce827201e6
 EBUILD efl-1.22.2.ebuild 6917 BLAKE2B e72f02cdd98c2b951dc29df62c53d2b4d964466a7e77e0612503649c2176bfb7c462e4f9442ad71337b008e143e04e199401573996b06dce37e26ac3640834b5 SHA512 85f8cf01985e23021383937b402097f9f4c2439398c3b4bab96ef031a620bdc8af54e2f3bc8bb87dda1e94b204a5f48c6d6738d73c5238e718bb1ee82e20b172
-EBUILD efl-1.22.5.ebuild 6919 BLAKE2B 3395a373c722c55f3ee8cb0c9a04b2433e158c60cd864a58767f5755a4134dd053cd0f5e0b5c26f666e06b53482aa6ff91ef4521505b8caa7f0d8a591e8c0fd2 SHA512 aeb44bfa0c2c7ac110cff54f4f462fe8f1bf7d20fa35ae1a6a9526cd18d541574f2fe3a5667f4f4bba6080e713afec15afea817fa7fdecac2cea5e996652b759
->>>>>>> next
-MISC metadata.xml 1920 BLAKE2B 01decb622aae3e01bf59d93d48b4babc5e2f63a1499f0daeedd1e9b513f2e7a41819caf3a8f738d49333a2b538d3231d0355ed216edb6313e0c587281f4a9bfe SHA512 ae1c2f5791cf991940eff5333747cd3591b8d03048b99fe4ff1acf442c964f7e56ff0de60cc275205f871b937ef369e9e24342368e69c565fc2efe87931df5b4
+EBUILD efl-1.22.6.ebuild 6919 BLAKE2B 3395a373c722c55f3ee8cb0c9a04b2433e158c60cd864a58767f5755a4134dd053cd0f5e0b5c26f666e06b53482aa6ff91ef4521505b8caa7f0d8a591e8c0fd2 SHA512 aeb44bfa0c2c7ac110cff54f4f462fe8f1bf7d20fa35ae1a6a9526cd18d541574f2fe3a5667f4f4bba6080e713afec15afea817fa7fdecac2cea5e996652b759
+EBUILD efl-1.23.1.ebuild 7489 BLAKE2B 0e86657acc4b135253b59734886917bf36d3bb2eda37a1016fb676492a1aa99e0c8f1f518b33164683785dbd2590e80b83aa5087753642c08ca5d962a1894f58 SHA512 7d953cd21de64cc52af81a938cae07ecf8bbadf551c5585e4ae2539ce963eeaf7bf0856dafa0b4a1259207b2d53d8d161cc6cfc4999d2ddfcef05f9509870f3b
+MISC metadata.xml 2199 BLAKE2B 56690b1757b3903b9c7008e64a287ed84420d1da4b3bbd4260617c66da0eded0bd5bb29d1880dd9484b428beb9a02f4b36f7f9b146c090e1c1f55272b5b77066 SHA512 45a075877b05d2dcca13c376b8af5fa269855e9419dbbaa60234a7529a737697ac8eb56ffb7c14b6216ec537b367de47b2558716dd7dedbfed737d07e307595a
diff --git a/dev-libs/efl/efl-1.22.5.ebuild b/dev-libs/efl/efl-1.22.6.ebuild
index 2da0160a9808..5af4a6a9437b 100644
--- a/dev-libs/efl/efl-1.22.5.ebuild
+++ b/dev-libs/efl/efl-1.22.6.ebuild
@@ -121,6 +121,7 @@ RDEPEND="
 			x11-libs/libXrender
 			virtual/opengl
 		)
+		wayland? ( x11-libs/libxkbcommon[X] )
 	)
 	xine? ( media-libs/xine-lib )
 	xpm? ( x11-libs/libXpm )
diff --git a/dev-libs/efl/efl-1.23.1.ebuild b/dev-libs/efl/efl-1.23.1.ebuild
new file mode 100644
index 000000000000..939c0e238232
--- /dev/null
+++ b/dev-libs/efl/efl-1.23.1.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 ~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
+	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/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 )
+	gif? ( media-libs/giflib:= )
+	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? ( dev-libs/rlottie )
+	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 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 gif && disabledEvasLoaders+="gif,"
+	! 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
+		insinto /usr/share/doc/${PF}/examples/
+		doins -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/efl/metadata.xml b/dev-libs/efl/metadata.xml
index a67c1169284c..02343d8644fd 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -1,36 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>juippis@gentoo.org</email>
-		<name>Joonas Niilola</name>
-	</maintainer>
-	<use>
-		<flag name="bmp">Enable WBMP image loader</flag>
-		<flag name="dds">Enable DDS image loader</flag>
-		<flag name="drm">Enable DRM engine</flag>
-		<flag name="eet">Enable Eet image loader</flag>
-		<flag name="fribidi">Enable bidirectional text support</flag>
-		<flag name="gles2">Enable the OpenGL ES GL implementation</flag>
-		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> support</flag>
-		<flag name="harfbuzz">Enable complex text shaping and layout support</flag>
-		<flag name="hyphen">Enable text hyphenation support</flag>
-		<flag name="ibus">Enable Intelligent Input Bus</flag>
-		<flag name="ico">Enable Ico image loader</flag>
-		<flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
-		<flag name="luajit">USE <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
-		<flag name="physics">Enable Bullet physics effects and support</flag>
-		<flag name="ppm">Enable PMAPS image loader</flag>
-		<flag name="psd">Enable PSD image loader</flag>
-		<flag name="scim">Enable Smart Common Input Method</flag>
-		<flag name="system-lz4">Use system liblz4 instead of bundled one</flag>
-		<flag name="tga">Enable Tga image loader</flag>
-		<flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events</flag>
-		<flag name="unwind">Enable debug support via <pkg>sys-libs/libunwind</pkg></flag>
-		<flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
-		<flag name="vlc">Enable <pkg>media-video/vlc</pkg> support</flag>
-		<flag name="xcf">Enable XCF image loader</flag>
-		<flag name="xim">Enable X Input Method</flag>
-		<flag name="xpresent">Enable <pkg>x11-libs/libXpresent</pkg> support</flag>
-	</use>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+  <use>
+    <flag name="bmp">Enable WBMP image loader</flag>
+    <flag name="dds">Enable DDS image loader</flag>
+    <flag name="drm">Enable DRM engine</flag>
+    <flag name="eet">Enable Eet image loader</flag>
+    <flag name="fribidi">Enable bidirectional text support</flag>
+    <flag name="gles2">Enable the OpenGL ES GL implementation</flag>
+    <flag name="glib">Enable <pkg>dev-libs/glib</pkg> support</flag>
+    <flag name="harfbuzz">Enable complex text shaping and layout support</flag>
+    <flag name="hyphen">Enable text hyphenation support</flag>
+    <flag name="ibus">Enable Intelligent Input Bus</flag>
+    <flag name="ico">Enable Ico image loader</flag>
+    <flag name="json">Enable lottie animation support</flag>
+    <flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
+    <flag name="luajit">USE <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
+    <flag name="mono">Enable mono bindings</flag>
+    <flag name="physics">Enable Bullet physics effects and support</flag>
+    <flag name="pmaps">Enable PMAPS image loader</flag>
+    <flag name="ppm">Enable PMAPS image loader</flag>
+    <flag name="psd">Enable PSD image loader</flag>
+    <flag name="scim">Enable Smart Common Input Method</flag>
+    <flag name="system-lz4">Use system liblz4 instead of bundled one</flag>
+    <flag name="tga">Enable Tga image loader</flag>
+    <flag name="tgv">Enable Tgv image loader</flag>
+    <flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events</flag>
+    <flag name="unwind">Enable debug support via <pkg>sys-libs/libunwind</pkg></flag>
+    <flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
+    <flag name="vlc">Enable <pkg>media-video/vlc</pkg> support</flag>
+    <flag name="xcf">Enable XCF image loader</flag>
+    <flag name="xim">Enable X Input Method</flag>
+    <flag name="xpresent">Enable <pkg>x11-libs/libXpresent</pkg> support</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-libs/elfio/Manifest b/dev-libs/elfio/Manifest
deleted file mode 100644
index 2a1a0fde8a16..000000000000
--- a/dev-libs/elfio/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX elfio-1.0.3-shared.patch 3539 BLAKE2B 36e99080bc9aaab6cf1e17b538349b6ca928cca5d969463ca5d013343dd55d57eaf03215b000ece8ab3e2579d4233c8af935c83410a324ca05e58e193ae3bfa6 SHA512 2561eef0223b62a0e0d0a81ec5a84d34e1a0434dab32665ab837584110c5888e38c61c0807d578622f3244dca5c7a8a0397dd09555553320ed5cf162f00835cb
-DIST ELFIO-1.0.3.tar.gz 308560 BLAKE2B 60316124f87ac0a3fadd959a6699431b01d79aa071fa18c4b3518f4c42fe9131b867287227694b2a46aca89b9a11347ed936327e6c08760a47738ef71b9ea5c7 SHA512 eb0194ccc9e5194b7ac4ee7dfed06269e5235e72dd72631b63dcc3b0b44c76d44aa30df1332e7424e08ab905d2b243af6e2c183be87766536d588fa6ff719f19
-EBUILD elfio-1.0.3-r1.ebuild 570 BLAKE2B 7a4493489aae974c774399db09faabdc8bc20c0cfcd7c34b13164392cb1214e039ef07dda4eff87e03c14d869ce3e0b0e04bd303987311fef79ed1175d3e2b96 SHA512 6fe80ad301b0ee19463267f5fd55d0b0d452e44734b32706757f626ba3be0c80235b17a6d590e663ba598018103dcd7e05344cbbeae062b285acf3dbbad9b6c7
-MISC metadata.xml 242 BLAKE2B 75471b4b3218f3b7c9b7f657d9862d8dde7e1b42438e98ecb220f391ae7adb4d4b1cbd26c00685590d689835f64b9a362190c50f2e34b5429ec71d9224f08c0e SHA512 3ae3a235c582a48c9bc5add7b6bab9417a7ad97cb65afb814c4c94d5bb937b4957ec656d71983bed7b8fcdd91d7e648ce72c181eeca5b4e1cb9522f00246941a
diff --git a/dev-libs/elfio/elfio-1.0.3-r1.ebuild b/dev-libs/elfio/elfio-1.0.3-r1.ebuild
deleted file mode 100644
index 8deb15fb6f8d..000000000000
--- a/dev-libs/elfio/elfio-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P="ELFIO-${PV}"
-DESCRIPTION="ELF reader and producer implemented as a C++ library"
-HOMEPAGE="http://elfio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/elfio/${MY_P}.tar.gz"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-shared.patch" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS NEWS README
-}
diff --git a/dev-libs/elfio/files/elfio-1.0.3-shared.patch b/dev-libs/elfio/files/elfio-1.0.3-shared.patch
deleted file mode 100644
index 01e67dfe98bc..000000000000
--- a/dev-libs/elfio/files/elfio-1.0.3-shared.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -ur ELFIO-1.0.3.orig/configure.in ELFIO-1.0.3/configure.in
---- ELFIO-1.0.3.orig/configure.in	2007-03-06 16:36:26.000000000 +0100
-+++ ELFIO-1.0.3/configure.in	2007-03-06 16:37:08.000000000 +0100
-@@ -7,6 +7,7 @@
- AC_PROG_CXX
- AC_PROG_RANLIB
- AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
- 
- dnl Checks for libraries.
- 
-diff -ur ELFIO-1.0.3.orig/ELFIO/Makefile.am ELFIO-1.0.3/ELFIO/Makefile.am
---- ELFIO-1.0.3.orig/ELFIO/Makefile.am	2007-03-06 16:36:26.000000000 +0100
-+++ ELFIO-1.0.3/ELFIO/Makefile.am	2007-03-06 16:36:45.000000000 +0100
-@@ -1,6 +1,6 @@
--lib_LIBRARIES = libELFIO.a
-+lib_LTLIBRARIES = libELFIO.la
- 
--libELFIO_a_SOURCES = ELFIDynamic.cpp ELFIImpl.cpp ELFINote.cpp ELFIO.cpp \
-+libELFIO_la_SOURCES = ELFIDynamic.cpp ELFIImpl.cpp ELFINote.cpp ELFIO.cpp \
-     ELFIOUtils.cpp ELFIRelocation.cpp ELFISection.cpp \
-     ELFISegment.cpp ELFIStrings.cpp ELFISymbols.cpp \
-     ELFODynamic.cpp ELFOImpl.cpp ELFONote.cpp \
-@@ -10,4 +10,4 @@
- include_HEADERS = ELFI.h ELFIO.h ELFO.h ELFTypes.h
- noinst_HEADERS  = ELFIImpl.h ELFOImpl.h ELFIOUtils.h
- 
--EXTRA_DIST = ELFIO.dsp ELFIO.dsw ELFIO.mcp
-\ No newline at end of file
-+EXTRA_DIST = ELFIO.dsp ELFIO.dsw ELFIO.mcp
-diff -ur ELFIO-1.0.3.orig/Examples/ELFDump/Makefile.am ELFIO-1.0.3/Examples/ELFDump/Makefile.am
---- ELFIO-1.0.3.orig/Examples/ELFDump/Makefile.am	2007-03-06 16:36:26.000000000 +0100
-+++ ELFIO-1.0.3/Examples/ELFDump/Makefile.am	2007-03-06 16:37:51.000000000 +0100
-@@ -3,6 +3,6 @@
- bin_PROGRAMS = ELFDump
- 
- ELFDump_SOURCES = ELFDump.cpp
--ELFDump_LDADD = ../../ELFIO/libELFIO.a
-+ELFDump_LDADD = ../../ELFIO/libELFIO.la
- 
- EXTRA_DIST = ELFDump.dsp ELFDump.dsw ELFDump.mcp
-diff -ur ELFIO-1.0.3.orig/Examples/RelocationTable/Makefile.am ELFIO-1.0.3/Examples/RelocationTable/Makefile.am
---- ELFIO-1.0.3.orig/Examples/RelocationTable/Makefile.am	2007-03-06 16:36:26.000000000 +0100
-+++ ELFIO-1.0.3/Examples/RelocationTable/Makefile.am	2007-03-06 16:38:53.000000000 +0100
-@@ -3,6 +3,6 @@
- noinst_PROGRAMS = RelocationTable
- 
- RelocationTable_SOURCES = RelocationTable.cpp
--RelocationTable_LDADD = ../../ELFIO/libELFIO.a
-+RelocationTable_LDADD = ../../ELFIO/libELFIO.la
- 
- EXTRA_DIST = RelocationTable.mcp
-diff -ur ELFIO-1.0.3.orig/Examples/WriteObj/Makefile.am ELFIO-1.0.3/Examples/WriteObj/Makefile.am
---- ELFIO-1.0.3.orig/Examples/WriteObj/Makefile.am	2007-03-06 16:36:26.000000000 +0100
-+++ ELFIO-1.0.3/Examples/WriteObj/Makefile.am	2007-03-06 16:39:28.000000000 +0100
-@@ -3,6 +3,6 @@
- noinst_PROGRAMS = WriteObj
- 
- WriteObj_SOURCES = WriteObj.cpp
--WriteObj_LDADD = ../../ELFIO/libELFIO.a
-+WriteObj_LDADD = ../../ELFIO/libELFIO.la
- 
- EXTRA_DIST = WriteObj.dsp WriteObj.dsw WriteObj.mcp
-diff -ur ELFIO-1.0.3.orig/Examples/WriteObj2/Makefile.am ELFIO-1.0.3/Examples/WriteObj2/Makefile.am
---- ELFIO-1.0.3.orig/Examples/WriteObj2/Makefile.am	2007-03-06 16:36:26.000000000 +0100
-+++ ELFIO-1.0.3/Examples/WriteObj2/Makefile.am	2007-03-06 16:39:40.000000000 +0100
-@@ -3,4 +3,4 @@
- noinst_PROGRAMS = WriteObj2
- 
- WriteObj2_SOURCES = WriteObj2.cpp
--WriteObj2_LDADD = ../../ELFIO/libELFIO.a
-+WriteObj2_LDADD = ../../ELFIO/libELFIO.la
-diff -ur ELFIO-1.0.3.orig/Examples/Writer/Makefile.am ELFIO-1.0.3/Examples/Writer/Makefile.am
---- ELFIO-1.0.3.orig/Examples/Writer/Makefile.am	2007-03-06 16:36:26.000000000 +0100
-+++ ELFIO-1.0.3/Examples/Writer/Makefile.am	2007-03-06 16:39:10.000000000 +0100
-@@ -3,6 +3,6 @@
- noinst_PROGRAMS = Writer
- 
- Writer_SOURCES = Write.cpp
--Writer_LDADD = ../../ELFIO/libELFIO.a
-+Writer_LDADD = ../../ELFIO/libELFIO.la
- 
- EXTRA_DIST = Writer.dsp Writer.dsw Writer.mcp
diff --git a/dev-libs/elfio/metadata.xml b/dev-libs/elfio/metadata.xml
deleted file mode 100644
index a797d0ae27c5..000000000000
--- a/dev-libs/elfio/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">elfio</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index cfa7c7b0b7f6..c63874aadf24 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -2,11 +2,13 @@ DIST ell-0.20.tar.xz 443196 BLAKE2B 35daff12e43a27b44b60ff0fd0f10c8d6b8ba122a582
 DIST ell-0.21.tar.xz 448612 BLAKE2B a20e177bb2ef7620c79cecdb84e47db662d97904189c885c90232a21ca40125bee14218fe2f1f06df74b424ccdc88dcd89da12bc9bf3e86c453b9903ae93013d SHA512 7bb96194e03d0067b22745899eec3f7166dce69aeed2ece1cd362178c1b7f94d464a894417d8329554f5b707133280e6cadfbd4e3ee34a5652f396d719e6fd17
 DIST ell-0.22.tar.xz 452692 BLAKE2B 6e8add0e439bfae287be5522ccdb0b9a7f1cc0c378f0498f8b2193bd4e8b10cac71df2b21cf0df202a16182bd188cb56efecf0cc7e8b027c2d00b2579f2c155f SHA512 6977f0fe2d7e2c86317163d45ee92750d9f42a2d04cd28e8fcb48e0ef680d98f586e983cc1821eb19430ea951bfe408d821da3a58244626f97244ed2b4a9e539
 DIST ell-0.23.tar.xz 453040 BLAKE2B 027adbaf786bd83070acfcbb1435c36adb70e6d798c6664cdb4d6f9ea0b7aaee2b45b2738210889125c565da06360fe1337b3847913195533be2f87ef1f9d48b SHA512 0a55316816f44482e6958c9745ebf2beca64b8a0d81db9367dfdeb05e36012a14d7b645f3077eab01ea743df129ab8dad0b8d72f21e8ccb2741863eb5f4bc948
+DIST ell-0.24.tar.xz 473332 BLAKE2B 97b5f5de1a4680f5b8da5db8d151df56d2eadb511c5440a780959cb832f9414030040abf91072a751b19028713cc8527f5dbb24450b07c69dcebcc9d8f62366b SHA512 14e9b31ab0f08761c7672798a23ee91b7d2fe8fd509df35c40e413e26b90f86a192f48283b3798402d9d23acdf1fbcd1d506e5fa9331a32279f03f4cf462205b
 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
 EBUILD ell-0.22.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
-EBUILD ell-0.23.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
+EBUILD ell-0.23.ebuild 1049 BLAKE2B aa1d8c875e062bf875c58b93bca4c3da4bb12779eb254cb2d78be3421a96a0037efdd463408e06d7f09002cc25637c46c33d74756381315d655d3228117f58b8 SHA512 950be003d142b2094396a10065c1018ec84c1695181e24d0d8f1106140c3d7ce561d977ee57447484519684bc0eb888bcead48ddf80ffc62e531963ac2388e60
+EBUILD ell-0.24.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.23.ebuild b/dev-libs/ell/ell-0.23.ebuild
index cafd42ed2ce6..974745cd299a 100644
--- a/dev-libs/ell/ell-0.23.ebuild
+++ b/dev-libs/ell/ell-0.23.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.24.ebuild b/dev-libs/ell/ell-0.24.ebuild
new file mode 100644
index 000000000000..cafd42ed2ce6
--- /dev/null
+++ b/dev-libs/ell/ell-0.24.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/eventlog/Manifest b/dev-libs/eventlog/Manifest
index 47eb80a55bdf..9f65ff3eabfc 100644
--- a/dev-libs/eventlog/Manifest
+++ b/dev-libs/eventlog/Manifest
@@ -1,3 +1,3 @@
 DIST eventlog_0.2.12.tar.gz 303925 BLAKE2B 2321b26456380788752f8cb106f4e7b7ea30c9d463d04d536d46d0deb83a0640b86483f46acb33537f539c127a9dde484c121ad608ed43f1a8f525fd6c04aa3c SHA512 a681ab2961f5bf38e106a5b0b4492e74098808e2bf1a100f545736902649c705db124c0847796a47485faa8b0befe691a789d752f313c5b65ad50ed2763d2cce
-EBUILD eventlog-0.2.12.ebuild 676 BLAKE2B c77b2a52dec9f11fa783ec933612bd0edd39fb758aebd46fe883dad44d434f211544f85c1e4eb144ca622a08e7200f8c016e0d8697a00149aa8548b0aeae2acf SHA512 d0085e0fcb8d2e682b9999608badc326a54ec6dc6ebd2e55f047cbe681f44d9f0aabe12407f752cd3b37bceccdb33432e6a3835ac1ccece63d8cae7bb6108446
+EBUILD eventlog-0.2.12.ebuild 666 BLAKE2B 8548c57fd4c74e6cf716f9f3c6556d539005411a1fab79acbe87ccca21eadec5acdf1ccaa723823420323505af6084f0be0811e8bf72d4afd13ade314a0fc027 SHA512 2d4990b53ed50ff1e66cbe4ec7179b9c3253d454f0b51cc2cf841eacd947e82cdd37eb2743751fbacbceb2da4f75bafeda597959a52e26f65d83ba086a2b4b43
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/eventlog/eventlog-0.2.12.ebuild b/dev-libs/eventlog/eventlog-0.2.12.ebuild
index 303e1a09d93f..fcedef6006b4 100644
--- a/dev-libs/eventlog/eventlog-0.2.12.ebuild
+++ b/dev-libs/eventlog/eventlog-0.2.12.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.balabit.com/downloads/files/eventlog/0.2//eventlog_${PV}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~m68k-mint"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~m68k-mint"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 8583c829f980..45acaec6b44a 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,11 +1,7 @@
 DIST expat-2.2.6.tar.bz2 513322 BLAKE2B 386736da1f2204fa8f15ee4d1b3d11f01ed691efe6951b9f24f2bd30ab5494e75da6a97ceb1ffe4a0a8ecdc80f96f51d21c54f35a2cbc352a9fe9425545bf15b SHA512 dbfb635a5fe7b190722664263a0dd437b512fdf519bc53bd4905567f4bfb4b1e89a021562da63df8cacd48b706d1dea60ccde47f279e57400ad3c846b6e9c4e6
 DIST expat-2.2.7.tar.xz 424264 BLAKE2B acf2fa5cf374a671603f4a12b81239ba3b1634bab66d736e87fb516ce52d599711b3014218bef822640781b8852c7238b6f071b5bd439a13838fcbc7767d06a7 SHA512 bf3af5b5a8e1a1b76658a41f67dbe7b10104e3b724e1882f529fecc509b07c75dde02d8f8b89b1522e05484e8dc417d47651c5f8d4aac1749676ba5c4752c107
 DIST expat-2.2.8.tar.xz 422324 BLAKE2B 1f3e8bbce7f05aa080ca647d12a4ff9bf6d21cd31366d70daabcf8db48985e0b644faac5e251e0a559a74f0a27b247ede64b6f117940a5f7f70dc1cce0f0036a SHA512 102a3af89af37a961f81ade2dfb4f3e13bf779110decff9f1462f21079aa6959009871c39b933d9bf47ebc3ee50d3f8d5b41859dce833d290f17886a2aa80aa9
-EBUILD expat-2.2.6.ebuild 2496 BLAKE2B 62a7621cad6cd7f5fab49320a6ad0221a5813495378da71e56c745f773b8aae512e1c6c543ac732ae1305a52c8330cbc68aea6b1284c40597fd9d7b58ae96911 SHA512 e72be5b7ef4176b6717858b7a0fee719cf924baa4c320c68425270e0d827bc9ef3d5bea5b466a8a01c854ea347e7b11e69b4216d28ed2b70f69db57921d316dd
-EBUILD expat-2.2.7.ebuild 2514 BLAKE2B 5e143de91fff2676a2162b1da379bb0f2931e5d16558cb0799af7cd171e6459bedf5865c12e318b3f50a9f65486e6a1d907c20c72f6247cc21869e92dea46ec7 SHA512 c80e08e274a162b0b220dc099c50ee6aadfb4b183f941cfe1787bd2d8fa2b0c06ef11ad469c5b8076c46bab20f671a906490a542c397f3681919b8887cc14b4e
-<<<<<<< HEAD
-EBUILD expat-2.2.8.ebuild 2534 BLAKE2B 381e377ccd7bc672c0ec6047021530e88a87f4aa6eec39b32fc2287f85c4988b37f85149ca18b3b870b0800e1f147e796c10b077a18380d0c5535a89afb957f9 SHA512 410b5404dc17d7908f1026cff5bd189be35d926bcb6d0dda16c0e7f82a747ac53d714e293b58dd1abb44c8cb0ab1d55277fdd3afde23439ddf543539b15f90e6
-=======
-EBUILD expat-2.2.8.ebuild 2533 BLAKE2B 8d333d67242445f8f7646a0f3dd3d5cfb416fb8a49fe7c950bcfe6e2e05f6a0c92f474c44c1f0e245efa89cac19d5bac372a2523adf50fcb1fa189887107b4dc SHA512 25b73400be33b37c86544a11dab59e5cacb692a2b36d1c07d4f47008ea758b7e8f6d3826e90468517c6cd20a6d3b925cf00d2691a3cc829faa5c8f3c940cb5df
->>>>>>> next
+EBUILD expat-2.2.6.ebuild 2474 BLAKE2B 00981a6b7fd2c347340a8fd5d807fc8433a52bd2dac47665d57624bc12b27db6cf866f15590e00108e41ba33d20753362c6444d61c92a4df68d1e1a54164c1fe SHA512 465ef4312e9bf5a2fba5265ea1eee376a351080b9e6a39e13c204c7c10fe8d8f5d1509b5a3df375392731482d68a99ae0dd9eb9456ab77b7ab69cd08a1a74375
+EBUILD expat-2.2.7.ebuild 2492 BLAKE2B bb4bd479446ff68661e650efd1c3119501921c0fafcae09a150e721bc4039ab365d0dd2cfadc887232f84bf5c832a8be19328f0f6addc697eb040c83019e6208 SHA512 fac8cc1baa77aaeb261a0c9b5bde41dcf04085a36eea303e1139216814464ebd209218278cff564cc3a89b8c1deee7f87059e769624397a36c6e932feac5c21c
+EBUILD expat-2.2.8.ebuild 2511 BLAKE2B e2d4f349316d2df8e84569179b8eb5bf5455b2a8815f9e25b0b727a60b5f218b3f1e818ec94f97d115b7a13b40b5ab7d238c8195d9ef876c7ccd18ae78fe5f41 SHA512 6a30cb61afc656dfc0ba524294cc2feaf6477062d83b498e3561c574e57804cf193b2fd3ce8137b24596ad5173780a72a0cfcc9c56a4f671493a8217d971a29b
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.6.ebuild b/dev-libs/expat/expat-2.2.6.ebuild
index 09463066ad8e..a8ea133e1e29 100644
--- a/dev-libs/expat/expat-2.2.6.ebuild
+++ b/dev-libs/expat/expat-2.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~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 ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 RDEPEND=""
diff --git a/dev-libs/expat/expat-2.2.7.ebuild b/dev-libs/expat/expat-2.2.7.ebuild
index 2009a2850eb8..c7c178878a89 100644
--- a/dev-libs/expat/expat-2.2.7.ebuild
+++ b/dev-libs/expat/expat-2.2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~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 ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 
diff --git a/dev-libs/expat/expat-2.2.8.ebuild b/dev-libs/expat/expat-2.2.8.ebuild
index beab95c6e5e3..2aadaa894039 100644
--- a/dev-libs/expat/expat-2.2.8.ebuild
+++ b/dev-libs/expat/expat-2.2.8.ebuild
@@ -11,11 +11,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-<<<<<<< HEAD
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-=======
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
->>>>>>> next
+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 ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 
diff --git a/dev-libs/fampp2/Manifest b/dev-libs/fampp2/Manifest
deleted file mode 100644
index 54d126e79431..000000000000
--- a/dev-libs/fampp2/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX fampp2-7.0.1-fix-buildsystem.patch 1882 BLAKE2B 2726865322fc1de809d974889b40cda6b8051efd67b9d2d4cf649d226fcc6933332899b6e73722c69e31b14048921c6db70992813035d4c0e418b00c2eff7594 SHA512 00241839c238d772803dc095e1eaa81eadf9451f2c8a783d4d5acbcaa82b755d00e6ec6bdb2a6e621427e10a0f0674d92186b58bb28a708c3f714200b626caa4
-AUX fampp2-7.0.1-fix-gcc6.patch 1514 BLAKE2B b94986a1166089672d1e5d229bee1b3902eaa051d8c427bf5d85fce7df3b2eeaefcccad2e98f22637d8406784b57d49ed63e0d4606036b2eaf8bf9e125295820 SHA512 2c41ecae31cb6bb5df861cd56f0898e9dcf4f5d71f1b25462989548847e4bf7b0f96dc1b53a139dc6b72a251e283e2e7f540dd751f045bc06061193f4b4787cb
-AUX fampp2-7.0.1-libsigc++-2.6.patch 1041 BLAKE2B 33c0c437602c48008599cf6ea670e2ad6fe1fd7b41d6c16860a7ac559435e5ea8a5c0d583d53afee13f7d0a23a685160877bca45dec1574885bfdf50323c5402 SHA512 6139c238551b4dd8396ed7df23353245b7668a27c109da3f720acc582d6b08d0b6f3227924ea8ca4c101706eae9036aa84f7f5ecd91c41f0f54d700a73a49b55
-DIST fampp2-7.0.1.tar.bz2 288073 BLAKE2B f74659c83af82eeed6c5f711a9273f2d8c7704f04c8407992bee7478d2ef20b6d2ecf37c5d292be35c126474052341c49f8a0d30d056c24e2404b17d0123dfd7 SHA512 317a5cfd383418265cafea0840af8b7c714a04b34265ebfba73230ff2492df8f7884797529916693ab489bdbc94799ca83e015cf0bcfffaea6b28b3a7f9ccbd0
-EBUILD fampp2-7.0.1-r3.ebuild 1234 BLAKE2B 810284de8a066038277b1388e105b707c5a2877d865d1691ea54afcd2cffe3cf7a27c9816ff202d33fd8f60eb995a688e8a76d2f269d86c57c87487898580cce SHA512 51f1696cf3eb0e5efde0bfa586e0f6e99afb2b06ec1beaa4f9d222ffc92655dcea14e1a5e3feaa6a4cd4097d6f764e06a155dac739971ff3debf66b2daefc789
-MISC metadata.xml 242 BLAKE2B 7f55f6c94b1dbefea3658a413342ac07dc109292cdf862a757b516411a3ebf2acf2ddbe1056e616920c1618a76cc57b3264f8b6efc04c20376aa8ef926c8607e SHA512 fc1dbdb68705088da51bd64d8dca4d40592cadae51b86458cee01252e5393c0c0e5d6143b56621defa23fa720afdb0d412db3314d1f9bb29641ec80a22d700b3
diff --git a/dev-libs/fampp2/fampp2-7.0.1-r3.ebuild b/dev-libs/fampp2/fampp2-7.0.1-r3.ebuild
deleted file mode 100644
index 7854cb30ecee..000000000000
--- a/dev-libs/fampp2/fampp2-7.0.1-r3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="C++ wrapper for fam"
-HOMEPAGE="https://sourceforge.net/projects/fampp/"
-SRC_URI="mirror://sourceforge/fampp/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-libs/ferrisloki-2.0.3
-	dev-libs/glib:2
-	>=dev-libs/libsigc++-2.6:2
-	virtual/fam
-	x11-libs/gtk+:2"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	# Fix compat with libsigc++-2.6, #569700
-	"${FILESDIR}/${PN}-7.0.1-libsigc++-2.6.patch"
-	# Fix completely broken buildsystem
-	"${FILESDIR}/${PN}-7.0.1-fix-buildsystem.patch"
-	# Fix noexcept(true) for dtors in >=C++11 with GCC 6, #595308
-	"${FILESDIR}/${PN}-7.0.1-fix-gcc6.patch"
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	# libsigc++-2.6 requires building with C++11
-	append-cxxflags -std=c++11
-
-	# glib and gtk+ are only required for some examples
-	econf \
-		--disable-static \
-		--disable-glibtest \
-		--disable-gtktest \
-		--disable-stlport \
-		$(use_with examples)
-}
-
-src_install() {
-	default
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/fampp2/files/fampp2-7.0.1-fix-buildsystem.patch b/dev-libs/fampp2/files/fampp2-7.0.1-fix-buildsystem.patch
deleted file mode 100644
index 34067ff1f539..000000000000
--- a/dev-libs/fampp2/files/fampp2-7.0.1-fix-buildsystem.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Fix buildsystem, to avoid ugly and extremely brittle patching
-of the configure script and Makefile.in in the main ebuild.
-
---- a/configure.in
-+++ b/configure.in
-@@ -1,8 +1,8 @@
-+AC_PREREQ([2.69])
-+AC_INIT([fampp2],[7.0.1])
- 
--# require autoconf 2.13
--AC_PREREQ(2.13)
--
--AC_INIT(src/Fampp2.hh)
-+AC_CONFIG_MACRO_DIR([macros])
-+AC_CONFIG_SRCDIR([src/Fampp2.hh])
- 
- FAMPPTWO_MAJOR=7
- FAMPPTWO_MINOR=0
-@@ -22,9 +22,8 @@
- VERSION=$FAMPP_VERSION
- PACKAGE=fampp2
- 
--AM_CONFIG_HEADER(config.h)
--AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
--AM_MAINTAINER_MODE
-+AC_CONFIG_HEADERS([config.h])
-+AM_INIT_AUTOMAKE
- 
- AC_CANONICAL_HOST
- AC_ISC_POSIX
-@@ -33,11 +32,7 @@
- AC_PROG_CPP
- AC_PROG_CXX
- 
--AC_STDC_HEADERS
--#AC_ARG_PROGRAM
--AC_DISABLE_FAST_INSTALL
--AC_DISABLE_STATIC
--AM_PROG_LIBTOOL
-+LT_INIT
- 
- 
- dnl Checks for libraries.
-@@ -58,15 +53,12 @@
- ###############################################################################
- 
- 
--CFLAGS=" $STLPORT_CFLAGS $LOKI_CFLAGS $SIGC_CFLAGS $CFLAGS -O0 -g  "
--CXXFLAGS=" $STLPORT_CFLAGS  $CXXFLAGS -O0 -g $LOKI_LIBS $SIGC_CFLAGS  "
--LDFLAGS=" $STLPORT_LIBS $SIGC_LIBS $LDFLAGS  -Wl,-O1 -Wl,--hash-style=both"
--AC_SUBST(CFLAGS)
--AC_SUBST(CPPFLAGS)
--AC_SUBST(LDFLAGS)
--AC_SUBST(CXXFLAGS)
--AC_SUBST(CXXCPPFLAGS)
-+CFLAGS="${CFLAGS} ${STLPORT_CFLAGS} ${LOKI_CFLAGS} ${SIGC_CFLAGS}"
-+CXXFLAGS="${CXXFLAGS} ${STLPORT_CFLAGS} ${LOKI_CFLAGS} ${SIGC_CFLAGS}"
-+LIBS="${LIBS} ${STLPORT_LIBS} ${LOKI_LIBS} ${SIGC_LIBS}"
- 
-+AC_ARG_WITH([examples], [install examples])
-+AM_CONDITIONAL([EXAMPLES], [test "x$with_examples" = "xyes"])
- 
- dnl if test "x${prefix}" = 'xNONE'; then
- dnl         prefix=${ac_default_prefix};
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,10 @@
- AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects
- 
- NULL=
--SUBDIRS = src examples
-+SUBDIRS = src
-+if EXAMPLES
-+SUBDIRS += examples
-+endif
- 
- EXTRA_DIST = fampp.spec fampp.spec.in fampp2.pc.in fampp2.pc
- 
diff --git a/dev-libs/fampp2/files/fampp2-7.0.1-fix-gcc6.patch b/dev-libs/fampp2/files/fampp2-7.0.1-fix-gcc6.patch
deleted file mode 100644
index 659ecd51bf4c..000000000000
--- a/dev-libs/fampp2/files/fampp2-7.0.1-fix-gcc6.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-C++11 changed destructor semantics to be noexcept(true)
-by default, leading to potentially changed semantics.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=595308
-
---- a/src/Fampp2.cpp
-+++ b/src/Fampp2.cpp
-@@ -105,6 +105,9 @@
- // #include <unistd.h>
- 
-     FamppRequest::~FamppRequest()
-+#if __cplusplus >= 201103L
-+    noexcept(false)
-+#endif
-     {
- //         cerr << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << endl;
- //         cerr << "FamppRequest::~FamppRequest() this:" << (void*)this << endl;
-@@ -245,6 +248,9 @@
- 
-     
-     FamppImplMethods::~FamppImplMethods()
-+#if __cplusplus >= 201103L
-+    noexcept(false)
-+#endif
-     {
-         if(0 != FAMClose( &theFAMConnection )) {
-             throw FamppCloseFailedException();
---- a/src/Fampp2.hh
-+++ b/src/Fampp2.hh
-@@ -168,7 +168,11 @@
-     public:
- 
-         
--        ~FamppRequest();
-+        ~FamppRequest()
-+#if __cplusplus >= 201103L
-+        noexcept(false)
-+#endif
-+        ;
- 
- 
-         void suspend();
-@@ -216,7 +220,11 @@
-     protected:
- 
-         FamppImplMethods();
--        virtual ~FamppImplMethods();
-+        virtual ~FamppImplMethods()
-+#if __cplusplus >= 201103L
-+        noexcept(false)
-+#endif
-+        ;
- 
- 
-     public:
-@@ -251,7 +259,11 @@
-     public:
-         FamppSingletonClass();
-         FamppSingletonClass(const std::string appName);
--        ~FamppSingletonClass();
-+        ~FamppSingletonClass()
-+#if __cplusplus >= 201103L
-+        noexcept(false)
-+#endif
-+        ;
- 
- 
-         void NextEvent();
diff --git a/dev-libs/fampp2/files/fampp2-7.0.1-libsigc++-2.6.patch b/dev-libs/fampp2/files/fampp2-7.0.1-libsigc++-2.6.patch
deleted file mode 100644
index 6b76a1532cbb..000000000000
--- a/dev-libs/fampp2/files/fampp2-7.0.1-libsigc++-2.6.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Remove inclusion of libsigc++ headers obsoleted with version 2.6
-See also: https://bugs.gentoo.org/show_bug.cgi?id=569700
-
---- a/examples/console_test/famppct.cpp
-+++ b/examples/console_test/famppct.cpp
-@@ -30,8 +30,6 @@
- 
- #include <sigc++/sigc++.h>
- #include <sigc++/slot.h>
--#include <sigc++/object.h>
--#include <sigc++/object_slot.h>
- 
- #include <gtk/gtk.h>
- #include <stdio.h>
---- a/examples/gtk/famppgtk.cpp
-+++ b/examples/gtk/famppgtk.cpp
-@@ -31,8 +31,6 @@
- 
- #include <sigc++/sigc++.h>
- #include <sigc++/slot.h>
--#include <sigc++/object.h>
--#include <sigc++/object_slot.h>
- 
- #include <gtk/gtk.h>
- #include <stdio.h>
---- a/src/Fampp2.cpp
-+++ b/src/Fampp2.cpp
-@@ -34,8 +34,6 @@
- 
- #include <sigc++/sigc++.h>
- #include <sigc++/slot.h>
--#include <sigc++/object.h>
--#include <sigc++/object_slot.h>
- 
- 
- using namespace std;
---- a/src/FamppEvents.hh
-+++ b/src/FamppEvents.hh
-@@ -36,7 +36,6 @@
- 
- #include <fam.h>
- #include <sigc++/signal.h>
--#include <sigc++/object.h>
- #include <SmartPtr.h>
- #include <Singleton.h>
- #include <Factory.h>
diff --git a/dev-libs/fampp2/metadata.xml b/dev-libs/fampp2/metadata.xml
deleted file mode 100644
index ff43a116ec95..000000000000
--- a/dev-libs/fampp2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">fampp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/fcgi/Manifest b/dev-libs/fcgi/Manifest
index b356c7dc2b52..15664831c7f1 100644
--- a/dev-libs/fcgi/Manifest
+++ b/dev-libs/fcgi/Manifest
@@ -5,5 +5,5 @@ AUX fcgi-2.4.1_pre0311112127-gcc44.patch 202 BLAKE2B e1c215ce690abb22799050b562a
 AUX fcgi-2.4.1_pre0910052249-link.patch 850 BLAKE2B e56ffa28035ecc8892d64dc097560068c61d7f6f9cd3b84a23b92f22b646cb73eeb5b81e2275e86ece868f9c7d83757a7fc0366596a718f170c6da0b7fdd351a SHA512 6180201e3ac7e9fe659b281cc612ed7d6d58acc17f670feba843931c5b038a7d08e75a9f24b098413bc309cb1cdbc6b96ba77f6f1fb43e47066815937d622b52
 AUX fcgi-2.4.1_pre0910052249-poll.patch 2469 BLAKE2B b1c16bf0ff35d1ccb62d006e4e846b55a1ebafd549c53952784fd3fdd744574a2db332ed06740e3a5d519515355335df1e2310bb3744a95753b821a434721bcb SHA512 3c00be90012bb7b9aabcce0eb014b2b0a8ec0bb8d4a44389237ae1c88fd46129e7686b035a427177545762275c30151c8a1037258b409486706a7f3a64db70b1
 DIST fcgi-2.4.1-SNAP-0910052249.tar.gz 614929 BLAKE2B 243125c2e815ccc505b23ea1be153c304a3174e5285583bb8be5411f624bedba76ebcb61389c0c4178a497678af6aeba4b8b840dda2d83c4638de6e1dc85b69e SHA512 7ae7542ef0934f44d8c7a120366a5cd92639d0bc283a16be320c9218a73a0302c961cc004074e3915209690f1e2b67fc234c9ba55d35af11e31566d79f081c87
-EBUILD fcgi-2.4.1_pre0910052249-r2.ebuild 1298 BLAKE2B 50bc22b594a27a37cd122719b574634029eb17050c5f9e3215677de8f2f64b348a4fa53dacbe24e211b84c6a20d8f912c0f961d2e483fdfa920143d45bc061a5 SHA512 a4417f284421ccadbbb92a339fdd76fb5d30b7986308ea9516d1bae16132807513bf19ea81f0241f069a13efdeb0cf81a20540902847864338f96a69eeff4f1b
+EBUILD fcgi-2.4.1_pre0910052249-r2.ebuild 1288 BLAKE2B 7f647fe1df2ffb3a9bab878eea921b18880f5fb0827633aed4287ee162dd8ea2e88228a668f030c0bf0a4456c92c3fc47a59405a7c65cbfff2b199f2c64c8a55 SHA512 f6fb96a116cd11deca091468e6b8dfee5127c1661c1481b569445b4210aa3bdbbcc58eb7d60935abff1df0672775d9e7d0d02beb3b3cebe1f5a3a55b1f31baa3
 MISC metadata.xml 322 BLAKE2B af18d8a4fc584c7512d4967123df7e5785e1efde8475c8d73277a244b67c00e0b80b30ddc8de15844beedbb454aeda583bb6021c8d3e2c681ffd529fbd9dd01f SHA512 d4d683173a6acb775871efc762823f186867e446c931714e8b04475a7982845e2d8152d871f123a1c8b08e7af307c7d1453c0309c26f7e6da131f120e1c29c7b
diff --git a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
index 3e769cb26ae1..23bb5e34f35c 100644
--- a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
+++ b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz"
 
 LICENSE="FastCGI"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="html"
 
 DEPEND=""
diff --git a/dev-libs/ffcall/Manifest b/dev-libs/ffcall/Manifest
index 4757f1fddec7..4a9184e40053 100644
--- a/dev-libs/ffcall/Manifest
+++ b/dev-libs/ffcall/Manifest
@@ -1,3 +1,3 @@
 DIST libffcall-2.1.tar.gz 943235 BLAKE2B ae82663174db084e830b6ff77ceedf8641b3edeb7800952ac4e2772d9033da3e45f46159e6fdae86615dc69fceba39f48d6c75e6cbd41be98f1986fa69d50b3b SHA512 da73375fb45b7d764c06437a517c2a90abf7d5de6afe0a8ca19e6dfafd2a8c7107e39d230ecbc8edfdd5926b16a0c13b7bb9319287047c47de1241b2f6ae805e
-EBUILD ffcall-2.1.ebuild 1517 BLAKE2B 0fc1ec51a7bcdbe83541e3b384060a8b370d29b3ccfbf6fa878684aaea5616691a2871a911e10dbdfae3bfb125682e7fb5f542c83eedf5f277fdb6081c399c6c SHA512 0ad442318a572ceb4ab9ca4682c15bdf3a6074a67df3f34ac352fd60c2703485cf801839597bd702db4f45bdb8b76f379140f78fa325b9923c6e9ac85cf8b07e
+EBUILD ffcall-2.1.ebuild 1507 BLAKE2B 93b1a456c4628781b1b86b0594505a661177051512781401b5440c1372a35dd3290a64c1571c901f4e81f789b32d75551c348289dd92aa4817899efe91048f97 SHA512 c2b1f374638753d3f9d87e60f9337aa052f9efd1f7a942b63a2c8a10e96805c3b8e01e08a746d07005031a83c143c19039d41146a1338003d3b9a4d2c7ef08cd
 MISC metadata.xml 858 BLAKE2B a47a659baa99a77ae0caae149918d698ab357a691fd1c57dfe9671ab5631da54b15daaa96fe45b251f800fcb00da5e3c6e87e30eec2bc960301fa6f818cb34da SHA512 e64e471f2fdcc289c678bfc4fe3d2f652062907f9ff18d0350c0907b3d9bfa4e92c76bf04d1b2f0fb3f820f917ec4e3bd7d997a0d5e2eb270ac10516cb58f971
diff --git a/dev-libs/ffcall/ffcall-2.1.ebuild b/dev-libs/ffcall/ffcall-2.1.ebuild
index f117b8a8f4b4..a683a1df73aa 100644
--- a/dev-libs/ffcall/ffcall-2.1.ebuild
+++ b/dev-libs/ffcall/ffcall-2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/libffcall/${MY_PV}.tar.gz"
 # under GNU LGPL." -ffcall author
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm64 ~hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm64 ~hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}/${MY_PV}
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 34fb8a38d270..d81d08674a96 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,3 +1,5 @@
 DIST fribidi-1.0.5.tar.bz2 2082617 BLAKE2B 99b088a37600d1b3e556b4dd978cafb04af0fea9c7db8ed9b0aa90d6a6a60f8ca312c214151ce386d2d61ae382d6ff0e6ae240bd44dfde28eb8c25a5c5f4cd1e SHA512 c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2
-EBUILD fribidi-1.0.5.ebuild 971 BLAKE2B 23b208bb3e27108ec33623166f546878c44b3b2261c3b3519270eecb2dd474343eda57b351ed12a6bf3db96c5b8b52219bed65cd1ac0454c1d8ca1969743566b SHA512 e77a470f58afa0b647087c90109d009cacffebbe0bdec475a449973eec0f94f3249bfd384c8e69d31df09edec523569afe8021a6610fea642f96f1cdd0fcbb50
+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
 MISC metadata.xml 341 BLAKE2B 5270be41f2666b559cee776629574ac71d81f82d273992d8377febd5c22418ef3ed933214a02a39a8de6cdbd4730d2abf547f001cf1d86c9c40b1a344880d276 SHA512 70b910d1fc10d8c0750618d8e6c1b2722a377f71042539f2400d6364a61483bd270d58e3a8f4f4f46f1a018d239902157b0a1d4aaf9e32b33346136f093f40a8
diff --git a/dev-libs/fribidi/fribidi-1.0.5.ebuild b/dev-libs/fribidi/fribidi-1.0.5.ebuild
index 9d560ef1b28d..d7e0df067e60 100644
--- a/dev-libs/fribidi/fribidi-1.0.5.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.5.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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-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/fribidi/fribidi-1.0.7.ebuild b/dev-libs/fribidi/fribidi-1.0.7.ebuild
new file mode 100644
index 000000000000..ec4204eaddb6
--- /dev/null
+++ b/dev-libs/fribidi/fribidi-1.0.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
+HOMEPAGE="https://fribidi.org/"
+SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.bz2"
+
+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"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+DOCS=( AUTHORS NEWS ChangeLog THANKS ) # README points at README.md which wasn't disted with EAPI-7
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+		--disable-debug
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/g-wrap/Manifest b/dev-libs/g-wrap/Manifest
deleted file mode 100644
index 041dcfd73a51..000000000000
--- a/dev-libs/g-wrap/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST g-wrap-1.9.13.tar.gz 613577 BLAKE2B 7b91a92e28c5f0757a1de95f7c6324653abfadad69737f96766dcf208d6366e3d525a40e07dde3e5b42a00eeead2a676fef5807281e0ecef564706a3820f6b7e SHA512 56001aa877f706eda5f40ac2d06f7214b52aa3d46a1c5cc64c1d195d3e3d619a0d8dac50dabc5b73453784351512e1e35ed53bc44151a61c4b8a9f6e851f6264
-DIST g-wrap-1.9.14.tar.gz 655812 BLAKE2B c4b937d156b0677e597120ec250537b9667242d0359b41a5e184f226c3cfc0086be9e35e265b02e857fb8e0074642aa93588352a07a10d1df95c55a70bbced5a SHA512 681d85caf24335db9f266e8350488d36c2b20a5ec02346189c866c7c1de9bcd4a942f092827cbf5fc30474dff70064abe8139069752a6d82657e51542000194b
-DIST g-wrap-1.9.15.tar.gz 701601 BLAKE2B 510264580a01c715a6f73647291debb4f4cdda473e394a9da2db7b8e458f620fa2433a4c911a3640c43e314e389e57c6b365bc5c4eae0e0db67ff04511bd8887 SHA512 599d7e5bda7a4fe8a74729a9cac29c8fe34eed4568d1ddcea778035c6695738e8ce545f84142c5876421db58a108347c1a860b9187c36d1af9b272c4219ae2ca
-EBUILD g-wrap-1.9.13.ebuild 635 BLAKE2B 97add4ccb66616f3bfbc24db7ebb83b49a64aaba5195bc6c8e531b6dd4ac0afb226d065f0dfa6e63e9c70e4de2a1abd7ede505c445238e497d47d6519ac9a884 SHA512 ecaea1e53331e876ab0c05252f383237368407e91e0cfa9ac6b4a28d38bf3afb3842cf1e4ffaaca5045b0f061d4ca9511d0a1ea6e3a00c0a00364f81922833f8
-EBUILD g-wrap-1.9.14.ebuild 704 BLAKE2B 87fe1a988aa9a5a766685488827aec3ebf2eb41ba9628c64eef167df4f418e55d805bcd71ab2c66ff3f4b82ef0ff6dda5f1e3a5f53ea2caba2595954435b3827 SHA512 2055c752cd0dd25a64e27651c87b3bb8123b9e30341c471f87d63de5925c0c70a63527e9379ad1da87c8cb52c62d6b1ada94f5d502bab2da2af0f07e20b4b8db
-EBUILD g-wrap-1.9.15.ebuild 694 BLAKE2B 9141ea71e2198b67f0b821d0c8a8410d6b45c334695304a2ee13850b73f40a3d129aa989e4d828a85cc662978049fdf1c290598dc46ac4a243a35c50e06b624e SHA512 150a292363d211b625c10eaa0b74a3d0938989bcdbbcc08cc7034f867258a9e89b94fd15db1701ac38b6d1242064b94b0ca64d8f5c515fe7c8956b74c6a78de1
-MISC metadata.xml 470 BLAKE2B d84738809f2d8a2999a9e9d22b342885cc9d55ff1328ff15720eb5a7887d03d64ef170db8723a8a080c738cac5495a4a396bf56c0288e021414affacf1c7195a SHA512 1a0ed70c7e3de5204dfbc75a6c470e0b833973b8b0922ce679ee4b4d5cd5c208f6e48f815d66b2d086e3ae9c9258c306c2480afe00c227b27e6f892362cc1c48
diff --git a/dev-libs/g-wrap/g-wrap-1.9.13.ebuild b/dev-libs/g-wrap/g-wrap-1.9.13.ebuild
deleted file mode 100644
index e204a071fc99..000000000000
--- a/dev-libs/g-wrap/g-wrap-1.9.13.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A tool for exporting C libraries into Scheme"
-HOMEPAGE="http://www.nongnu.org/g-wrap/"
-SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/old/${P}.tar.gz"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-# guile-lib for srfi-34, srfi-35
-RDEPEND="
-	dev-libs/glib:2
-	dev-scheme/guile-lib
-	dev-scheme/guile[deprecated]
-	virtual/libffi"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/indent"
-
-MAKEOPTS+=" -j1"
-
-src_configure() {
-	econf --disable-Werror --with-glib
-}
diff --git a/dev-libs/g-wrap/g-wrap-1.9.14.ebuild b/dev-libs/g-wrap/g-wrap-1.9.14.ebuild
deleted file mode 100644
index 189c24d4a7ca..000000000000
--- a/dev-libs/g-wrap/g-wrap-1.9.14.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="A tool for exporting C libraries into Scheme"
-HOMEPAGE="http://www.nongnu.org/g-wrap/"
-SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/old/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 x86"
-IUSE="static-libs"
-
-# guile-lib for srfi-34, srfi-35
-RDEPEND="
-	dev-libs/glib:2
-	dev-scheme/guile-lib
-	dev-scheme/guile[deprecated]
-	virtual/libffi"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/indent"
-
-MAKEOPTS+=" -j1"
-
-src_configure() {
-	local myeconfargs=( --disable-Werror --with-glib )
-	autotools-utils_src_configure
-}
diff --git a/dev-libs/g-wrap/g-wrap-1.9.15.ebuild b/dev-libs/g-wrap/g-wrap-1.9.15.ebuild
deleted file mode 100644
index 5a49fcadfff8..000000000000
--- a/dev-libs/g-wrap/g-wrap-1.9.15.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A tool for exporting C libraries into Scheme"
-HOMEPAGE="http://www.nongnu.org/g-wrap/"
-SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-# guile-lib for srfi-34, srfi-35
-RDEPEND="
-	dev-libs/glib:2
-	dev-scheme/guile-lib
-	dev-scheme/guile[deprecated]
-	virtual/libffi"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/indent"
-
-src_configure() {
-	econf --disable-Werror --with-glib
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/g-wrap/metadata.xml b/dev-libs/g-wrap/metadata.xml
deleted file mode 100644
index c240a63719b1..000000000000
--- a/dev-libs/g-wrap/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>scheme@gentoo.org</email>
-		<name>Gentoo Scheme Project</name>
-	</maintainer>
-	<longdescription lang="en">
-G-Wrap is a tool (and Guile library) for generating function wrappers for inter-language calls. It currently only supports generating Guile wrappers for C functions.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest
index e471b49aa23b..62647ec06c16 100644
--- a/dev-libs/gdl/Manifest
+++ b/dev-libs/gdl/Manifest
@@ -1,3 +1,3 @@
 DIST gdl-3.28.0.tar.xz 541252 BLAKE2B 7254a9e15e9e79229c85b12c02ff5307bf99569428b13629ac8b3a5e79383f14a248d6e74f139e44145cd1a2825a2d10859c922a07a22fe1243edfafdb01514b SHA512 d6a697b8cd098abfcb560d8b6c8a326b05f6f22211a3bc92ea458d643170abc514acd4105e372fb61777d2a5dd09709d7e3d6d3ad75215fffdf2809b3df3c471
-EBUILD gdl-3.28.0.ebuild 722 BLAKE2B bf6261dfa8590917598108170b826de6ff41139ff5d66d9163d4ee99eafc90880f156c37cf324bf78a86fcb3e01a820a98c0650bb9f24bb8d7a1146115712544 SHA512 403d3a58a377c23974911b2760f0ace194f1ebe223f5e63118fe7bf6f363ce43f519b8330522f1d04f1e82d4fd4110e371322bbf2b8fd8be513ccc0e9d578664
+EBUILD gdl-3.28.0.ebuild 712 BLAKE2B d8a1cb04635910a8180fe89e7043bf83d8354f94ed5514699e01da520ffbc183d5a70aa2ff4563e9cf508f0e3d845ac4620a5bbf9c27101e9efbbf22ac468894 SHA512 8b09991df57fae9387cb7de7e6a5844468a4d0826ef01015295258a9a856d6ea49d79f920f656160117a2dfc5d81527941e788824ff22b1b5cd6fc217e06d350
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gdl/gdl-3.28.0.ebuild b/dev-libs/gdl/gdl-3.28.0.ebuild
index efeb11f9b85f..2e0b06ba0e4a 100644
--- a/dev-libs/gdl/gdl-3.28.0.ebuild
+++ b/dev-libs/gdl/gdl-3.28.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdl"
 LICENSE="LGPL-2.1+"
 SLOT="3/5" # subslot = libgdl-3 soname version
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/dev-libs/gecode/Manifest b/dev-libs/gecode/Manifest
deleted file mode 100644
index 2d9ea6a788b3..000000000000
--- a/dev-libs/gecode/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gecode-4.4.0-no-examples.patch 463 BLAKE2B af3a815d3499a4cce304d8d42afcf6a9c134a52156f4d97c7f3d8066c724427f5b4b74aa7fac9578c08578b396e5688a049b01c88ddd2620f3dd64696c9595e9 SHA512 bf9b4fb44338ffdb6be6bc6bf601697bbf8a7d7f2518c753dff8306f58af1d4c03024785d1d47446518364eb485791c2b245f7ec6e8ff63aa0a37e9f8656d61b
-DIST gecode-3.7.3.tar.gz 1643336 BLAKE2B bf36fec6ee7f9f76be578de084f6d5c60afb9c01e6d66dcb6e7f35e0105fbf3be9017f8377f09a00502bcd4bc02f97083d23ceb42de16f5361c388fa332f9dba SHA512 292bafeaca3911b8af40d7c0f425cf0263f4408afad47f4f229a821ce89d06dc69ad1feeeef72531a1e711d797d249581b67c2d9cfdc9e544240012c838d2a5b
-DIST gecode-4.4.0.tar.gz 2889186 BLAKE2B b98692f841f8af292371b222c5dd8fda771eee48664e415daa84fd34c6430276fbc96c127491c8eb0fb86c1744f4137ecd1556420ddddc72af70ff0712999bd7 SHA512 5189a3c5f9f34371a0bc94528e8ca65efb0a3078ec158887f47a816d6fe3c879a7e908ee421414bc317754333ecb73806c8fc46b0b6b7d8419cdf6f13a4f8aef
-EBUILD gecode-3.7.3-r1.ebuild 722 BLAKE2B 0962e7c10c56af0b455ea12fef13590ef8ce17a099d9a5b143955a0fd794bb2309bdfc004336d44fae5e8e900ecc6e248840e5bff3cdae5bfcf385e731bb54cc SHA512 9c75e8ad0bf141feb626fc082cc0d7ca0fa5616060828bc1a09cd36c254de18a02e58d676a2da2e40a6f83aed9cfccea15d8c0b7d7cff6f892689433a8a63204
-EBUILD gecode-4.4.0-r2.ebuild 1563 BLAKE2B 5e25dcbc20eca89520637dbd358ea392c15f3373fe1c3b39a034d7e5b26592fc865fc4763aa17a16502f4652152290475e96641b365be7669873db69bb17c2c3 SHA512 6c0ed6549afa92ca8adde52684bfc6e88539a6f6e077cc53dfbd5b34b1f217b9d8d4d934b27c0b5894db735f126b575151b97bb04f95ee88a8d1080ea12fa190
-MISC metadata.xml 358 BLAKE2B 5b3d5ca409a8a649ed5b12a183102cca98e71be6195e0d0ec3a62d12441a33962d7514806642402695e9d98853d85047771979089fafe8ec1f7c6da9a20fbe73 SHA512 dfa79307fe5693ac03c56589907f414074c21d584c652a542e1ff409fedfe8b43a130e842cf4fe949d30d483d047c73d14906094b7656118b0e31461eb03dc06
diff --git a/dev-libs/gecode/files/gecode-4.4.0-no-examples.patch b/dev-libs/gecode/files/gecode-4.4.0-no-examples.patch
deleted file mode 100644
index 26535667fa65..000000000000
--- a/dev-libs/gecode/files/gecode-4.4.0-no-examples.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Avoid installing examples to system root.
-
-Patch from Fedora.
-
-Gentoo-bug: 488150
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -953,8 +953,7 @@
- ALLGECODEHDR = \
- 	$(SUPPORTHDR) $(KERNELHDR) $(SEARCHHDR) \
-         $(INTHDR) $(FLOATHDR) $(SETHDR) $(MMHDR) \
--	$(DRIVERHDR) $(ITERHDR) $(GISTHDR) $(FLATZINCHDR) \
--	$(INTEXAMPLEHDR)
-+	$(DRIVERHDR) $(ITERHDR) $(GISTHDR) $(FLATZINCHDR)
- ALLHDR = \
- 	$(ALLGECODEHDR) $(THIRDHDR)
- ALLOBJ0 = $(ALLSRC:%.cpp=%$(OBJSUFFIX)) \
diff --git a/dev-libs/gecode/gecode-3.7.3-r1.ebuild b/dev-libs/gecode/gecode-3.7.3-r1.ebuild
deleted file mode 100644
index f586564191f5..000000000000
--- a/dev-libs/gecode/gecode-3.7.3-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="An environment for developing constraint-based applications"
-SRC_URI="http://www.gecode.org/download/${P}.tar.gz"
-HOMEPAGE="http://www.gecode.org/"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--disable-examples \
-		--disable-gist \
-		--disable-qt
-}
-
-src_compile() {
-	default
-	use doc && emake doc
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		dohtml -r doc/html/
-		einfo "HTML documentation has been installed into " \
-			"/usr/share/doc/${PF}/html"
-	fi
-
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-libs/gecode/gecode-4.4.0-r2.ebuild b/dev-libs/gecode/gecode-4.4.0-r2.ebuild
deleted file mode 100644
index 4642b6d3496b..000000000000
--- a/dev-libs/gecode/gecode-4.4.0-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools qmake-utils
-
-DESCRIPTION="An environment for developing constraint-based applications"
-HOMEPAGE="http://www.gecode.org/"
-SRC_URI="http://www.gecode.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples gist gmp"
-
-RDEPEND="
-	gist? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
-	gmp? (
-		dev-libs/gmp:0
-		dev-libs/mpfr:0
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-
-PATCHES=( "${FILESDIR}/${PN}-4.4.0-no-examples.patch" )
-
-src_prepare() {
-	default
-
-	sed -i gecode.m4 \
-		-e "s/-ggdb//" -e "s/-O3//" -e "s/-pipe//" \
-		-e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" \
-		-e "/AC_CHECK_PROGS(MOC/a AC_SUBST(MOC,$(qt5_get_bindir)/moc)" \
-		|| die
-
-	eautoreconf
-}
-
-src_configure() {
-	 # --disable-examples prevents COMPILING the examples.
-	econf \
-		--disable-examples \
-		$(use_enable doc doc-dot) \
-		$(use_enable doc doc-tagfile) \
-		$(use_enable gist qt) \
-		$(use_enable gist) \
-		$(use_enable gmp mpfr)
-}
-
-src_compile() {
-	default
-	use doc && emake doc
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" emake test
-	LD_LIBRARY_PATH="${S}" ./test/test || die "test suite failed"
-}
-
-src_install() {
-	default
-
-	# The --docdir and --htmldir that we pass to configure don't seem to
-	# be respected...
-	use doc && dodoc -r doc/html/
-
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-libs/gecode/metadata.xml b/dev-libs/gecode/metadata.xml
deleted file mode 100644
index 234da92a34cc..000000000000
--- a/dev-libs/gecode/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="gist">
-			Enable Gist, the Gecode Interactive Search Tool
-		</flag>
-		<flag name="gmp">
-			Enable trigonometric and transcendental float
-			constraints
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest
index 7435d775ac79..a1fb31aaee2d 100644
--- a/dev-libs/geoip/Manifest
+++ b/dev-libs/geoip/Manifest
@@ -3,8 +3,8 @@ DIST geoip-1.6.10.tar.gz 161506 BLAKE2B 968ae25afe8345def099b82acf5bca4b7bcba05f
 DIST geoip-1.6.11.tar.gz 161934 BLAKE2B 628dd37bbcfffe36970d6bc8cd12ff1d504d9dc7bb760860ce59fbeeac631317556077ca5b50ae42c9cc8567ed41194379ed0743a0c2b0b0bef65504b13e62cb SHA512 9c017a95c7903898b9a2bc10c34e51b390326c181c46e6f99daf3bc4d8f84cfcf640c5cc92d527e4c7428e2b5bfa835cc57040507eb836062139a795726349b9
 DIST geoip-1.6.12.tar.gz 160826 BLAKE2B a6cb17141e4e9d00c15d19d7adfecb5492b14591911dc85de403afc9f94801fe1ec92b6106478448074d3679d6c9fa6a44f210b9cc751aba0c0425a5fae699c1 SHA512 d1ed2dae091548f555cde4d26e4b51ae1e8fbb12ef1695fd95963229d9a1bf241e6f09e5d77b151d51edd0cef78ddef490c6a3f3a70ff122bdd9c0ac5500fc7d
 DIST geoip-1.6.9.tar.gz 158576 BLAKE2B 797dce578c0e2b92b02cf125be5448746025e86c6d9a2efd4ec2c99de99b3874c9da0ef20c7c76308121420ea8099a0744c0240640ff9732b961789ce334b8d1 SHA512 a3a34511ba32e6c7d0b46b0e608c5be54411cf5b095c867c3225941b55e5714ec7c68de64e0aefcf4ee2081fbd626480067d6bc9822d775decef1f8e26d7e976
-EBUILD geoip-1.6.10.ebuild 1297 BLAKE2B c5650da4bbaf1c0290a26223f2b231a9e479f586dec8fc1b77d2d66833b095abc77f04af2ad7ecc59477c56199f45d302f154443c5a9c989b727093ce10ad0ca SHA512 e870c08e13c5e590938624e9788dfde74a4a420c70a3ef6b1d6399e337d09450ccdef14a04d05321d6b359b8992c487580fb483f1126255cd8bcb66544c0c094
-EBUILD geoip-1.6.11.ebuild 1307 BLAKE2B 84e94af04f2eb38d052b05da1aa90ff0867484d061b33c4fdb241bd5e62a582ad1b3b6e1296b5fa1a90a1330ad817bda392fb73aefa0829209b4ab19f2bf70ff SHA512 c204420951256782aead397071b203cf80a20352a96dd225240820c462b40ccbc81fcb062a393f70df89d699569348250ef89ffbc5a93ed2ed704cdda4b38369
-EBUILD geoip-1.6.12.ebuild 1307 BLAKE2B fbc239ba46ce020779604db81bed0d045f4bddd94030b85b2f0d8fa99275fbd437cc549872365f93a1f3de5b764a98f101ffff9794897a42259aeb9c1e70fe58 SHA512 c35f094f380323e364f20650e6c0fc9dbc48d47b02767060e1eddf885c20649f25ac9589b7532e018710fbd6b2404eaad169fcd3d2ca7155c6957aa4981cddee
-EBUILD geoip-1.6.9-r1.ebuild 1297 BLAKE2B bc58561a0be7e6d6916eead747add1bdacecfbf806644aeecf235f65cc5d142c482b7dcfa7885a4ba664f0bc687abb30f7a0ac342c75a99684001176876029a8 SHA512 47e87b89e2477917040b777f8f6d7490984cb4c2124b5d0707b44a41eae80e4e16a4b55eb3264fd280229c06401bed25273edd3599576424b0e96955cb6b19cf
+EBUILD geoip-1.6.10.ebuild 1275 BLAKE2B b0d5676966cf3841f269430921d89c09c649c0fb66a1d32a81220d5f3b302885dd59b7cac02578c25cab712696f81eb4f498ce68cfecee8d90cabf22267eb3b4 SHA512 d9d3f89b1ba0278b418fe851ef23af1056c31b23b87dc24fb13d79d7f49765f0908a102b6d5659a7fc1eb89f91c74217080e78f744af78186c2b0dbc9d670582
+EBUILD geoip-1.6.11.ebuild 1285 BLAKE2B 4bc6c7cd1c076cc91f632157a2bdd9fdf3449d07beb956d010f8fea75dfc05ac812725dd45c9df110fde31688b4ce815fb9732ad4677ffbbc3a533411c0e6857 SHA512 ea6f1d7a9bc2e3613efcb946456030f0726f117f04b9066a745d14adf3a1436e911697d5aa7846533f9452a0ef2a4843d196c12cadffcd1d82d69bb3220ed761
+EBUILD geoip-1.6.12.ebuild 1285 BLAKE2B 7bde34369d32101feecb3a6745af72e5e2a582d6037f4c23f7a222d7ff62fceaf97cc4fd3e7f733cbf060a96c02b2e68f47ff0af06a0524a608bf5e30bd1dd34 SHA512 acc3a658172ce69126694135d7166ff018787739d7203d407bb03d05ae6ec8e2ae17bb91ba9aab95c440feaeaa67903d7b5161e8c3c85d243dfc62abc080c5ea
+EBUILD geoip-1.6.9-r1.ebuild 1275 BLAKE2B 3349f2a841198c5944ef5634563a1a1d51d8daf7cacf24220aafe26d73e989355f70d299be656339f88c907c4cd0c5766d2f5dca1e47ab5f414dfe23b587debb SHA512 ec666f33c66b2991e7d01a4c87a591385d698fb9f1f9b24e781249c49ebbac43c461330903c47512204e929dfc501ac4a39e0bc125e0a26e41a6b42874a03e55
 MISC metadata.xml 374 BLAKE2B 1dba87e78019d8000de7779503afc32bf7a0dd5626981db35c0fffd608cfc4b0996159b15961a97aa3e8ee8a128a0263bb10b310c1457de2f955ef55c2f93e01 SHA512 1637e770cb8d68a11ec8c9b9e902d026c557efcce48221edc02dd9c0841ce14b8558402283c81b5babf133a5d84c148e7df8a5e864970fdbb0e256b9d8340762
diff --git a/dev-libs/geoip/geoip-1.6.10.ebuild b/dev-libs/geoip/geoip-1.6.10.ebuild
index deb21a6110f6..78257397c3ad 100644
--- a/dev-libs/geoip/geoip-1.6.10.ebuild
+++ b/dev-libs/geoip/geoip-1.6.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/geoip/geoip-1.6.11.ebuild b/dev-libs/geoip/geoip-1.6.11.ebuild
index 5ecf50082bde..b1e5a1cb4768 100644
--- a/dev-libs/geoip/geoip-1.6.11.ebuild
+++ b/dev-libs/geoip/geoip-1.6.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/geoip/geoip-1.6.12.ebuild b/dev-libs/geoip/geoip-1.6.12.ebuild
index c5ce219e773e..044c35a1fb9a 100644
--- a/dev-libs/geoip/geoip-1.6.12.ebuild
+++ b/dev-libs/geoip/geoip-1.6.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/geoip/geoip-1.6.9-r1.ebuild b/dev-libs/geoip/geoip-1.6.9-r1.ebuild
index e995cafe4822..da0728295bad 100644
--- a/dev-libs/geoip/geoip-1.6.9-r1.ebuild
+++ b/dev-libs/geoip/geoip-1.6.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 63cdebfac539..283860a00baf 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -2,6 +2,6 @@ DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee
 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.54.3.ebuild 1557 BLAKE2B 3eefd791008c74a8826023a6f788f9bf7d95a68b2d46c27f44f8a20a4e43dfb9877c4d78cfaab68383a59ce12154f75502cbdc470c63b209b444e03f692f1e2b SHA512 191d391963078c630355b6a50ddfa8c1473b5780bcfa2af98cb818743716bb2d98684bb5a76d890393c7e64ee4d6eb481524c33e76d40810576ad7487afbaef9
+EBUILD gjs-1.54.3.ebuild 1556 BLAKE2B 9fd9e8b7ae9511995a83a99a916c7c5afaf45b9a65a27aa4dc2f75c7f0ed77c794daa9bb7a541b36d3c8a230b628c4eb4705053120a08ff504ff1588e46c67cd SHA512 6ed337d8f79d3848159cb5ee234e6482e22b2cad42244e29b2ea3257dd1aca2fc9b6385bc8532703e109e576e609b95bba4474951335fbb51de755971a4a5ad7
 EBUILD gjs-1.56.2.ebuild 1730 BLAKE2B 0d09046b4a4029486f2c06d8ef923353bedb4a65448a19a33d417d7a144f4a6c7efd8c057df8a9f468a5e7950c5b80e1c31cb76e48c39f0e013340d25fb4fdce SHA512 165ea3340b784457679f261106d57e07b1328bb73f292bfa6bce90ec08d51b72243dc0537f1ae77525c4aded557822465feaf835f7a0690cd9474bec0adcae77
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.54.3.ebuild b/dev-libs/gjs/gjs-1.54.3.ebuild
index 86eced5fe04f..b23457717dd4 100644
--- a/dev-libs/gjs/gjs-1.54.3.ebuild
+++ b/dev-libs/gjs/gjs-1.54.3.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
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 4bcef58c18e3..1a2ef442e3ac 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 10907 BLAKE2B c600133aa1db3ec6d7171d83c59fdb6da341d2c074847770b88828c34e0616819882ff3604d79291e621b18724b8ae2e57fd5cf1fd9250ac31622d2de2157887 SHA512 011fdbe52c49f32682f5735ba4332e25e87b5ed8efe3da9c5fd543c282ea7932deb11d05cb93b6ab92460f0d545e0c7cb3798c4c3f736b58e9b5ca3ee388e1eb
-EBUILD glib-2.60.6.ebuild 10140 BLAKE2B c2307ea1c3827c02d9f46616b01f0791a3d53481619d4589942e502d0481a970d321af1a983fcc97087ede2eee273ee047ebef4fbe1a78cf02c73dd9583d9d89 SHA512 42249e14eb42e3babeb235ace4206683789e46b0c5749154b07b012bce4e978bcaedb448191816e00c877e1db24a85a0c757b9b2168c3fb7fd78ece406677fcc
-EBUILD glib-2.60.7.ebuild 10148 BLAKE2B 2ebd61ea78d44be8fda45dc9a13690af237bcd8a4002720a5743bbc171e128aea6fae71d6c19eddbaa565a3f5436d85290d38c1cc5ef346b28ed0f027110ee63 SHA512 978271f013dc19b9acb3e62ea47016ec67505c1950f3f8db538fc6d55a238bf1a632735a34af64a33949ea9492bcbc46029efc3fe427494a7edd1a8ea02ba204
+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
 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 1008e0119875..af6ae5ac84a1 100644
--- a/dev-libs/glib/glib-2.58.3-r1.ebuild
+++ b/dev-libs/glib/glib-2.58.3-r1.ebuild
@@ -21,7 +21,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
diff --git a/dev-libs/glib/glib-2.60.6.ebuild b/dev-libs/glib/glib-2.60.6.ebuild
index 1db439551344..0da3428974bb 100644
--- a/dev-libs/glib/glib-2.60.6.ebuild
+++ b/dev-libs/glib/glib-2.60.6.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~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/glib/glib-2.60.7.ebuild b/dev-libs/glib/glib-2.60.7.ebuild
index 19cc919f1490..c3b882a75d1e 100644
--- a/dev-libs/glib/glib-2.60.7.ebuild
+++ b/dev-libs/glib/glib-2.60.7.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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 5f7838b6f7d6..614dec62c928 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,5 +1,5 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
 DIST gmime-3.2.3.tar.xz 2217320 BLAKE2B 29c8004636b27acd1dfd102d45bad39c09c677475c5e063e73b26ed242070b66ce1030d6ecfbf16d76d83ff403685bd62bcad832b94883fc5b3c770d9f800fa8 SHA512 abaf9059baf0c045d5b62757953ee2fa0779462eb32142bb41be40c376fc7ac2b3e4a56fd66177fbbe1dca35c6168a251542b14a844125c2cfcc9a99888179b4
-EBUILD gmime-2.6.23.ebuild 1732 BLAKE2B c90cc326aea44d0e2ed12dc62a98d7f206dd33327a25ad897bb3a637a59148516fcef7f39e1f8029941cbc83836fe7e5df6f624cb1ad66f5f104d5c8115d9c66 SHA512 ad3f04f9358ab96caff5b1621d01d60b8db8888c16f35c410afdcc2932f4835630190a39b8c3df74b911667968bdfa34825e9b197f22b47463b318b374b32e68
-EBUILD gmime-3.2.3.ebuild 1564 BLAKE2B 86377f78457fc516f1ca64933db7d72ea9efd444357f581f31ca1ea16961999e83a0948ba74268cda0e1b0444099f3a79be0e4931df814249239f5d59226bfd4 SHA512 b48fbc404a38fb0a05ce556f9eaa2f9ccee2a921ad13bbf7b4b54f15cc501915391d6f631f1658135865e735cc176514ba2b2c07ad52dfbac2996bc7ad7cc0d5
+EBUILD gmime-2.6.23.ebuild 1722 BLAKE2B 9e3fb8377a4908c8569739940a39fe147dfa02bc1983812e041a37f66b0d53569d666b5cf27645a27b325fed4d73fb3503b18fcd2b79c91d0c6e89679336c3ed SHA512 73455c2979fc958713fb9f7df51bdcacaba08c76ca3205a6993bb2ded1784f27a41bb7fb2a22dfbca648bdee908dc7103733f4f86c231cecede6cb757c25c97c
+EBUILD gmime-3.2.3.ebuild 1554 BLAKE2B 21b99a57ad848545e879df34eac874a423f3892b55757ea30c379586a88bcb24a8f5bf5446ee9fbe00b8dcf8e63a6fb3a670af2271d529671edb3bbced553612 SHA512 69d726e3a11b73103725d9ce3d0bcad3100de5e7cdd9d6cd23cffb78ccb749662a7fa8a99a556173818d90179a16534e3bc00b576f23d159f58d8fab3cdf9c40
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-2.6.23.ebuild b/dev-libs/gmime/gmime-2.6.23.ebuild
index f3ba278aac5b..fe5a962ae414 100644
--- a/dev-libs/gmime/gmime-2.6.23.ebuild
+++ b/dev-libs/gmime/gmime-2.6.23.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
 
 SLOT="2.6"
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~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="doc mono smime static-libs test vala"
 
 RDEPEND="
diff --git a/dev-libs/gmime/gmime-3.2.3.ebuild b/dev-libs/gmime/gmime-3.2.3.ebuild
index b81300b696c9..d90c88951c2e 100644
--- a/dev-libs/gmime/gmime-3.2.3.ebuild
+++ b/dev-libs/gmime/gmime-3.2.3.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 ~x86-fbsd ~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"
 
 RDEPEND="
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index ab332f8b35a2..9a55c8b12369 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -5,7 +5,7 @@ AUX gmp-6.1.2-gcc-apple-4.0.1.patch 979 BLAKE2B 0fe8bf2db0e4633f5d230f02a0bbeb8f
 DIST gmp-4.3.2.tar.bz2 1897483 BLAKE2B 0efecd60c7a585f94ec8cbee77541d409c8e3bdeabaca09f7971560fb0fd504ae8e405256913acbef1434146868885c98068ff59efec92c92fdb73b853cf9396 SHA512 2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf
 DIST gmp-6.1.2.tar.xz 1946336 BLAKE2B 2a864e80799471037a71c10d871f9782c37fe3a0a1734872e90f14a874ecd6551099d67b2ebd07f82a43b0522249a6b46e79952db11a278f87ca8013198f7604 SHA512 9f098281c0593b76ee174b722936952671fab1dae353ce3ed436a31fe2bc9d542eca752353f6645b7077c1f395ab4fdd355c58e08e2a801368f1375690eee2c6
 DIST gmp-man-6.1.2.pdf 825720 BLAKE2B b96340da5f534353b140b361fc1ff74757168024e8039d97a0ed1f14d874ff5fbc50abae2ff3505adc51d72e4acf2882ae6ca6405ae37b594f7b248e1ca05247 SHA512 85de10b2c03f7381881c3e95aa7fc53d8e018115028496ffbb5a79ab4967106c69ed7e97a5e434e6bb39752498aade8c2caa7cf77a8942b7ffd9150368a0d9c3
-EBUILD gmp-4.3.2-r1.ebuild 1699 BLAKE2B 7f600a9d920bf53a0de5954675d3cf72738ab7f74f2e552b0fbbcf3ec891835153ac6e3b5d0180171fc0356d9b9b1384882d9c4fc13b2d1e03c79b53b8c3d312 SHA512 2df5767cb8e4ae67f0264ad5cdd99888ec465774ddd079c9bc6648058138a28dbe4203552233c62ee02b7b2c6ccf2747ec70d2d078dba1528ffca7fae2fb40b6
-EBUILD gmp-6.1.2-r1.ebuild 2951 BLAKE2B 7c1d3d1dc8bab89251acf8854e8ac0a03a2dbf71297a94e1f5b328cab7246cb18e58c236b8e929baa5389203ad61a1ee9b35fb4a27b1a5e21b7192163f35a4a3 SHA512 5092625d8f92fb2c42437affb0e5edd90e36ab783e6047f0f0fccaec3c6552cbe99bed61d1ea7d04a6414d6b5ea914b3ca6623c83200b5296c75fee3c3b52230
-EBUILD gmp-6.1.2.ebuild 3034 BLAKE2B 5de624947cbaa0b8edcc8e79312ae08f5fee41a1fbd31534cd13df246f9ec833142bc5e47501bc0d3da913763481328c83f84942bcb5380ba7ba87d30c5bb382 SHA512 874fb4368d5685dadafc758bd657bd60677207f0d9316ea5ef978acb26a7158e14fd6df5599aeb05dcff0094ca4b66201a09930639737f35eb11947853fd1d96
+EBUILD gmp-4.3.2-r1.ebuild 1689 BLAKE2B 4c1dc133268629570eaab18c0a9bc4240a8e310236efb0df5c4ef26fa480c1d61863b996cc4f355fda3a1df4f98784ca6925b7bf0fe40bf54ae50d7345d58fcd SHA512 51ac8108c0fc4c23a6872b1397b7beb21d2caa493a32575776bbc0552adc9adf559b644785fd7047911455beaffa658454770bafd28b610d88dd38208531026c
+EBUILD gmp-6.1.2-r1.ebuild 2929 BLAKE2B 36771ecb0821cabfa6c5d524b0b3acce4350eb4af42e3afd41136f95fefe1540ccc81a6371ecf0727c5f55396bb2722ce139fd6bdbe39f71515960910704d393 SHA512 4ab19dd9122b01b59fb45a412b0ed7fdf4530d5d842167db99a3f2ad583e29caad350d0e3754fe2d253d3b1447970ced168d0622e7f426f47dff0811280130d6
+EBUILD gmp-6.1.2.ebuild 3012 BLAKE2B 0925c290090d5bb587e24170e8feb27d43bf41e84c222bd2b05f4f26757d4bf58de559326835058fa0c41c393422abfe95b00b2c41c2e03584001246ce8a15e6 SHA512 e2f5f9931fb194534d6a4bd01f6c7462ad6f0be3be014da6be1dcbd02b6a8f74a8f180508f2ef68d89a65c41893ebc80910501584c57a142a6f81df8193e1ac8
 MISC metadata.xml 437 BLAKE2B 74945994e080552031f2fbcf051b5fb638712205d40433225fa010f70376a96903da3945dfafd4594da53624628d1abb9929a854cde7a60fa2e88fd01f0ba025 SHA512 c1d6b6a603472a84703310b3dcc72eefc66858ca397519cc42d06750b57d6f9683c9ac908cd3fc3aa16406957ed23a6ddf12a3cba6b20e97c21758b4ed3425ea
diff --git a/dev-libs/gmp/gmp-4.3.2-r1.ebuild b/dev-libs/gmp/gmp-4.3.2-r1.ebuild
index 119a7b9dd487..09bff4436b94 100644
--- a/dev-libs/gmp/gmp-4.3.2-r1.ebuild
+++ b/dev-libs/gmp/gmp-4.3.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="sys-devel/m4"
diff --git a/dev-libs/gmp/gmp-6.1.2-r1.ebuild b/dev-libs/gmp/gmp-6.1.2-r1.ebuild
index e2b2b8b64677..868d521c14fc 100644
--- a/dev-libs/gmp/gmp-6.1.2-r1.ebuild
+++ b/dev-libs/gmp/gmp-6.1.2-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~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="+asm doc cxx static-libs"
 
 DEPEND="sys-devel/m4
diff --git a/dev-libs/gmp/gmp-6.1.2.ebuild b/dev-libs/gmp/gmp-6.1.2.ebuild
index f7a77a47e8ca..4e84d2eb7d3f 100644
--- a/dev-libs/gmp/gmp-6.1.2.ebuild
+++ b/dev-libs/gmp/gmp-6.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc cxx static-libs"
 
 DEPEND="sys-devel/m4
diff --git a/dev-libs/gnulib/Manifest b/dev-libs/gnulib/Manifest
index 01581636b0b1..5088b31dbc59 100644
--- a/dev-libs/gnulib/Manifest
+++ b/dev-libs/gnulib/Manifest
@@ -1,8 +1,8 @@
 DIST gnulib-3a0b7b74982f44c735f4cfc2dccf538c3c4ef9e2.tar.gz 6192393 BLAKE2B 6c7409242c0421dd260369e7ca0b1c27ee46eb34c332d349545a5020e31fd476127b770739dc2578b3aa23e3a569e7d1467f41055bf449799d78b6ec48943fe8 SHA512 9076d0476aef4a7425fb6db038c2a4657ae1a5619a0ddce07a68a97883924f07635edc59818b532564128fbe23b06b39c98b4c544d4fc670dfc4ebd34e2e52c5
 DIST gnulib-b451121ab45497e78cb6f612c8673a9705193391.tar.gz 6666079 BLAKE2B e7d3b9478697067b57ab198e044f3c854128d5fe390d30947829ce4f34c695a748668c33ae19690e9927fff6df3e194a3160cb4adb7cf47235c603241c66889a SHA512 f6e165cfc0a3999c778d9f43ffc90ff9b569a77ff1e54ff5c50b12b0eddf262c24da8cd2719548574e0397535bb0eb835eef603cc74769f7876ef9db101bebec
 DIST gnulib-f583f328bec489dd59b54ecc1cc640843ea261cf.tar.gz 6486622 BLAKE2B 725fcb598262d12c8b0f04d4341cc59c18a915ce34f5239c587121a7f297d2b86dd49f98f19900c49400166789f6eea22f6719c76a78c0b107ba2fc550568145 SHA512 303d8d5eafd210854b803e9add2575de314a28cfc530dae49d1f738d73fbaaf3e3c18267ecf0367b8e16b11a2e403454f37b586f0e7718297ca6cdac9984258b
-EBUILD gnulib-2016.12.21.08.39.01.ebuild 974 BLAKE2B f6c3dc683330fb017f338e346ecc1e00a09aaaaae5200a36f7a9ee48369c716e29c168e259bb659d3c2bd3c49587b808a0ef326ad6229e23dc3df5a2a7d2f22e SHA512 d082eb524d18ee1779434ae4b392018c1a5fb5a14b129065f924b5d70dff074b7fcad9708e77ab9ea9e37a2b9393002fa8aea4d8e994509bad5186dd03d477ea
-EBUILD gnulib-2017.12.19.15.53.47.ebuild 942 BLAKE2B ae1ebfc30f71e56d46b5c0bcbc61baa8295186883a54cf592b69274d44177cab2f25e6ebc73f84ca2c3e340488e3d4412494c0eb789dc5560391be913febbe15 SHA512 1d196f969f15a6999db409f3b34c858ccb187a9ef3a021d72a69a644778006d41561e21c1d8b6aca973f6570ee3dc179a1b677e3e358db3f36de4ce86f544883
-EBUILD gnulib-2019.03.17.09.24.57.ebuild 939 BLAKE2B 65138aae4ab2b44ebf9b3ba39c4d2c3ff9f90830378dead1e2f9ee136f049d02b45f4617bc1c66ab3972a00adabb68713c61659ccdf092115d879a486c0eb30f SHA512 cb7b07030bdcf3bd8d5810c7a4d7249a99d74baf4be95e4ed766df1f317086a7c43182e1ed6c881586dadec7f1a07c6dff647d4e585567d4f214a70825b582dc
+EBUILD gnulib-2016.12.21.08.39.01.ebuild 964 BLAKE2B 685e69797429397fbe8d7813ddb7e2ccb87699712b102f7d6d540006d62d3f58e13d3346a9cd69ad69afc3d6feefc6e76a6f4e38b28b3034a2aacf1e02d15aa0 SHA512 818c119c78fd24c17b16bfdcc5da052ef3cb1b522f3d40283fb409f84a4ff86b7ce3b8fc49009afb947c4e543460637ea1b6e50d067f9e62c4c86f8fd5ddc42f
+EBUILD gnulib-2017.12.19.15.53.47.ebuild 932 BLAKE2B c388743d24b13733f8aa342931111efc7de42106e2e35441573aada2b20150f800b638a3fb7bd6417d25eff7b801975168b6bef58efed09ff0b6d1703acf00f3 SHA512 7fa578c01f30587482162e787ffc1d94c7fdb0709784a5ead09ded5086973d11c117119e7800f6ef3d32995bd7266a7f47891427d53bb5218e55504e3f43c52d
+EBUILD gnulib-2019.03.17.09.24.57.ebuild 929 BLAKE2B 05b41daeb6549b329b188682762e6418a20c55a60739178a7f0a3c284498c6931e8cad37776155b7c622d44b6c21f13d07927482c85a13173eaba3499426a3e7 SHA512 3439dfba3d5c40181553c8c13c95e379bc802ac25b541bcec504b6e8207713c34f4901a35625ba79b66c741672d6baec80fc58a60b08f45177e834fe62f59d0e
 EBUILD gnulib-9999-r1.ebuild 788 BLAKE2B 58e59d347b87cc6a6e1f4e04b6723d1e6dccc7adb7d8c5fac2d4df749bb059da9cd38df28139046281cb5e3c0eee5a62949c47fab8b6976cb37f99fa300fcc33 SHA512 f6042419262d62e10dfb62c2770e821157672040bd86ac3e92da9b5fd008a6ceda1486f331ead8716195cb8c9c3966531ecfe1d47bb6cc09e313a7f4492b269a
 MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9
diff --git a/dev-libs/gnulib/gnulib-2016.12.21.08.39.01.ebuild b/dev-libs/gnulib/gnulib-2016.12.21.08.39.01.ebuild
index a008b1478d0b..880c24682453 100644
--- a/dev-libs/gnulib/gnulib-2016.12.21.08.39.01.ebuild
+++ b/dev-libs/gnulib/gnulib-2016.12.21.08.39.01.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc-aix ~x86-fbsd ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~ppc-aix ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 S="${WORKDIR}/${PN}-${GIT_TAG}"
diff --git a/dev-libs/gnulib/gnulib-2017.12.19.15.53.47.ebuild b/dev-libs/gnulib/gnulib-2017.12.19.15.53.47.ebuild
index 3018a94c51d0..4689f18d6a68 100644
--- a/dev-libs/gnulib/gnulib-2017.12.19.15.53.47.ebuild
+++ b/dev-libs/gnulib/gnulib-2017.12.19.15.53.47.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc-aix ~x86-fbsd ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~ppc-aix ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 S="${WORKDIR}/${PN}-${GIT_TAG}"
diff --git a/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild b/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild
index 131a859af492..500065fad3a4 100644
--- a/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild
+++ b/dev-libs/gnulib/gnulib-2019.03.17.09.24.57.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${GIT_TAG}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc-aix ~x86-fbsd ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~ppc-aix ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 S="${WORKDIR}/${PN}-${GIT_TAG}"
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 81ddb664b4d6..8b6963730293 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/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-common-1.56.1.ebuild 1019 BLAKE2B 8f1d42b739389066c17614960bc214c616a9717d51e845b98ff0dc59fc10d484bda878a4149b358615568544d5b05259e2a788dce281bd4d5a70fe590373f4ea SHA512 db776369d3eb5af2c664aad6bd52a19f3d0371f9b84221c9cf65359cb625089e54b9b1aa9e3cf926b250fcd89e303a7fcffb34c0e5c58893583c82237a0c16f2
-EBUILD gobject-introspection-common-1.58.3.ebuild 1021 BLAKE2B 42f44b301be74849799c2f3b4382090aa2aa419bf50af10c7143c01251ebb9eab93997bef45e25680a3fd0d599e9bd4979bce5d6f50272199a923da6b3c7a2f1 SHA512 07e3ee6f0ec78190f024045a04b9ae3b83c34c4e495ebd99a9ddd1ad8233ca5989aa54158ed5c77bbff1d98bec21698bb46ac007c75ccd71dbfe23b50b3a4a02
-EBUILD gobject-introspection-common-1.60.2.ebuild 1022 BLAKE2B 50eecf479067a192f22f1d20494e582ab0370ce7d75f243adc5eb78c9a68072a4078ff69cb5db5ef19f3f134a2c4ba4d0ba92ce989827a6649512d10d591e3a5 SHA512 931b85067fd3c57cfd6a39cf125725bd84d3633e7f0702136747d623d288c789b271c554888dd14c4a76cc030314e8ab93761cd30f8710264cd65b9a4cbaeda2
+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
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.56.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.56.1.ebuild
index b586888ca2a6..3511e0f42d79 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.56.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.56.1.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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-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-common/gobject-introspection-common-1.58.3.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.ebuild
index db31c21bfd7e..9efbf2992a73 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.58.3.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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-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-common/gobject-introspection-common-1.60.2.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.60.2.ebuild
index f14cbb58dbba..930f9b7d4c5e 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-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 a4dccfd4c5e9..4231cdff3983 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 2123 BLAKE2B ee5a7866e95a1a70b74e2313e51a0b443ef2effa47aa9a119bb3c06442ba98e54e45c0d2fad34ade22fd0e1a8c9f4bb54fa4182f9acda62d0570ac30685f9893 SHA512 0e4c52cecf5cd72848f62a89402207c97bc6073472af2b0a3933dfc0f44170d06969f0bd9a0bdb692b3fffce4a1f4b40aad3b55fb9e932dc3dfa90637b9a28dd
-EBUILD gobject-introspection-1.58.3.ebuild 2201 BLAKE2B 53844bc18ba8ebe1e7f5e4e290c323bb02378793b43590bf9326c2af5fee6ad72d1083a37a2e16f654cc4c6a01e0dfa496954328ac1b9bca07aaea24791210ad SHA512 ede4515431a1d256694d18801416eb22ffe4bc6feb7cebc714178044acd396f2044c61976a3703add9066c99d08a2cad16e02b2c38cdd83725509584d4558bd0
-EBUILD gobject-introspection-1.60.2.ebuild 2116 BLAKE2B 43b25817477e2ea333ef88fd9c7e55f313596c1842b0e94f9cee1eee1df8790e3a9313a99917a7d5420c58fe7bc805197b6f91690d056babbdb103b3994bd684 SHA512 65be982a0a949b1401b077ee4204559e15e3e0af5479c39bee5c17bbbecd7ebb79f2daab98be5b29d05045b7bd2edaef842c4df0092c69cc9310b856434c4630
+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 2093 BLAKE2B d9edaeb9d4f8b3e6c3df7dff795c7dcca481c01757489ad4e9f20d907928ed172b387c26f012b5e2d3434ce788366d5830093100dee4d32d98ff4eaeee059a8c SHA512 74d47ee1e186c5d37cddd78467a17b7771be44bcb125eed7156860f0da7d851e8ac7bcf4354d93604fbb0d821074066cabc0439dfb7a7283edd23244264139b2
 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 a1a2c4ebd051..fda611d8f9e4 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 # We force glib and g-i to be in sync by this way as explained in bug #518424
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 de1d35da2cda..a371c8e76422 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 # We force glib and g-i to be in sync by this way as explained in bug #518424
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 af2c62cfe255..4b9721af843e 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-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/hashit/Manifest b/dev-libs/hashit/Manifest
deleted file mode 100644
index e8fd2464a3aa..000000000000
--- a/dev-libs/hashit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hashit-0.9.8.tar.bz2 18127 BLAKE2B 63a36e644dced8dfbf0bb049adc811ac526c519c4fe85f47ae631eba8d989b06325199fafa43abd0e98d014c7adc90c97bde75fbaacd5a215384a9e6e2f6b505 SHA512 b6a85cb8a7c97d2214fe91409006973de1b452dc7f5b412ad870a5a8d2b937957947ca47c314fd4d05b2683b20a9b8eb4241e0cbbc57e3b68b5cdfa024b80dce
-EBUILD hashit-0.9.8.ebuild 420 BLAKE2B 61b0dfcf12f3aa6faecfb7719fb94c96387f155d33e17bbd0ca0a251943a2a710b821a4ef3c341439c8ae486c1aeabbb34afba2f8a033ab2673553ac95057ce7 SHA512 73852bfcf46dc0b6cabb9efd6c52056347235a0da5d8c7c09dc88a7f29e2c03089fc3f4623a45b6058e8902ad6638197f98ca963a34189d560efc9ec273c3f21
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/hashit/hashit-0.9.8.ebuild b/dev-libs/hashit/hashit-0.9.8.ebuild
deleted file mode 100644
index f6272eea360f..000000000000
--- a/dev-libs/hashit/hashit-0.9.8.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Generic C hash library which supports multiple collision handling methods"
-HOMEPAGE="http://www.pleyades.net/david/projects/hashit"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug"
diff --git a/dev-libs/hashit/metadata.xml b/dev-libs/hashit/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-libs/hashit/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index 986be2deed9a..b8558b07a59f 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 1857 BLAKE2B 9217947c72f5744bf2d01ba12e647672417d8ee16379320cc9c1edbf3a8840478ef09bb14f132b4d42a381271c3a2a5b39bd4ba047b44cf3cd0335d65c5e9f7c SHA512 9bfb698ebfe74a1b9400b7ac25c0b9ec4b04efa2751f4a1f7b646a1d536cc15cfb57e9017a86e5661f74da66ec7521834a9fca7a00474363429a29877756a881
-EBUILD hiredis-0.14.0.ebuild 1867 BLAKE2B e931eba327408e8def1cf4b3b027a87dd093d36cbf3d10e2781178fbc748246eb323d51d9dd02c43f860e4415e8550aa0b1bc5059723b9d22cf5b2dc02f0d8d0 SHA512 e03538599cf8d21b1df2e15579960865adf14083b23512e88e1402659ca0e629c854839005c98f156b59d305aa7f0e3139947c97feeedeaad22ec568aaf893dd
+EBUILD hiredis-0.13.3.ebuild 1847 BLAKE2B 85fae34eb353c706da9e9e80290c6cc004c29cb29d4c03a16ce80da6e78f928b9fcc1a53dbb73d30efdeb324e8fb3c5ebd8e269846489a407608f83e1a75a42d SHA512 6f0d8e5018e5aa8607cfc63a1cdedf9fae8e18da89dedadae42f3d728a7a792db656d89f99195bb86ba3ac23d76562bf5b177b434b9e4481c9f37b17c7c662d6
+EBUILD hiredis-0.14.0.ebuild 1857 BLAKE2B 00f9c22dd85ae2bab39b29c216affb4006470656713c2e575b87b64c6c39a060dc239b5a4de4705e42947db59ee3885a8002414766e1c903eff3c9fd67263fad SHA512 ffbee692c3375e9fa8053fb1139590ed7292ded6aab4a187fd588aa4c1537c820f79ef48f5b0e1f3ee12d55b8030ae42bd779347ee8cce3eb148d2b190bb2583
 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 f9c5caf202ac..045f7c1ebd2a 100644
--- a/dev-libs/hiredis/hiredis-0.13.3.ebuild
+++ b/dev-libs/hiredis/hiredis-0.13.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/0.13"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
 IUSE="examples static-libs 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 ab120cee20da..201e0c0358d0 100644
--- a/dev-libs/hiredis/hiredis-0.14.0.ebuild
+++ b/dev-libs/hiredis/hiredis-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/0.14"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE="examples static-libs test"
 
 DEPEND="test? ( dev-db/redis )"
diff --git a/dev-libs/hsa-ext-rocr/Manifest b/dev-libs/hsa-ext-rocr/Manifest
index d90bad7a3479..1fd274f2c451 100644
--- a/dev-libs/hsa-ext-rocr/Manifest
+++ b/dev-libs/hsa-ext-rocr/Manifest
@@ -1,3 +1,3 @@
-DIST hsa-ext-rocr-dev_1.1.9-99-g835b876_amd64.deb 1113746 BLAKE2B ff1d3418febdde505e12a3a41b39a15d6ed28e97f62700ffa4b7bfbc618b23253026e3978e1293cfa2c06742c78574510e08969e1e1524b82b94a45d98efd2af SHA512 e7c799e218eaee6f926fe309b470af00e0ef7e4974a3dd67231c1c904a0a036e62b1ce3b176bb0c13c0fa65a718443f06e7472e3e66225d818074620e46350b1
-EBUILD hsa-ext-rocr-1.1.9.99.ebuild 1318 BLAKE2B 89da0b894d126f9a66e9262b0ef4331f925d4186dc5d6858af33fccf67ce519e4f2fbebf80614f3f2e75d4e5ddfa8c4bb461b744b2c52883b66e45b9fdd52395 SHA512 0b47efe14cdabcfbcd09337a62f9632c838dbc997da532cf646293ee244b1abcbe9732da4ab78ac456bbb55d50c7083d5b77a12d048173422cce6998dc41f409
+DIST hsa-ext-rocr-dev_1.1.9-112-g3d9d98f_amd64.deb 1120410 BLAKE2B 653480e4209f7f6a0d8dfe0f8a8948ef44d2aa2a415f33ce9c4ca8ec8dc3b3e0dd78dac9a3d80bb45f5202df49dc2aa5b329e285968853e0bcaf6673f76d714e SHA512 28fb2ecedb2094782376efcab2a5292cb4f3e58dbdd8ba8b520dfca7d230d30326939dc3964f6e1be841e41829bef44b96573ffdbcad187f02adb11ac70401fd
+EBUILD hsa-ext-rocr-1.1.9.112.ebuild 1161 BLAKE2B c0892ada0cdcb0bbc511755218382809b3fc266230e4d41a495a4d63ad83bb5d144b67808ca55889fc6b96ca506ce3de56d3505c98e2c28407a91a6d192c66e2 SHA512 347291970514118859262e1b3357bc7b65c9d142e020653a4069a632345efbdd5c93d11459ce07f2f622a667a0147b171a1911bc2e307e2d2ecce0f6535dbeff
 MISC metadata.xml 804 BLAKE2B 53bf694f8db04562ed3dcde4ed009a447f913d545012b511d0321d230ed9110ab73da69c2b5ac295eea48a705a8defb4409326d4f4001727139ce3ce2b7b699f SHA512 9f1c2af7864205799b5b2f36be15148de6b0d3ebe8fa6f1ca578abcf5fa6c4b08b24082a2a32e93fce71de25756c7644989b51e63b765516ad63f63a5eb880b3
diff --git a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.99.ebuild b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.112.ebuild
index fa5fe086fa06..f423e5899b06 100644
--- a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.99.ebuild
+++ b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.9.112.ebuild
@@ -9,27 +9,19 @@ MY_PV=$(ver_rs 3 '-')
 
 DESCRIPTION="Proprietary image-support library for Radeon Open Compute"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm#closed-source-components"
-SRC_URI="http://repo.radeon.com/rocm/apt/debian/pool/main/h/${PN}-dev/${PN}-dev_${MY_PV}-g835b876_amd64.deb"
+SRC_URI="http://repo.radeon.com/rocm/apt/debian/pool/main/h/${PN}-dev/${PN}-dev_${MY_PV}-g3d9d98f_amd64.deb"
 
 LICENSE="AMD-GPU-PRO-EULA"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="-deprecated"
 
-RESTRICT="bindist mirror fetch strip"
+RESTRICT="bindist strip"
 
 QA_PREBUILT="/opt/${PN}/lib*/*"
 
 S="${WORKDIR}"
 
-pkg_nofetch() {
-	einfo "Please download the package"
-	einfo
-	einfo "    ${SRC_URI}"
-	einfo
-	einfo "and place into your distfiles directory."
-}
-
 src_unpack() {
 	unpack_deb ${A}
 }
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index 09ddbbaec712..3fb2060b3cfa 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,3 +1,7 @@
 DIST hyperscan-5.1.0.tar.gz 1810559 BLAKE2B 0946b3afe00cdce51b82852515ffe674729854d762854c252ba90fc73cbdc23205fe75f8e6c4e976efb31bf10950076b5790bd9692768dabcbd642d53e739c32 SHA512 5e6d11429e61dc061dd31e6b311a8c1dbfcd03af6e24d97b95eb2cef24dcd33d593064e5faa7c22807d785a8921bc410a69a43c4e5b3d7b4774f37c4a12a025d
-EBUILD hyperscan-5.1.0.ebuild 789 BLAKE2B 27f42a6f9a83588eefa43355515b8bf309c8bca15e997da087a36bbbf479759ea35b3f0a375da2594aaa7ad243ce76b0641beb89173d14efa55dbae4b9bd5b38 SHA512 dcf1b2de973ee265fd12fd094f5eb0e74997ecc11e17bb1580b287f3cc58f39abf73ce17d0f67ce6d146422d1fceeba551f9d018d12c678f8bae9491a3c3a31f
+DIST hyperscan-5.1.1.tar.gz 1811275 BLAKE2B 524f1fbdfd470cd12ebb0ab4e122a97f6a90a1027adfa0850921a8f80c09f87792fed3da6b10367336b1e84987414bda93b98aa30aa9ff6dd899bf29fdd4294a SHA512 2812174890f775bc0c99019afe49cfde9ecc1107626cb4f1c9e1518228d090cba43bc15a19beaa00bae2a8a3dad85e7f27d4b237973360a294db78098fcb8508
+DIST hyperscan-5.2.0.tar.gz 1818751 BLAKE2B 4d74a4d022a59ee37c7df274ff1a37153898aa403bdfa3ec39df7304f7f65bcae1bbc074a2801223ef00903a5b8a01845e985c2ad196496d40899bab79df3844 SHA512 4d56e2d02dfbedf3caa8b212dae2ac3575b343b1ed2a75e91f6074ef265bbc28cfb78ad7f08dc47d7cc2e3e3e02e488c4cb75efacc41755f993236d97ddcb4cc
+EBUILD hyperscan-5.1.0.ebuild 790 BLAKE2B 4593877d1b26a45189d7752eabb7f639e9b457f6a7356e12fec6bd3a4bd77b3a5ff54bf4703252c6f66cd0387949552de44ec9a24b36b9a6f2b508ceedee928e SHA512 8de7a14565a77a7c7d44548504799a41f361ea1f9effdef2b8dc41764f2b3daa878f6e91b8a46d8997d74f02102fbf3cc008692f5fc30e8519b463fc2bc37c60
+EBUILD hyperscan-5.1.1.ebuild 893 BLAKE2B c5913b4ba909529a059721e62aa6955ce98610b106123059ea9d6ef2b28a30bad57d3b14d82284cd58638e885f38758437f49326765c8ccfb85d7914f392a5d5 SHA512 90475cfb7dba3517caec6c441a456202a1538579a09fcf352672506ff8ab05529db8a9475e211a06222c701b7a1c85d8b10115de5394b23d33c99c11d6c78493
+EBUILD hyperscan-5.2.0.ebuild 893 BLAKE2B c5913b4ba909529a059721e62aa6955ce98610b106123059ea9d6ef2b28a30bad57d3b14d82284cd58638e885f38758437f49326765c8ccfb85d7914f392a5d5 SHA512 90475cfb7dba3517caec6c441a456202a1538579a09fcf352672506ff8ab05529db8a9475e211a06222c701b7a1c85d8b10115de5394b23d33c99c11d6c78493
 MISC metadata.xml 444 BLAKE2B 135788c6bce69014c87cd2e80660f5ab8563afb0e2bddf281245d64e9787318b8b4cfa743d0d2648b40f40ce909dfe5a8677fe00114311c4d8ea88b037ff9afd SHA512 8b3dd40cc7b43125b2a7297c991143d74a5d3cbb70e0d5608ede859987cd27cae0a27b92c46419746d56a0f88252e6cb75ad6111ac25e920ba4e46acc8caa423
diff --git a/dev-libs/hyperscan/hyperscan-5.1.0.ebuild b/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
index b73f317040a3..8cecb0a904af 100644
--- a/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-libs/boost-1.57:=
 	net-libs/libpcap"
 
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
 
 REQUIRED_USE="cpu_flags_x86_ssse3
 	${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/hyperscan/hyperscan-5.1.1.ebuild b/dev-libs/hyperscan/hyperscan-5.1.1.ebuild
new file mode 100644
index 000000000000..6e6970b8c429
--- /dev/null
+++ b/dev-libs/hyperscan/hyperscan-5.1.1.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=( python2_7 )
+
+inherit cmake-utils python-r1 flag-o-matic
+
+DESCRIPTION="High-performance regular expression matching library"
+SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://01.org/hyperscan"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_ssse3 static-libs"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-util/ragel
+	dev-libs/boost
+	net-libs/libpcap"
+BDEPEND="${RDEPEND}"
+
+REQUIRED_USE="cpu_flags_x86_ssse3 ${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	# upstream workaround
+	append-cxxflags -Wno-redundant-move
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
+		-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/hyperscan/hyperscan-5.2.0.ebuild b/dev-libs/hyperscan/hyperscan-5.2.0.ebuild
new file mode 100644
index 000000000000..6e6970b8c429
--- /dev/null
+++ b/dev-libs/hyperscan/hyperscan-5.2.0.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=( python2_7 )
+
+inherit cmake-utils python-r1 flag-o-matic
+
+DESCRIPTION="High-performance regular expression matching library"
+SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://01.org/hyperscan"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_ssse3 static-libs"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-util/ragel
+	dev-libs/boost
+	net-libs/libpcap"
+BDEPEND="${RDEPEND}"
+
+REQUIRED_USE="cpu_flags_x86_ssse3 ${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	# upstream workaround
+	append-cxxflags -Wno-redundant-move
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
+		-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/hyphen/Manifest b/dev-libs/hyphen/Manifest
index 7c992a81a0e1..fcd9d17bc252 100644
--- a/dev-libs/hyphen/Manifest
+++ b/dev-libs/hyphen/Manifest
@@ -1,4 +1,4 @@
 DIST hyphen-2.8.8.tar.gz 638369 BLAKE2B b20bf9476d573c344eeaa5088da5dad17ef025d37717391965880b60b78908bfa00347b4840267a8bab77bbf0c3d653313e342b892581f1864381c476804c3c1 SHA512 ee514952be56869840b70fb74f60eba14dc4de246733ff8705492367e8cf00c485f8778a9d5a7ba374c988d4ac9fedbe75826dc559e1b62465dbfba21f6ce7de
-EBUILD hyphen-2.8.8-r1.ebuild 768 BLAKE2B cf2d0e251f9313ce19705c36bc593857c1f8233fbf8811071a12b454935dba161101b5243d06bd6522ebfa3f2e4ae569dd499e21d218aab9723fb22016c998b3 SHA512 831cf2fa92f891c0b78841ecf70a8a9c928b6917e7fa82a3a87cf7c9e07ba6c8f5838d792efece11cbc9737b60f625d6cbc84e12e710178ec45430a42d8f761a
-EBUILD hyphen-2.8.8.ebuild 733 BLAKE2B bb7a493ab4db6379309368aae7091a02cefdc09f7afe95d3d464ca5ffd8c30b4db1b2eac9fecdf745a1f0cf634da53c7080daa33423eff38d7ad1c7f294caa26 SHA512 e34d5fb56f920b5d2b66e32ef71d366e56b744f32deff5c2685757f1d22320970f4b004793d4d6a1daad67e83d1e36bf476b5752c9d4793ab54640631fff9457
+EBUILD hyphen-2.8.8-r1.ebuild 756 BLAKE2B 271adcae5e38e2dc197a03b697e18df76f4a2195d27b8a0974966bbe02b016114bfbb2a8117c94160c8e17b4c55dfd00c6c98ac86bbeb30f84b2fcb8c15a1daf SHA512 1bca7be58f9e8572e41b4d2858ac8675bc5e812deb278cd4816e73576086cdad90d3571ead0071dbc99be6202cde5a2b447740faf18bb0d8b749afc8d1086e39
+EBUILD hyphen-2.8.8.ebuild 721 BLAKE2B 973906a5054ac995bd0a4c0604050cdd41b4397004bcd224f5b536246fcd902b685aecddd014f97f98c2adf6d131fff66797dcc2a090ab7cd2b59527c02d6612 SHA512 02691d1c40723bb7d559402008cbdf689dc0ba2247ab463e5e628c9edc4651e82c832b9054d3dc7fb428feff92d942653310250e3aeacb032cbc48a89696cc7c
 MISC metadata.xml 333 BLAKE2B 989788782df7e4531d2ad8a12b49eb19f8651468467ef9c2894163c9089679622ed1bc597336afb881ca85bf0523e7e8077c8060d46b6237e4ff5dfe16bc1c1a SHA512 1c2849146c40fcf9b1c352d57e9580ea7d9c2fbdc71c5cf601343e3beb9580876b6dc1d42d41abe01163d92c0eb7837fedf85fc3e7408801f0d966ccc8e78ba2
diff --git a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild b/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
index 185c29e311bc..3de788167759 100644
--- a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-text/hunspell"
diff --git a/dev-libs/hyphen/hyphen-2.8.8.ebuild b/dev-libs/hyphen/hyphen-2.8.8.ebuild
index 44863f737714..315fe7fa9324 100644
--- a/dev-libs/hyphen/hyphen-2.8.8.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-text/hunspell"
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 1ac9da76debb..76f16ca32f8e 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -3,5 +3,5 @@ AUX icu-64.1-data_archive_generation.patch 473 BLAKE2B 88e77149ec92a316d5e534a6a
 AUX icu-64.2-darwin.patch 2162 BLAKE2B 74682494b903ee1cdcd2025afe36648adef39573754ccb0e0e86b5b7d7f26937c6ea54d655e8482ad9d7a2ccc64b5c8a8640d4e71390b19b64a25bde76b3d63d SHA512 e4e0eb9f953285f4221f2733a3a76c23e9e72127ce3ac0ecc67a46a9e37236dee352f28b7b9befdcae9e2f95297e01a98e0dd177697ee6335145ad5088d2f00f
 AUX icu-64.2-extern_c.patch 29978 BLAKE2B 398f371d256fd4e60fc069949d0d861e363c43889a762c9fffad176cb1164b069209a295475748c08a18a83b43abb561851f4d74359fc3fd683b97eb0cef2e50 SHA512 d45a8da416a573b69b76a615d11bf99f852cb1703cb0fd4ba35fe96411134fda97a29cddf3d14a23900a5099a930c32ff9d1865f02d07314268974c306832409
 DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78
-EBUILD icu-64.2.ebuild 3446 BLAKE2B 36e2878b16352e3ec2fb7e50dcbfb048473f4019aa85e690bffe1da8aa26000abb21bc5528226296b32778b8cbb752a07c90d7632218b947e400d9fd1e848629 SHA512 27bb194979a0e08b788657ffe289b7b7a61eecc5620be36b9e14390300757eadb331005c8fbe3905e09ffa22768785ac783f79eaa484098525c7c819cba67399
+EBUILD icu-64.2.ebuild 3424 BLAKE2B 455ef59b9f573a627eb83438bd98d2f71c82bcb800934373fe5e5ed3005efc05ec650ee699e00fbb4bf85073bdb686c849cbce11fa0b97816db961f4303903c6 SHA512 9f02fe5ddfe77f9dc2528d7aacf4eaed43eb5322396e3a3f7f275e38d90261f2cb77470babad8a205a62ef7cce41aedf1a064ab3e19d5709cacb38d4cbb74794
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-64.2.ebuild b/dev-libs/icu/icu-64.2.ebuild
index 64c1aa0d19ac..dcf1aa1467ac 100644
--- a/dev-libs/icu/icu-64.2.ebuild
+++ b/dev-libs/icu/icu-64.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-libs/iksemel/Manifest b/dev-libs/iksemel/Manifest
index 1a28f40f0f26..0bf3ec0b3a99 100644
--- a/dev-libs/iksemel/Manifest
+++ b/dev-libs/iksemel/Manifest
@@ -2,5 +2,5 @@ AUX iksemel-1.3-gnutls-2.8.patch 488 BLAKE2B 7834ca7b056b44534cc1c3301c9b58b6603
 AUX iksemel-1.4-gnutls-3.4.patch 1656 BLAKE2B 83d8e5f2e5aa7fca4721e35be46ee08cbaf8f6ab66be86e1d01766c567fbf8762ed7e7d13d729afc2b44b460e0fddcc9474e61af3c81fd2696fbe1ed71f57c1f SHA512 305990e760218b1ce59e55aefb31126174f6a8066b9ef20ed3073332ad4e925871709e4c5b52d1e3fcde7b2fc9776dfd3f74a763e897cba4eb45657d3946d518
 AUX iksemel-1.4-ikstack.patch 955 BLAKE2B 62223a269c7079fe40a0b835c1a6d2a34d0dd9b3424ae45e0f14712d388547321e66cbce2763bb73065ed53df626a572e6a72d4550e85801e3390a5a61dde7ca SHA512 d97dc724c9b41983e91889e742d604ad9cf752536b012c13a5667c59baa1f5467dc02e7e390e4eba02475e5c994484428c26079351f8e9450b7de14e08eb0cbd
 DIST iksemel-1.4.tar.gz 515581 BLAKE2B a0e9b8dc6f9dadc04d17d2952034b56c4665c7a9c0549bfb52e3adfbc7fb6af17d1b0de978835081e0d39c8200e41d5528f6b3e1dbf51a4fae160f59d5c474fe SHA512 902e326647b63a5e58b1c396a401bdd136ad01ecabca81b543c0ed76ebd8d2110377015fec1be09551b92651ee093e480fa37aa2186f7791147f29e0933852cc
-EBUILD iksemel-1.4-r1.ebuild 893 BLAKE2B 13a4ca3121c7337093c9694009b0491072626c281194f571dac61bd44d2d29f9372a44df5933941f3131649d50682e0612554749f6caba08925d33a2f6c863fb SHA512 1eee495e88774df647b8604e52801b6a229de535fae9599d686d93f6512fec381c4f7766f9235476e16f346ac6d22c62d970372bbe7a5e0160e738cdea7e8a0c
+EBUILD iksemel-1.4-r1.ebuild 883 BLAKE2B f96459bc3115e09e135b52cd143ef7612533351e07db143e071191e4edf4ed28f08ee588ab2e72f7fc65034ff1158398261a2ea1ed6908df6f05240409d0250a SHA512 5107af3aee778cc1fd5a41ba227c5d1ea2eae30a7cfd2643761c3cc70373e9626b3a93d51836496774e3fc2c62ef55774e7abe743ab022d060e3131559aafa9e
 MISC metadata.xml 301 BLAKE2B e3de81d61c491692f64943d6478ab64332cccceac5947b522a6d6b62127217792205e16c2ea9d04de150772b3337a38793a79e950500b43e837f309651cbcd6f SHA512 91ac21f435ad0c2943e17058fec736cb0371690f38427302eb360a284b48017841b807cf5f6f13c6c837af9d1c330dc9a7980ff77a5699e2efe399b01ca840c0
diff --git a/dev-libs/iksemel/iksemel-1.4-r1.ebuild b/dev-libs/iksemel/iksemel-1.4-r1.ebuild
index 9865b314e4a5..50766b4d7e71 100644
--- a/dev-libs/iksemel/iksemel-1.4-r1.ebuild
+++ b/dev-libs/iksemel/iksemel-1.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="ssl static-libs"
 
 RDEPEND="ssl? ( net-libs/gnutls:= )"
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index f798eb1cbaa0..48177cbe1df8 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -2,7 +2,7 @@ AUX iniparser-3.0-autotools.patch 829 BLAKE2B 808f8f7870151286ef4e4baea4ce80df3c
 AUX iniparser-3.0b-cpp.patch 1446 BLAKE2B e538e93d01e8521b9f3726bc4d24fee827f5ae3ccae81976cdb42abef62001a6d2a7b2abd7792df4b31fac00a7f4de69d750610253579ae3a2e618b704fee18b SHA512 8eb2058e332783ae11ef5cbebec153ee1938352f111e3efe332035aa013cf6d01a917aef9a7b8f46f7bd070986e5e686e584d46dedf30276baeb8da0954631a9
 DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86
 DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968
-EBUILD iniparser-3.1-r1.ebuild 1146 BLAKE2B 1086018866a27bd8832c83a57fb5e1617f8d870167382d23bc51a75d6b2300ce571d11ad68332077686cac54f8c3e13bff68c66c5bc52ca5fa550dd5a78be7a3 SHA512 fec348a4d6bb03153d3250e1866775cfc8f658882c126a53e370da69563a7120c9c8c5574a84eaefffda16ead98e6c2f7b52bf2d69e48c811e9237c138399b01
-EBUILD iniparser-3.1.ebuild 998 BLAKE2B 2e1e7eb3c6d52fc1e9caa9b8c41b0537bbc24d35dd1681addfd90422a5880ef0ebec1a957e0603abe31b1d0597cde0ccdc4be3aed324a87eae32258b5a0c7257 SHA512 d3245f9011c03e7f3eba25d78246e65833467d737eeb91bb337c557cb1e72b36d026e0dcc8266f61d120278af75bddf9a9c6a62d892e5086301178c4b10019ee
-EBUILD iniparser-4.1.ebuild 1760 BLAKE2B f571d2c687e3e5ee949e61b4e587271ca60e7387a3cd21dde39001f50a9bd7920ff5288ff1e24b172239d0fb1e74c24077d65dd70175bae29f8de36fb9583eae SHA512 a5201def74196f9dff0185a4f4d6eb8bff9dad213f64b1e05d2eee63adf2c4a95eb95dc9dc1816aeb85754c4c7e3145ec475b3f517e211509ef27db885bca8ba
+EBUILD iniparser-3.1-r1.ebuild 1124 BLAKE2B 08600b9bf4d0c36f5964d91b66c80c28f5bbd9bcd6791ae5d16553e9917ecd141e8af342cebf9add3ab24970ee2a34717e6dbfe10da081b1a9f7c96080279c88 SHA512 d61590d1b93e6aa993a7cf84df3a0c269e2c57321bb7d725244b828961646be4b000297ef7f247e2dc6025bd369a9f02747f7636efa2baf7d2ca5bdcfbde56bd
+EBUILD iniparser-3.1.ebuild 976 BLAKE2B af047e1d922bccf82569707b8f2fbf160858fe2a5ab8f83866935f60dec316f4adfcfc28851681664bf45d95225f766b54f13de524fd67f34d9f21094e082458 SHA512 9ceb0089a50c66b42ae9dd3164c6640412f7cc9bf90c9aa0c3f5b502d851f46783a7ac30726e16b09aa9418b8d4c90ac82ba006a0300bf93c3f8aba688d4556d
+EBUILD iniparser-4.1.ebuild 1738 BLAKE2B 20b78bd168542b2ad574eac3c000cefe5ed9c2948285a410980a8cdc02ee8d14a46ceee8a58ba91858a35e64d647eb5a718c232814fb3c718ef728e9dc78eec6 SHA512 714cb972ed91378756de579ab7eee404bcb4965e151c5ea4c9f6c780f3b7d759e0158451456b6c3192f23c12abcbbfbab45714592a4a416f7ab005bf3363e48a
 MISC metadata.xml 435 BLAKE2B 788d24983bfab5491f783ec20479370e6e01686d0f5a379c490a0b93d8379a3062e46b497cb911298df3d0de7f0eaaf1606e11a365e92ca5b93041dc935fc9ad SHA512 452ccec03580def2966c0eb2f50af057776387e01819e1ce5226e628204ea94554658309dfb0c54d413f95ed588f44b84133526b164ae557ad6ac7926aa51a51
diff --git a/dev-libs/iniparser/iniparser-3.1-r1.ebuild b/dev-libs/iniparser/iniparser-3.1-r1.ebuild
index 5a02a6f91bcf..a3709bc56f72 100644
--- a/dev-libs/iniparser/iniparser-3.1-r1.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://ndevilla.free.fr/iniparser/"
 SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~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="doc examples static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )
diff --git a/dev-libs/iniparser/iniparser-3.1.ebuild b/dev-libs/iniparser/iniparser-3.1.ebuild
index 93933b43ee75..a052691ec001 100644
--- a/dev-libs/iniparser/iniparser-3.1.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://ndevilla.free.fr/iniparser/"
 SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc examples static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )
diff --git a/dev-libs/iniparser/iniparser-4.1.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild
index 5f364a2aa3c0..060ad3e13df0 100644
--- a/dev-libs/iniparser/iniparser-4.1.ebuild
+++ b/dev-libs/iniparser/iniparser-4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index f4080278780e..f2c9a878c98a 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -1,8 +1,8 @@
 AUX intel-neo-19.16.12873_cmake_no_libva_automagic.patch 330 BLAKE2B a38c4a03d1837102168b907049c1a8fec93035f7efadd5e5cfb17296fd5fbf17dac1961affaa625847cd7c0cb3694d9d5c36b96d45f8c036334e8dc707100db0 SHA512 5c7133d355e0f4f8c0f8f0c84264d5f2a8cba6126d59b8a509354759a97d1a6f96b5deddcaacbce2ceb32e2014dd2f13e613a7db1973d3f865b906b803e8866e
-DIST intel-neo-19.16.12873.tar.gz 2370395 BLAKE2B 2efc76c9729d3ec000455270e923df1e3d0ec5d0a5c31cd156401b37c63ba01ee2a6051f487a98c4db10f61c2a70434f994f15472f54741ef4a80a71b036636f SHA512 1ec8b7883bfeefc1ed2095eac6111803a44e3c88e8bd1a478fb89a5baa4484fc96894f7ef0c01f4b6b9cb94731cdfc633f38ef2f636fdeb2d5e4344ca4aaa2ae
 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
-EBUILD intel-neo-19.16.12873.ebuild 1239 BLAKE2B 9f656d45ae8dd12435ee39fbfc0c47b00d4556482db1dbd1298940d140e0dca46e5c58684f7388a3e04a68a67cf3d6cba8996c3d3f331135c59077e487054551 SHA512 4fb62c57384aca36eecc1734401ef7a7262811e27650f25fd84d854d217dc9209015ac9685662cf09becf355bf9fa5f6f3826ba11c6bb6aeb453bcf8183cfa10
+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
+EBUILD intel-neo-19.38.14237.ebuild 1265 BLAKE2B 6c2129e46819eb6e8f380e81a82728969b38743fe8ab2eb5840cb3c44927e64846f1c71da032fe3d56509721fddfba2609efb7789bba5c42181014abe3831f72 SHA512 06a356aa7aa56997c7cb4ce3d71eee2068819b1002d8de65bf0b5b8ff33c07539624a48e3ae82835d8bc2c4e02dbeea31a5ca17b724abeaee9c342fd80ad71ac
 MISC metadata.xml 871 BLAKE2B 2e394b97e0147760965e10f7d43f3b7f189a0f146df84adbcfd5adf22937587982b113fe4d7f07d436265746eb9339d5141dbe2655846a1b10ebcc0751f1a763 SHA512 1092d3b8c8dd26fac3822f0b4d25f19ea74726df3f3978a6d596a97b5019465a8a7a853fb98512a07f51c5b81ecc3a7fb9350fb796a2fb7fb27fd16b937eff93
diff --git a/dev-libs/intel-neo/intel-neo-19.16.12873.ebuild b/dev-libs/intel-neo/intel-neo-19.38.14237.ebuild
index ac08c8c0ab25..843898c5f91f 100644
--- a/dev-libs/intel-neo/intel-neo-19.16.12873.ebuild
+++ b/dev-libs/intel-neo/intel-neo-19.38.14237.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -17,15 +17,16 @@ SLOT="0"
 KEYWORDS="~amd64"
 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.11
+	>=media-libs/gmmlib-19.2.4
 	vaapi? (
 		x11-libs/libdrm[video_cards_intel]
 		>=x11-libs/libva-2.0.0
 	)"
 DEPEND="${COMMON}
-	virtual/pkgconfig"
+	media-libs/mesa"	# for Khronos OpenGL headers
 RDEPEND="${COMMON}"
 
 DOCS=(
@@ -34,15 +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=(
-		-DENABLE_VAAPI_MEDIA_SHARING=$(usex vaapi "ON" "OFF")
+		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
+		-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/isl/Manifest b/dev-libs/isl/Manifest
index 0f5782939b3a..5c41aea26a3e 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -11,15 +11,15 @@ DIST isl-0.18.tar.xz 1475708 BLAKE2B 216d4d75e2bc03b3027c67ac7ab373aca6040ead12b
 DIST isl-0.19.tar.xz 1515156 BLAKE2B 1be213df736f59123072778b9721db06130c935edf0805fd489d74c9effeb9eaf5b191de0a28e8a5138f79dc23ac9ebb213c57c020d0411afb305788b5f312cd SHA512 eeda0405d38f77a18c6e69128948dc29af7e44ce827e9fb538d3844c6e22db3b4126287ca0937d9bee7b528bbab7aad8d3729db36e74864196f57e81943dade4
 DIST isl-0.20.tar.xz 1539064 BLAKE2B f1347c0126ba3ae9b5fa073d0f206a7f48d53edb40d87ddff18005d94754ea4d1fd3801ee913d3b7234124b6c1447990e5d299fad6c6b7ff1d022ede82bba9b2 SHA512 394bccd22d8e63cb052a60ad8b1a75f4ec43916a9482c66f5167b534b538161179c47919815983b7fbc20dfaa1a590e88b251850aa092bbffc2891635bf30dc4
 DIST isl-0.21.tar.xz 1621680 BLAKE2B ffd0c8aa7d489283ac958c280c05fe0c9ad621a10bd157d0522ac209a58e9bb6a8aad76c7a49b42d5e1c0f3605d0fb05a41ed6f2bb9aabb4f06060a5bbb65de5 SHA512 87ebc2fd6d4325cdfa82295a659ed6dbd70760a776b733e5503bbf8baa8fe80d905879728e9c7f23d2f3bcd7e78c00a66ab166c013ae97b603f7c460c69668ec
-EBUILD isl-0.12.2.ebuild 1048 BLAKE2B 371ee9c0891fe772e5ccc2ca2401f10e03102edcc397ff8c22169ce0a98533da0eaafc149f3eff3e019b25b78b9520d82a8ed7db04014dcdd979182440dcd5a0 SHA512 6834670244e7f4ec9a8238442ad472282db1fe313af11a2b17b9e7c3205b6e3b2efee00fb539cfc7c720d5fc8f0e39334e739fa22fea2fb8eee9152b77ad184c
-EBUILD isl-0.13.ebuild 1060 BLAKE2B 6074a73a484526d0392bcbd01d497bda7be34d1e57e064fa9cf4fb1e4afeb4646d191b8dc946b647651f5b8416949a019fcb85646e04ef5ad2e8449ba941d04c SHA512 289ea8dfac458f4c79f63f15b65ca4c675ab23bf6d48ce149cbc1ae4c5640ddd0c1f37de6336d7271eb0411a6a1305f364bc3fb0d82294ad0aae7b2dc6b97b5d
-EBUILD isl-0.14.1.ebuild 1078 BLAKE2B ed37bfff657e07ac2939db638581eae19cd93c77379c0a25693692830181775520f2cd71f1ae59c270a7ec64368141bdd4a87b301959bdf41342dade22a061ae SHA512 0bccd7ddb31c98564515f1ef9436276c29249391a685f1022ddc7e78f415b25be3bc2acd63d888d18f99cc9b0aa311b90960a446656d02e973af507abbe57543
-EBUILD isl-0.14.ebuild 1078 BLAKE2B ed37bfff657e07ac2939db638581eae19cd93c77379c0a25693692830181775520f2cd71f1ae59c270a7ec64368141bdd4a87b301959bdf41342dade22a061ae SHA512 0bccd7ddb31c98564515f1ef9436276c29249391a685f1022ddc7e78f415b25be3bc2acd63d888d18f99cc9b0aa311b90960a446656d02e973af507abbe57543
-EBUILD isl-0.15.ebuild 1067 BLAKE2B 93e49eecfc34622e1b28668615bc6d26638ef272a07f5fcaadd7176edb4920170c3cc8314938e5d879ed1e3bd37f343bf5a0ec3a789cd5a04ad21a1ba64dd2db SHA512 040ba32e203db3a859f9133e5b66bec283fe148e3d257acbc22f95bc3a8d6f64f63556542e7f3937b481a5331914cf56f113326af527f6bf745b7fc5621c6a44
-EBUILD isl-0.16.1.ebuild 1078 BLAKE2B dc9095858fca6bbc1445bec8c7a277a4552f7695ecde0ecd5f102073d4f720da7b8b3429014da53ea0f05c540cca486f3497bb472dea72c21cf230b846bcfed7 SHA512 74a306b624ecceeb45e7f92e5412746e804c366b76a477e0b6b5feb8e4328bc3e8a252d65ddfb59938504ebe99a99e0a7c34970d48bd3aea532bf073c1a36e5b
-EBUILD isl-0.17.1.ebuild 1078 BLAKE2B dc9095858fca6bbc1445bec8c7a277a4552f7695ecde0ecd5f102073d4f720da7b8b3429014da53ea0f05c540cca486f3497bb472dea72c21cf230b846bcfed7 SHA512 74a306b624ecceeb45e7f92e5412746e804c366b76a477e0b6b5feb8e4328bc3e8a252d65ddfb59938504ebe99a99e0a7c34970d48bd3aea532bf073c1a36e5b
-EBUILD isl-0.18.ebuild 1078 BLAKE2B dc9095858fca6bbc1445bec8c7a277a4552f7695ecde0ecd5f102073d4f720da7b8b3429014da53ea0f05c540cca486f3497bb472dea72c21cf230b846bcfed7 SHA512 74a306b624ecceeb45e7f92e5412746e804c366b76a477e0b6b5feb8e4328bc3e8a252d65ddfb59938504ebe99a99e0a7c34970d48bd3aea532bf073c1a36e5b
-EBUILD isl-0.19.ebuild 1362 BLAKE2B d31f140f3168fb1fb25ca106c5953c8c7baa92d338d4bbf361c13061a21cc8a0ee7b27fbbb7259d6e1aa5d0aae7fbe92c5824046473f62a8880116bfbf8bdce6 SHA512 e6215d0e567d46470e446cda506b618d67b2380b2ec8967636197d56ebc6afa46f98bb4c522d03427b6841aa6f89e8edec209b1f9f87aa64fc6220fad8381c61
-EBUILD isl-0.20.ebuild 1362 BLAKE2B d31f140f3168fb1fb25ca106c5953c8c7baa92d338d4bbf361c13061a21cc8a0ee7b27fbbb7259d6e1aa5d0aae7fbe92c5824046473f62a8880116bfbf8bdce6 SHA512 e6215d0e567d46470e446cda506b618d67b2380b2ec8967636197d56ebc6afa46f98bb4c522d03427b6841aa6f89e8edec209b1f9f87aa64fc6220fad8381c61
-EBUILD isl-0.21.ebuild 1259 BLAKE2B 4082ace3600469858d5cd544a817cd1022824f0334cacccd8ee307df139cf6864e3d76996b48328e58773458ee94c6e5af534c42c7ba41769ff68ab34bcfeeb2 SHA512 d7108333a5290e5cf96b282a90573e7d1f243cc755bb5f369dd580e8b298a3e05bac428e623f30d2963a6e9ecc26487985802f9b3829dc1460e088dfc475de6c
+EBUILD isl-0.12.2.ebuild 1026 BLAKE2B 8757a140cee7104d9907c54bd72836aef56ad58c3b2972f9b130831ca0b2eda1eeee45a896eca8b28b08a22cfc2d11d053ee73d677127fea4450bbde7e6a5390 SHA512 9e40b23cef96116fd7709e8b4e0fe74cf7f54b410bb8676ba95a7d8c87d76e4be5339a68cf7ac036ef3dcbd88a1c711649b0497c015003f78c43fcd9d1e808d8
+EBUILD isl-0.13.ebuild 1038 BLAKE2B 65a4769a80a659841fac88c9d8a881c579de7825f7a32de564d5aa7f85422361766075494edc206f7cb68c3d8f3355b08b9c9873ced5be6463d7090682e54f3f SHA512 c241101da68229bb06f302caf9f33fd5dd36470d3da6c1e790a341fa90e6fb61b3b1a13312af52ddb2415b1d23eb94d14c05a831bccecbb88be66315b2ee3250
+EBUILD isl-0.14.1.ebuild 1056 BLAKE2B a50b3afa0a17f0b71c7ca3fa6961942b23ed1c3289579c8c27f837dec4b21f7be453667e7bc4c1d1f5301f977da7d568c3f0438ef0244a7cac6eff261bf3adda SHA512 d73c0cc9c6aab8669c3c33bc25739373a768135a812a6bb54253b4691936925cf54e63102436c79ffef5fb01da06ef6cd38a3f7924796be5785345f67c384456
+EBUILD isl-0.14.ebuild 1056 BLAKE2B a50b3afa0a17f0b71c7ca3fa6961942b23ed1c3289579c8c27f837dec4b21f7be453667e7bc4c1d1f5301f977da7d568c3f0438ef0244a7cac6eff261bf3adda SHA512 d73c0cc9c6aab8669c3c33bc25739373a768135a812a6bb54253b4691936925cf54e63102436c79ffef5fb01da06ef6cd38a3f7924796be5785345f67c384456
+EBUILD isl-0.15.ebuild 1045 BLAKE2B dcc289c4da4c056590a06793c8ef9a314c5dff62edc6106fa9e2250693a9ea511d6a40621160289a0ad923039e9f85c4de2826576543d458444c77e7bc283d8e SHA512 98a73850f03547f1a612f92425d817f17ab9f31f399d367b66fb774d4c217074dbb540809d3671acacb76648286dfa80d5ffcbbe6df6c2634982d4999dcae71f
+EBUILD isl-0.16.1.ebuild 1056 BLAKE2B c9f7a5fe1dfca48511d5365dd93ccac8a59c4e848b93f5f18f74960e9be358bb35fc71f08236b0b7cfb3f8a9a1e58c3ed682fc8f7f9c101e8ea28fc0495ddf76 SHA512 300aa90a8afaa4cda00987dac9096ae623cc6b3747be6539adf89216d6b888b5b1c4bc86b6e2b69eabae865629170b1b34107b68efeadfdfa7245c48963ecae0
+EBUILD isl-0.17.1.ebuild 1056 BLAKE2B c9f7a5fe1dfca48511d5365dd93ccac8a59c4e848b93f5f18f74960e9be358bb35fc71f08236b0b7cfb3f8a9a1e58c3ed682fc8f7f9c101e8ea28fc0495ddf76 SHA512 300aa90a8afaa4cda00987dac9096ae623cc6b3747be6539adf89216d6b888b5b1c4bc86b6e2b69eabae865629170b1b34107b68efeadfdfa7245c48963ecae0
+EBUILD isl-0.18.ebuild 1056 BLAKE2B c9f7a5fe1dfca48511d5365dd93ccac8a59c4e848b93f5f18f74960e9be358bb35fc71f08236b0b7cfb3f8a9a1e58c3ed682fc8f7f9c101e8ea28fc0495ddf76 SHA512 300aa90a8afaa4cda00987dac9096ae623cc6b3747be6539adf89216d6b888b5b1c4bc86b6e2b69eabae865629170b1b34107b68efeadfdfa7245c48963ecae0
+EBUILD isl-0.19.ebuild 1340 BLAKE2B 442a4ec9050b9f86ad312a1a55134b528669a5a7295c1b2fe128ee3490be57e599eed76d3a6428a336560b4c004259d8f0ab3e94d84f08ac07dcb82de3ac8a90 SHA512 b343004007bb6172717ff45a978cc4f46082d4b76423cb1b3e1b99bbde69af56d9ab48ca2baa98151a8e613bfbf0c85b025fc1659a4cea9e40f7a763cd19815a
+EBUILD isl-0.20.ebuild 1340 BLAKE2B 442a4ec9050b9f86ad312a1a55134b528669a5a7295c1b2fe128ee3490be57e599eed76d3a6428a336560b4c004259d8f0ab3e94d84f08ac07dcb82de3ac8a90 SHA512 b343004007bb6172717ff45a978cc4f46082d4b76423cb1b3e1b99bbde69af56d9ab48ca2baa98151a8e613bfbf0c85b025fc1659a4cea9e40f7a763cd19815a
+EBUILD isl-0.21.ebuild 1237 BLAKE2B 579f3ed0505f6f65bea2de1f430bbd176483601ed209123b1c2f2ea42bc12757fae3f87100b9cc8ad6ffaa52b6bc1e6b3c2e9b2cfc676409c12f95e16238f79b SHA512 875116ea7e07024e08908610c2dcb0bdc8e74c8d55b213c2bd92e897741f72d216e64e5ba0ec5d1dacc6cdb44a47d9594716f9b90f12d6c4677267ae8698a6c4
 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73
diff --git a/dev-libs/isl/isl-0.12.2.ebuild b/dev-libs/isl/isl-0.12.2.ebuild
index ebc4308be9d0..17e0f4be3378 100644
--- a/dev-libs/isl/isl-0.12.2.ebuild
+++ b/dev-libs/isl/isl-0.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.13.ebuild b/dev-libs/isl/isl-0.13.ebuild
index c023fa026d54..0da87b58fb06 100644
--- a/dev-libs/isl/isl-0.13.ebuild
+++ b/dev-libs/isl/isl-0.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.14.1.ebuild b/dev-libs/isl/isl-0.14.1.ebuild
index 0378477e7605..f3de71966fe9 100644
--- a/dev-libs/isl/isl-0.14.1.ebuild
+++ b/dev-libs/isl/isl-0.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/14"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.14.ebuild b/dev-libs/isl/isl-0.14.ebuild
index 0378477e7605..f3de71966fe9 100644
--- a/dev-libs/isl/isl-0.14.ebuild
+++ b/dev-libs/isl/isl-0.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/14"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.15.ebuild b/dev-libs/isl/isl-0.15.ebuild
index 9d9ec2c2bdad..59228af626a5 100644
--- a/dev-libs/isl/isl-0.15.ebuild
+++ b/dev-libs/isl/isl-0.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/15"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.16.1.ebuild b/dev-libs/isl/isl-0.16.1.ebuild
index b2dd215071ee..91bb1d6d1bc9 100644
--- a/dev-libs/isl/isl-0.16.1.ebuild
+++ b/dev-libs/isl/isl-0.16.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.17.1.ebuild b/dev-libs/isl/isl-0.17.1.ebuild
index b2dd215071ee..91bb1d6d1bc9 100644
--- a/dev-libs/isl/isl-0.17.1.ebuild
+++ b/dev-libs/isl/isl-0.17.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.18.ebuild b/dev-libs/isl/isl-0.18.ebuild
index b2dd215071ee..91bb1d6d1bc9 100644
--- a/dev-libs/isl/isl-0.18.ebuild
+++ b/dev-libs/isl/isl-0.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.19.ebuild b/dev-libs/isl/isl-0.19.ebuild
index 2aba05792855..75b8910b3c30 100644
--- a/dev-libs/isl/isl-0.19.ebuild
+++ b/dev-libs/isl/isl-0.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/19"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.20.ebuild b/dev-libs/isl/isl-0.20.ebuild
index 2aba05792855..75b8910b3c30 100644
--- a/dev-libs/isl/isl-0.20.ebuild
+++ b/dev-libs/isl/isl-0.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/19"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/isl/isl-0.21.ebuild b/dev-libs/isl/isl-0.21.ebuild
index 96492b25b890..b801a3c5fc5e 100644
--- a/dev-libs/isl/isl-0.21.ebuild
+++ b/dev-libs/isl/isl-0.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/21"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 12092f608940..3a9b3ef6e54f 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,7 +1,7 @@
 DIST jansson-2.10.tar.gz 487855 BLAKE2B b1d83ad1a37e66cb7c497284a7958882d5a7e13cec2260d9cc2b5eaef648feea66b70305dec9193f10cf77f37bdda17605277ea41735708ca6a9898b79fef807 SHA512 e331d5c097b4acb0b1df7d90d1d3453c26bd34bfe2e06af0027665bee9efecc2bc61cc7ab5b70dab1262bf80a3315ffb53b4176874fe07e20eee4b9ea7071d44
 DIST jansson-2.11.tar.gz 483686 BLAKE2B 873283a1b41eef1c57fbcb3d4cdb8c33b850d95ee93c800cbcc009e3e9c9e87278beff11800e63894087e51c767dcbd555fbde48163376d53be2bf72b2eac72d SHA512 0ae77cf7ec264536313639458ba20b66e221078cddd209df3ce45c895b897799954abc1ca4b0d5993b974135652804be6bede2825503469d56303470888382f8
 DIST jansson-2.12.tar.gz 489154 BLAKE2B cf6bc6d03daba921ec5e033bf57ff0055741cc935adb14d5d4a5f04056fa93c292bf88367db071ef7bb32fbc5d2d6f5f2ce658815a17939bd38ed5c0676ad091 SHA512 e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb
-EBUILD jansson-2.10.ebuild 857 BLAKE2B 7b1b318f3a0dab579b82019dc0fd07caee375f19c0a19f4c92ba0f59a094432d85e722eea298c1d38ffd8d0508139dd160e99c29d1bb2c3a8d6512f1d5ce9465 SHA512 4ff618e64579443a2811717259086ad988991a773b1d35f05456647b9e19d2b757107cdedb1e840ede68c36b82714117acf5a42f46d89b020a835ff67b2a2fac
-EBUILD jansson-2.11.ebuild 831 BLAKE2B 1e391e445e5953e43de7a967afea476a5fb032bf2ffd7be5626e814e09a8db90709b1e4da658ebb3b31cc29ca1b392fce0d996d296ab81bd86b080059d461e17 SHA512 f4f8dafecd41fc3489f6b99c49aded20c93fa0a7638571427ad5adff991df55008820999546089e73e26c7250d2524d36d1c17c2db02dcd7e30c57c098445ce2
-EBUILD jansson-2.12.ebuild 843 BLAKE2B 845079169e230b7e38d2746e59d64e5d50c1ec4f31a65358a57e3ba070ca8bbe4311508a357818df6a2b6b95f5d5a7e6d38c4706209f77af71f4977ffc554924 SHA512 a63d2a052aef16c61b356faf80e1255c986a77415994be0c6e53e170eb77cad7d48d67889cd319f0abd068485a3b7f32eb7b1fa3aa555095da321719b46f06a2
+EBUILD jansson-2.10.ebuild 845 BLAKE2B 2d08b25443056af0503b2e5811079554e4ecc81ef067f636ac0ce1331c3fb502d42587cca60f94f75120e457ab1eedf03a9aafef9f0cd31cd927b7248be4c5ac SHA512 0c59679f112edf9349b313d80deac91d62c4867cb71725cecaaa78002e90a515309c35e0a34da7eb9ff948ec4dd4ddb9106794ed5736353438d1718d4df98079
+EBUILD jansson-2.11.ebuild 819 BLAKE2B 81aa1fb51bb648a1881f38abe5cd991e7beaa0eb06b7680d5401c425fc62107aab6b769ebef708093043a94953d8c0b6b2c3d1db22506bad42169d493b738a30 SHA512 47924bf2c7d0972e948b0ee4bf027465a8c45f1eadbd21acbeb509a997026563db9e7a8c517569d04727d199840ae0e2b038231eefa81ef6447734fb3c072378
+EBUILD jansson-2.12.ebuild 831 BLAKE2B 72b0441c823baaf65266bbf5b10f5ad936e545f417b0fe774f3eb4db4f819bda32054fd864ccd9ed5ff68d79a61397b2f567421f49d097459a09c3fdfd9a3819 SHA512 0e1bcbb87ff216fc1d119df415ce969d638f2878011c4638be56dbdc68505ec3fece228201eb44e589c896de26fd5cdf7f9c6a408e243022418efd72170db5a5
 MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59
diff --git a/dev-libs/jansson/jansson-2.10.ebuild b/dev-libs/jansson/jansson-2.10.ebuild
index e8868fe3c1c0..1df25c39588f 100644
--- a/dev-libs/jansson/jansson-2.10.ebuild
+++ b/dev-libs/jansson/jansson-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/jansson/jansson-2.11.ebuild b/dev-libs/jansson/jansson-2.11.ebuild
index 8e268e68cdc1..5a338cd89b8d 100644
--- a/dev-libs/jansson/jansson-2.11.ebuild
+++ b/dev-libs/jansson/jansson-2.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/jansson/jansson-2.12.ebuild b/dev-libs/jansson/jansson-2.12.ebuild
index 5fee180dfaaa..3e01e915f9e8 100644
--- a/dev-libs/jansson/jansson-2.12.ebuild
+++ b/dev-libs/jansson/jansson-2.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc static-libs"
 
 BDEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 67226ca977a8..cdbe69359871 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,5 +1,5 @@
 DIST json-c-0.12.tar.gz 501419 BLAKE2B 24f035792ff1ba5c39e55bca6ee4ba2509ab71d0374c70b520791f38e1ec4ff2245a282f234fde9f4a02cd9eaaaaa998ce307563a20702c04ee972fdf51f2539 SHA512 c959804362386f6b77e9d04b5fedf6d6aff1fcd0ab50250edb25f759b510b402e7ad4b33d1cbadc3337b63a3145d19f310812a9ee351748348304b384dc2dc35
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
-EBUILD json-c-0.12.ebuild 930 BLAKE2B dbe72e808826e7cdb24f298d9f258d5cee1dcb03716a8fb5a086fd13b53858961550f4310e4fddc626ed52825d9f7cf7d24751cffe54dadb52bacf0f232913e2 SHA512 1d1c65c6e297a9035b143969006f4c4d67cef6ec1d8c80edcd0a344c259da33ad24464c7a7485a30f182a7d41a14533f27936b50c37efd1b9802e8a5a143d72d
-EBUILD json-c-0.13.1-r1.ebuild 986 BLAKE2B dde8b0fd57d178fa8e8e1a63662f09d30461117eb51ad79b9c49b8f748c5de7c62ee39584926fe94f4f576712e58fef0425c9974a7f2da174e48af4b7a894cca SHA512 96940b744570dbc17cd4fc11ba2d37b8abafc7b74dccba8273740ce27113dd1f8e229fe2a5b1ebe7cd62589d4ddd99e14ebb3ea83d5a403cdddb1f94bd24f8a1
+EBUILD json-c-0.12.ebuild 918 BLAKE2B 940167a1fcdaa04b450a69337519267b4b632d7233a8f91b05090e3c687382470d6985dcf1b708c3b033096c5243909472ceffa1b97e0695e0ebc03f947d3539 SHA512 fab4cd6af0484b5c6ef117c81c158476e884da62a90db8a9e9c3ba6d6a9598b6c503c2460d7aa971494fa2c4460903e9b07afa8905c04eb7197c75899d4c737f
+EBUILD json-c-0.13.1-r1.ebuild 974 BLAKE2B 6380d485185e1e36eef26ad9338f7a162ece8830795a56532c404990531b422ce31c956d5ed753477861ff046fe7a1168de8a40f8f392f9c81893fd8e6ae836e SHA512 deea7213113780bf598108b6b31e93dd28ad93070f848e9570b5bdd05a7a979f8dc583c725a19875f7210a8a86b6b8ebfb343154c5e8b7c44d286019a54f8b48
 MISC metadata.xml 605 BLAKE2B 2290e9eb5ca3ad7c82de9d23062cd6b4a5cf3bc3f3b56900e72be88a96b04f7f6ca4b904b8eec476da9ce450f335312b9774f022b8c16fb88a710ad1de57f031 SHA512 485dcf4f7c9e63ee399862f09448965d675ae6580eb74c13c430547a8eab78c3c9890f3a06daf76d028e2bb194daa407f6abb9911648e4827eaf92fd3714154c
diff --git a/dev-libs/json-c/json-c-0.12.ebuild b/dev-libs/json-c/json-c-0.12.ebuild
index 9074dc523491..4b319bc85f61 100644
--- a/dev-libs/json-c/json-c-0.12.ebuild
+++ b/dev-libs/json-c/json-c-0.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/json-c/json-c-0.13.1-r1.ebuild b/dev-libs/json-c/json-c-0.13.1-r1.ebuild
index c03181cc1584..779611d8dcd6 100644
--- a/dev-libs/json-c/json-c-0.13.1-r1.ebuild
+++ b/dev-libs/json-c/json-c-0.13.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc static-libs"
 
 src_prepare() {
diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest
index 98cee6e3f99f..6e5432e7ed6a 100644
--- a/dev-libs/json-glib/Manifest
+++ b/dev-libs/json-glib/Manifest
@@ -1,3 +1,3 @@
 DIST json-glib-1.4.4.tar.xz 165584 BLAKE2B 0cdb518cd139b8dbdbf31c9bc00ddedca6385d7132843455a7898f3544fb43b62d6626d49944e83ef10ab9a555cf21c7e4548df7d784bcb4020f4026e0f3045e SHA512 cf56a99dce3938b5c0075810f105719836fac65392da33a49b26ebf33aee1fab89ca9fac58059a2008d688ecc75a3e524de60621a5b027d566963541f38b971f
-EBUILD json-glib-1.4.4.ebuild 1553 BLAKE2B 8d5562cabcb4c670302049279bcbadb2ca5f04e0e954addd50e16237fe8107993e9c4debcf3944eecd414d28af4a8e276bf5e123018940fff0f4d9bab98d3be6 SHA512 35b558e26b04110603e995f52e012de76b2f432a8991352e5f388aa50a87cbc626a64951bbf5b058b62078439d63403845c84dedbca07c2f777cd7a0740ff416
+EBUILD json-glib-1.4.4.ebuild 1531 BLAKE2B 91eb7d4bc20f397f6ed1aa048a11a68ef2f46aff1171ec67a80d3c47f7221aa7948e74498f42b0e95c42c0d0ef5dd4f8e6f7e773cec04d509ae869d5083f5139 SHA512 b3faea3b348d71c380d6881a3fc4c557c9fec75f6a42998e5616ffd34c9d29125a2ebd391f4e2fdf50bd3034fea2c4ae2e67485e4507d0f682ce1435353efc98
 MISC metadata.xml 1168 BLAKE2B f92f6fe2026abedfcd6f51797df84573b33817b10203e0325aa9790cc9c58ea6c9d69724b122dfe3c9b7b2a34cbf15e5e245c8aa93a1f8802757ac1c2ce61a7d SHA512 9af9dffd8e1d56c9dad5a0c53bdf16f5d54261c8c121cbc9644865340b84101a0bfcafc393bfe0d6b31024b16f1bbe9f9305286bc56a2df20a08984f55cb91e1
diff --git a/dev-libs/json-glib/json-glib-1.4.4.ebuild b/dev-libs/json-glib/json-glib-1.4.4.ebuild
index 1f39af78a738..0436811411dd 100644
--- a/dev-libs/json-glib/json-glib-1.4.4.ebuild
+++ b/dev-libs/json-glib/json-glib-1.4.4.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index a823a392a444..35f65d4ced7a 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +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
-EBUILD jsoncpp-1.8.4.ebuild 1370 BLAKE2B a84a5ca2b32fdaf245dea03c51304e026c11428eafe2ad4a1ae36d9d394a968a6f10aee504d08b590dd2ac9d8e060e96bcae182a2178e35c7aa9d5ae40f4e0fe SHA512 b942c9e5cda3e95b10e89c88179ea279fbd7f860364eaec5ad92210c9700c916af7ac5e04925552c0599291a4ea60e4a46a451d6c6bc9b882e66f95a7f24beed
-EBUILD jsoncpp-1.9.1.ebuild 1378 BLAKE2B 7170d86233ade7dc5fdac0ed05ff1e178907c0e41c18764f6e67b803dd60deaa47f65dfaac38d046ebbd3d5d859ce47b083c6cec67496b87cd05b12b0e46483e SHA512 f4fa4b9987f6997aa9aa37ec19e175d9b1e96665f3740835996e21741bd04089400c274260616fc1f8a3efcc7cc41de8d499de7e2b0dd186c368cd76245e868c
+EBUILD jsoncpp-1.8.4.ebuild 1358 BLAKE2B 44a52626b84622c18285dc24eaccbf064151314769da1caca9727a4e16ca803878569350ea0a02e662cac212c1f290ecdad6b9c62e02c1c37e9f6ee4e060375f SHA512 dd4fdf4b0b85d571c63f3151f9252f471d15a4420342535caca055dd000f15fb483573b93748ddd27f8518c7e687e7e695f9f89fbad87294831a839a7dfad0ac
+EBUILD jsoncpp-1.9.1.ebuild 1366 BLAKE2B 61aab4ecaf27074ef443ea80b3f49d1c5a7efb5cc8c72534744b83599e0721db7b7b6a836e0241478ea6feb9731799c099e3e39b3b6d5422390dad99a52fd094 SHA512 389464ed9b6b1ae0713673c7937478da5d0dfc896efdbc75df6cbea4a5c5c7c7ff4281adcc8a6f978e4ccf41b9e24dbe75f79b26ad62426eef987323124e3007
 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
index caab49d63485..6eb5e4ed40ab 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/19"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
index 80219f75dfea..d2336272a5cf 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/21"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index fd647ab0b710..fba8ad1eb0fe 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 9500 BLAKE2B 14170140e1cf7c59d1665cae4e2f11aa23e4664fd46b4527dd0c3c09ef2ce434595fae9881b3f4fcc6d072c69e1b2c5f1704c7016c2e3e2ba0012894f343d6a6 SHA512 eea7a3ee293015f7f2bc063f1dd204db3b19a410e6ea11b20e7b545daaf187326c9ca9c9ca9b9a47d20da14109f3d3e2436715bc73710c13901b962e57142730
+EBUILD klibc-2.0.4-r3.ebuild 9544 BLAKE2B 1084343464711ac1e6f111fb29164dbe8656f6bdd9e8626e24574720a7392128abf220da8b420227c38f3c21eab9228cf26b8576495644b9b3bf9942b784107b SHA512 c4b713d46a1b8f04f00d7aa992d4a92192348bc48b9fe39406d25770138ff772810ed62b6298cd041ddf3d5d9650bd522cd5659da3dcb51211a82f29d5562bb7
 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 9e4d06a4c598..0ce5d3b94957 100644
--- a/dev-libs/klibc/klibc-2.0.4-r3.ebuild
+++ b/dev-libs/klibc/klibc-2.0.4-r3.ebuild
@@ -30,7 +30,7 @@ if [[ ${PKV_EXTRA} ]]; then
 	else
 		PKV="${KV_MAJOR}.$((${KV_SUB}+1))-${PKV_EXTRA}"
 	fi
-	PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.${K_TARBALL_SUFFIX}"
+	PATCH_URI="https://www.kernel.org/pub/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.${K_TARBALL_SUFFIX}"
 fi
 if [[ ${KV_MAJOR} == 2 ]]; then
 	OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}"
@@ -38,13 +38,13 @@ else
 	OKV="${KV_MAJOR}.${KV_SUB}"
 fi
 KERNEL_URI="
-	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.${K_TARBALL_SUFFIX}
-	mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.${K_TARBALL_SUFFIX}"
+	https://www.kernel.org/pub/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.${K_TARBALL_SUFFIX}
+	https://www.kernel.org/pub/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.${K_TARBALL_SUFFIX}"
 DEBIAN_PV=2.0.4
 DEBIAN_PR=9
 DEBIAN_A="${PN}_${DEBIAN_PV}-${DEBIAN_PR}.debian.tar.xz"
 SRC_URI="
-	mirror://kernel/linux/libs/klibc/${PV:0:3}/${P}.tar.${K_TARBALL_SUFFIX}
+	https://www.kernel.org/pub/linux/libs/klibc/${PV:0:3}/${P}.tar.${K_TARBALL_SUFFIX}
 	mirror://debian/pool/main/k/klibc/${DEBIAN_A}
 	${PATCH_URI}
 	${KERNEL_URI}"
diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest
index db28cfa604e2..794c339988bc 100644
--- a/dev-libs/kpathsea/Manifest
+++ b/dev-libs/kpathsea/Manifest
@@ -1,17 +1,7 @@
-AUX insecure_tmp_mktexlsr.patch 602 BLAKE2B bb2dd2178a515431e643f4a3e91a4b30fb8e63e860e6e0b6c13208b00642bc88a672b1dc9ead8277c593c2ef333f0581af24c821b6f3c84841a750911d4fe909 SHA512 2b9e92665482403b7a153c27ad8aea5ae5f05ef42c994c899ee4987d39fb4005204c7abbb464d7c0ec1b48a7630d34991d6fea3076cee1f50d9c4855c7a908f1
 AUX texmf-update-r2 6017 BLAKE2B b9ded4693768342c6fe9a0d99b6836e74b3d8b9a5bb3d335d8ecbbe5c2a45967ac880ebfc2476c04e461ca2dac3eb02ee6c41ee34a050ba94b54d9d731853ee0 SHA512 924c6a53d778b1a05252830d914c92f8d1a8d1c479cd8a065b861bf1f263d6bb529c42c365134fea19ea1d9bedf68a943d609cd89abf73912f90bbc3397fb14f
-DIST kpathsea-texmf.d-8.tar.xz 11456 BLAKE2B e631ebcae97494b963dbe4bc03d7ba19ce0a38392dca8c171a40738cd7c6ea46ee821f993ab3ce8f4beb068cc485cb1c84adc7a07dd13c58c68bf9a0c17dff5e SHA512 496ef6e3134f1b0507b15729416de86d72f41b518f4d382c78c2f39b0d603d3d44f8c8befdab2351d38d2a26fd87e5a73570a67b11dbb3f307b006f409a6f036
 DIST kpathsea-texmf.d-9.tar.xz 12120 BLAKE2B 80069cdb1c8e1edf8ae0b5af2de825afdf234840f9365c0033d7fb080a1e5e5692ae9ba4c191b83422724f35523a21551102ef91e8642f5cbd4df9e251357b11 SHA512 5718ef60d33013159b5913f198330f9ecb098ac4333dd536068e8c48bf6eb208039a9b29afba331b3e4942c0c77c46e6add1c116d273f1f53550116ac06e69aa
-DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
-DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-DIST texlive-module-kpathsea-2016.tar.xz 30696 BLAKE2B 066f5586c93b07db1c07ee0e9a31465e24564faa30b0abf40e31212a1048527a54c58d516c5af139931df2f7d32b6c9c679080acc93f71f05245b2c4f0bb9530 SHA512 330254cf76fd30bf3686dd48710f21c4804f2f6ea9b14e6033b2741c3e6ba627e51efe96da9a1089120d474e36aad1c052285a7ea394b76ee2d4d335b86095fd
-DIST texlive-module-kpathsea-2017.tar.xz 30956 BLAKE2B f9f7d70a6d814996a211a5f3d9c6ee1f477497f84e4716af915bf1171018243094f11d131d2f51930575129b6e16e5fe5e907c0d74be1a182ba7e573be0eadb5 SHA512 df4bc2175394bb6e9726b2c09ccf04e2787f73d584dd6944a25b3aab1eb6e8b4bdcd14ca043b7fe4f6e240ede1bd7e9003b83e34dd3df8c685658b8dcddc83c9
 DIST texlive-module-kpathsea-2019.tar.xz 31480 BLAKE2B 897ceb8cb536f2d4a54ead2529da891eba83e4480b9ca527ab99337ed030f680bc25a12d4286e101965d146567720e3bb5fb8ff18a240365be9eeb7471c970bc SHA512 12676ea4b26af792c1abc2a3189c103357b6af4994d3131d8d98e507af24f5d9666bfe4d8abba0ec984eec1ba8c99ab7a6d35813c8e053c79c82a7baa88c973d
-DIST texlive-module-kpathsea.doc-2016.tar.xz 1128872 BLAKE2B e3b2e5c2c14e2d67fba3c89d31169b2af13bd6767983302ca302369ee8cf790655b248cc1069cfd59e4044562627eb83bca6ffe368d5c1b38832e08fcc53b678 SHA512 1cfbb4b5a8647bf5da46b04c9bc911091aa3322b154d65544aa3a1163e24b6906d7e5420549ab0ba023250e6dfa90e75d3a20dffd2e7360fba068a5c3cece885
-DIST texlive-module-kpathsea.doc-2017.tar.xz 1128868 BLAKE2B d1f6bb2f9a893616cc9e090671a7a3c2aaab0f942eed0824a60826b75ee0a62ded33cad197d0bb953100a02ecead1f8d84bf7374889bdba9fc36a26b23440a9c SHA512 af829f666c815da49b59bbe678a2c1e9fe45cbc528f484dfb6e43a1e52bbf0245a4e571505f5be2cc7cf7f5ebcdb06b862ac6e9f9b5390489f0fab10a11fd997
 DIST texlive-module-kpathsea.doc-2019.tar.xz 1068236 BLAKE2B 19ecf7d3e5dc1c7a537f59ad45188bb2cd23127682382e719d8bfced05a7f46704606be55c1ff3fe1374587b99866f441b67cb1b555dbf2e33f332d147e30dda SHA512 bd13bb8a5740df0abda5d5f546138504bf3b6bd54caa95e5f1758cc540af4bbbd055e3868c494f65e9bebe108038205d8537fcffbc821a8f17bc51119e5d479c
-EBUILD kpathsea-6.2.2_p20160523.ebuild 3274 BLAKE2B d028c3c47209c2505ec27054c2b5c7526fa548649eda49a2f58680389cbf2261e5d06a0014de9176c6f02ab7cd3df4e2a47b28fcce2fca01956465ad7f644f45 SHA512 2593e50d9d773406fa17dd4583ad02d837ede26de6140aa8b4a593170693b0c49bebe2e025b50356165b1c9ce8432b99e4e341c2f1874c000861c901ff1319ca
-EBUILD kpathsea-6.2.3_p20170524.ebuild 3287 BLAKE2B a33b736ea9ff4701aafd847ca262e2211de48ab992665666daa0f093de1416ce608a98051f6a42e4d7f1e17c01e471cc58a8e6ba97e5816e97bdf10a29295210 SHA512 a5cbe9f1986f60ef7c65c541a84f0dd7a4685094df88d6542777c64138b946dcb4d39b9ab0e34d9ec466ec898c0513599178c11bb3311e97494c3b0641990193
-EBUILD kpathsea-6.3.1_p20190410.ebuild 3185 BLAKE2B c03bcc5e17c86e850b5ad14c74ab65feed2204005fe2ca154adb17b77252bf6b4dc71a237a2f64f43e575e0d0d7b811bd401943f7690e32070530ec391349399 SHA512 52254491edf3f821fa8f6224c6abbff19bc2129b9a1ceaab14dce9f2e88d7f5e396dcf11ba71d8729c5de35575efd440c5d5ea1f649dd01d14cedc782bd21cce
+EBUILD kpathsea-6.3.1_p20190410.ebuild 3156 BLAKE2B 5d356dbed7837d7dcf736d4e8099e07e8d91b74fedeb5af91fd4d816a8e2f093c8cf9be3b4d80e65ed660bae86832dbdad79ebff2f243c3106e4c9c909d10492 SHA512 187247143eaa3a240b3fa4f57e3fe5369f4d3e6ea9ac823d3f7ca5d440f64c08aa71a00ee41505ef7476004a5d34f636636293633f99382b3ee7ed57a1245253
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/dev-libs/kpathsea/files/insecure_tmp_mktexlsr.patch b/dev-libs/kpathsea/files/insecure_tmp_mktexlsr.patch
deleted file mode 100644
index 36d2094cddf0..000000000000
--- a/dev-libs/kpathsea/files/insecure_tmp_mktexlsr.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugzilla.redhat.com/show_bug.cgi?id=1181167
-https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775139
-https://bugs.gentoo.org/show_bug.cgi?id=536454
-
-Index: kpathsea/mktexlsr
-===================================================================
---- kpathsea.orig/mktexlsr
-+++ kpathsea/mktexlsr
-@@ -73,7 +73,7 @@ if tty -s; then verbose=true; else verbo
- dry_run=false
- trees=
- 
--treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.tmp"
-+treefile=`mktemp --tmpdir mktexlsrtrees.XXXXXXXXXX` || exit 1
- trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp"; 
-       exit' 0 1 2 3 7 13 15
- 
diff --git a/dev-libs/kpathsea/kpathsea-6.2.2_p20160523.ebuild b/dev-libs/kpathsea/kpathsea-6.2.2_p20160523.ebuild
deleted file mode 100644
index 5b99104d2fe6..000000000000
--- a/dev-libs/kpathsea/kpathsea-6.2.2_p20160523.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit texlive-common eutils libtool prefix
-
-TEXMFD_VERSION="8"
-
-DESCRIPTION="Path searching library for TeX-related files"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz
-	mirror://gentoo/${PN}-texmf.d-${TEXMFD_VERSION}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV%_p*}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source static-libs"
-
-DEPEND="!<app-text/texlive-core-2013
-	!app-text/ptex"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-TL_VERSION=2016
-EXTRA_TL_MODULES="kpathsea"
-EXTRA_TL_DOC_MODULES="kpathsea.doc"
-
-for i in ${EXTRA_TL_MODULES} ; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${EXTRA_TL_DOC_MODULES} ; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-SRC_URI="${SRC_URI} ) "
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-src_prepare() {
-	epatch "${FILESDIR}/insecure_tmp_mktexlsr.patch"
-	cd "${WORKDIR}/texlive-${PV#*_p}-source"
-	S="${WORKDIR}/texlive-${PV#*_p}-source" elibtoolize #sane .so versionning on gfbsd
-	cp "${FILESDIR}/texmf-update-r2" "${S}"/texmf-update
-	eprefixify "${S}"/texmf-update
-}
-
-src_configure() {
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #347798
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-
-	# Disable largefile because it seems to cause problems on big endian 32 bits
-	# systems...
-	econf \
-		--disable-largefile \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" web2cdir="${EPREFIX}/usr/share/texmf-dist/web2c" install
-	find "${D}" -name '*.la' -delete
-
-	dodir /usr/share # just in case
-	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	if use source ; then
-		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-	fi
-
-	# The default configuration expects it to be world writable, bug #266680
-	# People can still change it with texconfig though.
-	dodir /var/cache/fonts
-	fperms 1777 /var/cache/fonts
-
-	# Take care of fmtutil.cnf and texmf.cnf
-	dodir /etc/texmf/{fmtutil.d,texmf.d}
-
-	# Remove default texmf.cnf to ship our own, greatly based on texlive dvd's
-	# texmf.cnf
-	# It will also be generated from /etc/texmf/texmf.d files by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/texmf.cnf"
-
-	insinto /etc/texmf/texmf.d
-	doins "${WORKDIR}/texmf.d/"*.cnf
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
-
-	dosym /etc/texmf/web2c/fmtutil.cnf ${TEXMF_PATH}/web2c/fmtutil.cnf
-	dosym /etc/texmf/web2c/texmf.cnf ${TEXMF_PATH}/web2c/texmf.cnf
-
-	newsbin "${S}/texmf-update" texmf-update
-
-	# Keep it as that's where the formats will go
-	keepdir /var/lib/texmf
-
-	dodoc ChangeLog NEWS PROJECTS README
-}
-
-pkg_postinst() {
-	etexmf-update
-}
-
-pkg_postrm() {
-	etexmf-update
-}
diff --git a/dev-libs/kpathsea/kpathsea-6.2.3_p20170524.ebuild b/dev-libs/kpathsea/kpathsea-6.2.3_p20170524.ebuild
deleted file mode 100644
index c5c3c142508a..000000000000
--- a/dev-libs/kpathsea/kpathsea-6.2.3_p20170524.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit texlive-common eutils libtool prefix
-
-TEXMFD_VERSION="8"
-
-DESCRIPTION="Path searching library for TeX-related files"
-HOMEPAGE="http://tug.org/texlive/"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz
-	mirror://gentoo/${PN}-texmf.d-${TEXMFD_VERSION}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV%_p*}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source static-libs"
-
-DEPEND="!<app-text/texlive-core-2013
-	!app-text/ptex"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-TL_VERSION=2017
-EXTRA_TL_MODULES="kpathsea"
-EXTRA_TL_DOC_MODULES="kpathsea.doc"
-
-for i in ${EXTRA_TL_MODULES} ; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${EXTRA_TL_DOC_MODULES} ; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
-done
-SRC_URI="${SRC_URI} ) "
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-src_prepare() {
-	epatch "${FILESDIR}/insecure_tmp_mktexlsr.patch"
-	cd "${WORKDIR}/texlive-${PV#*_p}-source"
-	S="${WORKDIR}/texlive-${PV#*_p}-source" elibtoolize #sane .so versionning on gfbsd
-	cp "${FILESDIR}/texmf-update-r2" "${S}"/texmf-update
-	eprefixify "${S}"/texmf-update
-}
-
-src_configure() {
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #347798
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-
-	# Disable largefile because it seems to cause problems on big endian 32 bits
-	# systems...
-	econf \
-		--disable-largefile \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" web2cdir="${EPREFIX}/usr/share/texmf-dist/web2c" install
-	find "${D}" -name '*.la' -delete
-
-	dodir /usr/share # just in case
-	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	if use source ; then
-		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-	fi
-
-	# The default configuration expects it to be world writable, bug #266680
-	# People can still change it with texconfig though.
-	dodir /var/cache/fonts
-	fperms 1777 /var/cache/fonts
-
-	# Take care of fmtutil.cnf and texmf.cnf
-	dodir /etc/texmf/{fmtutil.d,texmf.d}
-
-	# Remove default texmf.cnf to ship our own, greatly based on texlive dvd's
-	# texmf.cnf
-	# It will also be generated from /etc/texmf/texmf.d files by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/texmf.cnf"
-
-	insinto /etc/texmf/texmf.d
-	doins "${WORKDIR}/texmf.d/"*.cnf
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
-
-	dosym /etc/texmf/web2c/fmtutil.cnf ${TEXMF_PATH}/web2c/fmtutil.cnf
-	dosym /etc/texmf/web2c/texmf.cnf ${TEXMF_PATH}/web2c/texmf.cnf
-
-	newsbin "${S}/texmf-update" texmf-update
-
-	# Keep it as that's where the formats will go
-	keepdir /var/lib/texmf
-
-	dodoc ChangeLog NEWS PROJECTS README
-}
-
-pkg_postinst() {
-	etexmf-update
-}
-
-pkg_postrm() {
-	etexmf-update
-}
diff --git a/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild b/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild
index 460f007afb74..981df0c9a7d3 100644
--- a/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.3.1_p20190410.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0/${PV%_p*}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source static-libs"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index ed7989a920df..ae5453c88b17 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.7.1.tar.gz 814579 BLAKE2B e29e8bbdb58800e35c4c790b833a512ead0e177e22f140f16ef725738336b49afa709976ab6062b7219b705e14a369f31eef0ded26d51240919ace2cba1de739 SHA512 753cb89f7511b6fbc66e49e9c1fc3ecf1a2d61781b65baea763666f49780cf84a20e0a90fb98e7146f6e11555f892cbfb9c3b4f0d84961af7cce7fc4a277a7f1
 DIST leatherman-1.7.2.tar.gz 815088 BLAKE2B d011d2ae8b75c2a6c10c35da0293624fac0a30dac35d5b7f8b2fee264140666996821f60c8f67eeafc351b669c8263d1a95a00ffcdcd28448b36852c607ca69f SHA512 2976e8d56e603ba86bc22217c1c6b729fed62536ea56b0a74afed4d48a85429d2c79900652344e63905448a13d60d29440623980fd770d40e3db729af5d70ef3
+DIST leatherman-1.7.3.tar.gz 815236 BLAKE2B 26bb6cbf19675741c0d325f42ccce993cd7fa58b116601fa5fc79d2fb443f2c8b26799138289714a1663996247c267efb5485b04cfa68161bc291d91758f7f84 SHA512 4ce424d90c83e5268925095f267f3365b0a75e60d92af83836c790f538d381153c200fff1a1e152b60e247240698d3cbe9a59c4e366040eece0101819775ddff
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
 EBUILD leatherman-1.7.1.ebuild 1150 BLAKE2B 0d173c50865b8b66b27286a2e0df530c857ba5a9d48cf81e363905ff2cb0668fb6aca0c282fd56a5d3713d79cde73079eb96c8726c786ebbb9ef32aaabd3071e SHA512 91b7cedb5026b117f5d538d50a3b2f6b3d8583d7eb4944bff08cbc3e756acd255fc5f6d199a9f77b06258c34eda317aff32b4878207e645cc93e17638573699d
 EBUILD leatherman-1.7.2.ebuild 1152 BLAKE2B ccc089da10bfdf3835dc76aeb5dd2f087e974014566dcf62dec23551f1acc7e67d4741cb0c7f2d8c25a51fcf89a516bbb5ee11960c7b148a1713211722288f78 SHA512 d5af35ebba8fd2dc44c7bd264c33c898667812ce95e3557a9f151e8c5b44a351278414ac93dc93162b8bcd63e2a943b5004e359f6a8f1184d8f50c81da839792
+EBUILD leatherman-1.7.3.ebuild 1152 BLAKE2B ccc089da10bfdf3835dc76aeb5dd2f087e974014566dcf62dec23551f1acc7e67d4741cb0c7f2d8c25a51fcf89a516bbb5ee11960c7b148a1713211722288f78 SHA512 d5af35ebba8fd2dc44c7bd264c33c898667812ce95e3557a9f151e8c5b44a351278414ac93dc93162b8bcd63e2a943b5004e359f6a8f1184d8f50c81da839792
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.7.3.ebuild b/dev-libs/leatherman/leatherman-1.7.3.ebuild
new file mode 100644
index 000000000000..335426971404
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.7.3.ebuild
@@ -0,0 +1,58 @@
+# 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"
+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/legousbtower/Manifest b/dev-libs/legousbtower/Manifest
deleted file mode 100644
index 367b1fa86fe5..000000000000
--- a/dev-libs/legousbtower/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 20-lego.rules 83 BLAKE2B ac95969960bb86f3b5e18d7c9c00b49e4ecb2fb850f1481ca290de12e76eb3b14d0b4ddf225f569c8a8005bbf5a557590a63d9c7fc1881e2e6884a30e75d91c9 SHA512 1e708d5c5d1169075c6ba626cfb362e473e4d026c8ced32f888eb6874637bf7d655917b08f15738cb53eb4be78f8c243c795293862d109683e895507f30dfc61
-DIST legousbtower-0.5.4.tar.gz 22782 BLAKE2B a77f1e2fbadc7b7ecc93ce1726d4dbc47048cdf9edb7627cc08a4fb571657b0e601f7cd9b7a8026892a596ffaf8c3c9d26e4074c7aef57a78964087e905e38de SHA512 169cf31d4585bf3b7bd9aded76d202bb14e285f644f8aa10a6f4bf6d99e6f28efc33c65922388cdfa17a1bfc0dbc777edc1fb45484155543a42117eaba6fb7e7
-EBUILD legousbtower-0.5.4-r1.ebuild 905 BLAKE2B b6a1855fccfe7e85933094d15d38308c81f103c9a7bc2f46c2388cac67264eb4274a14b4752b0875ef0246f35079bedcde65f0a841a3ef29b462e396c91ccfbe SHA512 4e52ee06c59bd1ca64ce145521fed6bcb4d9709e394f19ba3e4f4a8964e034e8618697e6aa22bf98bbfce407df078d1c4a317f7c68f49ad63320ded3cdd51bc4
-MISC metadata.xml 244 BLAKE2B 9eceb013695379bbfd076331cd25d5c86c334913652e1f634b1b9dea98d36fa9e9a70e40606f45dffc0c437b96c3213cc446f6d460839d9b87440bb1e984b7c6 SHA512 dd104cf292c56e0c1faced64aec00bd8668ee8925116d795a47b3e1fd88f5a743ec64111e4095b9afbaa2823c20bcb5100bf1ffb5d17e5a19389112249a835a6
diff --git a/dev-libs/legousbtower/files/20-lego.rules b/dev-libs/legousbtower/files/20-lego.rules
deleted file mode 100644
index ddd5470b9315..000000000000
--- a/dev-libs/legousbtower/files/20-lego.rules
+++ /dev/null
@@ -1 +0,0 @@
-SYSFS{product}=="LEGO USB Tower", NAME="usb/%k", SYMLINK="usb/lego%n", GROUP="usb"
diff --git a/dev-libs/legousbtower/legousbtower-0.5.4-r1.ebuild b/dev-libs/legousbtower/legousbtower-0.5.4-r1.ebuild
deleted file mode 100644
index f24ec9097bb4..000000000000
--- a/dev-libs/legousbtower/legousbtower-0.5.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit udev
-
-DESCRIPTION="The lego mindstorms usb tower headers and/or modules"
-SRC_URI="mirror://sourceforge/legousb/${P}.tar.gz"
-HOMEPAGE="http://legousb.sourceforge.net/"
-
-SLOT="0"
-# The specified license is wrong as the file uses code from proprietary
-# SDK.  http://legousb.sourceforge.net/legousbtower/index.shtml
-LICENSE="all-rights-reserved"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-RESTRICT="bindist mirror"
-
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/include/LegoUSB
-	doins include/legousbtower.h
-	udev_dorules "${FILESDIR}"/20-lego.rules
-	dodoc README
-}
-
-pkg_postinst() {
-	elog "This package only provides the header file."
-	elog "You need to enable the lego usb tower option in the kernel."
-	elog "The kernel 2.4 module is no longer built or supported"
-}
diff --git a/dev-libs/legousbtower/metadata.xml b/dev-libs/legousbtower/metadata.xml
deleted file mode 100644
index 9f152df2ec1a..000000000000
--- a/dev-libs/legousbtower/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">legousb</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index 9fa0a95ae590..63176a7c75bb 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -12,9 +12,9 @@ DIST leveldb-1.9.0.tar.gz 203872 BLAKE2B 5fa6d361d82bd386a722b24f52b851791555c6c
 EBUILD leveldb-1.15.0-r1.ebuild 1434 BLAKE2B 9f38a16de6c75e7f6d0b4ac8172d7c7abbc6b95da6729c3ad67977dc17702486d1f5b10b28a7259ee8d7a32b9c6891666113f90e9fa797654bf068ad15314ee0 SHA512 686476d32f6922e79672b07c934662b09a2b9615b6014b9048dee4398fde71c8c26e46a47ee048c258568d5cd723ca6857db2fd046c846f187092b04e6dd15d8
 EBUILD leveldb-1.15.0.ebuild 1230 BLAKE2B bbaa78014b6f36a8c6d8e5a71ff56995b95f9fd195c54cb4fcc50d1ae5327eff1d4f116b60b79e03a4a2d561bd592eda2a5ad91c3dc09ba1e1d778ec9a50a296 SHA512 0b235df8d0bc8559a1e9b79498c2a3009134683a6edfe671abeb29e6a1517817622e03989e9d0c3a6e59aa6127b74a0f86ea6bb08c28974f1ca1dfb742c80033
 EBUILD leveldb-1.17.ebuild 1720 BLAKE2B 683381ebc3ae11d8844e52fb2c7161348a6495f4f83bd29369f991d4169619d526ae6bd1ed878bae9269715da5a9d7f80efc298253fa78c35aa1c7eea9b98bd5 SHA512 a59df720d900c7da98a4e0c9c865f5cb962b1843461289cd0a4e78cbcb5bcfff93b0d4213fde486df0a9f5d2dc7bfe86ecfec757c83513932fb1ab02859feb25
-EBUILD leveldb-1.18-r2.ebuild 1878 BLAKE2B 8a31c57e1e5e6015b549e55b83277c47be0b882f695f3af8f2295ea801380cb02ac0e0691a2a9113bccbb39e4a505a9ceeeaa2c0f9be3644afb1eb4c5949d7b3 SHA512 865cc8d9fa5b956e3b31863d3ce4d18624bda106aa06c0176ff514c7cc3b7016edb0dd34dd5724b5fe4a9ef231ceaf2b59ef47ac9589c66ca4979254b4703075
+EBUILD leveldb-1.18-r2.ebuild 1866 BLAKE2B a2d85d2b76188cf1da2b5651933c085eb91439b7385aaca594d3074124fb771bd858725745a0269e8ecd17e2be5cafbaee13cce5ca32550f0d4069fad3994be4 SHA512 f564389eba2fb0d5189c9dff09c85373990efcd412148e6bd53ab715fac22a29a0a405981768b5c40ed487f68d2aa721196dbfd94cb499e27d769126e2938533
 EBUILD leveldb-1.18.ebuild 1647 BLAKE2B 65c40aea5784964fcdf7550ff41f20980b61e3eae2e69ea790d1e1db1c3b152abb18c7ec679bbdaca21c2c91ace348e7b8a8bee53fa5c39528f1b0c1ac76108c SHA512 5a8feaeca45690fbb5d6f7ecfe7074e176532765900cb343107da542b32e61935bb0832a6682550d57a7e74bc20fec0469a7b0b20a1de9636f628fafd3de4193
-EBUILD leveldb-1.20.ebuild 1741 BLAKE2B 0d44963523ba5fe7f2075523fc52ef45487e1b410749ca4257020de639bcadec1fd46a271f481b654748de9f80bb661fe3d8201ec3e52c158eb004c2a91064cc SHA512 8eb0bd8e052cb7f54984702f0236fe1e24ade3bbefb2f65df89d2dcde392502696b0da5fc6bc5d79281629b09c9c9d8316b0c90d72db5e937dc1f27528999529
+EBUILD leveldb-1.20.ebuild 1729 BLAKE2B 2dc41230f1dfd71aa7bc808cefda1000d2f0eb03c86c696a312082d052e534d0271b53bc8e54f0fe2fee43977414238b21b617b70434db1b4d000c9336dd2bb4 SHA512 072b10a31156fb1adf282041adbedff81c9dcf435413c3746abad0cba9d0af906ff5559a163bc4f581c0dd27563a4ed5f13dbd8d17cc5ffaf0a3c83a7e5a2530
 EBUILD leveldb-1.9.0-r5.ebuild 1223 BLAKE2B 7bbb2958034b96f22b3bb5e55fd9f1383e2cd01b7a523dc32ead090b31cefcf4299d581e85430dbec267746ded520ed21ddb89a5fad9c40a1f6a652677961ecd SHA512 a97ee6357c3e37208d7900f216e4d4270bd7b6c9add1449e3a0c52d49755a1be88f6008e9ae9bb6a021d3345fa57db18e3751073a63ccc8e4270e7ba684216ea
 EBUILD leveldb-1.9.0-r6.ebuild 1277 BLAKE2B 9e581129c37d33f46037eeef50916c5ce6916e6f671f01144b9f0f7cffed096dff724076f36261d552df6cd8f396a38725ee476258211a1cdbf42af9bef6b289 SHA512 ca4965119338028813e0cdb5d1b303c88ef2e2450f471f4d58e16a276485fcb001d6c4818097f5b0c47eb66ce1b23b561ad37809415654c4cee771d0ac17137a
 MISC metadata.xml 400 BLAKE2B 770ed89274db8fd29e68bcc792bd9f593ea0785ff4f1651d85902bb0272cfdff3914ecd98e81dea4160ad085e1e0da6938ebfa801b2b5484cf5edd6666908e24 SHA512 b7284da0474b747738d6da09be217c815ec8b333f2b1f571594531fb77ec15a6cf4564b6053dbab84ceb94f3bcc5d16ed374780852920a7ca823df0ed00be5dc
diff --git a/dev-libs/leveldb/leveldb-1.18-r2.ebuild b/dev-libs/leveldb/leveldb-1.18-r2.ebuild
index 3cc929118ec6..ddfee8667bc6 100644
--- a/dev-libs/leveldb/leveldb-1.18-r2.ebuild
+++ b/dev-libs/leveldb/leveldb-1.18-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+snappy static-libs +tcmalloc kernel_FreeBSD"
 
 DEPEND="tcmalloc? ( dev-util/google-perftools )
diff --git a/dev-libs/leveldb/leveldb-1.20.ebuild b/dev-libs/leveldb/leveldb-1.20.ebuild
index 55249828b5ef..312bb341b5f4 100644
--- a/dev-libs/leveldb/leveldb-1.20.ebuild
+++ b/dev-libs/leveldb/leveldb-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 # https://github.com/google/leveldb/issues/536
 SLOT="0/1"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+snappy static-libs kernel_FreeBSD +tcmalloc test"
 
 DEPEND="tcmalloc? ( dev-util/google-perftools )
diff --git a/dev-libs/libIDL/Manifest b/dev-libs/libIDL/Manifest
index 63c8b6d00078..9ec6edb4ba70 100644
--- a/dev-libs/libIDL/Manifest
+++ b/dev-libs/libIDL/Manifest
@@ -1,3 +1,3 @@
 DIST libIDL-0.8.14.tar.bz2 427149 BLAKE2B c4fc6e4da9d581ddcaeab492586406902b07f964e70b84352b1436e8bc214986141f0a3d40506a7f408a1919c31275e89039978b09c496d5164e673ec236fe9a SHA512 906dde087908acd64b209fe466a89ae52a6ea23601cb30092063a6e062b1b6640fc2d5f422efcdd52b2b36ce20e6c244da6205fde0bdcec787fe64058be7adac
-EBUILD libIDL-0.8.14-r2.ebuild 827 BLAKE2B 7bdddab4617ae33c3f7d75fb25dad5d66b8d210798968ad2ab8870730ba8b29271fa4766be901a80092199de5f8b2c39d29cdeb6429ba88ff415030461a90754 SHA512 109e2c77c798931f46e27c86dff927e1bb11f2a4c0c7c48f1f9ca4276ae6c04e5b94b65465ba95bdfdb0995759edc81bc7acb8c7523a12a207778dc5a5804271
+EBUILD libIDL-0.8.14-r2.ebuild 805 BLAKE2B 252c49d63c4a34cbb6fcd8221da8d91e5b77e65ef6efb7896a7a7a059beb44482c42dad531c9510f390239508f3b3c9b97bfe0a603bca97bd7c27bd6716a98d6 SHA512 1e5975945d0cb787045d44be7673cb9b1ae9d7f2fb715ddc275c6179587e938f30e34eda7ff1f880c863c98de8deedff799be0b9cfa105c0c1476aba6abf273a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild b/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
index 3c1dfb2b048f..20507c13df82 100644
--- a/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
+++ b/dev-libs/libIDL/libIDL-0.8.14-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 7b47aa171d1a..a56a731a0d34 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,6 +1,6 @@
 DIST libassuan-2.5.1.tar.bz2 564857 BLAKE2B dc046b9551183ec543d2a186c3c593471c80445b48aec1366d0b997386c57187f9b7a848973d0930ca8d2be3f138e83c22ef9292e4c8bf5614a99ea3065c7827 SHA512 c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d
 DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a SHA512 e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617
-EBUILD libassuan-2.5.1-r1.ebuild 1277 BLAKE2B a68374f1c6bba14f1d8ea1b19c0c36e1c1331a9c3b3aa55df25af0c854eeea7a4b242f54201c4d9b33754c6554689f78e88c19a300d74926290139fb7bc87077 SHA512 4ee1da02a2e37fd5f3a56539035fe91b87a2255096b59f8ca3961f07b2e1c97d672039a0009fffbdf6478c6a9ed84e4efb5ef6f0fadb885c9d0784d00bc263fc
-EBUILD libassuan-2.5.1.ebuild 1087 BLAKE2B 16d92a4b99e67f950b73ffd544b112833b3da5ec14d7eca14d40651bae83a5b96eee71f751190b4522aaf969fd4fd8df492a85b5cc71baa41d7c284795c84639 SHA512 8d9b67ceaa45c369d93c0fff2a56061d49c056aefe9a67dfee92d508d8bdf323f5651e912480d246964e4a0bb653a22f107d1ee141b3978affccd3798ece6194
-EBUILD libassuan-2.5.3.ebuild 1286 BLAKE2B 54529ba7175c4ffbe823cd5bd9d70ceae3c5953aab779ebe5ae3cd0c64d2f9001efad3db41924edc370df56e5b3d69b9abad0df12907a4c5006afb78df834189 SHA512 31575c9f72f32b732a2e90ecfce3d54569b2086831fadf8f100d9318f67d75bd9cf60ded628655b2cc03193a253b480db58189d7684fa543c082915f5babad7e
+EBUILD libassuan-2.5.1-r1.ebuild 1255 BLAKE2B f44e065a49a9ac1f9a2ca3c6fba5109c29bb4e8e95bcd75b7c30b798a7b43f7ac932e627d85bc78c8e73ffcc53ccbc3f4ae79c8a0dd9452c7a40f4cf08b1d066 SHA512 d7d0968ef815caa65d8793bcfd9cbce3842a8a2a9303072c245375ebde859205f7257335092dc8c84e7102f6d99216fc338b9a4da319fe7eceec8539fbd33b20
+EBUILD libassuan-2.5.1.ebuild 1065 BLAKE2B 15ddd091eb5c4a64f47391ccdf42fc4b07a53e0e11d0ba5874ae0feb3f9b51dd1859e89accf43a198a5e6d3d31c26fe228a098dc240e76f504d7efbf2f105743 SHA512 2e538553eb20f7fc20b8666f7083d647db095df0662ea210392c97dafdab3907df607c59f4589713d4302007cc1592dcce94a73d3090deebcc272f6eabee54ed
+EBUILD libassuan-2.5.3.ebuild 1255 BLAKE2B 2f2346fbf41182f23aa84ce40783e2b4dd0d5ab6c5d728b8c042c5535499a77529eeb634ea794b587898398357094368bd57754eb079df90cd03cebe717d657c SHA512 91d949cf1ad77b8e1350d7bceb361bde744bc524b1c27a1113e235028062903817b2238e41dae45258e90bb29ec1b789a416e65e838d1eabfdf66423e17f3bf2
 MISC metadata.xml 858 BLAKE2B 2fc69cd4f58f8764d9d43c0b89be8765fe6d8bdab1dc8c0de634899d6ae22702ae1d7cac1b9cd69999fc297dcaa7a7386872cabb63f905558a20f736b500ad5b SHA512 cb46245a5f02ad762cb86bb18ca13fee1e9df22c6e1e367c16c9392680722d4852834c6d4d259d7ca71d817ecac22bda120da75513d6f17d243fd8db062f4303
diff --git a/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild b/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
index 85f19d540d72..5ad1133fd205 100644
--- a/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libassuan/libassuan-2.5.1.ebuild b/dev-libs/libassuan/libassuan-2.5.1.ebuild
index aa43cb719793..0fc8f725b42f 100644
--- a/dev-libs/libassuan/libassuan-2.5.1.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libassuan/libassuan-2.5.3.ebuild b/dev-libs/libassuan/libassuan-2.5.3.ebuild
index 8aa761372375..aaf0c72680b1 100644
--- a/dev-libs/libassuan/libassuan-2.5.3.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index 010db2e22fa7..9ad3418d8880 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,7 +1,7 @@
 DIST libatomic_ops-7.6.10.tar.gz 503734 BLAKE2B 5ee4adc3b2e9afe22d52a4b390927f79dfce139e9975c75aedd379fcbb34a1f0de82ca98ddc58a386e193080ba75eb1b6161bea75b62b8f3b4941979248290af SHA512 4661445503ef4303e873559af319ad799a7eddad3df45ad602cf338c594a642ad4333a36fa91722f0d8c48acd38bbf45c60a468c7375d14824520a83c1109ec9
 DIST libatomic_ops-7.6.6.tar.gz 498187 BLAKE2B 343ebda3a37aef6541efae9e646778cf8b1ea74e722979de4336d6819007f3fb37121d53c7e789f69fe6411c05ca2557a18d10db47c68e95e59c92c991bf9fa7 SHA512 ea6e4e2f8f369f5af18435a6ab8ee18c28832c367d24875cccc5e743761109036894260b4296feec5e269a74934df24a90f0fc4868937e1f36605fca082fbde8
 DIST libatomic_ops-7.6.8.tar.gz 503550 BLAKE2B ce8e8757cd20fc5d8e5b62fae0a619f3866e496f552e04c1cca6c63a6d954bf256927fe1fe62192cb24b9f7a9fd1727e108098b09d0f22e0987983ccce035274 SHA512 bc448fadcf8e2936fa933a5872d5550ecdff04b0df27120d3182dcbb2147a6594ec6bfc5b214e21b37ffa1b5100c1c56d301ba9cae7df26cee5e6b999dcda14c
-EBUILD libatomic_ops-7.6.10.ebuild 801 BLAKE2B 4a83b32d9dc47fb9155eefca6bd4ee69116d1f3b63ca94c464985a1250ff52d441123e8d303f6998eae69b9b45347f3e92bfe6418f5d421ca29a720d20e41ae8 SHA512 69ff3394abb93f364e3c5ceddedbe08f801de007ae4d9b5cc2a7cd56b66d2d3b7b59d1404f9981f524960b61aaabc3b8d9eb3090531871fee31f3fc7fe698ae2
-EBUILD libatomic_ops-7.6.6.ebuild 731 BLAKE2B 38802fab9bde60ad696c1212d51bee17287b47fb1af0219f8a897a241ab9d3c48e73a3503d4b939b811488f9db8e76df4c349380c32b9e5016539c0680a9ce3b SHA512 02090cb3d33b1cc769d99c42f18953585bd266278d7f946d8a8e93607bd1fe0aa3597300a3d639aef3824be04ca8dc489f0bd47ea2a2ce36ca91f1f9e438e5e5
-EBUILD libatomic_ops-7.6.8.ebuild 812 BLAKE2B 18d5d6e76c0826481f41dfea5cb76d33d7d7f63a33ec902de263bbc4f944af33081b65e9e1ccf19889af7584c0e706c91de98b65dce3ceba5f8a937929a77ebb SHA512 4e07f7536e026736b8cbe844ac0a1d72dd5c711bc8a7fe15627248f8e1cdac08f2bec672ecb33b1fb046c372ac107a4699bae01a84b8369384c4a77b659f6b37
+EBUILD libatomic_ops-7.6.10.ebuild 779 BLAKE2B 78853a828f3c0d25db918cd76226cfa1bd99c5d33113688fe4dda54b623351db854fa410fb842a5d3fed320450aabe2b59bbbcaef13d7b99d9e9bbf0b9cdf7ba SHA512 18e590b0d6b40b63b34c476cbbac2db26ad8c480cb1b0e1b89e3366d7fb1a0133042b3b33ce1fa50f28faebe8effd097a2c2f0f0604d461b767eac960a92b3c4
+EBUILD libatomic_ops-7.6.6.ebuild 709 BLAKE2B ec85b6dc9c77577877a877bd07116dd47719e1bbb5560c26845e8f993b150bb2053ec73dc3387537030a12dccfcf617c011f27704d9399be748d69d8281de9f8 SHA512 2affa96b868a510997a87a04e38ab4f4e6e5433ba3a0ded3d957db5b693d1a205e47f070ff8842e5377bbe7e73d3172ebe9c987a057cfed6487286fa65a92c38
+EBUILD libatomic_ops-7.6.8.ebuild 790 BLAKE2B 5146b319d7389ccb5634e1403999524baa208409d30a40f4f31361a0bdb933c167ba6267f50e0977641f0a67b8e5b75256d303cf2b87542e292eb6e985f2d85d SHA512 77c362db68e21e2d47bf0b8d76fb51016e512a53a4057ceeb43846f4d46720ec8ce2df36b93f39c4c0fd8c55b1c82d2cb4ddf94f4a8bbb29c9e2daa981b29843
 MISC metadata.xml 475 BLAKE2B e8db314b5a92dc7564e61a4f12238f6fb6ac593bb8e50e4899c0bd86eedf542350903aefda7784e406e72b64456e75e4099215767e6897c5f6a558f24b40beb6 SHA512 d7b2e2dcc35f4c402f8305a5cc35579bbf4d2607986810c040282365a230ebd916abd2b9936c1cffd3fd616705b5b6aadeece6170467cc27bbe623af18354dc5
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
index 1ab76d72e78b..f62e32b541db 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
index e52cef0612a4..c27817a93044 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.8.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.8.ebuild
index 331540a7867e..834ea31f0c8a 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.6.8.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libbegemot/Manifest b/dev-libs/libbegemot/Manifest
index d3345d5dc854..fba01bcdb131 100644
--- a/dev-libs/libbegemot/Manifest
+++ b/dev-libs/libbegemot/Manifest
@@ -1,3 +1,3 @@
 DIST libbegemot-1.11.tar.gz 266310 BLAKE2B c76b2b5e6fe6af0b55da779d6a98d52f1f519b717472338ce17bd2fd709bf397b3801782e1be89dbe2ba289ba9fe19c5527f544f1709770f019f2ad745ffbbd1 SHA512 ea5b0b548ad4240aa945ee9376e13a8ec5848bd9675f7fdc57c3daf1e79735e442c44a550430617a1048d5a0cef06adc9b48d45f42cca9f6049e3f3d0571e627
-EBUILD libbegemot-1.11.ebuild 557 BLAKE2B 8ca44cc388adf54a36227790247375308aa0608d13867b72a6034f918ce21dc6b5474562fd13d7e53e88d69e7da7cf453bdca30c6394b4e21a55bf5b833dd925 SHA512 2ba2a2b977c038f5373f998f76b3b19f1b4cbc272b647fe044fa0a6d7cb2c3a112a7a46edbb0c4c9db124d3de5a48aa7db13c342bafdab0ed9156e6da0a507f4
-MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
+EBUILD libbegemot-1.11.ebuild 535 BLAKE2B a46b0905f5133fa0be3c7010fa71509462d664c881b3aa9f1987a7df1a02fe1fc6292119c3f11e0ff91de813af893b04b0c1e3abd93d69b7cecf15835a4c9174 SHA512 1fd9bb617a9cd7e1297bc364d3d644f0737ce46f7a6051b30ed9eef44e4173b308a4a426d61ea4e660d5d1284b33de0f5f82d67ef13f55775e7cf2bd51398748
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libbegemot/libbegemot-1.11.ebuild b/dev-libs/libbegemot/libbegemot-1.11.ebuild
index 804f2f6846af..929296a5a713 100644
--- a/dev-libs/libbegemot/libbegemot-1.11.ebuild
+++ b/dev-libs/libbegemot/libbegemot-1.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://people.freebsd.org/~harti/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-libs/libbegemot/metadata.xml b/dev-libs/libbegemot/metadata.xml
index a00f3aeb1f81..6f49eba8f496 100644
--- a/dev-libs/libbegemot/metadata.xml
+++ b/dev-libs/libbegemot/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="project">
-	<email>bsd@gentoo.org</email>
-	<name>BSD Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 9373acb43b1e..e744dd1a6a11 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1,6 +1,9 @@
 AUX libbpf-0.0.3-paths.patch 1340 BLAKE2B 62ac9803114000b093b6c2a68d396fdc9f9b447ba0a2726d5f5a176368139e5e3c588e2c9482e26e2b27a7d6b850b8a5daebc9e5084758afcf04312235028cca SHA512 8808f00748e4f717562dd763598e864a7ecd2b12c0983bab4e32fd08aae778f29c5f1d173355275c205df1325e3c2327b99e62929ba1daeca6c20b81c9d9b80b
+AUX libbpf-0.0.5-paths.patch 997 BLAKE2B e84f5349131a1ab7f976e60baf74fa030b28214daca198db2a6d6b436bdf536aa89e58f39ab10a2cf9dbbf192a159cd1231b68dc3292396e1164950b1514de3d SHA512 47ccd456abf37cdf7e986633eb5a90c16963e5d99608f0c3dd6b035466a0ffe6769001d2bf448c2da88f6427fdac658f364b960a072949523a964ae01836add0
 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
 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
 MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41
diff --git a/dev-libs/libbpf/files/libbpf-0.0.5-paths.patch b/dev-libs/libbpf/files/libbpf-0.0.5-paths.patch
new file mode 100644
index 000000000000..e9eda9c2dced
--- /dev/null
+++ b/dev-libs/libbpf/files/libbpf-0.0.5-paths.patch
@@ -0,0 +1,38 @@
+diff --git a/Makefile b/Makefile
+index 6992fbf..cefc77a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -64,7 +64,7 @@ endif
+ PREFIX ?= /usr
+ LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
+ INCLUDEDIR ?= $(PREFIX)/include
+-UAPIDIR ?= $(PREFIX)/include
++UAPIDIR ?= $(PREFIX)/include/bpf/uapi
+ 
+ all: $(STATIC_LIBS) $(SHARED_LIBS) $(PC_FILE)
+ 
+@@ -85,6 +85,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS)
+ $(OBJDIR)/libbpf.pc:
+ 	sed -e "s|@PREFIX@|$(PREFIX)|" \
+ 		-e "s|@LIBDIR@|$(LIBDIR)|" \
++		-e "s|@UAPIDIR@|$(UAPIDIR)|" \
+ 		-e "s|@VERSION@|$(LIBBPF_VERSION)|" \
+ 		< libbpf.pc.template > $@
+ 
+diff --git a/libbpf.pc.template b/libbpf.pc.template
+index ac17fce..6d385d9 100644
+--- a/libbpf.pc.template
++++ b/libbpf.pc.template
+@@ -3,10 +3,11 @@
+ prefix=@PREFIX@
+ libdir=@LIBDIR@
+ includedir=${prefix}/include
++uapidir=@UAPIDIR@
+ 
+ Name: libbpf
+ Description: BPF library
+ Version: @VERSION@
+ Libs: -L${libdir} -lbpf
+ Requires.private: libelf
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -I${uapidir}
diff --git a/dev-libs/libbpf/libbpf-0.0.5.ebuild b/dev-libs/libbpf/libbpf-0.0.5.ebuild
new file mode 100644
index 000000000000..7e265723db96
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-0.0.5.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/libcaldav/Manifest b/dev-libs/libcaldav/Manifest
deleted file mode 100644
index e57cfd660b44..000000000000
--- a/dev-libs/libcaldav/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libcaldav-0.6.2.tar.gz 513852 BLAKE2B a8916bec69cd23ad9b7194a55222e7defe8bed7ba005cf3ecde186b843c68089bb0ad34f10d161ad8f3d11fdbfca9fb4e599188cbb65e80e430f2646871b8599 SHA512 a6d9c70f0cb7699644504e88934f7942b0840e81e89304ada50200d778e51e95dca08d0a0748636455295a03535a52559a07f58a15dd5ef1d4520dd3b0fc1aba
-EBUILD libcaldav-0.6.2-r1.ebuild 562 BLAKE2B a5407cffc101400fbad13f22472cfae89f45b36352a0def26977fa7916a73d23a2c4798b606ce9d480cec9a9efda79fccff8b2fb219939082b1702a3121e4f5f SHA512 8ea08cb0c7b6db9adf1357dd038ac1d6a4d61990f46ef870861c5abcf8f0db0171bf333a4ece37642ab6e954267bb5b0fabc3f86b413964d90ac9d065aca3a69
-MISC metadata.xml 246 BLAKE2B 023099f8ff9f7e2013c6a2cf92a1fb7f53e230affe07573b212f09d5a5b42012ef2cc7e91beadd8f29f410e92ff4b3206ea11ffa6737b1a30529692e01c5621d SHA512 021025439c733ffdc43f0714b191e86090b768b1c0913d71019fa8e7973d3dbfb79cd82c66a7e0a6870e7a04a8bf042f6d94a2fe1d48f7d32fb7f96f25aedce2
diff --git a/dev-libs/libcaldav/libcaldav-0.6.2-r1.ebuild b/dev-libs/libcaldav/libcaldav-0.6.2-r1.ebuild
deleted file mode 100644
index 73fa45a436f8..000000000000
--- a/dev-libs/libcaldav/libcaldav-0.6.2-r1.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
-
-DESCRIPTION="C library implementing client support for CalDAV"
-HOMEPAGE="http://libcaldav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libcaldav/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-libs/glib
-	net-misc/curl[ssl,gnutls(+),curl_ssl_gnutls(+)]
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-"
-
-src_configure() {
-	econf $(use_enable doc)
-}
diff --git a/dev-libs/libcaldav/metadata.xml b/dev-libs/libcaldav/metadata.xml
deleted file mode 100644
index f12388eb0998..000000000000
--- a/dev-libs/libcaldav/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">libcaldav</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index 839107ae4422..b5d0ae80dfd6 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -2,7 +2,7 @@ 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 1881 BLAKE2B 3972d7584139843181874247aaaa6822f68399eec7eac9a838c4cfc5d758252f51e448efad8973cf55fbfebf1436c5b2b60aa8745e7589504a8651031921999d SHA512 6ddc7284a0cb7583237cab0cdfa406c62d36484d4daa68542b6736e6895a01fc356162afe9991a7ceae148c23673ab0e0a9fbc23f52ba02aa5e99f2c618b8f5f
-EBUILD libcdio-paranoia-0.94_p2-r2.ebuild 2112 BLAKE2B ed01b795dd9bdce94ba6fdd1005be383b72948b0edfa21a6b89fb93c3f76ad87550e7ba7933950e00a9c2c2daa840c24a5f9e39bcc55ce9f8abc840166035d4e SHA512 275b23a95e1328e24d87ac4bfcc66547b0bcc5d0348b64f3bed9d7af916d2092ee63d7239549fbab1f0e428c01948c0eb1f3de0140e78457fced65f562fdec25
-EBUILD libcdio-paranoia-2.0.0-r1.ebuild 1872 BLAKE2B 8238f4f7fbd1558c01f268eeb177d4b15a2a3e956315f48e1a5f4c18f89ba0c5cf7a46ad242f928da5df41f3c1f7f223b24ab1651c1d01c0b96d4aab3f1b5052 SHA512 f98deabc1b5b20b2e08da0f7e482568bcc320424fcbcf190be91a53bcb6e47b673c699b476fc347918506eb083a9bdae5e4241d444563988b64620032ce86a47
+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
 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 7a6329bc3416..3f740f79869e 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
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
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 6bebe13929d4..26538d0a0fc3 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
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
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 792b56cbaeb6..222ea87fb769 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
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
 # 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 1e0fabac8443..9c5aa11b4d7b 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 1757 BLAKE2B 1149aead21159668e3f89c703b67e0e21520d75e01c61db4e7ee2c161dd50821de024cd75337583c2d8038baed1eeea267f18a9379b437be9ebf8c6d3f0198a1 SHA512 1f952e8cb5a7490d67a7ac20e4c2eb0e35fb981fd523223548f33d77a5d2185766973933e864342c87baa2c1f29755229f5b643955c0527f3c958425e6244704
-EBUILD libcdio-0.94-r1.ebuild 1766 BLAKE2B a04ab2d78db793aff7738da80db945b159e367c47ddd88b3d1bcd3d8ef108d79074952d58f90a737589a246b55d03c8c57b1d77a2f9b25cbacdbdb7c9e460411 SHA512 0baafcfb707d39df24a23da80356415aa450637c0a70751c08ce7ce1eae2180bbd39e6cfe58c28359cee86c0ed54fa132f0a84efaafbe8130696b5aff5494bf3
-EBUILD libcdio-1.1.0.ebuild 1790 BLAKE2B 1a0ddc06dff2c7a3f42f07f6877b0a76fd4ee4e6c32297c7d606afee07a3e78bdd77886c4ff07a783fadbcbc805427cff41d47211195b353212b6f3f0341dff9 SHA512 20f6efba15c4b0b9b86b54bd720e69cc25a9e87e54963f6c431b25634fd1624ea5277797fa5a2080341b55fea6de4cd0fc15c3e412e1ac70e1f6b8adf7af8456
-EBUILD libcdio-2.0.0-r1.ebuild 1838 BLAKE2B 7c0f3100156395d729a2e0f045c1c5d2d49509257c94c640b9ab2db3f887445548229d83552bf814f1a94eed4828dca959670e0a2e5125dcce859277dd5eecc0 SHA512 c4a412398d1c8c604e8b1a74a2baf6caf3146f9279d7d361338a4b342793afcd4a999a6b1840663db76f6591f4928178a2f51821f31435c6b8ecb288d762bbca
-EBUILD libcdio-2.0.0.ebuild 1789 BLAKE2B bd3747ef0f97375640f5a81ab756492564687a97292d74c75946b4f08ef22ab1e1f590f9db7d89ef4a98f4c4ca49afa1a306a1919da593b33f3e97ad0bd17037 SHA512 20bee0c8ef079f8597b7aa9a1b8dab14e5ca03423e5990fe89abbd7a9e0dd09d6d377e72158031df890ce9361e8067337e82db74d6459be1d7d9b1be86cdc611
-EBUILD libcdio-2.1.0-r1.ebuild 1813 BLAKE2B 43fad079a3b9333476792574d8e2601b4bbefbcfcd95c1435c6475ed2f160f446c643b6cf195e20c197c4e7f30136e7072120e72bc0334f4a435a96b276f3763 SHA512 ca14a8ae9b56b75b1ac37bca9f424745f367c93456be81353dace481158b7abd59a8f509bc29b37c225158a4d723f64303f6cdd8e3a15dc627089db187ed3025
+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
 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 cf8534c77501..d4ca932e64b7 100644
--- a/dev-libs/libcdio/libcdio-0.93.ebuild
+++ b/dev-libs/libcdio/libcdio-0.93.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/libcdio/libcdio-0.94-r1.ebuild b/dev-libs/libcdio/libcdio-0.94-r1.ebuild
index 1a21ff3a2f48..bb80335dbe05 100644
--- a/dev-libs/libcdio/libcdio-0.94-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-0.94-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/libcdio/libcdio-1.1.0.ebuild b/dev-libs/libcdio/libcdio-1.1.0.ebuild
index e41ff7858131..64bdaa9ca8be 100644
--- a/dev-libs/libcdio/libcdio-1.1.0.ebuild
+++ b/dev-libs/libcdio/libcdio-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
index 3e15b8530167..f0ba01979e37 100644
--- a/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/libcdio/libcdio-2.0.0.ebuild b/dev-libs/libcdio/libcdio-2.0.0.ebuild
index 8c41fd9ef9d5..609c35aafe0b 100644
--- a/dev-libs/libcdio/libcdio-2.0.0.ebuild
+++ b/dev-libs/libcdio/libcdio-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
index 725027fbcdab..6262baefae5c 100644
--- a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/libcgroup/Manifest b/dev-libs/libcgroup/Manifest
index f80c5134697d..5483568e62d9 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 2424 BLAKE2B 3c6c60afca6aa1e70ea5f19cb2b3622fee78859ede6b9e5d7d515b4689524acb503f56bff562db03289926c2b5ec8e60734722c36c25a0de6fd1c20d81640caf SHA512 8a30f0acc708652af2e772d6869f80e03e5f71fd7920b65c89846f4520ff77493ee6459eed50ae23d1cfbbcd9953ee7fd1ef0c48d65846d1dbededbba3d7fee7
-EBUILD libcgroup-0.41-r6.ebuild 2664 BLAKE2B 16da1e437cd2ed2000e062f2d5f13b73b80b9aef961938b9f237718de2f23406562b42a34d4ba997343aaf113b7264114ef7d424fa95789d38b1c43a95dac50f SHA512 576bc5ba764eeda2f0ab063a68d7514492755e8b5ebb2bfbe4f0afac98952df66cba2d6cf65e102f9e16c61efc5ca0781d7d647a3480f207ef894680d72e06ae
+EBUILD libcgroup-0.41-r5.ebuild 2425 BLAKE2B 3fe187eef944fd9057b36b2b64ffdfa96dc5c16d4629e4b82bc5299868628e1af47262e79ce26a01b5cab95392b6ea979712b6012a1cd06be7db36b4081ec18d SHA512 019dfa34d9e63aa0a643d3b8cdac459e88626ef884d75497c5cd45b675a3da29800b337060624d3d8750bd6f7b98f2ec6939f0b53c843e4d91280caabe859d72
+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 1acdb65f88b8..a144fee7f9f2 100644
--- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
+++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="+daemon elibc_musl pam static-libs test +tools"
 
-RDEPEND="pam? ( virtual/pam )"
+RDEPEND="pam? ( sys-libs/pam )"
 
 DEPEND="
 	${RDEPEND}
diff --git a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild
index f0164a2fa06c..5aaf74bec12e 100644
--- a/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild
+++ b/dev-libs/libcgroup/libcgroup-0.41-r6.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 	sys-devel/flex
 	elibc_musl? ( sys-libs/fts-standalone )
 "
-DEPEND="pam? ( virtual/pam )"
+DEPEND="pam? ( sys-libs/pam )"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
diff --git a/dev-libs/libcli/Manifest b/dev-libs/libcli/Manifest
deleted file mode 100644
index 3a5ebb4d9cf3..000000000000
--- a/dev-libs/libcli/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX libcli-1.9.4-ldflags.patch 298 BLAKE2B 8449418a864518df9a254a058e3ae50b773b5fd7f3de52181ee2ae0ce7ae4583b982140655efe6991facac731dbeb92ff1b57433e84b01c656efcefccb97a618 SHA512 d93b6197a6b6d5a0f0efc80ab9fbd8f1ca5749008290daa66bb9f725eaa9cf5c9dc1e5ba76cb3b067c6bf36f26842ea2140c2cb7819f5b84e60155b2953f2936
-AUX libcli-1.9.7-libdir.patch 814 BLAKE2B 587c571b61da391899a41c27e6805936f69f5e50d9220cade7f05bd4e565199424efcd5c5c7bac1ffe5b020281aa6d566bd7da510f59dbb12f4b9e59429809ba SHA512 2056600d5560196119bc690fc5c02151e7376608408c5b7205eadf7e69f4138758738c34203b93b2ceaa938de58d1b81e9050d259245e9e739ae3bc385a9a2a6
-AUX libcli-1.9.8.4-libdir.patch 1047 BLAKE2B a3f7e91d91c723946139ddcaf8225b7f209125c6184df32a099dd54a43915d3206b3c8b7d64f9a225796307d1d9ca67c7e1d3de268a79d4c70cb4834b9bf26de SHA512 75218aab7d67233775f31d3436519f3cdfddc26f65ef83cb5cc5f9dcd0e66269747302e3765595e2469f900aa9572f1850077f3ade6efb89a442c30b4c1d7d85
-DIST libcli-1.9.7.tar.gz 29557 BLAKE2B a53a8db720fd4ecc047ac6ca111cc8ba1d05067af4dc56b640a0bafd30e6d6b4ccfdbf79b251f1eb6927c7d81675de492a52280ccfab0b48854173650acaacfe SHA512 b2dacfd40bc068ddcc0dc3d60576ef2f7d7e2af80b93c6e7ae899d654afca6f0f8d2df2b33c9c8e760bdbea9aa2eaf757029d46032dcf307341f78f1a8f4f66f
-DIST libcli-1.9.8.4.tar.gz 29618 BLAKE2B cb901f5cd852449f3223f9b048fb483d2d4f5052dc29cb18714d7f5631be96b5ad99c61e09da778b4559760c5497bdaa61e9d68f75bb25e6c4c4475bdc4899e8 SHA512 731156f75b777be209d10db74e786af868c5e82ddfb7f882a07c1f385bae554a02897a53b4d5684e9f941b4ea72d465e3e8b32dda3cdf377ae728e4ac6eb5afb
-EBUILD libcli-1.9.7.ebuild 761 BLAKE2B ae7b7943999cd44183fdfc846592aadb8a32aa08bb698f255445288ae56f68c9dc378c069145c5e506aacf2b913f7b3b98b04aa4f9287500189200f6e0a4e41e SHA512 f29e833b83a79a909d0a3714f73200420ca7a2df20ce694bea7170c724dc8f38e6acf2fbed7702c0a009c076bff2972c0f7c8666bbc697aeef3a405977681d86
-EBUILD libcli-1.9.8.4.ebuild 893 BLAKE2B 08c5ceafd42af6217b592632d96709bebfbb798050c1df3b2855fc15e154a869e087116c2d3ecb9deaa851a3d8f551e124736e6eb15d4e5edb5c1b3b1501281f SHA512 52ee7085e7f0eb50d78fda1fee2261bddc9d1ffa76905c110378203ec803bd538d82ec456ab7d4345a00e0b371856a5b56a71d4e16db93d35c245c7364cd731b
-MISC metadata.xml 538 BLAKE2B a8407bbf3dcbe24ea08f1d590a0929caec1de6463afabb68c6cf96a75b72a54605ad390c79cd6ad2508cc9a7f9de9e2920ec760dc7757249dd9240235239a722 SHA512 e96312c4c077df84c2f183b1e833cb53aa6134be66d1f0dc7a6c9ca495f354c5da7e28a1f4524670bb9f11e7d3ae093463ae6177837c7791b13e5f3c3d23130c
diff --git a/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch b/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch
deleted file mode 100644
index 4b78c0ddb287..000000000000
--- a/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -28,7 +28,7 @@
- libcli.o: libcli.h
- 
- clitest: clitest.o $(LIB)
--	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< -L. -lcli
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< -L. -lcli
- 
- clitest.exe: clitest.c libcli.o
- 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< libcli.o -lws2_32
diff --git a/dev-libs/libcli/files/libcli-1.9.7-libdir.patch b/dev-libs/libcli/files/libcli-1.9.7-libdir.patch
deleted file mode 100644
index 99f817095adc..000000000000
--- a/dev-libs/libcli/files/libcli-1.9.7-libdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- libcli-1.9.7/Makefile
-+++ libcli-1.9.7/Makefile
-@@ -1,6 +1,7 @@
- UNAME = $(shell sh -c 'uname -s 2>/dev/null || echo not')
- DESTDIR =
- PREFIX = /usr/local
-+libdir = $(PREFIX)/lib
- 
- MAJOR = 1
- MINOR = 9
-@@ -50,10 +51,10 @@
- 	rm -f *.o $(LIB)* $(LIB_STATIC) clitest
- 
- install: $(LIB)
--	install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib
-+	install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(libdir)
- 	install -m 0644 libcli.h $(DESTDIR)$(PREFIX)/include
--	install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(PREFIX)/lib
--	cd $(DESTDIR)$(PREFIX)/lib && \
-+	install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(libdir)
-+	cd $(DESTDIR)$(libdir) && \
- 	    ln -fs $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR).$(MINOR) && \
- 	    ln -fs $(LIB).$(MAJOR).$(MINOR) $(LIB)
- 
diff --git a/dev-libs/libcli/files/libcli-1.9.8.4-libdir.patch b/dev-libs/libcli/files/libcli-1.9.8.4-libdir.patch
deleted file mode 100644
index 31c5024cb7bf..000000000000
--- a/dev-libs/libcli/files/libcli-1.9.8.4-libdir.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- libcli-1.9.8-4/Makefile
-+++ libcli-1.9.8-4/Makefile
-@@ -8,6 +8,7 @@
- UNAME = $(shell sh -c 'uname -s 2>/dev/null || echo not')
- DESTDIR =
- PREFIX = /usr/local
-+libdir = $(PREFIX)/lib
- 
- MAJOR = 1
- MINOR = 9
-@@ -64,14 +65,14 @@
- 	rm -f *.o $(LIB)* $(LIB_STATIC) clitest libcli-$(MAJOR).$(MINOR).$(REVISION).tar.gz
- 
- install: $(TARGET_LIBS)
--	install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib
-+	install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(libdir)
- 	install -m 0644 libcli.h $(DESTDIR)$(PREFIX)/include
-   ifeq (1,$(STATIC_LIB))
--	install -m 0644 $(LIB_STATIC) $(DESTDIR)$(PREFIX)/lib
-+	install -m 0644 $(LIB_STATIC) $(DESTDIR)$(libdir)
-   endif
-   ifeq (1,$(DYNAMIC_LIB))
--	install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(PREFIX)/lib
--	cd $(DESTDIR)$(PREFIX)/lib && \
-+	install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(libdir)
-+	cd $(DESTDIR)$(libdir) && \
- 	    ln -fs $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR).$(MINOR) && \
- 	    ln -fs $(LIB).$(MAJOR).$(MINOR) $(LIB)
-   endif
diff --git a/dev-libs/libcli/libcli-1.9.7.ebuild b/dev-libs/libcli/libcli-1.9.7.ebuild
deleted file mode 100644
index 36ea4dee1e22..000000000000
--- a/dev-libs/libcli/libcli-1.9.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Cisco-style (telnet) command-line interface library"
-
-HOMEPAGE="http://sites.dparrish.com/libcli"
-SRC_URI="https://github.com/dparrish/libcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.9.7-libdir.patch" \
-		"${FILESDIR}/${PN}-1.9.4-ldflags.patch"
-}
-
-src_compile() {
-	emake OPTIM="" DEBUG="" \
-		CC="$(tc-getCC)" AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX="/usr" \
-		libdir="/usr/$(get_libdir)" install
-
-	dobin clitest
-	dodoc README
-}
diff --git a/dev-libs/libcli/libcli-1.9.8.4.ebuild b/dev-libs/libcli/libcli-1.9.8.4.ebuild
deleted file mode 100644
index dd838091cecd..000000000000
--- a/dev-libs/libcli/libcli-1.9.8.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-MY_PV="$(ver_rs 3 -)"
-
-DESCRIPTION="Cisco-style (telnet) command-line interface library"
-
-HOMEPAGE="https://github.com/dparrish/libcli"
-SRC_URI="https://github.com/dparrish/libcli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.9.4-ldflags.patch"
-	"${FILESDIR}/${PN}-1.9.8.4-libdir.patch"
-)
-
-src_compile() {
-	emake OPTIM="" DEBUG="" \
-		CC="$(tc-getCC)" AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX="/usr" \
-		libdir="/usr/$(get_libdir)" install
-
-	dobin clitest
-	dodoc README
-
-	if ! use static-libs ; then
-		find "${ED}" -type f -name "*.a" -delete || die
-	fi
-}
diff --git a/dev-libs/libcli/metadata.xml b/dev-libs/libcli/metadata.xml
deleted file mode 100644
index a31d2d70c48a..000000000000
--- a/dev-libs/libcli/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">libcli provides a shared library for including a Cisco-like command-line
-		interface into other software. It's a telnet interface which supports
-		command-line editing, history, authentication and callbacks for a
-		user-definable function tree.</longdescription>
-	<upstream>
-		<remote-id type="github">dparrish/libcli</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index 61c1f569e3fd..a2c13cf1072f 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 1442 BLAKE2B 9f5c7428459553d93c099cb6ed0c1f6b3e0fe0bdeafec490f0e709f08f50045761748639b4b9df2e58fd4ad78e8bf2e30152b5654b2cc277d3467639b4f556ec SHA512 c25781b12bcc99c38e4a55e4dc03b8c27171e60b84c8095313c3b705446e2c02cdabc0d7206bf0aa459296dfc687f3c7b573513a4cbde71b5f9df088c8cd4846
-EBUILD libcroco-0.6.13.ebuild 1345 BLAKE2B 02f486419276fe16673640a4b602245a7c0562dfbba2d34e2857caf78236e56a608eef2968895452ce2972e047a8b075788d7d4233cf316d53b2c67e4bede9cf SHA512 c8c61d4b840d904b68d472d3bf7cd4843559ca88637cad44c0bc4185ece192fed5b5705f6f6d45e165b71540f0516a9e69a1cafa9103bcc38089b951138a96a1
+EBUILD libcroco-0.6.12-r1.ebuild 1420 BLAKE2B 0211d270622b90385551afe44769051c76064950d05fe5be82f5674d6242ac889cbe050e9bd218f57a7cdf1f8c51f51950a60cc2f5404a8b24dae4c7d1183896 SHA512 712d9d024aa698794fba84e4259ecbf3296888a0b5fc58514ef6c0c3a4aa21ea5b6089254a837703d9afbeef3f404e272e440e35e72a585e197955c97f427cb8
+EBUILD libcroco-0.6.13.ebuild 1323 BLAKE2B 2a6f69b3ba679701dc8559c6e3f11a5aa00d53acfa9525223c19ad468e306833d215125835eb9c19c5e7a50fd14e13f2e2cacc41c7fa4f9919f92b64708ace2f SHA512 60e88d84b310364545ec4da9815614bdeca585127670028d3e70f4ed2d33e89ca996cf3e5dae89a4c5cb33f8889d564d7bab20b8c696d25755c0fb874377e93e
 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 cd38c8bb5ee2..9356a6e7fbda 100644
--- a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
 
 RDEPEND="
diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild
index 65319613bb3b..59611f6382dc 100644
--- a/dev-libs/libcroco/libcroco-0.6.13.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
 
 RDEPEND="
diff --git a/dev-libs/libcxml/Manifest b/dev-libs/libcxml/Manifest
deleted file mode 100644
index 29e0074896d6..000000000000
--- a/dev-libs/libcxml/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libcxml-0.15.5-respect-cxxflags.patch 444 BLAKE2B d09005bc9687c6633d8a3ab0dfd0d0a06304317225c300b6936d89e178413b4b4a560b409baf6f2cf45a64d09330e9434d3073c40897557e5534a8cefb2ce28c SHA512 23b8d1078eb397e03cd9c251ee859e799840c07d73c96cef122aa5031d381fcb82d33b79779720d0d2ac26bf2a7dbc82167752bf15472d010ddfe12d129342ea
-DIST libcxml-0.15.5.tar.bz2 137328 BLAKE2B db8e8f1edfe6d03a1f60f9f62c1c3b33e9c092d0031aed4369b7c0075eb16432d8244a2098e75be6845905451a61e379829a80183acdcf9acf33372c354042ea SHA512 9ecb333bbd3c99c388bb08b28e6cf2cae97e5a5a6df29634f041e2718a5d995dabfd73686fe1494eac9d45198dbb1530fa8d5502a8ed3ca8010db087712cb87d
-EBUILD libcxml-0.15.5.ebuild 793 BLAKE2B d2e4c47c977f2623e046e29f67efe27dfffe0171ab3b19ac97f121174259b1f739545bba855065cb25e7c48f0ccdace6d48900a6b1f4a25ae3ab7f24a8b1b5fb SHA512 739cb8302c399241ad81bb7cc683d12c85ff75bc2be76b9ba8a5d7e6c22dff9af14d3763e505a7a0eb9f8aa5f85ae89a78627ce172700ca0d148a1ae8ff2ecfc
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libcxml/files/libcxml-0.15.5-respect-cxxflags.patch b/dev-libs/libcxml/files/libcxml-0.15.5-respect-cxxflags.patch
deleted file mode 100644
index f250229c4f51..000000000000
--- a/dev-libs/libcxml/files/libcxml-0.15.5-respect-cxxflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libcxml-0.15.5/wscript
-+++ libcxml-0.15.5/wscript
-@@ -36,7 +36,7 @@
-     conf.load('compiler_cxx')
-     if conf.options.enable_debug:
-         conf.env.append_value('CXXFLAGS', '-g')
--    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-O2'])
-+    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra'])
-     if conf.options.force_cpp11:
-         conf.env.append_value('CXXFLAGS', ['-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS'])
- 
diff --git a/dev-libs/libcxml/libcxml-0.15.5.ebuild b/dev-libs/libcxml/libcxml-0.15.5.ebuild
deleted file mode 100644
index bf7836c220cd..000000000000
--- a/dev-libs/libcxml/libcxml-0.15.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="small C++ library which makes it marginally neater to parse XML using libxml++"
-HOMEPAGE="https://carlh.net/libcxml"
-SRC_URI="https://carlh.net/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-cpp/libxmlpp:2.6
-	dev-libs/boost
-	dev-libs/locked_sstream"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/waf
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.15.5-respect-cxxflags.patch )
-
-src_prepare() {
-	rm -v waf || die
-	export WAF_BINARY="${EROOT}usr/bin/waf"
-
-	default
-}
-
-src_test() {
-	./run-tests.sh || die
-}
diff --git a/dev-libs/libcxml/metadata.xml b/dev-libs/libcxml/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-libs/libcxml/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index d0303ea91070..0bd26d5c060b 100644
--- a/dev-libs/libdaemon/Manifest
+++ b/dev-libs/libdaemon/Manifest
@@ -1,6 +1,6 @@
 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 1199 BLAKE2B 5dfa0749f2f582edc5003f4c1d9bf4f00d4100ad62d5ff058ea4a996d5e6f23d5f4bd74e18be8b9afebf23bdd45a825c2de0b488652b047c38bbf0c81763e806 SHA512 a4f0679b5702353f0dc05cc959dbe1cacba004093a69430fa71a85e2d0be0a80c07603d3e62152ebc203e8dc0fca412b764614cf9ccabb291e0fbcbd3d0d2070
-EBUILD libdaemon-0.14-r2.ebuild 1446 BLAKE2B 4e43ad8358555b319685431f1f7f3b2598116060cfe0d3dac1f923f06bcfcd84438036dd17fb2e174df5ff8397332ce557d81541b8fe7455cfa2ab1abe3027e1 SHA512 dffc3b0c3bedd18a109b5831009aaa309023645d4b419cf9f3d718cfc6629b2e0de5c738b681a093a3f7207b8076d88abbca880a002c2e7c5e8f1256446ff892
-EBUILD libdaemon-0.14-r3.ebuild 1391 BLAKE2B 47f8159b2a4aa36b67eb2caf540d4635c2f1ab983032a8b7bd6c18e06316a1ce7bb6d6a119f18e6a5a67c0fdb59645590fb346ff4aa1722c83627f15b49c0c14 SHA512 60fea99760cc407023466ba3da6fd2b51e549c710fa59d6d1ce5960a4f4072a13f464581381fcdc800764021b65f4c4bc17f7acb2beace5d01374115a30a148a
+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
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild
index 220ed1033ba8..62f84c239a81 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r1.ebuild
@@ -11,7 +11,7 @@ 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild
index 6de3cea08773..5b3e995289ac 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r2.ebuild
@@ -11,7 +11,7 @@ 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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
index 370c1aae2cf0..37f673cd1618 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index a5800730c5d2..df043f92a74b 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,6 +1,6 @@
 DIST libdnet-1.12.ipv6-1.patch.gz 5124 BLAKE2B 674866a441a5907df97942772b1e4b95aee004ddb110204df0580cec6b6bb3ba4074831d83e675e1914f1a29281b02227e95016db6ce6a0e8b99417d1aa6aaab SHA512 fa2380e41548ecdd978722930ecf90dffabd15cf06cbae0e113285072fe98a066f1e686b6d79e2d8b9f8adcf29783f313d61933b9e1e74e71da8dc7d741f815a
 DIST libdnet-1.12.tar.gz 959945 BLAKE2B a19f8c83425861d02f832330cf0eb5bc317eec157737e0eacd48a7827d423c626b24ce833f66429c9f2a0018502cae5426d5cfc1019aed307d63e4fa6b3845c8 SHA512 a2410a98b76d4bccecf7bcb82ff0b6e9fb809b389f7fea938cc42d94e18622cc5f353d2de737121a1990d9e16e9db8cc2f82677c94f78cd03c9227e815eab9e0
 DIST libdnet-1.12.tgz 970125 BLAKE2B 74be00b6fe1c7848010a7044628a6ad8f4b2f2c4f9676066c15e02c7a8b613e26a5e7743df524869fee2eb7d93438bf346f772b8df199b8ec337279dd50d5d77 SHA512 b763d2caa77b8d16b531142a5bce3b862ed20198406a00e1fe7f3b45ce308b97d638b0c7f03bd8593fdd206cc1645952839bc340b77537298a3df88599835bf3
-EBUILD libdnet-1.12-r1.ebuild 1539 BLAKE2B 5806f39ca49c9d3bd74613029a8a42e1578ddbcddd8385e0bca7f856294f124e92f1d123dc03a5bc3cc6b1caf8a24fe404bc00d7ddd6de5ab8a7dc24f3b383c6 SHA512 200ba566dbd1b6579d4cee3ba1cbdeae423e39dd2efe8b8730a9fc32101359151ea7f71acfaf892e04e1aecfe92a6d560023497dc6cfa7bd4515649387e909ed
-EBUILD libdnet-1.12.ebuild 1523 BLAKE2B 9f05030b1d32ca80bffd7a4eefeb9d55ffefe9ac2bde8bec41782c1a0a96fe2fe4cd164c94ef184c591fc998dabff1a091235d9584e23dfdb41c94a44e9b7942 SHA512 0128a0f669d3ce291b65e71b725b8f8e66934df2bd0036d96fd288a03047344921e038204cb44a6db781bc07c28e38a84c785efdd84b255dd68ca607e7b8ab10
+EBUILD libdnet-1.12-r1.ebuild 1529 BLAKE2B 9e27c23bc928cd8937e17b212df10bbe3c7371cb018937b44b0e82baaa3654ed1abc242a2fb42fddace2ceaeb8b7336b05a0396f8b3657869af229674514094f SHA512 4defa994ba07f5a41285acb108866c3dd177fb9797bff154bc7311498da33a6737a67c608390c7e79aca5f43b87ad1503ea7b7ad10c5b9e0bd7b6478c8f64712
+EBUILD libdnet-1.12.ebuild 1513 BLAKE2B b362095dea9072d48a29025cd1c6d2b171d66ed0f3e0ce7c13f0e1817f25d7467320fa8f2224f792cf8a9b759e83baf099392ab641c16d08c11f98c33fa27822 SHA512 42aba60863524c059164079a31a6edd8e2942d23a15be57c7e04935480d8fddafd3aea866b3f4017d22607bb8fa4a082ffa97d1af82c44162164217965c0aea2
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/libdnet-1.12-r1.ebuild b/dev-libs/libdnet/libdnet-1.12-r1.ebuild
index 37fb38166b21..1e9db55a13e9 100644
--- a/dev-libs/libdnet/libdnet-1.12-r1.ebuild
+++ b/dev-libs/libdnet/libdnet-1.12-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 LICENSE="LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ipv6 python static-libs test"
 
 DEPEND="
diff --git a/dev-libs/libdnet/libdnet-1.12.ebuild b/dev-libs/libdnet/libdnet-1.12.ebuild
index d1269f770acb..804cc7277e59 100644
--- a/dev-libs/libdnet/libdnet-1.12.ebuild
+++ b/dev-libs/libdnet/libdnet-1.12.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://libdnet.googlecode.com/files/${P}.tgz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="ipv6 python static-libs test"
 
 #DEPEND="test? ( dev-libs/check )"
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index fa3b4c05cb2a..2950afd678ec 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -1,3 +1,3 @@
 DIST libebml-1.3.9.tar.xz 69836 BLAKE2B d37bf9d74cb21a0c4cea3550bbd25f081e48085ba8d97d2f133e3f5da292527f0f31fc5aa3978c21f82262698877a76670b4b120e915573d339751234c4450c7 SHA512 a388fa8ff7acf9a0fb33faf9c00fc07f53794d86a4f894e04e2a690a24e781a7f380a0896e607e801a6f1f0b215407ee09a801e96d4b3e15f39ca71ec3a6d64e
-EBUILD libebml-1.3.9.ebuild 626 BLAKE2B 0db7111ce2784fdfea85a88e1c473a7f57947971c6ff14f0206dc01368ea17bee8af87f71f9ad009d70531e5e99d28a940d6c2048e6ef9b476a8053bb2872610 SHA512 b2dfc67e8d5728a1418faf7013169759efc25410611f04db632e499385eb88256f50a19e231e590167d6f0121928d1982579c85c6d1611a46749e8d5ac0dcb01
+EBUILD libebml-1.3.9.ebuild 604 BLAKE2B 450b828a4410444fe20a1ce56ae3bfeeca85572b1f83bd69e67757770df25f6fb890cc4eb47d0fb777227264af599e2b24a197923ec9f0e33a95840c10bd4d10 SHA512 50032a2a3fef703d529440764efba4ea99c73e7d4afaeea3a2a8287966a476cb47a7a6a8a40c6f2a64b180b2d7b6ab790c24da32e1415b39c32c58b4d528af8e
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.3.9.ebuild b/dev-libs/libebml/libebml-1.3.9.ebuild
index c789e2c6750f..95e1aa1e6847 100644
--- a/dev-libs/libebml/libebml-1.3.9.ebuild
+++ b/dev-libs/libebml/libebml-1.3.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 src_configure() {
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index b6dd379a6003..236ef4e49263 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -8,7 +8,7 @@ AUX libedit-ncursesprivate.patch 497 BLAKE2B c333a5d914047fd13faab9a9782c18893ed
 DIST libedit-20130712-3.1.tar.gz 483857 BLAKE2B 9120e9ac2f0d20841fea7d3a41fbfe2c1e79392d3b6dcfcd44517ee61d662427ea6cda312d2ec47ac92d61b9292684b8bbd8f92de0832909fadfb1b0cbbb4f81 SHA512 9fb3173a65ea2cd2ffa9af0666aa3e227b7d6be26f3e84f30ea3449b0c80fc5e91b618e939f7047bf885b96689ede93733f7eba614d4fdd1a4baff3f130b432e
 DIST libedit-20170329-3.1.tar.gz 508504 BLAKE2B 83857f2e56c1f3857e981556c4d5bb90580293a1b9b038bd08beaa2b3954ccee0b30ccdd716cca95d1811841ab8ada010084ec5cd9ab8407e996c713d0991cd8 SHA512 597ed2282240be6dc3c4a7bb8b4ade31fe16ebfeb2229e3aec58643a65882653cc91deb300343d1b1cc588959dbf95698122c4005e47dfb947efa3e6b134bb82
 DIST libedit-20190324-3.1.tar.gz 521999 BLAKE2B c48161626a5cf3140f75ec1df1d9652d961e568a0464a34f9e679f51e1e991a14c9d04a05f0de3815c4a38a9f17789a18e89ebd026450fa1053ef6420c045141 SHA512 240098989e3c5c8c5e28a61036655ad5a57f1c484e1cce2eaf3da157ff238dfb9cd81c766f82efbefa0935b7b5c07328087788cbac007b11dfb558cfaccaedf3
-EBUILD libedit-20130712.3.1.ebuild 1274 BLAKE2B 2666f0eeabf2ab4172797e07ec77c09332bf522d7f72ed088fbe84ea40ea987ee231372402d05a37cbb6d55d037333d85c8f0a57a1dde4167104c53ea9555dd6 SHA512 dfb00fc7b04fa6fd9e9043c6c1a2d32b71be729a883206714f260e6f51824b5d87461659cb9fea7a5d30004f40b29ef206df2a5c0317d7ab4b6d1cafc730ef83
-EBUILD libedit-20170329.3.1.ebuild 1284 BLAKE2B 58565222e997c9b9990f13e88856d7c33a33754e4abca771d6130825d6d17a5c63dd85e1021c58732782f7f34ba5c9645bb5a650902fc941e97bb52055e2cbd6 SHA512 beafdadc0b34da3e4f2df35c5816f4c6235a5f96124d2abc2fd936be46e3264205dc4da9c4680c73f8461588f5acc378e71a1a4c383d08ac650d685ecaa98951
-EBUILD libedit-20190324.3.1.ebuild 1226 BLAKE2B 521904d2aa1db079106fd9de94c3b5e369d0924602a75c3427ee4364257781dbf1b01b999c6de4110c2bf7936a39ff207634e99df4c972d928850d5a6d8e52c9 SHA512 da73748b85062490290c5e0d8f95a6e6d5a7e67bcb728560cb153a542ec9ee5c6c3dd6566ed7e3b17424b20771fa9c1d29c3bc243180b00a5d1828f1b2fc8daa
-MISC metadata.xml 636 BLAKE2B 22880383d39383e11fad886d88db603fe58db1e52f36528f71db2bdec95c74dd50fe7c76bce52f5f3eea47fe61d1dfd0cb7264cfd9458fd8b5db40d38a1adb86 SHA512 c335a652424f91f1ae79f907870bcd826cee21365b594353b3c52fb7fef51f637e9a65275c11f033b6bd7b6d918733904efc320b547999ee5b88a7b36ccb9389
+EBUILD libedit-20130712.3.1.ebuild 1252 BLAKE2B 688dde4eedbe0e0f5219eeafcdc4db6722659b692878606ce23034c69dc90f436e062707146016aa58c5490d1006cbd0f02151332d0d5a73b3b3d33e32954fb2 SHA512 ed3c7e80bad236fdf7912e701dc39cca8460463c45406f8e04791d465077ee222b59c3cb997d03fca72a92f007b5bc29e2a5c852aafda732457edc3162158f11
+EBUILD libedit-20170329.3.1.ebuild 1262 BLAKE2B f4e569da5c67c84b3a02d7a840356e63f63bcb55754fd89c5aa5b2c7d355b4ed7698e62800cbe633372ca1f165a4843e84f9d3ae0816619bfbbec8c44696ba0e SHA512 7d9a1c348f1afcef82fd6e28e233eeb84cfe70329b833bb054b67a491799b2c13aa92d3064461cb1d3008b8d80816e42031d0cd8bf18374721cf8d770a1f90db
+EBUILD libedit-20190324.3.1.ebuild 1204 BLAKE2B 9e9eed65d4ce01048ccb2442c69d949ee6e5a0a9fa913adb98ed487485ce36401b7c9d8d50d0274e89ce9eb482b81fab5707a73154f75267b129c2dccf0f72ca SHA512 c6f7716f5d64eb75d5c5a081e6e6a37035b8cc7e8ef06eb1b9b62815821c0569eb67e079ad65a74dcb23e4feda3d8d874baf33ba98b4c78c93b34e190e4cface
+MISC metadata.xml 641 BLAKE2B 9571b8de7209e3769419ab4286915a24f0efdc432725f0d7157a7625049702db7b05819e542a586583c3df77a3ad34b099c1f00d28855dcf7e117a81f5828e46 SHA512 ad32daf90166761308b53cb1de6fe923e52217f7d3e2359a7c5b8797841de3d4064437b1ffba727acca9085816b615e0c207c268017908ac1557943730539629
diff --git a/dev-libs/libedit/libedit-20130712.3.1.ebuild b/dev-libs/libedit/libedit-20130712.3.1.ebuild
index 03923953f6d9..1427ce62fb01 100644
--- a/dev-libs/libedit/libedit-20130712.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20130712.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://thrysoee.dk/editline/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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="static-libs"
 
 DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/libedit/libedit-20170329.3.1.ebuild b/dev-libs/libedit/libedit-20170329.3.1.ebuild
index bf68b0153f00..bef559eebe8a 100644
--- a/dev-libs/libedit/libedit-20170329.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20170329.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://thrysoee.dk/editline/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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="static-libs"
 
 DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/libedit/libedit-20190324.3.1.ebuild b/dev-libs/libedit/libedit-20190324.3.1.ebuild
index 8ed4cd6e2194..771faf6ae329 100644
--- a/dev-libs/libedit/libedit-20190324.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20190324.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://thrysoee.dk/editline/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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="static-libs"
 
 DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/libedit/metadata.xml b/dev-libs/libedit/metadata.xml
index 21c15532409c..3367f28ee732 100644
--- a/dev-libs/libedit/metadata.xml
+++ b/dev-libs/libedit/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>bsd@gentoo.org</email>
-	<name>BSD Project</name>
+<maintainer type="person">
+	<email>mgorny@gentoo.org</email>
+	<name>Michał Górny</name>
 </maintainer>
 <longdescription>
 GNU Readline is cool, but BSD Readline is cooler :)
diff --git a/dev-libs/libelf/Manifest b/dev-libs/libelf/Manifest
index c6b319fab22a..eae8a14b718d 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 1327 BLAKE2B 1978d279af56ccf9ab2d6cacfe26f3525c0c584f8f4c6034443b814f03ecbcdb1bf8ce627345012b6d3e2f14a01f3fe36a20b107933b3472ff9bb68d4c0f6e8d SHA512 80acd953c93ddf2a4c73d1919219812c6f6644b203681945028c04493584b2d6ca414723e05629a252dec35013c3375dedbf669eb716c393a9a93794152a577c
+EBUILD libelf-0.8.13-r2.ebuild 1302 BLAKE2B 79accc1edde3550dba712a1ba002a39789f1792b24c97088dada3eb874a9ce0bf5a52658b8f72ee62966431b0bd581b53b386d43a4ed30424f253056914852ab SHA512 380c613579387ef1b32b5d111227a8294c25cc7a2ba2b31792ad15adcf31823c88f98a269fdde246dc582d6e7ccdcaf6016608c45236b3b6f4979ca1938cedde
 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 f0832e2e44a8..20f15d7e1782 100644
--- a/dev-libs/libelf/libelf-0.8.13-r2.ebuild
+++ b/dev-libs/libelf/libelf-0.8.13-r2.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="http://www.mr511.de/software/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nls elibc_FreeBSD"
 
 RDEPEND="!dev-libs/elfutils"
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index 28ed6799e161..3050b6eb77fd 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -4,8 +4,8 @@ DIST libev-4.23.tar.gz 524184 BLAKE2B bb8c15665e0ff59322bc2f076f4256ca8f5acff5bc
 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 1098 BLAKE2B ed8a663be761548bf235607134c83f867cac6a090dad8a1a0fd27ae79c7124308cebdb58713631c23fa98eb40515bcf39f6d5d3a7e1393738982787f304ccb31 SHA512 ff3e6e3d8674b5c82f725039cc302e80600df10d4d428e1986720710409b9d26a2212a52a6c79c4ecc5d83bf7ebbabfd3226be377269dcc67dbe63ded9e27209
-EBUILD libev-4.24.ebuild 1115 BLAKE2B 28966f42a644d7817418cdcbd90347df31daf2470aa37934601a4d3b648193530063df7220179052ffab81151018e77031227ae68d01e621543b8ee0b103a1ff SHA512 0ac922c356c641aa6c1b636f9e0aea0a9805ee2869df1d2d441479b23519b9ded961207072513863a0ff7ad581dfc0b9d36438b70404f14a16c3f9516ece4266
-EBUILD libev-4.25.ebuild 1155 BLAKE2B a83b82d1ceacedef2390a70584cfb41dea9231962bed2422d948ea1fa2436e778ec3af2c25c44b3ad81c34b8b5026a5955d32a2994d3f8657fe72c487f6a2eef SHA512 e4b86e636b5cb80a66a5ce28b8183c4cc3ce07f9483f8273c8168a9c7062721502b3277ad142b23c04cb19cbed35c9745f3194e234e707ff3904388a4d6ceb3f
-EBUILD libev-4.27.ebuild 1161 BLAKE2B fb894275aebadd9658367a840e0c04f236655d5e478e69d1e0ad821c505ada62a23fb1aff3dac84b35252d7acfe8b00e60e6d999f8324ca2d5691443bb6b7571 SHA512 bad100e85f4e997b8083f1b69ac4d6459b3d6fa1f1454dcb62acc77b44c0ae9b8c3d429159162c933fc782692e8b49d00b427c880e8a0b4fc3bce2054b5acdff
+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 1132 BLAKE2B cfcce90535e6733771720d7f1ccf2d5341bbf4a03e462f0ec2244e8e1dbd4aab359b5ae4dddb30ae640a02db6df0730aceb378975c85eacb64c480d65c3aec7a SHA512 bfa43a4607d538a999e0b291f3072f7f1c191f4517db3d040d3f57d714217b9d60b15e9568e97b1b4e753ba4bf45059b648446a973dbbbeedffb34344e602feb
+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.23.ebuild b/dev-libs/libev/libev-4.23.ebuild
index f325fb0596a8..b2ec1f04ba41 100644
--- a/dev-libs/libev/libev-4.23.ebuild
+++ b/dev-libs/libev/libev-4.23.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="elibc_glibc static-libs"
 
 # Bug #283558
diff --git a/dev-libs/libev/libev-4.24.ebuild b/dev-libs/libev/libev-4.24.ebuild
index 162849edf9e4..85ef89d675d2 100644
--- a/dev-libs/libev/libev-4.24.ebuild
+++ b/dev-libs/libev/libev-4.24.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dist.schmorp.de/libev/${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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+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
diff --git a/dev-libs/libev/libev-4.25.ebuild b/dev-libs/libev/libev-4.25.ebuild
index b2ac07e21a86..8c1307b5ea95 100644
--- a/dev-libs/libev/libev-4.25.ebuild
+++ b/dev-libs/libev/libev-4.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dist.schmorp.de/libev/${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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+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
diff --git a/dev-libs/libev/libev-4.27.ebuild b/dev-libs/libev/libev-4.27.ebuild
index 1fcb053fd86a..734651116565 100644
--- a/dev-libs/libev/libev-4.27.ebuild
+++ b/dev-libs/libev/libev-4.27.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dist.schmorp.de/libev/${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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+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
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index c49c97a6c7ab..fd7857ab6e02 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 1680 BLAKE2B 1210af2341c69b0894533524421dd680351707fa7285e6e06fcc40ce88da6c1da5364b55329296862f914e30d589afe38be921aae71723410d9fee1ad711cff0 SHA512 f90ae6cae1d90ac481d096f66c69662390086924f00007040f635e9689ab29c27a624ee25d888c54fd48767d5200b99ab5cb8c49059ba97ee9d5d327a1d2166c
-EBUILD libevent-2.1.8.ebuild 1703 BLAKE2B ab36dd6165c91aba3eee97f652f50d20a8bf5f391c01cd568453b31ff24390eab17d10a0669e7f34759e25ea65163e463e95bc320a94ab14df1acbbb89b460b4 SHA512 aadd8949ea76bab2d03f5155456ddf9b7740c408ab818a2efe48959d839ca61a29ca01ac96557af0cddb5a7e3c9810e888eeb5dd4be52e72a189e1d4466aab68
+EBUILD libevent-2.1.11.ebuild 1658 BLAKE2B 254f8add1a9bdef775072433e2d14e5affb753f5232ec950cc45fa09d9ed7f24a74f71e46a10742fc6488bff01b109cb383a6a1ff22f9819c71e70a5e41f44b4 SHA512 ba9205268ddaf9d5ff35009fb6690d589c9625fb76039be0ff782a4a681d9c379c803390eed04923f89f726d508b19c89fde2e52690d9556c8288c7feabb4ee9
+EBUILD libevent-2.1.8.ebuild 1681 BLAKE2B 58875a32ef92c8de91f1bea410793118ee7a0f01ffbee2ffc10f522ec8c29799d6840ec41f8f9a0a3b518cc2f71c0a56ce1ad250c3ca5e24096cd343acfdbcbe SHA512 3a7c7e5c130da1144e7760d3295f094ac7396d16dc6214626852d54b3fee45e2b8eac178ca4d4227a930c4b14b698800e248d71546bad2351860c8e01ae9c48b
 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 aab84dca42b3..e2485b9fa95a 100644
--- a/dev-libs/libevent/libevent-2.1.11.ebuild
+++ b/dev-libs/libevent/libevent-2.1.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 LICENSE="BSD"
 
 SLOT="0/2.1-7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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"
 
 DEPEND="
diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.8.ebuild
index abe87a0df52a..95b9917355c9 100644
--- a/dev-libs/libevent/libevent-2.1.8.ebuild
+++ b/dev-libs/libevent/libevent-2.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}-stable/$
 LICENSE="BSD"
 # libevent-2.1.so.6
 SLOT="0/2.1-6"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
 
 DEPEND="
diff --git a/dev-libs/libexecinfo/Manifest b/dev-libs/libexecinfo/Manifest
index 8136bb7308d9..4e947164b822 100644
--- a/dev-libs/libexecinfo/Manifest
+++ b/dev-libs/libexecinfo/Manifest
@@ -1,4 +1,4 @@
 AUX libexecinfo-1.1-build.patch 479 BLAKE2B e6649b91cf56df3ed21de5a1b5af38c3fd5893fc0b1f4736da22c950ffd24e6aba09184df7ae0603a6093130422e44e56066268670ae70479d145afd0a82b313 SHA512 0eb8fe9ffc9220fb8b97508be39055999a4cb4924c2b1f770abbbdcc435deab689a95656e5de968d6ece89b4a573e7e6c3f73f6e18385467d70ca168338f6f0f
 DIST libexecinfo-1.1.tar.bz2 4841 BLAKE2B c17bf0c0188c951f0cc2b8f902b5aac018cd6f7fa9666de261995605ce6b48c1692320a0f0e03ff0eb9e2b449a03b625ab88eb4a57ba5e87ed33df03838964ac SHA512 51fea7910ef6873061a25c22434ce4da724e9d8e37616a069ad0a58c0463755be4c6c7da88cd747484c2f3373909d7be4678b32a4bd91b6d9e0f74526094e92c
-EBUILD libexecinfo-1.1.ebuild 576 BLAKE2B 5eda841bc94e17e153633bd817db96991596fe8ea3725dae62e4e8b80375cd6fad3a8a57d45d96e29919bdd5782759ab33da87a47c7992a46bbcbd8b7929ef20 SHA512 debd5b10c8f7da3edf71b23670d04f5130f61101faa45c8a8bf129c7c6becc18235d2945e3160a07b18a4ec7583574ee0e1d881d628cc94b2b1da84394ed6c8b
-MISC metadata.xml 502 BLAKE2B 29b984eb295c538ec0f8eee91d0ff3b23f2b311ef89776660b57dfbacacf35976535a2fc016968e76daa0c6fc9ce8e7e1bb078dd235e7e949f3986938096d317 SHA512 8db54c3dfed9ccd03680f8e31f0225e393f74f3be9ddc5ae894c292a95ec84176ebfece151e8266d5963dfa8f62b99db492feb1ed72ebc2199efe420cfe6ef91
+EBUILD libexecinfo-1.1.ebuild 555 BLAKE2B ee617b7cea3b1e06933c135716153f35f93762c42d60a7efbf11b09d35a8404eb52cc898e959c79850b341e45cb1fa8fbeffe9b1ef04e830267b9d0700be5371 SHA512 f8a8345ae9aa72cd4ee734ad4fac6f18159434c3b4d476dc1c8eb27c851e7a8ebd6bf520015fa835a5ea6867d052f1719fbd1560d750f69f754d651ffc94f28e
+MISC metadata.xml 430 BLAKE2B 7b7596e14b6fc876bbcf929fb3ffd3e8c7bc24286813d3ab3b7a69d759e2bffa8c4e4afdf7987df68d17a589ef284fa7ae35d79f688b8cc7cef560548c3162cf SHA512 09b97a52302b21ce78e0d928d00c07691941dca2d81c3f91fb85b53f94ee1f6d032a3cca389b947c17b153dcfba3e246120f9f8afd398ceb7715820a12684614
diff --git a/dev-libs/libexecinfo/libexecinfo-1.1.ebuild b/dev-libs/libexecinfo/libexecinfo-1.1.ebuild
index 09652b8528bc..41fb6b56fa7f 100644
--- a/dev-libs/libexecinfo/libexecinfo-1.1.ebuild
+++ b/dev-libs/libexecinfo/libexecinfo-1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
+KEYWORDS=""
 IUSE=""
 
 DEPEND="sys-freebsd/freebsd-mk-defs"
diff --git a/dev-libs/libexecinfo/metadata.xml b/dev-libs/libexecinfo/metadata.xml
index d7dec5e4ab8b..52378006fe3d 100644
--- a/dev-libs/libexecinfo/metadata.xml
+++ b/dev-libs/libexecinfo/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="project">
-	<email>bsd@gentoo.org</email>
-	<name>BSD Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 	This is a quick-n-dirty BSD licensed clone of backtrace facility found
 	in the GNU libc, mainly intended for porting linuxish code to BSD
diff --git a/dev-libs/libezV24/Manifest b/dev-libs/libezV24/Manifest
index 88de40b28026..62e6edd49e1c 100644
--- a/dev-libs/libezV24/Manifest
+++ b/dev-libs/libezV24/Manifest
@@ -1,6 +1,5 @@
 AUX libezV24-0.1.1-build.patch 4869 BLAKE2B 13f3e7a7493825ff2d7242baf499a3844d360ae0cad1b95dee6a7042c08f53eb428bcc93ebf23d3f4ea10ef589f384aeff6f8e70e36cc00f5546ad495e5839f4 SHA512 d55ba03d30973739918902a21c0b9da9f1b4d74f8923f2aa14747a894f2ff2118699e7f98c1a436f8942e948190752b1e0b027d52225ba025957d5068ce321df
 AUX libezV24-0.1.1-test.patch 472 BLAKE2B 9e7b928e271fc7b963e3f8f82c818de06fc0a0477c972a143a48669c67dbcec9c83e70da6cd38ef37968d91d438439090fbdf7ff521e69291a555ced5cf7aa1f SHA512 f2bc15b6c99ad760215406f2a4fc2d230671d0bac9a8249b6ac25aaec4fba16c435ce0871f42ff41cd54d9d0d9e4a72fdc19dc84426ae594bf9293b1b6efe906
 DIST libezV24-0.1.1.tar.gz 50515 BLAKE2B 5a4dfdb4e4875203cfc2c06a1d5966d79c84407539ad3b3419aea04e7fcfc5ba05e6e69d1a09d999a1c8820f35bd5adc7fe3d833ceb739e52f1246491d339034 SHA512 99b277a04354e2587567ae5f1ebc99e41d127ec94bf5de53021b94df8d731ce2f2ceacedd8b7fa29902cf98f5c4243bddaa96636e1f900f1434a3da857b0e6c5
-EBUILD libezV24-0.1.1-r1.ebuild 729 BLAKE2B e3a5c7a756387ed7788ff5eeff9b120214ba3b1cd2e0f8ba4fc2fc1c4bb723cd37eedd6e099e6d17865ba85207869c9081b91df6a17a0684f32f11cf4e1b76c7 SHA512 a2d6cd0cdbf1e2258c322a6fa48baf70ae70307059b79ef2bd7768cc6d79a1dae516be4452c8ff1abd2fb042c5dd371a6e9d331c146d3a0ff6f2feb0f42151d6
-EBUILD libezV24-0.1.1.ebuild 848 BLAKE2B bfa085c1053eb6ccf4a5c4163a9bb6d0fccb73d171397dc90b87e33fda27dee6d7ecaee284084865663aa0f8390d43ba8c14ba8d213e1880f6feb7142d76cdc9 SHA512 b5acccc76a086a85ab7ffbe421e6ea99c64ba43bcdc1a8d147f04848cb7fabcf3aafb87c23afed5bfe75657a3a25d3a8180d1dadff6e37373d13b2e60b1ddd36
+EBUILD libezV24-0.1.1-r1.ebuild 725 BLAKE2B 2e22356196e0b8cae0389fbb42d5075ea1e0bfd77ce3eabf3750dc42cdc24f2d98a7a5cf40b1befce2c9431f094967c45c71c6c3b65144fee45fcbd6c07c9c6e SHA512 5ff2841a8701edba103e33722af0f6aa8a0f942a01966c2c7b62807062c36bdf49e6ad6ed0b685bdaf472e37cd5cce136901a0d5d04ad9b153d79936dd8f1af4
 MISC metadata.xml 641 BLAKE2B e75047389f2e4125de93bb6bfca6ce5f33dbb416841c35712b066ba20f7a728fc3282665f684c377fd9359b780416eea9c1edc77593944250ffcfc046cb0172a SHA512 2ec206575cedf384e77716e3959bab5d359cfd16dde6b24f88f160d7e2bc8fe9d7916f6de771a9616f780d0da736d063cc1fd6d313c3e114a2c0f136df9847f5
diff --git a/dev-libs/libezV24/libezV24-0.1.1-r1.ebuild b/dev-libs/libezV24/libezV24-0.1.1-r1.ebuild
index b6b2424b2a9a..87307832e6d5 100644
--- a/dev-libs/libezV24/libezV24-0.1.1-r1.ebuild
+++ b/dev-libs/libezV24/libezV24-0.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ezv24/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc sparc x86"
 
 HTML_DOCS=( api-html/. )
 
diff --git a/dev-libs/libezV24/libezV24-0.1.1.ebuild b/dev-libs/libezV24/libezV24-0.1.1.ebuild
deleted file mode 100644
index 30ac27fe8784..000000000000
--- a/dev-libs/libezV24/libezV24-0.1.1.ebuild
+++ /dev/null
@@ -1,39 +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 that provides an easy API to Linux serial ports"
-HOMEPAGE="http://ezv24.sourceforge.net"
-SRC_URI="mirror://sourceforge/ezv24/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-test.patch
-	sed -i -e 's:__LINUX__:__linux__:' *.c *.h
-}
-
-src_compile() {
-	tc-export AR CC RANLIB
-	emake || die "emake failed."
-}
-
-src_install() {
-	export NO_LDCONFIG="stupid"
-	emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" \
-		install || die "emake install failed."
-	dodoc AUTHORS BUGS ChangeLog HISTORY README
-	dohtml api-html/*
-}
diff --git a/dev-libs/libf2c/Manifest b/dev-libs/libf2c/Manifest
index abad9d22045d..7baded1e6782 100644
--- a/dev-libs/libf2c/Manifest
+++ b/dev-libs/libf2c/Manifest
@@ -5,5 +5,5 @@ AUX libf2c-20110801-format-security.patch 345 BLAKE2B 723f79e2fa5015c49bd763473b
 AUX libf2c-20110801-main.patch 1708 BLAKE2B becf5fd72a0d9bad9a6fef4d6013b2e1dbedd2b2d1cb9764a3a04772648f24f2875d6257595c95c09b17159baf47c217d4fbdc3cd4d6dfa37980adb306552e3e SHA512 f2c8574f45580d2bf99e5506266668c615f19a985ffa27eefe38d373f083da61dbe486d5c27e034bd38029b46a4a77285e175a7285b1acb37e7a1ecfea6a2bbc
 AUX libf2c-20130927-fix-buildsystem.patch 1632 BLAKE2B 381a2e03ee75f0553325c4b5bbc1191d7262d0fec6d315791684a761f1be6e0749782a679fce805b1d4eb466d0f219d78bec6ef03968addaa47c3a0d1c212c59 SHA512 40191835f7b5d6a9865c68e0fb8a7168715b2f79cad069192427cc657b9664ac9f242c7b746aa821b81c33ae2c08c6d936f838b2f5228acde35d8aeb7c102b93
 DIST libf2c-20130927.zip 129082 BLAKE2B 09f818bde8888b569858784c39e93a6a11b3103039f44c3f6a1246b29efb5f8ae6e45f787ed0c2216bea383a79b9554aff30e1fbb00668bbc872b4bc30d87ba8 SHA512 1a12093dec3c250f4775eebd06f1a9144fdb956ea3162202fb67569fdd956ac5591bc563a0726ca65ea10d465efaac1c1d8024d63bc4a4b5c88bf46242607c8a
-EBUILD libf2c-20130927-r1.ebuild 1216 BLAKE2B 394a6539a1036aa5370ef547b1f68908028798c4b59a789fdeea95a54082da61d68ffbbaed48f0efb389759f1aa5cccebf26340788ce7275b72a49fe026f8bc4 SHA512 439acfd3e214057cfbb4828513c55fbd6369f1a402152e39811a0758a6d04108c554e42de1c05a2e04a41d170e6335a5cf561e86fd43b67576c3fd60ebb6d89b
+EBUILD libf2c-20130927-r1.ebuild 1206 BLAKE2B ca58597864c9a53c1492bba6aa5ce1a7ddc56e2870de0f34299e42c215418591106fb65aaf1c593e863f2eaaac70bd44611aa9a3814278e6489224bccbd56d44 SHA512 1ca74b5d405978b2a6f6e7f718ad7c86b4923119c0d9e76be93d7c4ea2bd663af38d3e1214c0fbe6506dadfac184c2af3c24a9ade9815fdcb1e76c9a89f4862b
 MISC metadata.xml 363 BLAKE2B 854c5e9e83fb984b31f4def65cb25720bacbff0522fe93e3488211611e15896e562ab86a101ea0f661ffa6de9bb15331dce1e39ca614b1987ed35184029a0d18 SHA512 3c5efbb36dba02cfa31cb0b95c78194bfecfcc128b60eb5c11983da6ac26fb0d75bc02e004443fc6365d3cf53b6d9bffc3a0342c185e61ffdc404cb8b4a3f95e
diff --git a/dev-libs/libf2c/libf2c-20130927-r1.ebuild b/dev-libs/libf2c/libf2c-20130927-r1.ebuild
index c91d0619c4fa..4b977242dc7b 100644
--- a/dev-libs/libf2c/libf2c-20130927-r1.ebuild
+++ b/dev-libs/libf2c/libf2c-20130927-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netlib.org/f2c/${PN}.zip -> ${P}.zip"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-libs/libffi-compat/Manifest b/dev-libs/libffi-compat/Manifest
new file mode 100644
index 000000000000..bc50789259f0
--- /dev/null
+++ b/dev-libs/libffi-compat/Manifest
@@ -0,0 +1,11 @@
+AUX libffi-3.1-darwin-x32.patch 606 BLAKE2B d5fb0c46d294241fd054717e3da00fdfa4e37b9d98bd79801843b0562f8ec02943659ce1baac5ed24a8651771ef318626b8f70d054e300572c2888a482a3084d SHA512 909e4c45f124d6a9d4a0b2b97fdcbf0451a15c11c3da581fc8571d4f4f0857306bbfddf682bbe0441f0c5c84a8489e4a79a792883bfe440224cf672567bf0a24
+AUX libffi-3.2.1-complex-ia64.patch 1622 BLAKE2B dc51b1cf0d0cd796d168bf4cdb66a8d5fc34a5fd46d96fd0dffd07d5885032775389cfd1465100d9972eb0ce736e8caab14dd49318dcc6630754825806be342e SHA512 136eaaa9e467afba2634fd4f997cfd982fc0162a48aba7efc429e719afea53e40607c973d281f78d5cf2d7886664ddc4b19161d35af113c9a7326c637e10b2e1
+AUX libffi-3.2.1-complex_alpha.patch 605 BLAKE2B 3b14addb7797ff99a465101487be49c922f0286f49230d13cebdec159e0054defa0f35e5dbbd0c5dad71117ad72d183d0a88af5b175957b3585d2b1639c87a2b SHA512 c5a3c287db9b7a71068c4f73c0dc3c3e2ee602a9c55c57cae393fcdbdc913e77e18481c19f8454b74ed7b66f7dded9e30b11b61d079c8567c585f6cc890cd70b
+AUX libffi-3.2.1-ia64-small-struct.patch 2306 BLAKE2B 1bace1573d4bdb93e7be97a8609426d35a1217cbb0718e7580c2a3b646a7d493d4b7aecc25dee35f61f7e036904e6b7dde8d3d398842dab7149053da2a2761a3 SHA512 4f33d849210da633629e16e96779dce2e03c0d1e6f44b91b68410e35433378f8cf0a04736d161539ea368f54a713177e6e8df2fde93d40c6917d03ad74a99c2c
+AUX libffi-3.2.1-include-path-autogen.patch 2901 BLAKE2B 836e61b6f64b9d649e969799e42c5dd808750ba51997d7486eef58e636ef2e1f215f9a26b5e88e61366d57e758688c4e69f578edd81167e1dbb0a8357f049150 SHA512 6c8b2d7dca0cdc6f69b2393777f546b6722b6260cfa6fcb814915975227185cc3b467b6537939f8f8d05df5fd8f245301030aa4ef74a3c2fa073e6200e91d47f
+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
+DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
+EBUILD libffi-compat-3.2.1-r3.ebuild 1619 BLAKE2B 34e94e79583b9b5398eae3a7bff5e8029b1ada7397d7ccdae12db3f24abc87cfb1bbeafad88481df8ef0e39421ce72087eb0ec53706b8fb56ff6e01d369a2875 SHA512 ef9b16a52e35f9c65c7fec307ac13eb51f8b35cbd07c084ee6a22786aaa5e148973d4ccfa34ac95963578e52a19d2b663ee36590f7101a96573fe8a5da9e997e
+MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi-compat/files/libffi-3.1-darwin-x32.patch b/dev-libs/libffi-compat/files/libffi-3.1-darwin-x32.patch
new file mode 100644
index 000000000000..e5f100e56726
--- /dev/null
+++ b/dev-libs/libffi-compat/files/libffi-3.1-darwin-x32.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/show_bug.cgi?id=513428
+https://bugs.gentoo.org/show_bug.cgi?id=536764
+https://trac.macports.org/ticket/44170
+
+--- libffi-3.2.1/src/x86/win32.S
++++ libffi-3.2.1/src/x86/win32.S
+@@ -1184,7 +1184,6 @@
+ 
+ #if defined(X86_WIN32) && !defined(__OS2__)
+         .section	.eh_frame,"w"
+-#endif
+ .Lframe1:
+ .LSCIE1:
+         .long	.LECIE1-.LASCIE1  /* Length of Common Information Entry */
+@@ -1343,6 +1342,7 @@
+         /* End of DW_CFA_xxx CFI instructions.  */
+         .align 4
+ .LEFDE5:
++#endif /* defined(X86_WIN32) && !defined(__OS2__), for the eh_frame */
+ 
+ #endif /* !_MSC_VER */
+ 
diff --git a/dev-libs/libffi-compat/files/libffi-3.2.1-complex-ia64.patch b/dev-libs/libffi-compat/files/libffi-3.2.1-complex-ia64.patch
new file mode 100644
index 000000000000..fd5c1ea4b282
--- /dev/null
+++ b/dev-libs/libffi-compat/files/libffi-3.2.1-complex-ia64.patch
@@ -0,0 +1,41 @@
+ia64: fix small struct handling (missing complex type entry)
+
+commit 6e8a4460833594d5af1b4539178025da0077df19
+added FFI_TYPE_COMPLEX value type (comes after FFI_TYPE_POINTER)
+
+ia64 ffi_closure_unix reiles on the ordering of
+types as ia64 has ia64-specific FFI types:
+small struct and others.
+
+As a result all tests handling small structs broke.
+
+The change fixes dispatch table by ignoring FFI_TYPE_COMPLEX.
+This has positive effect of unbreaking most tests:
+
+                 === libffi Summary ===
+ 
+-# of expected passes            1595
+-# of unexpected failures        295
++# of expected passes            1930
++# of unexpected failures        10
+ # of unsupported tests          30
+
+Bug: https://bugs.gentoo.org/634190
+--- a/src/ia64/unix.S
++++ b/src/ia64/unix.S
+@@ -529,6 +529,7 @@ ffi_closure_unix:
+ 	data8	@pcrel(.Lst_int64)		// FFI_TYPE_SINT64
+ 	data8	@pcrel(.Lst_void)		// FFI_TYPE_STRUCT
+ 	data8	@pcrel(.Lst_int64)		// FFI_TYPE_POINTER
++	data8	@pcrel(.Lst_void)		// FFI_TYPE_COMPLEX (not implemented)
+ 	data8 	@pcrel(.Lst_small_struct)	// FFI_IA64_TYPE_SMALL_STRUCT
+ 	data8	@pcrel(.Lst_hfa_float)		// FFI_IA64_TYPE_HFA_FLOAT
+ 	data8	@pcrel(.Lst_hfa_double)		// FFI_IA64_TYPE_HFA_DOUBLE
+@@ -550,6 +551,7 @@ ffi_closure_unix:
+ 	data8	@pcrel(.Lld_int)		// FFI_TYPE_SINT64
+ 	data8	@pcrel(.Lld_void)		// FFI_TYPE_STRUCT
+ 	data8	@pcrel(.Lld_int)		// FFI_TYPE_POINTER
++	data8	@pcrel(.Lld_void)		// FFI_TYPE_COMPLEX (not implemented)
+ 	data8 	@pcrel(.Lld_small_struct)	// FFI_IA64_TYPE_SMALL_STRUCT
+ 	data8	@pcrel(.Lld_hfa_float)		// FFI_IA64_TYPE_HFA_FLOAT
+ 	data8	@pcrel(.Lld_hfa_double)		// FFI_IA64_TYPE_HFA_DOUBLE
diff --git a/dev-libs/libffi-compat/files/libffi-3.2.1-complex_alpha.patch b/dev-libs/libffi-compat/files/libffi-3.2.1-complex_alpha.patch
new file mode 100644
index 000000000000..5e8c943eee38
--- /dev/null
+++ b/dev-libs/libffi-compat/files/libffi-3.2.1-complex_alpha.patch
@@ -0,0 +1,20 @@
+--- a/src/alpha/osf.S.orig	2015-01-16 10:46:15.000000000 +0100
++++ b/src/alpha/osf.S	2015-01-16 10:46:24.000000000 +0100
+@@ -279,6 +279,7 @@
+ 	.gprel32 $load_64	# FFI_TYPE_SINT64
+ 	.gprel32 $load_none	# FFI_TYPE_STRUCT
+ 	.gprel32 $load_64	# FFI_TYPE_POINTER
++	.gprel32 $load_none	# FFI_TYPE_COMPLEX
+ 
+ /* Assert that the table above is in sync with ffi.h.  */
+ 
+@@ -294,7 +295,8 @@
+ 	|| FFI_TYPE_SINT64 != 12	\
+ 	|| FFI_TYPE_STRUCT != 13	\
+ 	|| FFI_TYPE_POINTER != 14	\
+-	|| FFI_TYPE_LAST != 14
++	|| FFI_TYPE_COMPLEX != 15       \
++	|| FFI_TYPE_LAST != 15
+ #error "osf.S out of sync with ffi.h"
+ #endif
+ 
diff --git a/dev-libs/libffi-compat/files/libffi-3.2.1-ia64-small-struct.patch b/dev-libs/libffi-compat/files/libffi-3.2.1-ia64-small-struct.patch
new file mode 100644
index 000000000000..6e21f3566bc9
--- /dev/null
+++ b/dev-libs/libffi-compat/files/libffi-3.2.1-ia64-small-struct.patch
@@ -0,0 +1,74 @@
+From b58caef7fd620408be9239ac24ea89d5bc84f30b Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 17 Feb 2018 19:00:40 +0000
+Subject: [PATCH 2/2] ia64: fix small struct return
+
+This change fixes libffi.call/struct10.c failure on ia64:
+FAIL: libffi.call/struct10.c -W -Wall -Wno-psabi -O0 execution test
+
+.Lst_small_struct handles returns for structs less than 32 bytes
+(following ia64 return value ABI [1]). Subroutine does roughly the
+following:
+
+```
+    mov [sp+0]  = r8
+    mov [sp+8]  = r9
+    mov [sp+16] = r10
+    mov [sp+24] = r11
+    memcpy(destination, source=sp, 12);
+```
+
+The problem: ia64 ABI guarantees that top 16 bytes of stack are
+scratch space for callee function. Thus it can clobber it. [1]
+says (7.1 Procedure Frames):
+"""
+* Scratch area. This 16-byte region is provided as scratch storage
+  for procedures that are called by the current procedure. Leaf
+  procedures do not need to allocate this region. A procedure may
+  use the 16 bytes at the top of its own frame as scratch memory,
+  but the contents of this area are not preserved by a procedure call.
+"""
+
+In our case 16 top bytes are clobbered by a PLT resolver when memcpy()
+is called for the first time. As a result memcpy implementation reads
+already clobbered data frop top of stack.
+
+The fix is simple: allocate 16 bytes of scrats space prior to memcpy()
+call.
+
+[1]: https://www.intel.com/content/dam/www/public/us/en/documents/guides/itanium-software-runtime-architecture-guide.pdf
+
+Bug: https://bugs.gentoo.org/634190
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/ia64/unix.S | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/ia64/unix.S b/src/ia64/unix.S
+index 4733377..e2547e0 100644
+--- a/src/ia64/unix.S
++++ b/src/ia64/unix.S
+@@ -175,7 +175,6 @@ ffi_call_unix:
+ 	;;
+ 
+ .Lst_small_struct:
+-	add	sp = -16, sp
+ 	cmp.lt	p6, p0 = 8, in3
+ 	cmp.lt	p7, p0 = 16, in3
+ 	cmp.lt	p8, p0 = 24, in3
+@@ -191,6 +190,12 @@ ffi_call_unix:
+ (p8)	st8	[r18] = r11
+ 	mov	out1 = sp
+ 	mov	out2 = in3
++	;;
++	// ia64 software calling convention requires
++	// top 16 bytes of stack to be scratch space
++	// PLT resolver uses that scratch space at
++	// 'memcpy' symbol reolution time
++	add	sp = -16, sp
+ 	br.call.sptk.many b0 = memcpy#
+ 	;;
+ 	mov	ar.pfs = loc0
+-- 
+2.16.1
+
diff --git a/dev-libs/libffi-compat/files/libffi-3.2.1-include-path-autogen.patch b/dev-libs/libffi-compat/files/libffi-3.2.1-include-path-autogen.patch
new file mode 100644
index 000000000000..522e1fa9c486
--- /dev/null
+++ b/dev-libs/libffi-compat/files/libffi-3.2.1-include-path-autogen.patch
@@ -0,0 +1,56 @@
+Autogenerated part of libffi-3.2.1-include-path.patch
+
+https://bugs.gentoo.org/643582
+diff --git a/include/Makefile.in b/include/Makefile.in
+index 9d747e8..99ecfd7 100644
+--- a/include/Makefile.in
++++ b/include/Makefile.in
+@@ -152,2 +152,2 @@ am__uninstall_files_from_dir = { \
+-am__installdirs = "$(DESTDIR)$(includesdir)"
+-HEADERS = $(nodist_includes_HEADERS)
++am__installdirs = "$(DESTDIR)$(includedir)"
++HEADERS = $(nodist_include_HEADERS)
+@@ -317,2 +317 @@ EXTRA_DIST = ffi.h.in ffi_common.h
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+-nodist_includes_HEADERS = ffi.h ffitarget.h
++nodist_include_HEADERS = ffi.h ffitarget.h
+@@ -360 +359 @@ clean-libtool:
+-install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
++install-nodist_includeHEADERS: $(nodist_include_HEADERS)
+@@ -362 +361 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
+-	@list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \
++	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
+@@ -364,2 +363,2 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
+@@ -372,2 +371,2 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
+-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
+-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
++	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
++	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
+@@ -376 +375 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
+-uninstall-nodist_includesHEADERS:
++uninstall-nodist_includeHEADERS:
+@@ -378 +377 @@ uninstall-nodist_includesHEADERS:
+-	@list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \
++	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
+@@ -380 +379 @@ uninstall-nodist_includesHEADERS:
+-	dir='$(DESTDIR)$(includesdir)'; $(am__uninstall_files_from_dir)
++	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
+@@ -468 +467 @@ installdirs:
+-	for dir in "$(DESTDIR)$(includesdir)"; do \
++	for dir in "$(DESTDIR)$(includedir)"; do \
+@@ -522 +521 @@ info-am:
+-install-data-am: install-nodist_includesHEADERS
++install-data-am: install-nodist_includeHEADERS
+@@ -566 +565 @@ ps-am:
+-uninstall-am: uninstall-nodist_includesHEADERS
++uninstall-am: uninstall-nodist_includeHEADERS
+@@ -577 +576 @@ uninstall-am: uninstall-nodist_includesHEADERS
+-	install-nodist_includesHEADERS install-pdf install-pdf-am \
++	install-nodist_includeHEADERS install-pdf install-pdf-am \
+@@ -582 +581 @@ uninstall-am: uninstall-nodist_includesHEADERS
+-	uninstall-am uninstall-nodist_includesHEADERS
++	uninstall-am uninstall-nodist_includeHEADERS
diff --git a/dev-libs/libffi-compat/files/libffi-3.2.1-include-path.patch b/dev-libs/libffi-compat/files/libffi-3.2.1-include-path.patch
new file mode 100644
index 000000000000..e1269b2398a4
--- /dev/null
+++ b/dev-libs/libffi-compat/files/libffi-3.2.1-include-path.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/643582
+
+From 982b89c01aca99c7bc229914fc1521f96930919b Mon Sep 17 00:00:00 2001
+From: Yen Chi Hsuan <yan12125@gmail.com>
+Date: Sun, 13 Nov 2016 19:17:19 +0800
+Subject: [PATCH] Install public headers in the standard path
+
+---
+ include/Makefile.am | 3 +--
+ libffi.pc.in        | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/include/Makefile.am b/include/Makefile.am
+index bb241e8..c59df9f 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -6,5 +6,4 @@ DISTCLEANFILES=ffitarget.h
+ noinst_HEADERS=ffi_common.h ffi_cfi.h
+ EXTRA_DIST=ffi.h.in
+ 
+-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
+-nodist_includes_HEADERS = ffi.h ffitarget.h
++nodist_include_HEADERS = ffi.h ffitarget.h
+diff --git a/libffi.pc.in b/libffi.pc.in
+index edf6fde..6fad83b 100644
+--- a/libffi.pc.in
++++ b/libffi.pc.in
+@@ -2,7 +2,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ toolexeclibdir=@toolexeclibdir@
+-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
++includedir=@includedir@
+ 
+ Name: @PACKAGE_NAME@
+ Description: Library supporting Foreign Function Interfaces
+-- 
+2.15.1
+
diff --git a/dev-libs/libffi-compat/files/libffi-3.2.1-musl-emutramp.patch b/dev-libs/libffi-compat/files/libffi-3.2.1-musl-emutramp.patch
new file mode 100644
index 000000000000..7c011d2b6d07
--- /dev/null
+++ b/dev-libs/libffi-compat/files/libffi-3.2.1-musl-emutramp.patch
@@ -0,0 +1,31 @@
+https://github.com/libffi/libffi/commit/e169ba2b83c780058fe626856cfdb5903a85cb97.patch
+https://bugs.gentoo.org/694916
+
+From e169ba2b83c780058fe626856cfdb5903a85cb97 Mon Sep 17 00:00:00 2001
+From: Kylie McClain <somasis@exherbo.org>
+Date: Fri, 29 Apr 2016 21:04:07 -0400
+Subject: [PATCH] Fix usage on musl libc
+
+A gcc compiled on musl does not define __gnu_linux__, it defines __linux__.
+Only on glibc does __gnu_linux__ get defined, but both define __linux__, so
+we should check for that instead.
+
+With this patch, libffi works perfectly, and passes its testsuite entirely
+on musl libc systems.
+---
+ src/closures.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/closures.c b/src/closures.c
+index 3dec0e31..05849e06 100644
+--- a/src/closures.c
++++ b/src/closures.c
+@@ -35,7 +35,7 @@
+ #include <ffi_common.h>
+ 
+ #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE
+-# if __gnu_linux__ && !defined(__ANDROID__)
++# if __linux__ && !defined(__ANDROID__)
+ /* This macro indicates it may be forbidden to map anonymous memory
+    with both write and execute permission.  Code compiled when this
+    option is defined will attempt to map such pages once, but if it
diff --git a/dev-libs/libffi-compat/files/libffi-3.2.1-o-tmpfile-eacces.patch b/dev-libs/libffi-compat/files/libffi-3.2.1-o-tmpfile-eacces.patch
new file mode 100644
index 000000000000..92a733cbe823
--- /dev/null
+++ b/dev-libs/libffi-compat/files/libffi-3.2.1-o-tmpfile-eacces.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/529044
+
+deploy this workaround until newer versions of the kernel/C library/libsandbox
+are rolled out into general circulation
+
+--- a/src/closures.c
++++ b/src/closures.c
+@@ -301,7 +301,8 @@ open_temp_exec_file_dir (const char *dir)
+ #ifdef O_TMPFILE
+   fd = open (dir, flags | O_RDWR | O_EXCL | O_TMPFILE, 0700);
+   /* If the running system does not support the O_TMPFILE flag then retry without it. */
+-  if (fd != -1 || (errno != EINVAL && errno != EISDIR && errno != EOPNOTSUPP)) {
++  if (fd != -1 || (errno != EINVAL && errno != EISDIR && errno != EOPNOTSUPP &&
++		   errno != EACCES)) {
+     return fd;
+   } else {
+     errno = 0;
diff --git a/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
new file mode 100644
index 000000000000..7604ac448291
--- /dev/null
+++ b/dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils libtool multilib multilib-minimal toolchain-funcs
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions"
+HOMEPAGE="https://sourceware.org/libffi/"
+SRC_URI="ftp://sourceware.org/pub/libffi/libffi-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="6" # libffi.so.6
+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 pax_kernel test"
+
+RDEPEND="!dev-libs/libffi:0/0" # conflicts on libffi.so.6
+DEPEND="test? ( dev-util/dejagnu )"
+
+DOCS="ChangeLog* README"
+
+PATCHES=(
+	"${FILESDIR}"/libffi-3.2.1-o-tmpfile-eacces.patch #529044
+	"${FILESDIR}"/libffi-3.2.1-complex_alpha.patch
+	"${FILESDIR}"/libffi-3.1-darwin-x32.patch
+	"${FILESDIR}"/libffi-3.2.1-complex-ia64.patch
+	"${FILESDIR}"/libffi-3.2.1-include-path.patch
+	"${FILESDIR}"/libffi-3.2.1-include-path-autogen.patch
+	"${FILESDIR}"/libffi-3.2.1-ia64-small-struct.patch #634190
+	"${FILESDIR}"/libffi-3.2.1-musl-emutramp.patch #694916
+)
+
+S=${WORKDIR}/libffi-${PV}
+ECONF_SOURCE=${S}
+
+src_prepare() {
+	default
+
+	sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814
+	elibtoolize
+}
+
+multilib_src_configure() {
+	use userland_BSD && export HOST="${CHOST}"
+	econf \
+		--disable-static \
+		$(use_enable pax_kernel pax_emutramp) \
+		$(use_enable debug)
+}
+
+multilib_src_install() {
+	dolib.so .libs/libffi.so.${SLOT}*
+}
diff --git a/dev-libs/libffi-compat/metadata.xml b/dev-libs/libffi-compat/metadata.xml
new file mode 100644
index 000000000000..6e9a28c5ac88
--- /dev/null
+++ b/dev-libs/libffi-compat/metadata.xml
@@ -0,0 +1,42 @@
+<?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>
+	<longdescription lang="en">
+		Compilers for high level languages generate code that follow certain
+		conventions. These conventions are necessary, in part, for separate
+		compilation to work. One such convention is the "calling
+		convention". The "calling convention" is essentially a set of
+		assumptions made by the compiler about where function arguments will
+		be found on entry to a function. A "calling convention" also specifies
+		where the return value for a function is found.
+
+		Some programs may not know at the time of compilation what arguments
+		are to be passed to a function. For instance, an interpreter may be
+		told at run-time about the number and types of arguments used to call
+		a given function. Libffi can be used in such programs to provide a
+		bridge from the interpreter program to compiled code.
+
+		The libffi library provides a portable, high level programming
+		interface to various calling conventions. This allows a programmer to
+		call any function specified by a call interface description at run
+		time.
+
+		Ffi stands for Foreign Function Interface. A foreign function
+		interface is the popular name for the interface that allows code
+		written in one language to call code written in another language. The
+		libffi library really only provides the lowest, machine dependent
+		layer of a fully featured foreign function interface. A layer must
+		exist above libffi that handles type conversions for values passed
+		between the two languages.
+	</longdescription>
+	<use>
+		<flag name="pax_kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:libffi_project:libffi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 430dace65eb6..03e7567704b9 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -10,13 +10,9 @@ AUX libffi-3.3_rc0-hppa-no-TEXTREL.patch 2821 BLAKE2B fcc7eb0ed4a3f9b31718bf7761
 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
-EBUILD libffi-3.2.1-r1.ebuild 2269 BLAKE2B e2075034b9e9bec42427dcacbfc03aa114d9c2e5fd3cbda307bd24ae63573a8ab27459ed0b73177bd969232be7640b737a35bae7f5be69876b92de4351dfcbff SHA512 1f27cd306112d3de8762f0cfab1f6196819a6793585c477027b3e0a48fdf0259f764d87b8cb221c5b32aabd5ae47d8535f040d0960256064d14a4d78a67bcfb9
-EBUILD libffi-3.2.1-r2.ebuild 2328 BLAKE2B 26926447321e54807371c9e2154b062def22f04e298ee1ccbc5f92fed4bedab44d19622f034460c0727838fa1c6146c42cbd7fe83bc385df03c827535c42b949 SHA512 04a18c564ca898ffc3434ab7d62f2c2380300937726dae6c50f5e0d479009b059d020d48589b52970aa34723f6530bbeddd0f8f5f6fe3a865d90a48dd494e189
-EBUILD libffi-3.2.1-r3.ebuild 2380 BLAKE2B bfad9eae814e06536a2d6bedc8d746fb57d0746a4324fe6ed6474c7cec772b0b5e52cab4889a022489cbb3dc3a6dc368086462f8cde048ad0abfe102d2a05021 SHA512 03f7403c11b9b5395ff6ca0b57639a5c5a897372af9e9e638dd8d902dc35afdb5bb4615cc8408820853e79097d9350ea6794cfdd809e219418a4f675c2df4707
-EBUILD libffi-3.2.1.ebuild 1968 BLAKE2B 611f038994a687222d26a6709163e1848d15114dccd3e87c9b0a28cdc5851c6cb769eba5517d18f196cf0d27a1703ed01b40ae73e04d4e15b9cc26c07ecc9acb SHA512 f9f3b0a71a8a57adb563eb6c1ed64602976f18ff8e653f777d8dd14928bfc27417ee1aa81eab2529be1dd6b7fb70af274fe2d7cc1c0c09d29e48f37661ddeec7
-<<<<<<< HEAD
-EBUILD libffi-3.3_rc0.ebuild 2108 BLAKE2B a56dfde1ab20a6e7c327db771abb78ccd67d43710b3cc347ce0fe42fbbb1cd2d014cefac6afe8a29894111f819c639907d7388c025072af3b563e7d4ae53d410 SHA512 23cf7b84ee253a8e86125f51f6ee6ab2c63c9120526a139b486f665a50cdacc9c674a3894972278835ff63b2a522d58b156d594aeecea645241501c089fbecca
-=======
-EBUILD libffi-3.3_rc0.ebuild 2106 BLAKE2B 116e6e9d949b4103862727966ec48a18c002e3b676803cd99f4c3776915f520cfa1ed07903b5a039a497afbec90bdd6b580b028c95c0bdc2a64b9fa361a8b500 SHA512 8d88a86081c88caa9fd938560a84c2d29c27155be261517c0dc0e787d9886360145086bd3c8d16d9c7f5b2e5929aaf27ba92403cadb9ae3bf08bea6d966cd495
->>>>>>> next
+EBUILD libffi-3.2.1-r1.ebuild 2247 BLAKE2B af3fe29f0a3bed8dc2796651bee68f94133f1a3e7aebeab9fed8f2ab1e956e678e36dc746e5e19cb60707e0b8cc122a82c45229750b2b628a39c8d7665605fec SHA512 3d4f77b9d81d6963b34aed7a2677825187f811a49f0189114bdc94b358860913268dce3cbc27b9b4f862a23f18b226610f0c74c0d0ac54c1d3cac491b5dd89ac
+EBUILD libffi-3.2.1-r2.ebuild 2306 BLAKE2B 2aab5739ecccb926509487d44c113df73113f393c37ad55ab546b43172767ee93bf4e8d927831dc5d5ee406b4674cb73ca0a6b4503bf5190327cac9f2e2f42e7 SHA512 5f531fa8a5231a653e7a6dc1037cb6c3c37b7961a175d3ac3b346ac68f6030e266f1d8745e2ca29600965b03691146a545862a73ad59d189d5120509cc28278c
+EBUILD libffi-3.2.1-r3.ebuild 2358 BLAKE2B d9b06232210d47d8f46ec3d5ccecef1c01bdc434df74a521500dadb6879eb091c9954cff2277035676503318d50a8e30eb0d7626f1a1f2b0fa2f62a68646fb8f SHA512 6f05734cc0fdbdb82b869847c248aaae89aadd97f1aad87356002e020cf52464d0db311fdc37bebea8aa15aa4ccd3fa5c5017cabd1f6e18af06a7e49642f3ae1
+EBUILD libffi-3.2.1.ebuild 1946 BLAKE2B 064f5d08503166205bd4f7b655e36611703055e7b5a7e0313a406ffff6f20ca17f8ead0c5c4276e05b23cf6e73cd050b7953a2b279001359c96b30a106a7c5c1 SHA512 55c6e14e2a5ae1b9f1b2e3645fc8d4ddfa590b62d4fc1ad64b01de069e5c0b8bafedfdf3568239899141a20dbe3d87990f9890af9372b81f96c439e2141f3ef0
+EBUILD libffi-3.3_rc0.ebuild 2080 BLAKE2B 507e6e8f94ab4c3c21d268e699d1d7bf6c6203c2c66a36954f0b5e18fa85f79cf021b924d75206fe4aa748e2880ed27ad2c9c883eda7340541453cbc5de69f9a SHA512 0303f61e1a8a633b76dec8e61ee09508019eab8a48b8b4e55096bf53136584c370958e6016e6d3b6442f958bf3ec5824ae1473d1e6ae2fc68eef08ac8fdb962e
 MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi/libffi-3.2.1-r1.ebuild b/dev-libs/libffi/libffi-3.2.1-r1.ebuild
index 94aacacd13b0..3d1b61e0fd72 100644
--- a/dev-libs/libffi/libffi-3.2.1-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
 
 RDEPEND=""
diff --git a/dev-libs/libffi/libffi-3.2.1-r2.ebuild b/dev-libs/libffi/libffi-3.2.1-r2.ebuild
index 99e5d165f3da..ef3e0d216648 100644
--- a/dev-libs/libffi/libffi-3.2.1-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
 
 RDEPEND=""
diff --git a/dev-libs/libffi/libffi-3.2.1-r3.ebuild b/dev-libs/libffi/libffi-3.2.1-r3.ebuild
index 45d1209a70d6..34d55005928a 100644
--- a/dev-libs/libffi/libffi-3.2.1-r3.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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"
 
 RDEPEND=""
diff --git a/dev-libs/libffi/libffi-3.2.1.ebuild b/dev-libs/libffi/libffi-3.2.1.ebuild
index 8c103bd0cdbe..8143d37df311 100644
--- a/dev-libs/libffi/libffi-3.2.1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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"
 
 RDEPEND=""
diff --git a/dev-libs/libffi/libffi-3.3_rc0.ebuild b/dev-libs/libffi/libffi-3.3_rc0.ebuild
index a9cdaa09a785..ab6318f48edf 100644
--- a/dev-libs/libffi/libffi-3.3_rc0.ebuild
+++ b/dev-libs/libffi/libffi-3.3_rc0.ebuild
@@ -13,11 +13,7 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
 
 LICENSE="MIT"
 SLOT="0/7" # SONAME=libffi.so.7
-<<<<<<< HEAD
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-=======
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
->>>>>>> next
+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"
 
 RDEPEND=""
diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index 499f7294cb01..599b06e05c82 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -9,5 +9,5 @@ DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fba
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 BLAKE2B a7c8466fbe9f6613108a6a1b450c47c69018f9f252c17647b07591cf9fba2ba3a08cc344ca54f4647a9c809cecaa18b42bf9f2eff9e253749518b68565024b48 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD libgamin-0.1.10-r5.ebuild 4041 BLAKE2B 785841cf3331cf45be7d8270a6fe7fec3c6b8d704c7b00cb2b63a8e702d6876669e904abecf49bfeb2483a814b529ae00eba823765777de5b5feda2c84e019aa SHA512 3a1615f6824fcf1da8390558a39bd85894af5e9f5b5fe7faffdcd8967641baa649bd4fe2005c0e892f54c2abc2d7d61244af02cbe0e1c0ad969630ed0f1ceb63
+EBUILD libgamin-0.1.10-r5.ebuild 4019 BLAKE2B fc14088fa1c386ee958aeb7abb235a6a2229ee908b37ecfaede107925a4cac8c3e6a28fc8df09548e98cac2a4fa475b661b42ea01ca4a233ebcba79611d11ec6 SHA512 ed92809c85c8f70b1b6355b5540d66b23d746fd8901d0778b1c89bda184b3c46f44b7414e5c163c7ea1b81c4457409ae05138576ee26a08faaa63a7c76d64e9a
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
index 82ef17bc6fd8..3767fea2ce1b 100644
--- a/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug kernel_linux python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libgcrypt-compat/Manifest b/dev-libs/libgcrypt-compat/Manifest
index 9a17f151cb2d..e6789cd531a2 100644
--- a/dev-libs/libgcrypt-compat/Manifest
+++ b/dev-libs/libgcrypt-compat/Manifest
@@ -1,5 +1,5 @@
 AUX libgcrypt-1.5.0-uscore.patch 981 BLAKE2B 0f7bae068fa1c04834a0295b902aa479304a8b9f066d984d28a49c59a5c041281d93a7bc73e053f4098461364e87b7a665cb890b4792cdf221f44593c23fbae4 SHA512 716e182684886c905525ab9218b3453fd968ee8f73da83d3ba97ca84a868e18eb1c1c9bb3891a1e4b25f870eb3d762a5e8a415168c9804e9367d8dd12090a601
 AUX libgcrypt-1.5.4-clang-arm.patch 4189 BLAKE2B 39fb88e752a544232c4c48aa8b8df44952e700966f1cbc361664015d075c1d8ef171ae68e9cabd87cab9ce0424243dfbe71271ce2a984d7ad1bdc8c52efd1349 SHA512 86d462340595420a70977d697237a8bb87583750e90c8368ce783ca0fbfed8816c646dd5e40b8e929fbce29917a2b05bb48a0a492d271605958fcb98faf4caa4
 DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9ac3c78141cc888ee978882aee39ac386a1e90588d3840bf0595a519437e92fa53b5f73d8659e193a43cfa374dfb34 SHA512 2c16912de66bc83adfbf8f43a2a9f57e1afcc866b1774ec11a670e2a793a7c5f2029d134c0bda681c9cb95f7dcc166133782c124e520b7fbe246ec10a9e1c06a
-EBUILD libgcrypt-compat-1.5.6.ebuild 1637 BLAKE2B 81b3abe1b1d4ac59672e16a535434cf20ae71fb2b4cb0540466cf797e3b2a0a0b9ccf5b0b51cb0022800abb80e365f95c867ec2d92be89a891fa907a7ebb2e4d SHA512 e5fb4de70dabb43c417cf5ce03412ec7f489846563ca87926199214d483670b10e4ced14e8b90c48fd51e9e150b52683c9c65797b08394c19ae78b9a72fe470a
+EBUILD libgcrypt-compat-1.5.6.ebuild 1615 BLAKE2B a4f95ab70371a9e771a2ac867378413c437747581035c245a17d97237e470f4c21b9ba878937cb3b555677b13e6ed5ec31f2b26fabae1d0946e8efd057e91352 SHA512 b3bfc9f3324052f326bb37b23bfeb537aead61c248781b24b319264945e29af7a5c28fbd5bb325d562e1981a1fbe4551e0286d4d248b4c91e86860781e4a1895
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
index 76e7e0a7adc8..bca8a3b5d9a2 100644
--- a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
+++ b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1 MIT"
 SLOT="11" # soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
 	!dev-libs/libgcrypt:0/11
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 575e036a12a2..cb34a8f4fd2a 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -3,8 +3,8 @@ AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc
 DIST libgcrypt-1.8.3.tar.bz2 2989166 BLAKE2B 3443883c3e8d005be6cbdc91589b8b287226f26eb59536e1a32512004af739a64a3817ac38fa1132fdfc3424c21ca49c81db93535a23d590a5dc4f4518f3cce1 SHA512 8c873204303f173dd3f49817a81035c1d504b2fc885965c9bc074a6e3fb108ceb6dca366d85e840a40712a6890fc325018ea9b8c1b7b8804c51c44b296cb96a0
 DIST libgcrypt-1.8.4.tar.bz2 2990108 BLAKE2B 97a1f9382adf23cd4ac491a392882f2e712fddd4f0d95a4fafb9cc70aa41ffa7b7b6a371b8368e9c99e3e1849b9d38078abc55703d4d8b25289f3c662e6ba8a1 SHA512 b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1
 DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02add413f633d96cc95513daa6e6b0e098fe803bb6a0e405a241fddc5ce0cfad61658d57c27bd724eecd32fd862af4c99 SHA512 b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89
-EBUILD libgcrypt-1.8.3-r1.ebuild 2314 BLAKE2B 6487043c0cdd0129411e11726e29878d99fce2f075d17f043b97640c73ef147184fa832576a5dd57c40b59d2b7f4c2559f7bbb03576eafd9d64dadb9ce17b68c SHA512 1ac41888cea18aa75e5cd3190c89999ce1ec4dcbf4376890c9a8cdabf414fe8022644976d7c75f6ef26a883f7a0863d5363f9979af45f68e5eb539db890a776a
-EBUILD libgcrypt-1.8.3.ebuild 2186 BLAKE2B d1c56ad5f0182fcac6ab2fa237e5205818a0f61a7edea666b1f0f1fc4fe1f95fc6ad4a410262b293fb6e47f3e570d71f552a717887a9efb921bf902bb4f12061 SHA512 8f902c37512a01fcbc83026281e8ce9f5a8dc18d975c180f4f4206c38538dad8192ff15fc3782bcb6475e37c4bfcb4b3a96ab5321e79268a91a623f890aebbae
-EBUILD libgcrypt-1.8.4.ebuild 2321 BLAKE2B dc12986a53f6b6b61e89ad3a8e40d67115fb477874dbeb864350c196e6368edd20edeb3f2ec2c97591ece373b6868ef93f98c123ac895c6dbdadcaf9e154f3a7 SHA512 9b62ad68c6bd0721a89c683b3d96e0923fdb241e0c468898b0f8db161e7d46a5abc0fbf47adbb356da173e0d52793c04d84a14038b7b86ddbbd626897427a49b
-EBUILD libgcrypt-1.8.5.ebuild 2321 BLAKE2B dc12986a53f6b6b61e89ad3a8e40d67115fb477874dbeb864350c196e6368edd20edeb3f2ec2c97591ece373b6868ef93f98c123ac895c6dbdadcaf9e154f3a7 SHA512 9b62ad68c6bd0721a89c683b3d96e0923fdb241e0c468898b0f8db161e7d46a5abc0fbf47adbb356da173e0d52793c04d84a14038b7b86ddbbd626897427a49b
+EBUILD libgcrypt-1.8.3-r1.ebuild 2292 BLAKE2B 38d4a9d686f779239cff3c17886f080de25659644cc85f2f3aa8a8edff513796bc422f21cc22bbfdfd76d295bd50cc2efef05e387364b43bfe044b0d8919f510 SHA512 8e63df596a948a263d9ca3f8cf61c754e4de3c44415f2caa8302b78a82a653609f507b270533274d8d6f13bf10ccee51b5ab4eb8533decaad5f392b4f44f2fd9
+EBUILD libgcrypt-1.8.3.ebuild 2164 BLAKE2B 6eeaf43d21631f90044c7bd235f1babaa3fb7289c4f98efd5925b136862460977ffedbda6a6077991da97292827fb2e287d94fd80ac718331ff7215aa6cb902b SHA512 98fb08e085e9eb8c434284da991012b2fe9c299e2f264700b078a1200b22872a966e5747b8cfb0a641d08028a7c164c1294f5f46b375349566f31bc94afcddfc
+EBUILD libgcrypt-1.8.4.ebuild 2299 BLAKE2B f9abd685b5e83a619f2368c2761db3e045f229d007c8b5256756514b26654a356102ad844ac4938c06261c9705b253751fb33d765d1ebeb8868e94f0739ad61f SHA512 a201729f2b2240aed59732a3056c4af64f240f3dc9d67938ab9a2c1e4f101f02c08bbad92cd5b5e18e42865796b9fa9570b6f65994169d08a9adde7e80c87d94
+EBUILD libgcrypt-1.8.5.ebuild 2299 BLAKE2B f9abd685b5e83a619f2368c2761db3e045f229d007c8b5256756514b26654a356102ad844ac4938c06261c9705b253751fb33d765d1ebeb8868e94f0739ad61f SHA512 a201729f2b2240aed59732a3056c4af64f240f3dc9d67938ab9a2c1e4f101f02c08bbad92cd5b5e18e42865796b9fa9570b6f65994169d08a9adde7e80c87d94
 MISC metadata.xml 520 BLAKE2B bad7a2483330a66817b97b268b4bdedc48665f7697d8880263c890e74ca279616d857fbea686329d38385668e7b71c4ed5caaf42eadb49c0e0fecd1b4f23615f SHA512 26704a1e1e8d37cd7ea9002a0e2ad8cd0585b86486dcf8e3a419cce7945fa41b170f1e563ff62cf0a1ecc776b0a04c463cf4e8424ccb953484d2adfb708cfbd4
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
index ffd3b99f24b0..22ba9221713d 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
index 810c58069660..6c3b0aaa8ad5 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild
index dfb82b98c9ca..778b99687913 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
index dfb82b98c9ca..778b99687913 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index ad5e45ed0ec2..084f2ac27938 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -2,6 +2,6 @@ DIST libgee-0.20.1.tar.xz 681464 BLAKE2B 5e7d6d9fb9c2833bd7334f5fb38dd1ff151ee4e
 DIST libgee-0.20.2.tar.xz 675684 BLAKE2B 197eea5f1c4babf203e58c65a3419407c7657f4fb92e4e921afa2408cbe3dcba3f8e554a898766c83d3318a4a7fddc47b17f21daf04d79b5635e3363749cb035 SHA512 4ea312f73046fee5d0ad1d5d1942c9f4aecbec22509ce7f00b51352039b9643d65d2f37d4c0de550f0165ff7f6058cf88ecb55d7c5963706a1b63d5ec14c7d7d
 DIST libgee-0.6.8.tar.xz 443060 BLAKE2B b11275dd27492c0ae80fc354f1167e96def9b7c126089509f83b6d291eb48155224f5449e1b22a2549c6e3f2cb5d5daf5daa3ccc425723b7a203762e09ada091 SHA512 b26d36ee9fc0c5c214521ad97bc20f11f1191a3dab72a5f1af2f6435f51ff2f28e81ccb26fac399939c1a7eaad519db98032d3bc593a4052463acd91bb12902a
 EBUILD libgee-0.20.1.ebuild 679 BLAKE2B 56a9571229a501d6116c9c4de19620e8323caf7d5d96402b180ea1b82108fd04445f4e8694fdc9db522c873e956daed754fd974f8f481afcbb363f8e4103dfa2 SHA512 b852c9bb102daeb8bfcafda5c5200861c155ca7635061f5b136cd9a340102cccc8351344f1d7657545a2f0b411fdfe2737cc1f59bb76e6ad0561fab2ce6ef3ec
-EBUILD libgee-0.20.2.ebuild 681 BLAKE2B 5c3d370a843ba6612f63d836a2bdbbbb42ee931374d1fad70a44cf5c4a642c5c5fd2cdb6d4e08694a91be13b51e158b671917f492712fa7d7320a8461b5df9ac SHA512 0b48e7f0dfc8a46dcec6a05a9adadb5d979cf74ecc2bbc3dce516d09a163ca468a6704fa1f81dc1c58e71825c972f7ddcc1a73a8085f09a1719226680f0d116b
+EBUILD libgee-0.20.2.ebuild 680 BLAKE2B 4780e9319d6c9d9347ccf5565287874b214b59f46857af7ac2fcd5832ff9b33bb6f52a884b5b8f737b317a4b6e0b2ccd349f5f7a0db5315ad6c096ad23a48e72 SHA512 4c8c85d2549d33b69b22bc208f9d16c87aa977eaeb1a662f667340ae614d8ee7586fe03639b31916b0e165aa76e44c399ff38afb595156eec338c9d96bd63344
 EBUILD libgee-0.6.8.ebuild 659 BLAKE2B aae1527a96cc83f1408aac93b27aa67f82fa8f2c772fc026b5f4a14e41434ff9381aaca40f4f8fe7127e56d332048badae59eee7eec69e6cff5c1412ea3f7b51 SHA512 be5bb339f217170fa8725f2e02a7c222b023cc3dda19b86bdd67806adf9e6c8197dda762112a702ec72b6d9da5fed335dbc2f32a5bd92dca46fa55379089d79e
 MISC metadata.xml 410 BLAKE2B b14dbf9387001ee3bec2f3b5b968bf9b206b747a838ea70de2e44fe60397b4e0d498a3809719298d93e7bcb1908cd9d7cea4e84fc5ef6a1c32d4819b10cb574c SHA512 11953fbacef993713af860af50bb3d6edae2d69fcf672a3aa47e7c9198e514068b18ccc0eca76cf35888e2364a72ef7d9e9ad8498cd1e96663c4686e36a42285
diff --git a/dev-libs/libgee/libgee-0.20.2.ebuild b/dev-libs/libgee/libgee-0.20.2.ebuild
index 57a231d1cb7e..2471406590e3 100644
--- a/dev-libs/libgee/libgee-0.20.2.ebuild
+++ b/dev-libs/libgee/libgee-0.20.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.8/2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sh sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sh sparc x86 ~x86-linux"
 IUSE="+introspection"
 
 # FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index c93b9d050d87..69c6ea34442f 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -3,9 +3,9 @@ DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3
 DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88abecf87aefb655eb7847546148a6a887caf7f574aae101274da20375b90b32c35d599508711f7b5eac2addfabfe4b8 SHA512 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b
 DIST libgpg-error-1.32.tar.bz2 904382 BLAKE2B 92141af9e00725015ef31152ccfe4db9535a7a6ba0aa6d011f2404bc998d7b0932fdce742a45d271995c838d34342e5197a081a42eb2e5e29c11271a1c11c6f7 SHA512 0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20
 DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
-EBUILD libgpg-error-1.27-r1.ebuild 1287 BLAKE2B d8b77035b21a5d67fb35fa94c7581a1c2229aff20fab7ad47ab4a0bc18490d4331dbdfb81e2114b5f3fdfb4184837067a3afcca141710b1f846d3e40de2f3c98 SHA512 59121052137fb7f122a048bc320076d1d54320a41748aa5647e3d660be4b53d1d89868eb4ae23335b0492ee5b530f912449c45f1e1a5a8567b386fc7f077993a
-EBUILD libgpg-error-1.29.ebuild 1289 BLAKE2B 0d86eb4d6815b150aa7f9514e44368af4a45ab36462e4f8d858552c7b88df9e82ca103d2f742f42e5d93ea5df9721b47f08026ba99eb9fa5c63bf27bfa80059d SHA512 6b22dbb50879e62a76df64f957a23a718177a37f610b793c09c6e08c073fd882e421ecf820a0499e77edaac7cb3095003e1ccb5b62ceddb46fa88513395284ac
-EBUILD libgpg-error-1.32-r1.ebuild 1409 BLAKE2B f0cde481c3f551321a384ed1b322255e5c8ced45edb655d744ede766ade0e930a540d9dad756da5d1107ddb52499fd102b1c4500b02064bb816948bdfe1fe9f5 SHA512 09e05389ff67906dfc1b93d57b4fe556b07ecb5b758b0567f90b5bc0c58ea4ae3aa5aef638fcec7a3baa1a1a7d0925ba1545c03342689f84c79600bbc95426c9
-EBUILD libgpg-error-1.32.ebuild 1300 BLAKE2B f7367cc13a9db8e3e671459d9dea8884633c5f401af615c28670c4902c52e9f461ad4d40b2cee61ba4aaf0b76f205ab55a32b724083a14d3762d469109894f66 SHA512 ae3d6a4c73e9ba6631a1f852278ea3a5827e81271ef90bc8cb991cd7c4b69cdf81df660ac768cd76d3a5b8010bfb7da9c7cef1421dfa1ba01138d2b03a3b0282
-EBUILD libgpg-error-1.36.ebuild 1698 BLAKE2B 05733dbfe51f67dc94d64bf026275dc406171e56493ad93cb76750a43f0b4dac54aecc33a0b76cb09c4dd0facf66d0c6798507661c11dec05edfb5b87546ebd9 SHA512 f162cc28c818fd305b2168807128d097bd82d00d6aed41eb1e59e75b33d8d638670fbaae624c332866e3d34a9e9744be1e64add036385d025b671bde553735f0
+EBUILD libgpg-error-1.27-r1.ebuild 1265 BLAKE2B 349a369087dcd5d7ff7612809f2e1b0f20ea3b7acfa888bd8444fdc5ec8c7682dbcb154a46505abf7fbd6b9ea379e510f7d4570993f2deebe03ab78955381106 SHA512 404de903ca1b3baf567a04ae93034bf87cf504d681e3066ce49c9627318734511ad939ab89d9300fc3109289ac22b6e1f5de4ed86eedea44eaa649a6bfe1fb79
+EBUILD libgpg-error-1.29.ebuild 1267 BLAKE2B 3289b5f32041006b5f2ef2a5f415401e796cbffbe1c319400e975046b409ee25940e2788a3edf53be58ded7de0efa59c2faaccac546dd78e7e442abbed4d5dae SHA512 ec87dc4b6fdc15c0e8160afa9e5944597f22b4d2cd412546e77b8db5bf51c3bd560b2025a1b87072d097bcbe360caadeb90990590539a431783ec0e513cc9717
+EBUILD libgpg-error-1.32-r1.ebuild 1387 BLAKE2B 38aa122aa803af7e5ef2279acf67b9e4d28c2e4f424dfaa54b9feec1394d3c693305e64f2b87f82f88e02be92bdd825f1ac3397bbd6e038f1514ddd6eb61c2ae SHA512 1d6b3a31a5f5309d366c7fb926b38728d10f61d03886d78f4b95322a2f997cec9a615e0e2220449b914f256e1a5b69cb242674a69d4982517f0b3977e6729e41
+EBUILD libgpg-error-1.32.ebuild 1278 BLAKE2B 78410d700e760cd3e985fdf44bb343fbd8d23f5f07149a3fe9e284f9461b2bae1a4e3d8f70582e197ddbc0759467a139e10779ad8642444e82c61a54571aef07 SHA512 5d39f96c3259b7905bc7b25ad7894fb30c85151af897cbac7fc59a57a20a886114d69b51e5cad43262a3d704bca9ba4a6f593d73ac6eb799b6b4b7d38bd374ac
+EBUILD libgpg-error-1.36.ebuild 1676 BLAKE2B 69f235bb88b2ddd35307e8884a4ef4c8ff8d70eabe54c3f947309e92aba0a47162f02a5af63a8bfe272b6d448b54b94def6a359983ff5d5a544f60d679687377 SHA512 1bcbfdc8e02aa85e53736d9fd25d6d11f89ed5fbb03a4581af89bec73bd9394ad0819e16e96f7db794e9e40141d02b63b2bbb6939821ee69e91631f0cbd55110
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild
index 6bfe1cfbd13b..c5a4e710ba06 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
index 45f1b8149553..8a3edac23997 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild
index f43692029854..6dc647c6a814 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.32-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.32.ebuild b/dev-libs/libgpg-error/libgpg-error-1.32.ebuild
index c45b281f1571..c8bc57ca5721 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.32.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.32.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
index c82ad8572c92..1c2b8171b08f 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgpiod/Manifest b/dev-libs/libgpiod/Manifest
index 4200edb85652..3bfc66b50326 100644
--- a/dev-libs/libgpiod/Manifest
+++ b/dev-libs/libgpiod/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..50141fbb2619
--- /dev/null
+++ b/dev-libs/libgpiod/libgpiod-1.4.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib multilib-minimal
+
+DESCRIPTION="C library and tools for interacting with the linux GPIO character device"
+HOMEPAGE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/"
+SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+# Reflects the ABI of libgpiod.so
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="static-libs +tools cxx python test"
+
+#  --enable-tests          enable libgpiod tests [default=no]
+#  --enable-bindings-cxx   enable C++ bindings [default=no]
+#  --enable-bindings-python
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable tools)
+		$(use_enable cxx bindings-cxx)
+		$(use_enable test tests)
+		$(multilib_native_use_enable python bindings-python)
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			--disable-tools
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	if ! use static-libs; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+}
diff --git a/dev-libs/libgudev/Manifest b/dev-libs/libgudev/Manifest
index 3d67208bef03..6307642a3058 100644
--- a/dev-libs/libgudev/Manifest
+++ b/dev-libs/libgudev/Manifest
@@ -1,5 +1,5 @@
 DIST libgudev-232.tar.xz 270904 BLAKE2B 90b2ec011f065929bd560398de9cfa8c365f9b84d205c816f2d7a98391d96bde47449eb77bc76b1e486af7dfdb3ed6525f216549e0dc3571b2ee672920438c98 SHA512 f648a41e2a6af7e26634c7cc259fdc47bb6e6ffb329324d157f340e42928e28c2059a0e923b9b0aaecd1ee3ecafbc7b55e5652f1f77bc1b88367b97057a1bedc
 DIST libgudev-233.tar.xz 271292 BLAKE2B 02c9a1040e3db21a9478927cce99cc8fdb360db922fc35421fd41ceeaffc786aa9f397f9387ac9d98bdd8ed45a457af2c0d33df731edfa08b63cb64a2c7fa4e6 SHA512 0e7beb35478bba2aed3cf8e750f524c562038b04fd59e4dd31618b0ae7cbd29545e5909c422325e4be84dcab9177a5256bf0f3ce7df7b6c07e4866cbb8ce570b
 EBUILD libgudev-232.ebuild 1113 BLAKE2B 1e963ec6a6ea7bcc322d55489203147edcbbde2593bdc9d24461b0bd2c2d6fd806d1b357b9b9ef4e7a47cd49f5826e96ec61506859f8ca6ac59e7a0fa745e63f SHA512 858e3f1db9b255b87115ebeeb7922db41cade10ad7b6cc1a45fb96f0108e20c6f29d54702fd2435a160d96141ea3b07f3eb595ea505f8367b0eecbc53faada64
-EBUILD libgudev-233.ebuild 1115 BLAKE2B 430e39a05d12b04f4e72d99ef5759acf401abdffe4e58085b4bb8ac4c16622b40061c8b6ec4d4dda1fc7bf22d002ef43d2cc01057d3496a1b8a77603a49a4f77 SHA512 11077efd14925e9d2c80feeb19c52387824affd6f339859ec6829555923a89b5712676c5e58cc4668ea8e993182e7b87d4448c1e928ee7a394b31e7424d169f0
+EBUILD libgudev-233.ebuild 1114 BLAKE2B 31a649c775c10b05f8868d9a40de1b4e4b8674fed25a2cd40d429a2db50c83c98c050e3b2704c73cb99a3ef96a56eac78f99f0643228e70a38bdbdc5e467f724 SHA512 084c10c2107744cc2a425eed499523318bda4417c84e8e42fa8296d2cf027cb640ade870bb86304067ff954da28d5e5ea72eb92084da1314e7f520e98dc4bb1a
 MISC metadata.xml 361 BLAKE2B 82ce1db7744cf4c9d543621978add958e480a57053f250d98d756d2d476e2ad84adf8ee41e8c332eaaec255ce9440223579ea072aadb89023c1bfd359acc6d1a SHA512 5306c2af0867c2122471d13cf49ebe04cccd62897c82d73b66b52792d784ca7bfd7d2cafa0821998084e78b43505fc449040bb46c2b406ba2d50b8a92af03f1f
diff --git a/dev-libs/libgudev/libgudev-233.ebuild b/dev-libs/libgudev/libgudev-233.ebuild
index fa7922052b17..0418a5ea6276 100644
--- a/dev-libs/libgudev/libgudev-233.ebuild
+++ b/dev-libs/libgudev/libgudev-233.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgudev"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
-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="introspection static-libs"
 
 COMMON_DEPEND="
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index f867468dd74a..4a35da1dad92 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -5,9 +5,9 @@ DIST libgweather-3.26.2.tar.xz 3409528 BLAKE2B 1c5cdc7125aac8df95e97db8fa1d63bcb
 DIST libgweather-3.28.3.tar.xz 2711240 BLAKE2B 9e55c32485401fa31e5ca5a824f239c373e41c2ef3a1d4442ba4512f102edadaa3452bdc4f4a445ea34e5e24cda23fbf6e1363da5bd49f70018b387f7450cf15 SHA512 7eb98f15b624090ba0959f4ee47c1a2317504a381829cebb949f4104ea9b5c2847a98f95de60a35c5bf1094e500041c53e1afdb265dd2f237bc49db8acbfd6f2
 DIST libgweather-3.32.1.tar.xz 2713696 BLAKE2B 496aa07c517ad570ebf54041b8ae14ec5eb5a923a113e1adcf23e5ac9a515ccb5c2dbeb29c923f0abcfc213409ddafbb1747c5ed5a6129bd4ac40b4e0fd687d6 SHA512 f5ae94436fa3cceee84ff80f14296f11ab27727e3881689dd71126de158f7d0015b462163cb2b47cf30add5a4c97c89c6473c1ed0515fcaac0dde2daffdf7108
 DIST libgweather-3.32.2.tar.xz 2716144 BLAKE2B 56bf66edde8293758f49c1ca14b47fb725f72a0202e95e6e1d1832c179fd9414d527827be5cb7daa17627abfbd1ac16d8d09dbdbbdcb24d62cc62c25a220c156 SHA512 61543e5eaf8c04605a91a6f47811b3a0ed2b04c2f50eae9b8d08a4e24904db4731748fa27a0863d2cdab5fde776ec55abe9fd9fb2a72c7bd546665d59957cb4d
-EBUILD libgweather-3.24.1.ebuild 1322 BLAKE2B 105efe6d6f95643f2b98f5bc5ddc0ad9ddbd95ada17e085830e1617ae84ca8518584fb001c9d149c6fc9597965248a8502c92dc9b4cc78deb54f89076747746b SHA512 5c6bcafce98f58aaa43954eab525215f1b60df96b8b35ee72eb4fe794fcae3e8fd13cfe9524bbfb93e2fb8112f65418417b02b0a9ca715db71a2be37e0912252
-EBUILD libgweather-3.26.2.ebuild 1324 BLAKE2B 3dd629227ddea275fc27c2dd90049e29b6c23289a8c5b18036c07506a4adde288dc89ce393c6d57f0417f4f38da820c8650fae56350a771bfcc7d98437890348 SHA512 d932b1409e199220dbbd947813792ba707bec218cc4347f58ed31814d3cd715e0a1aded278a93bbe2add82470dd7b7bc72bbe292c9d0be0c808a7fd141bd939c
-EBUILD libgweather-3.28.3.ebuild 1567 BLAKE2B 2d9c723d196abc39ad39c6e690387300b0c5fefa117b1f6305ae63820ebf6fc839d69b5b612cd5126607050baaa5b3733d4992faaba2f6393ea2766059e9b286 SHA512 c3bd0b3a4b85ba09525fcc648713216dfd4c4817f21912d2c470e16a6d79cf230abdee9020e90416044eb289c75b1c3b6b974a393ffcb3b1fe8d61e4771f754f
-EBUILD libgweather-3.32.1.ebuild 1580 BLAKE2B 3a4afade029bc309b39224d08064322845b4becb3d945ac1524e03b0b6ab09dd37c33e071a9026145f5e0f9124bf317b724de23458f13ec96f92588d998681ff SHA512 3915bbfd5289c4c843303ff55f3514401f093f86a23323041a80b0f3f2e54838d17ad8f044f743328158a59c9a8afc59cb20ec8e7b79d2c3fe68b86bb8dfedfe
-EBUILD libgweather-3.32.2-r1.ebuild 1677 BLAKE2B 7482b423a65c924336ed2604b68421ad6338bd4961adcca34185ef8a914237d2f29d4fa0ea99361108ec89e578851f98938c88626ab86a5f44e8ed8f6d9e730a SHA512 f545e7fa14e53cfb9d1710eb04345d4220aa9ca34bfed6c8a7a371b9dcaf1a494dbe88dcfc2bc8c770a57f0a4b6aeeb1e6e018ca249d3f55161173777a011e60
+EBUILD libgweather-3.24.1.ebuild 1312 BLAKE2B 518c863280f2a52a3bd39f93ba33c439289c8427138e8a82f206f89a211de9cc5b2899db5c498dc5f41d6d3f91f2f863577340255a04fa364f76f9eed505d78b SHA512 aa82ec23295aeb1efda2fcb5e5607af5667f3baaf1c9ae6e55ff63ab455f9d1e2c9bcf95a2eb2c551409c62873de675c19fad56f5be502b6d1b1ee0174f6454a
+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
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/libgweather-3.24.1.ebuild b/dev-libs/libgweather/libgweather-3.24.1.ebuild
index 8c03a0bfffd6..4a662186a25b 100644
--- a/dev-libs/libgweather/libgweather-3.24.1.ebuild
+++ b/dev-libs/libgweather/libgweather-3.24.1.ebuild
@@ -15,7 +15,7 @@ SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gtk+-3.13.5:3[introspection?]
diff --git a/dev-libs/libgweather/libgweather-3.26.2.ebuild b/dev-libs/libgweather/libgweather-3.26.2.ebuild
index 20d2fa6e6999..43dcd3751e17 100644
--- a/dev-libs/libgweather/libgweather-3.26.2.ebuild
+++ b/dev-libs/libgweather/libgweather-3.26.2.ebuild
@@ -15,7 +15,7 @@ SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gtk+-3.13.5:3[introspection?]
diff --git a/dev-libs/libgweather/libgweather-3.28.3.ebuild b/dev-libs/libgweather/libgweather-3.28.3.ebuild
index 4c1418d489fd..75d02795fb38 100644
--- a/dev-libs/libgweather/libgweather-3.28.3.ebuild
+++ b/dev-libs/libgweather/libgweather-3.28.3.ebuild
@@ -15,7 +15,7 @@ SLOT="2/3-15" # subslot = 3-(libgweather-3 soname suffix)
 IUSE="glade gtk-doc +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~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.35.1:2
diff --git a/dev-libs/libgweather/libgweather-3.32.1.ebuild b/dev-libs/libgweather/libgweather-3.32.1.ebuild
index 8d09094874c8..8070a129c9e4 100644
--- a/dev-libs/libgweather/libgweather-3.32.1.ebuild
+++ b/dev-libs/libgweather/libgweather-3.32.1.ebuild
@@ -15,7 +15,7 @@ SLOT="2/3-15" # subslot = 3-(libgweather-3 soname suffix)
 IUSE="glade gtk-doc +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~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.35.1:2
diff --git a/dev-libs/libgweather/libgweather-3.32.2-r1.ebuild b/dev-libs/libgweather/libgweather-3.32.2-r1.ebuild
index 55ebb469e066..49030f1e61dd 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 ~x86-fbsd ~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/libhome/Manifest b/dev-libs/libhome/Manifest
deleted file mode 100644
index 76fbfcf685cf..000000000000
--- a/dev-libs/libhome/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX libhome-0.10.2-Makefile.patch 2595 BLAKE2B 1ea80fd25b2f0d15cad374e132c37b1cdb26167cae9a2e1bdcc532230b1193057e10577d5a019c21bfed1b6aabdc41452a52397a7268ab0cfe4ba480040bc63e SHA512 c5594a56637570d76225a72a490a6e2a1dc1525c2a539e2a8bba9580364b449868e4f66bdddc9662e5a600658142e582c426fbceb4f68335b646a7cd1b7af692
-AUX libhome-0.10.2-ldap_deprecated.patch 436 BLAKE2B dac750c9499423992a236c1c1370c4e2b9b219b546ac9b87c1ac9aba7277592f52dd175e568226588315bab6110fc48e11d859193b1b454734e10c6ff9f3cfc0 SHA512 9837639846acb2e89c92e0b821faf40d9ee82af9f6837ea69b3d435da6433c6095b45dbf09178de5d361993405141bf9ac7b91e8f6a0bda65d038f80c6897ae7
-DIST libhome-0.10.2.tar.gz 286453 BLAKE2B bb2356fef6358b849896c665760174decbf5f83f70380c855c519c6a8cde37e053af70962f7552ffdd581b1af559bbc4a74d7d8ccedad39fa4a178ded394436c SHA512 9f144b6aeb8e01f5ca2f8f90c5289d4449895e2eddbfd2d8d9b1828bb203fd8f68c224c0f068ffabfa5ee1514f9b756cb2499f862418d793eb8d06ae960447a9
-EBUILD libhome-0.10.2-r2.ebuild 1198 BLAKE2B 577f78ce8270b6bd79db641ac1feef295e48bab090a358342dfaafb3bb242c58fe151c8be177b77cba84fec153144af52fc06bd4d60b6380914d5d3fdeb767b3 SHA512 e454ca4b1359063b151a91c53ad149b5e51a4acde59208a8b3cb688cc94c2f6785224dcfd6921801d75ba0a616d4373dd1f35c7afe6981c75abb67afde3c4124
-MISC metadata.xml 240 BLAKE2B 2e3833d1ad4ea9595d87b465cc7ddc1c7265e408573c1cccd947df928faa1db495ba24ad4417ba6dc46a8ddbe36876775dfda70309472348ac6273554b8e62da SHA512 b81e5b5547e3dc86326d624d771f3c7a55f6b85989c0de3827fd9df823f7fef49d66e6ba814d1ee6ee0e02bbc9705f00aa74ea6d247abe3db5cf3a57e4171455
diff --git a/dev-libs/libhome/files/libhome-0.10.2-Makefile.patch b/dev-libs/libhome/files/libhome-0.10.2-Makefile.patch
deleted file mode 100644
index 371335b0bec8..000000000000
--- a/dev-libs/libhome/files/libhome-0.10.2-Makefile.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -61,7 +61,7 @@
- LIBTOOL=./libtool
- 
- COMPILE=${LIBTOOL} --mode=compile ${CC} ${CPPFLAGS} ${CFLAGS}
--LINK=${LIBTOOL} --mode=link ${CC} ${CFLAGS}
-+LINK=${LIBTOOL} --mode=link ${CC} ${CFLAGS} ${LDFLAGS}
- 
- 
- hparam.o: version.h
-@@ -114,27 +114,32 @@
- install:: install-man install-lib
- 
- install-man:: home.conf.5
--	${INSTALL_DATA} home.conf.5 ${mandir}/man5/
--@DO_PROXY@	${INSTALL_DATA} home_proxy.8 ${mandir}/man8/
-+	${INSTALL} -d $(DESTDIR)${mandir}/man5
-+@DO_PROXY@	${INSTALL} -d $(DESTDIR)${mandir}/man8
-+	${INSTALL_DATA} home.conf.5 $(DESTDIR)${mandir}/man5/
-+@DO_PROXY@	${INSTALL_DATA} home_proxy.8 $(DESTDIR)${mandir}/man8/
- 
- install-lib:: all
--	${LIBTOOL} --mode=install ${INSTALL_DATA} libhome.la ${libdir}/
-+	${INSTALL} -d $(DESTDIR)${libdir}
-+	${INSTALL} -d $(DESTDIR)${bindir}
-+@DO_PROXY@	${INSTALL} -d $(DESTDIR)${sbindir}
-+	${INSTALL} -d $(DESTDIR)${includedir}/home
-+	${LIBTOOL} --mode=install ${INSTALL_DATA} libhome.la $(DESTDIR)${libdir}/
- 	test "@PRELOAD_LIB@" = "" || \
--	${LIBTOOL} --mode=install ${INSTALL_DATA} @PRELOAD_LIB@ ${libdir}/
--	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} home_finger ${bindir}/
--	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} home_su ${bindir}/
--	-mkdir -p ${includedir}/home	
--	${INSTALL_DATA} hpwd.h ${includedir}/home/pwd.h
--	${INSTALL_DATA} hpwd.h ${includedir}/home/
--	${INSTALL_DATA} hparam.h ${includedir}/home/
--	${INSTALL_DATA} home_version.h ${includedir}/home/
-+	${LIBTOOL} --mode=install ${INSTALL_DATA} @PRELOAD_LIB@ $(DESTDIR)${libdir}/
-+	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} home_finger $(DESTDIR)${bindir}/
-+	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} home_su $(DESTDIR)${bindir}/
-+	${INSTALL_DATA} -D hpwd.h $(DESTDIR)${includedir}/home/pwd.h
-+	${INSTALL_DATA} -D hpwd.h $(DESTDIR)${includedir}/home/
-+	${INSTALL_DATA} -D hparam.h $(DESTDIR)${includedir}/home/
-+	${INSTALL_DATA} -D home_version.h $(DESTDIR)${includedir}/home/
- 	chmod +x libhome.sh
--	${INSTALL_SCRIPT} libhome.sh ${bindir}/
--@DO_PROXY@	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} home_proxy ${sbindir}/
--@DO_NSS@	${LIBTOOL} --mode=install ${INSTALL_DATA} ${NSS_LIB} ${libdir}/
-+	${INSTALL_SCRIPT} -D libhome.sh $(DESTDIR)${bindir}/
-+@DO_PROXY@	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} home_proxy $(DESTDIR)${sbindir}/
-+@DO_NSS@	${LIBTOOL} --mode=install ${INSTALL_DATA} ${NSS_LIB} $(DESTDIR)${libdir}/
- 
- install-nss:: nss
--@DO_NSS@	${LIBTOOL} --mode=install ${INSTALL_DATA} ${NSS_LIB} ${libdir}/
-+@DO_NSS@	${LIBTOOL} --mode=install ${INSTALL_DATA} ${NSS_LIB} $(DESTDIR)${libdir}/
- 
- compat:
- 	-mkdir compat
diff --git a/dev-libs/libhome/files/libhome-0.10.2-ldap_deprecated.patch b/dev-libs/libhome/files/libhome-0.10.2-ldap_deprecated.patch
deleted file mode 100644
index a96645176c13..000000000000
--- a/dev-libs/libhome/files/libhome-0.10.2-ldap_deprecated.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libhome-0.10.2/hldap.c
-===================================================================
---- libhome-0.10.2.orig/hldap.c
-+++ libhome-0.10.2/hldap.c
-@@ -27,6 +27,7 @@ static char const rcsid[] UNUSED =
- "$Id: libhome-0.10.2-ldap_deprecated.patch,v 1.1 2009/07/05 19:25:41 hollow Exp $";
- 
- #define passwd system_passwd
-+#define LDAP_DEPRECATED 1
- #include <lber.h>  /* for openldap 1.x */
- #include <ldap.h>
- #include <errno.h>
diff --git a/dev-libs/libhome/libhome-0.10.2-r2.ebuild b/dev-libs/libhome/libhome-0.10.2-r2.ebuild
deleted file mode 100644
index b94cfd3c8377..000000000000
--- a/dev-libs/libhome/libhome-0.10.2-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools db-use
-
-DESCRIPTION="libhome is a library providing a getpwnam() emulation"
-HOMEPAGE="http://pll.sourceforge.net"
-SRC_URI="mirror://sourceforge/pll/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="berkdb ldap mysql pam postgres static-libs"
-
-DEPEND="berkdb? ( >=sys-libs/db-4 )
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c:= )
-	pam? ( virtual/pam )
-	postgres? ( dev-db/postgresql[server] )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.10.2-Makefile.patch
-	"${FILESDIR}"/${PN}-0.10.2-ldap_deprecated.patch
-)
-
-src_prepare() {
-	rm -f aclocal.m4
-
-	default
-
-	# bug 225579
-	sed -i -e 's:\<VERSION\>:__PKG_VERSION:' configure.in
-
-	sed -i -e '/AC_SEARCH_LIBS.*db4/s: db-4.* db4:'$(db_libname)':' \
-		configure.in
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --without-db3 \
-		$(use_with berkdb db4 $(db_includedir)) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_with pam) \
-		$(use_with postgres pgsql) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || find "${D}" -name '*.la' -delete
-}
diff --git a/dev-libs/libhome/metadata.xml b/dev-libs/libhome/metadata.xml
deleted file mode 100644
index 77f70a1e61a5..000000000000
--- a/dev-libs/libhome/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">pll</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/libhtmlparse/Manifest b/dev-libs/libhtmlparse/Manifest
deleted file mode 100644
index 49d6665e84b1..000000000000
--- a/dev-libs/libhtmlparse/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libhtmlparse-0.1.13.tar.gz 202176 BLAKE2B 070d4d5ab6eebc46a310481e7265dd134b4b109fd7e89a3f3ed39319c954c6e5dd8e869eeec7a2f2126467254fdaa807a84fa2de437685836d46ef02a3cfb10e SHA512 51366b24ebf5cc1e494f146ec996f9327d20a41cd425ccade23c45bc95eaf76dc5e339aee6a459c794f527a55d7cf96502832dbe88281ee7c7e2b3c14d3a53aa
-EBUILD libhtmlparse-0.1.13-r1.ebuild 808 BLAKE2B 88790d0bd973a5e7aa9e0dd73ee11574e7c0fe1be9a1a0c996783c129765f5370df702fd37c3172a984275030c1d3353bc37021ec8d4433c1eafb42cdbad3f79 SHA512 70366b071bd1537d52d496981b01dea528d3cfe95fe3e0f11c8d222b9829acb75ac22270a64823515d483a351367db4d106be14f9e98e36230b32ac4b1fbe88c
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libhtmlparse/libhtmlparse-0.1.13-r1.ebuild b/dev-libs/libhtmlparse/libhtmlparse-0.1.13-r1.ebuild
deleted file mode 100644
index b087e1d46606..000000000000
--- a/dev-libs/libhtmlparse/libhtmlparse-0.1.13-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="HTML parsing library"
-HOMEPAGE="http://msalem.translator.cx/libhtmlparse.html"
-SRC_URI="http://msalem.translator.cx/dist/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="static-libs"
-
-DOCS=( AUTHORS BUGS INSTALL ChangeLog NEWS README TODO )
-
-src_unpack() {
-	# for some reason, we get a "this does not look like a tar archive" error
-	# but the following works... go figure.
-	gunzip -c "${DISTDIR}"/${P}.tar.gz > ${P}.tar || die 'gunzip failed'
-	tar xf ${P}.tar || die "failed to unpack ${P}.tar"
-	rm ${P}.tar || die "rm failed"
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libhtmlparse/metadata.xml b/dev-libs/libhtmlparse/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-libs/libhtmlparse/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 9d5d8d81bbdf..1e169a48f238 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 2085 BLAKE2B 225bf8884f0c71986de135bf79c4b4bbce00f8a437d713bad09b3c999ddda3f362973313effef20000c30ff7d79d68ee83d2b3689cc3e397e92c1c9fe8379850 SHA512 7f881e58e5c9b920e27eef4a83bf2200b8f29a1787a5d80c87046350ab7a36eee72d5b90e04a046a1d92092c9ba68fe6b1d4dbccacf309175398238836820e69
-EBUILD libical-3.0.6.ebuild 2241 BLAKE2B e4d727df378339da58902c846cb305a611d33af611e3141d5afc3487278679364b8690343e78132a1eed3137915dc8b31e6bfc15749f17af67a62764cfbb4e11 SHA512 ff5fe4dd9b359600c0153c27defae5e6cdf2d7ce0ba767cbcb160432e63eb9ea1ded87c2a34598eade8edd2ad2e0c0982c18b2f135876645201e490d2b3c4151
+EBUILD libical-3.0.5.ebuild 2063 BLAKE2B de5f7497391cd3be77755b00b034ea61d584cc68c7ac10f6270d14387a237b753f0ca8eceb2fde5ef9e6d1fb5b2fb479dcf0770f37b8959f6e094fb53f16ff00 SHA512 7fc2aef6bb07ecacccf61471b7f3ba429b11d2026cadec9e531ab70fc40bf1a6843b214002f52a5e8295258613b6c5bb21ee7816a1f8cf2df6fc269fada0131b
+EBUILD libical-3.0.6.ebuild 2291 BLAKE2B 7b7d18118a84ca73d7280c8efcadabf4f9ba5cb0e8afed4e07f8b72c2817c774013ba5cb98a8e044b87d2b113bcffa2c79d3f7329784843c926d9e5785e027bc SHA512 75fa075af5f10bc756c5972e04fb8dcb09a6d7b22ca61948ac0769708cda020aca40d2aefa8dc5d57531460cf90074a674ef6e2be0a1ef6c3b0d85af7474b82e
 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 8b595cd6c716..3c63dcc44252 100644
--- a/dev-libs/libical/libical-3.0.5.ebuild
+++ b/dev-libs/libical/libical-3.0.5.ebuild
@@ -12,7 +12,7 @@ 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-fbsd ~x86-fbsd ~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 glib static-libs test"
 
 BDEPEND="
diff --git a/dev-libs/libical/libical-3.0.6.ebuild b/dev-libs/libical/libical-3.0.6.ebuild
index 91bc8ab78258..d54602970273 100644
--- a/dev-libs/libical/libical-3.0.6.ebuild
+++ b/dev-libs/libical/libical-3.0.6.ebuild
@@ -13,7 +13,7 @@ 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-fbsd ~x86-fbsd ~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"
 REQUIRED_USE="vala? ( introspection )"
 
@@ -21,19 +21,19 @@ BDEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
+	introspection? ( dev-libs/gobject-introspection )
 	test? ( ${PYTHON_DEPS} )
 	vala? ( $(vala_depend) )
 "
-DEPEND="
+COMMON_DEPEND="
 	dev-libs/icu:=
 	berkdb? ( sys-libs/db:= )
-	introspection? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection:=
-		dev-libs/libxml2:2
-	)
+	introspection? ( dev-libs/glib:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	introspection? ( dev-libs/libxml2:2 )
 "
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	sys-libs/timezone-data
 "
 
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index 7e7f549f5e2b..a7b941e3aa99 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -3,6 +3,6 @@ AUX libiconv-1.15-no-aix-tweaks.patch 981 BLAKE2B 37d0ce998456bb2c07b249c22e8cd0
 AUX libiconv-1.15-no-gets.patch 796 BLAKE2B 19eeadf7bbfb96c5c7d2037af18d55162d81bba61b2dc022dfc19ce25534fe72eea1b29424f662c199fb6769fdd412a00cb2d5cb0e41af75f435f3ee16d83efc SHA512 39c32470cb802d74ee6f97071e74a4cedc8374cf60b50f470ca318066fe45a71ed89c5c77dc7b3e70f0a3a33ccca7beedf6e96863a431515e957883467325bde
 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 1395 BLAKE2B 2519884957bfba96deb916850a3a8c8224379536a981cfe901a2e2a15a4f775e5b78412ba3d2f79a519cc53fe86e621080bb7e45abb6b8716d6f8b4107844570 SHA512 791bbdbffc31d5aa7aa363b78a88821551a917662fe337de7fa2b4fc8c5bd0c27670a09827bd8905b2045b467d50dbfecfc6ad7a2fc5b4774f5e009eaef73552
-EBUILD libiconv-1.15.ebuild 1947 BLAKE2B 6dcb7b72ee47b3b99126f4898039d3ad06bc093686e6c1357f3e2925e8004f39f3031c2241c1a75077a46ca31c7f9ed6722509f8bfcba2c21c02ef288eab4669 SHA512 73dbc591f4c27da079665790e7d4fa8664c954463d2b52c394249f50ec602f0577444a4e2e1f0917658889f5720bd6eed983972e8b78825198c6398e59d96d80
-MISC metadata.xml 564 BLAKE2B 465a39f6ee306925d4eb3f616cba7e08604aff5e94024659df611d45ea96245205a6f257175e862ae63e5a6d31fc549e2104d56a3e970157d25cf315dc820ffa SHA512 7c13a258f15e61b3e5fd3e55411466f8830d83ecc25676d491635037be07b1a35b845ec5a06d56c26ecefb8865149e486e939a72111d1a3e46efc26b87d632a6
+EBUILD libiconv-1.14-r1.ebuild 1373 BLAKE2B 8164ba86f9ac4090f75618b1e63aa64ea83f569ba474598d76d4e6a3b5dc222c517e3e810394abcd528223f43582e361d36540dbde51112bada4b85bdb10b118 SHA512 36f86203f6f1323365987386de64da46dd6534c7b56a35b77f79f86359450d9cb314ba5a84b7a52a550337f71e7339ee6a9ee7d171df3eada00dc05d62d3802f
+EBUILD libiconv-1.15.ebuild 1925 BLAKE2B 18b97b3fdafbe9bf33e361e49493e8be3f0262af5bfc6886d2ae69bdde50c27414a09aaba71f89e172b0d1d2c7db261d0985fda12058a16d1f173990cf168ad4 SHA512 23c2ea0f450f45aad91033dda76d0ddb363563cc958569eb1063c543ac267d59f640d505aadf16b9ebea8157e39a97db3720ca443e0db14b4bbb4253cd0b96fc
+MISC metadata.xml 465 BLAKE2B a9451430b40c62c22fa244871d26561960f697d360e3e46300f0512556d07988d73beb7e2eb468b94c9df71aae8aef6bb61c9e59ca9ea451bd86d1acfdbb8ce3 SHA512 a7f901242b5bcc60c070d40e4271e6d6a8dbd2e152a29c0b408ef43d5140a3ef89e90062853066532cd6d64db687aaf41ff553a56449865f1b84f37158cc389a
diff --git a/dev-libs/libiconv/libiconv-1.14-r1.ebuild b/dev-libs/libiconv/libiconv-1.14-r1.ebuild
index c3c450b8a397..c3ba6d18d4b6 100644
--- a/dev-libs/libiconv/libiconv-1.14-r1.ebuild
+++ b/dev-libs/libiconv/libiconv-1.14-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
 
 LICENSE="LGPL-2+ GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips ppc x86"
 IUSE="+static-libs"
 
 DEPEND="!sys-libs/glibc
diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild
index e935e807bd3c..0e6e23881fcc 100644
--- a/dev-libs/libiconv/libiconv-1.15.ebuild
+++ b/dev-libs/libiconv/libiconv-1.15.ebuild
@@ -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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-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/libiconv/metadata.xml b/dev-libs/libiconv/metadata.xml
index f2b54580982c..300657e5e55e 100644
--- a/dev-libs/libiconv/metadata.xml
+++ b/dev-libs/libiconv/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
-	<email>bsd@gentoo.org</email>
-	<name>BSD Project</name>
-</maintainer>
-<maintainer type="project">
 	<email>prefix@gentoo.org</email>
 	<name>Prefix Project</name>
 </maintainer>
diff --git a/dev-libs/libidmef/Manifest b/dev-libs/libidmef/Manifest
deleted file mode 100644
index 820cea67466c..000000000000
--- a/dev-libs/libidmef/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libidmef-1.0.3.tar.gz 1321584 BLAKE2B e2fc6e542e96e4d00aafaea7e0817937adc33c4a0c5f824b58f8db683e9020434778fb993ea70c1548f7bae61e6c85d280eb4cd2e83ac7a25c8e6da1129da8dd SHA512 5f21c50efffc52b8008c979b95fcedd2add7e4355643626043880105f96b4086cd9cda3c9532ddd6745f6236e2edf15a20324bdfb932e63cdcf23c8104b03dc5
-EBUILD libidmef-1.0.3-r1.ebuild 509 BLAKE2B 50ebcf5876c6804a35ca1b6c2075cba09db3e1b6f842750d13b43d805814c24203d341de6a117692f68d35725b1409cf92fc43a06c7277038aa6f2e01fb393e2 SHA512 a3f94a84735fc35764ca6e199411f5ff8414712a6872fdccf037040350b3bbb6f863125b775ac9c39592fee37916a4dc6114539ef48f92af6930d16f605f3db4
-MISC metadata.xml 245 BLAKE2B 4cfef53cffd85edb40ee51c0c30272e372a646b1e4639220cec2552954194f7c9da9c694810b86764ce4d944a5b5f62bfbda6cd257d7edc1f123f768f8680218 SHA512 535c6138c251977440996f4a7638ade914f83418282b233749cd37c1501225ea80469cdccba901584c05fc0a4400cf3519e6743ecf79ff91938f9718e8bd00a3
diff --git a/dev-libs/libidmef/libidmef-1.0.3-r1.ebuild b/dev-libs/libidmef/libidmef-1.0.3-r1.ebuild
deleted file mode 100644
index e7cba52e4f70..000000000000
--- a/dev-libs/libidmef/libidmef-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Implementation of the IDMEF XML draft"
-HOMEPAGE="https://sourceforge.net/projects/libidmef/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug static-libs"
-
-DEPEND=">=dev-libs/libxml2-2.5.10"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
diff --git a/dev-libs/libidmef/metadata.xml b/dev-libs/libidmef/metadata.xml
deleted file mode 100644
index faf767a2295c..000000000000
--- a/dev-libs/libidmef/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">libidmef</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index 06199b900ef0..87ec9d8c361b 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -1,7 +1,7 @@
 DIST gettext-0.19.7.tar.gz 19235781 BLAKE2B 4c2cfcb0b21a66a9f8d2d57de7420e624a1235f97180ad5ac194a5eb629760a9cacc7f3966cdf893d7af86c1740d8bb2266c639ebe2664ea44f2c47a962a841a SHA512 7ba89074d3eddd0b4a5e2980e1ec74b53c49b7a04a1fa91c70c4bc11ce9c30415e4df9d79698148eaaed325fb4feb25a340a2e8e01fbe86b1a66b1376a4c9e3d
 DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
-EBUILD libintl-0.19.7.ebuild 2113 BLAKE2B 75e03a8f03cafbde95513b65efa2a93446d2a5e129da222dd1c536a60053b52b395e78841387e36ed50a8ea712f9dbb4d6e6a06d6d3f425c6c8a649623c5a8a1 SHA512 6fbd14bc71b6dfd475d1ca985432a7ca69908c49e1b0596b712b8f37e4fec0ebb89e651f367c41a7a5a9e6343ddc386d00f1cf57d7b8fc92f41da87137004ad0
-EBUILD libintl-0.19.8.1.ebuild 2113 BLAKE2B bad3eb14a73a0aece5e2bd7e574949b13b875598a3cb7914872748eba9a5bda2d49abda88c8baf079802df315240acb80527d8b3c65011305c6e24be1e128e2e SHA512 b38adde6c1ca3d61431789440bbdf91a62f2ee661fcc6119d3404c564a850840d1a8edc06fb257e62588c4f6d0d25aabd9ac85103cd77292803bfd4474ff5279
-EBUILD libintl-0.20.1.ebuild 2135 BLAKE2B ff1608339c894144102cbb9b77c612153c592115c6f1c4560b8c327d431a2d1da861d958346482528cba8670615a34ec2ba3ef8b2c706f9f90358893f6fafdeb SHA512 c4bd136542ea900a577ace3de54fdaf442629221ad44d939f73e833e4915b7b95426d3940e84a537f4b916d8ee174ba9a429851dfaf7341c6ed01932591a7c2d
+EBUILD libintl-0.19.7.ebuild 2091 BLAKE2B 5e46d533a6d4da1fbb3bb50df802ec2dc5c8dfb42b284dd4c595f5251bfc91137c825e9651e2460f05730425b0be9a3c7291cb57aab6e1944da28f2c196d652f SHA512 09dec6d6e3803bdac6f6ca8d234195ef8a6ed0730c432e7bf93198837ca48e942630db8e6c4b92833da51bfb5d4aa7bdadbc1e8b31756349e98fc9001a033f56
+EBUILD libintl-0.19.8.1.ebuild 2091 BLAKE2B aba2847691012715b822adf210577c214ab7f94d5de42295437f9119bdd3feb8512e8bc21ccb9f5b815007aa5b6b36dd1c23927e99c35032f630043623b73a59 SHA512 5d11fc7d2a28609a754f0246aae194ee3fecdbf22719c6403c4cc5af78b6d2cd878cb76dbaf62c70e06602d94dc0a89de038fd42742a941e6ab1a04eec316a88
+EBUILD libintl-0.20.1.ebuild 2113 BLAKE2B a3b780f97ae721bfcfb65508051e1f1a21d8a3715e1091a24c5a6ab9f64112a82469a2b1920a92afd1640da6b328bd56295e6d87a6b2530608c16b8afe6633cf SHA512 c785ddb9d4cf4d9ac3e57949a3dc23de0d83c3dc50e8f11f1357e6a78a779ac9702aaad5d2f8809c935d9295e530497b2f5ba9a51cc4997ceaf55fd7936861f5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libintl/libintl-0.19.7.ebuild b/dev-libs/libintl/libintl-0.19.7.ebuild
index 00d244bd65c1..65079b693fc4 100644
--- a/dev-libs/libintl/libintl-0.19.7.ebuild
+++ b/dev-libs/libintl/libintl-0.19.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.19.8.1.ebuild b/dev-libs/libintl/libintl-0.19.8.1.ebuild
index 65a105fb1349..600e5dbec942 100644
--- a/dev-libs/libintl/libintl-0.19.8.1.ebuild
+++ b/dev-libs/libintl/libintl-0.19.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libintl/libintl-0.20.1.ebuild b/dev-libs/libintl/libintl-0.20.1.ebuild
index 464638fd8ba4..0f9caedd75cc 100644
--- a/dev-libs/libintl/libintl-0.20.1.ebuild
+++ b/dev-libs/libintl/libintl-0.20.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libite/Manifest b/dev-libs/libite/Manifest
index ee5baa5f1068..2e0e8d067623 100644
--- a/dev-libs/libite/Manifest
+++ b/dev-libs/libite/Manifest
@@ -1,5 +1,7 @@
 AUX libite-2.0.0-fix-path.patch 304 BLAKE2B 2f753f52984c5481c76f8b228373ae7d091f8d6baeb43f12e69c7298e876f6edecfb6d3abd9c8b963c9c7ace78ee771c07fba6da9239a0a90b5902e9bf7b25f5 SHA512 1cb45bf3bdf4b80c7ad0ecc3127c036f52a80944087fa30c5f8709bd6af7c6e81f0e397bc4490f4e4ab61f9827519244eae0bc6f3258f3f875d2b89e789b7c1f
 AUX libite-2.0.0-fix-which-path.patch 594 BLAKE2B d93f3c500f82f541bbeffd2e418f2430db9e8328ba03a2af39b22042c9c5a6923b69fb9c6a5f0bd64271d2f4761c207a8af01d87c977c7ee09e273b90e64ce64 SHA512 34b091128a9d43202b2d90f01d575a4c03bea38828d65bc6212d601c02a53d8157b9634cf5e0dd4f2be3ddeb18ad0bb3af0dedc68a0a30abfd51e7de2808a115
 DIST libite-2.0.0.tar.xz 259960 BLAKE2B 4c5393daaf2ca6eb830fc5f11b1d38e9c1e2374c5f5d87bb973c7e54b9f81480d4a270a4551689806620cd5a84671d1055d409d6dd090acb64bf7fc454d1c283 SHA512 18516f19d36d81169116562b4b27d76240715424cdde9b87eae831f35adb17d70fb01e2eae5e7e9ce99e2c88344c2c15d2b7d11f4ea2e9ae0deb25ee5ee4c563
+DIST libite-2.1.0.tar.xz 265712 BLAKE2B c8a0f2a55bc6e0ae2ad774be67501d2d8ec31927cc107b1b38de409ce78334b9a516727722aa57d615b234edf1057967b2375a96dd947637e987d2583e2efc2a SHA512 dd6b48ed6dc646ce2d17e647179173bf5d3b478db38f05c2133119ce81da9778be8bb277db9beb0e28aeff7f81cb3fc361d3737de31623f6661141efa63d64d3
 EBUILD libite-2.0.0.ebuild 624 BLAKE2B 4fedd1976a0f0b8a3808dc86c0b1dbd9975f956320fd0caf9eac1c40657aa6ac01b96ca4133ab819d99a60f0e572406a1a3fe5b74960c517195ee78fdd6ce804 SHA512 fe0518a4470535fd2f79fa59b1b2525f8b2bec63e9ed6dace625e45b242640ec889822913b3911b04ab3e646e5ddec714c504d50a1f33c55562427e421f98f51
+EBUILD libite-2.1.0.ebuild 532 BLAKE2B bc58c451cd962322d65ce6bf026718161d0a73c3ac9330150d7388f9b885c1b5c8af2630ca2212d427d44c68f1244abf204ca496b054a08fde865fb2439ea09b SHA512 4b6ee1ad3db4e8fe04b374ce8c5ee6b32edda02aed3ec1c6180964a93f4dc498051c58f0e15598a25217a742e08edf5509ee1323da8ac21bd98f87d592177707
 MISC metadata.xml 773 BLAKE2B ed6eab8165e4f6a6b37c9c23616d0eacb44f2b15b13fda13093629a8d060e2c9f35b5a5614ad8e205462e0e1c8ec2a1cd71243d377d3a94084f0c1d7d2ab62a4 SHA512 2bb72bae63f07cce65711f13f5268a2bdde04ebdbcc9be4a2a5700f6a68aa3745d91ec83881fa83001fcdfb71675dc4fa1f937ca63273ae763ad899e43e0290f
diff --git a/dev-libs/libite/libite-2.1.0.ebuild b/dev-libs/libite/libite-2.1.0.ebuild
new file mode 100644
index 000000000000..285bb078460a
--- /dev/null
+++ b/dev-libs/libite/libite-2.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A collection of useful BSD APIs"
+HOMEPAGE="https://github.com/troglobit/libite"
+SRC_URI="https://github.com/troglobit/libite/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+src_configure(){
+	econf --enable-static=$(usex static-libs)
+}
+
+src_install(){
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
+}
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 06f016d92916..45be71232197 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,4 +1,4 @@
 DIST libksba-1.3.5.tar.bz2 620649 BLAKE2B 6ed250684e40b4efcc07a86584adfbc659f886919d0306e82e2275c9acb8a1df698c7cc9a917fa66dd906fe473d14fa29507c03e681aed86286d65d9551cb5f6 SHA512 60179bfd109b7b4fd8d2b30a3216540f03f5a13620d9a5b63f1f95788028708a420911619f172ba57e945a6a2fcd2ef7eaafc5585a0eb2b9652cfadf47bf39a2
-EBUILD libksba-1.3.5-r1.ebuild 803 BLAKE2B 9efcc44c2c4eed76d727ba908068e13edacf642d0136b54c4d310e168661c5a1cb8a9a4af90628493748d4fbcbe5c0a6489c71ac2fa401dedd076b131d98f0e4 SHA512 1f648c845434fabc1a9ebd5650e9a17a9943f82ed5963c8e5400cf5fbd8d13fc281be2f82a571616f3c55a59430f19aed69c8696c0d3ecc61a3aee3523c67c0a
-EBUILD libksba-1.3.5-r2.ebuild 1052 BLAKE2B dd7c9bfc7fb01fcac624db97a14d2e7e6f82a13a327f1977499dc296bdf23518f9d0161c76580eb7c6e055e80930439fcac20b591b0a070cb06c6e64b70f0fbf SHA512 5c97765a6eb7e3d1a42d168b38dedc29601f9165b8afa84138a4b18d7a2a1c24d815e84b1ecc6e59dccb2ad1f19d0a5793f474f838593ee1562b6d4a6603cabe
+EBUILD libksba-1.3.5-r1.ebuild 781 BLAKE2B 4dfb790e19472c505855b8d725ed3c8e7538f232115e4e02703a8504daf2df8cc3c940d98aeeca609d2eb5d736576a3c4ec2aaec671153209d2beabac1a020b6 SHA512 f0c4fa8ba02eb54738a96cebc27c9d8abf30a4c64dc5dd572ba6c082d5c18fb33f08192c81051eb959b9a8c5c41b05ec54acd092d13647c60e4c827a444f5909
+EBUILD libksba-1.3.5-r2.ebuild 1030 BLAKE2B a553d4dfffd37ce638a88fb4621f1abf155ab23f7a658f0bca856291ebc0d560eb137fa0093a8dd895f08df54a5b6a14a4e1cdc588b2c51d43481be0767a1610 SHA512 80e76313d0fad3d27df7f42d141163031e09c1ac8943caf3103e0af049a88be9983ee73ff4ac982cd622578eb72685cabd7aed7b9c672f6b4d8f39116ff4e5a8
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/libksba/libksba-1.3.5-r1.ebuild b/dev-libs/libksba/libksba-1.3.5-r1.ebuild
index 108f1a8ab6a1..1e60c2c7b3cf 100644
--- a/dev-libs/libksba/libksba-1.3.5-r1.ebuild
+++ b/dev-libs/libksba/libksba-1.3.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libksba/libksba-1.3.5-r2.ebuild b/dev-libs/libksba/libksba-1.3.5-r2.ebuild
index fbbab854987c..78876e7ec539 100644
--- a/dev-libs/libksba/libksba-1.3.5-r2.ebuild
+++ b/dev-libs/libksba/libksba-1.3.5-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index 55c42ccd2ffa..366914bea374 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -2,6 +2,6 @@ DIST libtool-1.3.5.tar.gz 538884 BLAKE2B 769c0ab679d5665bb729f97dc5c02b6e8921532
 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 866 BLAKE2B b67843df8ba4070f31ef8924b38a4a8c0607617b08b087dee35be01d2581fc04b6b35f5c81035fb43ed804e4424c38be69460b9c5243a0d1cf6a3206d920933a SHA512 8f5d1ba52a19df56d5efdd1a3dc9cc1085cab22b69badad778f6a10cdc5e9a1771216dfece334cb48d29b713881760a170770d58b66a6ac182a5e58714b94c71
-EBUILD libltdl-2.4.6.ebuild 1142 BLAKE2B f924f6626c14de066d238c6e3e32f601335eea616a5f351b0cc138140729c92899090008167566a9bf56e98f13dae4f5642773300caaf0154fd9433c34d2fd42 SHA512 961583240e659f8c60a6343f30d83944bef8e0d163d9a8d3760d6c2de7651b54a3d067b1ecb1cbd0ae13b4ff491ff6ccdef5dfc16a74a31a48916bc0f58d2781
+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.5.26.ebuild b/dev-libs/libltdl/libltdl-1.5.26.ebuild
index 7e35734843d8..28eccdaf6bbf 100644
--- a/dev-libs/libltdl/libltdl-1.5.26.ebuild
+++ b/dev-libs/libltdl/libltdl-1.5.26.ebuild
@@ -15,7 +15,7 @@ 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 # libltdl doesn't have a testsuite.
 RESTRICT="test"
diff --git a/dev-libs/libltdl/libltdl-2.4.6.ebuild b/dev-libs/libltdl/libltdl-2.4.6.ebuild
index 6369740f1041..3e3877e3a03a 100644
--- a/dev-libs/libltdl/libltdl-2.4.6.ebuild
+++ b/dev-libs/libltdl/libltdl-2.4.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~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="static-libs"
 # libltdl doesn't have a testsuite.
 RESTRICT="test"
diff --git a/dev-libs/libmail/Manifest b/dev-libs/libmail/Manifest
deleted file mode 100644
index 7ec77eebdc1b..000000000000
--- a/dev-libs/libmail/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libmail-0.3-respect-cflags.patch 879 BLAKE2B c1950a6b4052f75eb3f95ad35d7c70d28b2cfd7fdf8eefd406a92b91f87085d91370f36bc74bc4410994ae31ee8a1f860acadee145ccc4cd0e9e69f803707a93 SHA512 b5450bf020a84473f173f4985a5192609629e312a44da40c11cd8e806fb6d6b7d4e97df9821823d4da41d9588c9218dfb0d20a18b38ab06074001ad3ea3beb18
-DIST libmail-0.3.tar.bz2 271946 BLAKE2B f03b5a07bb78423bc37111448e0b0b812d51172210a555a1cc8279ce66f62ea5033954bb37c01d6d225d53bab4996366ae803fab9a96ef97a841cbd88896454e SHA512 df4e0e549867f7cf73db8c965a28c14e3e089e54a8272b70be8b00c896dcd91d68625e2287a15d353eff75ec05e702e6d113f8122ed0e9d294766fe4f467e9d3
-EBUILD libmail-0.3-r3.ebuild 1232 BLAKE2B ae096479e2e34087cd801d98a8f6415579dc5115ace6182de7569140ff6b98c6e3107a1451e9b2d4c0aa6df5c5a20e1862443913311d8313b932f4907c437488 SHA512 250af3049f272445fa3e1de9dff561fbe6055ca24aec542ae5a634dc1ad01ff530253567abfc435e4124d425cd2585941fbbb2e44e0245e2664d23cad60dc87c
-MISC metadata.xml 325 BLAKE2B e7c785c98f24aae1ee2d498d1d0ac93e7d60dfde1ea9289a36f90d997a56b3980531cfc6c412bfc211723fa6887a2958e468418613ead77c7b7b4051006248f4 SHA512 027f60bf3d6fcab565ddad1434d9df43f6e2d0e71c85f670a7c9723dec14ecbf7e8dddd4c15f1290b0bfdab453f796e58dc241752e5605023fe323ae4fac0f41
diff --git a/dev-libs/libmail/files/libmail-0.3-respect-cflags.patch b/dev-libs/libmail/files/libmail-0.3-respect-cflags.patch
deleted file mode 100644
index 7e22de4c7576..000000000000
--- a/dev-libs/libmail/files/libmail-0.3-respect-cflags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- configure.ac.orig	2013-01-31 16:18:06.537834009 +0400
-+++ configure.ac	2013-01-31 16:19:00.138835711 +0400
-@@ -12,7 +12,7 @@
- AC_PROG_MAKE_SET
- AC_PROG_LIBTOOL
- 
--CFLAGS="-D_GNU_SOURCE -Wall -Wunused -Wstrict-prototypes"
-+CFLAGS="-D_GNU_SOURCE -Wall -Wunused -Wstrict-prototypes ${CFLAGS}"
- 
- use_sasl=false
- use_apop=false
-@@ -99,7 +99,6 @@
- 	;;
- 	yes)
- 	AC_DEFINE(NDEBUG, [1], [Use debug functionality])
--	CFLAGS="$CFLAGS -g"
- 	optimize="no"
- 	;;
- 	*)
-@@ -119,7 +118,6 @@
- 	;;
- 	yes)
- 	AC_DEFINE(NDEBUG, [1], [Use debug functionality])
--	CFLAGS="$CFLAGS -pg -g"
- 	optimize="yes"
- 	;;
- 	*)
-@@ -127,9 +125,6 @@
- 	;;
- 	esac
- 	])
--if test $optimize = "yes"; then
--	CFLAGS="$CFLAGS -O2"
--fi
- AM_CONDITIONAL([LIBMAIL_USE_SASL], [test x$use_sasl = xtrue])
- AM_CONDITIONAL([LIBMAIL_USE_APOP], [test x$use_apop = xtrue])
- AM_CONDITIONAL([LIBMAIL_USE_TLS], [test x$use_tls = xtrue])
diff --git a/dev-libs/libmail/libmail-0.3-r3.ebuild b/dev-libs/libmail/libmail-0.3-r3.ebuild
deleted file mode 100644
index c20fa7c5a900..000000000000
--- a/dev-libs/libmail/libmail-0.3-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
-
-DESCRIPTION="A mail handling library"
-HOMEPAGE="http://libmail.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="apop debug gnutls profile sasl static-libs"
-
-DEPEND="gnutls? ( >=net-libs/gnutls-2 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-# Do not unset user's CFLAGS, bug #454558
-PATCHES=( "${FILESDIR}/${P}-respect-cflags.patch" )
-
-src_prepare() {
-	# Drop quotes from ACLOCAL_AMFLAGS otherwise aclocal will fail
-	# see 447760
-	sed -i -e "/ACLOCAL_AMFLAGS/s:\"::g" Makefile.am || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable apop)
-		$(use_enable debug)
-		$(use_enable gnutls tls)
-		$(use_enable profile)
-		$(use_enable sasl)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	# headers, that are wrongly skipped from installing
-	insinto /usr/include/libmail
-	doins libmail/libmail_intl.h
-	doins config.h
-}
diff --git a/dev-libs/libmail/metadata.xml b/dev-libs/libmail/metadata.xml
deleted file mode 100644
index b77b86fc4804..000000000000
--- a/dev-libs/libmail/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="apop">Enables the APOP authentication method</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">libmail</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/libmcrypt/Manifest b/dev-libs/libmcrypt/Manifest
index b9bffd0d334d..9ada7032d07f 100644
--- a/dev-libs/libmcrypt/Manifest
+++ b/dev-libs/libmcrypt/Manifest
@@ -1,4 +1,4 @@
 AUX libmcrypt-2.5.8-rotate-mask.patch 1060 BLAKE2B 1bce08c2fee92ddb2038b6de67d8ccc1c2d630506f4298926edf44147dcf9596d636204fb1d009f4affb00a1e84c503b162a41b5b02d5596996a8a1768ea2d96 SHA512 975d75e7b41ba18012a09ebf0bddec794ab8597d2515995ec55498437f237d8de917a2766e31da32e92ddbd40de6fe9ca78814eb55ff68da746037e064aaede8
 DIST libmcrypt-2.5.8.tar.gz 1335178 BLAKE2B caa970107382c1485267e68feebebe3ed1e2981d879b2bfaaa37f296528b77bf5e57e73e380f5ab02a1212fae1be5caeb376142920353fabdd8600746634780e SHA512 471a4e0dcbede836c975697a4edd5c3a53d555dde122a045d702e619d7e9768c7abc1ab541c79829f644b70241ac2e0cd274cf22499e47862983401566ca1fd1
-EBUILD libmcrypt-2.5.8-r4.ebuild 983 BLAKE2B f08b0c18ae10a344b6f470af6bcdc94afd1fac606266f5027cb41b427faca0d52cf539fc56ae79813cfa2858854050f1212fc6854274110596a938d194e7ce65 SHA512 1f289aeec9ce3a6a736dfc0c0c2a39f053c407462efb3889a2deef751531aefd5974f8819ddc0a892572d18f53eeb23f62f7017cf479937f8faa7e01710342b8
+EBUILD libmcrypt-2.5.8-r4.ebuild 961 BLAKE2B 6545ced5e7c5b68510cb6d97a80a4382933ff67d0f818db9ba1c485fd63697b6e10c11cd23193052ac3432bf8fdfbcf68924b9d59b2fb43e489969ef25792c57 SHA512 59a3b4aa4bc4debe6126ee436507cb19de4e34882207707387c18914309112fefe9d892d3c869cf0812ed217df07042598109f9428d6f6aaf83a874c2ad04dd4
 MISC metadata.xml 326 BLAKE2B 7815b2e4462f847a84c902df0c20b993c2a1cdd77006da029616096587e07003b2bba50499144d211c8ad0880eef53f0a3a9ce23af69f6320c427d6352958384 SHA512 a5d7a15b6084aebe038f38dc8003040c42434d415ebdb33b225e2772047950d35b2328dba5a7194533608b74ec47ca6a1bfccb56540f3a67308b499b04774207
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
index cda8c0fb3658..ccb711f7eedf 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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 ~x86-solaris"
 
 DOCS=(
 	AUTHORS NEWS README THANKS TODO ChangeLog
diff --git a/dev-libs/libmissing/Manifest b/dev-libs/libmissing/Manifest
index 09d2b9c42b7f..15bd4406e065 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.0.0-r1.ebuild 2866 BLAKE2B 0073f790979bde93a4c361b4b086008ba10c8c0c9b78e1a838ae0552f27be192253e05150cc23d397713a8b71c0a9484c2d50608e564cb6f2e854b1e1c3e8379 SHA512 a532d9aab59b256d67be25f243091c4a0dae694fc5cd375881302c4103e573e4a5c03912607c1d02ba5a35bdcbf5ba66282b3b5f1e90ebaa54b9cb7b633a84f3
+EBUILD libmissing-1.1.0.ebuild 4144 BLAKE2B 4af50fbda40b6218926a43a0ab09e2706fa85aecb0b0a4755158894320098ade390d6dc9567b3d5a14cfb582f936503745afbd0f4c0acff9b068bdc4746c0eac SHA512 0cef22a263bd0df8ddd44901ae1c51fd888801756ff55409a887861704fa4f7bd4ff9751a0fb80c3cdd4cf8a158904be836a97be7db9bfb3fbd61a7b6a1159b0
 MISC metadata.xml 393 BLAKE2B 8fdadb018197632713de833a7b64d961fa8ce1b86db6996fad32484fa09eda403a7bbcb50d3502ac02888b44d56971b0241a9e0902366f10d79017d50e46289b SHA512 8b5739afeacf385f9399745c6396506060f425376e47e0fdc9ca05c59608dd9e82bee2dc385f34c27f96ad8df41753fe05dd90886a81f613a910c76d50bae422
diff --git a/dev-libs/libmissing/libmissing-1.0.0-r1.ebuild b/dev-libs/libmissing/libmissing-1.1.0.ebuild
index c1371f6d4faf..b7099ebe7775 100644
--- a/dev-libs/libmissing/libmissing-1.0.0-r1.ebuild
+++ b/dev-libs/libmissing/libmissing-1.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-${GIT_TAG}
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
+#IUSE="static-libs"  # dynamic won't work :(
 
 DEPEND=""
 RDEPEND="${DEPEND}"
@@ -26,6 +26,25 @@ S="${WORKDIR}/gnulib-${GIT_TAG}"
 src_prepare() {
 	default
 
+	# create a config file with just the definitions we need
+	mkdir extern-inline || die
+	cd extern-inline || die
+
+	cat > configure.ac <<- EOS
+		AC_PREREQ([2.69])
+		AC_INIT([${PN}], [${PV}], [prefix@gentoo.org])
+
+		AC_CONFIG_MACRO_DIR([../m4])
+		AC_CONFIG_HEADER([missing-include.h])
+
+		gl_EXTERN_INLINE
+	EOS
+
+	eautoreconf
+	sed -e '1,/PACKAGE_VERSION/d' missing-include.h.in \
+		> "${T}"/missing-include.h
+	cd .. || die
+
 	mkdir "${PN}" || die
 	cd "${PN}" || die
 	cat > configure.ac <<- EOS
@@ -92,11 +111,11 @@ src_prepare() {
 		"${modules[@]}"
 
 	sed -i -e '/^noinst_LTLIBRARIES /s/noinst_/lib_/' lib/Makefile.am || die
-	echo "libmissing_la_LDFLAGS += version-info ${PV//./:}" >> lib/Makefile.am
+	echo "libmissing_la_LDFLAGS += -version-info ${PV//./:}" >> lib/Makefile.am
 	cat >> lib/Makefile.am << 'EOS'
 install-data-local: $(BUILT_SOURCES)
 	@for hdr in $(BUILT_SOURCES); do \
-		$(INSTALL_HEADER) -D "$$hdr" $(DESTDIR)$(includedir)/missing/$${hdr}; \
+		$(INSTALL_HEADER) -D "$$hdr" $(DESTDIR)$(includedir)/$${hdr}; \
 	done;
 EOS
 
@@ -107,12 +126,16 @@ src_configure() {
 	cd "${PN}" || die
 
 	# ensure we don't pick up installed libmissing
+	export CPPFLAGS+="-DDISABLE_LIBMISSING"   # disable libmissing headers
+	export BINUTILS_CONFIG_DISABLE_MISSING=1  # disable -lmissing from ldwrapper
 	export CPPFLAGS="${CPPFLAGS/-I${EPREFIX}\/usr\/include\/missing/}"
 	export LIBS="${LIBS/-lmissing/}"
 	einfo "CPPFLAGS: ${CPPFLAGS}"
 	einfo "LIBS: ${LIBS}"
 
-	default
+	# 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
 }
 
 src_compile() {
@@ -122,8 +145,27 @@ src_compile() {
 
 src_install() {
 	cd "${PN}" || die
+
 	default
 
-	rm "${ED}"/usr/lib/libmissing.la \
-		"$(use static-libs || echo "${ED}"/usr/lib/libmissing.a)" || die
+	rm -f "${ED}"/usr/lib/libmissing.la || die
+
+	cd "${ED}/usr/include" || die
+
+	# fix config.h dependency so we can can distribute it without
+	local f
+	for f in $(grep "_GL_INLINE_HEADER_BEGIN" -l *.h */*.h) ; do
+		cat "${T}"/missing-include.h "${f}" > "${f}.new"
+		[[ -s "${f}.new" ]] && mv "${f}.new" "${f}"
+	done
+
+	# modify all header-files so we can disable them and that they won't
+	# clash with gnulib-based packages
+	for f in *.h */*.h ; do
+		sed -i \
+			-e '1i#ifdef DISABLE_LIBMISSING\n# include_next <'"${f}"'>\n#else' \
+			-e '$a#endif /* DISABLE_LIBMISSING */' \
+			-e 's/_GL_/_LIBMISSING_/g' \
+			"${f}" || die
+	done
 }
diff --git a/dev-libs/libmix/Manifest b/dev-libs/libmix/Manifest
index a7e1a7a15562..caf66a806725 100644
--- a/dev-libs/libmix/Manifest
+++ b/dev-libs/libmix/Manifest
@@ -2,5 +2,5 @@ AUX libmix-2.05-fix-pattern.patch 415 BLAKE2B 7a203b13fb8718ceccc8f173c08306bef0
 AUX libmix-2.05-gentoo-r1.patch 8328 BLAKE2B 56c32ae2f6d8c69a461c360bc8a2f73d642b9031ab216e296b99a89074883a057ec82cd9470dd145ee97a4d6e20d80ec4aebfead90c6cb4f53418aee9dbf48db SHA512 24043efc6a7ebdee97425e63e97bcd298d0e920604277bdcd176c22e20119cacd6ef33a296df815cd98ae327bd149003e3e34c33f939d96bee71be3bac79bf75
 AUX libmix-2.05-libnet.patch 509 BLAKE2B ab9f57a1f49750d32f77095824637a9588dd8234b90cc5fc906c29105c1df0547552488a38d54ffe48755b0a27e8a46b30fc4553ebead19ce2f806ca5006398e SHA512 3c5204728db7fdecadbd3149a4edb544dafadedffa7d8f1afe2e3290a378865f68ac1189eeab7a6e73176bb4af045f4049dfc75417c143a5aad705906c96b498
 DIST libmix-205.tgz 79860 BLAKE2B 35f2480c609ed62bb0f277cba38e325cb387acf250d78d6db81dcf83cdc8002be9482d834d14f3e026452b493f4794b0a9ffff42b5ba3cf15b1263fb5ebe59da SHA512 412a1506d15b5ff3fff7f32caf50dca9283c9d667e4bce40a20be45465fcfe72e177159f546d4b8059de94c107faf641d116621ea395bc0ddb91c2a1d77257ec
-EBUILD libmix-2.05-r7.ebuild 876 BLAKE2B 43bd87c97dae2bb567827c749bb748a30b555ae977db8f67dbe936ead6e0d6e1498593236b68516bd5bf046d7325dab5b4d0f2509ca709d67215c640d5928223 SHA512 354b6d12deb7aad76bf9f55f3b58ad58727c6ee1a44083dc82dd1ffeebae8175c07017aa11cc8c1506a86da995916909f3c49c93eacee87c56d0b431b10d55c7
+EBUILD libmix-2.05-r7.ebuild 854 BLAKE2B 667d9d2bd8231459de080e59f7cdde3e2a3cdb961d0a8277f2ede94d746e4368742e06e6a0af51334753b97d50123024ae652ed83442a942290a691fd4e6812f SHA512 f274ff1c900ea4b9b22e1ae487989526951984707c0acd047d00e7aea7f93876d54640dcd326cb478929bd2ce09c1c42a439040481f683961bf2c6547638e14a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libmix/libmix-2.05-r7.ebuild b/dev-libs/libmix/libmix-2.05-r7.ebuild
index 9fbad4d8abfd..8dd3c98e69b0 100644
--- a/dev-libs/libmix/libmix-2.05-r7.ebuild
+++ b/dev-libs/libmix/libmix-2.05-r7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://mixter.void.ru/${P/.}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux"
 IUSE="static-libs"
 
 S=${WORKDIR}/${PN}-v${PV}
diff --git a/dev-libs/libmongo-client/Manifest b/dev-libs/libmongo-client/Manifest
deleted file mode 100644
index 1431600c0681..000000000000
--- a/dev-libs/libmongo-client/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST libmongo-client-0.1.7.tar.gz 122495 BLAKE2B 1c62e60f6181ed087058a0dca23940300db03668f7ec1b744f8b574fcbd302139c4ed525a0a2bbeaed7edf552eda47e4ca0e9faacfc2d2954d97f77863e94a60 SHA512 c8250ee04c01650b624641d8c3e0cb81e17bdc12d1d64ccb173c15db58d39953fec39dcf5b92ec91378b93574319ab47bb523d1c50594cbc89479c65d219b5ee
-DIST libmongo-client-0.1.8.tar.gz 127648 BLAKE2B 1ca701fc66cccd704a15f4370e2e3e8c75579af0e6aa4fd638a464d490a43b0e61950cb519829388b1625cd2e0609080b69576be91df3b105c6f00535fd8c096 SHA512 b013898768306ef053f8010b14b353c42af6505ec33d4384602e690d97e9272d48ea134a84f79394073b01ecc05beab3e2e95dbfc0c3603b09fac4b0f72c1ae0
-EBUILD libmongo-client-0.1.7.ebuild 699 BLAKE2B 644906d2c53da523d53eddf5f7a4bfb06597509be3f4c164f1fba676bb5f97e0c84243b25f5aa6ccacc6390aab35b60bafc016e736c400d030cf5089fba00183 SHA512 4e7e75ea0502dc7537c9169cfcb335cdab3d09b0d612c0a29dc7703acf2fe92a37cbc7c498ce5b8046969d53526d1415a2aaa05cb27ab5ed372fd370590e57eb
-EBUILD libmongo-client-0.1.8.ebuild 750 BLAKE2B 8443a3c2e25b723abdbf2fc1bb8f29f6adaad55706f89292fadd326cf2216e1da3b4792bec1ecc9aec745654dc282ca35905fff7f280f9ce5e0a3824b500a24d SHA512 5bd3f7d0a863f06701a3e5f5138504d5ef5639f99921d42e254f2788c4dbbe4b1a52a5113654ab491844e2e4a71f8134b9e2c27034a87a17ce9c80e91a99c8f9
-MISC metadata.xml 752 BLAKE2B d56615caf27a717684deba13cd920a1539aef9d052da9513d2f9ac9d1f476aa41b4610cdfd1a7501c1f58dcc928f6af1c7c1760cab7b894acff4b0e9c48e72fd SHA512 0a7e81a0b813de44fb443def8261386767eb85f7d2cc027703e2f66ed8bcd11c09c97ff1f7730c5981ca061cd833878f02740259d491b14dad1edffc3aaf5b87
diff --git a/dev-libs/libmongo-client/libmongo-client-0.1.7.ebuild b/dev-libs/libmongo-client/libmongo-client-0.1.7.ebuild
deleted file mode 100644
index eada1d63f64d..000000000000
--- a/dev-libs/libmongo-client/libmongo-client-0.1.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="The alternative C driver for MongoDB"
-HOMEPAGE="https://github.com/algernon/libmongo-client"
-SRC_URI="https://github.com/algernon/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm hppa x86"
-IUSE="doc"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-RDEPEND="
-	dev-libs/glib"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_compile() {
-	default
-	use doc && emake DESTDIR="${D}" doxygen
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete
-	use doc && dohtml -r docs/html/*
-}
diff --git a/dev-libs/libmongo-client/libmongo-client-0.1.8.ebuild b/dev-libs/libmongo-client/libmongo-client-0.1.8.ebuild
deleted file mode 100644
index 8cbff13f22c6..000000000000
--- a/dev-libs/libmongo-client/libmongo-client-0.1.8.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 autotools
-
-DESCRIPTION="The alternative C driver for MongoDB"
-HOMEPAGE="https://github.com/algernon/libmongo-client"
-SRC_URI="https://github.com/algernon/${PN}/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/0.5.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-IUSE="doc"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-RDEPEND="dev-libs/glib"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_compile() {
-	default
-
-	use doc && emake DESTDIR="${D%/}" doxygen
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( docs/html/. )
-	default
-
-	find "${ED}"usr/lib* -name '*.la' -delete || die
-}
diff --git a/dev-libs/libmongo-client/metadata.xml b/dev-libs/libmongo-client/metadata.xml
deleted file mode 100644
index eb1b99bdd954..000000000000
--- a/dev-libs/libmongo-client/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <!--maintainer-needed-->
-    <longdescription lang="en">
-        This is an alternative C driver for MongoDB, with slightly different
-        goals than the official one:
-        libmongo-client is meant to be a stable (API, ABI and quality alike), 
-        clean, well documented and well tested shared library, that strives 
-        to make the most common use cases as convenient as possible.
-    </longdescription>
-    <slots>
-        <subslots>Reflect ABI of libmongo-client.so.</subslots>
-    </slots>
-    <upstream>
-        <remote-id type="github">algernon/libmongo-client</remote-id>
-    </upstream>
-</pkgmetadata>
diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index 5d5d4747e952..f5044953b2d5 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -1,6 +1,6 @@
 DIST libmowgli-1.0.0.tar.bz2 105929 BLAKE2B f22af94e1d5693e92544e9c177f56caf7fcbbf3f46a254e1e6982ba0e6f41443bcf70d1b944cd68e7eea7a0247dd478777afcebb5db80742312149f52dd86bc4 SHA512 f3f7f9a527cb3f6f24c23d0585b55509d8721023c670df9e59a7f5667d4e12caf17ed71773cd1283a3ebfada465824653f654aa29d857c076875d36b2a824313
 DIST libmowgli-2.1.3.tar.gz 227742 BLAKE2B 9ef5c30880644247df3c98dabbd87694d0a7c92e7de0c44a73842d4c5bbc7f19a32db24acc52b27fe5f204b1f74a5c730c64edd1e8edd23bc320e4c0dc4a554c SHA512 bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533
-EBUILD libmowgli-1.0.0-r1.ebuild 496 BLAKE2B 21f1302141156e4addc1ccf3981b8022e1567522b080c55d3619856ebc877b1ed5544ee356b923ed7900981ee964eca7f00c577b32021bded45abebfc58acc1a SHA512 93adf0dbe03050733ec4408d1ddca8bc8f51e803e3f0813ca8f106490fc70fbd649c575a89a93d55b37154310e2ac5006bd81809e75b921373cdd02bcdf32672
-EBUILD libmowgli-2.1.3.ebuild 793 BLAKE2B 30258746fc98b5bd46f113f029f7a640516be59a108e3bc3ccec3e09d6c3283bd804ae57021724deee086db9b13326514d1b7449cc8e0af142d6fb6468179f9d SHA512 9255343c16af3ff19d069cacb6040645f37b5d4a95a8b2384017bacada43cdd69144410eb9bfa7d0dc53c1e3d8b527715571f606173e74f313fe7790defe4bc0
+EBUILD libmowgli-1.0.0-r1.ebuild 486 BLAKE2B db77100a9b1cb80ab0ebe85361a3cfea16ee3d5b6ff2e88c177d88012bd10ea42efbfee56628edff10a397b2c446e18578ecb647f0608309a0de3cf324363a7e SHA512 91ab512aa3ca354f648c277c67728bbb8a5c4fa151f26989e23b7aef96058bdea4a10c7b6ac84f20df0873b339621f75ec5a20a2a953f2df3d941a4b81b877c9
+EBUILD libmowgli-2.1.3.ebuild 783 BLAKE2B 89c3731f23d31108b54d8f66ba0286799ed32b3558c1c24e41a4134a1ac66fe0fda8a0456a7345383c6dd411bfba16fc12c93b7274811b86deb8c765760db0f9 SHA512 bbd2acee9653faaee639ad4a2ac5a509f5c538cfbc998a4375e8f0cacb3b8d906e66534d94804d7b5c30ac2e039efde72ac446d5286a00de8a1e77f18590174e
 EBUILD libmowgli-9999.ebuild 608 BLAKE2B c6dedd277c9406c534b97383d19a58a4ed461c49e96877deca89b02354ad43473a00b51e460e25c52f97323dd36d0a70100ffae2e68b4e07d4d09841f49dd390 SHA512 e4f523ef69e89ffa039494816d20cc552264d0f3fbbc054a198a5697f88aed24b3b8a812febd5eae00b5fd94ddebdcf82c7962d88b44a6ccfbfe80d6cb69f821
 MISC metadata.xml 364 BLAKE2B 3cf2dc0b9b8e9e25f34ed1e94214c05479d25ac7bb560680efec14ef19f61eef74c5edeffa9538c241ffdb7fe86bae4ee6c0865887e26f54e16cc5f064fb277c SHA512 dd547ca4323b0a3ed2d731ab482159ffdb22158bede172abcebff3460e20f284088659311c954919ce5f87e3fe6f90acce3c635612b7e0ca43ddfd85bc608843
diff --git a/dev-libs/libmowgli/libmowgli-1.0.0-r1.ebuild b/dev-libs/libmowgli/libmowgli-1.0.0-r1.ebuild
index f6bf87c430b5..9498d5e15049 100644
--- a/dev-libs/libmowgli/libmowgli-1.0.0-r1.ebuild
+++ b/dev-libs/libmowgli/libmowgli-1.0.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://distfiles.atheme.org/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DOCS=( AUTHORS README doc/BOOST )
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
index ccec9174b0fa..d3dda9979bee 100644
--- a/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="libressl ssl"
 
 RDEPEND="ssl? (
diff --git a/dev-libs/libnatspec/Manifest b/dev-libs/libnatspec/Manifest
index cdb5bb952813..43a6244ab267 100644
--- a/dev-libs/libnatspec/Manifest
+++ b/dev-libs/libnatspec/Manifest
@@ -1,6 +1,6 @@
 AUX libnatspec-0.2.6-iconv.patch 323 BLAKE2B 26cfb0f9faad0e375a2f2ed7766c3adc66d98d8bf5253e20b18148b29627b26addde0a0c1dbdc33e72182c346e477030318968553f4de1136c29a40d37759ded SHA512 8773c212b8ac7dd8b35f4fc4b0a266599374d0ec7da85c10b9ebd313c68bac5643a8301c1039152f2dfaa8ab03f2e17a5ee05a92d8e91bf314f99e30177943fd
 DIST libnatspec-0.2.6.tar.bz2 500525 BLAKE2B 30cf13f89a60c86c9ff56c2c2890d1fe169b2d503a87effec805fec49674b439f7311b358f2dad06b335e27b45e775f204092d3ae0b9933f516af3292ff351b2 SHA512 6bed3c8b2937ee27666a7deedcdebd7b24a8f495be63008fd70c467de4ab532e6448e6b682ed3be04a3a60ed64acaa0074d87231a421f6c73d6a7ee1d17bc66b
 DIST libnatspec-0.3.0.tar.bz2 127265 BLAKE2B 3f0ffdaa57f232c5245de72bc67b3b6bdfa88aaf965156c50483278f51d54c1da1600c19bd49aac5a1a9317a9b53d5202e6610b1ef6c2335b824e183de1fba75 SHA512 5c04358d20be5b6ffc7038bddd4514c4b5b4e9940fb6247070b832da9d059b31fd1306cf29f54e4a1b8be1d909176bd72e6ffa98e4b750840764f9b2c250d31c
-EBUILD libnatspec-0.2.6-r1.ebuild 1073 BLAKE2B 66ff76a44d2b6ef35ac8f37bf4be15ff9f56f54873c8771501ea903d4d0e57c517ab77269606e265e6909c5c5ad6b8afa2a63fa4b73626649a37ce6e4263574a SHA512 bf47ca1aa71973d9c1e0fe57687b734320a1734c585c52c556bf6f1bac01248d1744f8228113bb6e04c5681c51fcc811dd2ed21c211bab33be18f30a3a1eacb9
-EBUILD libnatspec-0.3.0.ebuild 1101 BLAKE2B 23feb2af436f5ab0956052fb4b2fd5edb6952204380631b7d931c0d3a3420c7eb762a6b2127747f233dfbff0a94caa70722ebb46c5f43fbcb3d816be468b5797 SHA512 7911cb04124c0a777154d3296d89ed39938db224760483616e95316dbba4c5764d9995334ca732857900e6a1d7ab52123f15cb73d1d37c3f3a15b28f1105bca6
+EBUILD libnatspec-0.2.6-r1.ebuild 1051 BLAKE2B c5fc3900556927cbfc4091e4d60a08bbc5298eee8247e35f68c9b31f35c0043f97a3b2f3ad3e11749befc95d123d6d75a3f74e0e6e9411f393af6c6dfb784fe5 SHA512 3a0c0d252e1c7c5be239c94aaff3c78a111fc92c74d646e957f5e92a6af5855312e0ea9db83bfe5daffa35744e832769ec10749293b94f67f4dff3e078352c0f
+EBUILD libnatspec-0.3.0.ebuild 1079 BLAKE2B edb96e466e5499074635f53a9dc6852148d5f3acbfa1615f0fd92b7e2b2a399dd6b5f85fc2fa4cb89c31361ed500e3769a280b7020c9db94d82617bb9c788e25 SHA512 f37b42da70c292de98ab1fffe537077be2af6a794f8c670e2b2212c06fc61ff68cf606b30bee9d28b6ac9958f8642b77baa6faac7b71c4b3ba14f7000f158870
 MISC metadata.xml 311 BLAKE2B 6af7771eaba07f3b1a635f316f198655ee598392f99fadc0f56bcb110c3b630bc9d86ff450622d9e27fdc17aeb62140efc6fec1d228a0de157b7058f1101d9a0 SHA512 f854676930193772765a53284b645b40e9a3a5fe7b6a6646173034593039ef6be112a1163760f59080ae89870d0af48c0308c31cd6eebd4d6fd5b45122d55272
diff --git a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
index 8fc1912e0cb5..6d8c0e4be2bb 100644
--- a/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.2.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="doc python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
index beeaea380a0b..04a335c80aa8 100644
--- a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libntru/Manifest b/dev-libs/libntru/Manifest
deleted file mode 100644
index 8e93fcddb203..000000000000
--- a/dev-libs/libntru/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libntru-0.4.1.tar.gz 97284 BLAKE2B 1384f96627c02f0b3981b25f8f080ae87606cbbf855358d40ccfb46abd22834c0af03f518bdfd23fbe17bdc40fc57cd1066db9e3bedb9a7529e2cf1130c6a5af SHA512 c49251a194614f02124c90c08b886f89d0dacbed2088eb2e306946666af3b8bc3f9c2dc2c7f5e4c0560af66fca31a640fa853b3142dcfb2ee2b0dfe9a0d41f61
-EBUILD libntru-0.4.1-r1.ebuild 1427 BLAKE2B eb86e9b3c56da03eec4ba9f365dcbe451229d7ffcfcc2fe4ee942e6e5b7ce467fc1c5b60d8c282d064a0f2fe4afa2028710b0993f39a6b99705dd1e4ba307dc3 SHA512 3ea44cdbcd5e3b9379e715b89a79e4b5f18e34fa6a4bb379afcf1f6e2ccdaad545b942b0e3f80e23956bfa6c722177502bedf86c032c301d587b538c8646938d
-MISC metadata.xml 246 BLAKE2B 539591427eb235ea24426e19f5fd86c40a9f74939f0252d96ba84bc8ea50ff6563be0d923150635b49736e3ee92b95ea12ae21c6fa6458d0836541e8fd587848 SHA512 d0b4f22c4207d647b24be3a25c4154aa30cf75727f0add14c9c1177f60fc264d1d9d60520518d16f5d5df3373d0a78643c650ab6925baf5255eab1a7e9fcebc3
diff --git a/dev-libs/libntru/libntru-0.4.1-r1.ebuild b/dev-libs/libntru/libntru-0.4.1-r1.ebuild
deleted file mode 100644
index 7625c4a96d4b..000000000000
--- a/dev-libs/libntru/libntru-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs multilib multilib-minimal
-
-DESCRIPTION="C Implementation of NTRUEncrypt"
-HOMEPAGE="https://github.com/tbuktu/libntru"
-SRC_URI="https://github.com/tbuktu/libntru/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples static-libs"
-
-DEPEND="dev-lang/perl"
-
-src_prepare() {
-	default
-
-	multilib_copy_sources
-
-	_copy_test_dir() {
-		cp -pr "${BUILD_DIR}" "${BUILD_DIR}-test" || die
-	}
-	multilib_foreach_abi _copy_test_dir
-}
-
-multilib_src_compile() {
-	CFLAGS="${CFLAGS}" \
-		emake \
-			CC="$(tc-getCC)" \
-			$(usex static-libs "libntru.a libntru.so" "") \
-			MACHINE="$(if [[ ${ABI} == x86 ]] ; then echo i386 ; else echo x86_64 ; fi)"
-}
-
-src_test() {
-	_test() {
-		CFLAGS="${CFLAGS}" \
-			emake CC="$(tc-getCC)" test -j1 -C "${BUILD_DIR}-test" \
-				MACHINE="$(if [[ ${ABI} == x86 ]] ; then echo i386 ; else echo x86_64 ; fi)"
-
-	}
-
-	multilib_foreach_abi _test
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${ED}" \
-		INST_LIBDIR="/usr/$(get_libdir)" \
-		INST_DOCDIR="/usr/share/doc/${PF}" \
-		MACHINE="$(if [[ ${ABI} == x86 ]] ; then echo i386 ; else echo x86_64 ; fi)" \
-		install $(usex static-libs install-static-lib "")
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use examples ; then
-		docinto examples
-		dodoc src/hybrid.c
-	fi
-}
diff --git a/dev-libs/libntru/metadata.xml b/dev-libs/libntru/metadata.xml
deleted file mode 100644
index 83d560b32b49..000000000000
--- a/dev-libs/libntru/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">tbuktu/libntru</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index 5ee3f1e22c4d..da821071a8d0 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,6 +1,9 @@
 AUX libofx-0.9.14-0001-Makefile.am-remove-INSTALL-from-docs.patch 697 BLAKE2B b7afbecfa66af17004ca9d8280ef491b08269eee834c3bfead44c1237ff35aeede455514301c31eb46c6cfd6431b68cbaea8cbe6993957e8883dbeb43220c8d8 SHA512 9c30bf1061666ce3659ec1a0ac00a4b5368213e8ebe338fab287740ae08ce1840f0bf80448ec2545e5d1269e25a2223b41bf91ce00d2f7e3c1b64ff6e5231a10
+AUX libofx-0.9.15-docdir-nothanks.patch 539 BLAKE2B 816194bff853bfec0cee811a2906a3c09143e79f3935e66f3ea7693bb7a8befc8a3e23bfa82cf612a928a4417554ccb42bfefa6885230fe33f27177d85d364c0 SHA512 819941c94e9c6ed393f3224d70a0905bd58d6d30d7b9f5fff68554f0d22030be9b170b44542fd70c7d6bbe3b3e2ee011cbe286e72d6b4bab2f05a3d1610cf0c1
 DIST libofx-0.9.10.tar.gz 1433837 BLAKE2B 131be0243b8450d32417dd75f0421744412a3186c0f7a3451883b6572c0dd27427579baf280ac2ae6409d0738bd578f69eaa9debfe50024411c6b0ccad11f5c9 SHA512 061110702034dbbb9be3adaebe6236a4b0842169d8ee7671bad6c93960b380cbb33953bdf080c8b14f45930b0c817fcfe1bf71f15d9872dd2535a1415f5be895
 DIST libofx-0.9.14.tar.gz 210155 BLAKE2B 1b5ee8503dd9d4837415e53ae79889c32c50146b2b508aab052e8074a277f8181c6866470220758ed7997b0b6e3e524ac6f9e1cac9a673f60c30ce3093e5a3ee SHA512 785c5130fc6f6cfc019d4aee2bf6de6311835e5dc7f2bd56a83f1ecf5e62ecb320a95bf4a5ff8f9e14dcaf5ff1eabc833cd7974927e571a8469c9a02fb8362d2
+DIST libofx-0.9.15.tar.gz 207361 BLAKE2B c84fd4593a9888268c691653dc1b5fff5c38013f12ccc4a8454f9a5026ba190388e5747074aa800266efcfd49a0fdb391a605d5837f664bdcb8fe1dc5c064839 SHA512 6014bf9c457adbe9053a47718064e6246c911c3bf081c690bf761650220208aabe94824aaa38794c1834462894b7948a06b3ff6b517a9a84b9f881ba51aee3a1
 EBUILD libofx-0.9.10.ebuild 1113 BLAKE2B 3631d753f719ba404467879b18d68ab9fddebe637b7ddca3e8c3821afe0a3d5527e9e6da69f7e031ef468b844f81ee567954ffde8a6c2939dfbc3965966dc2a4 SHA512 42493172e283ddf49306c5487eb22c5889b45d6c900fb41c1c33ab003cd316f4681ed239dd92a0a5b78f8f8b7bbb54fcb288622aa194b0ef4d602d853eecf9ac
 EBUILD libofx-0.9.14-r1.ebuild 1257 BLAKE2B f7cdc1d8f889624622bfb931ec3a514543c38433221c05df6fc0945763bb7cef7bf624b1353c9053cca1441e62e589c55088305b153e3c2f26c6cd7ab29cb3d3 SHA512 84b23985144ae9dd542306af7554a27bd02988e1ca8480d9e4445824f307c8a30506134d52d2da92dd29ae252584e656e88a6292af4243fbbcc3084e8ddd5110
+EBUILD libofx-0.9.15.ebuild 995 BLAKE2B 137ab8211813d86b3f703a02c97a54271ad9dbfee5c25b8a6f533e4e95536be97e6a3c757ae7c118d760df2fbde836062432e3288d8524d4ec2e94d5c167d5f6 SHA512 663bb695a30871914252932ac9a772c376028b9ecb0e9eefd2bc896bc95b87abc106ccf47ff1b0dabee2943578ad4858838820cff3d350d96529b36cc72e27de
 MISC metadata.xml 243 BLAKE2B 1611cb7b6df68e87374031fa563dcb5388243c0df9537b81e1c53f05cc297789e1f4d178edbbc8906af7a6b0ec549aae225662f87df1d48dc4a6fa2cc2c703c0 SHA512 fc5071bd581b91f72ea6f021641f47d46d1e6038cac7bd34bc13d94e6229441e3b2f7cdd981490a169d7e645339fe4137496a0eb0956014027ffd42a5b9814a8
diff --git a/dev-libs/libofx/files/libofx-0.9.15-docdir-nothanks.patch b/dev-libs/libofx/files/libofx-0.9.15-docdir-nothanks.patch
new file mode 100644
index 000000000000..6b8cc215eadb
--- /dev/null
+++ b/dev-libs/libofx/files/libofx-0.9.15-docdir-nothanks.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.am	2019-09-30 22:33:58.000000000 +0200
++++ b/Makefile.am	2019-10-12 22:46:00.915146241 +0200
+@@ -4,18 +4,7 @@
+   MAYBE_OFXCONNECT = ofxconnect
+ endif
+ DIST_SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump ofxconnect
+-SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump $(MAYBE_OFXCONNECT)
+-
+-docdir = $(datadir)/doc/libofx
+-
+-doc_DATA = \
+-  AUTHORS \
+-  COPYING \
+-  INSTALL \
+-  NEWS \
+-  README \
+-  ChangeLog \
+-  totest.txt
++SUBDIRS = m4 inc dtd lib . ofx2qif ofxdump $(MAYBE_OFXCONNECT)
+ 
+ EXTRA_DIST = \
+   libofx.spec.in \
diff --git a/dev-libs/libofx/libofx-0.9.15.ebuild b/dev-libs/libofx/libofx-0.9.15.ebuild
new file mode 100644
index 000000000000..5daccd32df70
--- /dev/null
+++ b/dev-libs/libofx/libofx-0.9.15.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Library to support the Open Financial eXchange XML format"
+HOMEPAGE="https://github.com/libofx/libofx"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+BDEPEND="
+	dev-util/gengetopt
+	sys-apps/help2man
+	virtual/pkgconfig
+	test? ( app-crypt/gnupg )
+"
+RDEPEND="
+	>=dev-cpp/libxmlpp-2.40.1:2.6
+	>=net-misc/curl-7.9.7
+	virtual/libiconv
+"
+DEPEND="${RDEPEND}
+	>app-text/opensp-1.5
+"
+
+PATCHES=( "${FILESDIR}/${P}-docdir-nothanks.patch" )
+
+# workaround needed for ofxconnect to compile
+MAKEOPTS="-j1"
+
+src_prepare() {
+	default
+	eautoreconf
+	append-cxxflags -std=c++14 # bug #566456
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+	if ! use static-libs; then
+		find "${D}" -name '*.a' -type f -delete || die
+	fi
+}
diff --git a/dev-libs/liboil/Manifest b/dev-libs/liboil/Manifest
index f0ba0c1b270a..be5ce6f522d1 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 1601 BLAKE2B 98c858d2bcd00d65663edbd4ab316b97a9da540e70324cb555aae5a354a1f819d3cb6b61064c056224313bd4b44d0199523b3a1c7c537bc0da44311646a61388 SHA512 ba57ae9b39c297dc796b62316f3a8e11f18f7fa2cd7ae21a612c550536cdac447bb55fd1ed54b0554188d4801249acf958b7b7acb28b103724c59f3e1e232478
+EBUILD liboil-0.3.17-r2.ebuild 1591 BLAKE2B 8fcc8174b3d342191e06ee7a47a7426b6ade687ceee12b6ee6eff42da72bb2edb0b060f9e8b06cdb1bd3c103d32febc35ba4b284b532c97b93388937e2b23212 SHA512 3c6efce8cf6816b4009d6c38bb50fc02c02caaf70349de26646cbcebc1cdb279cfdf796c5ef06f81ca50adf5ec76c23b5204066e76caeef7630d9950b31a98c3
 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 68e14d481b05..aa340d2c9640 100644
--- a/dev-libs/liboil/liboil-0.3.17-r2.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0.3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+examples static-libs test"
 
 RDEPEND="examples? ( dev-libs/glib:2 )"
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 99ddde79f612..a1582e822b2f 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -3,7 +3,7 @@ AUX libpcre-8.41-sljit_mips-label-statement-fix.patch 584 BLAKE2B 6523a93f78730f
 DIST pcre-8.41.tar.bz2 1561874 BLAKE2B 2a97a859237994137190da00c30ba7c15e8631b82b7f200858cf722f1fdd0405d36c24bb716eb099d8107f2f829a85fd7d3497f36cdac51769636989331e7a79 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551
 DIST pcre-8.42.tar.bz2 1570171 BLAKE2B f68bac3cf8ff5a81ccba31fd4d8926e05143a25a756e7daba9793467cec9cd8a4766f394f958ffca088b472463a43a31ea77014f2d4505082c1f366a18f30c7a SHA512 b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d
 DIST pcre-8.43.tar.bz2 1576584 BLAKE2B 12c2117fc5d242ada44884df279f7f8b4c680fa1623ddc131c0adca1740ec47614ac6af20fc60b0c516d9d7b66488ba8a4e5efa5fc8a0a70aacb02bb3d38ee53 SHA512 3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7
-EBUILD libpcre-8.41-r1.ebuild 2758 BLAKE2B fcf9a074de80ee360b8d5c173fa03a17e7a85230bc002e9acbcb72cc27cde4ccb3a36be465c5472b0d5fe88aaa092290fa1f0cda9d1037edd7fe2b27df3af967 SHA512 11bf42256b04f65e4ea767b3e03e5aa648596112ac432eb24d2bed5095c7d30cc458950375ce10664277ab89fbcf64e17e288eb32f8086394caca1ba3507dfa3
-EBUILD libpcre-8.42.ebuild 2577 BLAKE2B c7594243055ff465e67570a7112df101d402a7b94d0283105a40323ec923c1cfa6d7ee7c5e444919c00899df60ec09ea166fbdfc0c24c87026089971f8d9cfa7 SHA512 a16efb7649893d1779d9c1f014ae9b119e2f4e2f789cb5cac8cb2c3faf6619d077f389b5494b22cdd73074d32937b506dcd242d471c3dc543dfe342ac51548a7
-EBUILD libpcre-8.43.ebuild 2608 BLAKE2B 2f5a03e3d462e04de340f068e75e5d3ae2a83d1b1512ec84deaf2eafc11b0a5f2b565321dbe5793334595de09b26d9558f037e4892aea152c930f991b386e6e4 SHA512 668f2dfb8517dceb345bbdd4d5307a8abea477ec0029a8341b764e9c6cf9fc7cf02267525bd4710cdb2d35dd1bd897e86df7f0cf18f0d7f809777744a1e87a6c
+EBUILD libpcre-8.41-r1.ebuild 2736 BLAKE2B 49b62dbb0d85eac69d400eed16a2f456c01b701dc50e401aab892e81cfae531cc49a6ab6e9171e92c2c1766674e7d1d80e174866e171b0303fc87ae8a174e023 SHA512 2e69afff8a471cba66990490fdcf6196188aa5f48fc68d4f0121e2776d2617843c3644cdf433702a080b7b63bce838a65468d8c96ef8ad20c9903d1ae846b6ff
+EBUILD libpcre-8.42.ebuild 2555 BLAKE2B 0e115e7d3f8bff89be9eb49f7bcbcf4ffde0f04a59bc06fb443100c4d4e482f4d86b6a05bf069977d1b5d3d2be7037ee9f7d16adb154bb7f7b0b25ac4d1a2987 SHA512 33df88a158c4b04069758f941c676a2890acde8b77966269d2bd9b9efae0598087996c22fdb79317ac8078e40e1d9d194a99e68268da3e3015475be7872a01f2
+EBUILD libpcre-8.43.ebuild 2586 BLAKE2B 65c6ea1a968a802bd7c104c20e18bdd866b50c8c05ad62b3db3bede2181c873b85e961602c5a678c0e53f3edb6ec8e8221abba637eaf4f5ba58b76fdc47d9e9a SHA512 fe4f3bb99cc99726f38e8c51bce11cc2d4ed7aa64a866efe7dd66a30f100c08c31ede92858ccf992017708a5b3ebd0342fe7590cf58e5becd7b7d0c501e0fa82
 MISC metadata.xml 1112 BLAKE2B 640e6cc2fe53eaa86b6e6cdd72d45398c880a27d027441447b6162c70fa30fafe818cae8c08614333b866cfb1176feae365996386a72200232a738d99b592b83 SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b
diff --git a/dev-libs/libpcre/libpcre-8.41-r1.ebuild b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
index a56a11099734..0c71e46a0c11 100644
--- a/dev-libs/libpcre/libpcre-8.41-r1.ebuild
+++ b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libpcre/libpcre-8.42.ebuild b/dev-libs/libpcre/libpcre-8.42.ebuild
index eac6c8167e91..c5c986a943a8 100644
--- a/dev-libs/libpcre/libpcre-8.42.ebuild
+++ b/dev-libs/libpcre/libpcre-8.42.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libpcre/libpcre-8.43.ebuild b/dev-libs/libpcre/libpcre-8.43.ebuild
index 5f64e1c1ac8c..b5a63a4a71d1 100644
--- a/dev-libs/libpcre/libpcre-8.43.ebuild
+++ b/dev-libs/libpcre/libpcre-8.43.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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 ~x86-winnt"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 25e2b476c604..b656de392567 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,5 +1,5 @@
 DIST pcre2-10.32.tar.bz2 1641814 BLAKE2B fdd512312547ae90b36b6c9eb86b6fcfea9b03fcfd9766063c901819c6bf7536e1f3da89bd69ae62309069bc07c705e96e81f4a36355bf934c566f343e3104e4 SHA512 3d712e7d6afbaef227952680ded69fadbdec0b1abdfcac17cf071415c3c93edd152d6d268dec80570aedf24f82ba954f74f5f9e62c9b9991be75080a3d6ab5fe
 DIST pcre2-10.33.tar.bz2 1690739 BLAKE2B e59cf47a5068b2ec2d647d6dfe1cb5f8d6cdcc6fc6b47aa65a4c3d5aae256e7f0b090487d372c62aa7ec7f15a1f037650088b53385fc2fe31aa405878855e5d5 SHA512 c6aa52cdbb0c906b02e9a9f255697a1b9b99d9c7dccdaa484ffdb04fe3582d232ba3cb3c421d6df589a387b415dedb0817f58ec5391488b25b4e7bd9da6bab8f
-EBUILD libpcre2-10.32.ebuild 2359 BLAKE2B 6f569a14344a2d712c75d80dbf86c9959f830798e10f0218b74822327a8984730df0759892541bf7632f97137d39ba94fc51ce73ac54ed5eed0865b0ac9a34b4 SHA512 98364235db2f8a49d26f57ca7397c712b237cad56c12fbb65eedd0cb19f80a606fbfe6319065761fe0fe8a357e8340ee26f206c492260710dbe751c3d94334a9
-EBUILD libpcre2-10.33.ebuild 2379 BLAKE2B fc3b131bb355f7c9d0df2351bf56315b41435c0d3b31d7c0548b0b86e81a94904624384e0606403f2099ba71fb25cb023dde0668f177bd5ef5d83706b6b36ca8 SHA512 5e156c3b29a394bb877ba7d5f83d8e06a574fc4909b481cd30125b8377b47c6529055b84eb9e940e79e9a58ef9838763e07a9b4b5097c948e866b300e67d4c30
+EBUILD libpcre2-10.32.ebuild 2337 BLAKE2B a6659156d613e53ef1bce927e42c1a948a73868278c335bdb49b89bdc1b5dc9090afb994635e0395921748312c84ab1125a3e5acb66d916540795c9733e7fcc3 SHA512 9c8ebe7887d4ae6c6cf4138ec62021bba726a2052cb7b3c1d34ed276310e3b18e4c01d3a3ba0eb048e8234f2a72418e3749141a3bb0121c5193cfcdd72879fc2
+EBUILD libpcre2-10.33.ebuild 2357 BLAKE2B ac53d62cdc00e46b508cf3a554342782df4bba0ed0f772a3e33204f80378fe70349df2b2989e79845f6979ac42df99566820439cf26ce401236b30913651fa40 SHA512 93dcd6ed77ed7f193c7409f8847f209513b69d09adb0332de92103547c9fa0f58148dd29702be9c114c423728292446a5335e7b1f85b280e4f60a5bb6ed999e1
 MISC metadata.xml 1228 BLAKE2B da9f4403aa5618f793335621cecafefc6c3a475f7339884fdebe661002cf724e0b27d49270ce4dd4092bf9fe00371c53798988d28376475f630c965e7fbd1c09 SHA512 33c0cbcd3fd188d2c594cda3e8aa100a1528f40af2aad398c6371cf01c639b54d0cca52adf15a123fc036738031729f2950b8409b91b40240211ec7e9fbb80a8
diff --git a/dev-libs/libpcre2/libpcre2-10.32.ebuild b/dev-libs/libpcre2/libpcre2-10.32.ebuild
index 46a1c5ac6da0..38335b7f2127 100644
--- a/dev-libs/libpcre2/libpcre2-10.32.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.32.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpcre2/libpcre2-10.33.ebuild b/dev-libs/libpcre2/libpcre2-10.33.ebuild
index 152a9b890bbe..eb473005ccc4 100644
--- a/dev-libs/libpcre2/libpcre2-10.33.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.33.ebuild
@@ -18,7 +18,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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 )"
 
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index fccdaf4bc275..0311e24f5041 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 2208 BLAKE2B d7e3a6e08b7d2dbb2f1059dc62c72c2d70f118ad9e2544d29baa2f085303906dc18ee88f56ccd5088716b7cbebf94b1939c4f8057375b6652da576b1e71900de SHA512 ef014b6e5e3343100aee53a99134deef56039876b2d1700a4551e814ec7e5d78b8d162b85b2c08323bd3e32c8f5f501217b50daed156470be759131d1f437a68
+EBUILD libpeas-1.22.0.ebuild 2196 BLAKE2B 104284675bcec1690ad0ff30de3b2ac38d350774a4ce98f7840a2baf7377f8f1cec8796ceaa113bd9c65564eead8e811f71c18a2ac9b838cfacfd1db5ad91518 SHA512 734a5bec14ee98e35e08cb0df225f186707749f9cba6ad4ff81fff80c94d701f1268420c9538c837ad688ef37f117ac6fc074f6bb731c7922165a293187fbb26
 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 713d322fb503..458f5c4b5bad 100644
--- a/dev-libs/libpeas/libpeas-1.22.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.22.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="+gtk glade lua luajit +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index de9fdcfa5cf7..40bf474d6c40 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 663 BLAKE2B 79dc2b9a52eac5632235bdf1bcf3d1c55a352eb6bd5d5a13e617ca8035b5e562c5e1581639ba84d9da6dbc25cde19504a63090ab0169049f2403bbb73750fca8 SHA512 ce8bde67e8cf1308d88fe17fc54e57f552d6d1e740ecaa7463755803ad3d1427a8519b72f1db42b1223f380c24c05dfe147f63ca699d7a1a012a18a179f79b73
-EBUILD libpipeline-1.5.0.ebuild 790 BLAKE2B 41513ad649af9b6c71486710a3e44c4ef5a83fec601a7d1ed1668aab7404bb07a88c97029cf4b20cd8a98da7236d2d1a6d9311a263e59423c29cea4ea699001f SHA512 292cac40969d754d462260ccc32f93b52d65e6491e723f5995aeab1f9b050afb34f58dbbfd763149a8381096046dc27a7fb361a998d267386d6ff98f34d5ecb6
-EBUILD libpipeline-1.5.1.ebuild 661 BLAKE2B 37ba21c25d318ab2f8733013dc1ec17489baaf3832aa2c7b8bd1289b9100390e946994af9c86785f533fb647650f3f1513950f3c7b42f3937220c126e531aaba SHA512 2cbb77a80f5b84fbd5fa0167bf92887c62a553d22df49f36bbb67c216039f2c0dd7de5eed280d386b8f818e9f83cf4931afe3ddbd3cfd8c66ca6463d4f33ccb5
+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
 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 09dc93e73bc0..5d7946bfd016 100644
--- a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
 
 DEPEND="virtual/pkgconfig
diff --git a/dev-libs/libpipeline/libpipeline-1.5.0.ebuild b/dev-libs/libpipeline/libpipeline-1.5.0.ebuild
index 46f7cf9ddb9a..d88d6330cac5 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.0.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs test"
 
 DEPEND="virtual/pkgconfig
diff --git a/dev-libs/libpipeline/libpipeline-1.5.1.ebuild b/dev-libs/libpipeline/libpipeline-1.5.1.ebuild
index 7538a969cc94..a5e94a7d2829 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.1.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs test"
 
 DEPEND="virtual/pkgconfig
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index dc14cde94dd9..703df6c6cde4 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,3 +1,3 @@
 DIST libpqxx-6.4.5.tar.gz 715081 BLAKE2B 4f1356dc5fc9baddd8fdea6095541f4d90657ef0211edec7796ddd3693933b8d37d5bb14e19249a2e4627b85aef11c582b0ffac0226c8e99a70af1d2b0396e5c SHA512 b6f79c4af93876eaf859626c2deae3b23bd4fa1a438390bc01513ccc48b90565d59588f6977e7475bb7b8dbeb8b1c8ef2a4737d8eb4d15682531fbf78590ed5e
-EBUILD libpqxx-6.4.5.ebuild 2175 BLAKE2B 666e0bf84fa747c1d2a3735e9f1f490194d7f9992cdd022861f241b31fb9e31dbfe59a1c6928959e7fdf3825b0b8ab3505ab777b8b5d0e4e8944c8ca6ceebb80 SHA512 772047ecffe3658073da917d237d04c78b3c76deb5145f7e2906da2af16b29f5f93e9e9f9a3113f5ef647cbae0256ad9d79bd8d408a3548eecceda6841d09ef6
+EBUILD libpqxx-6.4.5.ebuild 2165 BLAKE2B d80cfb785949df8f5164cc85de8516f41f85062dfbdb67c0b56b03f7dbb38775e95084b81c00617d4d601b2b55b9a90ac139ca1d83eb3b7638166020765d9873 SHA512 be3f45d52b89551cf9448100b7722c48c0487515d27fa0f13ab69aee5e0ab5fa543961b71853bdaea8fbd4706e8b5f3bb3219f0342605b7d4a52c1763c3ff7d0
 MISC metadata.xml 597 BLAKE2B 2371e4c701506d5e8b4eb0938325a6cd909ad874badbc000a7ea831d2e7ff55cf1b6f4fbb3ae09f9392850319f9cbbbde083492a20cf1209e94139f7b1ceb927 SHA512 c732dc922e3ac9e63a373dbe8b53ef8fb93d87c7cd91a1db1b94e89fe33f3109b818cf0730df36b00f2abf1dc554e1bf261f39db807cf61775b8177db231d37f
diff --git a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild b/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
index 4d6ea997a9d5..b2334ecb8f0f 100644
--- a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
+++ b/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1
 
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
 
 DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
 SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-libs/libproccpuinfo/Manifest b/dev-libs/libproccpuinfo/Manifest
deleted file mode 100644
index c3d6c88baa74..000000000000
--- a/dev-libs/libproccpuinfo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libproccpuinfo-0.0.8.tar.bz2 54475 BLAKE2B 9845aa05ceae31039f8a95de7970b7e72a9fe0692b7efec6ec8259d12b61aa5b3c8e363d76d0cd9bd262127dc15cf99057566a97db48ec80cffecad705ad92fd SHA512 24c52551025d1ca349109e594861c74a5834ea4dc5c450bf6c03c3c73a4dbef176de4ffdd5cc2e8d4279ac14ebdf7045d31292a54730d52d81c1d7bece89f4ab
-EBUILD libproccpuinfo-0.0.8-r1.ebuild 655 BLAKE2B 9d9a6df9aacc92180fd006f3a3404b31e12a867eafb31721d09ba797f761b2151c2ad26186701089d0226d67ffd7fab6cd07fe7e2457bee207da05ecbebe6b8c SHA512 dceaa82eccaebb5eacd129b395683a965642d154a397ac00565b879cbf1cb7fad9d6c8d0ba5584642d7d95e9cf907c8077d43fada7e08c86bcf824e62d4d1245
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libproccpuinfo/libproccpuinfo-0.0.8-r1.ebuild b/dev-libs/libproccpuinfo/libproccpuinfo-0.0.8-r1.ebuild
deleted file mode 100644
index 6ec4298a117e..000000000000
--- a/dev-libs/libproccpuinfo/libproccpuinfo-0.0.8-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Architecture independent C API for reading /proc/cpuinfo"
-HOMEPAGE="https://savannah.nongnu.org/projects/proccpuinfo/"
-SRC_URI="mirror://nongnu/proccpuinfo/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~mips x86"
-IUSE=""
-
-DEPEND=">=sys-devel/flex-2.5.33"
-RDEPEND=""
-
-DOCS=( AUTHORS ChangeLog HACKING README THANKS TODO )
-
-CMAKE_IN_SOURCE_BUILD="yes"
-
-src_prepare() {
-	sed -i \
-		-e "s#DESTINATION lib#DESTINATION $(get_libdir)#" \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
diff --git a/dev-libs/libproccpuinfo/metadata.xml b/dev-libs/libproccpuinfo/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-libs/libproccpuinfo/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-libs/libpthread-stubs/Manifest b/dev-libs/libpthread-stubs/Manifest
index 590de831690e..4a57df9e6025 100644
--- a/dev-libs/libpthread-stubs/Manifest
+++ b/dev-libs/libpthread-stubs/Manifest
@@ -1,3 +1,3 @@
 DIST libpthread-stubs-0.4.tar.bz2 57565 BLAKE2B 0c59ba509aa24ce0d255790363d78d670be0bae5fd9556798f276466ecaf70c4d93064b531dd9870da8f934da6660fba71a7f0b402bb6ba5420fd6ee5ca546df SHA512 0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954
-EBUILD libpthread-stubs-0.4-r1.ebuild 855 BLAKE2B f9d9d3b52587eb384d01948c7197e4984f0f6004f4357e9856db98e50f4b81b11d50db62b6bafc5bffc1d4993c48a39faf485217a3beca51f0a2a4173f322c2d SHA512 811f7f4eb52cea007cf67dabf9cfc99e10857ce147e615cffa06ab3183e2256cbe45f0136ee7a8ae6a03e1decc6daacad7449b5a688b569c863f9481107048dc
+EBUILD libpthread-stubs-0.4-r1.ebuild 833 BLAKE2B 84d628c512d1a14d7e860bddd71b34fe5d5b83f901c0c51e8e3f8b26c12d59844e1c41bc20e2a43a41b65abeaaebf89ffd98942939947d7b004439e712d5074f SHA512 3ae3948d90961540078d54f1750d7ec0ea14b2434f9645942c9c0c36796a5d0a6d6e771688e36863bf6be03c6eb6d96825d276cf6a7663ebc81b3af8a50941d8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
index 9c460ce47613..958ae57859c1 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index ce3eb1f1f14c..c1bacb1d08f1 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,5 +1,5 @@
 DIST libpwquality-1.4.0.tar.bz2 450384 BLAKE2B 52a6f1c1bf90f6f01fb07667937b9792935729be77042bfc97dee8faa923212fa02410ad4e5c56f778bc9a8d248655f0b738889f5a0e73dc201d62d0c79093d0 SHA512 b8049f8b71bbfd4d345dbd4c4cffd29e9029b0fca4c95527af54d11a3b06e4708236b630df6c66738368298679c96cb3bf26b1b5d95cb3c5f7e1073cab8a98d9
 DIST libpwquality-1.4.1.tar.bz2 423053 BLAKE2B 305dbad6bba47d489cc5af7a362564cf9d8800e72d2e77cdbb2ea6fbf4d6888ef07ea93a4af474a60e6c25df417d0222ba54ebfa458894508410cec1ffbae654 SHA512 0bbec7e79a4db56c2cbda65c36003758a1044eee2ac8c678447d96d3cddf034a3196a7d8cd7972e9f50701391b8b81e2c3769fd81c4e4605fed96efd120ff257
-EBUILD libpwquality-1.4.0.ebuild 2012 BLAKE2B 5aa9d7a4685ac3d9ebc22aff2cb740a0e017b124053aa8071c9cbb34a50fded9fb9cd28b330deaa5e268ea613186ccef92c8322761f322530f819d7ddf37f846 SHA512 1e958db2c9ee2e7048e43d32f61fc052ee1d3d59d6d009ef0fe9a2d52a0ee37281111ab1266a1d4c6bdb3f6fe86d3089288be6b1bd262bc83a7cd6f73a000e53
-EBUILD libpwquality-1.4.1.ebuild 2018 BLAKE2B ff787403c88bc2bad5cbbbf0c3e4978b82b5e6aac74bdeabe07b68ecbbb41ec2d4b27215b257dafa4d3bdd90a321a9b464a8fb9c0d7c5a82783c3f1d2b93efb0 SHA512 df83c65f2249c127983ab5769b963f3a467a0fcc981e1d6300b5d55959fb1975322e394aa1927a56988eae5d19d043445a08f2858da3f9948dbbe42da60568c3
+EBUILD libpwquality-1.4.0.ebuild 2013 BLAKE2B e02c0b8cdbf67f824252221bf8068598512989c31d3b40466f9f078c056d539a73e79ecc10976e07f8270217af9918e3694bc7836e8bd436aaf537c0985b66b4 SHA512 33485f5ef2564b490372a6a6ecee65b08ed40079658ddeed9481707d7d496870f74e05e1c8bb52e4ff13b1a0b9e21d730aeaca05324ec1978621ae488b0fa876
+EBUILD libpwquality-1.4.1.ebuild 2019 BLAKE2B 02511b86c9ca59c10d6a4f087da1c240954778421d3618b9c52f334e05f749a8f737c90a0c70b90e909c3736f8ce7d8b9d0f871d645d4aa00940857548dd2f01 SHA512 4a4f09e2bb66cbd5c4725dc2b2cf17eb31baf428f3d2aab539e9a840fee3044eb436b6350fc6332375a27dcbbf3c522b1ba853b5c742c4fc21d1397a51c96328
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libpwquality/libpwquality-1.4.0.ebuild b/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
index 55e9c8b1b473..0bb5bb2eb52c 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	>=sys-libs/cracklib-2.8:=[static-libs(+)?]
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-libs/libpwquality/libpwquality-1.4.1.ebuild b/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
index 138f711f39e6..5627f0036e33 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	>=sys-libs/cracklib-2.8:=[static-libs(+)?]
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 06f1864d8f0d..b121bdc5c8fe 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,15 +1,6 @@
-AUX librdkafka-1.0.0-remove-automagic-on-zstd.patch 967 BLAKE2B 1df3c82dab189ab781ef848966561e87564e8878b7c69873792b2b6eaff963a132da8b248eb2796def6e78d8f7246136d3845374af6ad9d3ab3bb9c68ae876cc SHA512 0e01db881e7bd458837de5b4e1fb7ee97ac2dfdc0b163594ca4bc50b82e803acb18c5b768b359288c30fd2cd0a06b830858386c7175bd9028a23a9f959c1c77d
 AUX librdkafka-1.1.0-remove-automagic-on-zstd.patch 972 BLAKE2B 3ebe1a2895f5e06070e89c1b4aa23a771dcdb1e45b145ffcdeabb44dd061450eb98d160d4aa0ba297b909e6964d4d0f270346bf825a93a5883aef825d79011c6 SHA512 5a6318c9ba33da6c9c1fbaf08f3c9ff43a9f4b532ae4f220f0b2cbde6769358d0bfaf8de68102f9e3d6bb4b2e3005462036e024796a1fa81be65ea3ca914691a
-DIST librdkafka-0.11.5.tar.gz 1984510 BLAKE2B 55a27482275726233b5c9b39dfac1b9f34235c68600b5720c1a9dec782de6a4d7d084ad71e50857c32a93b39beacc891933e02f45162d0de144ecaadb3640c41 SHA512 4a8dc46ad66f23cff4d4ef2fc8daa7207bfa3e77fd3580b3f141a73b449e60ea5381e97263235b4d0d762df027a8a2cad08637d88162d9605c82d74a1e64b67c
-DIST librdkafka-0.11.6.tar.gz 1994337 BLAKE2B 7b61e6ba02c5ed58c20e604d6765f6a57ff63ab0c61f2a4c64eff55bfb6c854ef089ac9eea9acc6d44b6abdb6d1425ff23e9d4e6037c733bc5719d6b69c74ae0 SHA512 9657dc53220bbff3eb44941cff2f50ab7f71a82f7486d64ea14f67eabd4abe8c67f225a752cc1f0339439a1cc512e99ade6536d087857979cd198c0102015718
-DIST librdkafka-1.0.0.tar.gz 2465603 BLAKE2B 7006dc421ae5c2c991853f4ede9d99e7dd308b49372a7c2c859ecc0e6ee7aa3b6cda9af7a71a5813610630b564bd65c6cf18ecaefd1a1880545838d7758aea88 SHA512 15ac1e4c9042debf8d4df602ccdc5eccae3a37b305be24d724fcaffc3d1d0aafa708fc8e29d6af51f51ed6c7daf74b3041b8b9b0444e6702cd73479c8078859a
-DIST librdkafka-1.0.1.tar.gz 2466259 BLAKE2B a391d57b21711853ce7df338070512f715f3a49ead2b4f7eb1fe5500699c1891821e6bbd4b87d3debea6852eb85094aba161cb3ca95aee3c592a38be4933ecff SHA512 094599e974236814c03e688eaa5e39d817cca110ff691501826268c45653fcd6b21b60e741140a1f7ffccd49902247f08fcec82475be2e9f85feaa4340b32d4c
 DIST librdkafka-1.1.0.tar.gz 2511445 BLAKE2B 00c20361058d537d045da6961afc45e40e0ac641918df9eb457937dc3ca566639b81d8aa10cc6ed2f57988eded180f3d2eaea72ca4b910a652b93b54b9388253 SHA512 35561399b07278a09a51245c5503c86eb0cc8971692b4e65a332144bfb71e2e86d4ceaf1804534b6a416bcace74cef493b6465c20b32c14de97f45f2854359c6
-DIST librdkafka-1.2.0.tar.gz 2534841 BLAKE2B 2526ee5e40e9d78ce9ce66fd0c5bcfb8309c04c23fc18e890df6dfa32e182f48409728518a85647ea4a156e9d20c40ea5b443ff9813fc754e260874a6cda71c7 SHA512 7caddeec09bd1556688f0011f5cae49f8b0cde55b8dbc1296b3d2a39879badc42b7f59369bb1938ce7c4c4ff8b0fe4f1973b923c3db603466c10a4c015306522
-EBUILD librdkafka-0.11.5.ebuild 1249 BLAKE2B e10b7391be22a1b2fa32af02872ffa2e813ae0a387e7a31005900b63c9d2d3ada9cd47ca2e7a155f6178267b3a2b258f7eb9f8c7a2470be8ad61256d7d207a38 SHA512 41f0086bfe66d0a12f2ab448d842119bb3afe4e3008662b0fb0ca5bc99ef36fe81c4c4d0c8de46ff4eeb6594cd4253ef5f0895beb45235f99b195d3b13476953
-EBUILD librdkafka-0.11.6.ebuild 1249 BLAKE2B 038b73de2adf38cf66b95a470c1bf4e82b4d30c50410ba8ddbad3d59cb6ec323dd28da6c9deaa162049cb26c4d38f1456459fb309f01ee7d2b7f7d826825ca99 SHA512 e3d82210e7d6caee61bece6eadf2098144bb7dc7f1fe3c19e6e0ef154e0f36acc2b60017d8fc044f3a63ab7c83a7e1f5c8c732c39817904d31fec3b47d1f20cb
-EBUILD librdkafka-1.0.0-r1.ebuild 1369 BLAKE2B 0217f4996dd3904f871ccd0fbb300f681c1f2cdb9c4d08bcfb494ea99b15828c35712cd635c371daa776ec8f8dfa07dd70f4f678827393e9c45d3731e321ed70 SHA512 af7fd02a7f5c56b903c57f2f986a417ed9b31c956afb201b2c0523a452c1fced34359722e88d34e06203c1941101c0fdf56c4768397cd37432edfb309a13ba8b
-EBUILD librdkafka-1.0.1.ebuild 1534 BLAKE2B 8efba93d73fb34a800283061f19741a1831b3d0dedbad241d28ad8e61aec1b5ab8f232b8156b942ebae50a82bd1d5a4b11352bf2369c420cfe39e03eb5b0ebc6 SHA512 777c6c640484a94f688985e8e1cd2b25fd75de034329c6fccaef41dbf4de673733d6d8533791a37c5594b7ca5d6dcaa925ca39b919406ff9439b7dd74790a0bb
-EBUILD librdkafka-1.1.0.ebuild 1541 BLAKE2B ac930b83386acbd35d8c845699086c5b0038dccc7db8c57cc1a68f169f92451bced1ccf5afaec34194141228163c193d86c31ed7784a28cecf568be70cc4b7f6 SHA512 fda3cbcd3ef07d437cf305b816d863545d1692319edec8a87de5a503ee734cf27032b3f05888dc2d40d99d1d291bac94a2e60a78f5ef4a57f76dbed6b1dfa8ba
-EBUILD librdkafka-1.2.0.ebuild 1475 BLAKE2B c8b5a4d4f4d946e7a1d78b0a92b737686c1dd8f975122923de2994076a13fb7826f889ec893928c82dd206e2a3c9e777723a5ab1e7ff26f8a7f863f0e82f049c SHA512 a5e794ae2bce3f2aae32642986edc962e5861a745656440fd765a557e695a7d8570c0f90ba5bad57e18a399c1d294c2cd696284d598a074ab742ef49e241c46b
+DIST librdkafka-1.2.1.tar.gz 2547009 BLAKE2B f55c2f23339294d54c1a3cbe064b0ddb6a638adfd192351a69bba91c81f7d33dfad13b45d50a8ea008e397400c89e90fe267549566a8dff07ca701ae59934126 SHA512 57341a0e4dbe98b9da912f5a63cc82490222bd91aef7c3cda3acaa4807e1d13ac047fbff8898f7459e7a1cb46f02dfc665e8c5bddffd8153d67a2c0546000a62
+EBUILD librdkafka-1.1.0.ebuild 1540 BLAKE2B 9060364fe3e3927f991161e72a5d4fbcd1f9386538ab47f9c2640a93ae174a019ebede893281c52e65ac8ae306cfaa78e130ffd14437200cb92d958c91515ade SHA512 5025fd3a0bcfc99d7a771855e2304ae10990c0d4b62532fb7704ccf1e8127fb4ff2667440eb46ca15321294c7cc64773e233d80a07e0524677b0ee092c05982d
+EBUILD librdkafka-1.2.1.ebuild 1475 BLAKE2B c8b5a4d4f4d946e7a1d78b0a92b737686c1dd8f975122923de2994076a13fb7826f889ec893928c82dd206e2a3c9e777723a5ab1e7ff26f8a7f863f0e82f049c SHA512 a5e794ae2bce3f2aae32642986edc962e5861a745656440fd765a557e695a7d8570c0f90ba5bad57e18a399c1d294c2cd696284d598a074ab742ef49e241c46b
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/files/librdkafka-1.0.0-remove-automagic-on-zstd.patch b/dev-libs/librdkafka/files/librdkafka-1.0.0-remove-automagic-on-zstd.patch
deleted file mode 100644
index ed4dbda6b8ab..000000000000
--- a/dev-libs/librdkafka/files/librdkafka-1.0.0-remove-automagic-on-zstd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit ff67402dcfb2f4913a3ff1d84449a5e1620ee4ae
-Author:     Thomas Deutschmann <whissi@gentoo.org>
-AuthorDate: Mon Apr 29 18:57:10 2019 +0200
-Commit:     Thomas Deutschmann <whissi@gentoo.org>
-CommitDate: Mon Apr 29 18:57:10 2019 +0200
-
-    configure: Add option to disable automagic dependency on zstd
-    
-    This commit will add an option which will allow you to explicit disable
-    zstd usage.
-
-diff --git a/mklove/modules/configure.zstd b/mklove/modules/configure.zstd
-index 6dd621ad..3ea36ccf 100644
---- a/mklove/modules/configure.zstd
-+++ b/mklove/modules/configure.zstd
-@@ -9,8 +9,12 @@
- #   mkl_check zstd [<action>]
- #
- 
-+mkl_toggle_option "Feature" ENABLE_ZSTD "--enable-zstd" "Enable support for ZSTD compression" "y"
-+
- function manual_checks {
--    local action=$1
-+    local action=${1:-disable}
-+
-+    [[ $ENABLE_ZSTD == y ]] || return 0
- 
-     if [[ $WITH_STATIC_LINKING != y ]]; then
-         # Homebrew does not provide a static library for zstd
diff --git a/dev-libs/librdkafka/librdkafka-0.11.5.ebuild b/dev-libs/librdkafka/librdkafka-0.11.5.ebuild
deleted file mode 100644
index 8d19079df92e..000000000000
--- a/dev-libs/librdkafka/librdkafka-0.11.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 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 x86"
-fi
-
-LICENSE="BSD-2"
-
-# subslot = soname version
-SLOT="0/1"
-
-IUSE="lz4 sasl ssl static-libs"
-
-RDEPEND="
-	lz4? ( app-arch/lz4:=[static-libs(-)?] )
-	sasl? ( dev-libs/cyrus-sasl:= )
-	ssl? ( dev-libs/openssl:0= )
-	sys-libs/zlib
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-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)
-	)
-
-	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/librdkafka/librdkafka-0.11.6.ebuild b/dev-libs/librdkafka/librdkafka-0.11.6.ebuild
deleted file mode 100644
index 3e90b50ba9b1..000000000000
--- a/dev-libs/librdkafka/librdkafka-0.11.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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 x86"
-fi
-
-LICENSE="BSD-2"
-
-# subslot = soname version
-SLOT="0/1"
-
-IUSE="lz4 sasl ssl static-libs"
-
-RDEPEND="
-	lz4? ( app-arch/lz4:=[static-libs(-)?] )
-	sasl? ( dev-libs/cyrus-sasl:= )
-	ssl? ( dev-libs/openssl:0= )
-	sys-libs/zlib
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-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)
-	)
-
-	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/librdkafka/librdkafka-1.0.0-r1.ebuild b/dev-libs/librdkafka/librdkafka-1.0.0-r1.ebuild
deleted file mode 100644
index fa9a0fd5d556..000000000000
--- a/dev-libs/librdkafka/librdkafka-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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 ~x86"
-fi
-
-LICENSE="BSD-2"
-
-# subslot = soname version
-SLOT="0/1"
-
-IUSE="lz4 sasl ssl static-libs zstd"
-
-RDEPEND="
-	lz4? ( app-arch/lz4:=[static-libs(-)?] )
-	sasl? ( dev-libs/cyrus-sasl:= )
-	ssl? ( dev-libs/openssl:0= )
-	zstd? ( app-arch/zstd:= )
-	sys-libs/zlib
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${P}-remove-automagic-on-zstd.patch )
-
-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/librdkafka/librdkafka-1.0.1.ebuild b/dev-libs/librdkafka/librdkafka-1.0.1.ebuild
deleted file mode 100644
index d545a285df70..000000000000
--- a/dev-libs/librdkafka/librdkafka-1.0.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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 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} )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.0-remove-automagic-on-zstd.patch )
-
-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/librdkafka/librdkafka-1.1.0.ebuild b/dev-libs/librdkafka/librdkafka-1.1.0.ebuild
index d5ed3cd0a1fe..b3f9787c0202 100644
--- a/dev-libs/librdkafka/librdkafka-1.1.0.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.1.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	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"
+	KEYWORDS="amd64 arm arm64 hppa ~ppc ~sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/librdkafka/librdkafka-1.2.0.ebuild b/dev-libs/librdkafka/librdkafka-1.2.1.ebuild
index 6d51d76e53fb..6d51d76e53fb 100644
--- a/dev-libs/librdkafka/librdkafka-1.2.0.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.2.1.ebuild
diff --git a/dev-libs/librep/Manifest b/dev-libs/librep/Manifest
index 2d45712383a5..81be9e22b6b3 100644
--- a/dev-libs/librep/Manifest
+++ b/dev-libs/librep/Manifest
@@ -1,5 +1,5 @@
 AUX 50librep-gentoo.el 180 BLAKE2B 7d60b7ef76c4c695eca84d2c85e1d139fc34fcaaa76189510d8fe021b05a276da9ab33f38622e04c55bee7dcd312bc20baf86383114e527b34cc8daa305b35f5 SHA512 04a4da2e38ddf04bccd28002a46f13526249f31d2e25769056e1b763e3a22f75ffc2a906b68eef0ce04b1e6505acbf858f4d7f911258461e39419ebe4b098b71
 AUX librep-0.92.0-disable-elisp.patch 838 BLAKE2B ec37012dd440def1beab62335b787d7d064b416f3274bf5e563127801f0b242313fbdc5b30e43dd7e518c2a91a05532f606126645af33d45c808d570731a759b SHA512 cdbfe9f8f210869243e38e6ed4f2ea66cee4a1c626e7fcd8b9733870998e59e0a294c3cb9c491eefac8d6b89a8effc9068ea0dd9f2d2d6a86c9dc49dd838f126
 DIST librep_0.92.6.tar.xz 472152 BLAKE2B 165fa8b1d68360e0b08909663cab0f334774030e970c0d376652bc819368eae647882091f1e8d1329f4d3c1c53def4f69aeb8c4d7fe5f327d06d528dc9bb2267 SHA512 6e347e788922af9458e6eddfdaf7935b69df8f70b3f6deb11e6abd67596aec05e7dce7f41db1c84e478347d379ced10cfb34672a797c853913fd538a78a1f96d
-EBUILD librep-0.92.6.ebuild 1496 BLAKE2B 86d825c017bcea3436af965a595905c78d54f6a67c01b66eb1f07fba152840d2183fc69f1fbaa1898ce7b93be304713a3b8c06445b83ab81e14a2736f0f30915 SHA512 d608885996b4e13d3de2e96f2bc2194d411643e5e5c0f649c222450b46aa39df40fd1d7e5c712b3042e29e92c6297f07a908f842b9044320e804263e76a8541d
+EBUILD librep-0.92.6.ebuild 1486 BLAKE2B 1c1e59e0da56e06c0dc8eb9e67a08fbdfa64d3505035f75c210f10a8f2caff732864059f171663c5d06e0a054a4a6768cbbcd1d23742954330489832c99479c4 SHA512 ab36e1c220f6e1c7160c15c1b549fdb2974cabe0829da22455cd7af5dd3dcac39b1af75d22bd05083e26608474a8610ab0ed07663c97616d23102721e62648fc
 MISC metadata.xml 243 BLAKE2B 424708417b0be4fbbd98ebe053b99952e71bf62573e9c47eccd5adfa07de8ed4d9477bf5883b3ba4d4e9d1af015ff6e4f347fe1caa3fefa1ae7a1d5c9c0a82fc SHA512 6d786c0bd00b4cfc39b7705053bfda7169666513c7e7ca16f9fdcca5244b89f1e0024731214956e6cdcde8d241914c6f66b7dae153c4c48e5a41e44bd1b04411
diff --git a/dev-libs/librep/librep-0.92.6.ebuild b/dev-libs/librep/librep-0.92.6.ebuild
index 259b0e4cdbfa..2f401bc59246 100644
--- a/dev-libs/librep/librep-0.92.6.ebuild
+++ b/dev-libs/librep/librep-0.92.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/librep/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="emacs readline"
 
 RDEPEND="
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 2432afb583d5..b7e8a0ccfbfa 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -6,9 +6,11 @@ DIST libressl-2.8.3.tar.gz 3366196 BLAKE2B e32c097b31998d68a31266fbbf3624d5ab8ca
 DIST libressl-2.9.1.tar.gz 3607116 BLAKE2B a4542d7fc97bfd213162fe908e28b27d52329e2b6a5d77e0cb67d1a6732c500ca772d0c5735c9fcd036c477e6ede330305b4675bfcff9f72fd7886a781f30015 SHA512 7051911e566bb093c48a70da72c9981b870e3bf49a167ba6c934eece873084cc41221fbe3cd0c8baba268d0484070df7164e4b937854e716337540a87c214354
 DIST libressl-2.9.2.tar.gz 3607549 BLAKE2B 496e993e4f1c85167e0344afab61259d4e3f094a7e5dfac85878191070e2c196753162532efb921fab582481aeda3705fca9a2b48921cba82465192f2c1eef95 SHA512 b43e73e47c1f14da3c702ab42f29f1d67645a4fa425441337bd6c125b481ef78a40fd13e6b34dadb2af337e1c0c190cfb616186d4db9c9a743a37e594b9b8033
 DIST libressl-3.0.0.tar.gz 3620475 BLAKE2B c1dc1709e60cfbfa9907c206340262b78e1bfb991d3956dfc0a5d8d80f80b61df41059e645f9f096185724470e8466a5b7a444a575f5f09d5a0f9eb35ff3ae7e SHA512 460fa390012218262b7c148a28e6ddfc0dc3d669c4bdd37b68bfa6f50a0cb2fb81a277fb46ae0ac22673aae5b5cc4476fe96e56471a6812176bf76e9c5e10838
+DIST libressl-3.0.1.tar.gz 3668819 BLAKE2B 0e0e9db5018f7fd6c5d3f15dd911e375ae51885321fda2a6bef8f56620ca9d8b63d587f5acdf78afafabdd7ee1243c79bdf9b68a890dfc5f76fa45bbaf060563 SHA512 d2d665734d8aab2b998769492cbb1e7fddead52430ef503650c14786196241a6d1137f47b33ddf2037cc1ff13c240283f591dce83ec0da475619679a051d725f
 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
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-3.0.1.ebuild b/dev-libs/libressl/libressl-3.0.1.ebuild
new file mode 100644
index 000000000000..65dfe075bbcc
--- /dev/null
+++ b/dev-libs/libressl/libressl-3.0.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
+# we'll try to use the max of either.  However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/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"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
+	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
+	eapply_user
+
+	elibtoolize  # for Solaris
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/librevenge/Manifest b/dev-libs/librevenge/Manifest
index 66df77f58a02..31c131df8db8 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 1114 BLAKE2B 0d5a703c09ccc660be2162ad1a4439df6b23a4cff650012ee7af8ea476691bc85c10e3b144e1b786aee13c269c7e71096d00de24b40a9d59e5a6f54f191b93aa SHA512 902c7556c5385992cf0061e7795911ce262c59e35949c38b1895045ade0bb4256dcddcd06eb76da7e377ed6cf99f943220e4407316aac0d2ad394e776c7fd1c2
-EBUILD librevenge-9999.ebuild 1091 BLAKE2B f28e2ff7db9f1f741ee729f037799c432981e6acc86c67b57c8bce5a1c33343dcd0cd956ae79417491f873625b956a398bb095fda34e145a8debb3c0094a2c85 SHA512 5920bee7ae22c3ab194c19a9dad9194358577431c1ea40049a28356ceb51429374b7b6d855ae0e3c44fbaab3239c986337c6e525bb0a01334cce4017d01f269f
+EBUILD librevenge-0.0.4-r1.ebuild 1104 BLAKE2B 3f25d533fc325cdeffdfc939f2f1c2fa1d44d9970eb7a7a0c2281ba373d4b00fd844f6df76cba75881281023ff1c159da3b6930ec1b57bd4063b86cbc4ed6fcd SHA512 d71012c3edbca82e1f3b5e8b2fcf26dcacb2cc685c22979b39c11aa1b0b4d51a27a7706fdee92f69550dbe1d87fad918dd0a1001c22490306cbbbbdf32b71245
+EBUILD librevenge-9999.ebuild 1161 BLAKE2B 5f180735a54e063805d0f1fb8cdabec714857458e4d5dd6e8756e435ae30808aa539ccc6f715636de9f21c3ddcc5932ce512b86694649ec3a13c30d4c8a05966 SHA512 5e6a37d70f094b16776e2b6332f6694c7410577dee75db2ccd3f1bd80938843edcd259ce4bdcab8d8f4d5f78ef8b43a106381a2eb72e0e714d3b5baf4b05dce8
 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 2fea73e194ce..d60e8ba6c891 100644
--- a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
+++ b/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 fi
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
diff --git a/dev-libs/librevenge/librevenge-9999.ebuild b/dev-libs/librevenge/librevenge-9999.ebuild
index c40659225a0b..25f70ed8a4e9 100644
--- a/dev-libs/librevenge/librevenge-9999.ebuild
+++ b/dev-libs/librevenge/librevenge-9999.ebuild
@@ -1,30 +1,32 @@
-# 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 flag-o-matic multilib-minimal
 
-DESCRIPTION="A helper library for REVerse ENGineered formats filters"
-HOMEPAGE="https://sf.net/p/libwpd/librevenge"
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/librevenge"
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
+DESCRIPTION="Helper library for REVerse ENGineered formats filters"
+HOMEPAGE="https://sf.net/p/libwpd/librevenge"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0"
 IUSE="doc test"
 
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
 RDEPEND="
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
-	doc? ( app-doc/doxygen )
 	test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )
 "
 
@@ -37,15 +39,16 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-werror \
-		$(use_with doc docs) \
+	local myeconfargs=(
+		--disable-static
+		--disable-werror
+		$(use_with doc docs)
 		$(use_enable test tests)
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/dev-libs/libsecp256k1/Manifest b/dev-libs/libsecp256k1/Manifest
index 147e71c80cee..de5c6a1be1a9 100644
--- a/dev-libs/libsecp256k1/Manifest
+++ b/dev-libs/libsecp256k1/Manifest
@@ -1,8 +1,7 @@
 DIST libsecp256k1-v0.0.0_pre20161213.tgz 147557 BLAKE2B 078cb90c078722e2eb3b5645f9692d737c99ebfe04db5a96dcfb57bb750b31c009cd3ae46f793bb1789239be9689f6e695a5b03477eecea84f2c657d0cc7442c SHA512 f4d16fae972364fd04bfcfbaca1edde4410a7367a936f76c1e93b85ac3c9c45da58785f604a4fc14cdfb4d7a23395d2d274957ad83118e15a236dfff0d0f57dd
 DIST libsecp256k1-v0.1_pre20170928.tgz 150935 BLAKE2B f8b3408a33f36186c07cf931a8183a7a241e6418a846f4c3b248cf87e7a8b33a5a92368aa30310efadb066792eebead7fb48b4f4d902e7c8e9b4209717d7b8c0 SHA512 f480c76ba04b3d731c65227e156eb726b27da92f5dcfbd9b0a34c62e97f9b6dfd5c3fae3180b59244d0c9845fdf624b05f29e097f3ac0032ab15cebc4bf00660
 DIST secp256k1-v0.0.0_pre20151118.tgz 125884 BLAKE2B 7a4fc950006138d04d8d3da35db24be0c568e25202c16f34f94555fde1297fba839fd114a003b5510693de3386de22166c6f1294726fe381ae5b565cb9866a75 SHA512 3cc0a4973acf7936a7c6dc0abc37ee43ecd69e835069ed40765595d36ca597b43837b5d6f90499455599de03abfc775d7c9d019d26216b79b03dd6dc53a73e19
-EBUILD libsecp256k1-0.0.0_pre20151118.ebuild 1353 BLAKE2B bfbf6e0c1c1a5d7d96c1aa3fd64e54fedff0b4eabdb236d6bf3fc0fbf03d72b785da93405513ac2b6e37a7daed5305ee395b6fe8dc0273cbd61e5e95b03fc30a SHA512 efd501d39be71c46edf7df416592444f9de7d9906acb923357c2697e4ea8d9a01f17b2151387dad0dacc66ca8ebd27bd611a17b57cdca10716dd828915bd6efd
-EBUILD libsecp256k1-0.0.0_pre20161213.ebuild 1517 BLAKE2B e4f8d22c81d86bf74d8069e10694e0c3c43fe94b59a60c3bb9eddd6cb77a6307a7c0c1583330ff5747c46d033a46358468f3b9f4a6f0fc302e4c239099745375 SHA512 c1b4a3f70b89438f8bfb5bf63b410be26853d0abb26cb9198a6a1ba70fd46e432fea3d135b6edf6cb24ea2bec677019d380e82390d0f294540752088ed2b1b5c
-EBUILD libsecp256k1-0.1_pre20170928.ebuild 1560 BLAKE2B d98554be2cc72ab9797a876de945275356d4ade9ef203dac2d49b9163085e5d8d0d07d9f54e634c256d312c198a2c5e3df1966cd79037948d23de53900eeec0e SHA512 29ac329b8a7d6ead6524154efc911250cb819a8b9aab1c7081432913c27a478037fbf05cf7fe769ef9646e3cd39c9f8ed511fdfa5a9865b2e55724e5c844a120
-EBUILD libsecp256k1-9999.ebuild 1336 BLAKE2B 5baf2da422fca882c0af05159aa3a0700f69e47ee74e164db1a16a842620e7d76e57cb89614384224395060faae8180c104538e6a3b57ddfacfba6b7a7f23b73 SHA512 a155348e020c9b2a29db0d41ebd0311add97e74f7daae1cd499dee9564152664df3f9acab575ea0f4cd0bc738c013c7dc48d2167b97a7a3b3788b669d8ee743b
-MISC metadata.xml 945 BLAKE2B 7a352dd1f76e95f59cc73d2d80755f81d59e53ea01749e00f25dbdede5d3b430ee8ad5962e90b80c5abeb3a8674279460119a90f7dc656e9b9b3c5a1db486cb8 SHA512 77427813529d0396c4db94a1df6580d3719764049fb55a7b095ac936326e694c7047bfa67aa168252c94a72bda0e25370244ce74d4c3d358948c4106293a75b8
+EBUILD libsecp256k1-0.0.0_pre20151118.ebuild 1380 BLAKE2B 8cadeb5057f75775c0f2322dcea8f1bd92d9a82e83ba62c5f24f24746044d8a36dd73bea8c26cbf0b8bcead7dd2e09b8246027147bf3eabb15f343c4df45221c SHA512 5a2dcb53dde35df5c45d44d69b093f85dd3288b0e85ce6ae76c6d1c4ed8b66206d8bc9a28d6e78796cb0c59595722d9aae2bb745b15a3aa0b1cd6633227362a0
+EBUILD libsecp256k1-0.0.0_pre20161213.ebuild 1544 BLAKE2B bb172053e180ecf05098953d39ba8b7c168fc78f215d3f1fbd8c7f20502a64a86a425dcfccf401d744699083d5d47a681243c8e78ebb0f834ddeb2e8a0cb6344 SHA512 4bb8091298f568a4e661e3075d839f5b104b714e67c9632f8f713bd095cb95d96c50994f3e67774b71db4ddbc4f1653a3ecb469349eb90b4d7cf9903bfa11612
+EBUILD libsecp256k1-0.1_pre20170928.ebuild 1587 BLAKE2B bc6ab78e259982f38b30d41c6d548ece072f4afa9a6147505c0ab6d7ef151be72397b29ae82085e5fc6d673729c2e8e6faed4b2685c0507e9c1fd5024483fb8b SHA512 e5ddf94c45d693b21ab6f4d97d0aa2ea15291c1db42b1df29b8ebab4dc4d6e6d0bc1186d276df2de6f69939c30f31a253efbc12b6b309b80c76ae9f2961eed9d
+MISC metadata.xml 945 BLAKE2B 7a69755c3d1c70ed97958a6597821b2d35175bdb8a396bccef731a9da250a4b8b4a14fb9f28df076b265db72f96cf5d75c3892449bc7bc3f320c69d5d8e79c19 SHA512 f90780064a7b48ef4d9ad70fb20f61ee2ff62508c396bd79f157d2790becacd833d035cc9bd7719aec29acd0b4a30b37426106196f1e229f86bb6eb5c2abb8df
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
index 4609c06bb272..71d047416824 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="+asm doc ecdh endomorphism experimental gmp libressl +recovery schnorr test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	asm? ( amd64 )
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
index 2634a61198e9..7716244ab405 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
@@ -14,13 +14,14 @@ SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm ecdh endomorphism experimental gmp java +recovery test test_openssl"
+IUSE="+asm ecdh endomorphism experimental gmp java +recovery test test-openssl"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	asm? ( || ( amd64 arm ) arm? ( experimental ) )
 	ecdh? ( experimental )
 	java? ( ecdh )
-	test_openssl? ( test )
+	test-openssl? ( test )
 "
 RDEPEND="
 	gmp? ( dev-libs/gmp:0= )
@@ -28,7 +29,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	java? ( virtual/jdk )
-	test_openssl? ( dev-libs/openssl:0 )
+	test-openssl? ( dev-libs/openssl:0 )
 "
 
 S="${WORKDIR}/${MyPN}-${COMMITHASH}"
@@ -53,7 +54,7 @@ src_configure() {
 		$(use_enable experimental) \
 		$(use_enable java jni) \
 		$(use_enable test tests) \
-		$(use_enable test_openssl openssl-tests) \
+		$(use_enable test-openssl openssl-tests) \
 		$(use_enable ecdh module-ecdh) \
 		$(use_enable endomorphism)  \
 		--with-asm=$asm_opt \
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
index 388d889bc11f..bd971f602e6d 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
@@ -14,13 +14,14 @@ SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz ->
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm ecdh endomorphism experimental gmp java +recovery test test_openssl"
+IUSE="+asm ecdh endomorphism experimental gmp java +recovery test test-openssl"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	asm? ( || ( amd64 arm ) arm? ( experimental ) )
 	ecdh? ( experimental )
 	java? ( ecdh )
-	test_openssl? ( test )
+	test-openssl? ( test )
 "
 RDEPEND="
 	gmp? ( dev-libs/gmp:0= )
@@ -28,7 +29,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	java? ( virtual/jdk )
-	test_openssl? ( dev-libs/openssl:0 )
+	test-openssl? ( dev-libs/openssl:0 )
 "
 
 S="${WORKDIR}/${MyPN}-${COMMITHASH}"
@@ -54,7 +55,7 @@ src_configure() {
 		$(use_enable experimental) \
 		$(use_enable java jni) \
 		$(use_enable test tests) \
-		$(use_enable test_openssl openssl-tests) \
+		$(use_enable test-openssl openssl-tests) \
 		$(use_enable ecdh module-ecdh) \
 		$(use_enable endomorphism)  \
 		--with-asm=$asm_opt \
diff --git a/dev-libs/libsecp256k1/libsecp256k1-9999.ebuild b/dev-libs/libsecp256k1/libsecp256k1-9999.ebuild
deleted file mode 100644
index f1a5daa6ffb1..000000000000
--- a/dev-libs/libsecp256k1/libsecp256k1-9999.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/bitcoin/secp256k1.git"
-inherit git-2 autotools eutils
-
-MyPN=secp256k1
-DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin/${MyPN}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="+asm ecdh endomorphism experimental gmp java +recovery test test_openssl"
-
-REQUIRED_USE="
-	asm? ( || ( amd64 arm ) arm? ( experimental ) )
-	ecdh? ( experimental )
-	java? ( ecdh )
-	test_openssl? ( test )
-"
-RDEPEND="
-	gmp? ( dev-libs/gmp:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	java? ( virtual/jdk )
-	test_openssl? ( dev-libs/openssl:0 )
-"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	local asm_opt
-	if use asm; then
-		if use arm; then
-			asm_opt=arm
-		else
-			asm_opt=auto
-		fi
-	else
-		asm_opt=no
-	fi
-	econf \
-		--disable-benchmark \
-		$(use_enable experimental) \
-		$(use_enable java jni) \
-		$(use_enable test tests) \
-		$(use_enable test_openssl openssl-tests) \
-		$(use_enable ecdh module-ecdh) \
-		$(use_enable endomorphism)  \
-		--with-asm=$asm_opt \
-		--with-bignum=$(usex gmp gmp no) \
-		$(use_enable recovery module-recovery) \
-		--disable-static
-}
-
-src_install() {
-	dodoc README.md
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-}
diff --git a/dev-libs/libsecp256k1/metadata.xml b/dev-libs/libsecp256k1/metadata.xml
index 2e3a5c002ccb..10e5b2a45bfe 100644
--- a/dev-libs/libsecp256k1/metadata.xml
+++ b/dev-libs/libsecp256k1/metadata.xml
@@ -16,7 +16,7 @@
     <flag name="experimental">Allow experimental USE flags</flag>
     <flag name="recovery">Enable ECDSA pubkey recovery module</flag>
     <flag name="schnorr">Enable Schnorr signature module</flag>
-    <flag name="test_openssl">Enable OpenSSL comparison tests</flag>
+    <flag name="test-openssl">Enable OpenSSL comparison tests</flag>
   </use>
   <upstream>
     <remote-id type="github">bitcoin/secp256k1</remote-id>
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index f0c15873d2cb..19d5b1adb07f 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 1509 BLAKE2B a5f34af84bc26a1c40d0d5762e5351e784626b58ae18414db603591e35e541b20ee3b9e62102b4e134786170724f199680a05a29dac50fea5d3460ffb2efac51 SHA512 88b973a4ebb97dea119b0dbf312dbe0850eae7f7dcd80aa35e94e168602f8f237845f8e6cd0aa01c906e93774a3ab241d14214f4f4380c669aae8d6585643525
+EBUILD libsigc++-2.10.1.ebuild 1499 BLAKE2B 21742a0c91111f0098f3598dbb7e3c21d18a47cb2474e4d51ae6a1637fd47b3d642d28f2d96a786b5a8685506b4c14b3980e28e1be6df64f9230a326bca66d03 SHA512 e57c98971518d74b4845c0a5c12b2cc8328941c9766dd58194abfad1471599245a113d53a254dcb056736909618a8e054642228f44b2c9854a2effe7897458e5
 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 1b4f4f97fddc..101c333b36b4 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://libsigc.sourceforge.net/"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index eb7b70c6228f..1ec94d3fc5a1 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -5,6 +5,6 @@ DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d
 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 1303 BLAKE2B efb5e7314adc904c0d5ac99ebc7804e4125a7ed18f8d1d2945a6f020932030cc642919729f1d491ae251daf0ca901076d9fad1cb1624dacd9ba5a0a81c3092a4 SHA512 06c4bb4de35de4ad3ce64da1a6dc8b13e3d57eeb7bd1f281e7ad383bd0351f3e0246fdf22783a88f3961024a8b0dcd817abe2348b65f3fe6ebd444aa4bb95fd4
-EBUILD libsodium-1.0.18.ebuild 1314 BLAKE2B 923670f66bee00609fe26356adc982103013d80cde9d4fa78dd14214aff05a13bef7cc1537b8e0164aa467b7d51d614bb012fa412faf035dea98593af7424087 SHA512 17c116372b69ddc2e52ad125b2a1c5da26df4cee12977855203dc7af7f2d59062a9950ca382848ffbd235bc9f63d2d10708442422e11db80618ab037d6526618
+EBUILD libsodium-1.0.16-r2.ebuild 1291 BLAKE2B e85fe6fd6d491941f43ad1c2dc773ec529fd7ad15c685fed91831d1deb9f9864ff14ce95511067013be9c0639acf4756744e7278ef682ee582162f3afe406803 SHA512 71f7183b465f949564bbdc741d655cc29994a25c17a1537cdff0721e855b1898cf9aedd2b1c89fa706e90f3a3adb5a378a6f286da0d92bd39576026aa2e8c0d3
+EBUILD libsodium-1.0.18.ebuild 1302 BLAKE2B e08567dccec652f95d3b7190139f9141dad2c1a8ac88489c3eb540cd306e25df29c04a2ea2ff05e62e72797755db90d9649050b329fd7d88bac2367a1501df9f SHA512 536476292aa38b36ca6ff0063564142d89534a9f0f7e8b831568e5f03d79f3884b1647ff2e046608760580e7755fccf870038ba8b4cb987ce498a0357dee8bce
 MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild b/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
index fe6573407753..4bec9558e24a 100644
--- a/dev-libs/libsodium/libsodium-1.0.16-r2.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.16-r2.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 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+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 )
diff --git a/dev-libs/libsodium/libsodium-1.0.18.ebuild b/dev-libs/libsodium/libsodium-1.0.18.ebuild
index b1a14071e574..6032d35011e0 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-fbsd ~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/libsqlora8/Manifest b/dev-libs/libsqlora8/Manifest
deleted file mode 100644
index 10a6c2fc4e7d..000000000000
--- a/dev-libs/libsqlora8/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libsqlora8-2.3.3.tar.gz 1130458 BLAKE2B 7205c808c3e3064bf4aedad62e8cd4685cf6e7eda73e2bb8a13888a81cd0532081de889fd02408633e2df31a522e845b7fec3bee2ececcf39a689b75b75382fc SHA512 5c62387f11cc8b901d99c2981f7e7099d255203aa11a071fc53b22d770db3485f0f23e054b88b3b0f281546a5e92fd5a7bd46b4f0e5f51a8914894c54f222c6e
-EBUILD libsqlora8-2.3.3-r1.ebuild 1264 BLAKE2B c178b2d71faa4c4edb8546f8f0c2f85ac7a0e2a5ef20603fc0144c8412924cc4edc82ad374dc1ca07218a0f983d371db3fd5ba0398412b1f8b4d365cf45ff9d9 SHA512 739b82d31084d43bf053da8dd38958a46479dd6cb764daabc88959022ab5d4887dd069f124c206c654c632d58c34ec328cfd03eecc26a3bc08bdcc2a310392a7
-MISC metadata.xml 417 BLAKE2B 2e4dc2e46bfaf7e9f49ce66f53396ec4320cb8af2aaf80df473e6bd71b056e01ed3e074fc964c7fd0e7c1e212e676c077375f1a91fa6cd7f95ca595de77fe81d SHA512 287a9087ada0f1b1c52601f8f96d326b0e86eadca05d7b05ff0b2a14cd7d62e4a788d48199514a64bd602063068b530b243ee2a696dd205ffd45b44a867d02ee
diff --git a/dev-libs/libsqlora8/libsqlora8-2.3.3-r1.ebuild b/dev-libs/libsqlora8/libsqlora8-2.3.3-r1.ebuild
deleted file mode 100644
index 7e8df7fae210..000000000000
--- a/dev-libs/libsqlora8/libsqlora8-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic versionator
-
-DESCRIPTION="Simple C-library to access Oracle databases via the OCI interface"
-SRC_URI="http://www.poitschke.de/libsqlora8/${P}.tar.gz"
-HOMEPAGE="http://www.poitschke.de/libsqlora8/index_noframe.html"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE="orathreads static-libs +threads"
-
-RDEPEND="dev-db/oracle-instantclient"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="?? ( orathreads threads )"
-
-src_configure() {
-	local myconf
-
-	local ORACLE_VER="$(best_version dev-db/oracle-instantclient)"
-	ORACLE_VER="${ORACLE_VER#*/*-*-}" #reduce it to ${PV}-${PR}
-	ORACLE_VER="$(get_version_component_range 1-2 ${ORACLE_VER})"
-	append-ldflags -L"/usr/lib/oracle/${ORACLE_VER}/client/lib"
-
-	use threads && myconf="--with-threads=posix"
-	use orathreads && myconf="--with-threads=oracle"
-
-	econf \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	# Parallel compilation is not supported
-	emake -j1
-}
-
-src_install () {
-	default
-	prune_libtool_files
-	dodoc ChangeLog NEWS NEWS-2.2
-
-	# TODO
-	# Copy contents of doc and examples directory to proper place
-	rm -r "${D}/usr/share/doc/packages"
-}
diff --git a/dev-libs/libsqlora8/metadata.xml b/dev-libs/libsqlora8/metadata.xml
deleted file mode 100644
index 60a8019dbd9a..000000000000
--- a/dev-libs/libsqlora8/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
-  libsqlora8 is simple C-library to access Oracle databases via the OCI
-  interface. Makes simple programming tasks much easier than with plain OCI.
-</longdescription>
-<use>
-  <flag name="orathreads">Use Oracle threads</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-libs/libstroke/Manifest b/dev-libs/libstroke/Manifest
index 0793572f92b8..e49ee986ddd0 100644
--- a/dev-libs/libstroke/Manifest
+++ b/dev-libs/libstroke/Manifest
@@ -2,5 +2,5 @@ AUX libstroke-0.5.1-autotools.patch 734 BLAKE2B 3590484c7a4b96b7faa09eb7e2267365
 AUX libstroke-0.5.1-m4_syntax.patch 1100 BLAKE2B c86fed17159d3179bbb538c1c467fa5a34133b6a43d30f2e2862158e0756ea8ca8654ca6f450219c9222cc3612fefddf6170922f410a9c1119f48439acf5daff SHA512 bfe54a1c60c381e01820f46998c1ade66bcc5b816d20d8736334cd097f94fd06921c7ef17ae42e1f4f47090a7a9a6db2121a9960c140ad7dcb4d5ac3acf6fded
 AUX libstroke-0.5.1-no_gtk1.patch 1046 BLAKE2B feaaa0206f74bc1206ed464ec3f29c76e2f51c83f78c6821d2184b833e1718638b11757ab3f8cef9464884dc11a3158fccb9f1f9fd166f50ee83f556b447b25d SHA512 96004186c51e617fa53f1bbaef5f58c6572c5acf0a6acf2d9e7be618c443fccff5feb8dd7bf77a9a435b8c5b334e1babb3cbd739e71ec6d7fe7feda1c66607f8
 DIST libstroke-0.5.1.tar.gz 174270 BLAKE2B ce642aff20f731ed8dc6aedfcdca0370e4e9789bdf1fd7d4157745ea7375d5e5f9c7a2f00739d886ff348c00ada36c3bef0ce68f18d9b0dd52eabcc086776334 SHA512 03431d4cd39174aadb6cfd00a1c487d34ae9cf4b1db9e9d01d563f2a661f01979f474b87099fd2bfb0e54653416a1b9dea988367674a3cc6134e16b62810a0c7
-EBUILD libstroke-0.5.1.ebuild 731 BLAKE2B 140aa4afd892babe73914f222e82f50d216b878571a2a24420cb0e2401a8adfd3af9cd37ccf76ce0bc755f4a98fc86178d7118f623195eef89e7bdedb5c5f9b0 SHA512 83c5960caa75c97d6a15e29b8dd873ec42065b8b41ca2c82eb60a9c717a17c85a0b0e59f0b081728edc97ffb4a2057075633ef95db42f1f0c5f5a5018227ca0a
+EBUILD libstroke-0.5.1.ebuild 721 BLAKE2B 2f9429905121407fb191298ab7c12683fbbe7fa735775998ec9483fa9846da2fed5fc989429c35469a655e8eaa88809cab59936446a96f1f00a21ab103cdab09 SHA512 9e024de086ad128e7506c79bd0c49fef685b5c3348f0bdb7d57fff8c9224027f00b8a4683a3a1e20958dd86f4a9ee0265f63fe92e5af3e21d7e7a1709bb43da0
 MISC metadata.xml 261 BLAKE2B ed5cc49462c9e948e13f3455fbf209661aa04522f3753db7c674bca0528d7a384beefcbdfc5fcc0542dd08361d7953c06cbd19753bfe4dca2ff649ebc283bbd7 SHA512 318bd063baaa5dd560bcfdb87ab4d60edfb4dddf69884a84ef084a38399cf2ba84e69b432c816cce8e15d3dea253f395f41a1a654017a6eef30478ab8961cb51
diff --git a/dev-libs/libstroke/libstroke-0.5.1.ebuild b/dev-libs/libstroke/libstroke-0.5.1.ebuild
index cfa602722b05..8255b7317818 100644
--- a/dev-libs/libstroke/libstroke-0.5.1.ebuild
+++ b/dev-libs/libstroke/libstroke-0.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etla.net/libstroke/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/dev-libs/libtar/Manifest b/dev-libs/libtar/Manifest
index bc483f81724a..36f030c8bb5f 100644
--- a/dev-libs/libtar/Manifest
+++ b/dev-libs/libtar/Manifest
@@ -5,5 +5,5 @@ AUX libtar-1.2.20-bin-memleaks.patch 2571 BLAKE2B 72217c256a8f504e1647ecd8157bc9
 AUX libtar-1.2.20-fd-leaks.patch 2021 BLAKE2B 73e9ca5475e86fc6c5cddee5f608b0a1e349e987c17c0a1d1d9406ba2b3efd414a138402f2d78f925a736dc1a0bbe1511e2047fec5c6c25891f0874f233f53fe SHA512 93312a12b14f47d80a81368438afb4af9883d95691f4c33a2443c595808943087e31a00b44038028106ed99a23343efa41cd7ba432a8c8be00c5ea0d51817a26
 AUX libtar-1.2.20-tar_open-memleak.patch 630 BLAKE2B 31616574597017dc5444d0b79aa6084c55f3eedf5c23099663da2905bdf8be8d499c9a81228b268840524e286e06b18c3221a60c95f2e3effbb09beb8c0712f9 SHA512 a37df7b6e1e98298f622c1cbef348861c187409abf6614eafac21d802aaa1418081281db3e03fda0ba9fc5a690f4fb00b61fbe277c4c34c82443d4fe4548e317
 DIST libtar-1.2.20.tar.gz 63542 BLAKE2B 57565fd703aec159a0b30280c026ce82d4a74fc658a24e589c2d9fcf11ff0e8c79de172df8b4cfeefa776eb27bb4b1a65951739ec37de4300da47d508a8d4227 SHA512 360a0296af99bedd6d93236c3d6d6746fd38deaa5287e7a138d303e1072bc8871437a693dc926d82af5b54dedba2ebdff5a3edb1f7d7dc494b4235439e477dec
-EBUILD libtar-1.2.20-r4.ebuild 1496 BLAKE2B 706b9f319a7464f5345aeb8f972dcfd8e23f8bb8885075fdbe58cda1aea34c4ec79d200111a17a77c71a7b2a8a45fc61e122de3bdf65e1c9bd07fe0750a1eac9 SHA512 b1be3a3c9280340f25b4e36cb7b9ca49bf4692a1644fa6716fb32700ed9be927fa850fd075537262854055a21f5f48ce2edb78bd3d118ba2f7fd0a43fc1215e3
+EBUILD libtar-1.2.20-r4.ebuild 1484 BLAKE2B b858755bfb6fa735c5dc31278a94edf140735433adfd6a7e46c054062356ff0499c708878f05a3973ddf5ebb8e2444a9979f19cc061ae432fca6a7c4b91328e7 SHA512 a484a8ace35b951582aee6c0c2bbbb48519a003b3ca931df0a6b12001efba0075a5d2080d6f1073d82879896224712386f0fb79422bb7f2f37a5947896b98f0d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libtar/libtar-1.2.20-r4.ebuild b/dev-libs/libtar/libtar-1.2.20-r4.ebuild
index cbc4d499d82a..2c753219ab90 100644
--- a/dev-libs/libtar/libtar-1.2.20-r4.ebuild
+++ b/dev-libs/libtar/libtar-1.2.20-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs zlib"
 
 RDEPEND="
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 00ad8720e6af..5b1d52597a7d 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -1,5 +1,5 @@
 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 1169 BLAKE2B 5c73d0e3b295b55119251f08cdecfc9d9594bbd6fc9eec6ddd11c6743704075caccf507ba22071c3d1f41b18b30232591a2c5afb71f7625daf43e975e3d3682b SHA512 66e9032f34ed0d179c4eda17bf53d1ec153d943a33c71767ee55a6894917fbb9715d2fc4d797a2abbe2e8e72d5dc215ea9db4612ec6909d240b176a2f83c990b
-EBUILD libtasn1-4.14.ebuild 1192 BLAKE2B 467335199718a62c712a767a6fa1d40446cd4b95ade3ab5ccbcd9b09a8ed80b9a95514ef0e09491e25fd01866b4182ae2577009db7996c383c04461328a4f187 SHA512 2093ea48c8052f0d1e7d8b75109d4c801ed5ed2282a49b4fe4a9441fc4ba5711df97f049d2f38987fc590d9393a68d7acbd14901fd8b43b6b682fef25f34d8bc
+EBUILD libtasn1-4.13.ebuild 1147 BLAKE2B e05d3886c3fc9fae4d92f83d26a36bab230bcfa788b7ba35a942f29c476d84238cbbd0abbcc2be17d041f16f8baa9702c38ef40c30395e23cab908faee753dc9 SHA512 d3ea352f75e7745a0431394e3dfed43211fed7a40c577caf7c02b4d8a87e14e9cca24d9aac53269ea41762080fd8ee1a0c23fb4fe2c678cc0ed881539964f860
+EBUILD libtasn1-4.14.ebuild 1170 BLAKE2B 79871f0b944f18144b302c38bcfab822106bbf2aae0e21de66fc0786486bd37fedc74b809c7a2bd9f19f9d069025368c780fc43b70e048fae9f1987bb0639dc8 SHA512 f6329ba4b4ed90fcd0e13f4c557bd0f3bc5f4fd7f0723d1ad13becde188d1e45ef8a942420b1b1d53cd2666b28bf45f6382736322fcb8e9e559700f48f503721
 MISC metadata.xml 428 BLAKE2B 85413f31c74675764c652ce8bec334384a0696c3eefdb517cde5f73c6385e9f52bad2087613b9fc4f37074fbcbdd6953dd25f87ba6095d13cf08a1aadde1488c SHA512 172d1c137ea4190da305ca987dfecf1db73e4e222cae61e8f7830a539a87ed3e919af93f0415563a9be2f65dd7b8787c22e8494e134c42e701ce1559a66cf5a3
diff --git a/dev-libs/libtasn1/libtasn1-4.13.ebuild b/dev-libs/libtasn1/libtasn1-4.13.ebuild
index 76d5dcc9c67e..a20513fb9226 100644
--- a/dev-libs/libtasn1/libtasn1-4.13.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.13.ebuild
@@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~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"
 
 BDEPEND="sys-apps/help2man
diff --git a/dev-libs/libtasn1/libtasn1-4.14.ebuild b/dev-libs/libtasn1/libtasn1-4.14.ebuild
index fe96740ea316..29fd0b035fb7 100644
--- a/dev-libs/libtasn1/libtasn1-4.14.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.14.ebuild
@@ -11,7 +11,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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"
 
 BDEPEND="sys-apps/help2man
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index c499711841a3..83e1f8536ab6 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -2,7 +2,7 @@ AUX libtommath-0.42.0-makefile.patch 1694 BLAKE2B 37c2e368bb4f2d6f7738e3f110bb55
 DIST libtommath-0.42.0.tar.gz 1732144 BLAKE2B 624697bfa0bab0244783c3d2c92df2a1c0418611dc7f25989d038a5689beae325a426d8de38967ec856bd1e6f2d9413615333eebbf9316add838deda5b122de3 SHA512 d26e7737e5750530a7b96432502f0d458931e67af528872c46ad8dfc921b8f6ef4b3e05cb07d22bd13a8b24db65812928ae4c381250a4df95f6ca55efc3dae23
 DIST ltm-1.0.1.tar.xz 2210120 BLAKE2B e616f0359a1fffe8e1280dc24df1a83eb568d55f9f8acd0e4016fdd63b8ef10d939a8acbd4d49d70a69adf0e492ea5127200798f02af6af1c30e2e1f57870e3a SHA512 f98f7b0f91268e898803478fd52f578f476d378d096a25e48fa2e291159dc89bd1a6dc7d8c5c2254df840c731e5d009ec9728b72190318b6d1ba2916f5c66fb6
 DIST ltm-1.1.0.tar.xz 2125456 BLAKE2B 3aca7993704341f6a81e7fbef35389ac8ecd957dd78b5d576f0305d37493c3ddc32462cd787de2fb67d8e165417b18fcfde70accf991cd9433ff87591d8265ac SHA512 6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91
-EBUILD libtommath-0.42.0-r1.ebuild 1436 BLAKE2B 8a51bb249ec1c3dbccc9615dd815342224796215ccb4469ec7ed6cef2c1a1af460579cdf14430e15e1d54f7825b8bee1744b4ef2d7790408a900e3af0d27713c SHA512 83dc7913ebfad16d431bb6524b5a2fe032b52dd15cbc6d127b1e78785f36bd7787624d3459ff23cea37c29acd0db763b646e093cdad9292fb446829a526b3707
-EBUILD libtommath-1.0.1.ebuild 1507 BLAKE2B 980126c931a91612084f917867db29fc6cb0b46f03237321fa33fa6d72dfa9f67932425b723a7b463e7982b583afad5b386ad872882329da1c771e7167034c88 SHA512 2dee1c3229776885d089af70b3112243e67592eb23e20e5b231dab738e9a09a12a4035267b3992195290d6a16fe3c0680e1f6f87d3ed9202613b18ee3c561eb7
-EBUILD libtommath-1.1.0.ebuild 1547 BLAKE2B dfb9732b03aeff6ddc194fd1d1687bfccd3cabd3495265357e9fbd10a76258aed63879f6be81f5df05952da05737eff3b6a4731bdd39d6354c28c24607543a34 SHA512 d5d7fa2e02c0d0cd6718e5cdf4332d776727f1a5b4700289860ff69a95696c1f375279eee906481a1df69e012cc5c691a26d13a8906952ebf2eaaec238b49667
+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
 MISC metadata.xml 2967 BLAKE2B 8adab466c3bf4d4e4b2368e56c7cf35c6a0e03f0dc9a237070e56bc224333876accb0c229d520f863041c0ee48b380225121d47554bb5aa511ff5689dd0e4e9b SHA512 73ce667c4bd2943f848274ee3952961d8b09c2c1faa4920cb74f9d8630470119c7e55a112b3c7dc2243c3746f75fa15db5c143e05e6739d2c9c19536f09a937f
diff --git a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild b/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
index 32bd1cb9e072..c75cacd7b6cb 100644
--- a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
+++ b/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libtom/libtommath/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+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"
 
 DEPEND="sys-devel/libtool"
diff --git a/dev-libs/libtommath/libtommath-1.0.1.ebuild b/dev-libs/libtommath/libtommath-1.0.1.ebuild
index d369a6bdc05d..8f04224dc876 100644
--- a/dev-libs/libtommath/libtommath-1.0.1.ebuild
+++ b/dev-libs/libtommath/libtommath-1.0.1.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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/dev-libs/libtommath/libtommath-1.1.0.ebuild b/dev-libs/libtommath/libtommath-1.1.0.ebuild
index d240a0bcc5ff..187678a0c8eb 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libtrain/Manifest b/dev-libs/libtrain/Manifest
deleted file mode 100644
index 8c485de592cc..000000000000
--- a/dev-libs/libtrain/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libtrain-0.9b-impl-dec.patch 764 BLAKE2B 8db57809976b5dd4819199c719bb44d07d3f6d9eff1a73b970a1acc0e23851302be16be0bb405b09d1273fda9c3f45ee58d9be0a449008675f7f924df0c09abe SHA512 81ceb3302b21696dffcfb2b17ce0578a3ba5332ff072548022baada912fba8e9aa368af63ef9c276c4c41b65c0b838f7b4a7379711b052846894232d27ffe158
-DIST libtrain-0.9b.tar.gz 167075 BLAKE2B e21c8fb7e2d3ee268ab3414da05026944cfd1ebcddd569be22acfef9f12bd4d75c1375c6e04284070b5481ab0947bfd1b89819bbbf629d697f05afbb8172dea5 SHA512 72190d10a2d755ecdd791a2c90ab4de794fa9fe80b442824bc1bdfe04581db3fe6a6b4184928b7cec2c7221a999ff2a16ecf435554115d570ea714a72d7e9294
-EBUILD libtrain-0.9b.ebuild 578 BLAKE2B 9b1914808e890f809603f5afd457602e9b5b2eee6d9eb82a74c998762489be0f52fe44a683ad5e8e45e93b65b2a569ce7c2432eeb7771be215cc3fedb83085dc SHA512 50a1488552cec6ccc5ba5acecba803f6183d04a16b730c8d6468d47b978cf4964a2636c0f8aaa774e42977d49cbd0c69930edebdda15c5346b62434a9833ccdd
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libtrain/files/libtrain-0.9b-impl-dec.patch b/dev-libs/libtrain/files/libtrain-0.9b-impl-dec.patch
deleted file mode 100644
index 7cc2339cf8ef..000000000000
--- a/dev-libs/libtrain/files/libtrain-0.9b-impl-dec.patch
+++ /dev/null
@@ -1,29 +0,0 @@
- libtrain/lcommon.c |    1 +
- libtrain/roma.c    |    2 ++
- 2 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/libtrain/lcommon.c b/libtrain/lcommon.c
-index 8519c86..01a775e 100644
---- a/libtrain/lcommon.c
-+++ b/libtrain/lcommon.c
-@@ -2,6 +2,7 @@
- /* this file is modified by FURUKAWA Yo (you@ss.iij4u.or.jp) */
- 
- #include	"lfunc.h"
-+#include <string.h>
- 
- BYTE	Tmpbuf[ 256 ] ;
- char		FileBuf[ 1024 ] ;
-diff --git a/libtrain/roma.c b/libtrain/roma.c
-index e61a428..41b969c 100644
---- a/libtrain/roma.c
-+++ b/libtrain/roma.c
-@@ -13,6 +13,8 @@
- #include	<string.h>
- #endif	/* MAIN */
- 
-+#include <string.h>
-+
- #define		Strlen(s)	strlen((s))
- #define		Strcpy(d,s)	strcpy((d),(s))
- #define		iskanji(x)	(((x)>=0x81 && (x)<=0x9F)||((x)>=0xE0 && (x)<=0xFC))
diff --git a/dev-libs/libtrain/libtrain-0.9b.ebuild b/dev-libs/libtrain/libtrain-0.9b.ebuild
deleted file mode 100644
index c41c9c883d56..000000000000
--- a/dev-libs/libtrain/libtrain-0.9b.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils
-
-DESCRIPTION="Library for calculating fastest train routes"
-SRC_URI="http://www.on.rim.or.jp/~katamuki/software/train/${P}.tar.gz"
-HOMEPAGE="http://www.on.rim.or.jp/~katamuki/software/train/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~ppc sparc x86"
-IUSE="debug static-libs "
-
-PATCHES=( "${FILESDIR}"/${P}-impl-dec.patch )
-
-src_configure() {
-	local myeconfargs=( $(use_enable debug) )
-	autotools-utils_src_configure
-}
diff --git a/dev-libs/libtrain/metadata.xml b/dev-libs/libtrain/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-libs/libtrain/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
deleted file mode 100644
index 02b1c5ce8177..000000000000
--- a/dev-libs/libucl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libucl-0.7.3.tar.gz 1986726 BLAKE2B 8bd772d6bcce5ee6dd0c4611dac596f6168f263aedce7b9f4b1a30527fd9f991767d6db130d7b0e8b33a09357354010644fb8942812be2f06b37648890f491a3 SHA512 29b466254887f7be1168ce31de9f852f3f1868a3afaa5a73859a4cd43b915510850e786ff778613fa48579ee6f0f78e5898c83ce9423f1fb688cce8d969a8eab
-EBUILD libucl-0.7.3.ebuild 970 BLAKE2B 3bb944920e89b83ff226aec2a4dd77cc2804d7253cb3d8881c1fece8dabfb592a752ce35c0b95fe87c726d7006d54fe0f4ebaa96c65d0baecb3535210278c2bb SHA512 f51db8c008279536f1750fcd6a2f8d58b042de9d153c11d6d4289eae0f00ced03b4801d3508f19edebbfdb14995e4f7ab40d5a161d913d284f5139dbcb85fe6a
-MISC metadata.xml 910 BLAKE2B e9c95b0378a94b023aeb151ebc03f53f16794b1117a4b2a17ef205a7e567047dd8681aef9993b90bf88d55ab446e816ca1bca0fe9055a6b0275975df24d15966 SHA512 30aa6e64758a43680a6893516a1902b774d636b671e4191babafa10be4154c2f62da45249109727a7cbf9b9f203e0f97290a3dea70934faf403b7828c6b89a8e
diff --git a/dev-libs/libucl/libucl-0.7.3.ebuild b/dev-libs/libucl/libucl-0.7.3.ebuild
deleted file mode 100644
index ae7224e48e93..000000000000
--- a/dev-libs/libucl/libucl-0.7.3.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 autotools
-
-DESCRIPTION="Universal configuration library parser"
-HOMEPAGE="https://github.com/vstakhov/libucl"
-SRC_URI="https://github.com/vstakhov/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="lua +regex signatures static-libs urlfetch utils"
-DEPEND="!!dev-libs/ucl
-	lua? ( >=dev-lang/lua-5.1:= )
-	signatures? ( dev-libs/openssl:0 )
-	urlfetch? ( net-misc/curl )"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md doc/api.md )
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myeconf=""
-	use urlfetch && myeconf="--with-urls"
-	econf \
-		$(use_enable lua) \
-		$(use_enable regex) \
-		$(use_enable signatures) \
-		$(use_enable utils) \
-		${myeconf}
-}
-
-src_install() {
-	default
-	use lua && DOCS+=( doc/lua_api.md )
-	# no .a's it seems
-	use static-libs || find "${ED}" -name "*.la" -delete
-}
diff --git a/dev-libs/libucl/metadata.xml b/dev-libs/libucl/metadata.xml
deleted file mode 100644
index 6d4d014359bc..000000000000
--- a/dev-libs/libucl/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-    UCL is heavily infused by nginx configuration as the example of a
-    convenient configuration system. However, UCL is fully compatible
-    with JSON format and is able to parse json files. It can also emit
-    UCL objects into different formats such as "nginx like", json,
-    yaml and compact json
-  </longdescription>
-  <use>
-    <flag name="regex">Enable regex checking for schema</flag>
-    <flag name="signatures">Enable signatures check</flag>
-    <flag name="urlfetch">Enable URLs fetch</flag>
-
-    <!-- in v0.8.0, also the ucl-tool utility -->
-    <flag name="utils">Install the chargen and objdump utilities</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">vstakhov/libucl</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-libs/libuev/Manifest b/dev-libs/libuev/Manifest
index fe60b70f716d..fee0139e27be 100644
--- a/dev-libs/libuev/Manifest
+++ b/dev-libs/libuev/Manifest
@@ -1,7 +1,9 @@
 DIST libuev-2.1.0.tar.xz 247388 BLAKE2B e2934fb79e32bf61e22a7c8fcdd6371f089c5e8a4f5b3039c10c90abd852d08c5612f7b871ef705afdca68857a270dfd133a1436cd9f49876e0bf47b903e6328 SHA512 82bd68c75f015284d3757886720d1a0e5689cf71b40b896410e5e4e952761fe05b090a33e0787f632afa7726567667e4dbbbc6270129828656953ded6d28d02b
 DIST libuev-2.1.2.tar.xz 248092 BLAKE2B 7229acc6ae0e55a5ceba00e970a9e7b4b11049dc4f4435643e0541a7b3c75ac300ffc2839da0eaa7b3819a5910d20b608247812d32c028ff19c0cf3735d2941c SHA512 65a35f1e2cda5383267ba47bc90e2cdd769e5fb1318c11969c8f44262d8a5b2edad522688619aa6e9219c278286ba9ff997967f9281aa4f667fbe9b0842bf0ee
 DIST libuev-2.2.0.tar.xz 245680 BLAKE2B 40d0912dcec56d58863411e034c6ddded3470bc2ea3a9f49d36fa0ef924e9ff206cb96ef93582134881ce8377938688d44cfa04d7e533321baf7cfd754f0dff0 SHA512 700c91100c61af2101a6d1756eed97aaf51d6b1dc3a59f90f668d8bb6e3d817aa6f765af5acbbdaeccd4382a97c8e99d2a13ad679fc8582891e0546baa6f001f
+DIST libuev-2.3.0.tar.xz 247932 BLAKE2B dea136cbd34788b7156a5ce1b8390467fde77a21b6fb4c7b27068b87254eb42034579bcaed3228dcfacd00b320668db915557230ebbb8da9487ade2359a5fabe SHA512 dc6cd2d1df5336027d8df77fda17b9d9521d955ffa013a5e83958d6b4f981f14f5b0caac3e68e4fa4a8a00bbe8001a18de54ebc441b4231a2d17600c762f80d2
 EBUILD libuev-2.1.0.ebuild 534 BLAKE2B 4150427bd0e11f554676c94e81e83133558c64295861e0d0ad126f4800f7546e86aa24709754aee3d766d6228f9aac25990a9d5c572c6d507ae57d820b198a5e SHA512 da87d2ddac8efd98e103319718bc62e4737b2c8609df22b8f7064ccc66ddd10d003f7aee299c8a898658f4ce22a0e8feaaae1d1e220c0a0d59b710a2ae32e286
 EBUILD libuev-2.1.2.ebuild 534 BLAKE2B a87a2d9f2abc15dfbc0aa0f9e118fbf4b7c43f622d410aace856d9b9983b3a7574656add4335904526974cc0f96423fd95eae42f5d00e3d3e084e8a93bccc3f4 SHA512 b1e88c77b5c4a352f78c9b8e9f7835570df86e63e7e5dd5ae3550da7122395a97bdf0004bba8c7e0938a541f6c8d8b7a55d642d137d7f92889007560a3ced797
 EBUILD libuev-2.2.0.ebuild 541 BLAKE2B 217a18faa003337f8ec1e7cd92859a614d0764f52272f7b8690af10b83f71aee097b835e4b2249b55617ba80c0ceb99370c0606eec23a16158ccc5ec02a85437 SHA512 6cab65a348a30b3b2e1413e40551be6957320fa85fbe039d314072d2ab3a2f714a49907c57f42b1f7f34bef1af3dfabd069a412b0bbd2ce3e0778ee104d67f0c
+EBUILD libuev-2.3.0.ebuild 531 BLAKE2B 9c2416bdc1c33010cce85f05c38909d2d6cedbb850aac11ffd9d00c5481961d3f23eeaa68f48130dd8a8f04f8d56a4350bca6ca89b66df857ecbffb3a1521934 SHA512 70f22a65ced336d528fa421fb3bfaed1e6388f7f333b9ff3eda1a2012b765e5371b72264875e5fb93ab195619fc818533205d226ca22e59fe046a09c1f1b2aca
 MISC metadata.xml 697 BLAKE2B dcba433b09e4af6c7a3e849ec4b084545f84d08faa409b7408ae95d3f2922632f08237b6c51e1274a09299b0b09cb2031d809a8f5957f75206573695e7a9b11e SHA512 5250db4faa8c97ffb7b2a7df81b1afd4300358e2f223e1dcb15e461521c816abb09aac8c333315e506c325464ea404a4651009ce2f82b7a1270cbb35020cd4ff
diff --git a/dev-libs/libuev/libuev-2.3.0.ebuild b/dev-libs/libuev/libuev-2.3.0.ebuild
new file mode 100644
index 000000000000..2980b3bbb0e2
--- /dev/null
+++ b/dev-libs/libuev/libuev-2.3.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A collection of useful BSD APIs"
+HOMEPAGE="https://github.com/troglobit/libuev"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+src_configure(){
+	econf --enable-static=$(usex static-libs)
+}
+
+src_install(){
+	default
+	find "${D}" -name '*.la' -delete || die
+	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
+}
diff --git a/dev-libs/libunicode/Manifest b/dev-libs/libunicode/Manifest
deleted file mode 100644
index 11583afd2b74..000000000000
--- a/dev-libs/libunicode/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libunicode-0.4.gnome.tar.gz 211622 BLAKE2B 299e6ed5e3991b836ac43c07aca058b7c96a030648280792ec1c83fc590817147f577c86ef7e3138c431a3f54a175349a32a9ed3363e23d032efe8f0c7e69e3f SHA512 acfd67f80f194780ee6784abe3e41ae1557c177b8f07ee4bb9c9767499bd5f4b2e6ad7ce66653fd55b7e8ff765e5f7e8134cd5e3e28735e0c4f78cba60f6205f
-EBUILD libunicode-0.4-r2.ebuild 751 BLAKE2B 8047624f27501ea57b7b1bc1a64e14b5604f5f73a4d0923ad2ab45cb9610135754f4ae4c7c149ed77d03e13b6c29ba1a2b2f8b3a784c5fe471a7db7de25995a6 SHA512 d9f724bff08ffec2578cfce6d18c3fe16e4a6bb5c40af33f1637a2e129e8ccb1fdaca36ea114f9f68d8d483202f6188bc14ab70c26baecce6e7adfa3061a16e2
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libunicode/libunicode-0.4-r2.ebuild b/dev-libs/libunicode/libunicode-0.4-r2.ebuild
deleted file mode 100644
index 469332e132f7..000000000000
--- a/dev-libs/libunicode/libunicode-0.4-r2.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 autotools
-
-DESCRIPTION="Unicode library"
-HOMEPAGE="https://www.gnome.org/"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.gnome.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~sparc x86"
-IUSE=""
-
-src_prepare() {
-	default
-	# The build system is too old, regenerate here to fix crossbuild and
-	# respect LDFLAGS and probably other problems too.
-	sed -i -e "/testsuite/d" configure.in || die
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-
-	# no static libs installed
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libunicode/metadata.xml b/dev-libs/libunicode/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-libs/libunicode/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-libs/libunique/Manifest b/dev-libs/libunique/Manifest
index ffcffe99c708..068bf474f680 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 1593 BLAKE2B f2f8eff3839009aabfde7b95ae429f8292d6eafc9e944e5c887430c4b002b6874f61d1f166cf3db3e5005927acdc1f277a9b53a5ae2226bbb43aa719020efb2d SHA512 e439e83b6210e617a99507b0baef52f6b8679bfffc9ea6eed0060deb09ae95faf6d3e40139e60f0f423fbf917c5798db19893fb3080c0fe682baacd25fae683a
-EBUILD libunique-3.0.2-r1.ebuild 1152 BLAKE2B 8b77d73c6500c1266ef7913ac9abc27d447950ca6a4743c186c1d0abe290bb2781cb6b3f4a26bb097c5147e0a6a1444ef68728ece9dd0954b95a043754026dfd SHA512 5a18b2ec4b73927f8fbc02a1d42e4c1f84c82d992118e01dd993abec9f8b0b4af559e862e84becd046c504c64a0f8e95a851eadfcbca23087bc1a7411e533d4a
+EBUILD libunique-1.1.6-r2.ebuild 1583 BLAKE2B aa20117e8c5a34be2e43477b1a84837f1d5466299334572cc88299c556194779e00aaf754a35f7846b2608b88e2fdac83cae65bc17abc3a3892b3c8d6b1cbcf0 SHA512 a2eabda8f2824a277f1ab09f91fb6711766d333c14ddad7098ae6adb58be18e688f0329a11fa6e39c78c146d21afa59c030a08b52adf41bdef00f92254019c3a
+EBUILD libunique-3.0.2-r1.ebuild 1142 BLAKE2B f9288618900c95903160e3bc5006a144af2b77e7957a0c3cdeacaa8e09777a5d62e570c1b8053438dbb1e954e230219bc0219a39907a6133dec8a23695e14716 SHA512 dbeca30df63fc920273fbbff4d30f4d25309f54b4bb635b325d85cd0b7a8ea78251a41d66c7cc5604b6c8c1d487a02a5aebbd755c0c32d07cce81d37e5c9d77f
 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 363759d8bf9c..65afdef7455e 100644
--- a/dev-libs/libunique/libunique-1.1.6-r2.ebuild
+++ b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug dbus +introspection"
 
 RDEPEND="
diff --git a/dev-libs/libunique/libunique-3.0.2-r1.ebuild b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
index 8d23f7f79e75..9802691e12d1 100644
--- a/dev-libs/libunique/libunique-3.0.2-r1.ebuild
+++ b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
 
 LICENSE="LGPL-2.1"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug +introspection"
 
 RDEPEND="
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index 66a5868143b8..fdc867daeb8f 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -1,4 +1,4 @@
 AUX libunistring-nodocs.patch 287 BLAKE2B b351d572e702a17cc4b1df97f182b6fa5ca232c77a4775572097043814a868e16adb7e6dc4022ea07c614d6accac255a6c0262916e5a36275949e069a17b4a80 SHA512 f7bded4ec621039121c93c9808e384822613c670df886c125b00d8add6ab8257a5152298fa483cbed21222da78097a98433a2f0b364467ed82bda5f98a8c1847
 DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
-EBUILD libunistring-0.9.10.ebuild 1002 BLAKE2B 1bdfbad7f893973b0a75fc2d90a1809df4d558556b81d6711f7f2f98210308dac2f9e2837753c6afeddd99c76181cdd78f9e3c355a02ef9e2369bcab150d1bfc SHA512 95ad87525a7b0ccdd22d0914498c494e379a7e09f210cda0b4684a245b7ebb925801866bc205eef32d6bd8a415d955a0e83b995f4b1fdb4ffaaec5cebc967036
+EBUILD libunistring-0.9.10.ebuild 990 BLAKE2B 6947679c9fe95c20863d0380915122ae07c93601ba241872e41300fb996f285697ef85ca47ba427c1860decf16278554efe064b79bc4e45cd407fac21a2dc86e SHA512 c6e6085ac2cd4f5daccd00af1a310a82685c26e899734d5a4c3de8f9a53ad29a1a808ae629a83b8830da4b3ed9fb54b7937db22d21b5a936bad0c43c664b5882
 MISC metadata.xml 941 BLAKE2B 8234694090eba5e3506623b298b69657ece0a7c84d04b7dae238322112a74859e8c7bfebe40877f172a449ab8dc2095edc147f01040c949c704a54fc7a606617 SHA512 f4a8e3611f2e109b281e5777a0b7a30e14b64393af8c320be8fd18f293b9b8e1a732061e0b6598da24547dc71f068efc8f397bcdbefc4b286084d8f72478d4cf
diff --git a/dev-libs/libunistring/libunistring-0.9.10.ebuild b/dev-libs/libunistring/libunistring-0.9.10.ebuild
index 2532ee55788b..a2b5e055201b 100644
--- a/dev-libs/libunistring/libunistring-0.9.10.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0/2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~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"
 
 PATCHES=(
diff --git a/dev-libs/libusb-compat/Manifest b/dev-libs/libusb-compat/Manifest
index 64d0bbfaa68a..20252759775d 100644
--- a/dev-libs/libusb-compat/Manifest
+++ b/dev-libs/libusb-compat/Manifest
@@ -1,5 +1,5 @@
 AUX libusb-0.1-ansi.patch 4390 BLAKE2B c64a22623907ee5432d7f636642214221840df3721f226fedbe97da998e3503f9b6eb808e99a58f115f4bc1ac04a75b55928abd30786b9a6b5e3baa4b0f1edd9 SHA512 a3745567934bb8551b1fb0c7e43d5f749334ac763b05a23e15fb77af85034ca76fa6c65121c83cbfc44d82d6a879a43249148b1b894425956deb8eed3cf39e95
 DIST libusb-compat-0.1.5.tar.bz2 276769 BLAKE2B 66fa89c507d0454a587fa84d2ee2c34428963fa1770b44038fa45063466611ae263a3c790a167e5049393ef4d87073d1b16135d63cd0666256c3430bf36dae49 SHA512 fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857
-EBUILD libusb-compat-0.1.5-r2.ebuild 1156 BLAKE2B f7a30e6e3423638fce5be90155a1be6145de3187deeb51553ad34c500ef5df3bd6fa41feadee5b2bf2e3fa783fc508adf3f3c4ea0374ad9eaf22a428dbc5fdf6 SHA512 bed94197c4a53ddc1c81955db5c6f7f19ace01ea87e6a489e559ae3fc012222bad9d4327880aea1cadf4836ef630fd7ac4c8733d32925153f0aedfb523abf58f
-EBUILD libusb-compat-0.1.5-r3.ebuild 1219 BLAKE2B c4b80285bee67214707ed26f264629b905e3daf327b140c583bfad33988764b54dcd3f7d5d1309059acdf6a7a195fbf6f7f7f5358bed257bba1db913c9354cce SHA512 3b8e947ba7796b74b88a03e6335dcb2b7033eefb4a2453708bb41d905790a11d31942bd7cc44c51d92e598e872163904872ecfab94ff0a2a48e7350f4607e91d
+EBUILD libusb-compat-0.1.5-r2.ebuild 1146 BLAKE2B bbee76a637cb2ba7f8d0a2dd08066101d11d5573f767d2611b486d2bfb9142fc24772f0cad79b38ef9b40ff5f2dc7bd05c0833f17ab3753dd3c3ae72fb487ec1 SHA512 4c71952bcd6239d5f754342556d06002d5d58d6a80867981b626de2b049a946f56b84068eb39c5372a602456d62dafb0036af42b9d2eddf13d5a724e1c7d01f0
+EBUILD libusb-compat-0.1.5-r3.ebuild 1209 BLAKE2B 013b768afb428aecae0ca0c530b90ef510d293c23f647da9ddc9d394fbc643695490a2618f4c4ccbe4077f3e6527954e6ee6f65671fb491766659323da14e160 SHA512 a3cc53d1446102c6cae59d30c081ec72297453a5ec6acaa31ba1eb6ca1822cce5134390dafc36e4f92ea5d073351fcf1ed82648fd4b13bced768e1ccd3e92958
 MISC metadata.xml 552 BLAKE2B b177713b8523c97bb9cbe9044b69207060489656f4369ebfd44051530f45eaac3500df7c3ba085a015ae8de96cc95777fa9ad1b900cdb3b1fc87395cd865feca SHA512 546ff60c99c3e575534cd660384429b4b4ea8c19fac29ab4ea8e432831f4c69452e08f50b70a038b233c2bd7ccd547e65ad25716d9521c0b5573f1b7d80fc052
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
index 44ada6fd920c..ae1358a73624 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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 examples static-libs"
 
 RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
index b69a4a60f75e..ad93edb9e68d 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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 examples static-libs"
 
 RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 107678676421..62bdef866fa7 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 1562 BLAKE2B 9205b771773d512adf09d90e189d38cc6fd784402edf2f7f9129e2791b483a31eeacdb930682488cf95a35503b5e66e17e25cd11906b158f7b1f7c8fe9a7417f SHA512 f678d9238545b995e16d8ea726cdbb38b87c29cb6a4d549d740f1110e2fcf97438212e3c7557ee4c15853698024d51d62915ada0d2111f75e5a947aaf0377952
-EBUILD libusb-1.0.21.ebuild 1594 BLAKE2B a0834079b8a4461b65cbc338331e2f452c177497cd3019d2b79225fd62e96557e0d06e2b2b6475a1a65f349ad2a38fe1786178f4c6697126e4e602e19ee71bef SHA512 8bc2edb604068e4bf7ddfcbf65a8957f7c3f618becafdbaf5bd071f3004b8cef096cd8f7994bb9101d615692ad3052b06dc6232caaa2259c3d3668ed44629c66
-EBUILD libusb-1.0.22.ebuild 1588 BLAKE2B b0994b5c98dd8255851efe02104a0f925b9badcbd80b037d8b9f61799d0ff1f54e000411e495ba3622d6b3227371611ec9d40991ef98dd6bea0752b0661aec55 SHA512 957efadf3d5e785edf2b4dc8a423300bef1e377130383d87838402c6feb4c5dfae008877309103cfe801e0dd28c87f56db88109bcf2f4a8eef6932df22e800e6
-EBUILD libusb-1.0.23.ebuild 1642 BLAKE2B 3747bc274c6591ec30929c99acf2407507144ffbdec6466275aba9eb4ae702e82e8c056e55787fc27ef14881c65080b498338f22b4dbfe98ea0d12c36442a5bc SHA512 ddc09853ad24a29a489d68b65903889c35d637dee9c20d42ad4cfa910a1627ec630e2b53d349333f197038cae81e69bab798b7f07905204d3bde5c01b174993c
+EBUILD libusb-1.0.19-r1.ebuild 1552 BLAKE2B 41072916887bb0c3fb6b5a72e25058a8cf590116424d8e7f19fe24163e6527db5e18d71fc73c3957d18b31258b1d4a69dcab5ca28af7e15db13e240c6c56a110 SHA512 7246c56dce55159d30147a83a54ce518531b1842a304bd0d4f6346d0ee4d8ed5d4fcc2f3ead77cc11be3d6e8f7e8f09aa1a4e88a3229b6b7327f0668a61cfb22
+EBUILD libusb-1.0.21.ebuild 1584 BLAKE2B 79b753df93d5814fdd182cb97c0af28ac4ecc43684943843c50649665b4fd653485c01d0c91373c0c951471d337498799730edf08e612e83d60a7977b788ae54 SHA512 f7fb6258b7ea46e15615c1c65068ad6927bfd9950c16b11b00497e3d51cd26ef95abd0eff2f2c03fbfd9f2c0e33a1f7ecbc1447e134d1375dfb52fa6c076e4a9
+EBUILD libusb-1.0.22.ebuild 1578 BLAKE2B 3d5859dafe30f2ae44375fedc3f66d4bd496facff86528029d7dc30276ba604e576ec5ffd80ae5d89968d7bb8007f657feeb19fdb00d438aae55a3e78af72990 SHA512 1b9f8355e8f7f8a63155cd4f816bf35b2eec8bd2b8111350c91ae032b063ceb34e882d72f2a1054aea87f3a47d9ee1857d5740be3e7879977138a2443f8bb391
+EBUILD libusb-1.0.23.ebuild 1639 BLAKE2B 25913d93ce8dbfc5cbde70f2ea079c410a7ee37dd36d22c2314dc0e68bcbed67eb78f08c77ac1a03bc2174ade67f9b60c5c60f3340d73f52010f554b000cf329 SHA512 bfdd7cc67b0bef33b2c7ad08674464f3aa974b2df0c2792ee26f53b8794405ec1502b12405c32ee5458486b91c25a5c5dcca26ec09769c125720646fda4ee307
 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 0485e029b05d..730265b9abdf 100644
--- a/dev-libs/libusb/libusb-1.0.19-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
 
 RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
diff --git a/dev-libs/libusb/libusb-1.0.21.ebuild b/dev-libs/libusb/libusb-1.0.21.ebuild
index 660a93b597c9..270363654069 100644
--- a/dev-libs/libusb/libusb-1.0.21.ebuild
+++ b/dev-libs/libusb/libusb-1.0.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
 
 RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
diff --git a/dev-libs/libusb/libusb-1.0.22.ebuild b/dev-libs/libusb/libusb-1.0.22.ebuild
index 11f3472ae014..e5001ea40c8e 100644
--- a/dev-libs/libusb/libusb-1.0.22.ebuild
+++ b/dev-libs/libusb/libusb-1.0.22.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
 
 RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
diff --git a/dev-libs/libusb/libusb-1.0.23.ebuild b/dev-libs/libusb/libusb-1.0.23.ebuild
index 542edcff8700..11b5404949ec 100644
--- a/dev-libs/libusb/libusb-1.0.23.ebuild
+++ b/dev-libs/libusb/libusb-1.0.23.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
 
 RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 51b859d5634a..dfc50d84ab51 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -4,11 +4,11 @@ DIST libuv-1.30.0.tar.gz 1228356 BLAKE2B 1e70ff162f5b6200e1a88c069360cbbc246d8bd
 DIST libuv-1.30.1.tar.gz 1228593 BLAKE2B db45d283b7aec00ee5b617a6d3578112aeae6f006da5b09c9d0eb07ce9ceee59d6acc0ae9e476602f664c67d24685c4e1ac0e1524f38475da1f00e89c8376bd8 SHA512 bf6d99e4807da3e90c1852b901953fb5ddb9354942a433d8ddfef9a0766abfe3783216936c546ea1b9f2872d0d031dd184519bb5c7f58f6baeae4446f0f5e3fd
 DIST libuv-1.31.0.tar.gz 1238566 BLAKE2B d6a9b92dc8a6f28dd89f65e6d1b7ff4921c7d591c13965e27304d3ca38f25d0436a1ab690a09238c511bb787bcecbaf2cc34a214a388515eef039fc5742ec7ee SHA512 bb27ab86f2f6e9c2b22e768216097db2b69e468967b48bf1a15d17c36b445355ee4bd356f59bbd1bcf7d7c0d3f68b2c6660f999a2cc0660033eb5e3775499409
 DIST libuv-1.32.0.tar.gz 1242643 BLAKE2B 39520790200c70a417103416a6c2a389aad7b67878872c3733cf0dbca5ace012e45da088b0695e8dcbf55859635b6d67672581bc13c444d078ffa536bd3d0c39 SHA512 3e043a56fd09fdaf3c89f81b3dff70a385ba8a59ec065447c95199a0e45da323b8545fb13b50139c557541357450103a88297fdc921832de661f3e2700173b96
-EBUILD libuv-1.28.0.ebuild 1220 BLAKE2B f2a288593c2b6dfec730f5eee44f92ca7547256397130f5237f331aadd2e6b2e9d4f9a48ab499885a3844f27363b357a09e607a027a7d4844c0c546801a15f4e SHA512 74b859a4bc98970f1eca1b6ad29f974bfeddc8815455842220d317fb2ba0173baa179987fe096ca58154b6fc84fbf95d071f89df8b50aa5ead1f2e0649808658
-EBUILD libuv-1.29.1.ebuild 1237 BLAKE2B 05df78f6a04e72033411d2c2e4523ca314c1d11aadbdc599fcd83f84fc3758044a56d1f02709cace36675ce56f61c6df4d6d26a806c5e358b2c56cf4fca891ee SHA512 8426a40e2dce0793b9cc6defa6dde8525d0702fa46b3eeaeb05fc6a8d5fbc3527d76126920660e41b0d9382480dec8dfd7b40165fd2d46cf082f2898e180751c
-EBUILD libuv-1.30.0.ebuild 1237 BLAKE2B 05df78f6a04e72033411d2c2e4523ca314c1d11aadbdc599fcd83f84fc3758044a56d1f02709cace36675ce56f61c6df4d6d26a806c5e358b2c56cf4fca891ee SHA512 8426a40e2dce0793b9cc6defa6dde8525d0702fa46b3eeaeb05fc6a8d5fbc3527d76126920660e41b0d9382480dec8dfd7b40165fd2d46cf082f2898e180751c
-EBUILD libuv-1.30.1.ebuild 1244 BLAKE2B 72493abf57cae2fda6ed7e23c7dd8c06300bb80812cbd795a957697e4c07787e6f8c4ce9766af69ce0cf987e0dd8a1d58d5f5d3b8445c0d3eba76796241fc45c SHA512 91549516a2b1c2c54aa37786e46d5039caa8549448a921cf172d47b9c94aa386f4193c88cc430caa8841fcde09583a399c4428d2bd49cec09e77bbfe67f50b63
-EBUILD libuv-1.31.0.ebuild 1244 BLAKE2B 72493abf57cae2fda6ed7e23c7dd8c06300bb80812cbd795a957697e4c07787e6f8c4ce9766af69ce0cf987e0dd8a1d58d5f5d3b8445c0d3eba76796241fc45c SHA512 91549516a2b1c2c54aa37786e46d5039caa8549448a921cf172d47b9c94aa386f4193c88cc430caa8841fcde09583a399c4428d2bd49cec09e77bbfe67f50b63
-EBUILD libuv-1.32.0.ebuild 1244 BLAKE2B 72493abf57cae2fda6ed7e23c7dd8c06300bb80812cbd795a957697e4c07787e6f8c4ce9766af69ce0cf987e0dd8a1d58d5f5d3b8445c0d3eba76796241fc45c SHA512 91549516a2b1c2c54aa37786e46d5039caa8549448a921cf172d47b9c94aa386f4193c88cc430caa8841fcde09583a399c4428d2bd49cec09e77bbfe67f50b63
+EBUILD libuv-1.28.0.ebuild 1198 BLAKE2B e10d86b654ee8671e588dbcf0a509770c828d512a2c7476362c18518254946c52da758549fc20ffcc356349b758cfb518557249e1557211de670bba9cb1162d6 SHA512 cd2c514b8939ca68d0e2c7313dfa3878bce8b2b73e4ceadfe9f7e57024463ab08234e60be2451be1cb7b937e33614de70d91877da8b6001d374e37bd55c766ef
+EBUILD libuv-1.29.1.ebuild 1215 BLAKE2B 06309a530f67cb20f98cc41309219aba34d75cc44bcd873ee1415278fe509d258bbfbcfe766852318a0cc676cc0b4aac931c6eaddfcfe0eade9312061248db71 SHA512 e37f129b934044be101d4cc5bd9e7e40fbb5a0e67f8a85c945e7cb75d19d2073e40dc8f9c9debf373d39fcf9386f39eeb290a730846d8ad9fb816ab4e52b62a5
+EBUILD libuv-1.30.0.ebuild 1215 BLAKE2B 06309a530f67cb20f98cc41309219aba34d75cc44bcd873ee1415278fe509d258bbfbcfe766852318a0cc676cc0b4aac931c6eaddfcfe0eade9312061248db71 SHA512 e37f129b934044be101d4cc5bd9e7e40fbb5a0e67f8a85c945e7cb75d19d2073e40dc8f9c9debf373d39fcf9386f39eeb290a730846d8ad9fb816ab4e52b62a5
+EBUILD libuv-1.30.1.ebuild 1222 BLAKE2B 949a822dba0c539f7a5119e2478346007a37fef5f51ad67e603bc40586f721efb69e071a1ff45f702c991212874b1012b4f8d6bf86a497437caad77f58612bf0 SHA512 a1f75038807ef26e55189771b6584b66431e4c62b664637ba7e48e73e1af53faf2b11d918995448b9d9e148a11e77263b181c554087d3ef799875d6b2d365f5e
+EBUILD libuv-1.31.0.ebuild 1222 BLAKE2B 949a822dba0c539f7a5119e2478346007a37fef5f51ad67e603bc40586f721efb69e071a1ff45f702c991212874b1012b4f8d6bf86a497437caad77f58612bf0 SHA512 a1f75038807ef26e55189771b6584b66431e4c62b664637ba7e48e73e1af53faf2b11d918995448b9d9e148a11e77263b181c554087d3ef799875d6b2d365f5e
+EBUILD libuv-1.32.0.ebuild 1222 BLAKE2B 949a822dba0c539f7a5119e2478346007a37fef5f51ad67e603bc40586f721efb69e071a1ff45f702c991212874b1012b4f8d6bf86a497437caad77f58612bf0 SHA512 a1f75038807ef26e55189771b6584b66431e4c62b664637ba7e48e73e1af53faf2b11d918995448b9d9e148a11e77263b181c554087d3ef799875d6b2d365f5e
 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 f4cf2dc83fe3..547421f33400 100644
--- a/dev-libs/libuv/libuv-1.28.0.ebuild
+++ b/dev-libs/libuv/libuv-1.28.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~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.29.1.ebuild b/dev-libs/libuv/libuv-1.29.1.ebuild
index 82a9f17f9244..dda90b40158e 100644
--- a/dev-libs/libuv/libuv-1.29.1.ebuild
+++ b/dev-libs/libuv/libuv-1.29.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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.30.0.ebuild b/dev-libs/libuv/libuv-1.30.0.ebuild
index 82a9f17f9244..dda90b40158e 100644
--- a/dev-libs/libuv/libuv-1.30.0.ebuild
+++ b/dev-libs/libuv/libuv-1.30.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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.30.1.ebuild b/dev-libs/libuv/libuv-1.30.1.ebuild
index 046df21f2944..7c0554f35244 100644
--- a/dev-libs/libuv/libuv-1.30.1.ebuild
+++ b/dev-libs/libuv/libuv-1.30.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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.31.0.ebuild b/dev-libs/libuv/libuv-1.31.0.ebuild
index 046df21f2944..7c0554f35244 100644
--- a/dev-libs/libuv/libuv-1.31.0.ebuild
+++ b/dev-libs/libuv/libuv-1.31.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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.32.0.ebuild
index 046df21f2944..7c0554f35244 100644
--- a/dev-libs/libuv/libuv-1.32.0.ebuild
+++ b/dev-libs/libuv/libuv-1.32.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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/libverto/Manifest b/dev-libs/libverto/Manifest
index 8f54ac1d50f4..88b067a29079 100644
--- a/dev-libs/libverto/Manifest
+++ b/dev-libs/libverto/Manifest
@@ -4,6 +4,6 @@ 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
-EBUILD libverto-0.2.5-r1.ebuild 1512 BLAKE2B 951697802ba260ad2976ad599231b1feb1d63f8b24bd656d554e90d2dc350e7ae08663d82dce2688cb2b666b767b208ea0370ea5459d8f3f8bd75c28ec778211 SHA512 9d82060dfd52ea4543073d688b17ba4f1b904da712afbb0c1149ff74ba511f58fd02e2ef90f2f7e1491336c973133bf21e57272f2b0daf101c0d9dfbe9048867
-EBUILD libverto-0.3.0.ebuild 1744 BLAKE2B c79227f441df5ed9f02beebc07cecdab35082cb7a57ecf26444062f7e171c0f1750edc9ad6c285b8a36c7428b19cd47f0ec354ddc5447d2cf4bb784b422e61e8 SHA512 b6fe9c3d354da1719a6acfa69ae08a3813e54a95e4132d8beaba209c2dd78b9beeb1e28144450d54516bbd7d1870b77c481ef3654b776d9119b08770caa1bcad
+EBUILD libverto-0.2.5-r1.ebuild 1500 BLAKE2B a977607384abbb6fbc95638a6bcdbbb3a4d9bc73ed3ea07268f67ee5546827d477ef881d031ace9366a9f855cd18a2a274c1c7392072233b99d5af85d06de4c6 SHA512 b2fcc86e3f59c3155c684e29b8540738f745052e4755f1f47106372be053638c5c9bcf60268bbbcb1248ee201ec22ec90f39be30fb7261e3257e5d5d614dd306
+EBUILD libverto-0.3.0.ebuild 1732 BLAKE2B fa43bdcd7c99fecaf1f5d0ae062568df8ed31fa2943dc33ed1cf5ea67d080edc19b5b1fbc08dd6b7c9f9c8396f5662866fd136340f9ce7ffe50f3b7365f28b21 SHA512 75a9d850e8f90957996da433f8b4c74853d848560d7dcc17f9acf6102cef4d72d70855f2b198e2b30086b78ca11395e77483702291e2bbca78122455ae327b03
 MISC metadata.xml 1080 BLAKE2B cb37ba132016891f547bbf860b3353348b3312d770e220b6cd6cadabbdaea8c272c0b66a391f7a74de7ca0927be2d0f4939b7238b5966d553b5a5b834df93bd6 SHA512 88399edcdaa1d9055b6990605fe3bd1a753eac2ffa3b10ccea88a7385323b9de9f123a0032d19493f27603968fa8d07d29aa09f4f0f21ab5998f0ba2af2e4c00
diff --git a/dev-libs/libverto/libverto-0.2.5-r1.ebuild b/dev-libs/libverto/libverto-0.2.5-r1.ebuild
index 9502f0809ac0..0e4d61301cad 100644
--- a/dev-libs/libverto/libverto-0.2.5-r1.ebuild
+++ b/dev-libs/libverto/libverto-0.2.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="glib +libev libevent tevent +threads static-libs"
 
 # file collisions
diff --git a/dev-libs/libverto/libverto-0.3.0.ebuild b/dev-libs/libverto/libverto-0.3.0.ebuild
index b4a749110cc3..e2fcf850ff08 100644
--- a/dev-libs/libverto/libverto-0.3.0.ebuild
+++ b/dev-libs/libverto/libverto-0.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/latchset/libverto/releases/download/${PV}/${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="glib +libev libevent tevent +threads static-libs"
 
 # file collisions
diff --git a/dev-libs/libvolume_id/Manifest b/dev-libs/libvolume_id/Manifest
deleted file mode 100644
index 8652c1bf1444..000000000000
--- a/dev-libs/libvolume_id/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libvolume_id-0.81.1.tar.bz2 23399 BLAKE2B ba586630200eea63fae41b464c74e15151708888fac4f5ab49b3156c53520ca248b68e5812ebac157fda1c74b1ef70828d48584cba9e9adac043b6f835d97abc SHA512 a30c08fcdb020e8b7d0e5350d996d7007040d72e3c1caf3244cf7c6e08cc7d5eee9b94edbc04a073519243884be8b27e61c33a3f61c25e7bfb42eb96785d992f
-EBUILD libvolume_id-0.81.1.ebuild 681 BLAKE2B 4acbaed919f79df429fb7e92d2837c74577a0e85661a70c167d6caae9ea13bbe816b280a201cd2fe3eeed9982694aab4db34aeb7c5939438f53c7440cacc48ae SHA512 dbed89c235d0324dcdcc517084f668dfce0d2c36871801878f1b057edd5b599f0853cd5eaa21861159027416b8e208605074992d134af46c91bb1c647aeec6b6
-MISC metadata.xml 365 BLAKE2B 43c77501d8bd51ecd0cf3f904eca81b2db24fdbe6c053baf071ba1dcafd9606816047e05c40b144063b4033f62c7681b3ef75c3cd5c350df2a629a41f2bb5aa8 SHA512 0a7813ca50da7ee0c17399d54f12ca4038617afe550c22997f6b209cb800873a9ecc4badbe8b53f727980934a7568ed7c5824cb1a71eb18546ba1e92cd935671
diff --git a/dev-libs/libvolume_id/libvolume_id-0.81.1.ebuild b/dev-libs/libvolume_id/libvolume_id-0.81.1.ebuild
deleted file mode 100644
index 8702793a0e2c..000000000000
--- a/dev-libs/libvolume_id/libvolume_id-0.81.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Library to provide file system information"
-HOMEPAGE="http://www.marcuscom.com"
-SRC_URI="http://www.marcuscom.com/downloads/${PF}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-IUSE="static"
-
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
-	make E="@echo" RANLIB=ranlib AR=ar Q=@
-}
-
-src_install() {
-	dodir /usr/share/pkgconfig
-	insinto /usr/share/pkgconfig
-	doins libvolume_id.pc
-
-	insinto /usr/include
-	doins libvolume_id.h
-
-	insinto /usr
-	dolib libvolume_id.so.0
-	dosym libvolume_id.so.0 /usr/lib/libvolume_id.so
-	use static && dolib libvolume_id.a
-}
diff --git a/dev-libs/libvolume_id/metadata.xml b/dev-libs/libvolume_id/metadata.xml
deleted file mode 100644
index 89c6d8ad612b..000000000000
--- a/dev-libs/libvolume_id/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>bsd@gentoo.org</email>
-		<name>BSD Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Provided file system type information for systems that don't have udev.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index 5552b7511623..07144af3a2b5 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -1,14 +1,5 @@
 DIST libvterm-0.0_pre20181126.tar.gz 65524 BLAKE2B 00ad4cbc60739aae173e86ae7aa357869f815658c3c13e04808841e5e1e847732046e212153d4e4d49bbddcd5c661cdb7f7f962e6fd0a305a534bbca074a4ca6 SHA512 9f55c9a00807e46c1c6157fc372d3cad575f2574ac8b3abc82acd26ef6425166ac18ee1b7d77a9dfc617b14bc9eb7dc3a364cef5c0bf6c4951dc755d9c6c5ce0
-<<<<<<< HEAD
-DIST libvterm-0.1.tar.gz 69960 BLAKE2B 27849727b8fec8b807c151a035286f3f4ee0464995271771da190b270a4b6c4d4258f5635e4a14418d6ff3fae981f30d2c9bdeb5c7b3f0ca74eed3a99642e354 SHA512 35317b6998764336edca6a4a011714f87853996a43dbd907d9a73013d9169f9ff39fbeaa405fd0504830b302518ead1f9b6c00fdfc46ae8f7e51cff1a5464dc7
-EBUILD libvterm-0.0_pre20160305.ebuild 763 BLAKE2B 5eba9e60a96c6197e0630c4f324f1fe4803ddc24c5e0a2113fe48e3135e7b3dbbc22f3cd7be57851f37e2484516e044c42a623560580281f3e33e3f4f0e5321f SHA512 b3314341167cd00f0e849e566da865acaf84644f82b0370a87e25b5f1384919b35ede81d65ce3fd30302e294c0beeeae1dec06ad324ea886bf83596cf4ba4644
-EBUILD libvterm-0.0_pre20171004.ebuild 765 BLAKE2B 36262c4dd36157dccd571bf3218573fb802a04e71061676b8f8aec4238bfbd54950e555e234cb5f100461ee196befc584c69b9d5b705a4c8740f109047380e2c SHA512 d6fa75efa138639ade62b6d3ec37e0e1d6a36e8ac5273e7a4c0f12cb4bd29feae154b637c5559e5e5fd7088f2358a2d76e8d2b3c871d2495022568b9d25c7146
-EBUILD libvterm-0.0_pre20181126.ebuild 780 BLAKE2B 974ac0ab87a5b20ea74e4e89c7e95eb4edacab0b31051419382ddc8a824719cbfdc6304671f717743222fe309042e24068e3031180cb2a1b1183b175f2cc8b2e SHA512 42124f47b3762de058b07abec156c8991d84770d1f6f3c123e98b2a6bddef12921d301371ecd3f92742b17f92edab474f62809a2ad430c32871ac0049bbd0a55
-EBUILD libvterm-0.1.ebuild 938 BLAKE2B 3871580b8a9784efab338f07096629d772e9c61d8d090846566894880852969441cad50813803ddfe7f47d0e6bebefad754646b98d62fa6391157a7a4e8d7d3a SHA512 b06bdb65695c90d54778b8875f8c46e89c18feea2fcadc09adf76d5bf826af249839d5db6cd4457b4b2e095be346dcd71caa982f4f2e70c1233902b14541f228
-MISC metadata.xml 361 BLAKE2B 136d9b4f9d9a69c7bbd32343e71208ba7a128e33038899b9369ed5440935f8d171589aef9902e15260cde2d989c8dc3d9eb11432e7383e33cab83d79eefa41c7 SHA512 cc0e766d31c2b6ca0eb1816403d0d73d187986ffb40c0b9d677d9f40037d3f0e6cba5f08401eea8929cb5affed0b3f1c99cf0a6f8aa026e7b339665327483c9d
-=======
 DIST libvterm-0.1.1.tar.gz 69044 BLAKE2B 2e521a26238772370718e3c643e2225c9be7877f6312573d54c8cf3b34e38996886f1100ddae12e34ced1c8eace1a307238024fb91b2a96e6b9e2e85d30a5073 SHA512 beb21ae2bcc5f5e7dbc8cb645e004ce923f2b77f756b48a9ec835dbe1c99afa8cdbce12c5f982b5ca880b5b1ea113570d48733a1d043a7b16ae271f5718a6757
 EBUILD libvterm-0.0_pre20181126.ebuild 780 BLAKE2B 974ac0ab87a5b20ea74e4e89c7e95eb4edacab0b31051419382ddc8a824719cbfdc6304671f717743222fe309042e24068e3031180cb2a1b1183b175f2cc8b2e SHA512 42124f47b3762de058b07abec156c8991d84770d1f6f3c123e98b2a6bddef12921d301371ecd3f92742b17f92edab474f62809a2ad430c32871ac0049bbd0a55
 EBUILD libvterm-0.1.1.ebuild 861 BLAKE2B b6bead0944e8b79cd6730db0b02d675245667a3d469e4175507ea0111b719393d93929c05afa833a213c328ac21f029d0eea4dd44a54a0aa2d82c9a2d1e9ff2b SHA512 5f51122dd4c01c4eae11be5fc8e9690bb3bbd9abf11b55d68622b4c6d1d9095ca02a85c8bf028b72343a647101d55dbf1172376d36a4c82705a513406ce627ae
 MISC metadata.xml 493 BLAKE2B 8f975516716c1da5b84c183162a338e25b8985e10b329254c23cf3320a405e51e931668ee2f5a12dd7d7a38038e2c30f1b4b8614d739f1fb6344d3f78db29fce SHA512 2d75f4dddf3e7cc02f7dc0a31274aa8d30fe69800231a6d83ac57a8fb5692304dbe6a6190270c26ea35c4a52c0f299cf09b82584f7eeec11a081c259ab146e22
->>>>>>> next
diff --git a/dev-libs/libvterm/libvterm-0.1.ebuild b/dev-libs/libvterm/libvterm-0.1.ebuild
deleted file mode 100644
index 7109c9ce4426..000000000000
--- a/dev-libs/libvterm/libvterm-0.1.ebuild
+++ /dev/null
@@ -1,42 +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="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
-HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
-SRC_URI="https://launchpad.net/${PN}/trunk/v${PV}/+download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-lang/perl
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-DEPEND=""
-RDEPEND="!dev-libs/libvterm-neovim"
-
-src_prepare() {
-	default
-	# Remove broken test
-	rm "t/63screen_resize.test" || die
-}
-
-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/libvterm/metadata.xml b/dev-libs/libvterm/metadata.xml
index e6fc33367084..119029816579 100644
--- a/dev-libs/libvterm/metadata.xml
+++ b/dev-libs/libvterm/metadata.xml
@@ -6,13 +6,10 @@
 		<name>Bernardo Meurer</name>
 	</maintainer>
 	<maintainer type="project">
-<<<<<<< HEAD
-=======
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
 	<maintainer type="project">
->>>>>>> next
 		<email>vim@gentoo.org</email>
 		<name>Gentoo Vim Project</name>
 	</maintainer>
diff --git a/dev-libs/libxdg-basedir/Manifest b/dev-libs/libxdg-basedir/Manifest
index c43482dba9c8..3289a48b00fa 100644
--- a/dev-libs/libxdg-basedir/Manifest
+++ b/dev-libs/libxdg-basedir/Manifest
@@ -1,4 +1,4 @@
 AUX libxdg-basedir-1.2.0-buffer-overflow.patch 898 BLAKE2B 24db3713a2a85901f0b7c0353bed955ca377e4fe1c84b02343e191945203db500722a0efe15a263885952a526eaa7121231054d27e4d86bb72c937f019d52f8c SHA512 265ded0f9fc7448021281eb48ed77977eb2f8f6275a18ba329dc9ad5a8c7e41585add4cb989af34e8f135a8545b1548763253204ab5905f78d90c9852546aa25
 DIST libxdg-basedir-1.2.0.tar.gz 30159 BLAKE2B cd9eacf6d32e0f27aa4a9092fb919f027fe77905cf8cad2f3d860d93f9784bbcf85336704fd9241d58769e48b2a8a7e4b4ed306ff32328f1ddc7cce7b014dc09 SHA512 8584405d45e0b57e570666b6eab6d99d70411d00f88965826c9ed0292372385668f190157a10ff536f3a5a59fd0031b332ecbb8a38ac64eda1b04a0603997406
-EBUILD libxdg-basedir-1.2.0-r1.ebuild 959 BLAKE2B 9a8f2ecac6d349741548e3d2c4038d55ee8cf989afc9b4c2b794893637814f969938e1067effe1c64beb4cc3e264eabaa5cf1d50f632a868ae3d7fa54593e25b SHA512 5b5abb931c0f0f02bed40ad4877ab805ec835e1b6eb8bcbbb44dbef5c680cf668636fb5e28f627f2f81c01f13a161970436ff7e2ea39fdc183be528a2a9e9759
+EBUILD libxdg-basedir-1.2.0-r1.ebuild 937 BLAKE2B 4ef0e2da08f6b0b097d1853242d1acc2a20a87fa90ddc4b18c45d4b3b72f708663d7142e088c07232113e9f8ee0c9a15d1d96668b182eecfb8efedbacd6f3853 SHA512 3e4b6651e3311157e3d9a4ab558bcd3bcb2574c0b5b8dd09d7051e05df4455645c44eafc4094be29b6ab89e51929443fba64da630d6dd500e9ae5e30ebf7529e
 MISC metadata.xml 258 BLAKE2B fbb6080ca66a25c598b8dbd1366020c736e21b80c080dd1ab706a48379f2a5e9e1f1ca3dd6835a3c462f8465702b3277e5c30653e5def11a1bbe2f497d502b6f SHA512 2186459dac52b0c063cc8a6d83c1895a1dcb4d1cef3c5c0a50d2658ce8cd4140cdf50a28032a2add1f71ca6a03bfb80c9293c8c0af668623741f5b6f90b38f7e
diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
index 6cb1265efad1..4d8ca2a7e832 100644
--- a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
+++ b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x64-macos ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 31835820086e..bcf80d7910cb 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 6785 BLAKE2B 3ddd7282fed8570a54c1cf529e5afe5d3a45a330d355d1322b9f549afd05113c29abb5972fe4e07cd80989296ded3fa2e08a74804eb2f023bcde7cfd04681650 SHA512 72eed6db6082b98c70cbc19cdd9bf52898ea787cc8f9ab55207cbdb37829601de135f6822ab609113cff8d916824ff8931fc03425cfaa3587eaed5c156479013
-EBUILD libxml2-2.9.9.ebuild 6531 BLAKE2B b4b9d5c06f04316bb31aca3aeb1f60a9c0ae045ecc9e04d863c517120c4dbdd580c5bb7d88e85f16cb63b0f8a8d0751c5d9df42bf8fafe6a3af185292149a11a SHA512 63e8a73380c3a1798af17075f9e5ff5821b53b4d3e782dbf51dcca6d604ef8315b3fc3b5f6d3bffbb0336d4418e47e5f4c220d4798cf20042dde8cd766924f7a
+EBUILD libxml2-2.9.9-r1.ebuild 6763 BLAKE2B 8dfa7d815a3e3ade3ce2db771d4752f2181e86ac59f5449d909af80a10894d4950f6e73769cb1fd56453ed4cb9cadd0339b2fc060605060cf18c63302abfdebf SHA512 272cb5ed129d546ed25f8b1b043622676457ad3973094ce5f5745d95ac0a5f07f46c643cd030cfa435fe2fd111d17f676217ce00ef389635b63ac6b1a7cf5f7a
+EBUILD libxml2-2.9.9.ebuild 6509 BLAKE2B ba1792bede60aa001be656853d8cb39ab60f46c80df210a559d87f4abac8f2be5ec8f8200d6477ad3661990ef19b66b6448434651d2bf9633749e7a2e18db301 SHA512 b5fcf9671f176bb4281a676ad10dce575c2e626b058a144e6eb08c2b3d69c4760497785b6332126f32d1951b1bfc1827dc8682ffb04e1652ee0d3a04a7e73c89
 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-r1.ebuild
index 8e3356557e12..90b38796287e 100644
--- a/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~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} )"
 
diff --git a/dev-libs/libxml2/libxml2-2.9.9.ebuild b/dev-libs/libxml2/libxml2-2.9.9.ebuild
index 577d8feba4a1..cc03219b06f0 100644
--- a/dev-libs/libxml2/libxml2-2.9.9.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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} )"
 
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 3fee8dee0640..0cb966631828 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -4,9 +4,6 @@ DIST libxmlb-0.1.12.tar.gz 91256 BLAKE2B b063bed9d7794b300ec40622c7fd0caac974b7f
 DIST libxmlb-0.1.8.tar.gz 85945 BLAKE2B 4d17aaf4e5ed3001a4db24e7ca220cba3fc14ee446b127b65b545fab997c7c31835b57b0dd9d23da74200d774e3986558e7618789f42d1e95c0734fa5bb6e098 SHA512 4109f171da4622429d18afdb9ae183a64f89e0b92df285efae5736017970f877a92391876969c20894184c6d5df96390ccd46be1d1087882a5461476c39e433a
 EBUILD libxmlb-0.1.10.ebuild 903 BLAKE2B daf92bc66015754f493d281f8746bcf7274621e84b51be1f7fcf9c643909054003b09e8c49a0ca57c63837b2b18994e51fc891ff34c6a9ecc06baa161244976f SHA512 24c96335ca8cccb1f3d1b008a8da01f59c90baec5227515a921c34a63c11b07d94ab9814e50c9044d1bfabdf035e2957ee6350b71fe3010af3b9d725593e8868
 EBUILD libxmlb-0.1.11.ebuild 1214 BLAKE2B eabc4de808f3d20f3551be686c1c63f291de4e607bfbfb77d144284573842225be42a33fb89680c23815e0ab09a4948e4e4a11b924457938a21f967e2144c85c SHA512 23602d9fe8f4622a50d737586940609b770691782fcf17a5e1d5efee200fbc214069eb73f3b720a16fcd81691ce5e42816a76dc85634b3e54208e677e882580f
-<<<<<<< HEAD
-=======
-EBUILD libxmlb-0.1.12.ebuild 1214 BLAKE2B eabc4de808f3d20f3551be686c1c63f291de4e607bfbfb77d144284573842225be42a33fb89680c23815e0ab09a4948e4e4a11b924457938a21f967e2144c85c SHA512 23602d9fe8f4622a50d737586940609b770691782fcf17a5e1d5efee200fbc214069eb73f3b720a16fcd81691ce5e42816a76dc85634b3e54208e677e882580f
->>>>>>> next
+EBUILD libxmlb-0.1.12.ebuild 1212 BLAKE2B 01342990623c6a80680b5f0d778ed684a56488acd5b9dd66f96796dcec074117078a380e1cf5fa9666ec191974693a7bd12048df8e7099e4ddd6bd8f17a8821d SHA512 f67bb1e4cadc9291960cd995882370e2d85c66a49f65ee81c26d2b7b63427bb435d0a5f28856d46c198ff59bc7d86c2a5dc772833f16aab4108928106bf62bef
 EBUILD libxmlb-0.1.8.ebuild 901 BLAKE2B 62fa0a3128f0f46cf26ca2ad705f18bc528c9646db2021518ad62616b31a1103fec0fe4d71916c96751b630e392b34b7c70d1626d333f06f747f8ca3a3d2150d SHA512 533a364552f01625add7cf7cecfbf839c7aac8e93d6096ab94f2d3ca847cc6ed5cd15cf777c5ec9ce876c2016df33b1bf18733be67e39e05a8fa4596489adb51
 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 51a1b304f84c..203b7a1d9e50 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.12.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit meson python-any-r1
 
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index a4f3da634811..789b184b6075 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -2,5 +2,5 @@ AUX 1.1.32-simplify-python.patch 7487 BLAKE2B 401c691c12cd7aaae4eeef26bbd34ba173
 AUX libxslt-1.1.28-disable-static-modules.patch 1109 BLAKE2B fc4c8c1dc932ff9bdce27064bf68b7bb7c8de94902e26250ba280d771464e9c92bc069f36910ed96269bd1c4270e1f881921d8f7f9101941a4fcdbe9f77380e9 SHA512 d7a091d2b303450d46e94ca53df630ec6cdee8707ffd7d7d2920a56a624f1f8f53d2c1753768b49786c0ce17b6512f8de7740b54bf1c3cdbc5e8a5f3d052b1d1
 DIST libxslt-1.1.33-CVE-2019-11068.patch 3965 BLAKE2B eb3a0741ac9f464e31e8edd276fec4d837c63676a56a446ad42a0e251508bacb0129cbe18783de305336eaa32b189ffc23e95e03cfd5f940d4dee376f1fa0f8c SHA512 9a97c5038809aaf64cb4eb7d67b95acc4b62236d7613a5f753e2a0f4c9e707c22cd07bda2e518d3f36a40b9ed5aa93496b743998c7adadb84ca147e045e35948
 DIST libxslt-1.1.33.tar.gz 3444093 BLAKE2B 3457e5b62328ccbc48fbc5f71bf8a54c195c0059dd18afa38e6916e74c57e72601970446210c7584d5410b956e3bbb8cd4b852ec71e0a13c4441e6de095d86d1 SHA512 ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0
-EBUILD libxslt-1.1.33-r1.ebuild 3467 BLAKE2B d8663a0bf1b2ac475552d0319c05a702ad079c52f29da813ffe3b5815a1a93620731a415db5178e455452fcaa211eb9bfb6b70bee642a306a372a36bfae51b6b SHA512 48e01883b6660fe9e636b4fb128923e9a0d11b910aa922a72fec1b97a3126fb6dbf1986ef07d1a7e883e0202331312cf7b3e3d547693042f90f7205388510844
+EBUILD libxslt-1.1.33-r1.ebuild 3445 BLAKE2B ee72692820bc1dac9aaf4417d8ed7e236206cf62f40ef6948896908e74df6ee265c2537603e0e617fcec93d6af763263731aa7bba0598d882f1379cec82458e1 SHA512 f0eb4bc0ec56b02cb36396fd55cdf2da21c99497a37bbc06dc202c80ee2d94e8ecd972b2249662fb8f434baacb55479e2eb16389282413ea5614cc6c464d22f8
 MISC metadata.xml 347 BLAKE2B d45671e9d4d34c0f4583b4f3e83a8d780327d3d15286c9bb007a7061a4dbf2259ac860cd038adc6c0637265fa0c31430a1ebdec12f8dc133822b7f6067e9479f SHA512 f1679d429313fbd932a45bbd07178f82100e5e79c871327b3b510829137476a06a252351d1e58384db1e0c0d97ffecf1f4e37ef771e9e5f92219ee86d67b596b
diff --git a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
index bab71915297a..32849d76e7c7 100644
--- a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~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="crypt debug examples python static-libs elibc_Darwin"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index de2107829fd8..d16237e79f36 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 1024 BLAKE2B 1fc539a130c6f911bbd943f118b0f94c05e27406f8d45cbf13f8b92ee5747548fe9af3942782b3d66994faddb35ba8684bc8cc432ac90ee22ba6a3887a5d48d6 SHA512 906e0178eca1ec017de3f410039379fe90ab8e214fa9c3feca85b649730ea11c0d5eaf32aef2d138d80d459cbb7d56cfa2dbe47bfbfe74e9d03a09bae6598748
+EBUILD libyaml-0.2.2.ebuild 1002 BLAKE2B 60a0925c00142dfe1f195f6921b698d8d3cbf0f0e944afe298dab5171f89215cf4067cd002246d284ac9349260a091dff5b20fd0c6b02e48206bdb610fbbb277 SHA512 62ffa4402594dd8d78bbd9c2f73cac70df2822da1216cbb96855cee3a06856c469e0bbcf0f7e99434cd160321dd6bcc458e1f9def820ae90dd5ce569b72dd6b1
 MISC metadata.xml 393 BLAKE2B cce8a44acadbabe965899f786d3855d19b49549e42e39b2311a1d125a22789aa28924136767b42c074210fee6dd1b17f337968195aacf3190418979898bafe03 SHA512 ce775cab169e0601244583a8b771dc9f3fa58ccbe6e9bd315d5a778cc92e887b97ee63c7d5bcbc87d0b0483d89444855562aabf0d7f0067f660c173c4aeaad37
diff --git a/dev-libs/libyaml/libyaml-0.2.2.ebuild b/dev-libs/libyaml/libyaml-0.2.2.ebuild
index 8f0ed3ed5081..494a1e0a54c2 100644
--- a/dev-libs/libyaml/libyaml-0.2.2.ebuild
+++ b/dev-libs/libyaml/libyaml-0.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yaml/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 4e2bb7bc820a..e36c6a72615b 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 1901 BLAKE2B f668410b13077d0cc6e36e2b539070fb1172424623082053c71fd0ffc1533545c3aa5abe50030e6b62c0cd7690332eac3198807a94e41eeb9af709ca79166578 SHA512 00692e68879b5c76936f632f32c5ccf2759f8022bf13802bad8c6c3931a2d984ae5b976115f2b11f65fd0bf732b02083dea6c91dc7c69483d16e8fab3879dc3d
-EBUILD libzip-1.5.2-r2.ebuild 2314 BLAKE2B 2edbf69a6ad157e4d5bd9dc37cb3e8e457eaf1dbadbdf229f4b7410097d189b03e1f15542b0fd5f0d343e9ecd763d509addcb5900dd118d6b1bbf2e4e476be48 SHA512 d8843dc493983e5e9bc3c5a86e24bd668805c441e0f31f7b0ebe16c0a6ccaf7218f68b8ff3c01f2ececfd18fac6899050f97963b54b69c1868f1f9ac3889f073
+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
diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild
index 95c3608bf77c..666e8909c36c 100644
--- a/dev-libs/libzip/libzip-1.5.1.ebuild
+++ b/dev-libs/libzip/libzip-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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"
 
 DEPEND="
diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild
index bb6769b3f6ea..5a25f1c0cfb2 100644
--- a/dev-libs/libzip/libzip-1.5.2-r2.ebuild
+++ b/dev-libs/libzip/libzip-1.5.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+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"
 
 DEPEND="
diff --git a/dev-libs/locked_sstream/Manifest b/dev-libs/locked_sstream/Manifest
deleted file mode 100644
index 7021a0573a32..000000000000
--- a/dev-libs/locked_sstream/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST locked_sstream-0.0.5.tar.bz2 98277 BLAKE2B 096c215a5b64c51755505be9e45b5ccfff8a08d6a2d301b1501960a1b7f111b245f91d0200f80332109f7ca7045cbca625f0f3ab1d04bc26191e0c13295e5209 SHA512 5d136c2e1ac5b1eabd07a8048715f47881662ce7a3bfdc2460428f34ab51b0474327b2f28ce6ba2f4ac9774478abb20082af8f954ebb1c4653ba24ca82991c32
-EBUILD locked_sstream-0.0.5.ebuild 580 BLAKE2B 6c276002a9c7780e8b1de21ade53a444248c43f6f53b76ca36642f83db877689ebd5855de1066ef4556cef12bb0c58bf76700f6957c7af24e454e261ecf832ef SHA512 8d5bb06c66afea38bfa34e9031f7197073feef879e9eb4d5d2fd51c3a7a8a000a143391d20ed85a2c25ad299d12afcfdf5defdecf8abec227de37c85e2c2841c
-MISC metadata.xml 478 BLAKE2B 092f58c58c5811f2805205532fa4def4341e9a461532d894b769321a9389ac08d197e8030675ddb7891a2095839b3584ecc90de041d88bb3cadfaf404dce0c14 SHA512 4baad1194dc2e3eb059a466b2974b28178f41c691cf42ed498e1bf8629ee4c03742f59455dfdf2b4e72af4c75220a7f51b1f60272a3b5c18d6a2b29051073376
diff --git a/dev-libs/locked_sstream/locked_sstream-0.0.5.ebuild b/dev-libs/locked_sstream/locked_sstream-0.0.5.ebuild
deleted file mode 100644
index 64efb28d1858..000000000000
--- a/dev-libs/locked_sstream/locked_sstream-0.0.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="tiny C++ library which wraps std::stringstream in a mutex"
-HOMEPAGE="https://carlh.net/locked_sstream"
-SRC_URI="https://carlh.net/downloads/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-util/waf
-	${PYTHON_DEPS}"
-
-src_prepare() {
-	rm -vf ./waf || die
-	WAF_BINARY=${EROOT}usr/bin/waf
-
-	default
-}
diff --git a/dev-libs/locked_sstream/metadata.xml b/dev-libs/locked_sstream/metadata.xml
deleted file mode 100644
index 1d02d02cd9a0..000000000000
--- a/dev-libs/locked_sstream/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-locked_sstream is a tiny C++ library which wraps std::stringstream in a mutex to attempt to fix crashes on OS X when multiple threads simultaneously use different stringstreams. It remains to be seen whether it fixes the problem completely, but it certainly helps.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index 7b95c4a2cc84..043c2e33b9ae 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -3,6 +3,8 @@ AUX 1.0-doc_install_path.patch 1010 BLAKE2B 1f8f1b488e2ee87ad29738d175e2a2cb205c
 AUX 1.0-gcc43.patch 1166 BLAKE2B 2669ceaed022d24e5090a6b96e856ab9612c5818b216949c78732d887e0749818da1d94ae7f9e85d53ec2631e73b3baff2c2cab98ef926d38e0fa6bb0b2c083d SHA512 61ffeddb968a4cc138db1ec854460ad86d864cabc48e4801da8e6e886783d34b112115441090039307d2f7305caee1c0275ad988176adf339170f981fba41262
 AUX log4cpp-1.1-automake-1.13.patch 242 BLAKE2B 17ac8a6529025edf8f46109906ec2bb2087f56ced626f4f3ddf47c000714b85ba558af1680ae3ab29f5aca8799185e25bed7a7c563d6950f1f3159e58f60eba8 SHA512 22abe490efd1a6b500265744abb2f58345fd9f6df881f1d932d7a95e6076397009c0bbd190eb803c0a4800035c0e435493164393674d19c611825235cb59fcc5
 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
 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
new file mode 100644
index 000000000000..3dbdf540b638
--- /dev/null
+++ b/dev-libs/log4cpp/log4cpp-1.1.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations"
+HOMEPAGE="http://log4cpp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~ppc ~s390 ~x86"
+IUSE="doc static-libs test"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/1.0-doc_install_path.patch
+	"${FILESDIR}"/1.0-gcc43.patch
+	"${FILESDIR}"/1.0-asneeded.patch
+	"${FILESDIR}"/${PN}-1.1-cmath-fix.patch
+	"${FILESDIR}"/${PN}-1.1-automake-1.13.patch
+)
+
+S="${WORKDIR}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/log4cpp-config
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	# Build tests conditionally
+	if ! use test; then
+		sed -i -e '/^SUBDIRS/s/ tests//' Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf \
+		--without-idsa \
+		$(use_enable doc doxygen) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/log4shib/Manifest b/dev-libs/log4shib/Manifest
deleted file mode 100644
index 7eb15e64228a..000000000000
--- a/dev-libs/log4shib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST log4shib-1.0.4.tar.gz 487529 BLAKE2B 8ba4dd17e2f35c6566ba4736b5450c41fab1c5506ab6e994136b97ccab4d399281afb32fcf13935c25acd7ba063d2ed6595bab564614ffbb0d944074b68a5bba SHA512 af31bb436393e1a6a2674c0f4804148dea4f4081bb07b78f158f4109157bef4ed40647a3e4da7ec5eef0ed38b6286aee6d8b8a3320572c2b55df2998850d5245
-EBUILD log4shib-1.0.4-r1.ebuild 581 BLAKE2B 51b45b8a80d953e3448bcbac424fd12b272f1e6bb39d1d9110b4ead6f6d1cc3db5b2661e6109f5f312a21e6808b522a7324bb2e667129e2d0d1d2b4787e58277 SHA512 faf1af7b515951198162af69c5aa5c12c908033f313f093416e4346f4a8f6e278aa6592291c9035c8145adc49e100bfe962e8d087a540fd6af65eeb279957e4a
-MISC metadata.xml 396 BLAKE2B d9c3e97cacd4d4d4e9b26f9e78a9a56293ab4569232c63e599c89376723af4b8dd250c9a8642d835d1bc4eb7b53eb5a6b78a80eba1c95fec7f5edc11f8b0efbe SHA512 4232880b47191b4e89f07dc4987e8f24833a0f42a21355f943b03f88487f50f2401e1a51aa7a150ad27659e7ebf9d61509fb232191dc4836d8ee4a9c7345df70
diff --git a/dev-libs/log4shib/log4shib-1.0.4-r1.ebuild b/dev-libs/log4shib/log4shib-1.0.4-r1.ebuild
deleted file mode 100644
index 63ac7a704a4d..000000000000
--- a/dev-libs/log4shib/log4shib-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Internet2 version for OpenSAML of log4cpp logging framework"
-HOMEPAGE="https://wiki.shibboleth.net/confluence/display/OpenSAML/log4shib"
-SRC_URI="https://shibboleth.net/downloads/${PN}/${PV}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="debug doc static-libs"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_configure() {
-	econf --without-idsa \
-		$(use_enable debug) \
-		$(use_enable doc doxygen) \
-		$(use_enable static-libs static)
-}
diff --git a/dev-libs/log4shib/metadata.xml b/dev-libs/log4shib/metadata.xml
deleted file mode 100644
index 67c3230498ed..000000000000
--- a/dev-libs/log4shib/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>log4shib is a library of C++ classes for flexible logging
-		to files, syslog, IDSA and other destinations. It is a forked version
-		of log4cpp especially adapted for the shibboleth framework
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-libs/ltxml/Manifest b/dev-libs/ltxml/Manifest
deleted file mode 100644
index 56dc8e33856f..000000000000
--- a/dev-libs/ltxml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ltxml-1.2.9.tar.gz 304050 BLAKE2B 607fdcdfd056784862d06a7c6d3ea980695cff429f843235a0f5d8ce981996e1e3028cf5d7cf6329f208fabd7021ad15bd3e70efec8500d529d802e30994b18f SHA512 1c0b965b7ed330069a23259bc937546a6a0eb639206a844b6c4d524acfaeb1ec6978467fa8e63c8430ca222cec04386368e7ce625ac829ea5be445e880b86ac9
-EBUILD ltxml-1.2.9.ebuild 844 BLAKE2B d172e5d054d83422149480e832f185ce739a77de77f6f9b9a33e720a8cea1388cb6f0aa88ec6bc22a4353319892fded13d72f1534a59df62376f19591e0c51c4 SHA512 b9acd008767519dbe16f93550eaa195cc19b7025a46e2877d2708c08cbfd822330ecd077aad7911a28581682579d64fa21606ccad61de1056d269e6317af00d7
-MISC metadata.xml 268 BLAKE2B 4ca0567bdd97196b8cb1cc66ed554fbbd99823935bf9b58e52013f678c148193f52dadcd4487e6f38df45790c6bacaa30676c8bd25a7672992ffc9e805e24c19 SHA512 c70be371eec365e07f54ce32fced749e5137228fabd7e087427f1ed6a75f8a1eb0668f4587054ccf1ee29ab12a75fd2f52bd2bef5bf2c20e36db7993b01b1903
diff --git a/dev-libs/ltxml/ltxml-1.2.9.ebuild b/dev-libs/ltxml/ltxml-1.2.9.ebuild
deleted file mode 100644
index c1063f3255cf..000000000000
--- a/dev-libs/ltxml/ltxml-1.2.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Integrated set of XML tools and a developers tool-kit with C API"
-HOMEPAGE="http://www.ltg.ed.ac.uk/software/xml/"
-SRC_URI=ftp://ftp.cogsci.ed.ac.uk/pub/LTXML/${P}.tar.gz
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND=""
-
-PV_MAJ="${PV:0:1}${PV:2:1}"
-
-S=${WORKDIR}/${P}/XML
-
-pkg_setup() {
-	tc-export AR
-}
-
-src_prepare() {
-	sed -e '/CFLAGS=/s:-g::' \
-		-e '/CFLAGS=/s:-O2::' \
-		-i configure || die
-	sed -e 's/ar rv/$(AR) rv/' -i src/Makefile.sub.in || die
-}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	emake -j1 install \
-		datadir="${D}"/usr/$(get_libdir)/${PN}${PV_MAJ} \
-		libdir="${D}"/usr/$(get_libdir) \
-		prefix="${D}"/usr
-}
diff --git a/dev-libs/ltxml/metadata.xml b/dev-libs/ltxml/metadata.xml
deleted file mode 100644
index 3ff7c54672fe..000000000000
--- a/dev-libs/ltxml/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
-Integrated set of XML tools and a developers tool-kit with C API
-</longdescription>
-</pkgmetadata>
diff --git a/dev-libs/luise-bin/Manifest b/dev-libs/luise-bin/Manifest
index 7e45fd170219..68afa59649cb 100644
--- a/dev-libs/luise-bin/Manifest
+++ b/dev-libs/luise-bin/Manifest
@@ -1,3 +1,4 @@
 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
 EBUILD luise-bin-0.1.1.ebuild 956 BLAKE2B 8f6bae020414fb375dc2cb533c95424635c799afa2780569d233cfa51bf94aed84118eaeeff607ec36c84c3dccbc02fdc583622838f541d9ab2b4e86b0bfabe7 SHA512 1a43b77112f275ddfb7ef16b9a8e006e888b38e725e9f742a670440434157207cad18f52c75dc7078b4cb053eda601e178c5a895e8c49e8d7a0814a14288779f
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 1313 BLAKE2B 18110903546bc63acdabc23a02b0acc5e74a6ae34912a8224e6a7c57b6c235278b3469c9620ea8dc55e461c9aafdeb7d7b53961d8324d5c4d716884c5875b219 SHA512 cf23b2da2f293cbb12caffb1dfa4bc228acdc0eb9ebf454319e1c6875619b43aa64bcbcefb1f50330b135268132f05c0e5ae446b948a8a00960bcded46b80448
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
new file mode 100644
index 000000000000..0b998ae7bf27
--- /dev/null
+++ b/dev-libs/luise-bin/luise-bin-0.1.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="examples"
+
+RDEPEND="virtual/libusb:0"
+
+S="${WORKDIR}/${MY_PN}_${PV}"
+
+QA_PREBUILT="
+	usr/lib/libluise.so.${PV}
+	usr/lib64/libluise.so.${PV}
+"
+
+src_install() {
+	insinto /usr/$(get_libdir)
+	newins $(usex amd64 '64' '32')bit/libluise$(usex amd64 '_64' '').so.${PV} libluise.so.${PV}
+	dosym ../../usr/$(get_libdir)/libluise.so.${PV} /usr/$(get_libdir)/libluise.so.${SLOT}
+	dosym ../../usr/$(get_libdir)/libluise.so.${PV} /usr/$(get_libdir)/libluise.so
+
+	insinto /usr/include
+	doins $(usex amd64 '64' '32')bit/luise.h
+
+	dodoc doc/*
+	use examples && dodoc -r samples/luise-test
+}
diff --git a/dev-libs/luise-bin/metadata.xml b/dev-libs/luise-bin/metadata.xml
index 6f49eba8f496..31373f78eb1f 100644
--- a/dev-libs/luise-bin/metadata.xml
+++ b/dev-libs/luise-bin/metadata.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		The libluise.so lib provides a very simple interface for programming
+		the USB LCDs ready. The programmer has three independent screens available,
+		a text screen and two graphic screens. The screens are each 320x240 pixels.
+		By the two separate graphic screens can be very easily superimposed static and
+		represent dynamic data. This is for example when using background images
+		helpful because the environment of the dynamic data / graphics is not constantly recalculated
+		got to. All three screens will appear "on top of each other" on the LCD and will go through
+		previously defined parameters (LUI_LCDmode ()) corresponding to each other bitwise
+		connected. The coordinate origin (x = 0, y = 0) of a screen is always in the
+		left upper corner. In addition, the inversion and the rotation of the screens
+		supports (90 ° steps), while saving the programmer the coordinates conversions stay.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index d6b9c86c2367..0c0daf9e2173 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,3 +1,3 @@
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
-EBUILD lzo-2.10.ebuild 1043 BLAKE2B ae5730afb17e721c57dcfeb635a824c8a6afb4ad48b7026bfea8b4cde0330b3e568e105d88b7584606d4bba5e72f597f624a7b39c84eb98639b712a85cc38c92 SHA512 9bbc011168b42521e4a9c9849b63dfcf94e62594d52755c1ddd0b3c54263320e642081592021846ad7e42416ceb20a474021cd56510898f9c9514794fc374717
+EBUILD lzo-2.10.ebuild 1021 BLAKE2B 5ecc16a4bb8395fb31494379100ec766824b00c7d5fbda69a6b16cadf88662e2905267825448573c3d0b4e2534941851845f2439814ca03d221ded95be57ec6f SHA512 c034df9905a5c8427a9f10ecb8681d0e7149116ab890569b3645282173b7e100567ab60daa950d18fef9f27cc16f23307ee57f357c0d85456d8d87636c16496e
 MISC metadata.xml 331 BLAKE2B 26723a66d81589b011d73477fb7166710855286818c34d5ea2ba3bce10e0902c7498915b559bc8aec13c676a43255efc70b1d578367cd3a53deb31702ef13727 SHA512 b58af857c0305f2e7266fb0a33439f4908c46b5e30e968785936b5fde495dc1e9852264ad862ab1f909ad8eb5c086b7efe96315771140f3677a81b2136f0f21b
diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild
index 34b3f895ccc1..16a90667e881 100644
--- a/dev-libs/lzo/lzo-2.10.ebuild
+++ b/dev-libs/lzo/lzo-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples static-libs"
 
 multilib_src_configure() {
diff --git a/dev-libs/mapm/Manifest b/dev-libs/mapm/Manifest
deleted file mode 100644
index 75c340941bd8..000000000000
--- a/dev-libs/mapm/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 4.9.5-missing_include.patch 390 BLAKE2B 4ebdf5e0111f8e2db71e371d8ffb1c3d5cfa56e533707943feeec4757d7873023faf6977d612c42fbdef236d50bcf77ee5d2d4d519638673f09bfb42b3b67408 SHA512 e9e5b0af9021fa90c397b07adcbcdd2c437d656cf48036a31c63c4fad2a6770efda47891af4defd86cc506c438b9beaacfdf97a344a57997728b0f2f2b1627ad
-DIST mapm-4.9.5.tar.gz 162943 BLAKE2B db0ba331cb3eb526c13de24e6aeafef9ea5f4391b0450386a263507e164ed15616c747e6237b886a60bc186550f3c7350776a5c699952b20121c2ba766f03d28 SHA512 1d0b489395fdfcb0c23ce2d242c63de739c45e33827411c976f6e7c48b18fc2afe599270139f40108b1f30573134d9d5950f3316613a45f567f53cfd59f4dc3e
-EBUILD mapm-4.9.5-r1.ebuild 1051 BLAKE2B f6349b48412a28f9b9ebd1d00dc271fee0ea720170968d8d377e383fffc3f496975fb904a032f920d99d991c4936b512c19a7e4f67ac6810138a5c6155e629f8 SHA512 7f5f4a4a3404ea6421f40a121f3baebdebd48b00cb10e83e38d340231f877485ab667d3e2cd4a7c397abc2421aaeb120820b507afc6eb696a9c3e561b76dd838
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/mapm/files/4.9.5-missing_include.patch b/dev-libs/mapm/files/4.9.5-missing_include.patch
deleted file mode 100644
index e03b122ea0dc..000000000000
--- a/dev-libs/mapm/files/4.9.5-missing_include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mapm_4.9.5.orig/m_apm.h mapm_4.9.5/m_apm.h
---- mapm_4.9.5.orig/m_apm.h	2009-03-02 11:55:18.914770612 +0100
-+++ mapm_4.9.5/m_apm.h	2009-03-02 11:56:19.585923499 +0100
-@@ -159,6 +159,8 @@
- #ifndef M__APM__INCLUDED
- #define M__APM__INCLUDED
- 
-+#include <stdlib.h>
-+
- #ifdef __cplusplus
- /* Comment this line out if you've compiled the library as C++. */
- #define APM_CONVERT_FROM_C
diff --git a/dev-libs/mapm/mapm-4.9.5-r1.ebuild b/dev-libs/mapm/mapm-4.9.5-r1.ebuild
deleted file mode 100644
index cc8171276d8a..000000000000
--- a/dev-libs/mapm/mapm-4.9.5-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Mike's Arbitrary Precision Math Library"
-HOMEPAGE="http://www.tc.umn.edu/~ringx004/mapm-main.html"
-SRC_URI="http://www.tc.umn.edu/~ringx004/${P}.tar.gz"
-
-LICENSE="mapm-4.9.5"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}_${PV}"
-
-PATCHES=( "${FILESDIR}/${PV}-missing_include.patch" )
-
-src_compile() {
-	$(tc-getCC) -c -Wall ${CFLAGS} -fPIC map*.c || die "compiling sources failed"
-	$(tc-getCC) -shared ${LDFLAGS} -Wl,--soname=libmapm.so -o libmapm.so.0 map*.o || die "linking sources failed"
-}
-
-src_install() {
-	dolib.so libmapm.so.0
-	dosym libmapm.so.0 /usr/$(get_libdir)/libmapm.so
-
-	insinto /usr/include
-	doins m_apm.h
-
-	insinto /usr/share/doc/${PF}/examples
-	doins calc.c validate.c primenum.c cpp_demo.cpp
-
-	cd DOCS || die
-	dodoc README article.pdf algorithms.used commentary.txt \
-		cpp_function.ref function.ref history.txt struct.ref
-
-}
diff --git a/dev-libs/mapm/metadata.xml b/dev-libs/mapm/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-libs/mapm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index be8b329d27be..56cc948bfa27 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -1,4 +1,8 @@
 AUX marisa-0.2.4-python.patch 683 BLAKE2B 5d26607877b3f4614a558d085de11360783d2a448749e7a7fed2ac805e4b6dc5d4b89c29c37fe70a34cc4745789b9ff93b4f398860d8014303a4290bbd1196c5 SHA512 fa718a385cfef196833f5a9aa23c31839505a0101df3d25a73616942845668891f818213b89a36689ec93e678289128add1f6450e15fb995233621faaa76d700
+AUX marisa-0.2.5-cpu_features_check.patch 4645 BLAKE2B 3ccd0b23d881d56d2341e1ed87f39acb0324440fd019b94fb7b846cedad756a9bd5c76fcbafac08ea7be294fb58334dfeda02d26ba575beb18df410dc921ca5d SHA512 5098491cddcd53451264d127373b29bed7e2260887494b1f562b94f1ab5d71962ee9fdc5d811d9ea0062c11c14d5cd4a81428da9f04d92ef2efe3a3810e844b2
 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-9999.ebuild 2139 BLAKE2B 08fe3511b7340f07991121f9d84e36bd69a0c6a479ecfdd5f4c044174b501fbe1ff6f44226c33aa7ac20fb2b554be3e038a3d2893476e81cb810cec7f61e2c7d SHA512 3306d92fb8d241f09ad57fd1a8f7004ea85be1481d3f808f07821ce295c42566fceb732e358bc49797617767bf06238fc349f48aa0fb0be3f6ce0570b85d3285
 MISC metadata.xml 317 BLAKE2B 16fd28ba01ffdf67af29ea7f6b41be190ecff6ab88706b0cb04b6e9dee5a623087652e666af02cff1c3ed3bd4b42f252adf5fce1b08c2eb9a998e8c112dba922 SHA512 0e782fba322f87cfc0f180f812d0e33630c4295df1f434d497aba1a7f9d922e9674a3c23a821211cbe11d419eee70c25dbabb7508abc7bd56267e9648a1e721c
diff --git a/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch b/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch
new file mode 100644
index 000000000000..dba677221a19
--- /dev/null
+++ b/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch
@@ -0,0 +1,157 @@
+https://github.com/s-yata/marisa-trie/commit/d93f1b67f3aaa2d56bf20089c0ce9ef216da6cb7
+
+--- /configure.ac
++++ /configure.ac
+@@ -13,6 +13,56 @@
+ 
+ AC_CONFIG_MACRO_DIR([m4])
+ 
++# Macros for SSE availability check.
++AC_DEFUN([MARISA_ENABLE_SSE2],
++          [AC_EGREP_CPP([yes], [
++#ifdef __SSE2__
++yes
++#endif
++          ], [enable_sse2="yes"], [enable_sse2="no"])])
++AC_DEFUN([MARISA_ENABLE_SSE3],
++          [AC_EGREP_CPP([yes], [
++#ifdef __SSE3__
++yes
++#endif
++          ], [enable_sse3="yes"], [enable_sse3="no"])])
++AC_DEFUN([MARISA_ENABLE_SSSE3],
++         [AC_EGREP_CPP([yes], [
++#ifdef __SSSE3__
++yes
++#endif
++         ], [enable_ssse3="yes"], [enable_ssse3="no"])])
++AC_DEFUN([MARISA_ENABLE_SSE4_1],
++         [AC_EGREP_CPP([yes], [
++#ifdef __SSE4_1__
++yes
++#endif
++         ], [enable_sse4_1="yes"], [enable_sse4_1="no"])])
++AC_DEFUN([MARISA_ENABLE_SSE4_2],
++         [AC_EGREP_CPP([yes], [
++#ifdef __SSE4_2__
++yes
++#endif
++         ], [enable_sse4_2="yes"], [enable_sse4_2="no"])])
++AC_DEFUN([MARISA_ENABLE_SSE4],
++         [AC_EGREP_CPP([yes], [
++#if defined(__POPCNT__) && defined(__SSE4_2__)
++yes
++#endif
++         ], [enable_sse4="yes"], [enable_sse4="no"])])
++AC_DEFUN([MARISA_ENABLE_SSE4A],
++         [AC_EGREP_CPP([yes], [
++#ifdef __SSE4A__
++yes
++#endif
++         ], [enable_sse4a="yes"], [enable_sse4a="no"])])
++AC_DEFUN([MARISA_ENABLE_POPCNT],
++         [AC_EGREP_CPP([yes], [
++#ifdef __POPCNT__
++yes
++#endif
++         ], [enable_popcnt="yes"], [enable_popcnt="no"])])
++
+ # Checks for SSE availability.
+ AC_MSG_CHECKING([whether to use SSE2])
+ AC_ARG_ENABLE([sse2],
+@@ -20,9 +70,7 @@
+                               [use SSE2 [default=no]])],
+               [],
+               [enable_sse2="no"])
+-AS_IF([test "x${enable_sse2}" != "xno"], [
+-  enable_sse2="yes"
+-])
++AS_IF([test "x${enable_sse2}" != "xno"], [MARISA_ENABLE_SSE2])
+ AC_MSG_RESULT([${enable_sse2}])
+ 
+ AC_MSG_CHECKING([whether to use SSE3])
+@@ -31,9 +79,7 @@
+                               [use SSE3 [default=no]])],
+               [],
+               [enable_sse3="no"])
+-AS_IF([test "x${enable_sse3}" != "xno"], [
+-  enable_sse3="yes"
+-])
++AS_IF([test "x${enable_sse3}" != "xno"], [MARISA_ENABLE_SSE3])
+ AC_MSG_RESULT([${enable_sse3}])
+ 
+ AC_MSG_CHECKING([whether to use SSSE3])
+@@ -42,9 +88,7 @@
+                               [use SSSE3 [default=no]])],
+               [],
+               [enable_ssse3="no"])
+-AS_IF([test "x${enable_ssse3}" != "xno"], [
+-  enable_ssse3="yes"
+-])
++AS_IF([test "x${enable_ssse3}" != "xno"], [MARISA_ENABLE_SSSE3])
+ AC_MSG_RESULT([${enable_ssse3}])
+ 
+ AC_MSG_CHECKING([whether to use SSE4.1])
+@@ -53,9 +97,7 @@
+                               [use SSE4.1 [default=no]])],
+               [],
+               [enable_sse4_1="no"])
+-AS_IF([test "x${enable_sse4_1}" != "xno"], [
+-  enable_sse4_1="yes"
+-])
++AS_IF([test "x${enable_sse4_1}" != "xno"], [MARISA_ENABLE_SSE4_1])
+ AC_MSG_RESULT([${enable_sse4_1}])
+ 
+ AC_MSG_CHECKING([whether to use SSE4.2])
+@@ -64,9 +106,7 @@
+                               [use SSE4.2 [default=no]])],
+               [],
+               [enable_sse4_2="no"])
+-AS_IF([test "x${enable_sse4_2}" != "xno"], [
+-  enable_sse4_2="yes"
+-])
++AS_IF([test "x${enable_sse4_2}" != "xno"], [MARISA_ENABLE_SSE4_2])
+ AC_MSG_RESULT([${enable_sse4_2}])
+ 
+ AC_MSG_CHECKING([whether to use SSE4])
+@@ -75,9 +115,7 @@
+                               [use SSE4 [default=no]])],
+               [],
+               [enable_sse4="no"])
+-AS_IF([test "x${enable_sse4}" != "xno"], [
+-  enable_sse4="yes"
+-])
++AS_IF([test "x${enable_sse4}" != "xno"], [MARISA_ENABLE_SSE4])
+ AC_MSG_RESULT([${enable_sse4}])
+ 
+ AC_MSG_CHECKING([whether to use SSE4a])
+@@ -86,9 +124,7 @@
+                               [use SSE4a [default=no]])],
+               [],
+               [enable_sse4a="no"])
+-AS_IF([test "x${enable_sse4a}" != "xno"], [
+-  enable_sse4a="yes"
+-])
++AS_IF([test "x${enable_sse4a}" != "xno"], [MARISA_ENABLE_SSE4A])
+ AC_MSG_RESULT([${enable_sse4a}])
+ 
+ AC_MSG_CHECKING([whether to use popcnt])
+@@ -97,9 +133,7 @@
+                               [use POPCNT [default=no]])],
+               [],
+               [enable_popcnt="no"])
+-AS_IF([test "x${enable_popcnt}" != "xno"], [
+-  enable_popcnt="yes"
+-])
++AS_IF([test "x${enable_popcnt}" != "xno"], [MARISA_ENABLE_POPCNT])
+ AC_MSG_RESULT([${enable_popcnt}])
+ 
+ AS_IF([test "x${enable_popcnt}" != "xno"], [
+@@ -170,6 +204,7 @@
+ AS_ECHO(["  LDFLAGS:   ${LDFLAGS}"])
+ AS_ECHO(["  PREFIX:    ${prefix}"])
+ AS_ECHO([])
++AS_ECHO(["  NATIVE:    ${enable_native_code}"])
+ AS_ECHO(["  SSE2:      ${enable_sse2}"])
+ AS_ECHO(["  SSE3:      ${enable_sse3}"])
+ AS_ECHO(["  SSSE3:     ${enable_ssse3}"])
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
new file mode 100644
index 000000000000..90b71175c866
--- /dev/null
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2014-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7})
+DISTUTILS_OPTIONAL="1"
+
+inherit autotools distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/s-yata/marisa-trie"
+fi
+
+DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
+HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="|| ( BSD-2 LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="python? (
+		${PYTHON_DEPS}
+		dev-lang/swig
+	)"
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/marisa-trie-${PV}"
+fi
+
+PATCHES=(
+	"${FILESDIR}/${P}-cpu_features_check.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+
+	sed -e "s:^\([[:space:]]*\)libraries=:\1include_dirs=[\"../../include\"],\n\1library_dirs=[\"../../lib/marisa/.libs\"],\n&:" -i bindings/python/setup.py || die
+
+	if use python; then
+		pushd bindings/python > /dev/null || die
+		distutils-r1_src_prepare
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	local -x CPPFLAGS="${CPPFLAGS} ${CXXFLAGS}"
+
+	local options=(
+		# Preprocessor macros dependent on CPPFLAGS are checked.
+		--enable-sse2
+		--enable-sse3
+		--enable-ssse3
+		--enable-sse4.1
+		--enable-sse4.2
+		--enable-sse4
+		--enable-sse4a
+		--enable-popcnt
+		$(use_enable static-libs static)
+	)
+
+	econf "${options[@]}"
+
+	if use python; then
+		pushd bindings/python > /dev/null || die
+		distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		emake -C bindings swig-python
+		pushd bindings/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -type f -delete || die
+
+	(
+		docinto html
+		dodoc docs/*
+	)
+
+	if use python; then
+		pushd bindings/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+}
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
new file mode 100644
index 000000000000..6942f85b198b
--- /dev/null
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2014-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7})
+DISTUTILS_OPTIONAL="1"
+
+inherit autotools distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/s-yata/marisa-trie"
+fi
+
+DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
+HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="|| ( BSD-2 LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS=""
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="python? (
+		${PYTHON_DEPS}
+		dev-lang/swig
+	)"
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/marisa-trie-${PV}"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+
+	sed -e "s:^\([[:space:]]*\)libraries=:\1include_dirs=[\"../../include\"],\n\1library_dirs=[\"../../lib/marisa/.libs\"],\n&:" -i bindings/python/setup.py || die
+
+	if use python; then
+		pushd bindings/python > /dev/null || die
+		distutils-r1_src_prepare
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	local -x CPPFLAGS="${CPPFLAGS} ${CXXFLAGS}"
+
+	local options=(
+		# Preprocessor macros dependent on CPPFLAGS are checked.
+		--enable-sse2
+		--enable-sse3
+		--enable-ssse3
+		--enable-sse4.1
+		--enable-sse4.2
+		--enable-sse4
+		--enable-sse4a
+		--enable-popcnt
+		$(use_enable static-libs static)
+	)
+
+	econf "${options[@]}"
+
+	if use python; then
+		pushd bindings/python > /dev/null || die
+		distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		emake -C bindings swig-python
+		pushd bindings/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -type f -delete || die
+
+	(
+		docinto html
+		dodoc docs/*
+	)
+
+	if use python; then
+		pushd bindings/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+}
diff --git a/dev-libs/mdsplib/Manifest b/dev-libs/mdsplib/Manifest
deleted file mode 100644
index d81736e49b5e..000000000000
--- a/dev-libs/mdsplib/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mdsplib-0.11-gentoo.patch 1696 BLAKE2B ffcac6d7bd2b7500b93aed0566ae198515dbe7d1cc8544ba8ee04b861be53ca938f328ffb68bc58891e16079c53b1247855a77416b43d59c5243c4fb4d6c6fc6 SHA512 fe38e841473c82eababd0e40a7cf226f5545b1da0c957e50c737aaa8303a4aff6b5baf52b10dda5711c4313ce4712e9eee60e0b8d2a298fcf8c45be87f83ec46
-DIST mdsplib-0.11.tar.gz 70435 BLAKE2B 8a2de901d8f386a989eedb95f85171e93d51e9c87c45b0fb6bfcb76bb3d6394a0a2453cdbbb6cd2b87e64a16eb18201107f7b61fb0747a1c9e53df77f0479c04 SHA512 5baf7c23884ab21d2111a05c97a988ff82b003f0b3243ce5fabe5a9757c149a007e7ec6e0baf80de4fa75630c640b2411598a0b06848c7b96fd6ef070e76a687
-EBUILD mdsplib-0.11.ebuild 557 BLAKE2B d59bf5fba6582c20ed1161c35030b4727e4a6e0519b2acbc66f68177ce0c473c58646d6560cc9dcc5c7faeb71d71ac6c4260a3e19571019fcd6640fc048b11ff SHA512 dbf14ed89a15d4f93042e9370c3ecdc12d40087a74f7444127bbb2cb7e1592639394108fdb12b271d78aab5519e3783122e24b1721d629c05897c9c4f5af51f8
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/mdsplib/files/mdsplib-0.11-gentoo.patch b/dev-libs/mdsplib/files/mdsplib-0.11-gentoo.patch
deleted file mode 100644
index 92d96147bb72..000000000000
--- a/dev-libs/mdsplib/files/mdsplib-0.11-gentoo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ur mdsplib-0.11.orig/Makefile mdsplib-0.11/Makefile
---- mdsplib-0.11.orig/Makefile	2003-12-10 21:56:23.000000000 +0200
-+++ mdsplib-0.11/Makefile	2009-08-06 13:33:03.000000000 +0300
-@@ -1,5 +1,6 @@
--CC = gcc
--CFLAGS = -O3
-+AR ?= ar
-+CC ?= gcc
-+RANLIB ?= ranlib
- LIBS = 
- 
- library: libmetar.a
-@@ -7,11 +8,11 @@
- all: dmetar library
- 
- libmetar.a: src/antoi.o src/charcmp.o src/dcdmetar.o src/dcdmtrmk.o src/fracpart.o src/prtdmetr.o src/stspack2.o src/stspack3.o
--	ar ruv libmetar.a src/antoi.o src/charcmp.o src/dcdmetar.o src/dcdmtrmk.o src/fracpart.o src/prtdmetr.o src/stspack2.o src/stspack3.o
--	ranlib libmetar.a
-+	$(AR) ruv libmetar.a src/antoi.o src/charcmp.o src/dcdmetar.o src/dcdmtrmk.o src/fracpart.o src/prtdmetr.o src/stspack2.o src/stspack3.o
-+	$(RANLIB) libmetar.a
- 
- dmetar: src/drvmetar.o libmetar.a
--	$(CC) $(CFLAGS) -o dmetar src/drvmetar.o libmetar.a $(LIBS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o dmetar src/drvmetar.o libmetar.a $(LIBS)
- 
- src/antoi.o: src/antoi.c src/local.h
- 	$(CC) $(CFLAGS) -c src/antoi.c -o src/antoi.o
-@@ -48,5 +49,5 @@
- 	chmod 0644 /usr/local/include/metar.h
- 	cp libmetar.a /usr/local/lib/
- 	chmod 0644 /usr/local/lib/libmetar.a
--	ranlib /usr/local/lib/libmetar.a
-+	$(RANLIB) /usr/local/lib/libmetar.a
- 
-diff -ur mdsplib-0.11.orig/src/local.h mdsplib-0.11/src/local.h
---- mdsplib-0.11.orig/src/local.h	2003-12-10 23:30:56.000000000 +0200
-+++ mdsplib-0.11/src/local.h	2009-08-06 13:27:03.000000000 +0300
-@@ -1175,7 +1175,7 @@
- char *strupr(char *);
- char *strlwr(char *);
- /* char *strdup(char *); */
--char *strndup(char *, int);
-+/* char *strndup(char *, int); */
- int strcmpi(char *, char *);
-  
- /* void *memccpy(void *, void *, int, unsigned); */
diff --git a/dev-libs/mdsplib/mdsplib-0.11.ebuild b/dev-libs/mdsplib/mdsplib-0.11.ebuild
deleted file mode 100644
index 47af62190af3..000000000000
--- a/dev-libs/mdsplib/mdsplib-0.11.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="METAR Decoder Software Package Library"
-HOMEPAGE="http://limulus.net/mdsplib/"
-SRC_URI="http://limulus.net/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
-	tc-export AR CC RANLIB
-}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	dobin dmetar
-	doheader metar.h
-	dolib.a libmetar.a
-	einstalldocs
-}
diff --git a/dev-libs/mdsplib/metadata.xml b/dev-libs/mdsplib/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-libs/mdsplib/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-libs/mm/Manifest b/dev-libs/mm/Manifest
index e91900341d7f..7c6ffd756733 100644
--- a/dev-libs/mm/Manifest
+++ b/dev-libs/mm/Manifest
@@ -1,3 +1,3 @@
 DIST mm-1.4.2.tar.gz 344903 BLAKE2B 5fec1eeea52e9ff77f94081f4e77dfd627c356cc94591169fa89f5564882e2e3a4712c90c3f1e133024ef0adf095da8063916145159e5023c4191748bd622c6c SHA512 dcc12676453cfaf19560f99fa97e905428051d72b46aeaf574300f51e64f689caa70c81b619b8794ad604e8a2efe6bde1e486a2e315263b5694d6eab1cacc182
-EBUILD mm-1.4.2-r2.ebuild 701 BLAKE2B b2a46936714bc79e40c46cf11b101da99fbab3b1a54e7b37d7ad88576e9e0825627b50ff9f61e446cf92a0ebca00a0f4960c84f0e6f782b9a5560d83f42934b1 SHA512 d5bc3051c69a6ecea8b76fabc1475be5988584535b69420e1766f65e0d429ca259b2865d35ad99f19937b7d5f0166c030b415053833bb862cf014f82a8b1e8bd
+EBUILD mm-1.4.2-r2.ebuild 679 BLAKE2B a2df0c623b5225e44d3d0f1d7d55f7b52097e2b34a26d1ddb17818aae8004a1b2fd1ad743703ec61f1bd857fe4a29fffd2df6d07d4cd0d4c1e72d571964d2656 SHA512 13df26b5cc8590325796c12e9d68e87712ee9579d3e5614d8ea44c65296b19150a3097b75648b22c5e1a0090651cb759d3022da15df106e1b638a250343fdd6b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/mm/mm-1.4.2-r2.ebuild b/dev-libs/mm/mm-1.4.2-r2.ebuild
index 51290880bc5d..498cfd3bdbed 100644
--- a/dev-libs/mm/mm-1.4.2-r2.ebuild
+++ b/dev-libs/mm/mm-1.4.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/mm/${P}.tar.gz"
 
 LICENSE="mm"
 SLOT="1.2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index c09bcc0be448..1d8195de8109 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -2,7 +2,7 @@ AUX mpc-1.0.3-mpfr-4.0.0.patch 3748 BLAKE2B 906ee3ff90ab1d9aad58caae7b1185d99d6e
 AUX mpc-1.0.3-no-ulp.patch 904 BLAKE2B 33f96aa9ce60823ac9b84a604ac84c87fd0d4d8eec9b08880f70920aad24775a00cfadf0e76f08274d829f3a7ef03f22d8f440f0207ccaa7f98f1c4911d0beb1 SHA512 22bf9f04ba745d66469a23366d405b7b32bd7454e2240d01995b0dd04e156f23fa1bd842b520799af899ff96650bd050f4675d7a9cba6ebd68ba8fb5d658a0a6
 DIST mpc-1.0.3.tar.gz 669925 BLAKE2B 4b5a1db5220b58070f9356041f44f021c2c9ec46aa4303d0a31e809d649897bc3547e9b06271dae4e80be569ee67e2a84f86b662e05dac0ca36ff87e95fcbd62 SHA512 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43
 DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628
-EBUILD mpc-1.0.3-r2.ebuild 1067 BLAKE2B 2fdd0a44aa368644afc96a6b02c256d49aae0ee4afafef45cbf764d482d15a91025ae4ae800e2e7984da4bbe6ba99638863673db01e6f587ae774d6a8e90ee6d SHA512 410bb670bda1d94ec05e1b42ff7fb9439834d7648f7b722bb5406c44fbfa055c0e0aea5dee9e08384ed22f7f93b6004e93fceec0bc84de8f2daeeb6685896c69
-EBUILD mpc-1.0.3.ebuild 977 BLAKE2B eba89a4ce40a919c7c4883da8ef089f12de6cadf96776a3b40d81480e6638e3bab8868cf88bdf291cf40e1d75c723b0e67d80fde9d4d1325693ac0d3ee30445f SHA512 885fd40a8d1402e173a3f6f23b2e6694a8cb6aae3e1ca3c9287e1f3f3b7de5e2e546fec2521c131ad475e09bc9b51ed48deaea6e00096117125938eaf1f28ece
-EBUILD mpc-1.1.0-r1.ebuild 946 BLAKE2B fe43e02623aa411dd03245916882a916f6695aeea0f1025707fcece8b0dc89f67e8016ae6382bf6103104cb9d7ec46a27badd5fccea146ea4559e2dfb0b330e4 SHA512 bf7dd2d78b6950875cbd95fffed0e868d7c1739a0884b6d05e1200318b58efd7041615a76651f8119839d0dc5121f8f3630c60286212cee7fa6b0679c837d877
+EBUILD mpc-1.0.3-r2.ebuild 1045 BLAKE2B d633849f8800b5ceafa524fcb2f01dbaae5eb04898667f902303af6bd439da3f7acad1f95946e083e90b41bdf4c1d3095d9ad76ecd748a8fb9035fe7c6f8cd19 SHA512 2e3af6ce3b2c0cd2dc670bb689087ffa84eacb31b96f373e8e621b6a628e4fffa3ca9386e81c93b07c19343e9cb7f9806198ba7ad7265a3dae3f7c6cef10b7ca
+EBUILD mpc-1.0.3.ebuild 955 BLAKE2B b81c6d279157a3a47c6e78cf40b625d29226b79ef587c22cf1e25095bd1605823c94207cf75b8a0271dc988bd8bac1b6ebb2915080171322e0ba50f4b55aeead SHA512 aed001c22031eca558034bc9deac4d235c9aba28e9c9187a75b71bfcf91f65d7be18d722b29abebb781df72ef8442febe7e40ed5241c1ed3c768d2bf9d6e5509
+EBUILD mpc-1.1.0-r1.ebuild 924 BLAKE2B b4ff107bb85b74263e1ea0cf624d11c526171e7b0b77108215a1f034f5089204a069b8ffe60192b7952fb1114eb9335086e0fcb8746fb642a71c55f2744be734 SHA512 0fc6decdecb4b0f815f17baba4a3815859bc23db81e51cfc712252ce8bf704a7956227823ed2f6b6c45faa35f4fd9ceccf1fabca0a450ddd5872afaa3c6e4704
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.0.3-r2.ebuild b/dev-libs/mpc/mpc-1.0.3-r2.ebuild
index f8291888155b..1f14c51bb17f 100644
--- a/dev-libs/mpc/mpc-1.0.3-r2.ebuild
+++ b/dev-libs/mpc/mpc-1.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-4.3.2:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpc/mpc-1.0.3.ebuild b/dev-libs/mpc/mpc-1.0.3.ebuild
index 584f40e71e93..846b31d3ca10 100644
--- a/dev-libs/mpc/mpc-1.0.3.ebuild
+++ b/dev-libs/mpc/mpc-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-4.3.2[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpc/mpc-1.1.0-r1.ebuild b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
index 1db10b16274d..70d275e32d3e 100644
--- a/dev-libs/mpc/mpc-1.1.0-r1.ebuild
+++ b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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="static-libs"
 
 DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index fa36e2ae3f97..2f6b49ade5a4 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -10,12 +10,12 @@ DIST mpfr-3.1.6.tar.xz 1133672 BLAKE2B ab8b87be9d29e9ae5807976f72d65e16cd3e5b4c2
 DIST mpfr-4.0.0.tar.xz 1406244 BLAKE2B 2d1e356ac1f7119aa8896c438e7e30c4b316780d76fa2690e50482005e9ff5d6b5cd368d4c9a524df66ea3e7f2942c627329fa15be83402209c6e249cd1abd28 SHA512 9c9c4535f33fffd2126d1c290e5eeda7cd2804219244643f09c9a2d2acfa3d410d2cb1e4a7bb77cd86cffc2fac59c7f5d32c9910317cac37dbca474ab6d63808
 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 1497 BLAKE2B 7161fc539fd4de18e4c66a057bbddf9633e45a964fa628051c800a265140fdbea1652c3e8fa8ef1e9f156dcab58d8283761218382c5af7056dcbef2b63405342 SHA512 6634ef915f69bbd2ee2f27c01a4aef7f6c8e3258adc270fca97e55c8f2155fd66b6ab827c2152db1d9ce93aba7a96b884a05220dac3ae92c02b869efb8e9f6a4
-EBUILD mpfr-3.1.3_p4.ebuild 1812 BLAKE2B 488a0b5543cff2058fb64cb7164916caf22a81b0e931498d1f54d567c182fa846dbce4a838316c973d99c2715f9a5ed279bca94d9fe5cc189791fb162c01121c SHA512 95d57a2c819ba28565e00cbc9e8075f506e75bf685b8a8b4cbecb56abee8525b8b3adb070d1470dff6f7ee69b8547e77b312e64f6400c41120a4830ef92e6c50
-EBUILD mpfr-3.1.4.ebuild 1634 BLAKE2B 2c3ec81dbec054f865b81a5e16cafb0c4464ff6eca4fe034d328554087594112d90d64c76149c293a1d210e8ce0da7e39f55018512b8154bb5dbcc44271c411c SHA512 86aefae35f12481e03f5b45831e2c0ebc64060d9dfa7253b3ce2fffbdb08429c53c3fc5f0ed334b9fcae2fed6b74170a612494943db5423b9acf24c34b8d0f2f
-EBUILD mpfr-3.1.5_p2.ebuild 1694 BLAKE2B 5fc3003fdde93f5d358af91b8e70483ad969f808ff39c43fd7e76e40c69baec9c578d1eb76b47c0860a119b29e9a06d51e013f07382e87380f2159d79e1ff7f9 SHA512 a851d8c13612123defdbdde43041b3d477e0cee21086aa82e18252f2811011c3f6af0d47078c1cf9fd3d056977f42426ddf60b4f062607599a7bbc8ca95b20f7
-EBUILD mpfr-3.1.6.ebuild 1613 BLAKE2B 395a98c009ac37dd9a66d1f5d6dceed463571235164946e2c6dd5dc15dd25e967f0c4832f5743a3a22e563a292b5dd4469e0d7ee3f5a4de10fcd84c0746dee00 SHA512 c39187e26caddce22e50724f2045d4e170f640d62085a6d19efcbecd77bd55a6632bb2076c174ee1ed41770a335921c3ced75b6737a9234feef6527b21dc2f4b
-EBUILD mpfr-4.0.0-r1.ebuild 1720 BLAKE2B 33b420b5be1b09b18a5f3f99bc574b84d81cae9979d26e6f937056a206e8b817c6f995cc01318bf443bda82967e4f0f2d3703806bdcd7e9539c50fffa58d1270 SHA512 7d8c0fd531d8de2a533282171b3183b6f9d9e518fb620ff5bd1ad7ff94cb8b8a897a780b2fb680244e6b963c704d109ba92aa718904c5af8cef6c0ef0e966dd9
-EBUILD mpfr-4.0.1.ebuild 1720 BLAKE2B 33b420b5be1b09b18a5f3f99bc574b84d81cae9979d26e6f937056a206e8b817c6f995cc01318bf443bda82967e4f0f2d3703806bdcd7e9539c50fffa58d1270 SHA512 7d8c0fd531d8de2a533282171b3183b6f9d9e518fb620ff5bd1ad7ff94cb8b8a897a780b2fb680244e6b963c704d109ba92aa718904c5af8cef6c0ef0e966dd9
-EBUILD mpfr-4.0.2.ebuild 1724 BLAKE2B 7cb848cc9f3806f4b533889d66b77940ab9e56f8561db545d9816245a6b82bbee0c595f963c9b8a091fd2e61c31ec5bfe100f7599f521d1960ab96245255beba SHA512 780701203f7e18da104cc6974e77843e4fc099d2d2de92b86dfe06aac864a8350505dd58de3407a2c58389dd08d1ea2c1359274c4225664b4228f3defbd9bf52
+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.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
+EBUILD mpfr-4.0.1.ebuild 1698 BLAKE2B 6357828969ceaa9854aa801fc52cb02a273d8f25cf20bc082fc3e4226b8eacaf8a6f28cafd6db7c58f6e1d597d7b179a95f6052f19ee0ad89351c87f7a01b8bc SHA512 e68e3ca70ab845ea8762be1ba670d533ca714963f8ddf03af07575a7ad0603810e9b22871413c17d6828068e07f06bbec6ca8aeeb2c161d3cc32dac9e346cbc8
+EBUILD mpfr-4.0.2.ebuild 1702 BLAKE2B d1660a75c25c2c0461fbf9ffad12b9b09bedfea87fb40f141bb8aedb3a799a1a8d69584e36bcc7a0beca25e031a7da05596bde00c485789b83cc14e19647ba62 SHA512 471bdefc062a0633915b9ea3970bf409de4dcaf85bc8c27a5949793101d30bc33b29ccab1abf4c00ecae9930d3d6e47c88da89d82761403a703ba47aad81d6a4
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild b/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild
index 7967195aea45..fcb579b56b0b 100644
--- a/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.bz2
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2:0[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
index e19a31cc851b..4c65b8c578d1 100644
--- a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-3.1.4.ebuild b/dev-libs/mpfr/mpfr-3.1.4.ebuild
index f5a549273d6c..a832b4410b00 100644
--- a/dev-libs/mpfr/mpfr-3.1.4.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild b/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild
index bb73ce2d6a48..d10f7c6a6486 100644
--- a/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # libmpfr.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-3.1.6.ebuild b/dev-libs/mpfr/mpfr-3.1.6.ebuild
index 54529fa86a00..8c19f05b58af 100644
--- a/dev-libs/mpfr/mpfr-3.1.6.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # libmpfr.so version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild b/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
index b15b4e64c7aa..e17798a663b1 100644
--- a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-4.0.1.ebuild b/dev-libs/mpfr/mpfr-4.0.1.ebuild
index b15b4e64c7aa..e17798a663b1 100644
--- a/dev-libs/mpfr/mpfr-4.0.1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-4.0.2.ebuild b/dev-libs/mpfr/mpfr-4.0.2.ebuild
index 710dd1db5dce..95c70cb95cee 100644
--- a/dev-libs/mpfr/mpfr-4.0.2.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index bd8b40661767..1da785f2dfd8 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 1038 BLAKE2B a5b595b557661b2f40b0f71d7281edaedafda8b1e7fa7364e65c2944cb7088cf4bc459cd982e337e3a5f5437552f250deb67036d0f08fdb8c95542af22eae7f2 SHA512 f8a2cd1e834721bd20fbd37460cec314b23f7ac0d9b506f1a77efe7bbcedb62cfee0fa59308d10272906eb9c36a6aeb43abf5c030f0b05ad6626c283ed8a00e3
-EBUILD msgpack-3.1.1.ebuild 1700 BLAKE2B 77629aa7b803c62713ec0291f6501628432ea52800aadeffea6443f0466abb372703842a2cac930a69233f241c61ad0a3f6152ea8bdd108f3f8da7f2150eb309 SHA512 5d5c958915bd61df6d8177af5f0ec5b3f708688c98c9b95381248a14efb86805efb1eb58f705439e5662aefc67d67ab248d31addd3822a7582011d1733d3d26e
-EBUILD msgpack-3.2.0.ebuild 1700 BLAKE2B 64ebbcd3d4e712b7e0ecc05c12eace9fa9677c84d00008952719607cb70f18fc24c8bffb48337fc92ae11b6ab26fcacf13b45ead7405d3d58090c00d4655e829 SHA512 423593fddfb9209789253d54082eb72ead50ceeba2c6c7a672e4007d78d9af3323bf7b18fb26d59b62754fc4bf5964fb48a8e9c7a9f6eccfb58090bdc3486fdb
+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
 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 027734b5670d..d7c174ef7c5a 100644
--- a/dev-libs/msgpack/msgpack-1.1.0.ebuild
+++ b/dev-libs/msgpack/msgpack-1.1.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
diff --git a/dev-libs/msgpack/msgpack-3.1.1.ebuild b/dev-libs/msgpack/msgpack-3.1.1.ebuild
index 768e32012a7b..9d401bce9590 100644
--- a/dev-libs/msgpack/msgpack-3.1.1.ebuild
+++ b/dev-libs/msgpack/msgpack-3.1.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
diff --git a/dev-libs/msgpack/msgpack-3.2.0.ebuild b/dev-libs/msgpack/msgpack-3.2.0.ebuild
index a4bf98c62275..877a72fa3be8 100644
--- a/dev-libs/msgpack/msgpack-3.2.0.ebuild
+++ b/dev-libs/msgpack/msgpack-3.2.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 4a1ec1a77783..28b2b5612ee7 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 1787 BLAKE2B 80b456defbf4e4c28bf9b0ed97b310d9993218964af3febb91649d25b69fa71fae0f2109b1b952e1a8c90f09311ef1f966d9d77f8af2f113630c64ef6821ec9d SHA512 9545879b7b41f3b4fb74a14cfa7b0c6c032bcf8228daf2d0e5265eec5ee32ad93a757d5dc54f7c5f7e76ba595328cf97eae0dc085e060a259f5bc00b74378c24
-EBUILD nettle-3.5.1.ebuild 1694 BLAKE2B 93fab2dcd60d5821297c3d577eaedf545ebd22c85d354a0b18eb13c93cca5c01d0103e959c096552a6b04a75a88658a9a6324ae6295223ce0e2a2826e4a38614 SHA512 93a3c4eaa29e1cce5916596df0cc62cf79b8f107527d21e6f12c2687b64a8187040658210ed72d240067b5a1ad72ee2ea71bc381b2cbe7e73d2999695f5b3c55
+EBUILD nettle-3.4.1.ebuild 1765 BLAKE2B 02021587799cc2b5ccc35f1a829c4abccbee1449ad3abffec4772b8e25ad7021fc0ccd6a8c33dc9333873fd08e861a5336b48b1551e938fe1a136a69880e1077 SHA512 ca5bd2e0e4a8a698ca59a1f4d22f5b40b4aa73ddf19677e2348325e6307777e862233a68f6db83d2690be64660de4ffb41ddead1991b620ab0ec59b85fa117cb
+EBUILD nettle-3.5.1.ebuild 1672 BLAKE2B 00a3a2f2960334b88f8fb5c2e57b760d8a8b515d4c9b9527dfe738375050d8896f848738f62865e1d53c7bc755c43913743e7a569f17ba24e2d7b1d4e62b072b SHA512 b12b641ca7826ea6028aa79dd07ea9c7e481d1c1c438c9db0a548cdab7dbcf22ee5564e4a5443889b464d648df2e95b589463fcc8331fd1241215c41688f768b
 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 c2a18046a70b..6d2e54b033cd 100644
--- a/dev-libs/nettle/nettle-3.4.1.ebuild
+++ b/dev-libs/nettle/nettle-3.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~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"
 
 DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[static-libs?,${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/nettle/nettle-3.5.1.ebuild b/dev-libs/nettle/nettle-3.5.1.ebuild
index 5bf45e8446d6..565e7dd9f5d9 100644
--- a/dev-libs/nettle/nettle-3.5.1.ebuild
+++ b/dev-libs/nettle/nettle-3.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
 
 DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[static-libs?,${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 9d062b3be388..95cc1ea3e7b5 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -3,6 +3,6 @@ AUX newt-0.52.14-tcl.patch 3269 BLAKE2B dc542330cf49a43d63ca6e3edea141ae62664a70
 AUX newt-0.52.15-makefile.patch 403 BLAKE2B a7d85c4d99961894b21d051bb143059c6efbcd29fcf187de1e37344850d545ad98b974346483f2f1aadf1ab029d9d9a0fd64416e6892188cbd2bcfb60a64bc05 SHA512 146430581aa1811ac2f5aa03f6da6f193afda153eb3c3efd8576631f591f3671f05d9479182f593faedc79be17fc91852641259df93faa1231d3eda5e9dfd73d
 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 2022 BLAKE2B ee8fed9342ee68b4548c8a95726894e5ee9f3de9902f7537e8b8458154ba391e46090a70518450bc7a51e330cbcfe81f7423b49de0de79a8406914a0e7d01007 SHA512 2945fcdd40fd57b502da9aada6273022a961607ae40a30730d8935791ea409aab96efc14181c6a2f4d07ac2a9752d677adc09bd99ab4489866fdea70d49c3e2a
-EBUILD newt-0.52.21.ebuild 1989 BLAKE2B 5954f0985a18ea0b0c12fbd297e5d4c79494feb9cef088c2063eb8f74ce23f6a246ffc1eb9a2e85e014d871f0bfc3b539bd20b77d886410a3780c7d93a43760f SHA512 7deb7b896bd8a3d406f9005aecf77e7f0a2eace68119dcb94485e417abcdeaf4ef9668189cc07f522725993b95ba0ca52954d12e6ea4bf214c614b1c20b3cbfe
+EBUILD newt-0.52.20.ebuild 2012 BLAKE2B fdfa42cba47f46dfde39eff8f47083438b358fc9b37bfc7dffd72307418b8610ef7b00e981a5be495197706b6310e469612ed9c96415103c6deb3f7e06400344 SHA512 69b3ecdba8e9f64bf0aab827f4a63d60b599cc800f64050375c809026d8d3e40f32fbd878f8da713326b746e974a8d4a191c460ba5637c3ea96d371e767abf42
+EBUILD newt-0.52.21.ebuild 1979 BLAKE2B e32d200f5224f084d3961aa71c7193d75802fd335b3515b287217a54ecf0f469dc9701d376fae107394b93fb20b067960e076d979b7d75cbc52faf9310d72b4c SHA512 6a52360a46defb9388f928dc0f4ba7335eb803bb8f2e1e57feac415473ec7cf9d9e6f9acac9cf5214a2545f96d26cb6908aacbede50d653ecc004f619d0356dc
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/newt-0.52.20.ebuild b/dev-libs/newt/newt-0.52.20.ebuild
index b272773647d3..ca6eb6863a01 100644
--- a/dev-libs/newt/newt-0.52.20.ebuild
+++ b/dev-libs/newt/newt-0.52.20.ebuild
@@ -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 ~x86-fbsd"
+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/newt/newt-0.52.21.ebuild b/dev-libs/newt/newt-0.52.21.ebuild
index 8af4c46bcaa8..34e47df4a1ab 100644
--- a/dev-libs/newt/newt-0.52.21.ebuild
+++ b/dev-libs/newt/newt-0.52.21.ebuild
@@ -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 ~x86-fbsd"
+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/npth/Manifest b/dev-libs/npth/Manifest
index 9ce9fa2f246d..48da16abe744 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -4,7 +4,7 @@ DIST npth-1.5.tar.bz2 299308 BLAKE2B 1a3cef4475ad5440487151026889ef321626b372d1c
 DIST npth-1.6.tar.bz2 300486 BLAKE2B 665fdb2f4cbe59750b6b4b7c2701ee80a23a122df10c9f8be47c4af5f3bf5968f709637ab3f4878bb68609752fbb6ce1364e109fdfeba64e4db258733a33f3fc SHA512 2ed1012e14a9d10665420b9a23628be7e206fd9348111ec751349b93557ee69f1176bcf7e6b195b35b1c44a5e0e81ee33b713f03d79a33d1ecd9037035afeda2
 EBUILD npth-1.3.ebuild 675 BLAKE2B 101174fbc1293b04ee1b227560213654c2dbe7488dbdbaeb8de89fed9ab4462e22aaa7885f296f7188a7215f599adb82b73ff23e1af88576fbd44f5d93c4be30 SHA512 3a699b2874058b7fe4614d9d6853b10178565092f68aed700f12a79ea7ec7ba28e7e30e97f5e0c766066223d224c58cf14275986edf6eef1b521ff1c270504c8
 EBUILD npth-1.4.ebuild 690 BLAKE2B ebfdb4fa6dd18b1ba10b0eb7cb87b9506151db6906e10ecfa7b3930e9b11dede9212f46109bee83baba3afce807105abaae322f4bb825197d7466b5dc60b51a0 SHA512 c46dca3ea141e43649d01408d668ab3619fb06c1ca2d66eaf8c44d250f983886844e20ec79aedf3731c257118c3bee96d2f3003de55559cf5db399adb0697006
-EBUILD npth-1.5.ebuild 756 BLAKE2B 7f8054a147bbee0e72fb5d137ed2972774edb5797641d180648ca58ba4c860baf43136998c025f6228a196845fff8d1e81e6172be3684f0960791c2d5652fc28 SHA512 275963c48109c88b9a14c5ab26ba4210196fc05e74887bcd545239a56cba3a0288e6ca47ce7b1434d472ecb2cbc1900d6e90d734bfe5f9d7caf13b71699acf8f
-EBUILD npth-1.6-r1.ebuild 779 BLAKE2B 215e803734ce49e224206ee0e596c05fa31c7a8aa8151caa40280974e859825ba4bf689ff77f697b88e1178383aab86f68d0e7c01795f40d9068c92f61a1e25f SHA512 0e011eebc4838eb00ff2de82b5a38d3d631ba1d1b66db48cff52a999640317cd8e47b0a7bf2f8aef341a4eb1b98934dcc0b4ab1d423fbe096595340e3ef3f130
-EBUILD npth-1.6.ebuild 768 BLAKE2B 208b6e4a0570fe1599a68043806ad13843bf76e8b047789c26bc44ac4c97f35f66e51ec7a47b40c9f446c981fb73358c1fdec1b06eb31d383d6b2e276149f569 SHA512 c1fd7b11a5957ead792f4517c5f6fc864de3e2e5cb48b12ad4228b796f2f79f2b63d297ac2ca1a633b8a1d062446fbb094a4ec1e6db16118286724e691daf091
+EBUILD npth-1.5.ebuild 744 BLAKE2B b295e9fab3993c50016fc78ae09f6305e834f63eef5dd7daa03f0bbfed990047be2608863396d710f2dd4386cca395d78dc7b7732fac6789ac59ff06b4946484 SHA512 8bf30e3270ea4ea618fd194154a9b37736badab99a7d90c203e0b2ee1622dce399dbd906edd55894e91d8132311c4dac4d9e69276060a325280bf2612a84b989
+EBUILD npth-1.6-r1.ebuild 767 BLAKE2B 992634d18793140c4d9a8eca7d971db7c49f23d6c3f6235b4aeb504544e5a68f52a04937e5dd9b59127acab9ca6deac4a123a62bac59911ea1758e806bde4ebb SHA512 f1d11f181710ed1522ef7fe3e14f2c998143dce46a2aa303f1583f3357012d92e16471cac7de53ddadd7d1211c35348c07e7c368c69a006137eb8807c6272277
+EBUILD npth-1.6.ebuild 756 BLAKE2B b812b2ead7a9981319bed556254f47c49d2a93898d026cc5e939961782082c48684b2f18d1658701e284da9948f7a75ad6acdb1ed93fa2e6c127aa5edb4b8244 SHA512 6ffe0c3c020b4f575048257b4bd596a9b3b89e02241c9823e4ada346beb795e05024b9298253107f0f189617319e1e7f4d414799d5e140a78c1fe5897adcd25f
 MISC metadata.xml 246 BLAKE2B 569d634cc821d4a537880a58ca96bf709155b0af827d8153b9521d5ca29f174ec29629d11b9eb91ee1cbba5f1a823d5c621521105a00e9fbd6d9a27bc3740bde SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015
diff --git a/dev-libs/npth/npth-1.5.ebuild b/dev-libs/npth/npth-1.5.ebuild
index e7f3e4b96a87..1b693d5d0937 100644
--- a/dev-libs/npth/npth-1.5.ebuild
+++ b/dev-libs/npth/npth-1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/npth/npth-1.6-r1.ebuild b/dev-libs/npth/npth-1.6-r1.ebuild
index 6669793ebb4a..4d8bd423b467 100644
--- a/dev-libs/npth/npth-1.6-r1.ebuild
+++ b/dev-libs/npth/npth-1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/npth/npth-1.6.ebuild b/dev-libs/npth/npth-1.6.ebuild
index df775b203fea..5a27ef7f9b09 100644
--- a/dev-libs/npth/npth-1.6.ebuild
+++ b/dev-libs/npth/npth-1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index d89379995b7c..1b6250e7b682 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -8,11 +8,7 @@ AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc
 DIST nspr-4.20.tar.gz 1140892 BLAKE2B 2cb96b7a40c307f904dac038f016b5c0e527aaf673463cbcb59d8bb6c9d0239219402587d624f48804e33f43abd4427c87f267bf1a88a0dacffcc408ac15dc49 SHA512 22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949
 DIST nspr-4.21.tar.gz 1140741 BLAKE2B 9d6d079ac50c97ed7fff957e23506a24ab0d723cadc2ddb0c4283a2abdf387f0d55116ff82bf748500026b5d493909aa5495bd220f3b6e83ad4990f29eb446a0 SHA512 4f152c6ca32d9dd4cf3d92b4b54f249ac1fa39047811f7c0c7a67bdc73173cf7de0dce36dc278ad781189ea2fdc71fa70e044597676a8b1f5e6d664907e5ab7c
 DIST nspr-4.22.tar.gz 1078701 BLAKE2B 8b37031ffebf79320c91ce674d7c3a0cfbef25bfb006cb9aaff44f090110b35ea2768f83dae4a793723f8e2f3aecabc1a4b8042cd1b0ab0aade30781e43f9d62 SHA512 d34271f0692905162f71b02cf6f62a8ebf779159335e4ed286ee8d51faaad633a61c9392bada86d976bca2b5aa47c8760085de30dbd13c9cfa423582c31db37b
-EBUILD nspr-4.20.ebuild 3792 BLAKE2B 2f6c9e7d9cbe04da44e9e34e45c416d77d610d045fe3cce5e2c60c7655be78853bba9428a91a0dad388f6fc1e26876b26e0bab2d6495616c4941b8585aacba38 SHA512 5f2f0b397fb9dfd274b73e9026c4e5d6ccdae99f32c98a9fbb4497f87609d7e9afaaaf08cd0dd9dc8b21f8b63f91043988f7e2171cf26703447467314b4d6c4f
-EBUILD nspr-4.21.ebuild 3897 BLAKE2B dbc3e8d02f14a0c22e2969ce9cd0cf644c2ec290f247b9581dfcfff954e1d544c05e84968a6b8ee1690c778b975ad57395cbd1cdc2313ddc048ae100c00e715a SHA512 04c3a557fe7be670d98790c499f2a7e20606a1cfa8be64247669b40057244135e32e8da5a8bf6243b9fe7164b706cadd442d3d61b7e06676bc0b820d90b9f3a1
-<<<<<<< HEAD
-EBUILD nspr-4.22.ebuild 3888 BLAKE2B 995a072499af5e0b947f4a8ee3e28af65359f666981e5b2ff242922a3511d6818786c6272ba54776102f4b2c0c404ba7a0c6d060ff56d9ceac7308d2f8d93c39 SHA512 94bf0bb6ff18f339bbeb8e130b5d135bab539fe0c2586b0e68e346d14fe8cd883d097444211922291a4f0d72a86eb4f9c4c23f304a63d76be6925d77172c4ce4
-=======
-EBUILD nspr-4.22.ebuild 3887 BLAKE2B b437b0b5870026275731224ddd2e1af368caf48deb4cec30467f3232e6b91267e439121dd54423b5c424ec5427898842006258ad84d589bfad79e5d623f17b84 SHA512 2613310f6e3fb741468297a884d3ade0da92c33b092100695dca5f3b80ad3de6ff5441881f50924cff6af87cc750034ecf6e731d18b2ba4ff58c84d9356c25fd
->>>>>>> next
+EBUILD nspr-4.20.ebuild 3770 BLAKE2B d27554e938728d5dda0bbd6da5223b994bb106b2bf9af1631c4f0f66cfee3eea384f4f665356bffd5b1cb87c82f475c9099e767235cce02c06408e5987b9cd09 SHA512 cc0067760312e923bad46dd322ea193decb62f8deb6d50519f3373e837d1c0aaf8cc75f28b8b0439f9f89566ebcba1c15837713535446abef7b583b7b2680af1
+EBUILD nspr-4.21.ebuild 3875 BLAKE2B f6e53d9ad60e299bab2d1a20b228b0105c112702992d05047c6d3b8a41433278605b95a39676ac637082c4f0f4e29f6cad9f7acbb4a302684d6fa81a53808c61 SHA512 49c8721862e993070c9f55d6150a5273d70bbe9c1e6590198924bc1bdfaa434c4d44a0918db4985f92307cdde3e705c01f4031d29dcd54f4fe3f879637efa68a
+EBUILD nspr-4.22.ebuild 3865 BLAKE2B 69207a7090aac468f09ac874cf1070e33fef8338ad3c7900373ca39f29845cb3f0fef1c197c3fb90ab78c7d1efcdd25edc5185a9ef84df82cf2414c96c9fd69c SHA512 9877374a313c217c8c17c17434ae243446be9ef1beb20c58683207135f2a18c1085f4bff0d8b8ce20bc57cd730825fcd97f59813b91dcc081c15277dcd839826
 MISC metadata.xml 349 BLAKE2B 06dabb7ec8263989dcff436449a820af581cc04ce9de05d7c4553751c8d9c6dc43a2af221c69107fca9ae046a1b3ec807cd3f3122195cffd23de9c6ce8b1c258 SHA512 5185204ed18d7e0e4a48f918dfd871a18c62572968767566b6e0c028075e1054ec8028aac412de0c598936a79e3f70486ef889f96b720e2b15d862cf91b12b23
diff --git a/dev-libs/nspr/nspr-4.20.ebuild b/dev-libs/nspr/nspr-4.20.ebuild
index f20d29ee3411..19ed970007c3 100644
--- a/dev-libs/nspr/nspr-4.20.ebuild
+++ b/dev-libs/nspr/nspr-4.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.21.ebuild b/dev-libs/nspr/nspr-4.21.ebuild
index 172a334d4b2d..78e6c4476bef 100644
--- a/dev-libs/nspr/nspr-4.21.ebuild
+++ b/dev-libs/nspr/nspr-4.21.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nspr/nspr-4.22.ebuild b/dev-libs/nspr/nspr-4.22.ebuild
index a76257f19ee2..8a508486ba00 100644
--- a/dev-libs/nspr/nspr-4.22.ebuild
+++ b/dev-libs/nspr/nspr-4.22.ebuild
@@ -13,11 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-<<<<<<< HEAD
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-=======
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
->>>>>>> next
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 2b9863c39fe6..fc247fc7fb06 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -4,15 +4,11 @@ AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef
 AUX nss-3.32-gentoo-fixups.patch 6443 BLAKE2B cfe0380832776b7e51f95f800e70436622332d90f61b6b75fcd5474faaf722342ab157694be26881acfae3baceb6d2fdcfabc0c7673101abedfe1667d3821e6f SHA512 36a6db836ab9210e8201a3987229cf18a6b1fe5adeb0d82037f9641da72e6280807123b18fc74d344c680751b04f883bc402cd1c505783c77f00f9962338da03
 AUX nss-3.36.7-fix-cms.patch 15889 BLAKE2B d58e656215e805461bc43ec10c95d8646fcddb93bc3a9870cc4c406af7de3ab2f5e474bbbcfa53cd8d405f96dfddc393e880c9528e156f87a7951bcb4b693e5b SHA512 930b032538eaf76ba354767790a75566b34e83334a1d382d3583bcc31c3cd721d46da8f268903bce2950bf73d705933c7a3887107cbf9bc5caa717b14eb7ce72
 DIST nss-3.40.1.tar.gz 23311074 BLAKE2B 9cd723e983a3f70748b0734bb2a6cc1ddfa280f1c167c3b1b371a58900fb3d9b3bf3482293bb8614d39ffb538bcca815a2aedbe03d2d643731817452f82bc2ca SHA512 464ae843161e8deb911975d2117e8bf1194a968689b4ce70f9a12d5a33dba7ddd69f1248ec45244139c30fcc87678b206a4e124f032b26ead8bf894e4e8d0564
-DIST nss-3.44.1.tar.gz 75986343 BLAKE2B b0a91ffdf879c8fd684abcb92480dd465466e83d3bad346d937bae285543705d10817527ed4f5ddbb618ad52103d4aedfc25e03053225010abc80267d2f94034 SHA512 eb8777701a25b54377026633b6bf284e4c62308012058355f348a7c57525afe96db74a07de41ba01754e316a7dff06689de527359a5474ed7ab606779c4cf169
+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-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 9501 BLAKE2B f743d2d9ec752b5c7bba215bef12c744ae91a92b547745c7d146f457e8ae3d805231643cd1579f7b0000e853305c94a2f26930f6b7009e0f79813cfb1962682a SHA512 b67cb7e84ac85aa5c74be19aca7186b1e082a3c0f736bf93ece7f8cbb310a40993bdc6d2d5aef64311de6e42ab6029c36acc4d8377500732b3a8358314f9a75c
-EBUILD nss-3.44.1.ebuild 9488 BLAKE2B 1e9068af29f3d798a4b7a47931e77ffa04e1e3b37c7cdac7c9a4d11a91ae2eeeee2c8f5d688952204c7a2235a020e05e97e5b2c266f85d09ee97a8c0998e911d SHA512 7df96c4826322101639975574cbc2c621cecd97e7b40641fff918c8283efd85b670c84feb02e3ccc7e47af6131f9841b19668afefb9219f975fd54acbda88088
-<<<<<<< HEAD
-EBUILD nss-3.46.ebuild 9479 BLAKE2B 1a97bcd13b5876f8f2e1856831a303107728ffa54383ef5e8dd83b754cd3e4d0a8ad4aa3318e83d73b97212c7ab58cbe80d6fd99c3c6a96c866ba5facc7a696c SHA512 7b7df99a2897afae6f0860bf8a33598ed46bddfba7ef9cddbf7ac5913a59612af99e80212cb41e30651aa86a50a0c5f07cbafa259e496ed0fdfc099c56133da6
-=======
-EBUILD nss-3.46.ebuild 9478 BLAKE2B ce357178071d9b93eb2e9838ff8870332bdc4790b1f016d5b54ff6b4df62e2293f5fb5a866f61df1e70f7847bc4dcea3b3767b868801908daed4b4d324e462a1 SHA512 53689f8bc455f6256302a8941813bf7ef4e6e7d8b8cb27aff1df19b55cbefc461706eca7e97f1a56ce7701a0d760064cc821e73b32b609fab1f050b72d65d6c4
->>>>>>> next
+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
 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
index 5200c1dcab7d..cf653745a3c8 100644
--- a/dev-libs/nss/nss-3.40.1-r1.ebuild
+++ b/dev-libs/nss/nss-3.40.1-r1.ebuild
@@ -19,7 +19,7 @@ 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-fbsd ~x86-fbsd ~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}]"
diff --git a/dev-libs/nss/nss-3.44.1.ebuild b/dev-libs/nss/nss-3.46.1.ebuild
index bd22251e6050..f99ef74485f3 100644
--- a/dev-libs/nss/nss-3.44.1.ebuild
+++ b/dev-libs/nss/nss-3.46.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
 
-NSPR_VER="4.16"
+NSPR_VER="4.22"
 RTM_NAME="NSS_${PV//./_}_RTM"
 # Rev of https://git.fedorahosted.org/cgit/nss-pem.git
 PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
@@ -19,7 +19,7 @@ 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-fbsd ~x86-fbsd ~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}]"
diff --git a/dev-libs/nss/nss-3.46.ebuild b/dev-libs/nss/nss-3.46.ebuild
index 82194713c45e..1385aed733c4 100644
--- a/dev-libs/nss/nss-3.46.ebuild
+++ b/dev-libs/nss/nss-3.46.ebuild
@@ -19,11 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-<<<<<<< HEAD
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-=======
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
->>>>>>> next
+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}]"
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index cd53226e6611..4dd6cfcb8ebd 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -1,5 +1,4 @@
 AUX oniguruma-6.9.3-fix-heap-buffer-overflow-php78559.patch 454 BLAKE2B 8ec384d21dd283cabd7b3a567bacc2375c489a78f71ccf4373a88b707c31bee0ca2f83c538e1d760e52314c6ecb168c2cf80a5049eb96d993ec08bb38136f641 SHA512 2fd3df7ad7c7bd75967250ec89153c0c6c6859f2833419e134c5aa6463cfd26bb9e7e2a1121cf59973bd6b3451476743b1fba79dbf61cb5cf45040ea13d67311
 DIST onig-6.9.3.tar.gz 902349 BLAKE2B 4b20290a2d72b638b13a2e2edc89e072a8d17f89f6a273b58d0e408d01726ace948dd390bb2f4c478b87d01bed9fa344a4933060736a40981219301529957aaa SHA512 6b038879cb9cbe8cc756159eb53125e1d4dc7365ca434d07b99a59f3602987e573da120506bbd88d0f51dcdde5866bfa48d45803f8869503726c4d9a47d62861
-EBUILD oniguruma-6.9.3-r1.ebuild 1077 BLAKE2B 0f302c21bd32d6a7502d5ebb4e032285d7abcf0b5395bcc1c8fecb321178f2f5b09cba872ffa7b8bef76c94de0f6d2f49ccc7719d958cc3b77dc2b4a9e6f8994 SHA512 228679adc5273acad4af7da0a522023913dadba542e7736462f000a04c4c8e4a7b689bb0fc7c8b5af98f60f935c2d8609d36a7c869359bcbf0b70a4536a9096f
-EBUILD oniguruma-6.9.3.ebuild 987 BLAKE2B e328f16352bdbe51260a4b1aef78c0631f0f71aef036677ea73153f9e49709bc965a6943d04ca4702bc72b04dc819834f7a0381a37778d299acb17b667bab0d7 SHA512 11dbf5f9f1fc2cecf1d0c2500dbac1f3632330c6b8350b44dd33196aad6453e064718e6673e03c2bb011d18953bf24813cd32c1c54b88554269b37b4c4c16bef
+EBUILD oniguruma-6.9.3-r1.ebuild 1044 BLAKE2B 72cda1c817606528a2b81cc4333aa8df356761cc4781d645a48c42cdff72a1931ed30ab1aefe702c921d2a018abc66bdd4ecabbe56825cf937cd2003f3380580 SHA512 ba2751c367251fa344a4a7aef978d752d7158c4d6d240ce3eb167e2b1a7b838ca02ccb5b12d4f7f1eb2e1aff8e81072a1ccd02b0c2337b1d35adc74d49f2882c
 MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
diff --git a/dev-libs/oniguruma/oniguruma-6.9.3-r1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.3-r1.ebuild
index 2b0d346fc447..b3b9800c1cb8 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.3-r1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 PATCHES=( "${FILESDIR}"/${PN}-6.9.3-fix-heap-buffer-overflow-php78559.patch )
diff --git a/dev-libs/oniguruma/oniguruma-6.9.3.ebuild b/dev-libs/oniguruma/oniguruma-6.9.3.ebuild
deleted file mode 100644
index a8f178b9c387..000000000000
--- a/dev-libs/oniguruma/oniguruma-6.9.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2003-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-MY_P="onig-${PV}"
-
-DESCRIPTION="Regular expression library for different character encodings"
-HOMEPAGE="https://github.com/kkos/oniguruma"
-SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/5"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="crnl-as-line-terminator static-libs"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(AUTHORS HISTORY README{,_japanese} doc/{API,CALLOUTS.API,CALLOUTS.BUILTIN,FAQ,RE}{,.ja} doc/{SYNTAX.md,UNICODE_PROPERTIES})
-
-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/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 68f7eb0153a7..46778c03f11c 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,6 +1,4 @@
 AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
-DIST opencl-clang-8.0.0.tar.gz 40789 BLAKE2B baa559e90bf7f57cc59942c279b0488e306c7fd481582b213707d1cf0382f717965cd0fc7278e9c5a359847cead097243509a0730cd38f70fbbb2586c3145265 SHA512 4a353e2b28d54671be0eea00536c05093d358dec9950ea5b0732c8f46dd03bc29884487fb88f762f2c20311b928496c3b5729a8c6a72a7ce9caf30b23895340f
-DIST opencl-clang-8.0.1.tar.gz 42069 BLAKE2B 9d095b2f14b1fb0cbe3eacfba9cae013dbe41e90a367d7acfe4f56496fbdd673fccf16a09a78affa43aa427f5bd0abc400319128525a660d57308cf16bd4e638 SHA512 3e1714b65311b5c07537329c94d55f037c219eaf41380960e5220b0e85761a69b45b469507dc168c09ae4801fb6e14db256acdb7bd2f7e9734f6f84ad3ba49b2
-EBUILD opencl-clang-8.0.0.ebuild 810 BLAKE2B 1d348eb2acc3e6d4215f59ea49ba869620bffa35443731491934eaec8cdbf958b849fba5230881751645cadfad0e114983b4b81a6cd8772b6c7b01654976c624 SHA512 708ebf99760fc80780f49ce36299718ba7ef6665b8b604e275df96c07786d199d5bf4234b2170ab9bad7b103edd407d9246a90b252c2dbecafba264158b01c3b
-EBUILD opencl-clang-8.0.1.ebuild 819 BLAKE2B 698c09e06c342823635596241c7f427bcc1ef9df9a9914409d1fdfdd631bde7a7f2067eadfc172734f8ed2b45a92a3f638ded8e55bdce7b5b8bad21ff780971d SHA512 ba657ea1e6e5837a630ae3a4d880acdd284f3b0039c4e10d30a9b2211a63020fd4f67708666726ff9a70405a1e515a3f74c68c65133e8645437bcb807a15e0d4
+DIST opencl-clang-8.0.1_p20191001.tar.gz 41402 BLAKE2B 0ab3cc4f84a9e3e599d4e0995f219b94761b882a6290d9c1e399bf820074b72daab935a9d48d09d3e02d1b46659fc8c00613f35e88f0231234e31f93ca6e4d7a SHA512 87f3855bd2cc9a416f317afc98ad7cd1cfcb5bf4b2ebf7401837c1734b1c8d10e07843aab78735bf48888523b231db1911014a6468c0b4c461c43a5434a31ada
+EBUILD opencl-clang-8.0.1_p20191001-r1.ebuild 913 BLAKE2B 812cdfd7ca1d00e2fe0e6456260723ba6a242abc84c3bfc737f56961c94ebdd805091503e21efe05cf00d3e6d3de58744ca2fb52a4205a0e56085423b209b349 SHA512 123e5cafa2491543016f850e941da71c7a0b8e3d75c6371ba4707f7a2f81abd7bdf230613538ba5acc94105d5647a6e44207060230775732ba03bb8f9b78c444
 MISC metadata.xml 329 BLAKE2B d50cf1fac225c2240bd4af19962089d9b7446549d9cc7067d860218e76013acfbc65f40abfffded01c098b06dd4c8a5688c94e40710ecdf6e7db71e05816498d SHA512 de4a3177f7091c00cd54f5eb52d8d88ae88d207ca72acd71c824220593d27ebdbf3673459ab48440373af19eb88603a5fcdd5956597d816927c9663be177eccb
diff --git a/dev-libs/opencl-clang/opencl-clang-8.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-8.0.0.ebuild
deleted file mode 100644
index ac93a0e876ba..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-8.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib llvm
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="8"
-KEYWORDS="~amd64"
-
-COMMON="sys-devel/clang:8=[static-analyzer,${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}
-	dev-util/spirv-llvm-translator:8=[${MULTILIB_USEDEP}]
-	dev-vcs/git"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/opencl-clang/opencl-clang-8.0.1.ebuild b/dev-libs/opencl-clang/opencl-clang-8.0.1_p20191001-r1.ebuild
index 914e05911fec..616cb77c650d 100644
--- a/dev-libs/opencl-clang/opencl-clang-8.0.1.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-8.0.1_p20191001-r1.ebuild
@@ -3,11 +3,13 @@
 
 EAPI=7
 
-inherit cmake-multilib llvm
+inherit cmake-multilib llvm vcs-snapshot
+
+EGIT_COMMIT="94af090661d7c953c516c97a25ed053c744a0737"
 
 DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
 HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/intel/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="UoI-NCSA"
 SLOT="8"
@@ -27,7 +29,7 @@ PATCHES=(
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
 		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
 	)
 	cmake-utils_src_configure
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index a93bc5eed6b0..6a1775ef4877 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -7,18 +7,8 @@ AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162
 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.2r.tar.gz 5348369 BLAKE2B 9f9c2d2fe6eaf9acacab29b394a318f30c38e831a5f9c193b2da660f9d04acbf407d8b752274783765416c0f5ba557c24ee293ad7fb7d727771db289e6acc901 SHA512 6eb2211f3ad56d7573ac26f388338592c37e5faaf5e2d44c0fa9062c12186e56a324f135d1c956a89b55fcce047e6428bec2756658d103e7275e08b46f741235
-DIST openssl-1.0.2r_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
-DIST openssl-1.0.2r_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
-DIST openssl-1.0.2r_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
-DIST openssl-1.0.2s.tar.gz 5349149 BLAKE2B 46c72dcceb5b473b129be0a895f3d6c25a24ee852a31dc369ccf0e44319259d8694d3571b8cb698efb8bce89dbe31f4fc9f82753cacb24cbd3d50fa2ab9b6e83 SHA512 9f745452c4f777df694158e95003cde78a2cf8199bc481a563ec36644664c3c1415a774779b9791dd18f2aeb57fa1721cb52b3db12d025955e970071d5b66d2a
-DIST openssl-1.0.2s_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
-DIST openssl-1.0.2s_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
-DIST openssl-1.0.2s_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
 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 4969 BLAKE2B 8258165c7a8deecf2cf15da2be35d3bea56c7d6df869d9188fb0ec73e684257704d0aee189d520d54f5396c5e34498476db0966178cd43ad5b6cb76c19a6384f SHA512 463d439e67494224e40638fbbd4b44760371e10d0fcaddf6b6419f0baac04046f3bf4ce0013616c8b42a8896f5395488e6faa008acdbe1669f8308b24c20fdcb
-EBUILD openssl-compat-1.0.2r.ebuild 8037 BLAKE2B 1f652836c93e4cd7a8b0211a26a1e0b22c73a30a64a5248cc9a251afd83af8cf6e54b7f0a6a53a9beb184c7638fd834eaa565361ee710461321fc733359e630f SHA512 263f9a96aff760c96061702478651cca50b91f331d29cec718aa0bcea9f993b6fb60e01efa521a3513da5157e2364022fea747e451166ada000b1fc43e06c1d8
-EBUILD openssl-compat-1.0.2s-r1.ebuild 8248 BLAKE2B 04b038fbfe2951e83a9663abbb37ba4179ca8e75263d4263ff02c721baf54e6ca38c7e4591d3049b16cdaff032d29dea80bd567a69f5cf57155b6606d08e84f6 SHA512 5980c460ed506e35f101efe0f5fb591c169f7f23d817b2166e95e2d637e3e7b9749004eef8f97ffc0a6f85e09b8dc792b913e8bd159abf765287e4ca9a6e3de6
-EBUILD openssl-compat-1.0.2t-r1.ebuild 7592 BLAKE2B a57e59a56cc76fa0a6850fc97f08098104d13464d5f58ab98bb7d68587526173bfe482e0c80bdfedb233dff397db16208e7c5c12af30b9c307213aed8977ae82 SHA512 3626ef230d0bb9f01069002425b7390ee8995063a8f233572508d8fbf37200d47d3eadca4f356d17209e885629d5438597a7bf5bae8bdc51cf9c88ecfda476c6
+EBUILD openssl-compat-0.9.8z_p8-r1.ebuild 4959 BLAKE2B 0b188cd8b933cf5edbe4a35737a104a94cdb1dd79e39401d5561226394b90105b9ade4bd26026076d10d7cc64483586fc2920ec721b56fb0af643a8b718a9023 SHA512 4f87a3d45f94b399471664d2e2ece94b0fd15c4c83d8cd161b8e929f0a904d43725e4594a8d3628518e111bd95f6cd05183b20230f865a7350620af3a5395b8c
+EBUILD openssl-compat-1.0.2t-r1.ebuild 7570 BLAKE2B aba7ce7a20da61e28927096eee6c75cbb3aeaa0af6cdc4fa6eb268f11a4d0436130d9b0b23f837af6ad93d14156c1a8f908bd15af780df65b2422599fd95a9ff SHA512 8f97ec631758e1a938689eadff27eac3ec0349eb540398d4bbf6af15bbfd8981a17b590e0ba9f3239e4720a425a0e1caf88ddc7871325624cf223edc82cf98e5
 MISC metadata.xml 967 BLAKE2B ed2fb20c832fbd18b7834f35e21072d419e8da5d88c165b7113a3835af1408f10e8c649dd2ccdffac35b6ed297320c18c0ae76b7a124fd3db6ab1a316f11c31c SHA512 12392dd6d10877fd78b8f54d6c51a5b5d50db3690fff0084112389a1ff3d28a0a37ec09262e4e817337eb04133877de8aa06f341bf9c96e73cb36c31e77f9e0f
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 26730ec90fe6..d9b04231afd5 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
@@ -18,7 +18,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0.9.8"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+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 )"
 
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2r.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2r.ebuild
deleted file mode 100644
index 7aef40f273d2..000000000000
--- a/dev-libs/openssl-compat/openssl-compat-1.0.2r.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
-
-# openssl-1.0.2-patches-1.6 contain additional CVE patches
-# which got fixed with this release.
-# Please use 1.7 version number when rolling a new tarball!
-PATCH_SET="openssl-1.0.2-patches-1.5"
-MY_P=openssl-${PV/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	!vanilla? (
-		mirror://gentoo/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~chutzpah/dist/openssl/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~whissi/dist/openssl/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
-	)"
-
-LICENSE="openssl"
-SLOT="1.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
-	!=dev-libs/openssl-1.0.2*:0
-	!dev-libs/openssl:1.0.0"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-
-RESTRICT="test"
-
-# Do not install any docs
-DOCS=()
-
-# This does not copy the entire Fedora patchset, but JUST the parts that
-# are needed to make it safe to use EC with RESTRICT=bindist.
-# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
-SOURCE1=hobble-openssl
-SOURCE12=ec_curve.c
-SOURCE13=ectest.c
-# These are ported instead
-#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
-#PATCH37=openssl-1.1.0-ec-curves.patch
-FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
-FEDORA_GIT_BRANCH='f25'
-FEDORA_SRC_URI=()
-FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
-FEDORA_PATCH=( $PATCH1 $PATCH37 )
-for i in "${FEDORA_SOURCE[@]}" ; do
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> openssl-${PV}_${i}" )
-done
-for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
-done
-SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	if use bindist; then
-		# This just removes the prefix, and puts it into WORKDIR like the RPM.
-		for i in "${FEDORA_SOURCE[@]}" ; do
-			cp -f "${DISTDIR}"/"openssl-${PV}_${i}" "${WORKDIR}"/"${i}" || die
-		done
-		# .spec %prep
-		bash "${WORKDIR}"/"${SOURCE1}" || die
-		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
-		for i in "${FEDORA_PATCH[@]}" ; do
-			eapply "${DISTDIR}"/"${i}"
-		done
-		eapply "${FILESDIR}"/openssl-1.0.2p-hobble-ecc.patch
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-		# $(use_ssl !bindist srp) \
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/patch/*.patch
-	fi
-
-	eapply_user
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	# this breaks build with 1.0.2p, not sure if it is needed anymore
-	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX%/}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		$(use_ssl !bindist srp) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX%/}"/usr \
-		--openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 V=1 depend
-	emake build_libs
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	dolib.so lib{crypto,ssl}.so.${SLOT}
-}
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2s-r1.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2s-r1.ebuild
deleted file mode 100644
index f956fa3826a9..000000000000
--- a/dev-libs/openssl-compat/openssl-compat-1.0.2s-r1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal
-
-# openssl-1.0.2-patches-1.6 contain additional CVE patches
-# which got fixed with this release.
-# Please use 1.7 version number when rolling a new tarball!
-PATCH_SET="openssl-1.0.2-patches-1.5"
-MY_P=openssl-${PV/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	!vanilla? (
-		mirror://gentoo/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~chutzpah/dist/openssl/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~whissi/dist/openssl/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
-	)"
-
-LICENSE="openssl"
-SLOT="1.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	!=dev-libs/openssl-1.0.2*:0"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-
-RESTRICT="test"
-
-# Do not install any docs
-DOCS=()
-
-# This does not copy the entire Fedora patchset, but JUST the parts that
-# are needed to make it safe to use EC with RESTRICT=bindist.
-# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
-SOURCE1=hobble-openssl
-SOURCE12=ec_curve.c
-SOURCE13=ectest.c
-# These are ported instead
-#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
-#PATCH37=openssl-1.1.0-ec-curves.patch
-FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
-FEDORA_GIT_BRANCH='f25'
-FEDORA_SRC_URI=()
-FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
-FEDORA_PATCH=( $PATCH1 $PATCH37 )
-for i in "${FEDORA_SOURCE[@]}" ; do
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> openssl-${PV}_${i}" )
-done
-for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
-done
-SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	if use bindist; then
-		# This just removes the prefix, and puts it into WORKDIR like the RPM.
-		for i in "${FEDORA_SOURCE[@]}" ; do
-			cp -f "${DISTDIR}"/"openssl-${PV}_${i}" "${WORKDIR}"/"${i}" || die
-		done
-		# .spec %prep
-		bash "${WORKDIR}"/"${SOURCE1}" || die
-		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
-		for i in "${FEDORA_PATCH[@]}" ; do
-			eapply "${DISTDIR}"/"${i}"
-		done
-		eapply "${FILESDIR}"/openssl-1.0.2p-hobble-ecc.patch
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-		# $(use_ssl !bindist srp) \
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/patch/*.patch
-	fi
-
-	eapply_user
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	# this breaks build with 1.0.2p, not sure if it is needed anymore
-	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	CFLAGS= LDFLAGS= echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		$(use_ssl !bindist srp) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 V=1 depend
-	emake build_libs
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	dolib.so lib{crypto,ssl}.so.${SLOT}
-}
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2t-r1.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2t-r1.ebuild
index 670f557544d2..d42cc5f4f5a9 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.0.2t-r1.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.0.2t-r1.ebuild
@@ -37,7 +37,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="1.0.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+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 )"
 
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 6cf42876ccfe..4b6e32ed8821 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -4,30 +4,16 @@ AUX openssl-1.0.2p-hobble-ecc.patch 10875 BLAKE2B fc8240a074f8cc354c5ae584b76b3f
 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
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
-DIST openssl-1.0.2r.tar.gz 5348369 BLAKE2B 9f9c2d2fe6eaf9acacab29b394a318f30c38e831a5f9c193b2da660f9d04acbf407d8b752274783765416c0f5ba557c24ee293ad7fb7d727771db289e6acc901 SHA512 6eb2211f3ad56d7573ac26f388338592c37e5faaf5e2d44c0fa9062c12186e56a324f135d1c956a89b55fcce047e6428bec2756658d103e7275e08b46f741235
-DIST openssl-1.0.2r_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
-DIST openssl-1.0.2r_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
-DIST openssl-1.0.2r_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
-DIST openssl-1.0.2s.tar.gz 5349149 BLAKE2B 46c72dcceb5b473b129be0a895f3d6c25a24ee852a31dc369ccf0e44319259d8694d3571b8cb698efb8bce89dbe31f4fc9f82753cacb24cbd3d50fa2ab9b6e83 SHA512 9f745452c4f777df694158e95003cde78a2cf8199bc481a563ec36644664c3c1415a774779b9791dd18f2aeb57fa1721cb52b3db12d025955e970071d5b66d2a
-DIST openssl-1.0.2s_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
-DIST openssl-1.0.2s_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
-DIST openssl-1.0.2s_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
 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
-DIST openssl-1.1.0k-bindist-1.0.tar.xz 11716 BLAKE2B c491ba0899c44dbcc63f85b255548c439c965a20a04ac2a6324a4122c4691b7c95ec18e62be6d708a7ea62ea197d32e5091987cb5043969878f89e5bc26243d4 SHA512 1d5bc9d7b24cf55d32d996e2421d43a1218b605720293f00d07814afb481387856f0dc000ad3c3e4cba2361055668cfe79a945be44ab85a249555f37e683a909
-DIST openssl-1.1.0k.tar.gz 5287321 BLAKE2B fce40a399f5a08d5fe183dfcaab11b211d982885fb9888b25fa41bdd9919ecd203fca6f573363cfb42c9a0776ae69ea50b0f144227a3f28ca0dbadf878d396bc SHA512 65f41a240a97d79504c0e1391fde8ac8692f0993437cdc35e4bc964ecc36e5ef75a62499c4c6cb4ce63f892135e06dba2d3594c8869d935554296fa3c6ccd822
 DIST openssl-1.1.0l-bindist-1.0.tar.xz 13184 BLAKE2B c09e023458faff17b10d6f20c28462c0851757a20d59b4b751220ab307324d5778252df112ad74fd319407cc75fdd1cd507d48058dd0234dc8c03020c882ed42 SHA512 39720ecee3ec6080c1416f2fb7c9246b89ee55b21be2baabad51eb6823dbe1559450b1ae92fa61ac1cf5ba04ac8c02438aa469bc65eae6905cf1ea486f270793
 DIST openssl-1.1.0l.tar.gz 5294857 BLAKE2B 0e4f30f9e8a22414325bd780dc4e875e962487fbe72967f0392ace959955429192541881a98d097d7bb75ed7238b1817b0c3c2c4da04421512bd538f2b07cdd7 SHA512 81b74149f40ea7d9f7e235820a4f977844653ad1e2b302e65e712c12193f47542fe7e3385fd1e25e3dd074e4e6d04199836cbc492656f5a7692edab5e234f4ad
-DIST openssl-1.1.1c-bindist-1.0.tar.xz 11964 BLAKE2B 8c5190846d13984589a150089d329bb3ecc613788b9462c6f6a1833a040e21cb9bf940140449f09fd797c0e396b0aea073237be374bd16097795b8974c3e7ce5 SHA512 249c6d8c455130b98e3be635f12f323e0cc349f1770648bad591e5de15483917185a473c162ed871a2fa05b47056931e6f12e5fdd9cecee7e6d1c246b862923b
-DIST openssl-1.1.1c.tar.gz 8864262 BLAKE2B bd157b244bedcefb8e646a743732945119b267236789ac69c38856570318aca09299bdaaea3f20294863b633e6fd4dfe124820597185b3b7461cfdf094daadb0 SHA512 8e2c5cc11c120efbb7d7850980cb6eaa782d29b4996b3f3378d37613c1679f852d7cc08a90d62e78fcec3439f06bdbee70064579a8c2adaffd91532a97f646ff
 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.2r.ebuild 10261 BLAKE2B d69c02146d892718a81ea97c6d946cdbef7fbefdfdbccc1590b961d1514d0c21e5b3f9d52a07465d0848cba20b9d5773092680e95dafb2233232b607582f9834 SHA512 8e5c8ecf64b9684047106fc07d9529f64f34782129975e1dff7777104dd18de66800a75f2cc30dea3d2079e2387843fa742fc470319f53c1bf6574798ddd8630
-EBUILD openssl-1.0.2s-r2.ebuild 10519 BLAKE2B 6856119b931ab897e828101294eb4f62fe89422f71aad8e86fe399abfbd3ab6b2c1c06d02b2f3e79a742d00e0941abe17a19f957dc82eab73ec3c7dd4de72745 SHA512 fb6b8a378291108f8093e0f60b9e2b24a3fc6833f1ec581f3c6dd7b04dda880547be23c1cc9801ff9cd6407ee90fbe71a243ae01a9e2738592240c06af34f35b
-EBUILD openssl-1.0.2t-r1.ebuild 9872 BLAKE2B 90c7e6c26b520208e35b8037ba89642bae7714aae464bfcb76f053f261a664d03ffa98bbe86dce4cfadc9c871ddaec8bf4d143f0115d1ecca36dbf295d7d0e37 SHA512 4ae5b6aa61507a4a39eef0db5e240ff931830eca593da5eb328d1d6f0268111f2e14fc2bd6149fc63e2b44af8cc3145c4243aedab6d14d03977007837e9c60b9
-EBUILD openssl-1.1.0k-r1.ebuild 9463 BLAKE2B d04ca8cad9e3a763c606b88b66309a11c3f3d1b27af1870dadb258521f110e5d7e6b5482554ee3a00c5a92343542b411ebb084de338d751bd04ccd3afc69a9b4 SHA512 4be3b7b467ca52a35de64d7ec53bb414f67fa30953001a66503336ca32635e8d9d7682a1f15d60e627903bad8d5603c29398b418e263b638c58ff1ec0da42bfd
-EBUILD openssl-1.1.0l.ebuild 9601 BLAKE2B 37990d15c063ffbf5922bd3a4a195e5dd359bc8ccffe940376a80b3d2e5af694030e7bdf841e574f2d24f62f11d6427dfb2b926cb0f45f8387e51d4606907d45 SHA512 0eab2bde4858c9f74c4ae799ed2cd7bebd4e47edb6cff52e5b9487703287fa424e99f973d48b0a01d67b80fedfa7d03ddeb5be702877fc87da2b91bc18d53122
-EBUILD openssl-1.1.1c-r1.ebuild 9297 BLAKE2B 114347e74c4224d73956c4d9e333776da681690779a9e542422a9c15ac8bf624469ad337b3cbbde159b35474631de95a423f2ccdf20d3a2370d086b89fa24b10 SHA512 eb7bfe2b301769fc1e3118bf449c85f8af455c1e0252c3b574b426b4986ee1631581bbbd915c13f75ce9f1e1704f6ced048a0485dae69ba1aafb31f3aa455b65
-EBUILD openssl-1.1.1d.ebuild 9351 BLAKE2B cb70c810bc409ec11f2a1e92e3361b4f98c1976be3cfaee7a6d7c152d86f7505d5dceca7df3e93901d85926426aeefcc11d900f9f392d2da4aae0ae47b6863b6 SHA512 80bb6b67ebd60dd0fef87dd1d6f72ffae3371f7f7acb941069748ee2fadeee26a6702fd092a1a873019e7959e524217af89bdc1753bc4ae6590f41e2f84129f8
+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 10310 BLAKE2B af5bd0449f7755f342ad611f07bf804674f27acd6170e7e75d4e294deb951368745868c7afd4ecafa6d7e9f4591be8643b18b3589fd6acc6751c7862655c0536 SHA512 e1e0908a41faadef4d8cf6b44dd84dc184dcca88daef1a3a0b4f8ad8180781cd054faa6ef3114f99c9fead2b330ecaf40fc18e745866ce5394b6f8ca53f2ccbd
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.1.1d-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch b/dev-libs/openssl/files/openssl-1.1.1d-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch
new file mode 100644
index 000000000000..1f195d0384c1
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1d-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch
@@ -0,0 +1,107 @@
+From 515c728dbaa92211d2eafb0041ab9fcd258fdc41 Mon Sep 17 00:00:00 2001
+From: Bernd Edlinger <bernd.edlinger@hotmail.de>
+Date: Mon, 9 Sep 2019 19:12:25 +0200
+Subject: [PATCH] Fix potential memory leaks with BN_to_ASN1_INTEGER
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/9833)
+
+(cherry picked from commit f28bc7d386b25fb75625d0c62c6b2e6d21de0d09)
+---
+ crypto/ec/ec_asn1.c     |  7 +++++--
+ crypto/x509v3/v3_asid.c | 26 ++++++++++++++++++++------
+ 2 files changed, 25 insertions(+), 8 deletions(-)
+
+diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
+index 1ce1181fc10..7cbf8de9813 100644
+--- a/crypto/ec/ec_asn1.c
++++ b/crypto/ec/ec_asn1.c
+@@ -446,6 +446,7 @@ ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group,
+     unsigned char *buffer = NULL;
+     const EC_POINT *point = NULL;
+     point_conversion_form_t form;
++    ASN1_INTEGER *orig;
+ 
+     if (params == NULL) {
+         if ((ret = ECPARAMETERS_new()) == NULL) {
+@@ -496,8 +497,9 @@ ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group,
+         ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_EC_LIB);
+         goto err;
+     }
+-    ret->order = BN_to_ASN1_INTEGER(tmp, ret->order);
++    ret->order = BN_to_ASN1_INTEGER(tmp, orig = ret->order);
+     if (ret->order == NULL) {
++        ret->order = orig;
+         ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_ASN1_LIB);
+         goto err;
+     }
+@@ -505,8 +507,9 @@ ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group,
+     /* set the cofactor (optional) */
+     tmp = EC_GROUP_get0_cofactor(group);
+     if (tmp != NULL) {
+-        ret->cofactor = BN_to_ASN1_INTEGER(tmp, ret->cofactor);
++        ret->cofactor = BN_to_ASN1_INTEGER(tmp, orig = ret->cofactor);
+         if (ret->cofactor == NULL) {
++            ret->cofactor = orig;
+             ECerr(EC_F_EC_GROUP_GET_ECPARAMETERS, ERR_R_ASN1_LIB);
+             goto err;
+         }
+diff --git a/crypto/x509v3/v3_asid.c b/crypto/x509v3/v3_asid.c
+index 089f2ae29f0..ef2d64826fb 100644
+--- a/crypto/x509v3/v3_asid.c
++++ b/crypto/x509v3/v3_asid.c
+@@ -256,6 +256,7 @@ static int extract_min_max(ASIdOrRange *aor,
+ static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice)
+ {
+     ASN1_INTEGER *a_max_plus_one = NULL;
++    ASN1_INTEGER *orig;
+     BIGNUM *bn = NULL;
+     int i, ret = 0;
+ 
+@@ -298,9 +299,15 @@ static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice)
+          */
+         if ((bn == NULL && (bn = BN_new()) == NULL) ||
+             ASN1_INTEGER_to_BN(a_max, bn) == NULL ||
+-            !BN_add_word(bn, 1) ||
+-            (a_max_plus_one =
+-             BN_to_ASN1_INTEGER(bn, a_max_plus_one)) == NULL) {
++            !BN_add_word(bn, 1)) {
++            X509V3err(X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL,
++                      ERR_R_MALLOC_FAILURE);
++            goto done;
++        }
++
++        if ((a_max_plus_one =
++                BN_to_ASN1_INTEGER(bn, orig = a_max_plus_one)) == NULL) {
++            a_max_plus_one = orig;
+             X509V3err(X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL,
+                       ERR_R_MALLOC_FAILURE);
+             goto done;
+@@ -351,6 +358,7 @@ int X509v3_asid_is_canonical(ASIdentifiers *asid)
+ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
+ {
+     ASN1_INTEGER *a_max_plus_one = NULL;
++    ASN1_INTEGER *orig;
+     BIGNUM *bn = NULL;
+     int i, ret = 0;
+ 
+@@ -416,9 +424,15 @@ static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
+          */
+         if ((bn == NULL && (bn = BN_new()) == NULL) ||
+             ASN1_INTEGER_to_BN(a_max, bn) == NULL ||
+-            !BN_add_word(bn, 1) ||
+-            (a_max_plus_one =
+-             BN_to_ASN1_INTEGER(bn, a_max_plus_one)) == NULL) {
++            !BN_add_word(bn, 1)) {
++            X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE,
++                      ERR_R_MALLOC_FAILURE);
++            goto done;
++        }
++
++        if ((a_max_plus_one =
++                 BN_to_ASN1_INTEGER(bn, orig = a_max_plus_one)) == NULL) {
++            a_max_plus_one = orig;
+             X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE,
+                       ERR_R_MALLOC_FAILURE);
+             goto done;
diff --git a/dev-libs/openssl/files/openssl-1.1.1d-fix-zlib.patch b/dev-libs/openssl/files/openssl-1.1.1d-fix-zlib.patch
new file mode 100644
index 000000000000..5d2f923a4872
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1d-fix-zlib.patch
@@ -0,0 +1,52 @@
+From 86ed78676c660b553696cc10c682962522dfeb6c Mon Sep 17 00:00:00 2001
+From: Tomas Mraz <tmraz@fedoraproject.org>
+Date: Thu, 12 Sep 2019 12:27:36 +0200
+Subject: [PATCH] BIO_f_zlib: Properly handle BIO_CTRL_PENDING and
+ BIO_CTRL_WPENDING calls.
+
+There can be data to write in output buffer and data to read that were
+not yet read in the input stream.
+
+Fixes #9866
+
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/9877)
+
+(cherry picked from commit 6beb8b39ba8e4cb005c1fcd2586ba19e17f04b95)
+---
+ crypto/comp/c_zlib.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
+index d688deee5f2..7c1be358fd7 100644
+--- a/crypto/comp/c_zlib.c
++++ b/crypto/comp/c_zlib.c
+@@ -598,6 +598,28 @@ static long bio_zlib_ctrl(BIO *b, int cmd, long num, void *ptr)
+         BIO_copy_next_retry(b);
+         break;
+ 
++    case BIO_CTRL_WPENDING:
++        if (ctx->obuf == NULL)
++            return 0;
++
++        if (ctx->odone) {
++            ret = ctx->ocount;
++        } else {
++            ret = ctx->ocount;
++            if (ret == 0)
++                /* Unknown amount pending but we are not finished */
++                ret = 1;
++        }
++        if (ret == 0)
++            ret = BIO_ctrl(next, cmd, num, ptr);
++        break;
++
++    case BIO_CTRL_PENDING:
++        ret = ctx->zin.avail_in;
++        if (ret == 0)
++            ret = BIO_ctrl(next, cmd, num, ptr);
++        break;
++
+     default:
+         ret = BIO_ctrl(next, cmd, num, ptr);
+         break;
diff --git a/dev-libs/openssl/openssl-1.0.2r.ebuild b/dev-libs/openssl/openssl-1.0.2r.ebuild
deleted file mode 100644
index c14fecb318d2..000000000000
--- a/dev-libs/openssl/openssl-1.0.2r.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
-
-# openssl-1.0.2-patches-1.6 contain additional CVE patches
-# which got fixed with this release.
-# Please use 1.7 version number when rolling a new tarball!
-PATCH_SET="openssl-1.0.2-patches-1.5"
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	!vanilla? (
-		mirror://gentoo/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
-	)"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-# This does not copy the entire Fedora patchset, but JUST the parts that
-# are needed to make it safe to use EC with RESTRICT=bindist.
-# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
-SOURCE1=hobble-openssl
-SOURCE12=ec_curve.c
-SOURCE13=ectest.c
-# These are ported instead
-#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
-#PATCH37=openssl-1.1.0-ec-curves.patch
-FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
-FEDORA_GIT_BRANCH='f25'
-FEDORA_SRC_URI=()
-FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
-FEDORA_PATCH=( $PATCH1 $PATCH37 )
-for i in "${FEDORA_SOURCE[@]}" ; do
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
-done
-for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
-done
-SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	if use bindist; then
-		# This just removes the prefix, and puts it into WORKDIR like the RPM.
-		for i in "${FEDORA_SOURCE[@]}" ; do
-			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
-		done
-		# .spec %prep
-		bash "${WORKDIR}"/"${SOURCE1}" || die
-		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
-		for i in "${FEDORA_PATCH[@]}" ; do
-			eapply "${DISTDIR}"/"${i}"
-		done
-		eapply "${FILESDIR}"/openssl-1.0.2p-hobble-ecc.patch
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-		# $(use_ssl !bindist srp) \
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/patch/*.patch
-	fi
-
-	eapply_user
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	# this breaks build with 1.0.2p, not sure if it is needed anymore
-	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX%/}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
-	echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		$(use_ssl !bindist srp) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX%/}"/usr \
-		--openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:-fomit-frame-pointer ::g' \
-		-e 's:-O[0-9] ::g' \
-		-e 's:-march=[-a-z0-9]* ::g' \
-		-e 's:-mcpu=[-a-z0-9]* ::g' \
-		-e 's:-m[a-z0-9]* ::g' \
-	)
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 V=1 depend
-	emake all
-	# rehash is needed to prep the certs/ dir; do this
-	# separately to avoid parallel build issues.
-	emake rehash
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED%/}/usr" ]]; then
-		# We can only create this directory once
-		mkdir "${ED%/}"/usr || die
-	fi
-
-	emake INSTALL_PREFIX="${D%/}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED%/}"/usr/bin/c_rehash || die
-
-	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
-	einstalldocs
-
-	use rfc3779 && dodoc engines/ccgost/README.gost
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	dodir ${SSL_CNF_DIR}/certs
-	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
-	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.0.2s-r2.ebuild b/dev-libs/openssl/openssl-1.0.2s-r2.ebuild
deleted file mode 100644
index fbf3c919b91d..000000000000
--- a/dev-libs/openssl/openssl-1.0.2s-r2.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal
-
-# openssl-1.0.2-patches-1.6 contain additional CVE patches
-# which got fixed with this release.
-# Please use 1.7 version number when rolling a new tarball!
-PATCH_SET="openssl-1.0.2-patches-1.5"
-MY_P=${P/_/-}
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	!vanilla? (
-		mirror://gentoo/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
-	)"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-# This does not copy the entire Fedora patchset, but JUST the parts that
-# are needed to make it safe to use EC with RESTRICT=bindist.
-# See openssl.spec for the matching numbering of SourceNNN, PatchNNN
-SOURCE1=hobble-openssl
-SOURCE12=ec_curve.c
-SOURCE13=ectest.c
-# These are ported instead
-#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
-#PATCH37=openssl-1.1.0-ec-curves.patch
-FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
-FEDORA_GIT_BRANCH='f25'
-FEDORA_SRC_URI=()
-FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
-FEDORA_PATCH=( $PATCH1 $PATCH37 )
-for i in "${FEDORA_SOURCE[@]}" ; do
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
-done
-for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix
-	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" )
-done
-SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	if use bindist; then
-		# This just removes the prefix, and puts it into WORKDIR like the RPM.
-		for i in "${FEDORA_SOURCE[@]}" ; do
-			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
-		done
-		# .spec %prep
-		bash "${WORKDIR}"/"${SOURCE1}" || die
-		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
-		for i in "${FEDORA_PATCH[@]}" ; do
-			eapply "${DISTDIR}"/"${i}"
-		done
-		eapply "${FILESDIR}"/openssl-1.0.2p-hobble-ecc.patch
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-		# $(use_ssl !bindist srp) \
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/patch/*.patch
-	fi
-
-	eapply_user
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	# this breaks build with 1.0.2p, not sure if it is needed anymore
-	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	CFLAGS= LDFLAGS= echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		$(use_ssl !bindist srp) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 V=1 depend
-	emake all
-	# rehash is needed to prep the certs/ dir; do this
-	# separately to avoid parallel build issues.
-	emake rehash
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED}/usr" ]]; then
-		# We can only create this directory once
-		mkdir "${ED}"/usr || die
-	fi
-
-	emake INSTALL_PREFIX="${D}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
-	einstalldocs
-
-	use rfc3779 && dodoc engines/ccgost/README.gost
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	dodir ${SSL_CNF_DIR}/certs
-	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
-	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.0.2t-r1.ebuild b/dev-libs/openssl/openssl-1.0.2t-r1.ebuild
index eb39171323f6..53f5acad6bab 100644
--- a/dev-libs/openssl/openssl-1.0.2t-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2t-r1.ebuild
@@ -37,7 +37,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+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 )"
 
diff --git a/dev-libs/openssl/openssl-1.1.0k-r1.ebuild b/dev-libs/openssl/openssl-1.1.0k-r1.ebuild
deleted file mode 100644
index 7bcd5d03e7e3..000000000000
--- a/dev-libs/openssl/openssl-1.1.0k-r1.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal
-
-MY_P=${P/_/-}
-
-# This patch set is based on the following files from Fedora 31,
-# see https://src.fedoraproject.org/rpms/openssl/blob/f28/f/openssl.spec
-# for more details:
-# - hobble-openssl (SOURCE1)
-# - ec_curve.c (SOURCE12)
-# - ectest.c (SOURCE13)
-# - openssl-1.1.0-ec-curves.patch (PATCH37) -- MODIFIED
-BINDIST_PATCH_SET="openssl-1.1.0k-bindist-1.0.tar.xz"
-
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	bindist? ( https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET} )"
-
-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 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
-	"${FILESDIR}"/${PN}-1.1.0k-fix-test_fuzz.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	if use bindist; then
-		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
-		bash "${WORKDIR}"/hobble-openssl || die
-
-		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
-
-		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
-
-		local known_failing_test
-		for known_failing_test in \
-			30-test_evp_extra.t \
-			80-test_ssl_new.t \
-		; do
-			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
-			rm test/recipes/${known_failing_test} || die
-			eend $?
-		done
-
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
-			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
-		fi
-	fi
-
-	eapply_user #332661
-
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	# Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# show the actual commands in the log
-	sed -i '/^SET_X/s@=.*@=set -x@' Makefile.shared || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	# Prefixify Configure shebang (#141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
-		-i Configure || die
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m'
-	# 'srp' was restricted until early 2017 as well.
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	CFLAGS= LDFLAGS= echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		enable-srp \
-		$(use elibc_musl && echo "no-async") \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl sslv3 ssl3-method) \
-		$(use_ssl asm) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED}/usr" ]]; then
-		# We can only create this directory once
-		mkdir "${ED}"/usr || die
-	fi
-
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.1.0l.ebuild b/dev-libs/openssl/openssl-1.1.0l.ebuild
index 09b9314d05cd..deccd8443de1 100644
--- a/dev-libs/openssl/openssl-1.1.0l.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0l.ebuild
@@ -26,7 +26,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 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 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+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 )"
 
diff --git a/dev-libs/openssl/openssl-1.1.1c-r1.ebuild b/dev-libs/openssl/openssl-1.1.1c-r1.ebuild
deleted file mode 100644
index a3a0f2a2c06e..000000000000
--- a/dev-libs/openssl/openssl-1.1.1c-r1.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal
-
-MY_P=${P/_/-}
-
-# This patch set is based on the following files from Fedora 31,
-# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec
-# for more details:
-# - hobble-openssl (SOURCE1)
-# - ec_curve.c (SOURCE12)
-# - ectest.c (SOURCE13)
-# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
-BINDIST_PATCH_SET="openssl-1.1.1c-bindist-1.0.tar.xz"
-
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	bindist? ( https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET} )"
-
-LICENSE="openssl"
-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 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-RDEPEND=">=app-misc/c_rehash-1.7-r1
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-PDEPEND="app-misc/ca-certificates"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
-)
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	if use bindist; then
-		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
-		bash "${WORKDIR}"/hobble-openssl || die
-
-		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
-
-		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
-
-		local known_failing_test
-		for known_failing_test in \
-			30-test_evp_extra.t \
-			80-test_ssl_new.t \
-		; do
-			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
-			rm test/recipes/${known_failing_test} || die
-			eend $?
-		done
-
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
-			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
-		fi
-	fi
-
-	eapply_user #332661
-
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	# Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	# Prefixify Configure shebang (#141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
-		-i Configure || die
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m'
-	# 'srp' was restricted until early 2017 as well.
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	CFLAGS= LDFLAGS= echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		enable-srp \
-		$(use elibc_musl && echo "no-async") \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl sslv3 ssl3-method) \
-		$(use_ssl asm) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED}/usr" ]]; then
-		# We can only create this directory once
-		mkdir "${ED}"/usr || die
-	fi
-
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
-	# create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-		[[ ${m} == openssl.1* ]] && continue
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-		mv ${d}/{,ssl-}${m}
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
-		ln -s ssl-${m} ${d}/openssl-${m}
-		# locate any symlinks that point to this man page ... we assume
-		# that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/openssl/openssl-1.1.1d.ebuild b/dev-libs/openssl/openssl-1.1.1d-r2.ebuild
index dfb4be45e239..2130482bcb98 100644
--- a/dev-libs/openssl/openssl-1.1.1d.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1d-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 LICENSE="openssl"
 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 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+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 )"
 
@@ -45,14 +45,35 @@ PDEPEND="app-misc/ca-certificates"
 
 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
 )
 
 S="${WORKDIR}/${MY_P}"
 
+# force upgrade to prevent broken login, bug 696950
+RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
+
 MULTILIB_WRAPPED_HEADERS=(
 	usr/include/openssl/opensslconf.h
 )
 
+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
+		fi
+	fi
+}
+
 src_prepare() {
 	if use bindist; then
 		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
@@ -93,6 +114,16 @@ 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
+	fi
+
 	# make sure the man pages are suffixed #302165
 	# don't bother building man pages if they're disabled
 	# Make DOCDIR Gentoo compliant
diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest
index 4dbd52b9d35c..3c18bf532d55 100644
--- a/dev-libs/ossp-uuid/Manifest
+++ b/dev-libs/ossp-uuid/Manifest
@@ -9,5 +9,5 @@ AUX ossp-uuid-1.6.2-php70.patch 11172 BLAKE2B 8cd653ff28f8eafb8f47eefb830a18bfa6
 AUX ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch 2535 BLAKE2B b5d2aa2673ec14779f4bda0c28609c807071eaf88a876d472bbc19de891b04aad47bdd4105712e28e604a968062ffdf199b60f1903fd89dd4caabd919bac2348 SHA512 64634327b2095bac0f8f9778b5c6e09edbaf3f6993aea344e3d8ff0bb661d0e0afae9806a364a33c3be6ca7dd7a23b9b8a501c742e99ad88fbefb88d0c4cfe8c
 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 3046 BLAKE2B bf9673f52ac3d58bf47b771634fea820c442a1a71a4a8df2ad9c388249b1b2b3e49ef1da018e3d7c89196cf91a76dc96f448ecfcb547f6f676c9ce57be42ea31 SHA512 bb046bc2d048892e8fa8acbcd0941f548aac5300829d338be94233db5b70fd96b0ed7910edbae181b20d95f6837b941d13bdc389ac65319213c18bdc15b351fa
+EBUILD ossp-uuid-1.6.2-r6.ebuild 3025 BLAKE2B 60e909e2aae3ec4d81c7bca9e332ebeb9f0b844db63d6a541cfb9adc0bd7f3c936d747fda766d06f76e35c4f6572240dc78e05e4166e1eda7c0f662a7661f210 SHA512 75c38940f5004ea8d2d599a1eff43a7e38ef9ec4d861740b54e37ceff9a8ba73cc8fdc761c42bdf583a24b7143be18ab0b3a90cdce774250c060b62a4a63ad73
 MISC metadata.xml 248 BLAKE2B 491e9ad2de37296d9a80e8149cc62db2e8fbf8c8fea001ff675c244f9f61740ee1dbceef0b5f467b88ad105f9be751fc99420eff8429f4a1dbb4a00e2b763e6e SHA512 ceeb1d27ec5afa7cd117c05220a5191629c08a008f5640050fab3deb9610d48610a314cff6f1a73577b3e771c3015e14fbc6273377cad6c559f277982f1b0b80
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
index f0bc8e587ac4..ae03e3b394e7 100644
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
@@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="+cxx perl php static-libs"
 
 DEPEND="perl? ( dev-lang/perl:= )"
diff --git a/dev-libs/pcc-libs/Manifest b/dev-libs/pcc-libs/Manifest
index ef8206a5f97c..1e8de2719704 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 561 BLAKE2B 330ebcfe67e2c726616985844c9bfd2c7db74a4bea962325e4f5124551ed12a99d5c6fb210f6112c01c58875cf09f71dde5111f2b356b8018f4428f32cf72f5c SHA512 14d055395b0546c3159aa7678281ab955b0cf9a01a603eb39601ddc6be95073363df9a12a42a8360de442ae7d2dd9e43f32bc4fe82e2e2dd08d36073b71b0d16
-EBUILD pcc-libs-9999.ebuild 674 BLAKE2B 5d6e2466a01f9e0a7ddc3a737862e3ce793d83643ad6d2c0bd3aa5806bd8556d3b522d3418bc22fb68dd6107ca7ae2e9fccdf6b7e98050dace650f3386b10e04 SHA512 e0816de3682a9a73b9e8de8c6d879c6b0cf506042f4392e465c306e3cabcd6a080bb4a09e4a1a1fa90879fa935f64db03d618834f17b0ace2a2a33dcccef5d22
+EBUILD pcc-libs-1.1.0.ebuild 549 BLAKE2B 7f0169ae4bdcee16fe4f8159c3d47d140f049ea8ad439d74a1b900e87653ea233d4e24a6fc2bfc1dbb2790c21ad3b57f6d78ac5f36df35491e7dce47ffb4a7b6 SHA512 006f9ce2cc29ce65999fc846c72818f4c33be20c666375fe75ea182d0ea7eeceae25c4aca1aa01554f9f79e343e4b3029572f8c4eb9790a55b4942f8ac7df143
+EBUILD pcc-libs-9999.ebuild 662 BLAKE2B 4717e61287665fe2f6a2797a9bacd780fa0da8e17ea47e2ba6d196791b2cb00985724b7a36d2bc9621af7a3afb2dd9e5217a76b5e78238a8774b96ee1c54874b SHA512 826a8f117788651fff1a1e277bde00b136cb40a141d84df35c4985a44924d3566180d89fedbfd73a7b0e6ab9f99810dcf10e7550c21a784a0efddb3c3d780b66
 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 b084d5d901f4..a045911ed6cf 100644
--- a/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild
+++ b/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://pcc.ludd.ltu.se"
 SRC_URI="ftp://pcc.ludd.ltu.se/pub/pcc-releases/${P}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 DEPEND=""
diff --git a/dev-libs/pcc-libs/pcc-libs-9999.ebuild b/dev-libs/pcc-libs/pcc-libs-9999.ebuild
index af530465ea47..ce43fb4adbd4 100644
--- a/dev-libs/pcc-libs/pcc-libs-9999.ebuild
+++ b/dev-libs/pcc-libs/pcc-libs-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="ftp://pcc.ludd.ltu.se/pub/pcc-releases/${P}.tgz"
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+	KEYWORDS="~amd64 ~x86"
 fi
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/pcre++/Manifest b/dev-libs/pcre++/Manifest
deleted file mode 100644
index eca839a048b3..000000000000
--- a/dev-libs/pcre++/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pcre++-0.9.5-patches.tar.bz2 3733 BLAKE2B b915f094498ba34d875515ab5e16db71d4e1a17c15b08332e761cc7ff2113d16afe6f12d8321194c7ef6dac960349b6ebb281eb8ddd25f239767a70db143a970 SHA512 ddfb13575f7950c7298ddce5fd603c8f34c1e901c8fef71f7591d0c4a49dc36cf5204240dbb23078346a4497f69b541374633e9f3f17b045fc58ba3ccd0f8019
-DIST pcre++-0.9.5.tar.gz 381589 BLAKE2B 573a8d43556e1d925cf21928d773f66086adb2a60db72865bb463fbe4810c5bc17e2a2c5c2a713c2bf2d512ae5255a81707536bbace65e9b467697e7776d0243 SHA512 509080e31483ea82f13873423b48adfcf78ff8d4b5480fb8d46f6bb4a596a0480e4ae32da9e5518b1a6e98679b4e1a523cc9d6f8d8373dcec6f73d18479712e5
-EBUILD pcre++-0.9.5-r1.ebuild 1130 BLAKE2B 73e75942ac7c219e6dd788ffa2b99d9010f008c25bebacc097cbc4b199ff22025bc2f61ac53eae278e4cbef498a4905203f8b5816878fc725596436d3516f6ca SHA512 6de974b97b556972c052e37c21567a7d0f6066b0efd12ea7467fed6e8269e0ab2998bdf21dab6c12fbddb90e25faa750798aca0ec5a7c137db2ae5135dc12363
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/pcre++/metadata.xml b/dev-libs/pcre++/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-libs/pcre++/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild b/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild
deleted file mode 100644
index c6ee554bcc22..000000000000
--- a/dev-libs/pcre++/pcre++-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils autotools
-
-DESCRIPTION="A C++ support library for libpcre"
-HOMEPAGE="http://www.daemon.de/PCRE"
-SRC_URI="http://www.daemon.de/files/mirror/ftp.daemon.de/scip/Apps/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}-patches.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="static-libs"
-
-DEPEND="dev-libs/libpcre"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	EPATCH_SUFFIX="patch" \
-	EPATCH_SOURCE="${WORKDIR}/${P}-patches" \
-	EPATCH_FORCE="yes" \
-	epatch
-
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #467670
-
-	# Upstream is kind of dead, so handle the rename ourselves.
-	mv configure.{in,ac} || die
-
-	# Disable examples which we never run/install.
-	echo > examples/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}"/usr -name 'lib*.la' -delete
-
-	dohtml -r doc/html/.
-	doman doc/man/man3/Pcre.3
-
-	rm -rf "${ED}/usr/doc"
-}
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index c559a0742143..cfffaed09e63 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,4 +1,4 @@
 AUX pkcs11-helper-1.25.1-build.patch 932 BLAKE2B 792082e48c6566c47ec4b043ccd7762d2c94d8c6f6d7fe8233f91e8f17c2361cb1786644ad7e77f8f0c398cc8d86167f675257a9dbf62a40bd56f1e7c9cb6d40 SHA512 81494d947f62b9cf4aa45fe35a88afb0044a5b36fa89e7f175cb9ab4e1d17ffc6afc81a8da17ab18f087b47894460d0d8c26ca8024c98a73a4bc2a14bbf00346
 DIST pkcs11-helper-1.25.1.tar.bz2 425719 BLAKE2B 527b387a981dbfd855d4eb0024dd7625388cda27c3a0e993b49315e311d46f1735afc8d436361ac1b75a7b3d7f1f712d7dda8eb546ab7adc3dc046bc85fd4c5a SHA512 a5954f4d07a166ed7e711b7a0aa84b454b25774b2fb187ca65bba439f59539c8074bda8ddd5f579d635fe0dc27d8415d8bd22707dc91327bbe05ce03e277b499
-EBUILD pkcs11-helper-1.25.1.ebuild 1065 BLAKE2B 473c17885fe3d618fa8ffcc514d12af4bb21a7e38e7a0667be24f334d18b360d1d5f9e3bd36ac78ead70cb05e36acc618e56fba711e830ca1d574f5e7f0f39b8 SHA512 fac27eee74cc0a196297e167d7024e3cebca0d9da4b72bd82268df0ca62246546f4a42e75b39fc59e660f0b6d21254125ae2a5ecc165e207fd50dedc2a39b737
+EBUILD pkcs11-helper-1.25.1.ebuild 1055 BLAKE2B 5e83f9c42dbffa5885adc476992aad7b54c061c029a4c97e1c5af9bbceb6d58a4b3469168e03e222ac144017cea5d7baa739cd5f876d5325f26dac4038a36c0e SHA512 0214f6b86769f6de54ee219dcb211ef6adfc4b681bd907400d253e642c98dba21f94a32cc3700089b3b80cf34a40e3e6343e8dc7a267f4ceb8476f36ebb60e35
 MISC metadata.xml 507 BLAKE2B 0931fc75f319958ede51838e6e22cc9eb99871b3bf3e1bebe2d635d6e1ce585f4fa723afd0b3a21c33e9545543e7d7d6b8b6f9e27e929b01d2c77b59ce2e41f6 SHA512 440b311a012774466333018e7000dc220fa8a0bba83bf7f8c54f2acd5d50939c827a5fc8105542da9c0a6087599387f3fefbb1458b31382127e597823c698428
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
index b79c9b4d01af..14dcca9b8781 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="bindist doc gnutls libressl nss static-libs"
 
 RDEPEND="
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index 4a4fde2b25bd..9af3bb709485 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 3850 BLAKE2B 4a527b3b1a416c97f9cf4a9b093f262cbd9243e3e24d8af4a868b2fe55e0adb45d21290a6735a26a364572165a2518bc8d50eff5091ce883169b2d223ca74a8a SHA512 e8fc21f64b36e82b064648f6108ae6e9c64117bde3f5d092d49ffbcdd704c90d71d8d121756c06eed8c82cf8e4e75c3a5b7f966ebccec89a76f0957091287f3d
+EBUILD poco-1.9.0-r2.ebuild 3848 BLAKE2B 997744d759075ab074b611237b98327a162eca4778e8a6cb14e6823ce4b21f182f27e2c63e10aed205c18208f43abbf0fc268d61d7cdbc4b799da0c2a563202a SHA512 7b05546ae7dfb9faa3cec811e5a7300aee3eae3f8ed74aeafa6056ac16d9a290812cf90d3796c0c24f7606f5d436f39a820d8c7ecf05a219d033ae119a631f25
 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 0e799b657b11..f2c9dd98dac6 100644
--- a/dev-libs/poco/poco-1.9.0-r2.ebuild
+++ b/dev-libs/poco/poco-1.9.0-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit cmake-utils
 
 DESCRIPTION="C++ libraries for building network-based applications"
@@ -11,7 +12,7 @@ LICENSE="Boost-1.0"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
 
-IUSE="7z cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl mariadb +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip"
+IUSE="7z cppparser +crypto +data examples +file2pagecompiler iodbc +json libressl mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip"
 REQUIRED_USE="
 	7z? ( xml )
 	file2pagecompiler? ( pagecompiler )
@@ -21,48 +22,48 @@ REQUIRED_USE="
 	odbc? ( data )
 	pagecompiler? ( json net util xml )
 	pocodoc? ( cppparser util xml )
-	ssl? ( util )
 	sqlite? ( data )
+	ssl? ( util )
 	test? ( data? ( sqlite ) json util xml )
 "
 
+BDEPEND="
+	virtual/pkgconfig
+"
 RDEPEND="
 	>=dev-libs/libpcre-8.42
-	xml? ( dev-libs/expat )
 	mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= )
 		 mariadb? ( dev-db/mariadb-connector-c:0= ) )
 	odbc? ( iodbc? ( dev-db/libiodbc )
 		!iodbc? ( dev-db/unixODBC ) )
+	sqlite? ( dev-db/sqlite:3 )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
-	sqlite? ( dev-db/sqlite:3 )
+	xml? ( dev-libs/expat )
 	zip? ( sys-libs/zlib )
 "
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}-${P}-release"
 
 PATCHES=( "${FILESDIR}/${PN}-1.7.2-iodbc-incdir.patch" )
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	if use test ; then
 		# ignore missing tests on experimental library
 		# and tests requiring running DB-servers, internet connections, etc.
-		sed -i \
-			-e '/testsuite/d' \
+		sed -i -e '/testsuite/d' \
 			{Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,PDF,Redis}/CMakeLists.txt || die
 		# Poco expands ~ using passwd, which does not match $HOME in the build environment
-		sed -i \
-			-e '/CppUnit_addTest.*testExpand/d' \
+		sed -i -e '/CppUnit_addTest.*testExpand/d' \
 			Foundation/testsuite/src/PathTest.cpp || die
 		# ignore failing Crypto test since upstream does not seem to care,
 		# see https://github.com/pocoproject/poco/issues/1209
-		sed -i \
-			-e '/RSATest, testRSACipherLarge/d' \
+		sed -i -e '/RSATest, testRSACipherLarge/d' \
 			Crypto/testsuite/src/RSATest.cpp || die
 	fi
 
@@ -81,7 +82,9 @@ src_prepare() {
 	# Add missing directory that breaks the build
 	mkdir -p Encodings/testsuite/data || die
 
-	cmake-utils_src_prepare
+	if ! use iodbc ; then
+		sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die
+	fi
 }
 
 src_configure() {
@@ -111,10 +114,6 @@ src_configure() {
 		-DENABLE_ZIP="$(usex zip)"
 	)
 
-	if ! use iodbc ; then
-		sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die
-	fi
-
 	cmake-utils_src_configure
 }
 
diff --git a/dev-libs/polylib/Manifest b/dev-libs/polylib/Manifest
deleted file mode 100644
index 36e67226bd8a..000000000000
--- a/dev-libs/polylib/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD polylib-9999.ebuild 439 BLAKE2B b3d64edb3cd211bd2f0edd75d72b7ad41bfe708dd9e1b2b9c144c0663a5e9a1af7c421638e1c8b57425192a9e3b57df930c77933c6d1e3bbe8ba20c32782bf57 SHA512 92eb8a3490b3abbf6bd9519acdc0cb8b06b026dd1ef0b15b1a476903ffaba5e1686f61c3ddc69d5d9879fb4b080fac8120bed639182f9a4eafdf227e7dfa9b72
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/polylib/metadata.xml b/dev-libs/polylib/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-libs/polylib/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-libs/polylib/polylib-9999.ebuild b/dev-libs/polylib/polylib-9999.ebuild
deleted file mode 100644
index dabb9d8742d9..000000000000
--- a/dev-libs/polylib/polylib-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools git-r3
-
-EGIT_REPO_URI="https://repo.or.cz/r/${PN}.git"
-
-DESCRIPTION="ppl port of cloog"
-HOMEPAGE="http://icps.u-strasbg.fr/polylib/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-src_prepare() {
-	default
-	eautoreconf
-	sed -i '/Libs:/s:@LDFLAGS@::' configure
-}
-
-src_install() {
-	default
-	dodoc doc/Changes
-}
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index 08c891843329..be32ddab83a7 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,4 +1,4 @@
 AUX fix-popt-pkgconfig-libdir.patch 519 BLAKE2B d31d6d121f745f208c743aed94c071343efd09b8396c777f7887e8931f87d4fd8e4fa1eff7ec340300a68ae67862cdd7bb05d6bd60e08289c406d3cc9f4ead6d SHA512 8862cb25283f38d734aa1abaa4d29d1f018718be77d03a4f0533b6b8b2518581abf277eefd3b3d56d5f9ab9e00b544e816e83fca6863e86a66dacae0f9abbfd0
 DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
-EBUILD popt-1.16-r2.ebuild 922 BLAKE2B 5a7351477b23333961b5e86db33aaa90b2d80e8e41aabea34ea1fbbb86c6b0904b42734bacfd1800e5c5bd694876b1d82abc54381cdbb53097fdc3e58137dcf1 SHA512 cc607f3d29a91c4438af6ef9e95f4c36444bb71dd40890c0b31b0ae800373301a4588d28633f7028f151e50be3cac6990f905dd9322e7b5f2e3f65afb9d7e263
+EBUILD popt-1.16-r2.ebuild 900 BLAKE2B a6fac4e8dbaf4832c95ece59c3de49d8ad4560bc4ee1cd2891cab57801344dcbdacd12f6556d5b8881171b9e65be5392d5870ff04901392921e90366baad518f SHA512 af417eafe70d2576f860cfb351db8c0a56099c3ee946de41b7e8b2287fd9bf4bbe05bd30a2c0e638d12475061c8a57f8e799d2f89b568bd866740f5e6ad9fcaa
 MISC metadata.xml 263 BLAKE2B da35927a73cc22621ec3170a872817bc1f2e91967dd369f21f6543ce2a02e995eb654ab2c1209bae764ef194788828e00daf5d559d3a26926e6912838075dc7f SHA512 b25a1229f571493fdde40749d60d17d411676854bc3f73810e15edac8a2a930d3633f46a6f7f5a7ec6cf7f36b9ef690a7e03916c7c76869315f5ba1f862fd0f0
diff --git a/dev-libs/popt/popt-1.16-r2.ebuild b/dev-libs/popt/popt-1.16-r2.ebuild
index efda71d2e079..e5c34f2d0c40 100644
--- a/dev-libs/popt/popt-1.16-r2.ebuild
+++ b/dev-libs/popt/popt-1.16-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://rpm5.org/files/popt/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index 3762bc78437f..7e029f2624cc 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -1,5 +1,5 @@
 DIST ppl-1.1.tar.xz 14734820 BLAKE2B 2c96d86b534c7f06569bfe37d0ca1938b0c7c708b38d62e210d868db005275e392b2cc9e6dded7d4a5bf1e901136c298b0ff86d2933dc89b4607d5ef9e286b86 SHA512 ae0503fb3eac494fa3edf5d5c9ec61e2419e6e2fa57d30323f7d0360ff080b033686410c7462f5b2ff5514803451cb91e9c0fc14cf953485c5f5fd664448cc27
 DIST ppl-1.2.tar.xz 14136236 BLAKE2B 060b73384dac558dc8b2b0f1027ed0aa270b0adf0992c2ca1a281fa7bcdf959cba3a9e8ee29e978d12c3eee606b819075c5bcab59f4aed24fbf1c5512b5e2c36 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350
-EBUILD ppl-1.1.ebuild 1611 BLAKE2B cd6d8213986c0ddddf1aad3294e9850aa344aa06414e95bffb3cee7f648535e174bd6e535f05cf01ff7ac97bdfb8722c8c9db8d9da5aeb5869f5820698f71d4c SHA512 5e63a2d590086a49c82e64f315ff385ae30e8e63ff5f70ad289a5e5c08bc3e8a7a679ffcf7d734590e95197f465f4cab7cd23946cfbd01ecca2d4b70b183be82
-EBUILD ppl-1.2.ebuild 1615 BLAKE2B c99256375ecacf278e5dec97c156c26f30803c16781ba02ae37e1d6e701181c8a738154c3e471469b755643b13449b62499de3ebff6959221fed03052977b5ea SHA512 218bf984d5f777ceb87e4e9d9bd91120ac128db5be205cc14a823e215774907f737669b38a47214b5b8f504ee75238429d792bd48b349ccc833ed2154a39e30e
+EBUILD ppl-1.1.ebuild 1589 BLAKE2B 82d6a50faa6173d6c85429f8b0aeace735b519ae77b8eec6c204ad30de3f0b5c887f3891a0e4dc712d6aa3fe23be88e0fbf6f57c1732324a59489cba7d40775d SHA512 c2c7fd8b97b008fee843de17cb9319779ff731ee421b0e65b7039bb750846c23825b0f4950e7b0ce3b19f8bc423a3e5a6d057d3de10ae42e721fadb71005737b
+EBUILD ppl-1.2.ebuild 1593 BLAKE2B ddfa57fd25701c8c53df4c5900d85770796137a47d901ec60cca87fc70e58131ba37cb4c1d5371860692a5331e6503029365e123f18b6ed9caaf355198d07eef SHA512 5ab574fe9692b7f0ab15cf3408bba0e6a3c9a4826f6e0ea6c6641f29b29ab103f3a5cd74c9360fa56415dd5f84dc7987ab070c1b82e10c089e8e5d4e0608f9cb
 MISC metadata.xml 354 BLAKE2B 77e58ca8f59039d9814e8388a7fa941fe88130fadd21720447f050f09cbccdf289153f15874c6f48cd7d8720841d181e4904e515df87c3a16fc8673283b41b4c SHA512 5f42b5399f8961160bd6ed9db93c11e2f7c7f1e750c227068fb828ac7519c927b55786d7cf60481d21813d48af51e7cae7e1c8baca12f8fbe6a1f4e701377a50
diff --git a/dev-libs/ppl/ppl-1.1.ebuild b/dev-libs/ppl/ppl-1.1.ebuild
index 1aa44fbb4e19..fa6ffdcc1e63 100644
--- a/dev-libs/ppl/ppl-1.1.ebuild
+++ b/dev-libs/ppl/ppl-1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0/4.13" # SONAMEs
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~sparc-solaris"
 IUSE="+cxx doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx]
diff --git a/dev-libs/ppl/ppl-1.2.ebuild b/dev-libs/ppl/ppl-1.2.ebuild
index 4c4cf952f0d8..7b7669adc3b7 100644
--- a/dev-libs/ppl/ppl-1.2.ebuild
+++ b/dev-libs/ppl/ppl-1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0/4.14" # SONAMEs
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~sparc-solaris"
 IUSE="+cxx doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx]
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 1fe415934285..8e660fc0307b 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -14,9 +14,11 @@ DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fd
 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.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-9999.ebuild 2720 BLAKE2B 2f45592f132b7758201e6c3125290ce4aef7728997cc64a325585679a81a92ae9eb5037a67c78eb762ab2490e7ddd4e174024b869d01b8629a31838fa0a52541 SHA512 0353bf1028af6eeae9689b7a08aa6e5726638c6a7e9472cf2fe4153c3c346222ec14e5a9c2627c1eff94a6e00c52a9c39c642ea05da082f53b87dd59787b2ffa
+EBUILD protobuf-3.9.2.ebuild 2896 BLAKE2B c893d4fd10dc19eb708804bb6c65ff9c349ead7e318e87a44aa6e6554ca8989227de888b5ff733d788ab2a425d1c6342f67ef549705559efddee8deb2fc2c69e SHA512 27e0441ce650a4981808dd5fd25b88ae33371e012be0e522635907bfce65e049d2095a14dcfed8c261d5c2ec3d3a34e0bb214bd133cefa5e5c28aa8c3be61332
+EBUILD protobuf-9999.ebuild 2664 BLAKE2B 91a5ee25ea6ac2ff3f15be0b2dbc320df7dd1ade591cdc370cc66d31c67332eb1575623365d75c8181fc37e909f53426b3389088f06c733b88333534b8e47df2 SHA512 8776d66984da869ea25afc82206d151b64fbe1efac6fc903210ffceb2616e4202dc461c58cb85411b471726fa5eb5cf8443af5363d6838729596cf66683bb76f
 MISC metadata.xml 627 BLAKE2B e908d6d2ab7bf7886f09af02f2a2828bcd9d6909ad7b421e0879551c24ab382733c2140def8132c70d7b6a0f8074651773476e9a645c64440ef596a7f62319d0 SHA512 2f60739bbea23091942893776b29257ed556c3d98351e0e9455852e8ea6b275d3ecca613c81ed35c009431c3e5fb378a77259f13c470359526ccbdff4033d86b
diff --git a/dev-libs/protobuf/protobuf-3.9.2.ebuild b/dev-libs/protobuf/protobuf-3.9.2.ebuild
new file mode 100644
index 000000000000..39e484b64e65
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.9.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 2008-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+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/20"
+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.9[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( virtual/emacs )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${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)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+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
+}
+
+multilib_src_configure() {
+	local options=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+
+	if tc-is-cross-compiler; then
+		# Build system uses protoc when building, so protoc copy runnable on host is needed.
+		mkdir -p "${WORKDIR}/build" || die
+		pushd "${WORKDIR}/build" > /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${options[@]}"
+		options+=(--with-protoc="$(pwd)/src/protoc")
+		popd > /dev/null || die
+	fi
+
+	ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}/build/src" protoc
+	fi
+
+	default
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	find "${D}" -name "*.la" -type f -delete || die
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index 00e035ecb002..25600eba82fb 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -1,8 +1,6 @@
 # Copyright 2008-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# True Authors: Arfrever Frehtes Taifersar Arahesis and others
-
 EAPI="7"
 
 inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
@@ -23,7 +21,7 @@ else
 fi
 
 LICENSE="BSD"
-SLOT="0/20"
+SLOT="0/21"
 KEYWORDS=""
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
@@ -91,7 +89,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/ptexenc/Manifest b/dev-libs/ptexenc/Manifest
index 91d1ea5b80da..7c170d862057 100644
--- a/dev-libs/ptexenc/Manifest
+++ b/dev-libs/ptexenc/Manifest
@@ -1,7 +1,3 @@
-DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
-DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-EBUILD ptexenc-1.3.4_p20160523.ebuild 1316 BLAKE2B 5bfb94b2c8768f015452935dc3cfab18f49c37c2de9b1adcc077509a99ab654c6f91bb379ca022805aef2bc79cb20c2554ab313566252e25f5ed4937d3b9c4cc SHA512 e3bb57562cb7215109bddafa5182e8636cc32aa0953d98f33b88cd692df4598c85bac94ee9787e6820779607fefd3c2f09c65a77498bb5ae2fd4cd00e409bb09
-EBUILD ptexenc-1.3.5_p20170524.ebuild 1326 BLAKE2B 4eee0ce2d875623dfb4385543c37c29c65b4c5d8eb1cd78ab15cca2f43f33b7a5c2886b3a9b006dfb0e9c0a36a7c657a7ce90147edd3b0b2408161da1e8c939d SHA512 73036b3d92f6f25a1293257bf64a953e1cc5dc38894a87bc7099e868cc2faea056cf818038fe8bd967195e9ed09575ea2ee33b97d385f320d9c54e9f058cb027
-EBUILD ptexenc-1.3.7_p20190410.ebuild 1309 BLAKE2B 6dbb609fe31db481a2608c52768a17210f30ff1524d0904132a8e5a0bcc67885187175000cf1d5e6201476e0bc09210e6aaca876527d8b08d0ef5ebf0cdd7647 SHA512 c04bcbcd66980d8330b7b65250a3f284dd0283ce92037531b69e1c733e2f27eae9a9f16bf85d0ebc3e943bffbe8c336c052d29979c16bf4a774345ed4bc369b9
+EBUILD ptexenc-1.3.7_p20190410.ebuild 1280 BLAKE2B 116d7d773756fda30d30f169743416f9b8526309052f4f29e6a64abd9d3245b4f32ec31fce83c95d7ca5fbb4ded656d7ab8a5c9f39442234b66ff0cc4daa4f6e SHA512 720b6d5aba97a73dfbf11181c2903c5a06cd58d00358db5db6618824dd27c1eacba9a9a6ad2cee06c56a5082fdbd7cdcafad44079d767d69f0b61bffa50eb816
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-libs/ptexenc/ptexenc-1.3.4_p20160523.ebuild b/dev-libs/ptexenc/ptexenc-1.3.4_p20160523.ebuild
deleted file mode 100644
index a4689313395b..000000000000
--- a/dev-libs/ptexenc/ptexenc-1.3.4_p20160523.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit libtool
-
-DESCRIPTION="Library for Japanese pTeX providing a better way of handling character encodings"
-HOMEPAGE="http://tutimura.ath.cx/ptexlive/?ptexenc"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-# http://tutimura.ath.cx/~nob/tex/ptexlive/ptexenc/${P}.tar.xz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE="iconv static-libs"
-
-DEPEND="iconv? ( virtual/libiconv )
-	dev-libs/kpathsea"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-src_prepare() {
-	default
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=377141
-	sed -i '/^LIBS/s:@LIBS@:@LIBS@ @KPATHSEA_LIBS@:' "${S}"/Makefile.in || die
-
-	cd "${WORKDIR}/texlive-${PV#*_p}-source"
-	S="${WORKDIR}/texlive-${PV#*_p}-source" elibtoolize #sane .so versionning on gfbsd
-}
-
-src_configure() {
-	econf \
-		--with-system-kpathsea \
-		$(use_enable static-libs static) \
-		$(use_enable iconv kanji-iconv)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete
-
-	insinto /usr/include/ptexenc
-	doins ptexenc/unicode-jp.h
-	use iconv && doins ptexenc/kanjicnv.h
-
-	dodoc ChangeLog README
-}
diff --git a/dev-libs/ptexenc/ptexenc-1.3.5_p20170524.ebuild b/dev-libs/ptexenc/ptexenc-1.3.5_p20170524.ebuild
deleted file mode 100644
index 13abee827886..000000000000
--- a/dev-libs/ptexenc/ptexenc-1.3.5_p20170524.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit libtool
-
-DESCRIPTION="Library for Japanese pTeX providing a better way of handling character encodings"
-HOMEPAGE="http://tutimura.ath.cx/ptexlive/?ptexenc"
-SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
-# http://tutimura.ath.cx/~nob/tex/ptexlive/ptexenc/${P}.tar.xz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="iconv static-libs"
-
-DEPEND="iconv? ( virtual/libiconv )
-	dev-libs/kpathsea"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
-
-src_prepare() {
-	default
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=377141
-	sed -i '/^LIBS/s:@LIBS@:@LIBS@ @KPATHSEA_LIBS@:' "${S}"/Makefile.in || die
-
-	cd "${WORKDIR}/texlive-${PV#*_p}-source"
-	S="${WORKDIR}/texlive-${PV#*_p}-source" elibtoolize #sane .so versionning on gfbsd
-}
-
-src_configure() {
-	econf \
-		--with-system-kpathsea \
-		$(use_enable static-libs static) \
-		$(use_enable iconv kanji-iconv)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete
-
-	insinto /usr/include/ptexenc
-	doins ptexenc/unicode-jp.h
-	use iconv && doins ptexenc/kanjicnv.h
-
-	dodoc ChangeLog README
-}
diff --git a/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild b/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild
index 5d658e613464..06d57c340097 100644
--- a/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.3.7_p20190410.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="iconv static-libs"
 
 DEPEND="iconv? ( virtual/libiconv )
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index c78dec2b5120..bcb14118caac 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -2,7 +2,7 @@ AUX pugixml-1.9-Use-CMAKE_INSTALL_LIBDIR-for-pugixml.pc.patch 1670 BLAKE2B f5e44
 AUX pugixml-1.9-always-install-the-pkg-config-file.patch 2820 BLAKE2B 768af20490d163f581a4c683426055fe50fee716e29124d4af28d1a347dbb4e48ff4ea95eab93820ec69d875ece957f66977ff68288b452ba20d2151b9c8c78d SHA512 5ce40e7838ec950902a02b74ebd81958ff821e0dc0a2d8be8d65e194c40c32056f137a8cdbbfa9beaf43665f261c3a8db18e8f6485c3b903f7e59840702ee250
 AUX pugixml-1.9-pkg-config-Use-CMake-GnuInstallDirs-FULL-vars.patch 1641 BLAKE2B 281f24717276e7e21d380d048e6e6896fdc89de88f1ee8745b9880b0c39d5c0043af6f408bd2bfb6dbbea1ef3e516635ea486ed1f247e5b5ef19f7c7e01358a0 SHA512 60a1b80b26d663cccc2da4ed3b2fa631ffe1dd09a62d7e42a00d28844cb097be6c682aa6ecf92e2ce3d9c20569e23d2f1e8133af6c1eb4ceb3f99692fa5c1623
 DIST pugixml-1.9.tar.gz 377369 BLAKE2B 39b5b0d63a20e9c15c5634e56f82207aed63843d252900db94dbf06d100d03916a16523ccb9de433cc94ded4a9e9d1dc11f47bfd6fd75e348a9a2af31c305db6 SHA512 853a9d985aae537391c6524d5413ef4de237d99d96cc58ea7fe7152f786df1e408cdacd2e4387697e23c3e67cdc1d42b29de554501309eae16d86edd0e24785f
-EBUILD pugixml-1.9-r1.ebuild 888 BLAKE2B 309a8ea7a43053b63e11e602b23662e14340c06f97fb7bc14e8c985d456274ec2ed019bcf3aa41e7222ef1458559889ecd6cf5d3221da8a7423bd3a36f1e2c39 SHA512 93712992bd203b5bf882afb07e781c10a32ce2ace17d5d18e9fe340f7bae1d0ec85b7f5e12a58694931d7cf03943617c3cb2596d19512b01043798343a76ed22
-EBUILD pugixml-1.9.ebuild 595 BLAKE2B fdcea3a006480c5ddf8c60ad27d01be9c75b6791409809a39bb1985b881e62269cf3b387ece63ff1b0bd123cf85df06713f78ee636bf768e0f3d6e01414eafbe SHA512 e0f17a0ee26983ddc62cd9b751868e0abe1e8272957a981df199b324e93653f2a4275fd45d8736bc2c02331a672794178d3f11d4823cc0b28de2106e62de2935
-EBUILD pugixml-9999.ebuild 682 BLAKE2B 43d98ba135daff2413a0505a8ea22efe483bbdba1e2b8cdc7bb96f70dd0605e516aa13c9e42a74008d0dcdfc0b0a5ad01d9e1bf71bb4dede49a6026493f9423e SHA512 02030b482bf1c8a62b16300139a84d9419a5d303802222703efce893c4a51532a12ab8bad5c8ee75d6a47b58d184851b19cea24af6e37605160bb23d23114234
+EBUILD pugixml-1.9-r1.ebuild 878 BLAKE2B c2416091370f25dff0a15565a5f755137c0e2d635b3876b9096fe4ee247114fc4e8e4912b985f34aba607c911a4af3c0be8bfe25bc218538a3dd55c2efc5f342 SHA512 5dda6fe0c537d7ab21ecd61446866606567f4b7cd1c6b9e6324c92e74b74e3f8b5024b9a540b41cf1a4d0287dc0b48459f3c83560b945870a86566104ac9fb70
+EBUILD pugixml-1.9.ebuild 585 BLAKE2B 131575f7432ca4a912b7b45006c35d2fffe8e54f3a6b63def1d723fd587c20e58c88ec8ab9a31664732370e9771e427b30d02e0fde9082689693b7010cddf3bc SHA512 5d62f6ec363f503debb8082c699c21744e9a59a3419d10a88dd51c57425f4ce0944b86ce8836efb6be228822a341799015410934fd139b274bc2b2114ae4f90b
+EBUILD pugixml-9999.ebuild 672 BLAKE2B 69e7a66288ebe03c3238c1c75b1ed1a61ac79229c3c4f326bfda4a0ef1d7d388aa5adb13ce4071613eb4d418171ab6b1a41741d7d0e71e69ab251607217b364e SHA512 d4670cb89e776c585e1dd66653476e46d8c5006f1021f278af038b330a2a31ea04908e407582bfee7d33fcca20e2b519645b0f4ba6ee6f6f542cf1e24196c9ae
 MISC metadata.xml 346 BLAKE2B 68e81d68ef327995169a33c1716bf546958902854870095704000abc97634073a87945a54968a1e167bb94b845032b5ab3d8822b1663e7fb3fdfdb5abaf0d789 SHA512 90152b3b666bf26a6b0be0a411aff980d340ab1b38e2068a170b809c883e7a1c29de6adc0c8aef90b5702682a8fe548ba59e2bf077cc3ad145f9d1e3699afcaa
diff --git a/dev-libs/pugixml/pugixml-1.9-r1.ebuild b/dev-libs/pugixml/pugixml-1.9-r1.ebuild
index 4034fa88e5a6..a828ba74f2e3 100644
--- a/dev-libs/pugixml/pugixml-1.9-r1.ebuild
+++ b/dev-libs/pugixml/pugixml-1.9-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
diff --git a/dev-libs/pugixml/pugixml-1.9.ebuild b/dev-libs/pugixml/pugixml-1.9.ebuild
index afcc7834a96b..8c2591dfd445 100644
--- a/dev-libs/pugixml/pugixml-1.9.ebuild
+++ b/dev-libs/pugixml/pugixml-1.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	local mycmakeargs=( -DBUILD_SHARED_LIBS=ON )
diff --git a/dev-libs/pugixml/pugixml-9999.ebuild b/dev-libs/pugixml/pugixml-9999.ebuild
index 3cc627c8675a..bd5bdeffb3ad 100644
--- a/dev-libs/pugixml/pugixml-9999.ebuild
+++ b/dev-libs/pugixml/pugixml-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index 204e84f5ede3..760c3288b20a 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,3 +1,3 @@
 DIST quazip-0.8.1.tar.gz 150584 BLAKE2B 4a1d61b65b01eee06e1292ee88b543675c77ac922d0fb1726ac0afd447d74e8c8154db82da0ce95c2f2c303c036f2795e8938a412dc22e921ee09a0ef99278f6 SHA512 d65dab16c2cbc4d8bb23dae5b2fdff5ef787aaff2653b8e75c3fc8ba1701f5568a52bdde39009f83c5069a9fe3331cd1a49cf965822c4180e88bbc341faa2bfb
-EBUILD quazip-0.8.1.ebuild 1133 BLAKE2B 8b939d526b052909a81d0b6e35f3b421338b2b95d2e529337bd88c079a3b6fd7ad062a8b9d461300ad8b6c9a791afcb778deba0efaa5b1a1cf8d5a055b32b46b SHA512 ab6c233f28b72753597e91dcc02b13e37a607554fd487eef655d74bb3f038bd6c21ff74aae2c939865d9cacd9f67726af7d917002959c13627aac2373ba0c50b
+EBUILD quazip-0.8.1.ebuild 1123 BLAKE2B e211bdacdda7239e678496e9189b82bd182a4893128e0db53fa6f0bbd6e651b505f8562b8eccdc91a2202e3bdfaddb5d9d90c420a9f2c680649810a79c183086 SHA512 82dbb19ddef59c2746c5a83fa2eb66adcb88827048d780b373fdc8936e4745f3aac676f89ab00e77a3aa449fe314890d9f2bc111adbfd33bd4f8d06873eec531
 MISC metadata.xml 291 BLAKE2B c82030a8bb517384360ea44225c9c472868d2460ddc9f95f267ef58f8275d7386a87fc7f074995636bf88e056cdf516a3a89500d6d0da09ea97d0d70507eca73 SHA512 4bbb5644633f8430cf5aa8e2e0108154b9480129ebdfcdcd2e3138c550d03d4d4b2d5554ec2a2fcf592375cda4ce4825f59db8921256c491a3216500f8df0a98
diff --git a/dev-libs/quazip/quazip-0.8.1.ebuild b/dev-libs/quazip/quazip-0.8.1.ebuild
index 3dfa73e6c0bd..6270dd67e87c 100644
--- a/dev-libs/quazip/quazip-0.8.1.ebuild
+++ b/dev-libs/quazip/quazip-0.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/dev-libs/rapidjson/Manifest b/dev-libs/rapidjson/Manifest
index e20cea7a4efc..618d0e7c233f 100644
--- a/dev-libs/rapidjson/Manifest
+++ b/dev-libs/rapidjson/Manifest
@@ -1,6 +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 1049 BLAKE2B 65bde54b25f8f8813a18ed589f871a763817872781aeeec033d70d68845c4bb6bb8fa735c9554a93d4b680c3cca0fb36efc7a34718f71474503f650184e03390 SHA512 00c021a40bf9cc989a28582c320186f1a8553cd8c441e980df9506e5c7d0931a71078b4462cf4bcc037044dde32503b4f1ac20336c73ec62c930f93b5ad6c7d5
+EBUILD rapidjson-9999.ebuild 1154 BLAKE2B eef9dc938b3ae18b4964c3f41f48d76231bb2d9137dcd257df850f63bebe058df69cb6b77e56db26b734825334dcc621b3db431bea1640c9b460437e3390b568 SHA512 1756b13132c2dcd155e464773e71c49312344411c2886fa1132b7b34346d9f3ea4782977dbb60c56ba9b59063f440badfca8137a32e19fd3b8918bf4a2e9d161
 MISC metadata.xml 395 BLAKE2B acf0adcc9af1a50757d72f4b52d73c2481fda7bb48ebf2b71e7440c81788e1633b45a4af9ee0adbc1984b0667207706d162e1bdb7177ce8f4e85b819f789b708 SHA512 678196ecc89abed8aa3c1699844573b78103f1ee77dd193b68ad1ae1d5518cd46469b0a5850b00a201c41be381c730ced2aec79f8d4230cf61419b3a20a88935
diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..bd6b5e3e3671
--- /dev/null
+++ b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API"
+HOMEPAGE="https://rapidjson.org/"
+
+LICENSE="MIT"
+IUSE="doc examples test"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/miloyip/rapidjson.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/miloyip/rapidjson/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/rapidjson-${PV}"
+fi
+
+DEPEND="
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-cpp/gtest
+		dev-util/valgrind
+	)"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-7.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e 's|-Werror||g' CMakeLists.txt || die
+	sed -i -e 's|-Werror||g' example/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DRAPIDJSON_BUILD_DOC=$(usex doc)
+		-DRAPIDJSON_BUILD_EXAMPLES=$(usex examples)
+		-DRAPIDJSON_BUILD_TESTS=$(usex test)
+		-DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild
index 160fb5e9d92f..392fbf7059fe 100644
--- a/dev-libs/rapidjson/rapidjson-9999.ebuild
+++ b/dev-libs/rapidjson/rapidjson-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
 DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API"
-HOMEPAGE="http://rapidjson.org/"
+HOMEPAGE="https://rapidjson.org/"
 
 LICENSE="MIT"
 IUSE="doc examples test"
@@ -39,6 +39,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
 		-DRAPIDJSON_BUILD_DOC=$(usex doc)
 		-DRAPIDJSON_BUILD_EXAMPLES=$(usex examples)
 		-DRAPIDJSON_BUILD_TESTS=$(usex test)
diff --git a/dev-libs/rasqal/Manifest b/dev-libs/rasqal/Manifest
index 52346bcc85c1..427b20969ab6 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 1709 BLAKE2B 404837a3f352d823f6b58f0a20e7abaebf551d0a73060f18824203fb303c8b44119387828f5812bcf23c6aa742bc9cc3d1e7ab4bc1e7f8480d366053c7fcd930 SHA512 803889c4db10f25541973e0903ea7780db1c20e8232fd96a4004c76ba234dc8e465bd2088123eb5dd56e530b02e838e3db7797501bf8886d1a45d41cc12a58c3
+EBUILD rasqal-0.9.33.ebuild 1687 BLAKE2B bc0eae7f53e1b5ed651fce0b62438be185270f52f6aadacdb0b80f02467b8b069209bb384da9c4bfe0ca319494b010256e7ab276e032958dd441ff9b3d5ae04a SHA512 b8a0cf216a6878d71a12c449938f8caf3107b61e613d6e700008f0c5a4a785a0e15b33de269c4f077326e63e1aadaded86481eb12643773c2e7c659f742ebb41
 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 0730ea8d1454..57b679ac91c6 100644
--- a/dev-libs/rasqal/rasqal-0.9.33.ebuild
+++ b/dev-libs/rasqal/rasqal-0.9.33.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+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"
 
 RDEPEND="
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index bceef9c1b5dd..5fc1abcb5f15 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,3 +1,3 @@
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
-EBUILD redland-1.0.17-r2.ebuild 2498 BLAKE2B 3086dd8494f2248c02b253ad8bee772d07f9e323ef673c71bbcfaf2bd2986367a5f1cfe9d0f0a95772533aba3864643e15cd3a55e3287f385a0c47e1ad3b32b3 SHA512 6d6f3d40b43dc8f3eb8d23f10d3541670d78a830c51c3fc3d0ed63c061a914a8a9b8097b8617d06ee94f5972fa8b40e1add47b849947d0cf07a65071b914cb3a
+EBUILD redland-1.0.17-r2.ebuild 2476 BLAKE2B 132ab8fd87e64523f94fa0700b89cc8b1728281c30e920322b301f6b9ff2caba25e37f53be6dbb2da95d77740f805df7aace393ae6899d00ee06b3e771f2a502 SHA512 a4e15b87d109e27c797aa24984ca538aee99c57769ea78681e8034bb88cec90ecd656d8a28681ff6c54947c41784ca99ab6b3e6e88af7eb90fae4e42a5610b35
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r2.ebuild
index 8da2616c8280..03249a1ce220 100644
--- a/dev-libs/redland/redland-1.0.17-r2.ebuild
+++ b/dev-libs/redland/redland-1.0.17-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
 
 RDEPEND="dev-libs/libltdl:0
diff --git a/dev-libs/rlottie/Manifest b/dev-libs/rlottie/Manifest
index af0834de785b..20a03f5052b4 100644
--- a/dev-libs/rlottie/Manifest
+++ b/dev-libs/rlottie/Manifest
@@ -1,7 +1,4 @@
+AUX rlottie-0.0.1_pre20190920-disable-werror.patch 420 BLAKE2B 3b3173c4514227de44f1f953678dcce871b3df07ccbb617d0f8a18763f66dadf584fdacd8eeb31a8391a5b8a8a1c00a05137790ad09662e093eb7888f8f0bb4d SHA512 893b5a658a63e8fe4f62e72e967d9e89eaef8184680c1b753fbc0c0893078bbf963967dd4dadff6a94150b7b15c0b6c7ee7cd54631b6874aa3cf3d21989746ed
 DIST rlottie-0.0.1_pre20190920.tar.gz 7891127 BLAKE2B bc9e37e74f21f681fffae3e6140662782ebce7bee58c4205cdb9f927f5246aedc83efc516adecf6c61fb5fc06aff58d1c65bfe3cca18d02bf4e9f2d71890869e SHA512 8d903e877cb83fd0af8cb7b6dd96e09a423201c0b88b2c8c733e54bb873a7b48377e5eb8eeefa620e284c2d1b61fcfe0aa309d180c88428aaccdb0f1ac4a48ed
-<<<<<<< HEAD
-EBUILD rlottie-0.0.1_pre20190920.ebuild 770 BLAKE2B 7d5f3d0524d229d83c8d235c07fb3b075936cdb5358a4690645de10ecdfb9cf646c39ed3a4a1ca2bde1c794ec6f765f44305a903833beee931165afbc021706d SHA512 e20d113e017d1eff974438a21da357a2d3ac04e01b527f3b14f7f8a2e27ece11126c02282e6a88ed7d20d20beedeb33418652bdd78c24b5f8bfd5f7fe0f6c423
-=======
-EBUILD rlottie-0.0.1_pre20190920.ebuild 787 BLAKE2B 9c04e9b288dd3d812847bcd7b199fd8bb914e282c198011896eaf1736fc387b3b6736f0cf45d95d87b1a2644340a4c4171b345388fd3d4fbc630e2d6928ca04f SHA512 cdd841c441cfd93432323195515adfdcb79ed6945400e76ccbadbbab9ff456058d47dcacbda3a33091a5af84556cf36011efd974d87d4615643563365c3b71a1
->>>>>>> next
+EBUILD rlottie-0.0.1_pre20190920.ebuild 880 BLAKE2B bd576d345fe17ffdf201b25a1f10dcc1bbcb9c4eb821f619e5d4c770b5a78505a224e34cf82e83dc1dcde2d82263697d0804306d2338ecd506957d2bceb41ff4 SHA512 409b2f0314d061550124f8952dba66594c2291c3c232803acf46fba765d8a01a79ce2d8b19da65c297f27692b7b4108c3e272170a0e02d8ae9537d153ea77f5a
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/rlottie/files/rlottie-0.0.1_pre20190920-disable-werror.patch b/dev-libs/rlottie/files/rlottie-0.0.1_pre20190920-disable-werror.patch
new file mode 100644
index 000000000000..60676f7f8e32
--- /dev/null
+++ b/dev-libs/rlottie/files/rlottie-0.0.1_pre20190920-disable-werror.patch
@@ -0,0 +1,11 @@
+diff -Naur a/meson.build b/meson.build
+--- a/meson.build	2019-09-28 08:38:12.810010842 +0300
++++ b/meson.build	2019-09-28 08:38:47.812649483 +0300
+@@ -1,6 +1,6 @@
+ project('rlottie',
+         'cpp',
+-        default_options : ['warning_level=3', 'werror=true', 'cpp_std=c++14', 'optimization=s'],
++        default_options : ['cpp_std=c++14', 'optimization=s'],
+         version : '0.0.1',
+         license : 'Apache')
+ 
diff --git a/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild b/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild
index e7c6b6951e12..24a7d66d956d 100644
--- a/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild
+++ b/dev-libs/rlottie/rlottie-0.0.1_pre20190920.ebuild
@@ -13,11 +13,7 @@ SRC_URI="https://github.com/Samsung/rlottie/archive/${MY_COMMIT}.tar.gz -> ${P}.
 
 LICENSE="BSD FTL LGPL-2.1 MIT"
 SLOT="0"
-<<<<<<< HEAD
-KEYWORDS="~amd64 ~x86"
-=======
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
->>>>>>> next
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
@@ -26,6 +22,8 @@ DEPEND="test? ( dev-cpp/gtest )"
 
 S="${WORKDIR}/rlottie-${MY_COMMIT}"
 
+PATCHES=( "${FILESDIR}"/rlottie-0.0.1_pre20190920-disable-werror.patch )
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use test)
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 73748a4d2a24..0a2d73f35e7a 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -4,8 +4,13 @@ AUX rocm-comgr-2.6.0-find-clang.patch 982 BLAKE2B 7284604ac25dbbd292050d35952db0
 AUX rocm-comgr-2.6.0-find-lld-includes.patch 1886 BLAKE2B b06fc169e9271f9476e17091fa6060518b11bf2dfce700fedc780189f9db4da57aa4290183e743a08bfe4502be9079895690085a89788b1ba56bf4e9f8aa3062 SHA512 211b274280734b7f2478ecb094a36f303f7849cfede46709714a5171d07f2521959c216564623d119a14064d762fa752de4b745cee340480210eea4b757c7e3f
 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.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.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
+EBUILD rocm-comgr-2.9.0.ebuild 1094 BLAKE2B 7347448c0f1e812b5932e833971c65a267db520af9cc2084bc919a4e8feeb6eb955d908268f6ee6ffca770e2d18b949263c9047f9ddc1fb490cf1463cead9fcb SHA512 afb18417ae9931bb2a9a8af877b6b85939a2f7cadfd61745cabd879cfdbefcb66270f9a5725f45456b0382a8edf35e89a1831660b3a0cbc6d1efc8c040b6bed3
 MISC metadata.xml 484 BLAKE2B 5afcf22d4b70b094748570fc3f2c756c85b1f192aabc8df86d64e3bad535702444111151282dead984de46a5de2ab04748e0a2b0252f3a3af6e32e1e60416a3b SHA512 da6dbb545060ba024ce5df3439db80210c15e9191953703c9c50b2fed11a4140303a87cc89ee0336ad81f495da0d434fedd85e6c32a1ddede525a1bc5420ca94
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.8.0-dependencies.patch b/dev-libs/rocm-comgr/files/rocm-comgr-2.8.0-dependencies.patch
new file mode 100644
index 000000000000..3a0af258c054
--- /dev/null
+++ b/dev-libs/rocm-comgr/files/rocm-comgr-2.8.0-dependencies.patch
@@ -0,0 +1,84 @@
+https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/19
+
+From 5f872ae4a059ac6a09669e301b8a60b11a25eb42 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Wed, 31 Jul 2019 11:51:17 -0400
+Subject: [PATCH 1/2] Link additional required LLVM libraries
+
+Without these additional required dependencies, linking fails with errors such as:
+`undefined reference to `llvm::errs()'`
+---
+ CMakeLists.txt | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 454b830..95e5799 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -185,7 +185,11 @@ add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
+ include_directories(./yaml-cpp/include)
+ 
+ set(CLANG_LIBS
+-  clangFrontendTool)
++  clangFrontendTool
++  clangFrontend
++  clangBasic
++  clangDriver
++  clangSerialization)
+ 
+ set(LLD_LIBS
+   lldELF
+@@ -193,8 +197,19 @@ set(LLD_LIBS
+ 
+ llvm_map_components_to_libnames(LLVM_LIBS
+   ${LLVM_TARGETS_TO_BUILD}
++  Option
+   DebugInfoDWARF
+-  Symbolize)
++  Symbolize
++  Support
++  Object
++  BitWriter
++  MC
++  MCParser
++  MCDisassembler
++  Core
++  IRReader
++  CodeGen
++  Linker)
+ 
+ target_link_libraries(amd_comgr
+   PUBLIC
+
+From ffc4d18a7ae1fbd5c8807eec4ca8aed043524811 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Mon, 30 Sep 2019 10:52:12 -0400
+Subject: [PATCH 2/2] Link more required LLVM libraries
+
+Without these additional required dependencies, linking fails with errors such as:
+```
+in function `amd_comgr_index_list_metadata':
+<artificial>:(.text+0x4d4c): undefined reference to `llvm::msgpack::ArrayDocNode::operator[](unsigned long)'
+```
+and
+```
+undefined reference to `llvm::msgpack::Document::fromYAML(llvm::StringRef)'
+```
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 95e5799..b6123a6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -209,7 +209,8 @@ llvm_map_components_to_libnames(LLVM_LIBS
+   Core
+   IRReader
+   CodeGen
+-  Linker)
++  Linker
++  BinaryFormat)
+ 
+ target_link_libraries(amd_comgr
+   PUBLIC
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.8.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-2.8.0.ebuild
new file mode 100644
index 000000000000..ff0ede91ae21
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-2.8.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-comgr/rocm-comgr-2.9.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-2.9.0.ebuild
new file mode 100644
index 000000000000..ff0ede91ae21
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-2.9.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 6d7d89ce6e54..d4ba81a8a76a 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,6 +1,10 @@
 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.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
+EBUILD rocm-device-libs-2.9.0.ebuild 867 BLAKE2B caec1c5ad1e4f7b6a643720d469ce6da76c0e5951b0c9b81a972427ac4e4308f772d4df40eb4f30fc4be9a98ec6241d53908e1bd5613ee69e06094049b963a6f SHA512 74b9fa8b676ab3e75afe13099367cc7c915ad7c8ac3a2f7c594e791c8cedd127c8a107005c5823864fe305ef665d3c94fb657dc1057bd078b04cde03f85d8fdc
 EBUILD rocm-device-libs-9999.ebuild 851 BLAKE2B 7e07a2b6f56b52b2245af3084cb021b496aef361ecb554a848901679341e6733e168951c7cb1ba29b92d118380ba6c5ab9565384892d455db52df35ee7df547a SHA512 0954cabec7c11b7eb1c54acbfd0e23c1f1746c50ffbbb60b1042509111380686aa9b21b426cc9281e17c4cf74b6033dfc9ccb4f5612f031913a37b0b66f4c5e6
 MISC metadata.xml 477 BLAKE2B 75910bca37a606f3ca0b41122d64b786776930f7cf00e8125496b4722d887f31506f1abec272123b66e81ce5e5ff9ffad5e3176c29e64c314e46f71c8baefb4a SHA512 ea01d8303b071b1338e53361ec9b21e73447d42e4d96598f4b723496fa48dab4f811d743f1dd188da28c7240fdf4b132775181c177fc35702d8b99ef40ef7b01
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-2.8.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-2.8.0.ebuild
new file mode 100644
index 000000000000..e0264de7479c
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-2.8.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-device-libs/rocm-device-libs-2.9.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-2.9.0.ebuild
new file mode 100644
index 000000000000..e0264de7479c
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-2.9.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 df80a46b2355..fff320e0602c 100644
--- a/dev-libs/rocm-opencl-driver/Manifest
+++ b/dev-libs/rocm-opencl-driver/Manifest
@@ -3,6 +3,10 @@ AUX rocm-opencl-driver-2.6.0-install-header.patch 828 BLAKE2B 5640501a48f6d8552e
 AUX rocm-opencl-driver-2.7.0-libraries.patch 1062 BLAKE2B 9c95bf1928542e0eccaec1927ed6bfb3d81624e29c4bc1873ade263312f5f97c896d6d19922d471c99fbb7eef3e5e7aca2f06a73ac0ed1b475386e5807f9c893 SHA512 3f490d80d08e8ffc7b843dbe33425240820eadc66973e148aca38aadc82c39e80b0e22f2937bff3b0e95cc53f73bf2ffa4fc50c80ba755b251d83e95275c8194
 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
 MISC metadata.xml 489 BLAKE2B d989103f6ed0e6a7406558565a5d0453046f640fbef964eb84e51fc911dac4bcc57bc3f1c5222bb5f6d2fb6d10a7f83b4172161070029b0d537b475ef8473f04 SHA512 3bfb9c1ed4cd559aefaf7a74567daf0952359a9fa3e703f1dfaac48d9bb7a25d134afe16e7509c28dff8a5cdabe09870d8f541898756c028b5c5996577956f0a
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
new file mode 100644
index 000000000000..31cc476dd0d3
--- /dev/null
+++ b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.8.0.ebuild
@@ -0,0 +1,46 @@
+# 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}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.0-install-header.patch"
+	"${FILESDIR}/${PN}-2.7.0-libraries.patch"
+)
+
+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.9.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.9.0.ebuild
new file mode 100644
index 000000000000..31cc476dd0d3
--- /dev/null
+++ b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.9.0.ebuild
@@ -0,0 +1,46 @@
+# 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}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.0-install-header.patch"
+	"${FILESDIR}/${PN}-2.7.0-libraries.patch"
+)
+
+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-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index a75041444363..fe5f95990e61 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -1,5 +1,15 @@
 AUX rocm-opencl-runtime-2.6.0-unbundle-dependencies.patch 56337 BLAKE2B bfb8265b4c901d9c71c8bacae34e43f9e951be3b7c2feb0eb76d9ceb62535a8924882c9383b7e7abf71f8aa6d22da9c78f46b9d7ba5c10e9127f05b922e85187 SHA512 660b4fd2d0d0a1aee5a3683806b5f2491bfb551101c569a297b4fd32ded507787e98cd3fea85e9f9ad4476324da407a5d527bc967e43582fc8edf9eac5caa614
+AUX rocm-opencl-runtime-2.8.0-amdocl64icd.patch 582 BLAKE2B 28e97a03f6696503b1ddc3d1720d3aa9f4e807b2e5fd01771e81f3bda61350cc580e961a90ed07499a8625ea6178e34e15f117115719a6bf04046c758eb95f46 SHA512 938abe8eadcef1d703c797f1716c5588dbe0267d5bb1e3eeb0e46b5fc52f6976751348f402332d07f3c56007e64dac672112170fc33c13cb4314a2a299735142
+AUX rocm-opencl-runtime-2.8.0-change-AMDCompilerh.patch 2778 BLAKE2B 5fe2c74631db679788767a4488d2157660e0c1c1e4291165e1d0c52c29c8d976ff5b2f691ff128ec49778d0cc2855bcfc73c3dfc0ed831d3fac114445e272408 SHA512 8c34c570957b5f25f9347b50baf47342f84f6a398e77f7b9d007d2861947b70dace27ae016c23a7959a6d936fdbe24980acc1a253a7bcaff95eea11283c89901
+AUX rocm-opencl-runtime-2.8.0-change-install-location.patch 5344 BLAKE2B f634d0d3c7f3d54e6fc30ba1228575e6ba95fda21ca63bcf4745d3d9ac8ec6eb6b0a02aab4f7ca7d5e50db61ed567073dadf84d028f5f77314cba4b57b2db480 SHA512 d5bf8459e1ceed074042664ce66608de8806b274ad12f4d1dd3487b0eb82a34295ad85c490d93d3392b82be98fe7077f78320825015df76c5d9f87a3a28e1e55
+AUX rocm-opencl-runtime-2.8.0-change-opencl.patch 3886 BLAKE2B e9833c8486757214876aba32f52722189497e5a1975cd6f7a4d64388a9cd52bfcf114625906b671cf73de052e42101ab3be7a43562c2983fe9e2ccfece3b83c8 SHA512 ae49608277493259d1348c8bce912b4d489a9edb16b0e6460336f4468530460362b2e95ac85c57543edfb8ed57b93e01f73a9b3e9012a8a333eba9eb52d80d8f
+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.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.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
 MISC metadata.xml 489 BLAKE2B d989103f6ed0e6a7406558565a5d0453046f640fbef964eb84e51fc911dac4bcc57bc3f1c5222bb5f6d2fb6d10a7f83b4172161070029b0d537b475ef8473f04 SHA512 3bfb9c1ed4cd559aefaf7a74567daf0952359a9fa3e703f1dfaac48d9bb7a25d134afe16e7509c28dff8a5cdabe09870d8f541898756c028b5c5996577956f0a
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-amdocl64icd.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-amdocl64icd.patch
new file mode 100644
index 000000000000..f399f360c9cf
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-amdocl64icd.patch
@@ -0,0 +1,13 @@
+diff --git a/api/opencl/amdocl/CMakeLists.txt b/api/opencl/amdocl/CMakeLists.txt
+index 8ea8517..d1223ed 100644
+--- a/api/opencl/amdocl/CMakeLists.txt
++++ b/api/opencl/amdocl/CMakeLists.txt
+@@ -82,3 +82,7 @@ if(${USE_COMGR_LIBRARY} MATCHES "yes")
+ else()
+   target_link_libraries(amdocl64 opencl_driver oclelf pthread dl ${ROCT_LIBRARIES} ${ROCR_LIBRARIES})
+ endif()
++
++file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/amdocl64.icd" CONTENT "$<TARGET_FILE_NAME:amdocl64>")
++install(FILES "${CMAKE_BINARY_DIR}/amdocl64.icd" DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/OpenCL/vendors/")
++
+
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-AMDCompilerh.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-AMDCompilerh.patch
new file mode 100644
index 000000000000..796277e46723
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-AMDCompilerh.patch
@@ -0,0 +1,79 @@
+diff --git a/runtime/device/device.hpp b/runtime/device/device.hpp
+index 9eb45b2..a721463 100644
+--- a/runtime/device/device.hpp
++++ b/runtime/device/device.hpp
+@@ -21,7 +21,7 @@
+ 
+ #if defined(WITH_LIGHTNING_COMPILER) && !defined(USE_COMGR_LIBRARY)
+ #include "caching/cache.hpp"
+-#include "driver/AmdCompiler.h"
++#include "AmdCompiler.h"
+ #endif  // defined(WITH_LIGHTNING_COMPILER) && ! defined(USE_COMGR_LIBRARY)
+ #include "acl.h"
+ 
+diff --git a/runtime/device/devprogram.cpp b/runtime/device/devprogram.cpp
+index 587e950..dc233f3 100644
+--- a/runtime/device/devprogram.cpp
++++ b/runtime/device/devprogram.cpp
+@@ -14,7 +14,7 @@
+ 
+ #if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
+ #ifndef USE_COMGR_LIBRARY
+-#include "driver/AmdCompiler.h"
++#include "AmdCompiler.h"
+ #include "libraries.amdgcn.inc"
+ #include "opencl1.2-c.amdgcn.inc"
+ #include "opencl2.0-c.amdgcn.inc"
+diff --git a/runtime/device/devprogram.hpp b/runtime/device/devprogram.hpp
+index 68de7ba..8b91ba2 100644
+--- a/runtime/device/devprogram.hpp
++++ b/runtime/device/devprogram.hpp
+@@ -11,7 +11,7 @@
+ 
+ #if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
+ #ifndef USE_COMGR_LIBRARY
+-#include "driver/AmdCompiler.h"
++#include "AmdCompiler.h"
+ #else
+ #include "amd_comgr.h"
+ #endif
+diff --git a/runtime/device/rocm/rocdevice.cpp b/runtime/device/rocm/rocdevice.cpp
+index 4cba9d7..7ab30ed 100644
+--- a/runtime/device/rocm/rocdevice.cpp
++++ b/runtime/device/rocm/rocdevice.cpp
+@@ -20,7 +20,7 @@
+ #include "device/rocm/rocvirtual.hpp"
+ #include "device/rocm/rocprogram.hpp"
+ #if defined(WITH_LIGHTNING_COMPILER) && ! defined(USE_COMGR_LIBRARY)
+-#include "driver/AmdCompiler.h"
++#include "AmdCompiler.h"
+ #endif  // defined(WITH_LIGHTNING_COMPILER) && ! defined(USE_COMGR_LIBRARY)
+ #include "device/rocm/rocmemory.hpp"
+ #include "device/rocm/rocglinterop.hpp"
+diff --git a/runtime/device/rocm/rockernel.cpp b/runtime/device/rocm/rockernel.cpp
+index 8a28acc..7d5b62d 100644
+--- a/runtime/device/rocm/rockernel.cpp
++++ b/runtime/device/rocm/rockernel.cpp
+@@ -11,7 +11,7 @@
+ 
+ #if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
+ #ifndef USE_COMGR_LIBRARY
+-#include "driver/AmdCompiler.h"
++#include "AmdCompiler.h"
+ #endif
+ #include "llvm/Support/AMDGPUMetadata.h"
+ 
+diff --git a/runtime/device/rocm/rocprogram.cpp b/runtime/device/rocm/rocprogram.cpp
+index 0155dc2..613d00d 100644
+--- a/runtime/device/rocm/rocprogram.cpp
++++ b/runtime/device/rocm/rocprogram.cpp
+@@ -10,7 +10,7 @@
+ #if defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
+ #include <gelf.h>
+ #ifndef USE_COMGR_LIBRARY
+-#include "driver/AmdCompiler.h"
++#include "AmdCompiler.h"
+ #include "libraries.amdgcn.inc"
+ #endif
+ #endif  // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)
+
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-install-location.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-install-location.patch
new file mode 100644
index 000000000000..0679da4d639a
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-install-location.patch
@@ -0,0 +1,146 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 83575a3..a0526d1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,12 +28,26 @@ endif()
+ 
+ project(OpenCL-ROCm)
+ 
++include (GNUInstallDirs)
++
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+ set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2" CACHE PATH "")
+ 
+ find_package(ROCT REQUIRED)
+ find_package(ROCR REQUIRED)
+ 
++find_package(LLVM REQUIRED CONFIG PATHS ${LLVM_DIR} "/opt/rocm/llvm" NO_DEFAULT_PATH)
++set(USE_COMGR_LIBRARY "yes")
++find_package(amd_comgr REQUIRED CONFIG)
++add_definitions(-DUSE_COMGR_LIBRARY)
++FOREACH(DIR ${LLVM_INCLUDE_DIRS})
++  include_directories("${DIR}")
++  include_directories("${DIR}/clang")
++  include_directories("${DIR}/lld")
++  # TODO: move AMDGPU.h header to include folder
++  include_directories("${DIR}/llvm/Target/AMDGPU")
++ENDFOREACH()
++
+ # FIXME: Remove following if block after enabling COMGR by default
+ if (${USE_COMGR_LIBRARY} STREQUAL "no")
+   set(LLVM_INCLUDE_TESTS OFF CACHE BOOL "")
+@@ -46,29 +60,19 @@ if (${USE_COMGR_LIBRARY} STREQUAL "no")
+   # override default option value in library and driver
+   set(GENERIC_IS_ZERO ON CACHE BOOL ON FORCE)
+ 
+-  add_subdirectory(compiler/llvm EXCLUDE_FROM_ALL)
+-
+-  find_package(LLVM REQUIRED CONFIG PATHS ${CMAKE_BINARY_DIR}/compiler/llvm NO_DEFAULT_PATH)
++  find_package(LLVM REQUIRED CONFIG PATHS ${LLVM_DIR} "/opt/rocm/llvm" NO_DEFAULT_PATH)
+ 
+   list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
+   include(AddLLVM)
+ 
+   add_definitions(${LLVM_DEFINITIONS})
+-  # TODO: add find_package for Clang and lld, and also use LLVM/Clang variables got from their config
+-  include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/include)
+-  include_directories(${CMAKE_BINARY_DIR}/compiler/llvm/tools/clang/include)
+-  include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/tools/lld/include)
+-
+-  # TODO: move AMDGPU.h header to include folder
+-  include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/lib/Target/AMDGPU)
+-  include_directories(${CMAKE_BINARY_DIR}/compiler/llvm/lib/Target/AMDGPU)
+ 
+   set(BUILD_HC_LIB OFF CACHE BOOL "")
+   set(ROCM_DEVICELIB_INCLUDE_TESTS OFF CACHE BOOL "")
+   set(AMDGCN_TARGETS_LIB_LIST "AMDGCN_LIB_TARGETS")
+   set(AMDGCN_TARGETS_LIB_DEPS "AMDGCN_DEP_TARGETS")
+   set(AMDGPU_TARGET_TRIPLE "amdgcn-amd-amdhsa")
+-  add_subdirectory(library/amdgcn EXCLUDE_FROM_ALL)
++
+   add_subdirectory(compiler/driver EXCLUDE_FROM_ALL)
+ 
+   install(PROGRAMS $<TARGET_FILE:clang> $<TARGET_FILE:lld>
+@@ -84,51 +88,51 @@ if (${USE_COMGR_LIBRARY} STREQUAL "no")
+   endforeach()
+ endif() # if (${USE_COMGR_LIBRARY} STREQUAL "no")
+ 
+-if(${USE_COMGR_LIBRARY} MATCHES "yes")
+-  set(COMGR_DYN_DLL "yes")
+-  add_definitions(-DCOMGR_DYN_DLL)
+-  add_definitions(-DUSE_COMGR_LIBRARY)
+-  if( ${BUILD_HIP} MATCHES "yes")
+-    add_subdirectory(api/hip)
+-  endif()
+-endif()
++#if(${USE_COMGR_LIBRARY} MATCHES "yes")
++#  set(COMGR_DYN_DLL "yes")
++#  add_definitions(-DCOMGR_DYN_DLL)
++#  add_definitions(-DUSE_COMGR_LIBRARY)
++#  if( ${BUILD_HIP} MATCHES "yes")
++#    add_subdirectory(api/hip)
++#  endif()
++#endif()
+ 
+ add_subdirectory(api/opencl/amdocl)
+ add_subdirectory(compiler/lib/loaders/elf/utils/libelf)
+ add_subdirectory(runtime)
+-add_subdirectory(tools/clinfo)
++#add_subdirectory(tools/clinfo)
+ 
+ set(BUILD_SHARED_LIBS "Build shared libs" ON)
+-add_subdirectory(api/opencl/khronos/icd)
++#add_subdirectory(api/opencl/khronos/icd)
+ 
+ ###--- Packaging ------------------------------------------------------------###
+ 
+ # MAIN package
+-install(PROGRAMS $<TARGET_FILE:clinfo>
+-        DESTINATION bin/x86_64
+-        COMPONENT MAIN)
++#install(PROGRAMS $<TARGET_FILE:clinfo>
++#        DESTINATION bin/x86_64
++#        COMPONENT MAIN)
+ install(PROGRAMS $<TARGET_FILE:amdocl64>
+-        DESTINATION lib/x86_64
+-        COMPONENT MAIN)
+-install(PROGRAMS $<TARGET_FILE:OpenCL>
+-        DESTINATION lib/x86_64
+-        COMPONENT MAIN)
+-install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL>
+-        DESTINATION lib/x86_64
++        DESTINATION lib64
+         COMPONENT MAIN)
++#install(PROGRAMS $<TARGET_FILE:OpenCL>
++#        DESTINATION lib/x86_64
++#        COMPONENT MAIN)
++#install(PROGRAMS $<TARGET_SONAME_FILE:OpenCL>
++#        DESTINATION lib/x86_64
++#        COMPONENT MAIN)
+ 
+ # DEV package
+-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2/CL"
+-        DESTINATION include
+-        COMPONENT DEV
+-        USE_SOURCE_PERMISSIONS
+-        PATTERN cl_d3d10.h EXCLUDE
+-        PATTERN cl_d3d11.h EXCLUDE
+-        PATTERN cl_dx9_media_sharing.h EXCLUDE
+-        PATTERN cl_egl.h EXCLUDE)
+-install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
+-        DESTINATION lib/x86_64
+-        COMPONENT DEV)
++#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2/CL"
++#        DESTINATION include
++#        COMPONENT DEV
++#        USE_SOURCE_PERMISSIONS
++#        PATTERN cl_d3d10.h EXCLUDE
++#        PATTERN cl_d3d11.h EXCLUDE
++#        PATTERN cl_dx9_media_sharing.h EXCLUDE
++#        PATTERN cl_egl.h EXCLUDE)
++#install(PROGRAMS $<TARGET_LINKER_FILE:OpenCL>
++#        DESTINATION lib/x86_64
++#        COMPONENT DEV)
+ 
+ # Generic CPACK variables
+ set(CPACK_GENERATOR "DEB;RPM" CACHE STRING "Default packaging generators")
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-opencl.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-opencl.patch
new file mode 100644
index 000000000000..cd6695e2d4f6
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-change-opencl.patch
@@ -0,0 +1,70 @@
+diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
+index 2c9dfd6..863b4bf 100644
+--- a/runtime/CMakeLists.txt
++++ b/runtime/CMakeLists.txt
+@@ -23,7 +23,6 @@ if (${USE_COMGR_LIBRARY} STREQUAL "no")
+   include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/include)
+ endif() # if (${USE_COMGR_LIBRARY} STREQUAL "no")
+ 
+-include_directories(${CMAKE_SOURCE_DIR}/compiler/driver/src)
+ include_directories(${CMAKE_SOURCE_DIR}/compiler/lib)
+ include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/include)
+ include_directories(${CMAKE_SOURCE_DIR}/compiler/lib/backends/common)
+@@ -79,6 +78,8 @@ add_library(oclruntime OBJECT
+   ${COMGR_CPP}
+ )
+ set_target_properties(oclruntime PROPERTIES POSITION_INDEPENDENT_CODE ON)
++#add_dependencies(oclruntime opencl1.2-c.amdgcn.inc_target)
++#add_dependencies(oclruntime opencl2.0-c.amdgcn.inc_target)
+ 
+ set(AMDGCN_DEP_LIST)
+ if(AMDGCN_TARGETS_LIB_DEPS)
+diff --git a/runtime/device/rocm/CMakeLists.txt b/runtime/device/rocm/CMakeLists.txt
+index 5870b65..39166f3 100644
+--- a/runtime/device/rocm/CMakeLists.txt
++++ b/runtime/device/rocm/CMakeLists.txt
+@@ -1,3 +1,21 @@
++find_package(Clang REQUIRED CONFIG)
++
++# FIXME: CLANG_CMAKE_DIR seems like the most stable way to find this, but
++# really there is no way to reliably discover this header.
++#
++# We effectively back up to the Clang output directory (for the case of a build
++# tree) or install prefix (for the case of an installed copy), and then search
++# for a file named opencl-c.h anywhere below that. We take the first result in
++# the case where there are multiple (e.g. if there is an installed copy nested
++# in a build directory). This is a bit imprecise, but it covers cases like MSVC
++# adding some additional configuration-specific subdirectories to the build
++# tree but not to an installed copy.
++file(GLOB_RECURSE OPENCL_C_H_LIST "${CLANG_CMAKE_DIR}/../../../*/opencl-c.h")
++list(GET OPENCL_C_H_LIST 0 OPENCL_C_H)
++if (NOT EXISTS "${OPENCL_C_H}" OR IS_DIRECTORY "${OPENCL_C_H}")
++  message(FATAL_ERROR "Unable to locate opencl-c.h from the supplied Clang. The path '${CLANG_CMAKE_DIR}/../../../*' was searched.")
++endif()
++
+ include(bc2h)
+ 
+ set(INC_SUFFIX "amdgcn.inc")
+@@ -82,8 +100,8 @@ if (${USE_COMGR_LIBRARY} STREQUAL "no")
+ 
+   # generating opencl*.inc files
+   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.pch
+-    COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa -Werror -O3 -DNDEBUG -cl-std=CL1.2 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.pch < ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h
+-    DEPENDS clang ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h
++    COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa -Werror -O3 -DNDEBUG -cl-std=CL1.2 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.pch < ${OPENCL_C_H}
++    DEPENDS clang ${OPENCL_C_H}
+     COMMENT "Generating opencl1.2-c.amdgcn.pch"
+   )
+   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl1.2-c.amdgcn.inc
+@@ -96,8 +114,8 @@ if (${USE_COMGR_LIBRARY} STREQUAL "no")
+   add_dependencies(oclrocm opencl1.2-c.amdgcn.inc_target)
+ 
+   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch
+-    COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa -Werror -O3 -DNDEBUG -cl-std=CL2.0 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch < ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h
+-    DEPENDS clang ${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/lib/Headers/opencl-c.h
++    COMMAND clang -cc1 -x cl-header -triple amdgcn-amd-amdhsa -Werror -O3 -DNDEBUG -cl-std=CL2.0 -emit-pch -o ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.pch < ${OPENCL_C_H}
++    DEPENDS clang ${OPENCL_C_H}
+     COMMENT "Generating opencl2.0-c.amdgcn.pch"
+   )
+   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/opencl2.0-c.amdgcn.inc
+
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-update-README.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-update-README.patch
new file mode 100644
index 000000000000..741faf20ca78
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.8.0-update-README.patch
@@ -0,0 +1,41 @@
+diff --git a/README.md b/README.md
+index a834965..7fea026 100644
+--- a/README.md
++++ b/README.md
+@@ -8,12 +8,6 @@ Developer preview Version 2 of the new
+ 
+ 
+ ## GETTING REPO
+-
+-Repo is a git wrapper that manages a collection of git repositories. Install this tool and add it to the command search PATH:
+-
+-    curl https://storage.googleapis.com/git-repo-downloads/repo > ~/bin/repo
+-    chmod a+x ~/bin/repo
+-
+ ## GETTING THE SOURCE CODE
+ 
+ Main OpenCL™ Compatible Components:
+@@ -26,11 +20,6 @@ Main OpenCL™ Compatible Components:
+ * https://github.com/RadeonOpenCompute/lld 
+ * https://github.com/KhronosGroup/OpenCL-ICD-Loader
+ 
+-Download the git projects with the following commands:
+-
+-    ~/bin/repo init -u https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime.git -b master -m opencl.xml
+-    ~/bin/repo sync
+-    
+ ## INSTALL ROCm
+ 
+ Follow the instructions at https://rocm.github.io/install.html to install ROCm.
+@@ -45,6 +34,11 @@ Copy the amdocl64.icd file to /etc/OpenCL/vendors
+ 
+ To install additional dependencies:
+ 
++* ROCm-OpenCL-Runtime
++* ROCm-OpenCL-Driver
++* ROC versions of LLVM, Clang, and lld
++* ROCm-Device-Libs
++* OpenCL-ICD-Loade
+ * OCaml
+ * findlib
+ * A Python 2 environment or active virtualenv with the Microsoft Z3 package
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.8.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.8.0.ebuild
new file mode 100644
index 000000000000..b576f463c545
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.8.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}/${P}-change-install-location.patch"
+	"${FILESDIR}/${P}-change-AMDCompilerh.patch"
+	"${FILESDIR}/${P}-change-opencl.patch"
+	"${FILESDIR}/${P}-update-README.patch"
+	"${FILESDIR}/${P}-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/rocm-opencl-runtime/rocm-opencl-runtime-2.9.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.9.0.ebuild
new file mode 100644
index 000000000000..f62a0a3951c2
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.9.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 bdb8a87026cf..54208b48c6e3 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,9 +1,15 @@
 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.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.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
+EBUILD rocr-runtime-2.8.0.ebuild 967 BLAKE2B 847b465d805b6d30129b3bafedd2471bc093fd3bb91dbfec11dae0a086ec625e4ce087af08e405942d4677003c4c6d9794488932da754588e4567878edaed5ab SHA512 02dd1a0fc265a44a2250d475733c1aa3ea1fd046651291b457991a433676007828e082380b6593eb23dc2dbb5d0293b07072925706002dcc2aaa3d8f12306abf
+EBUILD rocr-runtime-2.9.0.ebuild 967 BLAKE2B 847b465d805b6d30129b3bafedd2471bc093fd3bb91dbfec11dae0a086ec625e4ce087af08e405942d4677003c4c6d9794488932da754588e4567878edaed5ab SHA512 02dd1a0fc265a44a2250d475733c1aa3ea1fd046651291b457991a433676007828e082380b6593eb23dc2dbb5d0293b07072925706002dcc2aaa3d8f12306abf
 EBUILD rocr-runtime-9999.ebuild 902 BLAKE2B 0e7ae79cbaf8eec276cee4981a4e093d4fd1121c4e71d86d485db8eecf239ed773c50934ad5010d56a69fb01408968ac99af80ee6105593b1976d31e48224aab SHA512 346a787c3be08d55b1de4bbfbea44b9e321a8f9646284667c3146181d75cd7c9e98ec594d4674cd5290ed68ce1f60afc8919efd878f920eb15ec8b408100c32f
 MISC metadata.xml 720 BLAKE2B 79e9a058e954fd4d4d7d3490f5cda3e157ac772ca9dcb973d14bae4cfe572de2edc4f6b36c8ec1803632dfeb30c734552566ed1100d0ef89c74fa7386baadf3f SHA512 3a13dc340357222fbab6e417c63c83905c3c5fb9aacff18097ba954eae0cca26e752749dd0da031658de5ab96a30528775ee55403b09b36b17c98f108bd6c1d1
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch b/dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch
new file mode 100644
index 000000000000..aef3d297034e
--- /dev/null
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch
@@ -0,0 +1,57 @@
+https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/71
+
+From d2a6ad97eb96a28d8f8b658b26ab94e911886cf2 Mon Sep 17 00:00:00 2001
+From: Sean Keely <Sean.Keely@amd.com>
+Date: Thu, 5 Sep 2019 20:58:57 -0500
+Subject: [PATCH] Correct doorbell_queue_map allocation.
+
+doorbell_queue_map should be allocated unconditionally.
+---
+ core/runtime/amd_gpu_agent.cpp | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/core/runtime/amd_gpu_agent.cpp b/core/runtime/amd_gpu_agent.cpp
+index 9b79a6b..76df913 100644
+--- a/core/runtime/amd_gpu_agent.cpp
++++ b/core/runtime/amd_gpu_agent.cpp
+@@ -1182,12 +1182,22 @@ void GpuAgent::SyncClocks() {
+ }
+ 
+ void GpuAgent::BindTrapHandler() {
++  // Make an empty map from doorbell index to queue.
++  // The trap handler uses this to retrieve a wave's amd_queue_t*.
++  auto doorbell_queue_map_size = MAX_NUM_DOORBELLS * sizeof(amd_queue_t*);
++
++  doorbell_queue_map_ = (amd_queue_t**)core::Runtime::runtime_singleton_->system_allocator()(
++      doorbell_queue_map_size, 0x1000, 0);
++  assert(doorbell_queue_map_ != NULL && "Doorbell queue map allocation failed");
++
++  memset(doorbell_queue_map_, 0, doorbell_queue_map_size);
++
+   if (isa_->GetMajorVersion() == 7) {
+     // No trap handler support on Gfx7, soft error.
+     return;
+   }
+ 
+-  // Disable trap handler on Carrizo until KFD is fixed.
++  // Disable trap handler on APUs until KFD is fixed.
+   if (profile_ == HSA_PROFILE_FULL) {
+     return;
+   }
+@@ -1195,16 +1205,6 @@ void GpuAgent::BindTrapHandler() {
+   // Assemble the trap handler source code.
+   AssembleShader("TrapHandler", AssembleTarget::ISA, trap_code_buf_, trap_code_buf_size_);
+ 
+-  // Make an empty map from doorbell index to queue.
+-  // The trap handler uses this to retrieve a wave's amd_queue_t*.
+-  auto doorbell_queue_map_size = MAX_NUM_DOORBELLS * sizeof(amd_queue_t*);
+-
+-  doorbell_queue_map_ = (amd_queue_t**)core::Runtime::runtime_singleton_->system_allocator()(
+-      doorbell_queue_map_size, 0x1000, 0);
+-  assert(doorbell_queue_map_ != NULL && "Doorbell queue map allocation failed");
+-
+-  memset(doorbell_queue_map_, 0, doorbell_queue_map_size);
+-
+   // Bind the trap handler to this node.
+   HSAKMT_STATUS err = hsaKmtSetTrapHandler(node_id(), trap_code_buf_, trap_code_buf_size_,
+                                            doorbell_queue_map_, doorbell_queue_map_size);
diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.8.0-r1.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..9a38ed332383
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-2.8.0-r1.ebuild
@@ -0,0 +1,38 @@
+# 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"
+	"${FILESDIR}/${P}-fix_doorbell_map.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/rocr-runtime/rocr-runtime-2.8.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.8.0.ebuild
new file mode 100644
index 000000000000..507d471dc104
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-2.8.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/rocr-runtime/rocr-runtime-2.9.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.9.0.ebuild
new file mode 100644
index 000000000000..507d471dc104
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-2.9.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 903a404c36bb..cd0a6a991557 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -6,8 +6,12 @@ AUX roct-thunk-interface-2.6.0-pc-prefix.patch 860 BLAKE2B 93118ca68359edae385b8
 DIST roct-thunk-interface-2.0.0.tar.gz 1958218 BLAKE2B c1ba89cac9a18964e040e6b1e57a464216e7086c400e3360cfca6f376ac90b0b1afbb3a2a4d995581d1829ca57afe62bf6f2ac59cc103a48d384a8e52b1457d0 SHA512 7d2e35df2bec201bcc977328d7d36b921f76b57a0c54fc2332eb1faf3a722b6a3a1e3b1658e93b216ed68b965426c463a2dbf52a22af64ce1dcc9fad0f27ca9c
 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.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-9999.ebuild 1081 BLAKE2B 79de97419f7b465562b3215ffb57a2dfcedaf686042ffb3022b0dce22cbf9d74c1d2e713ae92a7bcada0238bbbdd2c787b7e8ea905585751c5b08438f026d3d4 SHA512 a44004e851ae89b50bc355357e1b9f9132384a8d77524236bc35aab65ca753a416514dfe14aca8fbc344ca2abe4c537da7450b4d1ee015ae81873ca50f71b5cb
+EBUILD roct-thunk-interface-2.8.0.ebuild 1196 BLAKE2B e76798567c890f59faa5964ca734ebdd3235bffbe950802797dfe7ee46e635aef32cf69563f455c5fa33a4034608eea55f952085decd84f7b5efb35323b256f8 SHA512 eaab8c6baa03d56bbf4486eb71b65c71f69e1df21ac05ed825092598b942468183dd0dc360ca941240459bfe4bf3f8a686766ec9d9222b60ea9a9e51ac1cd1c8
+EBUILD roct-thunk-interface-2.9.0-r1.ebuild 1142 BLAKE2B 288362340dd65cc262e7eaa46e66b9d76bd6dcc5529fbcaf6be5a5628360a6574bdf34350c79cce310dddb2d3b683161c66bbbb43aacff12d2c0b8ded42190ad SHA512 8afe5bc83827816481b7f196e64412a3697608286a423e2d7fb9e4227625aac9b4f639c04ece126499ed696cbb732f169ecfcacd0cf0ac3dbdf95b0b084d3742
+EBUILD roct-thunk-interface-9999.ebuild 1142 BLAKE2B 288362340dd65cc262e7eaa46e66b9d76bd6dcc5529fbcaf6be5a5628360a6574bdf34350c79cce310dddb2d3b683161c66bbbb43aacff12d2c0b8ded42190ad SHA512 8afe5bc83827816481b7f196e64412a3697608286a423e2d7fb9e4227625aac9b4f639c04ece126499ed696cbb732f169ecfcacd0cf0ac3dbdf95b0b084d3742
 MISC metadata.xml 742 BLAKE2B e4bf5b17c7add51f1fce354e5b68d874808e680e3dce8e514da738a0fdfb8a26076f76cfc5c8091bd11f7ef4576e2d45334590f20f899865b8c984406892b1a0 SHA512 7d0b104b201778561f5e0566c28f593abd8a9c05ea1154a7d58bebb135f15e86cf6dd7f98f9fd5059b054ffac1d64a86404743f7c9bb1a619431f5e911a233cf
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.8.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.8.0.ebuild
new file mode 100644
index 000000000000..454c65e73c12
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.8.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 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
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.0-correctly-install.patch"
+	"${FILESDIR}/${PN}-2.6.0-correctly-install-pc.patch"
+	"${FILESDIR}/${PN}-2.6.0-pc-prefix.patch"
+	"${FILESDIR}/${PN}-2.6.0-do-not-install-kfd_ioctl.h.patch"
+)
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
+CONFIG_CHECK="~NUMA ~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE"
+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_compile() {
+	cmake-utils_src_compile build-dev
+}
+src_install() {
+	cmake-utils_src_install install-dev
+}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.9.0-r1.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.9.0-r1.ebuild
new file mode 100644
index 000000000000..84d01d8e830e
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.9.0-r1.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"
+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/roct-thunk-interface/roct-thunk-interface-9999.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
index 4860c47142d2..84d01d8e830e 100644
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
@@ -16,7 +16,7 @@ fi
 
 DESCRIPTION="Radeon Open Compute Thunk Interface"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
-CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE"
+CONFIG_CHECK="~NUMA ~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE"
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 
@@ -30,7 +30,8 @@ src_prepare() {
 }
 src_configure() {
 	local mycmakeargs=(
-		-DCPACK_PACKAGING_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
+		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
 	)
 	cmake-utils_src_configure
 }
diff --git a/dev-libs/rote/Manifest b/dev-libs/rote/Manifest
deleted file mode 100644
index 7b83e97a616e..000000000000
--- a/dev-libs/rote/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rote-0.2.8.tar.gz 61440 BLAKE2B f6626d38c6203f535308d38888c7998b2ba1a9016fabf13bd3b7a6bc59c3d4f4ac344bab6f089df07cba7702d6cdd4ab2d94a1d7902adce623353fade7154a6d SHA512 699d45fb188de51a7059cc94febf69ff8a7c15cc5dc2dcbc81cba76e531ec415b242ee856e03ce1c9ca6f7f6ae6a73bece299088a4bd41e8f9e846de206727ab
-EBUILD rote-0.2.8.ebuild 373 BLAKE2B a4bcc63badc56bb31854b4c64d2f0393c9c79637ea25c1e00db5f4a7e2c21fa6fc32370b3aedc792b1dde97a8605de80a10ac09cc305976b9e433540e2b77806 SHA512 3a64ce2d5c1b775fa503cb08459d9f8150d3e4279df84d61c4782da5ec51f4198245d0dc6ecda7d84d92df2f3d9abc1abd129a90c6d07aca91c9b756f4adea27
-MISC metadata.xml 241 BLAKE2B d9fd5cd54a08ec5484e63a660653c8935c5952f41e1c58a1b4f03009cefd6cf88c2a6f6d34e929ad9ff5fd974e11fd998738df7fc8e1022d039e0be949ee9f1c SHA512 a2a7fc258dc66ad02e126f2e8953276da01bbd87a0e233b0bbae6af3a4b67e4ea4c67792f8a0e4f57475e532a354922d8cd7a80d479c3a522e1852b2931cb77e
diff --git a/dev-libs/rote/metadata.xml b/dev-libs/rote/metadata.xml
deleted file mode 100644
index 4d070fe11b62..000000000000
--- a/dev-libs/rote/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">rote</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/rote/rote-0.2.8.ebuild b/dev-libs/rote/rote-0.2.8.ebuild
deleted file mode 100644
index 5b6dffe26696..000000000000
--- a/dev-libs/rote/rote-0.2.8.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="simple C library for VT102 terminal emulation"
-HOMEPAGE="http://rote.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}"
diff --git a/dev-libs/sblim-sfcc/Manifest b/dev-libs/sblim-sfcc/Manifest
deleted file mode 100644
index f9772ae0760b..000000000000
--- a/dev-libs/sblim-sfcc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sblim-sfcc-2.2.8.tar.bz2 376918 BLAKE2B 867d7643a9f11cf546e39e839ef5a8d3addc8902dd024f741561b0e22016a11e009779c8f50b7228e7ab21b8b697bd8f767b08a08f61727a07ee37c465c0d223 SHA512 b5eb7712aed1e40f19993ba5f5ee2f1f48c01246d28e9f4d89cee53000801ce4fe7c862a82163a55774c71094223b32bf8981a883ad04e820f9c749e746f52fa
-EBUILD sblim-sfcc-2.2.8.ebuild 582 BLAKE2B 2031dd0026172d86259c675a051827ff2107ad0cbc0622a8fa7e51fa42243e81eaf3c79296906cedbfd63cb5080a4f92b1bfa68cd3197aa6c9574b00b4be335a SHA512 24eea0fb6ebdadfe178ff24e87681276d9dfc82c92fd9a5e5725ecd1c96f059cc8e66b88be83e2d47de357374a39022c9469e8cc33274c8d1e3dde72cc14645e
-MISC metadata.xml 242 BLAKE2B 052465d196bda064646fae6603fd20d79d90b2033abf5b1803af7f616bb16ab259866d49ac11085be252a6604f663e227958baf09275c17d46cfa0bda9be97ea SHA512 d92b2c91d32f632c3916af1ad8fe764b9c6c6dab77658a8b05aab608e2a74e3124a2312877989543423ed7f1201257795eda9cab675fde55074412b7cbff3852
diff --git a/dev-libs/sblim-sfcc/metadata.xml b/dev-libs/sblim-sfcc/metadata.xml
deleted file mode 100644
index f4d0157135c5..000000000000
--- a/dev-libs/sblim-sfcc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">sblim</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/sblim-sfcc/sblim-sfcc-2.2.8.ebuild b/dev-libs/sblim-sfcc/sblim-sfcc-2.2.8.ebuild
deleted file mode 100644
index b128ee38f4b3..000000000000
--- a/dev-libs/sblim-sfcc/sblim-sfcc-2.2.8.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
-
-DESCRIPTION="Small Footprint CIM Client Library"
-HOMEPAGE="https://sourceforge.net/apps/mediawiki/sblim"
-SRC_URI="mirror://sourceforge/project/sblim/${PN}/${P}.tar.bz2"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	net-misc/curl[ssl]
-"
-RDEPEND="${DEPEND}"
-
-DOCS=()
-
-src_configure() {
-	local myconf=(
-		--enable-http-chunking
-		--disable-static
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/sink/Manifest b/dev-libs/sink/Manifest
index ecc0c5efb290..67f7acb5a21f 100644
--- a/dev-libs/sink/Manifest
+++ b/dev-libs/sink/Manifest
@@ -1,3 +1,3 @@
-DIST sink-0.7.0.tar.gz 383090 BLAKE2B b853609889ead6f623c7288b9dfe8dba0388dc0d5e8f28d9967fa9be1d78b10bafd9d4674f11355bfe60506843d2abe033149c448ff293329db558ed00fef18b SHA512 591838cb9c76d89c1794b94b02bff3d67155e1f27ae32b7ac9369d15aa109130c7792f30e74b61009765e7b7cb78141bf5e3c93304d814bce22bf91059339fd0
-EBUILD sink-0.7.0.ebuild 1278 BLAKE2B 4f1bcd6d98914fd2c51a96ef7dde5636bdcec6e76f1af63d9b1628f410a35d0253832fb2e85c6a122dfad3f3810892539de11a1608a61d1b2d35f4f47f6e5bca SHA512 2b9ddddf426c1a3396aefc41b94a02f2a4e108bdc7fd7da1ec518a8c8634122f4d065dd4425bd82712feae7a3dc2ded963445ae5a7ea668ac046d961edc70a2c
+DIST sink-0.8.0.tar.xz 295064 BLAKE2B 8187520979b43966a4e2d782e0ceb651c49eb25a349e2f9f2251b47978b0eebe64a98ce8c04f1854cdd05779f01c2cb68f1fa008568c1e95d292dbcd65fc61fe SHA512 008ca8355ffbed2bf89a906510aac4c505c8e44de49f445db283aa565e233e7652f2e46c5bcf37e680dec940a8c0f1525e6a8f708e1b4742db62522255c8bad6
+EBUILD sink-0.8.0-r1.ebuild 1141 BLAKE2B 6b5d8760261e500ee0102869b986a741c1ee2e20e663bc41a47b17d4deeee9283d9f1fab4dad4a3276f8968b3a18db5ab2bcd95f802ada02f501410e72a5b6af SHA512 70a46bda78a774a717e5118880d70f6215161db2c9275cd0bfd439749b19fc43efdf47afb25b34aba43b347dd502916a1a57796efb51f19de78e15e4cced4388
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/sink/sink-0.7.0.ebuild b/dev-libs/sink/sink-0.7.0.ebuild
deleted file mode 100644
index 4e7f4708a8f5..000000000000
--- a/dev-libs/sink/sink-0.7.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="false" # build breaks otherwise. tests not isolated.
-inherit kde5
-
-DESCRIPTION="Data access layer handling synchronization, caching and indexing"
-SRC_URI="https://github.com/KDE/sink/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64"
-IUSE=""
-
-# qtgui is bogus but is required because something else in the deptree
-# uses it as a public dependency but doesn't search for it properly
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	dev-db/lmdb:=
-	dev-libs/flatbuffers
-	dev-libs/kasync
-	>=dev-libs/xapian-1.4.4:0=
-	net-libs/kdav2
-	net-libs/kimap2
-	net-misc/curl
-	sys-libs/readline:0=
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-
-# fails to build
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-	# FIXME: sink is useless without its 'examples'. Workaround our eclass
-	sed -i -e "/add_subdirectory(examples)/ s/#DONOTCOMPILE //" \
-		CMakeLists.txt || die "Failed to fix CMakeLists.txt"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
-	)
-	kde5_src_configure
-}
diff --git a/dev-libs/sink/sink-0.8.0-r1.ebuild b/dev-libs/sink/sink-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..b578e12e6682
--- /dev/null
+++ b/dev-libs/sink/sink-0.8.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Data access layer handling synchronization, caching and indexing"
+HOMEPAGE="https://kube-project.com"
+SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+
+# qtgui is bogus but is required because something else in the deptree
+# uses it as a public dependency but doesn't search for it properly
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-db/lmdb:=
+	dev-libs/flatbuffers
+	>=dev-libs/kasync-0.3:5
+	>=dev-libs/xapian-1.4.4:0=
+	kde-frameworks/extra-cmake-modules:5
+	|| (
+		kde-frameworks/kcalendarcore:5
+		kde-apps/kcalcore:5
+	)
+	|| (
+		kde-frameworks/kcontacts:5
+		kde-apps/kcontacts:5
+	)
+	kde-frameworks/kcoreaddons:5
+	kde-apps/kmime:5
+	>=net-libs/kdav2-0.3:5
+	>=net-libs/kimap2-0.3:5
+	net-misc/curl
+	sys-libs/readline:0=
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+"
+
+# fails to build
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/socketstream/Manifest b/dev-libs/socketstream/Manifest
deleted file mode 100644
index 850fd3a12630..000000000000
--- a/dev-libs/socketstream/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 0.7.0-missing_includes.patch 396 BLAKE2B 9e9412c4c6926cecfb2cde1f74baf0ea78132502916983b319d71fb0c7b673be06112bca7f93c5ddb1f70d944a91c11e0852d87931732ad5485399edd8a2df48 SHA512 ef55dabe5c6a6543448b3e28d205ef452762d11903d6288f7d4886c2bea5e6d1164ca6d79262aac10b3db2adfbe64874a0cdfde40862174fa17ea6f3bb6d7be5
-AUX socketstream-0.7.0-gcc47.patch 263 BLAKE2B 0104caa8685cf70a56b4f78baaba54e6af7b703e6f505932781a80b1152d3d8d482cc8a8af376c6c6214152b4b62049b4022ecc1e4a79cf5211c6e4ebd404027 SHA512 2bf8ca41e0d755e4834a139e3c59788a018f3d43590e52f398676e5086827909cb0edee96548a8ecf90a2621cfd04e7ea2490d68944896e6a6abfefc428ac0c6
-DIST socketstream-0.7.0.tar.gz 464806 BLAKE2B a27cd848dad6a3570fad5eb74886106e0e50f5a62e84751e558e17ae6b7b0c4a3d6d257d473e4b64f7b233e6621ce44df24dcde5d11a7cf60f2de18d7110a352 SHA512 61eae3e5df80329e5b81f8d4d3148d16b9ee278b8898ed59e058ea960bd82cfa0d9a01f5ac9ea18ddbabac9d2d3347c49bde870cc74c16a7deb46f99bf443fe9
-EBUILD socketstream-0.7.0-r1.ebuild 797 BLAKE2B 42bcbc5756979b30caa0ca2d4ddeacc7206613e654244c14ff53c8990c1147c7ca3532f1145b6568efc53d1b0adb7c1aaf01c168f08f3a7b0be829ef23482bc8 SHA512 fdecd22de2dbf460015a8458e0c1cb9c40050704ea5e7daf0a6418c2f42960e78aeeb02a3e59946eeed121526117df4b62a30482b783aaf4b31b1d85d7f92219
-MISC metadata.xml 249 BLAKE2B d4af425e717982e9a6ac4be4ea8b400c4073f67a7df6177b18a4886fe90a2c93a710bc45877be7da63b767dc292b34d081645ec1a3bb1118bf0c89d83e889e1a SHA512 46f197b755974d1a0ce78f2220d6f63ea4b2a9a9f019a9866a86d6cccecae435f3853a8bbe70bc2f16efd5123a60c784439cf16c45aa1989a57c5c10f0477760
diff --git a/dev-libs/socketstream/files/0.7.0-missing_includes.patch b/dev-libs/socketstream/files/0.7.0-missing_includes.patch
deleted file mode 100644
index 22c29379ed10..000000000000
--- a/dev-libs/socketstream/files/0.7.0-missing_includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur socketstream-0.7.0.orig/src/socket_exception.cc socketstream-0.7.0/src/socket_exception.cc
---- socketstream-0.7.0.orig/src/socket_exception.cc	2008-06-16 22:08:13.000000000 +0200
-+++ socketstream-0.7.0/src/socket_exception.cc	2008-06-16 22:09:00.000000000 +0200
-@@ -24,6 +24,7 @@
- 
- #include <socketstream/socket_exception.h>
- #include <cerrno>
-+#include <cstring>
- 
- namespace ss {
- 
diff --git a/dev-libs/socketstream/files/socketstream-0.7.0-gcc47.patch b/dev-libs/socketstream/files/socketstream-0.7.0-gcc47.patch
deleted file mode 100644
index 248450847e0b..000000000000
--- a/dev-libs/socketstream/files/socketstream-0.7.0-gcc47.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- https://bugs.gentoo.org/429292
- 
- src/basic_socket.cc | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/src/basic_socket.cc
-+++ b/src/basic_socket.cc
-@@ -22,6 +22,7 @@
-  * @doctodo
-  */
- 
-+#include <unistd.h>
- #include <socketstream/basic_socket.h>
- 
- namespace ss {
diff --git a/dev-libs/socketstream/metadata.xml b/dev-libs/socketstream/metadata.xml
deleted file mode 100644
index 663da9bcbe4d..000000000000
--- a/dev-libs/socketstream/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">socketstream</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild b/dev-libs/socketstream/socketstream-0.7.0-r1.ebuild
deleted file mode 100644
index 741291a7e96b..000000000000
--- a/dev-libs/socketstream/socketstream-0.7.0-r1.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
-
-DESCRIPTION="C++ Streaming sockets library"
-HOMEPAGE="http://socketstream.sourceforge.net/"
-SRC_URI="mirror://sourceforge/socketstream/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~sparc x86"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-missing_includes.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-)
-
-src_prepare() {
-	default
-	# include/Makefile uses DIST_SUBDIRS and thus headers dont get installed
-	sed -i 's|^DIST_\(SUBDIRS =\)|\1|' include/Makefile.in || \
-		die "sed include/Makefile.in failed"
-}
-
-src_compile() {
-	default
-	use doc && emake doxygen
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( docs/html/. )
-	default
-}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index d19f8c1205e4..685244702ba3 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 775 BLAKE2B fce5764a6d61b2748a5463fa319f03832af4deb3fdf505023483a6a48adddd1dcdcc03b9c8b3b73532927dcae68a1a592c5fd349cfd6befd54e7281fadd4e883 SHA512 394dd8bd0ba20cae5d3c37b59135eef5d784b9fcbe3eebf652319df34b4ee499d91478d934e326aafb9a221ef0aa3b260d5d0b4d0935ebf88e7562f713e9b00f
+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 799 BLAKE2B e9d1508a8c1c434e8d4fd4e372989c2b52bdf90ff7220fa35dd2d63d027f2fd7661c50bcb83a10558db3a30b1d0a2f98f524eb42177df143ef07f0ac13fb09e8 SHA512 d3a21825ee17b057048f8e756be28608e74b624d964238b0a9dce8abbf01b9268121d0f7b4a2913aa55c32a866849f1620cbd5ad99f38d832f719ea7df71a8b6
+EBUILD spdlog-1.3.1.ebuild 795 BLAKE2B 7e3308b9d5361ab778407e52cc7ffe9f8dbf77a96115d1d2c4a7d6b490f76fa8413ad47d0340b9602a593a7f6de1e10e3b58230cf09850564e7ec9ce2bf8f364 SHA512 df3faea5c086186560b466ad85b0484947bc241f2e349fc4bec243f64156b63590a1dfc1704217b98e876686c810ffd6066a077ff35ff6005d650042e9ee75ab
 EBUILD spdlog-9999.ebuild 798 BLAKE2B 5122612fce41d8c3bc09395ba99692900790ae51daf3a7f01ef30b0f228120c170395b2c9488286bb05a279e0a3f66d12deb98ce456b9e4d4b45947d44b09784 SHA512 9693c2549a926893acb2ac9dee57f18dcb0ba36cd7fa134195ecbdb7e711106c6db661a5fadfcb882e348d2620defd53d643c6d9816657361195604842adc005
 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 192745e8ae46..ceab2bad83e9 100644
--- a/dev-libs/spdlog/spdlog-1.2.1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.2.1.ebuild
@@ -21,7 +21,7 @@ SLOT="0/1"
 IUSE="test"
 
 DEPEND="
-	>=dev-libs/libfmt-5.0.0
+	dev-libs/libfmt:0/5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/spdlog/spdlog-1.3.1.ebuild b/dev-libs/spdlog/spdlog-1.3.1.ebuild
index 430086637b62..4713c61feaba 100644
--- a/dev-libs/spdlog/spdlog-1.3.1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.3.1.ebuild
@@ -21,7 +21,7 @@ SLOT="0/1"
 IUSE="test"
 
 DEPEND="
-	>=dev-libs/libfmt-5.0.0
+	dev-libs/libfmt:0/5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/stlsoft/Manifest b/dev-libs/stlsoft/Manifest
deleted file mode 100644
index b2355610fa70..000000000000
--- a/dev-libs/stlsoft/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stlsoft-1.9.111-hdrs.zip 2074341 BLAKE2B 73377b822c7c2251011691c9452ef1788dc80fb5a1334e5adad905eb6d525f766b5d817afc4386c26de2f3767114a57e1f7b8918245d7c274514cbf3ee9d130d SHA512 0b277d87444e93ac2918072daf4065240fe18d941831b41cf810427fa51d950922359fa6b9e441fb7d33e26a86a5830e237bc765ff4e7fbc2ec276a708836b7c
-EBUILD stlsoft-1.9.111.ebuild 427 BLAKE2B b05cf9da13532b8dc409fa148faaae82ecbe50ec828b5689210464d7f7ba65f4df8ad28ed53eff78f256eea64ee9b5402f14533de25a0492f6b97c3d6b246e8e SHA512 73bc6d541d7ac16a1dc0948869cf52ea1b4e7da26c59a0e5323fc0a08ca16e8a04d777a355daf2cfdfd1107ada3087250e5f564e0d4a2ed894b11d2e3e66d6f8
-MISC metadata.xml 243 BLAKE2B 2b0a920e82265b6810be0b633cb7b5b79402c382a8a7af4105f6cfb01998ade281fb410157aad94bdccb4ee36c0e3db9b02e167c2194ca5de7cf120c6e7555d6 SHA512 bf5bcc94e0485af353fd128fddbd4981e1386f4935e1779332019f40d78dacad7bde8e6cc897fe5e3e06d8acf546d219b0d1dcb6d593d59ec784001330327ca3
diff --git a/dev-libs/stlsoft/metadata.xml b/dev-libs/stlsoft/metadata.xml
deleted file mode 100644
index 35c25a052436..000000000000
--- a/dev-libs/stlsoft/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">stlsoft</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/stlsoft/stlsoft-1.9.111.ebuild b/dev-libs/stlsoft/stlsoft-1.9.111.ebuild
deleted file mode 100644
index 8a17de2830d6..000000000000
--- a/dev-libs/stlsoft/stlsoft-1.9.111.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Robust, Lightweight, Cross-platform, Template Software"
-HOMEPAGE="http://www.stlsoft.org/"
-SRC_URI="mirror://sourceforge/stlsoft/${P}-hdrs.zip"
-
-LICENSE="BSD"
-SLOT="1.9"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-src_install() {
-	default
-	insinto /usr
-	doins -r include/
-}
diff --git a/dev-libs/syncdir/Manifest b/dev-libs/syncdir/Manifest
deleted file mode 100644
index 97105340e368..000000000000
--- a/dev-libs/syncdir/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST syncdir-1.0.tar.gz 8878 BLAKE2B b9b53d90cb9122e86d23ca8e86ceb4178e4a62e2bdf486e6d7861065592adbc047226581e9d574092590db0a54bf2dd9afbc21e4997ceea3cebb2d66927297b7 SHA512 0b5262e23e43f34be7bc31ed6baf7624a115a509e459504651b184a0856c7918671db4be1b8e14552f275c49c5c6bbc00d786c57f1d96548a491048674f58317
-EBUILD syncdir-1.0-r2.ebuild 836 BLAKE2B cd43cfc66a56669eeebb9fb5aafbd4b7597b7f120726cd41da5b6a22ec14fc937ed88b8ec6bec70a1345d8ae144a8c9dd5d52f4dcf5ab34bfd7dd48928964ccb SHA512 936e7625a7bf3e8b0b7f29dd8f955f5c8809313df7701bb1a5f88daf3c9da3d059bcb7fa32aad931666760164c69c06b8cd8238e268acef42e7690df0f1746b7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/syncdir/metadata.xml b/dev-libs/syncdir/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-libs/syncdir/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-libs/syncdir/syncdir-1.0-r2.ebuild b/dev-libs/syncdir/syncdir-1.0-r2.ebuild
deleted file mode 100644
index 5bd567f29505..000000000000
--- a/dev-libs/syncdir/syncdir-1.0-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Provides an alternate implementation for open, link, rename, and unlink"
-HOMEPAGE="https://untroubled.org/syncdir"
-SRC_URI="https://untroubled.org/syncdir/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE="static-libs"
-
-src_prepare() {
-	default
-	if ! use static-libs; then
-		sed -i Makefile \
-			-e '/^all:/s|libsyncdir.a||' \
-			-e '/install -m 644 libsyncdir.a/d' \
-			|| die "sed Makefile"
-	fi
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		libsyncdir.so \
-		$(use static-libs && echo libsyncdir.a)
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)
-	emake libdir="${D}/usr/$(get_libdir)" install
-	dodoc testsync.c
-}
diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index a58a37748e80..d702421c5cb9 100644
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -3,6 +3,6 @@ AUX tinyxml-2.6.1-entity.patch 1776 BLAKE2B e8430b2fea965f351c12a0413c3bba43ce19
 AUX tinyxml-2.6.2-defineSTL.patch 353 BLAKE2B e9a3d63283f7946e04dafa58a7eeda782b02d6d6093bae18fdec727b9e6c6722a4c610230cc43ea8142695f3a0aaa1e9bf11a8f0072ad580acb5428655a3d6e8 SHA512 52cd82ef9e8f1783b3d6042551342a8c592c447e1da352d5d017db4211144bc0a908ddbfe2a4641b3108fb8e02dc47f385a851f920532d94178314255904a6ef
 AUX tinyxml.pc.patch 383 BLAKE2B 7f13d388d80605a9576ca6c6dca263d9d1afe87026801f4a5d1db9b341b8bc763c66dfdfef924ce388b30fc453b143f01019ba676f66805fb11270c54d19ecfb SHA512 e423baf55f488fe4788234b8b19819520db3f9a43e677c34dd0bb9250c187c349b796a5c2749b5bee35d468b8676ccc8db7eab8a1094c36f65f63e128572b860
 DIST tinyxml_2_6_2.tar.gz 210124 BLAKE2B 84d4ad0174eb38583a4488523410105928b9797f09a2ef84b41156580a40cc11d1d09e28e67512494bd02d7a7e0b208aa6c1ce3383bec12de606491214c16a77 SHA512 133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56
-EBUILD tinyxml-2.6.2-r2.ebuild 1272 BLAKE2B 52eb49192dbc1f2fb465aab5c49e43b90fda4ae8c4bfd9ece8ab49231d9fdaa3097003b21f065332c0b15dfed89befd2c3d6be3b6ee0425fe51a68331734776b SHA512 d01c6c429d6c1fcc0361a3da80de019e329b55492bee5b769a8717016529f3f7e5443341babd3b9431610cd5b7a11fdcedcfffe03a38372333a907a8ebd26f54
-EBUILD tinyxml-2.6.2-r3.ebuild 1511 BLAKE2B 4dc93c2cfddd1603fe48d1ea908883877637ff93858fbf862e59b9633874d5ad52d337fdacc54bcdd43802bef356e5edc433ee27d71ed8f040416d458faf8dc1 SHA512 fbc56b50f7835135a19fb01ad4c518a93ca57a6b2a64374517731a241ab093a899987e26408a984353a7f139d83d4c83c3bfcba27302edbdad12b9913d85c441
+EBUILD tinyxml-2.6.2-r2.ebuild 1260 BLAKE2B 4bac40d16ecc7b9317b74ab35c1d886074b51802c4cabe0296c99f406264200f3d9f6028806a2021fef98e0008a248ed640e8b579b122e9a0d901aa055d5be3f SHA512 5d1b14a173074853b6864f603087ed7e5165e9a0a4b9bcdced139b4d8a0d969a1ff31449ab05ae34b92d00ed95cd237134f678801937feeb7c07760daed33bdc
+EBUILD tinyxml-2.6.2-r3.ebuild 1499 BLAKE2B e3b2877851aeb77c26cb5568d701fa33f22e377450b44f9e316d93d54e4b1230c5ceee5a1aaa82155389e35d83ef058f78a47462b8ac9fa157ebd0133e157a09 SHA512 6d7016dc6a2c3585e9949879722fb557f3e712eaa2027339e36a4749521e11466fdaf50b6ae81b41d2458eebf106bee48c43442c7d125b321f5bb9370c3e444e
 MISC metadata.xml 405 BLAKE2B 3df8b80574d2d5d42ee82fc2056f99d03fdd76190bc4fce6318a7b4ce79765c8c518f34b78181c0252de98dd587f6a48e745f1c094bd20f167a2667c8e64187f SHA512 b11af65ea7f12e4840154047ded852f3a393fecdca6c247d2eee83330a1ca834d210cb5d55db1601534c13a391321b82311fb9d5b288326beacdce2ad743ebb2
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild
index 52ba8c0050dd..66c6e75140c9 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs +stl"
 
 RDEPEND=""
diff --git a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
index 1a6e115660f5..41f16d2f8a0e 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.2-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs +stl"
 
 RDEPEND=""
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index 24bae9a8e1a6..8fbe235ee167 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,3 +1,3 @@
 DIST totem-pl-parser-3.26.3.tar.xz 1314216 BLAKE2B 24b1c7e111456b454022ba7262a1e1483420dbd97b6ec99c0e2631acbb8057134b51ff991d2619e6bda57da6c133e211f949915b0fd62d497905fcd58738b43d SHA512 f059fd9447627268ce5029ed48551b0a2b6c30ba28c50a360d37808ad63fa8423824eef29c7f4d7a752f24861d4c7a7139f321fa2e19085085446e7ed15130cd
-EBUILD totem-pl-parser-3.26.3.ebuild 1913 BLAKE2B c250404ca3ad515f325550ee89f01fc80a88bd6133b3079a8acba60e7a398daa03a9a918ac035d55421606a2739f3acbc798a1222fcf485962f2c10372601cfd SHA512 cd406fbb1a0956500546c32225e0c467e996e7760726118d24f601afe816e8cd9a5822b00928264bf8cbe0705ee9e0c6a24d9d19fed706bd419d648ebc10e11c
+EBUILD totem-pl-parser-3.26.3.ebuild 1903 BLAKE2B 487456163abb628185f5b51353269ae552346e383aaf4f08332acf2c62c4f5a05e78f6dc58cdaa5564f19d64efc6be7933e518b56ff93afea4e9303a3f25e4be SHA512 f96aff903b505e89d74e95bb3784983f1a80f36f348e9a783167fe81a271b6796bf0880d7d01214ccf7baa9ff1b619ebadfa5731bdf365eb09caf87070d62a32
 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 37f9fb14ce9d..2e2c85339e86 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,7 +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"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index 8a461ccf4eb1..db6ad36ad9a1 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -1,4 +1,4 @@
 AUX 0.8.0-pkgcfg.patch 420 BLAKE2B 6b04ff4db2abc5dffdbca50bcbbe20974fdaa24ab25875f2538eca5af42921a729550e7ea5188225d3d73661e9ba05b96ff345fb4d931130ba4255b14c3944d2 SHA512 a6e4713aa0f9619abe256e9e1ea7c5bc8cbeb9ed173dd856972af70612ac435206e2b294ca5947e93223c17de875ba2620bf57949332b19ecff9965e2ee1a9e6
 DIST tre-0.8.0.tar.bz2 380714 BLAKE2B b2af6e805e9e19fd69debf2f881ddfb591317f69db4e29a04e1899eb69100b8ac7744f86fa438530509ca2ee8aa1d346d416c6391f13247cd9398f4c59c2ed85 SHA512 db7465993e0d25eee8e52f974427b8a040234cf0f017769eb94ee88bc6261821336aad7f762bfa82db7e2212d8449bc221592586f061c528a59a550773cbc263
-EBUILD tre-0.8.0-r1.ebuild 1420 BLAKE2B 61ec376c53e7f893729aaf08fca7cd758ac8a505ab4eb67af446d21aa1c7136fa2c99d82734791d56c57aceaa2e04c86c08e864caaa57598f875dd27d7ee3060 SHA512 6b45f7f8e3209f40660c59cc2d5137ec8b61fee587e125edf6eb4020e708e6e232e3a9ade78811b9077f082cfff52169479e1bb789fb87f3a2329ea8ba68c513
+EBUILD tre-0.8.0-r1.ebuild 1410 BLAKE2B 99ec1a1207e0de4dcedda5f804bf46a17c5387cb3dfa1e6074b13c61dec775b15f93d7eee5404b632ff05a31c23a599c70bac0f4bbee5102c94ee7cdade8d29c SHA512 21c764bfe33bf57323a301a6b98d61b117312900b889d22eeefa83c0a2dbc885168faf7d742ef0b86730239f35db808132789a7b04ea2e8438eed663405985bc
 MISC metadata.xml 353 BLAKE2B 0346462595f8f9a38758ce0817e787b87b35b329aef65d2921214d32bd9313023f006ee2ab31084a03a2f8a8ecf1d556dd11f190ac2467ebcd061bc144b977e4 SHA512 907b341e747fb9d7ba7b76f300d373284a21a59e3d649275c4a53ac681177f94e9d0d9f56b15365008262b2aba91236d9ac5623387313c7b74b65b2b70871d3b
diff --git a/dev-libs/tre/tre-0.8.0-r1.ebuild b/dev-libs/tre/tre-0.8.0-r1.ebuild
index 3b33954d254b..943b4a42eb9f 100644
--- a/dev-libs/tre/tre-0.8.0-r1.ebuild
+++ b/dev-libs/tre/tre-0.8.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://laurikari.net/tre/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/dev-libs/ucl/Manifest b/dev-libs/ucl/Manifest
index edaf2906e927..4877bba722d4 100644
--- a/dev-libs/ucl/Manifest
+++ b/dev-libs/ucl/Manifest
@@ -1,5 +1,5 @@
 AUX ucl-1.03-CFLAGS.patch 4187 BLAKE2B 1f59a598cd58d53b25ecb57cf35720a56de022d19c0b57d749ec7cd35b88d8549db712affecbd5902bf98b9b55d375c6b16107d23c3ca126c57ae5ed4d3dbc6c SHA512 4d9b608b2b19cecc6693beb73c5f775b6f1ffbe1e1138dfe77a1318891705a10319e4e728f193f68555bff55a3a24871ec58c2823c487442559987dcb392a890
 AUX ucl-1.03-x32.patch 6437 BLAKE2B 285d7efd85f631752e208f95dc9be4ed8904da63d0e0a20b3bed1f62bc08b6ba0f155f33d1ab9ef3a9f883f4068fa49de4bb286fb73a7aee5638005b18b31348 SHA512 e6a481c12255c7756d424eded3de923a971c8ebb440776556d467ab950ed0944f3468b1f875f1ae835edfe47b44a6f738d5cb16bd8c49c085f6239685528a6ef
 DIST ucl-1.03.tar.gz 534881 BLAKE2B 98df000bcf445963b901acf88b5d1a1065fd6f3eafd1b8adbda5bfe7ac1527b979252ff9d1e8474785f6f23a1a7452e39bf47ebac9216fcfff862625769cabd6 SHA512 7dd1824d01b4bb41ee03bbceddc634a9f7f910d235e5cca163d783680d6743f0f3cc309bbbcc1e094d897d549d3805a555f9093b4d77805443d896dd1862aa34
-EBUILD ucl-1.03-r1.ebuild 1147 BLAKE2B 80df0cffcad4238f7b46c04a0610e8243678cf262ddbd4a3e48e64e2dccbe27ad7f24efa3bedb007782357b8b52ab4db5cc8a1b4cb9a1f71a0d1e4850be87cd4 SHA512 2f374cf021f973d745894e401837665e5d50c5e05fe750c7a101c3653d400567db8c3f547a0ec099601fd15f0cfc1a8568cca65663b4e59a6d1593e4d23efaa1
+EBUILD ucl-1.03-r1.ebuild 1137 BLAKE2B 7d6686123d2cb978bc4924a9f9589a0404b513bc0820f778b8ac0d04faffe69ca2f4ff388046fca56abf01dca41b28e46a4ff9c1e2e713700823cd6cbf04f15b SHA512 6fa67a453257cfe30329dc8792c6fb29870de5ebc323d2bbc4b7731c2c8d38782b088de230f3ce500888d117004c0b3c65e40e8865a8172e373a77f1263cc2e2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/ucl/ucl-1.03-r1.ebuild b/dev-libs/ucl/ucl-1.03-r1.ebuild
index 38a7acb307b6..a0a0936287cb 100644
--- a/dev-libs/ucl/ucl-1.03-r1.ebuild
+++ b/dev-libs/ucl/ucl-1.03-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.oberhumer.com/opensource/ucl/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 DEPEND="!!dev-libs/libucl"
diff --git a/dev-libs/udis86/Manifest b/dev-libs/udis86/Manifest
index 3524a9ebdcb2..4ab39457782e 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 725 BLAKE2B 52df35cbcc8ad0aa83adcefa9ae0bf353ae32821e2c9d9886a1381afecc8d76e5fc1f92d60a1649bfd4db6f32039c053674b6f85a07fa14a5700b62e21526879 SHA512 3b8abae8834e594ea39ea856ca22aca558fa76368b462fd097770a996586dbea97448349f139574e73f09e6954b5151caab98273939d455b001e43e8d77829e6
-EBUILD udis86-1.7.2.ebuild 774 BLAKE2B 42f25a8f4adb8086bd85e54040ac97b28757d485db844f00426b7e1dc93d93917ce41422b90ca7ff739eb5ab7d0c8d8bba2e0135bf065a6d443615d8f6e43763 SHA512 558046efee3e9895f50cb3ea7113fc71f1fe0f41f5d3254ca7826873f23987060595691ad99aa97a97c7ec2b3d6e6f5d31074f6b4a98a69c0a97139878736fa9
+EBUILD udis86-1.7-r2.ebuild 703 BLAKE2B a020d7de8dce1b8f862642af7fd1f2375fa24a787dc3ae33e1908fa3ac1779f3d00bf34488e4183dbbf63d4a238661f67505afc0cf336669dbe4fabefb6ce1d5 SHA512 291a13293efd06132d38f4494046ce59fd9e7e6fd42ae7ca910e7171101e4c15a5e6db55218e8cb06a5cce7d79ed46dbb2316e6a8ddd4d98efff585e356d0062
+EBUILD udis86-1.7.2.ebuild 752 BLAKE2B 7ff7a7421880647330bc046977aadb5edcf066a71c2032f1ccc1400aaea270448a3137dcf65ee476c38dbe2d7a851503ee916a2181dad4f73401bd31a922a4e0 SHA512 2ad52db7d4c7b4f5170f5466877245e704e8c40b4dac7cf6d2c9a43e9bc113e1a497f0506ed6e61f06e6aa88f668b3d3591c2c4a6bf30b2889b7c6ddadf9c9bd
 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 1231af279799..788849146dc2 100644
--- a/dev-libs/udis86/udis86-1.7-r2.ebuild
+++ b/dev-libs/udis86/udis86-1.7-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 DEPEND="test? (
diff --git a/dev-libs/udis86/udis86-1.7.2.ebuild b/dev-libs/udis86/udis86-1.7.2.ebuild
index cd7cf07a9bc6..25d81a928da1 100644
--- a/dev-libs/udis86/udis86-1.7.2.ebuild
+++ b/dev-libs/udis86/udis86-1.7.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 DEPEND="test? (
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 3059e06342a2..06edf3625f66 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -2,10 +2,12 @@ DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a26
 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.46.1.tar.xz 3363624 BLAKE2B 3a85f704eeeb5b741b976cb2450165f524372911f3c00156ce92ff4f7328a7b9e0bfe37be7a8fbcc81a4126391acb4097975c2b5c7475f1b4ffca5bfd8c35379 SHA512 f623afcea7b5b861c122962a76addce3ef83b3a08104635644b034e72113732a6c631b3397fd91e17a73258eec152a21b9be1c29f19a722b765eeffa75e98321
-EBUILD vala-common-0.40.14.ebuild 2517 BLAKE2B c39aa1eaadca30724db5ffc17c26a2df6f932b3aec82273c0cf8dff0ea7407ba6673d403f33040d4c8b361385a71be0e2c39c02b119b67b3f93801b2f8be890a SHA512 5acbad84f92b78270ce6dca6474bfdaa5b9df36f23eac4f16f715ceb75933b45783178d9b4a63a546255e0e899090954f6b9fed7d3b31ee33c42584c7658faca
-EBUILD vala-common-0.42.7.ebuild 2518 BLAKE2B 79889f31651bf8044e066f1275ca2c7b931a10f7a1dbe9985d945ad5141b388b13bb9e27dd2bcc508ab83f63ba63efca7d529ed1eb505c1397a4e00465b58a54 SHA512 0c264a16df1c0bfead6d1edd4967ba7d0ffeff3f4f506b6bc210b0d2db807d8986c286560baa83335412388a00fdb7841718c3e9cadb42e51427e1dcfc9940d4
-EBUILD vala-common-0.44.7.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
-EBUILD vala-common-0.44.8.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
-EBUILD vala-common-0.46.1.ebuild 680 BLAKE2B 2a602773803ce538febac7ed4ebb3a51f68abd5b89938686efa18238b3ef6b95cee53bcf8b2224f8446db465dfc8b9e8bcbe8b8db09700e4d66f5ebfb126a779 SHA512 9f9eed57ec977e7412ee5d76789947033414d0b4591c54679e393a57e08ccd14416c709a7bbacb4e16bcda8f266795da1be591dc86fd5fddd6fc4e1637268d22
+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.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.40.14.ebuild b/dev-libs/vala-common/vala-common-0.40.14.ebuild
index 8b0eff8060dc..3dd858ebb4a6 100644
--- a/dev-libs/vala-common/vala-common-0.40.14.ebuild
+++ b/dev-libs/vala-common/vala-common-0.40.14.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-fbsd ~x86-fbsd ~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=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/vala-common/vala-common-0.42.7.ebuild b/dev-libs/vala-common/vala-common-0.42.7.ebuild
index 85662c0d9061..d31592e99a7b 100644
--- a/dev-libs/vala-common/vala-common-0.42.7.ebuild
+++ b/dev-libs/vala-common/vala-common-0.42.7.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-fbsd ~x86-fbsd ~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=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/vala-common/vala-common-0.44.7.ebuild b/dev-libs/vala-common/vala-common-0.44.7.ebuild
index 5d6856bd6561..f66b34153af7 100644
--- a/dev-libs/vala-common/vala-common-0.44.7.ebuild
+++ b/dev-libs/vala-common/vala-common-0.44.7.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-fbsd ~x86-fbsd ~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/vala-common/vala-common-0.44.8.ebuild b/dev-libs/vala-common/vala-common-0.44.8.ebuild
index 5d6856bd6561..f66b34153af7 100644
--- a/dev-libs/vala-common/vala-common-0.44.8.ebuild
+++ b/dev-libs/vala-common/vala-common-0.44.8.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-fbsd ~x86-fbsd ~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/vala-common/vala-common-0.46.1.ebuild b/dev-libs/vala-common/vala-common-0.44.9.ebuild
index 5d6856bd6561..f66b34153af7 100644
--- a/dev-libs/vala-common/vala-common-0.46.1.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-fbsd ~x86-fbsd ~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/vala-common/vala-common-0.46.3.ebuild b/dev-libs/vala-common/vala-common-0.46.3.ebuild
new file mode 100644
index 000000000000..f66b34153af7
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.46.3.ebuild
@@ -0,0 +1,30 @@
+# 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/vanessa-adt/Manifest b/dev-libs/vanessa-adt/Manifest
deleted file mode 100644
index b63689e2307e..000000000000
--- a/dev-libs/vanessa-adt/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST vanessa_adt-0.0.6.tar.gz 315242 BLAKE2B d321c6deac802a01f3fec209267f69ec9ad2d2d08ab47bf8ea7831a10c6d1d4a0020519322c3882247f6ba42ab4d3d67f77e950154d3fd65f97a61efabbde24f SHA512 d26726b3baedffb7f7e37d62101af3d05166d70e2709caf76be2623fcd53f3e38bc4c920ea2ab95d4729aa130ab62aa3c92db388e4ffe25023bf57e29d414884
-DIST vanessa_adt-0.0.9.tar.gz 342309 BLAKE2B 4a1aca54de30ac01137e16fccac0e46b07ab44688ebe7f3354949938c622f85cb9d92c275e07af2c3af0c35e34550009c91bb549044aa4620a98a66f9e23d09d SHA512 c32eec21879c43350389d62e74667cdd44921f054037bf33eaf869873f1b49e26b5d74bf2bed03b834f28babe072f25d499c9a717be7431b7dc42cd455526019
-EBUILD vanessa-adt-0.0.6.ebuild 680 BLAKE2B 2707415fc999d30a0c39aca51f54878b1b5ffd097caa6662c41bece1df7819794ba6280caf3d41eeb9ceffce78b56fa5da481141749da1d3e81567249846861a SHA512 65fbe939fc264a88ee1f6ea4380f07658aa5c960098d32eca41380a0eb693b16324f1b8cbc4969332baf9ea1878e2f0613dda430916c01e7b8f3056f9732a6f0
-EBUILD vanessa-adt-0.0.9.ebuild 691 BLAKE2B 80ea75e703a9e5c034701be0c42ace1dcc60074a625f64f2a6840188efc24d69ef056480f75126217aa863c94a2ce3a2c3c9d26cb1032719dfa277013f5212fa SHA512 f869ac47ad80b078ff61ce08b5d944a7e9111ef3c2f172c6767e881d5a97566fb3298de68cd6989098eca2b3f55fefb3f5c0f00aa5958ef856e157aa10447fa3
-MISC metadata.xml 289 BLAKE2B ece359bbc1cd696797428b31c61c58e5d63559ec8bfb734e3869421e1ddccbebe109c854225c924ba71d0321cea7ef3a63b1dee3d56b728a4d53bfd34eca8e37 SHA512 eb4947560bda57063dd746f397daafccc5d30e8aa694d75419a2dd4da56461fd6c82274c13e1ac01f8bad0d742c00f4116c20ceefe50f383988c9d12be27c90c
diff --git a/dev-libs/vanessa-adt/metadata.xml b/dev-libs/vanessa-adt/metadata.xml
deleted file mode 100644
index a7029b1a1086..000000000000
--- a/dev-libs/vanessa-adt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-        <maintainer type="person">
-                <email>patrick@gentoo.org</email>
-                <name>Patrick Lauer</name>
-        </maintainer>
-</pkgmetadata>
diff --git a/dev-libs/vanessa-adt/vanessa-adt-0.0.6.ebuild b/dev-libs/vanessa-adt/vanessa-adt-0.0.6.ebuild
deleted file mode 100644
index ac6922b3e794..000000000000
--- a/dev-libs/vanessa-adt/vanessa-adt-0.0.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Abstract Data Types. Includes queue, dynamic array, hash and key value ADT"
-HOMEPAGE="http://horms.net/projects/vanessa/"
-SRC_URI="http://horms.net/projects/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc x86"
-IUSE=""
-
-DEPEND=">=dev-libs/vanessa-logger-0.0.6"
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf || die "error configure"
-	emake || die "error compiling"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "error installing"
-	dodoc AUTHORS NEWS README TODO
-}
diff --git a/dev-libs/vanessa-adt/vanessa-adt-0.0.9.ebuild b/dev-libs/vanessa-adt/vanessa-adt-0.0.9.ebuild
deleted file mode 100644
index 9af4c0c2fde9..000000000000
--- a/dev-libs/vanessa-adt/vanessa-adt-0.0.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Abstract Data Types. Includes queue, dynamic array, hash and key value ADT"
-HOMEPAGE="http://horms.net/projects/vanessa/"
-SRC_URI="http://horms.net/projects/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/vanessa-logger-0.0.7"
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf || die "error configure"
-	emake || die "error compiling"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "error installing"
-	dodoc AUTHORS NEWS README TODO
-}
diff --git a/dev-libs/vanessa-logger/Manifest b/dev-libs/vanessa-logger/Manifest
deleted file mode 100644
index 5537e3a9a4a3..000000000000
--- a/dev-libs/vanessa-logger/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vanessa_logger-0.0.10.tar.gz 328814 BLAKE2B 9780a45ff20d863c46af028afddb2b64d2e533312262c4e64f041ac7f47766a20eac2ae7d107c6cdc0a02261ef306749cba524dccb8e6690e20f029f94de2eb3 SHA512 e8fb11c9ba48cbef6abc1cbb2f6c15786eb405d2eb721d24c33b0e529f0eee8fc3e9d35ffbbdced42c33677377fccee15344bc249521339c4fed5bd5a8c4f20c
-EBUILD vanessa-logger-0.0.10.ebuild 602 BLAKE2B fdfb8b8ed9fea8fd2e389b4dfe438c8e64423f2c90be50c09b2cfa6a3d53c54b49b4e00ca9eaf7e25622cbe50b8417cfda71b54df8f6cf574124a3c97728f233 SHA512 e2cea8085f064b27e6d5af2507a8ec0e4b019c11f9f92cfe431076a9a0952ae15a1e8c30fa4a03b1c47216ac8a854ea41beca6480bb5e75be054a87ec5e9d7e9
-MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/vanessa-logger/metadata.xml b/dev-libs/vanessa-logger/metadata.xml
deleted file mode 100644
index 40aa45df2b01..000000000000
--- a/dev-libs/vanessa-logger/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/vanessa-logger/vanessa-logger-0.0.10.ebuild b/dev-libs/vanessa-logger/vanessa-logger-0.0.10.ebuild
deleted file mode 100644
index bad41b65fdc1..000000000000
--- a/dev-libs/vanessa-logger/vanessa-logger-0.0.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Generic logging layer that to log to syslog, an open file handle or a file name"
-HOMEPAGE="http://horms.net/projects/vanessa/"
-SRC_URI="http://horms.net/projects/vanessa/download/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	make DESTDIR="${D}" install || die "error installing"
-	dodoc AUTHORS NEWS README TODO sample/*.c sample/*.h
-}
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 590fce80d856..1a3b7d84dbc2 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 2956 BLAKE2B 00df5adb4b7200a4bf69549d7f317116d962e5a4631d02c257b12d44b035c05a026aec628eb9ef538a135173889fab37dcc0382f7fddef36c0692f8dc90f8110 SHA512 911ba0ef96cc8f5ecc6ef4e72cf3c8e7829bc2f2c97d14ad1b9323b382d3c0588e694041bd8d7e36d3064bc6b415af896e80f8f1543ff344ef338aca54a185cf
-EBUILD xerces-c-9999.ebuild 2868 BLAKE2B bd1be084d8090c1538260577ab8e89ec8aaf9abbf83c5c8fdaa046e2e44daf0acc996deafc832ad2635043cce5642a5b350223a58a7bb34e0bd4321a1e7893a1 SHA512 d1261c22979dffe67756acfac50fe395d98b56836f246e40acce0aeba1d0b79a8c5fc5d7cb54eff355f848d40aebd9fa36b3829ab00928193739a7823e7672d4
+EBUILD xerces-c-3.2.2-r1.ebuild 2946 BLAKE2B c8302b268d7c0de7b7eda1a74ea30150e38ab3c3c31b023d9490cd575da285f9488a31d31d8c34598b85a3841e743ac28770d6a2891e8bfbc4406c31f0a34d8b SHA512 a0fe1b547c8fa08dac2fa7be0bb1cd018930f2a74b0d21dc8cf58b05980646613a133e3bb2e60b91666f3cf6612ac35b0db4e30870531ba567c191797c0c0f23
+EBUILD xerces-c-9999.ebuild 2858 BLAKE2B 9deec4677f531579e1940474396adf1f7f8883d551a95890dbe36a136568d71bb2b84049727f2dbe6fbd3222abe775b3e690e9767af9b5e3f52a4343766b66e7 SHA512 d9294f193c5f2fac2c3d78a49b228ae5eac0e6d9e7d8266af65a5635df9f41eddec73014b108ae01e8efb0eadbda78a0e044f08c00603a4173d65aceb1a48265
 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 b3de8de76791..1276aaf55f59 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
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/xerces-c/xerces-c-9999.ebuild b/dev-libs/xerces-c/xerces-c-9999.ebuild
index 1f61a3a023de..d431cd570770 100644
--- a/dev-libs/xerces-c/xerces-c-9999.ebuild
+++ b/dev-libs/xerces-c/xerces-c-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/xml-security-c/Manifest b/dev-libs/xml-security-c/Manifest
deleted file mode 100644
index d62ad5ed58fd..000000000000
--- a/dev-libs/xml-security-c/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xml-security-c-2.0.2-libressl.patch 2224 BLAKE2B 076555d874526180d9842599cbb788819e6b8508d1c11dd20a63ad681e4a2d256b8d3b0d80cfcf6d23741cb735bdc5845a72226bd56526ba24e24f5155374b5f SHA512 f248594d5fadd960d6437b5c17ad12db5455dc1ee3b30849f0c394fbf4ac8e85b3a575a833e0878ca5c6fb2a264878b86e3656a21f3038a105c1162253ce446e
-DIST xml-security-c-2.0.2.tar.gz 904933 BLAKE2B 8e336dd7539778411755a8d45398daa530a2f602a0d57faa29301d1f0b29ab0a61c3f47ead42b740337ea75a28e03f471ae6735d5cd66d31f56d3d5fe3405b1b SHA512 bebadee2daf27181f5bcc955a909397976e8fd2e67f5e546f5adbede0ca790647cbec9181b0b609da59d525ff3baa9f899af2a3d815bc7a2f3a57bd8b30c011b
-EBUILD xml-security-c-2.0.2-r1.ebuild 908 BLAKE2B 405c8036ab3a993ca471b1ecbaf48bd7fb94344853d2e1d0a6037945323fee76943c2c1b02512025340e9b08afdc8ad17bd2c04c90b00fe3192e89044318ac8f SHA512 aacf14edef1e76d2290ec4dc62cc6bae053cb5b94d290bb83c67fb8508f8e4e4ff1a811ca1434ec058db99bacc4483bb8c20e7039c2aefd853f2939f3fc82699
-MISC metadata.xml 401 BLAKE2B e1464fa11f2fbc8193158e81a988622d0f92d70a243a817cc8be3dacfddf75550f930743cdfef5d062978811285ef7f51685f4e0dc916458ab7be326d933ec55 SHA512 07f6591298a410fa90c6b830f7ce19dba7c17b1d57e6e1d94e3c399299885da07106abee7ff57dd49854b27b6b7186c038fac6a454b4bb0f36e06fc9c4a32789
diff --git a/dev-libs/xml-security-c/files/xml-security-c-2.0.2-libressl.patch b/dev-libs/xml-security-c/files/xml-security-c-2.0.2-libressl.patch
deleted file mode 100644
index 754ddc6bcf1d..000000000000
--- a/dev-libs/xml-security-c/files/xml-security-c-2.0.2-libressl.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
-index 2ad9da6e..a8ea9f1d 100644
---- a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
-+++ b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
-@@ -48,7 +48,7 @@ XERCES_CPP_NAMESPACE_USE
- //           Construction/Destruction
- // --------------------------------------------------------------------------------
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- OpenSSLCryptoBase64::OpenSSLCryptoBase64() : mp_ectx(&m_ectx_store), mp_dctx(&m_dctx_store) { }
- OpenSSLCryptoBase64::~OpenSSLCryptoBase64() { }
- #else
-diff --git a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
-index c892eac4..82aeb0a1 100644
---- a/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
-+++ b/xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
-@@ -205,7 +205,7 @@ private :
-     EVP_ENCODE_CTX *mp_ectx;              // Encode context
-     EVP_ENCODE_CTX *mp_dctx;              // Decode context
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-     EVP_ENCODE_CTX m_ectx_store;
-     EVP_ENCODE_CTX m_dctx_store;
- #endif 
-diff --git a/xsec/enc/OpenSSL/OpenSSLSupport.cpp b/xsec/enc/OpenSSL/OpenSSLSupport.cpp
-index dfd37eb3..cf874f82 100644
---- a/xsec/enc/OpenSSL/OpenSSLSupport.cpp
-+++ b/xsec/enc/OpenSSL/OpenSSLSupport.cpp
-@@ -273,7 +273,7 @@ int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s)
- 
- #endif
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
- EvpEncodeCtxRAII::EvpEncodeCtxRAII() : mp_ctx(&mp_ctx_store) { };
- EvpEncodeCtxRAII::~EvpEncodeCtxRAII() { }
- #else
-diff --git a/xsec/enc/OpenSSL/OpenSSLSupport.hpp b/xsec/enc/OpenSSL/OpenSSLSupport.hpp
-index e3527fae..b5f67f26 100644
---- a/xsec/enc/OpenSSL/OpenSSLSupport.hpp
-+++ b/xsec/enc/OpenSSL/OpenSSLSupport.hpp
-@@ -88,7 +88,7 @@ public:
- 
- private:
-     EVP_ENCODE_CTX *mp_ctx;
--#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
-     EVP_ENCODE_CTX mp_ctx_store;
- #endif    
- };
diff --git a/dev-libs/xml-security-c/metadata.xml b/dev-libs/xml-security-c/metadata.xml
deleted file mode 100644
index 76ed43fb1227..000000000000
--- a/dev-libs/xml-security-c/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="xalan">Enable support for XSLT and XPath parsing 
-			by <pkg>dev-libs/xalan-c</pkg></flag>
-		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for certain crypto
-			operations (configureable at runtime)</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild b/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild
deleted file mode 100644
index 278e534140b8..000000000000
--- a/dev-libs/xml-security-c/xml-security-c-2.0.2-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=7
-
-DESCRIPTION="Apache C++ XML security libraries"
-HOMEPAGE="https://santuario.apache.org/"
-SRC_URI="mirror://apache/santuario/c-library/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug examples libressl nss static-libs xalan"
-
-RDEPEND=">=dev-libs/xerces-c-3.2
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	nss? ( dev-libs/nss )
-	xalan? ( dev-libs/xalan-c )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-PATCHES=(
-	"${FILESDIR}/${P}-libressl.patch"
-)
-
-DOCS=( CHANGELOG.txt NOTICE.txt )
-
-src_configure() {
-	econf \
-		--with-openssl \
-		$(use_enable static-libs static) \
-		$(use_enable debug) \
-		$(use_with xalan) \
-		$(use_with nss)
-}
-
-src_install() {
-	default
-	if use examples ; then
-		docinto examples
-		dodoc xsec/samples/*.cpp
-	fi
-}
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index 37347ec2daff..71d97313092f 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 2928 BLAKE2B 325cc645a2d7b046b76b03c3ec08802ad4d5073a6b2edbd069cbfbbfa149aa08970196722a9394dd8686620909a78b401714898955b690105f744951a569acba SHA512 02e123da66dcc7151655389ac606f6063467d04dab0e3040d8567d08a865b248d31efc9c187ae813ea4d29fb984ccefba526c9928c3045bcdf795993c79d6f1c
-EBUILD xmlrpc-c-1.39.11-r1.ebuild 1906 BLAKE2B 2d28e83985eb6632f0122b1ebd6deba93e98639de252771bab5fff2f3891022a9fdde183e29bfcf5e6e7ef634ee6e9902e9f867790bfc37c0a6d505ca1d2fc08 SHA512 4c6f3c4c8285c81eb2ac17a0af73d6685d127e6bcb4c44f43f121f7e31f3d8a239ca38952825324b8c4376feb0168d81b81d8fea401a95e77cf0840598ca5e13
+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
 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 bcda3a805a5f..a941bfed35c1 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
@@ -22,7 +22,7 @@ SRC_URI="https://dev.gentoo.org/~maksbotan/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
 
 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 4647224d4fb0..71bcbc4488e5 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
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
 
 REQUIRED_USE="test? ( abyss curl cxx ) tools? ( curl )"
diff --git a/dev-libs/xmlrpc-epi/Manifest b/dev-libs/xmlrpc-epi/Manifest
deleted file mode 100644
index 792dc88aca9d..000000000000
--- a/dev-libs/xmlrpc-epi/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xmlrpc-epi-0.54.2-fix-build-system.patch 370 BLAKE2B eedf67329806af7ab1674cb81c20feff2d2e155a2294838a9183ae33ff37ba71a5f95daf783e2d07621f31a4a015548fa56838b6a610fdd4369b3f1697d6a093 SHA512 993ff2f38d7a1b8f1acf45212607e0499c0b7072152c9c2e30b9cb86fa67108644bf62f69aa954c245d86577c6a2fae0a77a1e6e473e21abbb4b396c67ab22f9
-DIST xmlrpc-epi-0.54.2.tar.bz2 348478 BLAKE2B 43f460445d129def3ca238747598ffd43c51e6d28ac3065bf8e0bc7b888dca77d71960346bd79b9d200d81d17df4f37be39f049f67f356f746b58d5b965c9ddb SHA512 2a8e818bd0eff4d1b0ad0c1cb26f93bc65d941096cf9f4555d1969c69601c452ab26edccee511b06efc9927c5deb7bd2a93fe44da23e5e4f78f6c77ca8e1e9c5
-EBUILD xmlrpc-epi-0.54.2.ebuild 961 BLAKE2B ba6d88bbd4876a6d265fdb7c65befaae2351923d619d07cc126f585338c411e03c08819518e5acff0f9be64b909971b0adbebad55670e338446d7758da554149 SHA512 1f9d6f2a0c8f0f593d40b9b52b2485f7a257e56e10ef15f869b60d0c7ae7f6ff26695dcf95e75b8ae586155c330f085251faba7be15b744279412118e0d3150c
-MISC metadata.xml 247 BLAKE2B 2c8eebb25dce4086826f2899e097abfd82be265330efaccf1b0a70dc6ddd7db762b9c7705869f43b6778474ac42c3fe2ea538d9ef75d16ad4bf54086378f2b1f SHA512 9d95e81a0ea01ed0693e8aaff3c55cffc38aa7d6dedad6212e7d0914791702da5b7434f13deee6fd8b05744002b3d8e60ede232ed1b7b6addd54cd09d50a6824
diff --git a/dev-libs/xmlrpc-epi/files/xmlrpc-epi-0.54.2-fix-build-system.patch b/dev-libs/xmlrpc-epi/files/xmlrpc-epi-0.54.2-fix-build-system.patch
deleted file mode 100644
index 0772836e6bae..000000000000
--- a/dev-libs/xmlrpc-epi/files/xmlrpc-epi-0.54.2-fix-build-system.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -218,8 +218,8 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = src sample
--DIST_SUBDIRS = src sample
-+SUBDIRS = src
-+DIST_SUBDIRS = src
- ACLOCAL_AMFLAGS = -I m4
- CHANGE_LOG_GEN_BIN = scripts/cvs2cl.pl
- CHANGE_LOG_GEN_FLAGS = -t -r -b --accum -I ChangeLog --gmt --prune
diff --git a/dev-libs/xmlrpc-epi/metadata.xml b/dev-libs/xmlrpc-epi/metadata.xml
deleted file mode 100644
index 9c33e56d8b34..000000000000
--- a/dev-libs/xmlrpc-epi/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">xmlrpc-epi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.2.ebuild b/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.2.ebuild
deleted file mode 100644
index 45df6e8ea284..000000000000
--- a/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.2.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
-
-DESCRIPTION="Epinions implementation of XML-RPC protocol in C"
-HOMEPAGE="http://xmlrpc-epi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xmlrpc-epi/${P}.tar.bz2"
-
-LICENSE="Epinions"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="static-libs"
-
-DEPEND="dev-libs/expat:="
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.54.2-fix-build-system.patch )
-
-src_configure() {
-	# NOTES:
-	# to prevent conflict with xmlrpc-c, headers are installed in
-	# 	/usr/include/${PN} instead of /usr/include (bug 274291)
-	econf \
-		--includedir="${EPREFIX}"/usr/include/${PN} \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	if ! use static-libs; then
-		# remove useless .la files
-		find "${D}" -name '*.la' -delete || die
-	fi
-
-	docinto examples
-	docompress -x /usr/share/doc/${PF}/examples
-	dodoc sample/*.c sample/*.php
-	dodoc -r sample/tests
-}
diff --git a/dev-libs/xmlwrapp/Manifest b/dev-libs/xmlwrapp/Manifest
deleted file mode 100644
index 98f3aa1d6926..000000000000
--- a/dev-libs/xmlwrapp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xmlwrapp-0.8.1.tar.gz 1470707 BLAKE2B 213923b5e74f79a6d966ded4b9c9dfb5e6906bc44dd5d79099ee146f852233675d59f33908ee4a2c844332e1b3f7b064770ddcdcd2cea0745bdac6e1329ec3de SHA512 f6415c7cbbe209f7ee148eff4ee5aca4f210b2ab420dbc89b2cdbca1f270097c362ecb456b0cc72cbebc8688fbc66ee3a94c1019d80e7211a9ebe44ddbd535eb
-EBUILD xmlwrapp-0.8.1.ebuild 1225 BLAKE2B 3be2e1162a50143aa2b2011cedbad361bbf413368b1e023881e8f06b5f39fe661b5693534e79924c3e33ae55462a828d7c0f5d336e463ad04c3364cf664a5803 SHA512 6992478f7ebf0fb04fc8724e96cfc231fa51046c10f4eae6910a61238a7a9e2b73f6f7ce4a7b4b999d0bb085b764f1c32ec41aae8416f923203ea36d1be4707b
-MISC metadata.xml 365 BLAKE2B 49ff90af92159680c3ada3c35b8258b756137a7e05c1bfb2108e697874e4102755cfd55605dda1c8f4a00b039ba1333305033bf3729cc6bb4e96f16572735eb9 SHA512 1ec257aeec9800258e0d4ccd22aafdc0c062d2bf85f1f1f978a3fb185b82c6e867fa71d278ad26ab9e22e7151e7a63287d81801227e6263618b3377df9945f61
diff --git a/dev-libs/xmlwrapp/metadata.xml b/dev-libs/xmlwrapp/metadata.xml
deleted file mode 100644
index 3bed55d09fbf..000000000000
--- a/dev-libs/xmlwrapp/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<bugs-to>https://github.com/vslavik/xmlwrapp/issues</bugs-to>
-		<remote-id type="github">vslavik/xmlwrapp</remote-id>
-		<remote-id type="sourceforge">xmlwrapp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.8.1.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.8.1.ebuild
deleted file mode 100644
index ed8327256b08..000000000000
--- a/dev-libs/xmlwrapp/xmlwrapp-0.8.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="modern style C++ library that provides a simple and easy interface to libxml2"
-HOMEPAGE="http://vslavik.github.io/xmlwrapp/"
-SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/6.4" # subslot = SONAME(libxmlwrapp.so) + SONAME(libxsltwrapp.so)
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/boost:=[${MULTILIB_USEDEP}]
-	dev-libs/libxml2:=[${MULTILIB_USEDEP}]
-	dev-libs/libxslt:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	sys-devel/boost-m4"
-
-src_prepare() {
-	default
-
-	# Unbundle boost.m4, rely on
-	# sys-devel/boost-m4 instead
-	rm admin/boost.m4 || die
-
-	sed -i -e '/XMLWRAPP_VISIBILITY/d' configure.ac || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# bug 619804
-	local -x CXXFLAGS="${CXXFLAGS}"
-	append-cxxflags -std=c++14
-
-	ECONF_SOURCE=${S} econf \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# package installs .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index e3936debb372..daff14a8903c 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,7 +1,7 @@
 DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8a3d6c936ab27d3b339dbca3fa88e8ddc4fc9878501d6875622edd2ba50f465b4c361f1eb42d8f7a8f8a6fbd SHA512 085643b52e091ac0eedd54c4459220b3643d825ca71a11e952d00ea2041c570ff57d8553d0378f34e038ca9ee3b40d2048ed02d44d5aff1fbfcbf5e642487ba0
 DIST xxhash-0.7.0.tar.gz 52372 BLAKE2B e59a80ab3970f4830d0de17d3c91de1049fd671dba777d143fae2cf372970c717b6b586bfaca13c49c7dd2f57257d41ebad500632f25bc47125570ed715a47fa SHA512 2d7a06a5cabc945ac841df4451a744f0a666e4afcce77f5eea70bd68547ac46ebf776dd0e3645ef0204c7ff1dea3f5ff8228a8d9894dae0077f865ffdc123c66
 DIST xxhash-0.7.1.tar.gz 76328 BLAKE2B 8ef64a1a44763417441dbec396d54b5d57ee225058f6c1bfb6baa8983bae49d84ab55a59743f7edf8580be52acc1bfb622c590f43450891af4d17cbd2ac48972 SHA512 03aa89c35fffafa8fc81b249ff4fa0dd3f7985466106815a9f36b00314ce82e3e2586e7abec5b56dd94d9b785768ac9562b03973817390b716cad8cd53e9ebc1
-EBUILD xxhash-0.6.5.ebuild 866 BLAKE2B e74ebb6ca149fbb5a21d27be21919a11716ba1da1552d8524c6e3d09601edb4876cdb27a7ed5726f903c309124dfb0ca8a39c883046a5bef9d6cb6916edab65e SHA512 fef64fa69b75cc2e5e599edc5bccf37d38e111912271e0e84d41bd8a537ab72a43d86f6dfa511e10e9259b031388794d9750ff6110a11654932e25a1a3ae7306
-EBUILD xxhash-0.7.0.ebuild 869 BLAKE2B 52bbe35fc037a735519a6a88477d58337bb66c5283f709ed8ddcf3872c4a482f57bde8aa0f28a2f9897c31ba47a272cb7d0b132ce18371ec32add75db0307c2a SHA512 d7b96bcb2eff8d499068daf01dd320ac106317265b706d29d3a4bd086a1386d862c5f2d7e80ee6350938b91ae5d3673aeafc188f69dc45fbff5b4356241ec3ea
-EBUILD xxhash-0.7.1.ebuild 922 BLAKE2B 36544ef79746feb6580f458cfcb90bb6c84f17199a9b9d9c3af8a5446e241eb67f54af686bac8f64727913174995ccb8db61b830b52231d8044f0c87be26ef93 SHA512 1c93853714b91db9a7d385035a2e296679a6d5ca64dfeb4de85b0e676b0b376e9295b248068a3a7901d107f3397e20d431e852430b17cec36b0210507925179c
+EBUILD xxhash-0.6.5.ebuild 854 BLAKE2B 29726d099a9447691c50de1623418fd42bead11bbe8835d616f4c1d72daaf05cd302af4939341639ac91dc91a79f235e7650f2ae83b351a370640967efd6a8cf SHA512 821bedc497f8f88f5d65c7b5d1d495d2031466cdf3f02b22df15ecf9ff84e23e7b0de3379177e9fa6325ec8906bca6c87be02f9df80109761e67ff448ef039e6
+EBUILD xxhash-0.7.0.ebuild 857 BLAKE2B 9583e7ed38d1f737324e3070874300d69c825c76b568a57db143886fa1145efdc46b6891e3606b08adebb6aa6c69e83ee301e94b3a24e37a26c01275b7e8f00a SHA512 2d179bfd9cee06f12b79995a11e02318fa7c31ec86f28e9829cd558e2c26c4cf1ebc0bc3fc1a687d24f1f96436fa0a15f5c9a66cc154a34151b988fb111b3044
+EBUILD xxhash-0.7.1.ebuild 910 BLAKE2B 3d7a05558c8845a9027f34902af7c373480e4296c8b45fb8f604ddb8c28ab9713bb9048ca9683020d2220a1c3d8d4a0f846127e3255be9219b95395648b38058 SHA512 da8975796275af0757b5ad36965fccfceb86f0a2afca5f69097bc44f444bc7055e4820150b22b2576e84925693648ce996081dd3ac303237a8982987c445ca17
 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.6.5.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild
index 7674c73b5cb2..45f304b9d623 100644
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-libs/xxhash/xxhash-0.7.0.ebuild b/dev-libs/xxhash/xxhash-0.7.0.ebuild
index 382d4b60dd12..1471f457de2c 100644
--- a/dev-libs/xxhash/xxhash-0.7.0.ebuild
+++ b/dev-libs/xxhash/xxhash-0.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-libs/xxhash/xxhash-0.7.1.ebuild b/dev-libs/xxhash/xxhash-0.7.1.ebuild
index 9f2255c1241b..a432ad182cca 100644
--- a/dev-libs/xxhash/xxhash-0.7.1.ebuild
+++ b/dev-libs/xxhash/xxhash-0.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD-2 GPL-2+"
 # https://abi-laboratory.pro/tracker/timeline/xxhash
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index 2fe54f256d9e..746c80d41ddb 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,6 +1,6 @@
 AUX yajl-2.1.0-pkg-config.patch 2299 BLAKE2B 1de5b3d183b692b8be1fe37d0f05e97141b82dcfce7770e9b4e27ed2443b8506efb8a6cff2bbc5ebac640ba87819833d0e6eb5d8cd8139a973861904afbea648 SHA512 0cc7f685b80280af209c8b3d9443711174a0439dc59f3e81dbd1f78b8aecca3eb29b2c8b88d94b8a4200a1248fb03948a1e51206373af49a55fb2eb32e9d7dde
 AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d
 DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985
-EBUILD yajl-2.1.0-r1.ebuild 929 BLAKE2B 3056d21fbf420a21a5fe3e8ba091b5d1509c5c270dd559faf6ba189c1770f5eae18adb40efc9c67bdc5f662eb94594e593943ec5c9938eb90370007f394bdd70 SHA512 ddf6476d025c541b62e831540a97c16a89706a51c61b1207afdfe52bd04c1175360e67351433158237cb17156e41446a81702e50ede4078a2bb67f08618deb61
-EBUILD yajl-2.1.0-r2.ebuild 964 BLAKE2B 3c6656021246cf7eb18acfe704b15d61c4d0ab5ad5da51b968782ca5cdfff2d0a056865ab8e19da0e6b37f34f173edcaaba44038502e5be6c688ca52fd67a87d SHA512 ff676e1296af826a7ce6733cdfea81efb4c8eca387342d1d139763d54a72745dcf6b962caf6373380969fdabb29cf707833adb4a88319b6ad8b23560bf980cf1
+EBUILD yajl-2.1.0-r1.ebuild 907 BLAKE2B 62b6c9bef36a8e61f170b24cb251b8d5b6c0259ccb1db2e42d278644d0f29db9d727877a35bb919f1b933d1427b4160c5870128bd928d55d6858d6d495fadcc2 SHA512 dcbbff601234fe93c38b3b926b078dcbc6be470538081c155c7164e7e6d733d1cbc4cb373594295bef0fa20403691f46e74a3f974cc26c2dc5b627fc66eb7245
+EBUILD yajl-2.1.0-r2.ebuild 942 BLAKE2B 45f2069b4321e5994cae8c65d61c8dd625a0868d89b1b2d6ce8c202905c9a6dbfc78f37dac5c1f79b985f19efbcc309a62b566dcd025cae1684cf0390008cac8 SHA512 f5f403466b3e332fa56c0fb7491aecfe29dfb090f237d886ebd8505696ba025c8a72b572285a39ae39ae344b7703a0961327479bb79f4646c775bc61e37afcbe
 MISC metadata.xml 336 BLAKE2B cfff08a4c7fbc2990928356c47d5110c6e6de6278ec3a45ac89f7dc1ae5f247a12214c41c884e622d264142b3f487fb82ff0457e15a0d39080e7680ad72d790e SHA512 c01c9b3ba695bb76ef55ede76c3e4b2e6843b27d4148aca7c290ac909aa8800541f0b85c043c5a74e518e4e84a0d3c6907cc4f93bbe8d0addfaaa40ede3a347d
diff --git a/dev-libs/yajl/yajl-2.1.0-r1.ebuild b/dev-libs/yajl/yajl-2.1.0-r1.ebuild
index 0404291809c5..d4d16b2f6956 100644
--- a/dev-libs/yajl/yajl-2.1.0-r1.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 PATCHES=( "${FILESDIR}"/${P}-uclibc.patch )
diff --git a/dev-libs/yajl/yajl-2.1.0-r2.ebuild b/dev-libs/yajl/yajl-2.1.0-r2.ebuild
index ac53ef40c042..79b944be356d 100644
--- a/dev-libs/yajl/yajl-2.1.0-r2.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 PATCHES=( "${FILESDIR}"/${P}-uclibc.patch "${FILESDIR}"/${P}-pkg-config.patch )
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 85143dcbf9c1..1ee11e9961e8 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 2315 BLAKE2B 4dab01a4f2d916240c4119ad10af21a14efa1e7d20c3b76daa7f32480c80324120c1ea024acd30c07bb60d90d8d1dc36e5fc8bedb80e04cceaa39acfcc70775d SHA512 9e4078370c40afc58cbf7d8d193e89db3c33e043e8024e30033c251159e33af6ca5320c821efea1a9f5f4113bdd08439735ba89a0483a094c42a9dd1bd781846
+EBUILD zziplib-0.13.69.ebuild 2293 BLAKE2B ac4ab1038202486065661f5cc151e872480752aa34e43085600068b6fb3481aaba31b74c698853ec334b033e63f80c7fd8c00b4eb3876bb17889a607388dec79 SHA512 1c17f556edb55706cfe2d76b9dcecd77d1c63288da37b805a50a909d93a0cc524ad453177dc838e970c15af6b9d39da87f952559eb9f88b30c483b4ce5650e4d
 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 fccf9c061558..2ce5760dafac 100644
--- a/dev-libs/zziplib/zziplib-0.13.69.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.69.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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="doc sdl static-libs test"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
commit	bb72e65b6d6ce95abb5d486dad35d37dc105e89b (patch)
tree	b31a9263d386dcae4cb06764136672508dc5efdf /dev-libs
parent	9b1e6d491f32eb4caf0c8e197bdec075713c97ca (diff)