gentoo resync : 11.07.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-07-10 23:40:16 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-07-10 23:40:16 +0100
commit: 51af5f0eb4cddbe6aa7953717873691d77aae9ff (patch)
tree: 1541525274162b033ebbc3ed38abaf335fbbd49a /dev-libs
parent: 7014a5a3ea0feffab9701fdd6b64cc7667a985af (diff)
112 files changed, 1175 insertions, 1495 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c181c1211f60..a9a4357ed475 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index 74d4724b8ead..89bdeaf30efd 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,5 +1,5 @@
 DIST appstream-glib-0.7.15.tar.xz 2240040 BLAKE2B e1b58e0ce6523354490e529381302aa603e4ac1886c37e9c261ab612f76490ae4ea8fd22eff9c2bc1981d5ceb77ff8c4f8279e091dc62bd4df39d2c32623c1ea SHA512 bab0c73e54d90fbf22295f616d4a09332f94b90a3fa0cb38f1b654c6d9a459c9557dd81c677f486361dbf4f1dd23651306fe34b1cdd15254694269a8c9e8a927
 DIST appstream-glib-0.7.9.tar.xz 2245728 BLAKE2B fb6f54329bed91f1acaa6218b111fd4527dff7ed412a89cb44a6e4f6cdfb7e0fe4e6f9fb37b6cdc2efa75164dccef323b6d7428a63b08369b941d36b0b9071f0 SHA512 d78cb6f11cad01d67cb33f16e987485177d20b78a8b21cfbabb64ce7b18b813c0d2d1de2faeea199fdc31d12633e899a5596a6cf133cb831a4377d641f79eb7d
-EBUILD appstream-glib-0.7.15.ebuild 1639 BLAKE2B 34c060608d1ae5996bc0b166694ea6d766ce0c85ac4946ce1330617d590c434da3ba84582d8603f3c21ecdc891e567ce8c2290dc29364df1d4dc3b4e9fdb0a31 SHA512 8c5c02019705040e90023c7521c64ce067340b053d9784a857d91cf8f2dd719cdc70fa4d55a54cb1e9ad45b2aef34bcc5279fd77a5b75b044a80a4d488fbc52c
+EBUILD appstream-glib-0.7.15.ebuild 1638 BLAKE2B b1d180c3c0c3f7ee9b2632c4c67b5f22c3fd1d40247c3de7ce7a452a6594ad50a1f84de5ed22faeee0e64f489325a66ade013acea0e30bfc5806e21b8a509d94 SHA512 0127fef4f96b31d46029d85ea575fdcbac5fabac71c52c9958deae82f54fad097c12eb4f9caa41d3d6e0283425d9f5bbd8492d1edb90cb0ced62d205cd32f8ee
 EBUILD appstream-glib-0.7.9.ebuild 1623 BLAKE2B c66d8dae417e53b8fcc0be7afbd2cc06aee3df35254ea1e204dd00feacd37133b702f39ca1899e91c9fea5294e45cbf35a31df7b8e30370be76821301f47dae0 SHA512 d865778c663bbfcab9e99473f66c4156c5d887fcdd1e4402bacc9bb7dcaf073656a624b8d0e2d78883b180512e31ecb7553cfb5ca0733d369d5bb745b5141bf6
 MISC metadata.xml 422 BLAKE2B 2e5bf4c5c2d13bf78b471e1dd96805a9ccfe89dc4c9d0e580d8248f2217516c661c150589d810ed63a5d157188adfbddd0e14aff27066c30abf3b890a40fea39 SHA512 c4466112e9b673bab1ddd4787d13b39bb12be7c646a801f5583ffbf8edee2010b0309e6dd2e0cc65cc127a2c4fa7c2182a4c7cbaa5a7011e569d31ca2d1217ca
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
index fee560ccfa93..3201045c2f8d 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 6fca8ad5c76b..20f7d7157443 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -2,5 +2,5 @@ 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
 EBUILD atk-2.28.1.ebuild 1441 BLAKE2B c1283a8624ebc62e5bebd5d7593413be5030a7dc3206440e07630f29b0b06bcb93effe354fa52552706a557e5a965396f8c0a800322595589137ab56208d9f3e SHA512 04ffcc74623d10bf92d3401deec43395bf4cf8c3093481af7d46369df7e0e563ae91655be7fb78a6a232e76dd4fe0cc43d7330af3b3147e9aa6f12dfd8ce2513
-EBUILD atk-2.30.0.ebuild 1250 BLAKE2B 3a73d0a9df227f95b0f96e43ac38222f1a15e1da5c79ea5b2ce06b4e0ea2b3bdb759f46de638997bb3fafea9a099b80b3f448fdfae3bb8bb57112904acde89fa SHA512 09c4637fae47e0ccddd5aa7109a4ed9c2d6a492848dea82bb16f8e36427528dbd64a5fdef058e664dae001d1c4594925be9d7db72de5bdba8f056b828dfe1289
+EBUILD atk-2.30.0.ebuild 1249 BLAKE2B 7616b74cb47076cb4076b09b912548d922b45e46f9edb2f25419361b26b8d23579ec04fc228ccc602ff37a4a74d726588a38a788ebc0ca3806adaba0a1ee8ed8 SHA512 8af7527ccf22d4e9ee3e37631c057bca06b31d084b774f3c86877caf8d8322c6e8fadf6eb7ff90ae5bf0072c67d75632de1892a1489a3438fc2492d050f7522c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.30.0.ebuild b/dev-libs/atk/atk-2.30.0.ebuild
index d7493ec32481..298e68d20e93 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-fbsd ~x86-fbsd ~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/beignet/Manifest b/dev-libs/beignet/Manifest
index a639814ca656..41356ee64b8b 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -7,5 +7,5 @@ AUX beignet-1.3.2_llvm7.patch 4805 BLAKE2B df959c8e482e1810b2257419088a4cd283bfe
 AUX llvm-terminfo.patch 788 BLAKE2B cb652c28aac1cca566cb801b9e7f2b6ea8a9ff9457896a50b3323b41a009e039085d2d4aeff14d9d8cf35fca3e4a23bacb3078451c4981b6f806cec4146aec83 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312
 AUX no-debian-multiarch.patch 1652 BLAKE2B 4d112429412a7ada957228aa8e6beb145fbaf04065d6f816b0f13513631211894c57e9999157db5f22d7044f231be65396040efe450d090e3774bd24c9c93482 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a
-EBUILD beignet-1.3.2-r3.ebuild 2851 BLAKE2B 02f77460a32eed4a28941bb655c5392166360a64b47a92eb9a31490ac65b304a2bd7291154b0d51d50598c29ecdceca7b7275803acfa6d6c7b3d2133b15b8b24 SHA512 015e0ce25db7878edcc509b81bc4dcbb4cd525f84358d427f44e4ada39e9b3f01f258748332017f387bea897d4ab55d10d5fc19ede72e93d4bce95235d0a6b8c
+EBUILD beignet-1.3.2-r3.ebuild 2867 BLAKE2B 09622ce3932f4b04027b2c4585b3c003bf3a0582f25ef6aae3045b87226e27b3efb5eb640663990e557ba037ebeb48a60fb97392717e3008b62af9e98c9bb386 SHA512 c1c31f7f1eaf6804c3dfaa01e40e8ec3a8476de87806aea3fba2b608b807c43b3867244d86c9b77cce412ff0a8384328ea6893c3d0ec8962ce8a22a2740cb9d3
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2-r3.ebuild b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
index 0d0b8a6bae77..132de5924f5f 100644
--- a/dev-libs/beignet/beignet-1.3.2-r3.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
@@ -21,7 +21,7 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig"
 COMMON="app-eselect/eselect-opencl
 	media-libs/mesa[${MULTILIB_USEDEP}]
-	<sys-devel/clang-8.0.0:=[${MULTILIB_USEDEP}]
+	<sys-devel/clang-8.0.0:=[static-analyzer,${MULTILIB_USEDEP}]
 	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libXfixes[${MULTILIB_USEDEP}]
diff --git a/dev-libs/bglibs/Manifest b/dev-libs/bglibs/Manifest
index 9e83511bbe60..e1eae6490356 100644
--- a/dev-libs/bglibs/Manifest
+++ b/dev-libs/bglibs/Manifest
@@ -1,7 +1,3 @@
-AUX bglibs-1.106-parallel-fix.patch 2142 BLAKE2B 2f51f4bf7980afadc9bed2d701a59cf8c7c4abc628dfd3cae5eb0aa72ef6c2da4e7c5d846a7090d47bfd9be51fe72c7cdba9ddb9da3b3ecf95e59eae121af0a3 SHA512 8f6d1760932416e1f9b83229df89730a191c467b3e05ba7ba4faf4e3f5ef57d16469695fadc39717352be6b8ae7b84d8ba3933b39e4a8a041086c386c84c0339
-DIST bglibs-1.106.tar.gz 481564 BLAKE2B 838bd29753b254efc90c8c2c2e4d4920de2e931f823d32393184156f76967ec1995f1e79d2879169dd509cddd298b2389a4ca0109b81245fc617575f3ccf7405 SHA512 c1ae4bb9978b09ffe01231738d1f249c2040a51c2a0bbc4b04389a7085a3885cca6483f1bfe65deca213d991273bb3b7b925ebde8b6e2cd9182d8a57cb9a49d8
 DIST bglibs-2.04.tar.gz 713673 BLAKE2B 9e1353b3221ef6a8cfb256ec8616d1e208777b20ecade3e6ae17faca6b42222e18aa601a948e6201139378bf6f8131a2b7a053d77b198176776d42a1af611186 SHA512 094268cad7d4bacf65c0dd3d42fde2e6bac34da0fd6193b1c8202c018e752b3ef80a86c38e687467fb3a4e97130126fe74ee4a86063e4b25ee291de573984a6f
-EBUILD bglibs-1.106-r1.ebuild 2306 BLAKE2B 42fccf4efd079a4e18f318b70aa37080f35ac6885b7f9922d4caeb1013c6885e166bb863f91538a39ce7d8356be6edfe06461aa761c5f1f2a4ac98fe74db5336 SHA512 7687de754e81aeec14538d92cb1ac0d768ecaee8f9621d8921c42ce0c87dcbfaf915de84cf32b7befa3b45154229ba3eb0abff5ef01304b196582db5f84901f8
-EBUILD bglibs-1.106-r2.ebuild 2391 BLAKE2B de82b2768655bf2690a58abfea210de7cc887c5d64d7988c9aeb22bbd0f3f419b32af44c71a27392dcd655bfdf9cca81f4af2e0525c5e126594596271a4d5417 SHA512 6e6093d5c0fbe9fb6acff127cff01cab06f641ff7b0d377fefa4bb3a3376bc5f161aa431ed692eebfd46969d065661e0bcfd1e01c572f2479c4510a685cb531f
 EBUILD bglibs-2.04.ebuild 1663 BLAKE2B 8435eacaf2494ef267fe5f6b9b8d54b70229df63a5d4c86bcb218428d6c01bc673e15b955659267fa52c7c417be8719e32a8b1d22bfa4bd34fb77f8b7bb98787 SHA512 8e792b58d91a3b4158dde65f5548bcaac7a4a12d87d4bb221fe76c1c396fdd3069633e68b4180352255d36feb9cc9777d34c2db6c0db793a536a0dd933eda45a
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/bglibs/bglibs-1.106-r1.ebuild b/dev-libs/bglibs/bglibs-1.106-r1.ebuild
deleted file mode 100644
index 3964c00ce922..000000000000
--- a/dev-libs/bglibs/bglibs-1.106-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit toolchain-funcs eutils multilib
-
-DESCRIPTION="Bruce Guenters Libraries Collection"
-HOMEPAGE="http://untroubled.org/bglibs/"
-SRC_URI="http://untroubled.org/bglibs/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc x86"
-IUSE=""
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.106-parallel-fix.patch
-	# disable tests as we want them manually
-	sed -i \
-		-e '/^all:/s|selftests||' \
-		"${S}"/Makefile
-	sed -i \
-		-e '/selftests/d' \
-		"${S}"/TARGETS
-	#sed -i \
-	#	-e 's,^libraries:,LIBS = ,g' \
-	#	-e '/^LIBS =/alibs-static: $(filter %.a,$(LIBS))' \
-	#	-e '/^LIBS =/alibs-shared: $(filter %.la,$(LIBS))' \
-	#	-e '/^LIBS =/alibraries: libs-static libs-shared' \
-	#	"${S}"/Makefile
-}
-
-src_compile() {
-	echo "${D}/usr/bin" > conf-bin
-	echo "${D}/usr/$(get_libdir)/bglibs" > conf-lib
-	echo "${D}/usr/include/bglibs" > conf-include
-	echo "${D}/usr/share/man" > conf-man
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	emake || die
-}
-
-src_test() {
-	einfo "Running selftests"
-	emake selftests
-}
-
-src_install () {
-	einstall || die "install failed"
-
-	#make backwards compatible symlinks
-	dosym /usr/$(get_libdir)/bglibs /usr/$(get_libdir)/bglibs/lib
-	[ "$(get_libdir)" != "lib" ] && dosym /usr/$(get_libdir)/bglibs /usr/$(get_libdir)/bglibs/$(get_libdir)
-	dosym /usr/include/bglibs /usr/$(get_libdir)/bglibs/include
-
-	#install .so in LDPATH
-	mv "${D}"/usr/$(get_libdir)/bglibs/libbg.so.1.1.1 "${D}"/usr/$(get_libdir)/
-	mv "${D}"/usr/$(get_libdir)/bglibs/libbg-sysdeps.so.1.1.1 "${D}"/usr/$(get_libdir)/
-	dosym libbg.so.1.1.1 /usr/$(get_libdir)/libbg.so.1
-	dosym libbg.so.1.1.1 /usr/$(get_libdir)/libbg.so
-	dosym libbg-sysdeps.so.1.1.1 /usr/$(get_libdir)/libbg-sysdeps.so.1
-	dosym libbg-sysdeps.so.1.1.1 /usr/$(get_libdir)/libbg-sysdeps.so
-
-	dosym ../libbg.so.1.1.1 /usr/$(get_libdir)/bglibs/libbg.so.1.1.1
-	dosym ../libbg-sysdeps.so.1.1.1 /usr/$(get_libdir)/bglibs/libbg-sysdeps.so.1.1.1
-
-	rm "${D}"/usr/$(get_libdir)/bglibs/libbg.la
-	rm "${D}"/usr/$(get_libdir)/bglibs/libbg-sysdeps.la
-
-	dodoc ANNOUNCEMENT NEWS README ChangeLog TODO VERSION
-	dohtml doc/html/*
-	docinto latex
-	dodoc doc/latex/*
-}
diff --git a/dev-libs/bglibs/bglibs-1.106-r2.ebuild b/dev-libs/bglibs/bglibs-1.106-r2.ebuild
deleted file mode 100644
index 6ef63dbc235c..000000000000
--- a/dev-libs/bglibs/bglibs-1.106-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Bruce Guenters Libraries Collection"
-HOMEPAGE="https://untroubled.org/bglibs/
-	https://github.com/bruceg/bglibs"
-SRC_URI="https://untroubled.org/bglibs/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-BDEPEND="
-	sys-devel/libtool
-	doc? (
-		app-doc/doxygen
-		dev-tex/xcolor
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.106-parallel-fix.patch )
-
-src_prepare() {
-	default
-	# disable tests as we want them manually
-	sed -i -e '/^all:/s|selftests||' Makefile || die
-	sed -i -e '/selftests/d' TARGETS || die
-}
-
-src_configure() {
-	echo "${ED}/usr/bin" > conf-bin || die
-	echo "${ED}/usr/$(get_libdir)/bglibs" > conf-lib || die
-	echo "${ED}/usr/include/bglibs" > conf-include || die
-	echo "${ED}/usr/share/man" > conf-man || die
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-}
-
-src_compile() {
-	default
-	if use doc; then
-		emake -C doc/latex pdf
-	fi
-}
-
-src_test() {
-	einfo "Running selftests"
-	emake selftests
-}
-
-src_install () {
-	default
-
-	#make backwards compatible symlinks
-	dosym ../../$(get_libdir)/bglibs /usr/$(get_libdir)/bglibs/lib
-	[[ "$(get_libdir)" != "lib" ]] && dosym ../../$(get_libdir)/bglibs /usr/$(get_libdir)/bglibs/$(get_libdir)
-	dosym ../../include/bglibs /usr/$(get_libdir)/bglibs/include
-
-	#install .so in LDPATH
-	mv "${ED}"/usr/$(get_libdir)/bglibs/libbg.so.1.1.1 "${ED}"/usr/$(get_libdir)/ || die
-	mv "${ED}"/usr/$(get_libdir)/bglibs/libbg-sysdeps.so.1.1.1 "${ED}"/usr/$(get_libdir)/ || die
-	dosym libbg.so.1.1.1 /usr/$(get_libdir)/libbg.so.1
-	dosym libbg.so.1.1.1 /usr/$(get_libdir)/libbg.so
-	dosym libbg-sysdeps.so.1.1.1 /usr/$(get_libdir)/libbg-sysdeps.so.1
-	dosym libbg-sysdeps.so.1.1.1 /usr/$(get_libdir)/libbg-sysdeps.so
-
-	dosym ../libbg.so.1.1.1 /usr/$(get_libdir)/bglibs/libbg.so.1.1.1
-	dosym ../libbg-sysdeps.so.1.1.1 /usr/$(get_libdir)/bglibs/libbg-sysdeps.so.1.1.1
-
-	rm "${ED}"/usr/$(get_libdir)/bglibs/libbg.la || die
-	rm "${ED}"/usr/$(get_libdir)/bglibs/libbg-sysdeps.la || die
-
-	dodoc ANNOUNCEMENT NEWS README ChangeLog TODO VERSION
-	dodoc -r doc/html/
-	if use doc; then
-		dodoc doc/latex/refman.pdf
-	fi
-}
diff --git a/dev-libs/bglibs/files/bglibs-1.106-parallel-fix.patch b/dev-libs/bglibs/files/bglibs-1.106-parallel-fix.patch
deleted file mode 100644
index 30c13e8c75fa..000000000000
--- a/dev-libs/bglibs/files/bglibs-1.106-parallel-fix.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Forward port to 1.106 by Thilo Bangert <bangert@gentoo.org>
-Fixes for parallel compile.
-
-- Redirection straight to an output target that is later used for dependancies
-  is not safe. The output file must be come into existence atomically.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Naur bglibs-1.106.orig/Makefile bglibs-1.106/Makefile
---- bglibs-1.106.orig/Makefile	2009-11-20 11:52:29.000000000 +0100
-+++ bglibs-1.106/Makefile	2009-11-20 11:56:01.000000000 +0100
-@@ -152,37 +152,43 @@
- 	./compile crc-gentab.c
- 
- crc/crc16_arc_table.c: crc-gentab
--	./crc-gentab crc16_arc 16 0x8005 reflected >$@
-+	./crc-gentab crc16_arc 16 0x8005 reflected >$@.tmp
-+	mv $@.tmp $@
- 
- crc/crc16_arc_table.lo crc/crc16_arc_table.o: ltcompile crc/crc16_arc_table.c
- 	./ltcompile crc/crc16_arc_table.c
- 
- crc/crc16_ccitt_table.c: crc-gentab
--	./crc-gentab crc16_ccitt 16 0x1021 normal >$@
-+	./crc-gentab crc16_ccitt 16 0x1021 normal >$@.tmp
-+	mv $@.tmp $@
- 
- crc/crc16_ccitt_table.lo crc/crc16_ccitt_table.o: ltcompile crc/crc16_ccitt_table.c
- 	./ltcompile crc/crc16_ccitt_table.c
- 
- crc/crc16_xmodem_table.c: crc-gentab
--	./crc-gentab crc16_xmodem 16 0x8408 reflected >$@
-+	./crc-gentab crc16_xmodem 16 0x8408 reflected >$@.tmp
-+	mv $@.tmp $@
- 
- crc/crc16_xmodem_table.lo crc/crc16_xmodem_table.o: ltcompile crc/crc16_xmodem_table.c
- 	./ltcompile crc/crc16_xmodem_table.c
- 
- crc/crc32_table.c: crc-gentab
--	./crc-gentab crc32 32 0x04C11DB7 reflected >$@
-+	./crc-gentab crc32 32 0x04C11DB7 reflected >$@.tmp
-+	mv $@.tmp $@
- 
- crc/crc32_table.lo crc/crc32_table.o: ltcompile crc/crc32_table.c
- 	./ltcompile crc/crc32_table.c
- 
- crc/crc32c_table.c: crc-gentab
--	./crc-gentab crc32c 32 0x1EDC6F41 reflected >$@
-+	./crc-gentab crc32c 32 0x1EDC6F41 reflected >$@.tmp
-+	mv $@.tmp $@
- 
- crc/crc32c_table.lo crc/crc32c_table.o: ltcompile crc/crc32c_table.c
- 	./ltcompile crc/crc32c_table.c
- 
- crc/crc64_table.c: crc-gentab
--	./crc-gentab crc64 64 0x42F0E1EBA9EA3693 normal >$@
-+	./crc-gentab crc64 64 0x42F0E1EBA9EA3693 normal >$@.tmp
-+	mv $@.tmp $@
- 
- crc/crc64_table.lo crc/crc64_table.o: ltcompile crc/crc64_table.c
- 	./ltcompile crc/crc64_table.c
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index b33bf8a775a4..65b8300ef528 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,7 +2,9 @@ AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432e
 AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642
 AUX botan-2.9.0-build.patch 1886 BLAKE2B 62f6b5f9c47ded4c460c6c6b3057cbbb95711b5b5db300523f45e25e6bc161277174ea4c461e872f24bfd23839510a7857c44733a333cb6054b7dc183faa3e2e SHA512 90948e75d5bb6f2620a92fe4aea37d05aaf25e98430b112651aa6ad635f19f8659658ae79d16e60e27ca61ec5da92d5dd1c234c4c9e2ae0fab44b92806bcafe0
 DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649
+DIST Botan-2.11.0.tar.xz 5765712 BLAKE2B 5602ef9485363b21f6f622f7370e486d834477730c2fc2f0bb9211db944d2b2a6a03d8ae14845cf871f648c76c77fd3e18804bd598f805a5754e3bfadb114d5d SHA512 a697a7f29788afc561cde35431e65e2f37e40fd45af89a6d060bf9988d28089905c6a1c005f9b23fb377547cd7a96a41f62c8d2f61a7f80d1ca1b9ccf857a2ce
 DIST Botan-2.9.0.tgz 7216373 BLAKE2B 5ad2e15db871ccc3a32b29b7f54a02d69f251f0aca2ce656b557dbbb3814a793053a54905371b3414ad72952a64bece43e2383da91f205f68b0fe31be2f9439c SHA512 b88f3894a4a5b7b2fbff9be6eb0b774bf679a014bd2364811b7e63d4f323e22ca9ef916491afbc2cdf9db68727c1449fbeb6fd417e591560add0955517db3f65
 EBUILD botan-1.10.17-r2.ebuild 4270 BLAKE2B 7b8f1a4722002c8dee3d30c9f29c9aa27e2d1cf3e98e7b41ddc2b9b959e51b5b451b945cbaa9c13890f555e077843cbc94106f2c0032c9f4fb181513f159b432 SHA512 fd4b7886680da84254c19e546ddb4a96491263b228caf5408e48b01ad02c1156058ba11c8aef6722e99be92af6f6f5bd9599730f93820c40f0598513000ab9d7
+EBUILD botan-2.11.0.ebuild 2493 BLAKE2B ff01dd555ab285fec89ddd821d35838724842bc00e1dcdc2d18ba66973780c1a0a990ce408c48cb81921b1e7ef32600867253444b80c7302a32fab1e0343864c SHA512 fb406e8d1752d2d456902bf69bb9f2bb7e1fbedffb232015d4829d371850a49d5e350e2d386bf24d95b947af461f258ce8b953945e055e8f0659e3a55b878311
 EBUILD botan-2.9.0.ebuild 2530 BLAKE2B 550a64323758808af1525767900553a56fc7e80b857923c678d718bde1bcc04e9265e1671b3cd16dca9bc4ac7b2dcf1b8ae86c6f4c098cb63fbbcad880230efd SHA512 d22a695d68e9e05add7aedc7d79985261238593b5ff626d28e40eb49d4d287ea3dcfba6c272a3ccb951d5a8d453e36bd47ff3d6581eba247492fb9f16dc15aa3
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-2.11.0.ebuild b/dev-libs/botan/botan-2.11.0.ebuild
new file mode 100644
index 000000000000..0b8587ddfd92
--- /dev/null
+++ b/dev-libs/botan/botan-2.11.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit multilib python-r1 toolchain-funcs
+
+MY_PN="Botan"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="A C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+SLOT="2/$(ver_cut 1-2)" # soname version
+LICENSE="BSD"
+IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}
+	bzip2? ( >=app-arch/bzip2-1.0.5:= )
+	zlib? ( >=sys-libs/zlib-1.2.3:= )
+	boost? ( >=dev-libs/boost-1.48:= )
+	lzma? ( app-arch/xz-utils:= )
+	sqlite? ( dev-db/sqlite:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+BDEPEND="dev-lang/python:*
+	doc? ( dev-python/sphinx )"
+
+src_configure() {
+	local disable_modules=()
+	use boost || disable_modules+=( "boost" )
+	use bindist && disable_modules+=( "ecdsa" )
+	elog "Disabling modules: ${disable_modules[@]}"
+
+	# Enable v9 instructions for sparc64
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
+		CHOSTARCH="sparc32-v9"
+	else
+		CHOSTARCH="${CHOST%%-*}"
+	fi
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*)	myos=darwin ;;
+		*)			myos=linux  ;;
+	esac
+
+	case ${CHOST} in
+		hppa*)		CHOSTARCH=parisc ;;
+	esac
+
+	local pythonvers=()
+	if use python; then
+		append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+		python_foreach_impl append
+	fi
+
+	CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
+		$(use_enable static-libs static-library) \
+		$(use_with boost) \
+		$(use_with bzip2) \
+		$(use_with doc documentation) \
+		$(use_with doc sphinx) \
+		$(use_with lzma) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssl openssl) \
+		$(use_with zlib) \
+		$(usex hppa --without-stack-protector '') \
+		--cc=gcc \
+		--cpu=${CHOSTARCH} \
+		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
+		--docdir=share/doc \
+		--libdir=$(get_libdir) \
+		--os=${myos} \
+		--prefix="${EPREFIX}/usr" \
+		--with-endian="$(tc-endian)" \
+		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
+		--without-doxygen \
+		|| die "configure.py failed"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+	use python && python_foreach_impl python_optimize
+}
diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
index 524cccf8516a..a8254f637cb1 100644
--- a/dev-libs/clhpp/Manifest
+++ b/dev-libs/clhpp/Manifest
@@ -1,3 +1,3 @@
 DIST clhpp-2.0.10.tar.gz 129954 BLAKE2B 1beb9b41ce1ad8ec88d0ccfa5f1d7a7af931841fa64d79b9eb9db90538f1b43f3cee5c74dc015ba835ee4ded2e926967bc3aa00dcc6ec0f5b65a04f9618ea1a9 SHA512 4a4898540c55422ca0cc6ba7f0c5495b915fc34df50f8add90e7f06dd5ef1d01a767234ecdee3757292980aa2f938e773177bcc73f28ac9c1b42d386863dea58
-EBUILD clhpp-2.0.10.ebuild 964 BLAKE2B e727a53b2b985851b1689002e5eb303bb9e728d5e3218c5a518e31f14b4f00ec0a52be3ef61a998a892b22e02ab9ddcc1ff5de161e84d8e92c38be5293c746a5 SHA512 c43291742252f91a58de66909adf2ead8f005712f3ecbe334abb1cc8661ca62b35566582509b70b914e0b71fc99c4106bc39a072bafbbed3c528a9ef6ba9549d
+EBUILD clhpp-2.0.10.ebuild 963 BLAKE2B 369b74996e6732048f10e8acb545aff1864e752579436e1820d6a353dafe4b9a4aad88021ffe27b7ec4ddf050bcc8a41445c668418b8f1704ea5944858578198 SHA512 e1510dfd308e468a3afcec19468111037ef63a1a10fe51699373830b90256a18666f5bc56f8c938fda8c9843b9543db51670c407c7875cd461c012b675e27ea5
 MISC metadata.xml 336 BLAKE2B cf9637d462e3606aa1a49639f60217f003e2271fa064d6bb36e9d1744c3b84815c0b75c2d42a3e761876879ea7eb92c32986f8e54926ed7e544690035985a86a SHA512 77d25c077302f6e92b83c869c45c9f91131160fa250f5a5087067e3291a1a0954e883ae110d20d9420cd9c01720803977ccf1d5ff6250bee91d6e5192798e55d
diff --git a/dev-libs/clhpp/clhpp-2.0.10.ebuild b/dev-libs/clhpp/clhpp-2.0.10.ebuild
index dcea074146dd..7b3846b3b3b9 100644
--- a/dev-libs/clhpp/clhpp-2.0.10.ebuild
+++ b/dev-libs/clhpp/clhpp-2.0.10.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v${PV}.tar.gz -> $
 
 LICENSE="Khronos-CLHPP"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 inherit python-any-r1 cmake-utils
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 5e0ab74359cf..73d6b72fafd5 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,9 +1,11 @@
 AUX crypto++-5.6.4-nonative.patch 1011 BLAKE2B e8f8245dbb1ce9a0011c0e73ea1021ab4e0e197d2f3eaeaa455265dcbb75b19d50bb308b787bd926afee994c674203622662a120b6c539d6fed6c434bae86b55 SHA512 fd9973d5fcb8182f89388276c54e8698c9b0ec82be1e93a575b4a00ad5f8b2966cd2cf699258dbf8b681423b31cb3d926a694d36d0eb07bf583811d55e845837
 AUX crypto++-5.6.5-CVE-2017-9434.patch 1728 BLAKE2B 0cfd25fca89d59486ba9c49a87f04d90f0b5bff524aa817a46dcb1c3fd005609a938e08007d71bf407bd8ef0c334baa2054b44c2aac58c15817314223c7b0a2c SHA512 42566d3e67c6b253b65587877652112691ba91e554db47843256a9c2af8a29d7950266a508358356f008462ec51cc1dadf4d0e9dbbd33a33a5a94d029eebc1f9
+AUX crypto++-8.2.0-build.patch 6814 BLAKE2B 490329199a411c6d291e35216680fae3b540b7c7d8c88c4f671db41c3b9b22ab8d537b9ddeb6cee899daa58b2173e5486ee763ba6f163ecfa3a20018a5117a94 SHA512 d9f23cf713e76d986d50fce895ba9ef2980b3ad81460b81217f9fa5af2a8840ab9e9e72c1d8d9635eaeceaa45f1add9e8dad36fd4159923b659f4fce09ef502e
 DIST cryptopp565.zip 4220843 BLAKE2B 0c42da3564cdd175c2f2c5c4272caf826f21e47d2271c7f54acab86f5f79dcdad8d6cb946bc88f55fde6189bb2d24ad8fb03dda6b3b8c6f105434b55b8b217d0 SHA512 f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7
 DIST cryptopp700.zip 7296665 BLAKE2B 1b1a60e240a9d94b4edfea16beef0ec48ec26c61f7f9a3d89d29bd2e77b13a83ce942f81467bb90d3086253560a3c4acd6b89178dcb416ed4328340ad5222dfd SHA512 8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec
 DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb12bf7c7cf84c776731eabf3c31965b47a60287e4e5a79dd3e9f0928dcfb185a0010a76f7cb96d2c3e8c6ae SHA512 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5
 EBUILD crypto++-5.6.5-r1.ebuild 1530 BLAKE2B df7d53463e39d86aa3eb905911e5ccdd6cd6ae435b4a51059978b68109c3448c555bbe91984f285671856d5ab7c98232cf2b171d154a01a97655d5aea14cf94b SHA512 f8065ac14fcffa77b75a439edcad34214d62a40184c27f79b073d4f788b2ef3b8667110ef9766d901ed69a25cb1f1639d494f4a0ad2e97391879821569b5a06b
 EBUILD crypto++-7.0.0-r3.ebuild 1077 BLAKE2B f6fda1242e5f9c5379b03793d1652a62596f8f3f97a507c19c7399e8418128908e82ca92494b485eff40d195e16a84009377208e9c83c49feb69d8b338a40edf SHA512 0088c1bc6c4a3e573955f14dab24da6e077699c147de1f3b18c3d76ab0d4073d20ddfb169691f2fee9c459a88d9662cc69d519224434c327d8c4b1dd36f6951b
-EBUILD crypto++-8.2.0.ebuild 1085 BLAKE2B b7a1484da1c66f5fd818dd5e04c23299ebc305a14e65cd13609618ef1bb737b2af066ba3f2cd46d3dc4aaae93c8ece2b613a369e8210767c1ff4553a2d82dd8c SHA512 90e2946803f7351f9242005909f4dab4e67d22b7c432f67efc1c5074f1e93c4c4117344e62b4d295500997e8d4d724159923625dab8f42700d3d0993f5d6d2f1
+EBUILD crypto++-8.2.0-r2.ebuild 1723 BLAKE2B 338081a7afc38b4d752e80fb558e2c8fe37f5026ad3d1671cfa6371a50de6527b917f82e30268256ec1fe97e53c154490bfd0f0f3a207ee6390c4595d5c68532 SHA512 5d2d1b82988db7bdca6841e5837f6af63f35f392d15523a7a1603a105670f7b8bf865c4b1061f5a793c5ac12dc53a41a1f2de08e2d3a1d13107f5d471f99e6e5
+EBUILD crypto++-8.2.0.ebuild 1123 BLAKE2B 5f96f1f27b7dcc79758766f7ee3f6ae19b8ca566344843add9a520af1ddc0940dc3f0a73503892933899189272c27a364a2bb09c577517b907293da74703749e SHA512 3cbfde17f99ce451a892fc88f42b1068f63a2af16ba26a73ee561f1d148025cd5dffc0806df301c5f4737527dd1093fde540f9e380f0b1b8478b2d1c5fa7d6c5
 MISC metadata.xml 597 BLAKE2B 8e8dd9fb9a60f2a5e7fdda6de99b6a07264d54aaa666a41d7fb30da338f91867bdda7135bd21e92191722de7e14ac10f394ac8d8f3118109f4ce6800fb12ebc0 SHA512 e20fd2e76765968417d659a6342ff9229dc822c2291bca00dd6cccd55dc3195563574aaf3a88c68b111821b41c9bce172f4d79bbb462f2b913ab15bcc2c2ee5a
diff --git a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
new file mode 100644
index 000000000000..17988c377227
--- /dev/null
+++ b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="C++ class library of cryptographic schemes"
+HOMEPAGE="https://cryptopp.com"
+SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
+
+LICENSE="Boost-1.0"
+SLOT="0/8" # subslot is so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="+asm cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_pclmul cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 static-libs"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+config_add() {
+	sed -i -e "/Important Settings/a#define $1 1" config.h || die
+}
+
+pkg_setup() {
+	export CXX="$(tc-getCXX)"
+	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	export PREFIX="${EPREFIX}/usr"
+}
+
+src_prepare() {
+	default
+
+	use asm || config_add CRYPTOPP_DISABLE_ASM
+	use cpu_flags_x86_aes || config_add CRYPTOPP_DISABLE_AESNI
+	use cpu_flags_x86_avx || config_add CRYPTOPP_DISABLE_AVX
+	use cpu_flags_x86_avx2 || config_add CRYPTOPP_DISABLE_AVX2
+	use cpu_flags_x86_pclmul || config_add CRYPTOPP_DISABLE_CLMUL
+	false || config_add CRYPTOPP_DISABLE_SHANI
+	use cpu_flags_x86_sse2 || config_add CRYPTOPP_DISABLE_SSE2
+	use cpu_flags_x86_sse4_2 || config_add CRYPTOPP_DISABLE_SSE4
+	use cpu_flags_x86_ssse3 || config_add CRYPTOPP_DISABLE_SSSE3
+
+	# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
+	[[ ${CHOST} == *-darwin* ]] && config_add CRYPTOPP_DISABLE_ASM
+}
+
+src_compile() {
+	emake -f GNUmakefile all shared libcryptopp.pc
+}
+
+src_install() {
+	default
+
+	use static-libs || rm -f "${ED}${EPREFIX}"/usr/$(get_libdir)/*.a
+}
diff --git a/dev-libs/crypto++/crypto++-8.2.0.ebuild b/dev-libs/crypto++/crypto++-8.2.0.ebuild
index be40704c5f30..25541d774a79 100644
--- a/dev-libs/crypto++/crypto++-8.2.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.2.0.ebuild
@@ -11,13 +11,17 @@ SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0/8" # subslot is so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
 IUSE="+asm static-libs"
 
 BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
 config_uncomment() {
 	sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
 }
diff --git a/dev-libs/crypto++/files/crypto++-8.2.0-build.patch b/dev-libs/crypto++/files/crypto++-8.2.0-build.patch
new file mode 100644
index 000000000000..7c7e8a9c1b66
--- /dev/null
+++ b/dev-libs/crypto++/files/crypto++-8.2.0-build.patch
@@ -0,0 +1,271 @@
+--- a/config.h	2019-07-02 19:25:10.448720035 +0300
++++ a/config.h	2019-07-02 19:25:25.785455586 +0300
+@@ -514,7 +514,7 @@ NAMESPACE_END
+ #endif
+ 
+ // 32-bit SunCC does not enable SSE2 by default.
+-#if !defined(CRYPTOPP_DISABLE_ASM) && (defined(_MSC_VER) || CRYPTOPP_GCC_VERSION >= 30300 || defined(__SSE2__) || (__SUNPRO_CC >= 0x5100))
++#if !defined(CRYPTOPP_DISABLE_ASM) && !defined(CRYPTOPP_DISABLE_SSE2) && (defined(_MSC_VER) || CRYPTOPP_GCC_VERSION >= 30300 || defined(__SSE2__) || (__SUNPRO_CC >= 0x5100))
+ 	#define CRYPTOPP_SSE2_INTRIN_AVAILABLE 1
+ #endif
+ 
+From fbbf0a08e8cf4faca661b0f75f806ea652abea70 Mon Sep 17 00:00:00 2001
+From: Jeffrey Walton <noloader@gmail.com>
+Date: Tue, 2 Jul 2019 16:55:00 -0400
+Subject: [PATCH] Add missing XOP header for blake2b_simd.cpp (GH #859) The
+ Gentoo folks caught a bug at https://bugs.gentoo.org/689162. The 689162 bug
+ uses -march=bdver1 -msse4.1 on a AMD Bulldozer machine.
+
+Investigating the issue we are missing the XOP header blake2b_simd.cpp. However, adding the XOP header is not enough for this particular config. Four source files fail to compile with the expected headers. We are waiting on the GCC folks to get back to us with a fix.
+---
+ blake2b_simd.cpp  | 5 +++++
+ keccak_simd.cpp   | 5 +++++
+ simon128_simd.cpp | 1 +
+ speck128_simd.cpp | 1 +
+ 4 files changed, 12 insertions(+)
+
+diff --git a/blake2b_simd.cpp b/blake2b_simd.cpp
+index ff138321..b246824c 100644
+--- a/blake2b_simd.cpp
++++ b/blake2b_simd.cpp
+@@ -32,6 +32,11 @@
+ # undef CRYPTOPP_ALTIVEC_AVAILABLE
+ #endif
+ 
++#if defined(__XOP__)
++# include <immintrin.h>
++# include <ammintrin.h>
++#endif
++
+ #if (CRYPTOPP_SSE41_AVAILABLE)
+ # include <emmintrin.h>
+ # include <tmmintrin.h>
+diff --git a/keccak_simd.cpp b/keccak_simd.cpp
+index 45674ac2..ae2f2095 100644
+--- a/keccak_simd.cpp
++++ b/keccak_simd.cpp
+@@ -26,6 +26,11 @@
+ # include <tmmintrin.h>
+ #endif
+ 
++#if defined(__XOP__)
++# include <immintrin.h>
++# include <ammintrin.h>
++#endif
++
+ // Squash MS LNK4221 and libtool warnings
+ extern const char KECCAK_SIMD_FNAME[] = __FILE__;
+ 
+diff --git a/simon128_simd.cpp b/simon128_simd.cpp
+index 5331c351..4b551f8f 100644
+--- a/simon128_simd.cpp
++++ b/simon128_simd.cpp
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ #if defined(__XOP__)
++# include <immintrin.h>
+ # include <ammintrin.h>
+ #endif
+ 
+diff --git a/speck128_simd.cpp b/speck128_simd.cpp
+index 2c356346..fb3eb1e6 100644
+--- a/speck128_simd.cpp
++++ b/speck128_simd.cpp
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ #if defined(__XOP__)
++# include <immintrin.h>
+ # include <ammintrin.h>
+ #endif
+ 
+-- 
+2.21.0
+
+From eeb7dadc76572b7061922ca6ac5f247bdfd985ad Mon Sep 17 00:00:00 2001
+From: Jeffrey Walton <noloader@gmail.com>
+Date: Tue, 2 Jul 2019 19:10:11 -0400
+Subject: [PATCH] Fix missing _mm_roti_epi32 and _mm_roti_epi64 under GCC (GH
+ #859)
+
+---
+ blake2b_simd.cpp  | 4 +++-
+ blake2s_simd.cpp  | 7 +++++++
+ chacha_simd.cpp   | 3 +++
+ cham_simd.cpp     | 3 +++
+ keccak_simd.cpp   | 4 +++-
+ lea_simd.cpp      | 3 +++
+ simeck_simd.cpp   | 3 +++
+ simon128_simd.cpp | 4 +++-
+ simon64_simd.cpp  | 3 +++
+ speck128_simd.cpp | 4 +++-
+ speck64_simd.cpp  | 3 +++
+ 11 files changed, 37 insertions(+), 4 deletions(-)
+
+diff --git a/blake2b_simd.cpp b/blake2b_simd.cpp
+index b246824c..6803d0ae 100644
+--- a/blake2b_simd.cpp
++++ b/blake2b_simd.cpp
+@@ -33,8 +33,10 @@
+ #endif
+ 
+ #if defined(__XOP__)
+-# include <immintrin.h>
+ # include <ammintrin.h>
++# if defined(__GNUC__)
++#  include <x86intrin.h>
++# endif
+ #endif
+ 
+ #if (CRYPTOPP_SSE41_AVAILABLE)
+diff --git a/blake2s_simd.cpp b/blake2s_simd.cpp
+index f02b9771..4b6d1bd6 100644
+--- a/blake2s_simd.cpp
++++ b/blake2s_simd.cpp
+@@ -42,6 +42,13 @@
+ # undef CRYPTOPP_ALTIVEC_AVAILABLE
+ #endif
+ 
++#if defined(__XOP__)
++# include <ammintrin.h>
++# if defined(__GNUC__)
++#  include <x86intrin.h>
++# endif
++#endif
++
+ #if (CRYPTOPP_SSE41_AVAILABLE)
+ # include <emmintrin.h>
+ # include <tmmintrin.h>
+diff --git a/chacha_simd.cpp b/chacha_simd.cpp
+index a983ab69..5a63ecee 100644
+--- a/chacha_simd.cpp
++++ b/chacha_simd.cpp
+@@ -46,6 +46,9 @@
+ 
+ #if defined(__XOP__)
+ # include <ammintrin.h>
++# if defined(__GNUC__)
++#  include <x86intrin.h>
++# endif
+ #endif
+ 
+ // C1189: error: This header is specific to ARM targets
+diff --git a/cham_simd.cpp b/cham_simd.cpp
+index 7fcaece1..e102a877 100644
+--- a/cham_simd.cpp
++++ b/cham_simd.cpp
+@@ -24,6 +24,9 @@
+ 
+ #if defined(__XOP__)
+ # include <ammintrin.h>
++# if defined(__GNUC__)
++#  include <x86intrin.h>
++# endif
+ #endif
+ 
+ #if defined(__AVX512F__)
+diff --git a/keccak_simd.cpp b/keccak_simd.cpp
+index ae2f2095..194291a0 100644
+--- a/keccak_simd.cpp
++++ b/keccak_simd.cpp
+@@ -27,8 +27,10 @@
+ #endif
+ 
+ #if defined(__XOP__)
+-# include <immintrin.h>
+ # include <ammintrin.h>
++# if defined(__GNUC__)
++#  include <x86intrin.h>
++# endif
+ #endif
+ 
+ // Squash MS LNK4221 and libtool warnings
+diff --git a/lea_simd.cpp b/lea_simd.cpp
+index b4180e34..ee2a5697 100644
+--- a/lea_simd.cpp
++++ b/lea_simd.cpp
+@@ -24,6 +24,9 @@
+ 
+ #if defined(__XOP__)
+ # include <ammintrin.h>
++# if defined(__GNUC__)
++#  include <x86intrin.h>
++# endif
+ #endif
+ 
+ #if defined(__AVX512F__)
+diff --git a/simeck_simd.cpp b/simeck_simd.cpp
+index 2a9efc99..f92a53d7 100644
+--- a/simeck_simd.cpp
++++ b/simeck_simd.cpp
+@@ -24,6 +24,9 @@
+ 
+ #if defined(__XOP__)
+ # include <ammintrin.h>
++# if defined(__GNUC__)
++#  include <x86intrin.h>
++# endif
+ #endif
+ 
+ // Squash MS LNK4221 and libtool warnings
+diff --git a/simon128_simd.cpp b/simon128_simd.cpp
+index 4b551f8f..cb16fa8d 100644
+--- a/simon128_simd.cpp
++++ b/simon128_simd.cpp
+@@ -23,8 +23,10 @@
+ #endif
+ 
+ #if defined(__XOP__)
+-# include <immintrin.h>
+ # include <ammintrin.h>
++# if defined(__GNUC__)
++#  include <x86intrin.h>
++# endif
+ #endif
+ 
+ #if defined(__AVX512F__)
+diff --git a/simon64_simd.cpp b/simon64_simd.cpp
+index eb5a1757..fcbe1342 100644
+--- a/simon64_simd.cpp
++++ b/simon64_simd.cpp
+@@ -25,6 +25,9 @@
+ 
+ #if defined(__XOP__)
+ # include <ammintrin.h>
++# if defined(__GNUC__)
++#  include <x86intrin.h>
++# endif
+ #endif
+ 
+ // C1189: error: This header is specific to ARM targets
+diff --git a/speck128_simd.cpp b/speck128_simd.cpp
+index fb3eb1e6..0c0f389e 100644
+--- a/speck128_simd.cpp
++++ b/speck128_simd.cpp
+@@ -23,8 +23,10 @@
+ #endif
+ 
+ #if defined(__XOP__)
+-# include <immintrin.h>
+ # include <ammintrin.h>
++# if defined(__GNUC__)
++#  include <x86intrin.h>
++# endif
+ #endif
+ 
+ #if defined(__AVX512F__)
+diff --git a/speck64_simd.cpp b/speck64_simd.cpp
+index 0a720fb3..0b43c175 100644
+--- a/speck64_simd.cpp
++++ b/speck64_simd.cpp
+@@ -25,6 +25,9 @@
+ 
+ #if defined(__XOP__)
+ # include <ammintrin.h>
++# if defined(__GNUC__)
++#  include <x86intrin.h>
++# endif
+ #endif
+ 
+ // C1189: error: This header is specific to ARM targets
diff --git a/dev-libs/device-atlas-api-c/Manifest b/dev-libs/device-atlas-api-c/Manifest
index d599d1c30fa8..033dd28bb157 100644
--- a/dev-libs/device-atlas-api-c/Manifest
+++ b/dev-libs/device-atlas-api-c/Manifest
@@ -1,4 +1,7 @@
 AUX 2.1.3-src-cmakelists.patch 629 BLAKE2B f3bb4160bbbe58a92e33216f11b52f25b3fc80d58efd11830575b819a41165df51f3c7e8c1a4c431157296d34f179c95c596b2d37b22b5211ff3e7e05989e671 SHA512 08b5f1156341b91911adbba7d527f11f385642a8afcd0ad0e833f83e6c799dd85bb6195dddf9cde13672ec9f52b5b7094f57a09c85866c3c42e627495b45e9bb
+AUX 2.1.4-src-cmakelists.patch 1496 BLAKE2B 879dfb7943eee4c03791c25b1f73d5a1d1cdab07f5144f46891d610492dffd61dfa0cd03afb35177740615549a81ac403d0f4009992cb78d46fccb2f20efe922 SHA512 1f9097accda72d10bf5201110fc5ae099d99e4a6573ac30fac399744b88ce9957f6fa82e8c11275663e028865c8c4b376d07ba8894785b57e8324e6e2ea81f2c
 DIST deviceatlas-enterprise-c-2.1.3.tgz 183663 BLAKE2B e190aa8e9a4b9bc90af76e21eb425c0f040ef70e605c8f9e588bd0c859520a82807aaafddd24402d3365e94bcf3b7a875a65804f2b1b3bed6f0703f28a841440 SHA512 364811d42b2c0d937a12f2bbfee760701a1dee4e93bcc84423c8b236d59257a3440111ffc6072a7822b9694ea65986572550f67d0b1e5d68a784d1339b2b70aa
+DIST deviceatlas-enterprise-c-2.1.4.tgz 51756 BLAKE2B f8dafdf31b608890da07214e14e9b2ec558e2c9c94c394a04c554e915cc1d4e2e886be1c0932353b0a68efaf90f190157696a2575db6ff2a86bbca3b492bc427 SHA512 5ea765738560c6dbc90799426f6bc0e6eb5e7775fa005279f046a68a4a984305ef99ae8b943dd9d32f88d88c1d24b6c09145643fa64a90eb834fc4a6ece05008
 EBUILD device-atlas-api-c-2.1.3.ebuild 1061 BLAKE2B fa019f2768618bfd43c93ae8936efb609824ecabc6fb49871d3b1fa57ef00775c4764365779b3bca8b8adcfeb64805beeb7ab1b7e196d76b2cc27a7110f0bc93 SHA512 26b10edaf8aae154e9b21fa32da662305b51e6255a12e5fe9d0e3d2ed49e57dc30c630d6cb98af8c26c3989f12e579861a8647fe10c36d3e80529f31baa50507
+EBUILD device-atlas-api-c-2.1.4.ebuild 992 BLAKE2B a82dc8b3f1e78572763a771cd8a59d80c719b6613e1591ed074864512811c0b3e3a5cf84e34a161c5312d7669a686b3072333a6e51d36dcaac1d98a4d91effe5 SHA512 bc9272a8efb0a99008403dc981d662a86800cd92e462a3c9d0c517b0ffb83a19d7a711abc3675a384d23d0a77a4b32b43755c81153bfacbf4ed0ca27d65a6486
 MISC metadata.xml 794 BLAKE2B 5021d469addcb51164731491a3a9ae1c24c3a24ccf2159574bcd8cb2c3ec7aa5dd217beb093c696db8438ae31778c18f8d047e73deec3984683009f50279af41 SHA512 2da64d528f2e49d368ba7b8684d818f0d8bb979dd0c64d613f25bdca97a9c5a3af2eb85f4955e03ed52dc5eb43b3ba7bad21eb94bdd67d370e1ddfa6545b26a1
diff --git a/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.4.ebuild b/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.4.ebuild
new file mode 100644
index 000000000000..1f91f978318a
--- /dev/null
+++ b/dev-libs/device-atlas-api-c/device-atlas-api-c-2.1.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake-multilib
+
+MY_P="deviceatlas-enterprise-c-${PV/_p/_}"
+
+DESCRIPTION="API to detect devices based on the User-Agent HTTP header"
+HOMEPAGE="https://deviceatlas.com"
+SRC_URI="${MY_P}.tgz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-libs/libpcre[${MULTILIB_USEDEP}]"
+DEPEND="
+	${RDEPEND}"
+
+RESTRICT="fetch mirror bindist"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-src-cmakelists.patch"
+)
+
+pkg_nofetch() {
+	eerror "Please go to https://deviceatlas.com/deviceatlas-haproxy-module"
+	eerror "And download DeviceAtlas C API"
+	eerror "Save the file as ${MY_P}.tgz in your DISTDIR directory."
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		local -a HTML_DOCS=( Documentation )
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc -r Examples/.
+	fi
+
+	einstalldocs
+}
diff --git a/dev-libs/device-atlas-api-c/files/2.1.4-src-cmakelists.patch b/dev-libs/device-atlas-api-c/files/2.1.4-src-cmakelists.patch
new file mode 100644
index 000000000000..d66fdad8e4dc
--- /dev/null
+++ b/dev-libs/device-atlas-api-c/files/2.1.4-src-cmakelists.patch
@@ -0,0 +1,25 @@
+--- a/Src/CMakeLists.txt
++++ b/Src/CMakeLists.txt
+@@ -11,6 +11,7 @@ if (NOT LIBTYPE)
+     set(LIBTYPE SHARED)
+ endif()
+ 
++include(GNUInstallDirs)
+ message(STATUS "${CMAKE_BUILD_TYPE} version")
+ 
+ include_directories(${PCRE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+@@ -33,11 +34,11 @@ set_target_properties(ci PROPERTIES SOVERSION ${CI_API_VERSION})
+ 
+ if(UNIX)
+     if(NOT APPLE)
+-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libda.so ${CMAKE_CURRENT_BINARY_DIR}/libda.so.${DA_API_VERSION} DESTINATION /usr/local/lib)
+-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libci.so ${CMAKE_CURRENT_BINARY_DIR}/libci.so.${CI_API_VERSION} DESTINATION /usr/local/lib)
++        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libda.so ${CMAKE_CURRENT_BINARY_DIR}/libda.so.${DA_API_VERSION} DESTINATION ${CMAKE_INSTALL_LIBDIR})
++        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libci.so ${CMAKE_CURRENT_BINARY_DIR}/libci.so.${CI_API_VERSION} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+     else()
+         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libda.dylib ${CMAKE_CURRENT_BINARY_DIR}/libda.${DA_API_VERSION}.dylib DESTINATION /usr/local/lib)
+         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libci.dylib ${CMAKE_CURRENT_BINARY_DIR}/libci.${CI_API_VERSION}.dylib DESTINATION /usr/local/lib)
+     endif()
+-    install(FILES dac.h dac_json.h ci.h ci_priv.h ci_fwd.h DESTINATION /usr/local/include)
++    install(FILES dac.h dac_json.h ci.h ci_priv.h ci_fwd.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ endif()
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 24051cd92078..9aeb2178915f 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -8,6 +8,6 @@ DIST elfutils-0.176.tar.bz2 8646075 BLAKE2B 7f23d59b7f5d74946fea928a7fada7764c1f
 EBUILD elfutils-0.170-r1.ebuild 1790 BLAKE2B 2581434109a567bc3c57d6ebaf6b1416377d2fbfcc1cadc51efbefa02caab505dcdfa22e58b33c80ce37637c5abb1559ebdb117999eb5f552095f85da8f0dafc SHA512 22d72fdb2e2c1e8d4e1d47113a8c0d6aeb2e8e7b9f0759d445e32509c7bce9cc6dc8edd38e12ffa556447981fc60c7a04df76fd6d529b79d07d28cb10314f6ce
 EBUILD elfutils-0.173-r1.ebuild 1909 BLAKE2B ed2992e3c50b9ea4885f434d074782db9b3af7570ae2eefd99c17b6c7cc58a16b3774a4c54545e644ce9ac159f79dbdd0ba22442d2a0cbe098218c2e2016f546 SHA512 9a62caf142a53c2b3ab7da0250235536e6911f0a905a1d56a8ba2469f23c7d11c2a068b22985fce38e5fa1bc00f3a4db6ffd823c69625ffc2914df9699ede12b
 EBUILD elfutils-0.173-r2.ebuild 1961 BLAKE2B 3dbfbcc53a801468deebbc25a9b3c128b85d580fab3c8aafc8b29da3897011f119cf31c47b141289f718d0a72683682db07ebe466f3cb6bdb3de89d69c4cc7c6 SHA512 6696b9f1cc0cfba128049a21186822760a038cf775563f7785efff20697f7324831171ca2a0bd64c43fba1668a4190c6536f034a0f2abd096a5bd1d1faf2a570
-EBUILD elfutils-0.176-r1.ebuild 1955 BLAKE2B 675ff9e6a6261ba5ed16926f41196edff15bbe78e5a9a475a17c8d0a9a7b54690e0f6b898b18305c061d5899c2688c31415055c0ecf34164957395d5cab661ff SHA512 d9ca920e431699b1e62022ddc05abd7d87f331ec65de1f648fcddabe8a53853aa839c44c3ac3a41fecbc5b6f875b7a9c2cf0f0d4438d0a2a3721b41551d02e3f
+EBUILD elfutils-0.176-r1.ebuild 1953 BLAKE2B 2633e1f4e3f5bf3c8378be04177e8205b69cafc9898dcaf39bd0e77f3a4bc3ee16b6ba78954b87d18b9f154abce25c16af158771af9b2e6d42c93cb4b090e2f3 SHA512 fca6ca016945d11dfce0bde278bb514336a3fa04325a54ad4ee950044c226644f7238adb31d0cbb56a75fbf7067743fb812fe64d86a7df494295fc3ddcbe44c2
 EBUILD elfutils-0.176.ebuild 1915 BLAKE2B 2c30c4718da7fc0cf5c16eedda0f460d1e495b92616c5ebfaa667b6df10d7e194ba6a069dde660a8596794acf90c3c9a6bcc172dc914749eb06a8612858c3e8c SHA512 114f21a0334433cb5b365710e4c57bc386b750feb40d72562138b986de55b88e4d468eb57cfbe0668b5f3210cd5c6e3587ba94ed6725bfbab4e8fa89fad4556a
 MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac
diff --git a/dev-libs/elfutils/elfutils-0.176-r1.ebuild b/dev-libs/elfutils/elfutils-0.176-r1.ebuild
index 0a0439231393..aba258f85299 100644
--- a/dev-libs/elfutils/elfutils-0.176-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.176-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 61a1704a6688..83e946af1d06 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,5 +1,5 @@
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 DIST gjs-1.54.3.tar.xz 647704 BLAKE2B 792225afd9828755ef67b3e7221d4c53535d79d879e0aef0c7c56f06e02313a966776b5dddf9876649984a1599eb44a27d6288f9216bb929a66ad9e14cb632e5 SHA512 f19e667963fa3feecd23a9e4cc263a55d9d1311de7d10905969966f74e26ff982839c192c555cbc059e4fd65ff7c89d18944ca6bf8ffbb65ec91081036d19505
 EBUILD gjs-1.48.7.ebuild 1548 BLAKE2B 47a474a7958d70ed915b8c1a2a973f1e72f99a7bc4459e98a687503122d83d40dc0733dcd3e7fbefc42304049520acf80b3ad609cda1ea5c8653e0ba215f19f7 SHA512 4a976754dcc518a188fa3ceae85ec61aa20b0abfe6c9c5ad248fa72ea62820935415451cb8f6659931b6b8f4044dee2f5a20be8c08a6d1a3df0d526b24b8695f
-EBUILD gjs-1.54.3.ebuild 1558 BLAKE2B 334d2be521fc4c00212dfba74a6a6c110fe6e121a144d7083b3ff79f3e25d85b92480d81cd332df1d1245549d1768c89063413a710956fabbe3579eab6bbc773 SHA512 25e690f1c62dc1d0effe8ffd0d8c8d395fae7b6409cc17ae3fcdc57082a9d46209305f504648a7e382aafb4117ca13d7172159a5fedb2e61a91014c301dd3b36
+EBUILD gjs-1.54.3.ebuild 1557 BLAKE2B 3eefd791008c74a8826023a6f788f9bf7d95a68b2d46c27f44f8a20a4e43dfb9877c4d78cfaab68383a59ce12154f75502cbdc470c63b209b444e03f692f1e2b SHA512 191d391963078c630355b6a50ddfa8c1473b5780bcfa2af98cb818743716bb2d98684bb5a76d890393c7e64ee4d6eb481524c33e76d40810576ad7487afbaef9
 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 936f97d06184..86eced5fe04f 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/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 37a3b1967173..d7e63344d21e 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,5 @@
 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
 EBUILD gobject-introspection-common-1.56.1.ebuild 1019 BLAKE2B 8f1d42b739389066c17614960bc214c616a9717d51e845b98ff0dc59fc10d484bda878a4149b358615568544d5b05259e2a788dce281bd4d5a70fe590373f4ea SHA512 db776369d3eb5af2c664aad6bd52a19f3d0371f9b84221c9cf65359cb625089e54b9b1aa9e3cf926b250fcd89e303a7fcffb34c0e5c58893583c82237a0c16f2
-EBUILD gobject-introspection-common-1.58.3.ebuild 1023 BLAKE2B 031e93bd5b47174e0fd57bf67fc804839cab6634e3ab214dbec9b701c3f231dd4a37e3b0afde5bd82127d7bef35a257c38d94a4975edbd495b6a64ee222b1bfe SHA512 70d3d3238ebcc52a1a45cdc1ca96647151e4e60ac788111efbeb1ebbdac15af67756416e98eef119de8658be4f7092c80f53c17d3107fea64c7def7a5582c7eb
+EBUILD gobject-introspection-common-1.58.3.ebuild 1022 BLAKE2B 50eecf479067a192f22f1d20494e582ab0370ce7d75f243adc5eb78c9a68072a4078ff69cb5db5ef19f3f134a2c4ba4d0ba92ce989827a6649512d10d591e3a5 SHA512 931b85067fd3c57cfd6a39cf125725bd84d3633e7f0702136747d623d288c789b271c554888dd14c4a76cc030314e8ab93761cd30f8710264cd65b9a4cbaeda2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
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 c6cf6492e095..f14cbb58dbba 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-fbsd ~x86-fbsd ~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 fe98c1abaf56..aeb8e8639dd5 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,5 @@
 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
 EBUILD gobject-introspection-1.56.1.ebuild 2123 BLAKE2B ee5a7866e95a1a70b74e2313e51a0b443ef2effa47aa9a119bb3c06442ba98e54e45c0d2fad34ade22fd0e1a8c9f4bb54fa4182f9acda62d0570ac30685f9893 SHA512 0e4c52cecf5cd72848f62a89402207c97bc6073472af2b0a3933dfc0f44170d06969f0bd9a0bdb692b3fffce4a1f4b40aad3b55fb9e932dc3dfa90637b9a28dd
-EBUILD gobject-introspection-1.58.3.ebuild 2203 BLAKE2B 3a17e3ad1583bf98003b22e3e1f0874aecf60092d456c9282c0c3322c0504cfe2e97cd540069ce7bfdcfb3f0ffe2280c0911794067b1251ad03ccc4b825741c6 SHA512 8625c47950d51f4ccf470e199ba415d1f165a9b43f503087109113299eef6038f651f000656d9bfeab142f01daebdeebf5a3cb066ac0965924ca182fefc65c47
+EBUILD gobject-introspection-1.58.3.ebuild 2202 BLAKE2B bfd59cae183344ac90466bc6ee85d7d14d99a00c6c522944b55039ca113d5326c846362dbfa0d30317c09ecafe5f0f678640852b967f7d4ae2df4da3bc9ce81c SHA512 9cd31c91c9def871d50665108295187a1b7f10d5a75bcb5dfd4b410547f66c967b649037fc74a0c25e3b499dafb7123128adff61f8ee487ac1a4f39a26e3ab81
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
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 42b406257dee..67e3dff2f105 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-fbsd ~x86-fbsd ~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/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index ec145248dcec..05354dc11122 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,3 +1,5 @@
 DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
+DIST jsoncpp-1.9.0.tar.gz 203176 BLAKE2B 81026de1f4f1882b504598879c7425586ad4fed8e005116509c85e03431d879f92040d802a3a0a9a369d652a076a60221e7d3b32027e3ea2ff4633fb7275c7a9 SHA512 b1da96c12d9ad4c7e002ed84b6c0ff24a7c86034f462a4eb29d93be2f81d7961a03d6f7aa3e7fa58366a2ed76242f6c72e8c3c6d34bdf562c86ca9951f5f3785
 EBUILD jsoncpp-1.8.4.ebuild 1370 BLAKE2B a84a5ca2b32fdaf245dea03c51304e026c11428eafe2ad4a1ae36d9d394a968a6f10aee504d08b590dd2ac9d8e060e96bcae182a2178e35c7aa9d5ae40f4e0fe SHA512 b942c9e5cda3e95b10e89c88179ea279fbd7f860364eaec5ad92210c9700c916af7ac5e04925552c0599291a4ea60e4a46a451d6c6bc9b882e66f95a7f24beed
+EBUILD jsoncpp-1.9.0.ebuild 1352 BLAKE2B b7533c89373f2a136f413a4a1c41c8adbbdda97480493a60fdc1964a6cedc04d5f64122e6587a78738a5bf720091e13236260157bc9dd30d3e331c17a3c7061f SHA512 1556db3750f62327ba5cc1206f805b493a644566fb41df4baba56a15d17549ffc09a056a8aa7b81cabfa88c437e0187be103590a7920ee45e309615f8149fc9d
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.0.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.0.ebuild
new file mode 100644
index 000000000000..14eea97be973
--- /dev/null
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="C++ JSON reader and writer"
+HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
+SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( public-domain MIT )"
+SLOT="0/21"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+IUSE="doc test"
+
+DEPEND="
+	doc? (
+		app-doc/doxygen
+		${PYTHON_DEPS}
+	)
+	test? (
+		${PYTHON_DEPS}
+	)"
+RDEPEND=""
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	if use doc || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DJSONCPP_WITH_TESTS=$(usex test)
+		-DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
+		-DJSONCPP_WITH_CMAKE_PACKAGE=ON
+
+		-DBUILD_SHARED_LIBS=ON
+
+		# Follow Debian, Ubuntu, Arch convention for headers location
+		# bug #452234
+		-DCMAKE_INSTALL_INCLUDEDIR=include/jsoncpp
+
+		# Disable implicit ccache use
+		-DCCACHE_FOUND=OFF
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
+		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
+	fi
+}
+
+src_test() {
+	cmake-utils_src_make jsoncpp_check
+}
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 9cca6473b911..bd73b5cba7cc 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,7 +1,9 @@
 DIST libbytesize-1.2.tar.gz 70598 BLAKE2B e136b1274703da7b3596e7583cea1ac773c1594af09c626f4dbb481dfcc23a3186b03ebdc54bba67d0a063c5d6587f6b7f8b610828c461cfd114eea1388dd193 SHA512 a8151e7440d0ec43d10239ddf08a9924827cdf08f20a16dff6177b444c1022fab905a0567384531e7610d854998111adb77f9a6a98e2d9648c02521f84ea2bf2
 DIST libbytesize-1.4.tar.gz 80943 BLAKE2B d4c6c34d81be01bf7db2c37b0660886d99eff3c0a87024f5fbc12cc3606dc01e772b81dfbcacbf76c62213120253a9e7bda90adbc749b6d4c3e31e1ed3ae7702 SHA512 5dd13cf52a1674be776220ee1863f42261a47dc53af1ce4a31460d6d02ce87e19c5a52260f700928af98f1d9d7a96de7c11d8f384907b3187ef2effc10cbb593
 DIST libbytesize-2.0.tar.gz 440544 BLAKE2B a371c617c965171a8746339ff8a2ec412daf3f79ae80e4e6a404546b0fc2f59f3e5882fc93726701490ef267f90cfd8c5db70bf7bd334c08806ff35eaab97377 SHA512 9d2a18930d0d900262ced4abd5cd358896570eadb06435f1b9aba5484ca530478b65dfb4982e8acf77ca4519a2d8a1dc236d42f5fa1ecbd7461949b282ef44a1
+DIST libbytesize-2.1.tar.gz 440209 BLAKE2B 7c689f269eae7b408b7f85fb9c877c9eb519d2a2eb143ef0ddb1657fbb4d79fab7cdaa56b35b4bbbb964e47361e37d7c70a0a135bacb8f817bd6cf8d2e22b68e SHA512 6b93d877e921820c19ed6874a36d9f8b6958112f6230f24980e8e6e30570b39ce74594f0ef126f70dc81b5434899c1f0f3ad0925f3ff7b6a596a9329c8f106c8
 EBUILD libbytesize-1.2-r1.ebuild 1122 BLAKE2B 6f17b8fd6560664dd8dd33861e9016269f82be242785e1f8c30e5e55bf55d81082b68e5ab329286f505b31b2b6a30145e291ecb3665554a84bc4ae5130ea69af SHA512 918fd1fdeeb6b4df3d9f1a66fabac851dff049f14b62b12aea633c6b629fa54b54eb822ec17ff80f11f8784400d59f90eb49ea3812e54c86ca68de1f819700b0
 EBUILD libbytesize-1.4.ebuild 1218 BLAKE2B 3b7a314c721f4a269fb299d7450a039443833b7ce93056304fea0f5343acc36704c63e05b775790787845c36c995e87a604863df95f47a69ff8f6baea67cb993 SHA512 e9e086e291914efe221745c55ac9d29863eff6f4d9974c1734a004dd1ffd5f475da3fabf8b744ebe1e286550488da8ff1b01d700d35bbdb01e4b8ef801069795
 EBUILD libbytesize-2.0-r3.ebuild 1471 BLAKE2B cfbb90bc8d10883bbcedcfaa0ff7d023aa814a4b145bed1fdeb716444c76c01fc07fed5178cebd789b26a7e632bde7c4779e9138e50c4a3caf5ba94ac2909c70 SHA512 ae6cf6ad4ad79130ab6f83b2476228d38c41b6ef23347d7c65ac4abaa61ce6dc72e3100728fd954cae50be0f203bee76f1bb646ec0b07ec928f2a1cd51cbf848
+EBUILD libbytesize-2.1.ebuild 1471 BLAKE2B cfbb90bc8d10883bbcedcfaa0ff7d023aa814a4b145bed1fdeb716444c76c01fc07fed5178cebd789b26a7e632bde7c4779e9138e50c4a3caf5ba94ac2909c70 SHA512 ae6cf6ad4ad79130ab6f83b2476228d38c41b6ef23347d7c65ac4abaa61ce6dc72e3100728fd954cae50be0f203bee76f1bb646ec0b07ec928f2a1cd51cbf848
 MISC metadata.xml 425 BLAKE2B 445bf1e0d46e04c766c4c81c90f9acb8e8f3c1c3eeb567c3101400139a7b2ab830efcf737e30332af5dd0e50d46bdf9f583cccbfb2e50186cbb6d3f5a396f0df SHA512 24b8980240c3513229ea2e181c64b7f89597be9cd121459ad62bce935fd52a7bbc0ee4871e15899b69b477fdbaf0850d55821a6fbcf3afc30d0cb81a3eb83b65
diff --git a/dev-libs/libbytesize/libbytesize-2.1.ebuild b/dev-libs/libbytesize/libbytesize-2.1.ebuild
new file mode 100644
index 000000000000..f3c68f3c42fe
--- /dev/null
+++ b/dev-libs/libbytesize/libbytesize-2.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit python-r1
+
+DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
+HOMEPAGE="https://github.com/storaged-project/libbytesize"
+SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc python test tools"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tools? ( python )
+"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/mpfr:=
+	dev-libs/libpcre2
+	python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	sys-devel/gettext
+	doc? ( dev-util/gtk-doc )
+	test? (
+		dev-python/pocketlint[${PYTHON_USEDEP}]
+		dev-python/polib[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.md )
+
+RESTRICT="test"
+
+python_do() {
+	if use python; then
+		python_foreach_impl run_in_build_dir "$@"
+	else
+		"$@"
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with doc gtk-doc)
+		$(use_with python python3)
+		$(use_with tools)
+	)
+	local ECONF_SOURCE="${S}"
+	python_do econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	python_do emake
+}
+
+src_test() {
+	python_do emake check
+}
+
+install_helper() {
+	emake DESTDIR="${D}" install
+	use python && python_optimize
+}
+
+src_install() {
+	python_do install_helper
+	einstalldocs
+	find "${ED}" -name "*.la" -type f -delete || die
+}
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index 3f066bb78d6c..cdd07bb9e3f5 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -3,5 +3,5 @@ AUX 0.6.12-CVE-2017-7961.patch 1437 BLAKE2B 8678147cc24ff674b067691a3eeae42a5731
 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 1347 BLAKE2B 78d91b27d2d7ec2dfb834d74b726c1d7ac3f19f60cd401fc84ac6fec22f308f6d9f88cb1fae6b0586a3ca424ad4f66690e2fa2fe59916d304f93e642fa268060 SHA512 b49a5fa721687e7c0c3700537acb6cb03556697b8b53267d57890ba4a22527fe43acd18d0e6151b8a221fb23d9a2a2072f45ce355753cb46f75306af1fd310ee
+EBUILD libcroco-0.6.13.ebuild 1346 BLAKE2B aa0ee5d9cfad0dbb0a86d4e4650be4c1a5bd596e177c94804953dd2e33643d8de1454047455e92426de6f231e1dd97eb0be6fadff96c8895c9d4e7f4bde0873c SHA512 095402c889da2335eed58a812d36edcf13a0229ddb56d4fd3aec78beff57be1176d5ccde59f82a197c87020a0567380d232c128d8d778eaa9e3cc82c862ee596
 MISC metadata.xml 597 BLAKE2B 93f85899d5ecfde37206061e57a03b1eaa181d9e2c105999621da011bbed2b11efaae603c2dbba0b405917653adc75cf849e92682e798e9514984e5577fee90f SHA512 9161b1cf0d796d0aeb681374b278be7938bc551316d6d7fc4fc1e19bfff4477f6b12bf606df0eb17c57e08ecb257f358f579a232ce6dbd6cc2f838aee4e2b9bf
diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild
index 7d9bd5b15bce..525a7563f791 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest
index 629c60ea1247..bc2ae7b5a50d 100644
--- a/dev-libs/libcss/Manifest
+++ b/dev-libs/libcss/Manifest
@@ -1,3 +1,3 @@
 DIST libcss-0.8.0-src.tar.gz 516474 BLAKE2B 937adc65f68fecece189e0f06cfd601ae2d76f0b4dcdbcb8a67f3f058c4355c19c12c088fb50ecf1e6bcd8436c867b1845b3da27bb44b5d1a009bd946bf5e53e SHA512 fb52920ce462f442dfafa7b0061fa465e6c04827d26186e8468855c2a40e8f34e6f0689d5eb58cb0b2ee0759d083fcff5c8c583e1d98693755003c352a22a4be
 EBUILD libcss-0.8.0-r1.ebuild 1141 BLAKE2B f1eef7ad41b44f26eebbca5d2d2c8c201aee90879423198c0220356c4b22fb8647fd1d5e48e13bb86def6b30145503813ca00f1017c8dafbbfb81b34e18bcc75 SHA512 9ff1ce8316cb2842dbb22a730a85d23052c8a8dedd4a84b5d2803dbf605ead2c74e1507ee6825c719ef2e6d5da2ea6a5e1ed1b00095c904b669f0d07be226a24
-MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libcss/metadata.xml b/dev-libs/libcss/metadata.xml
index 88de5fc462b1..7a38bb900964 100644
--- a/dev-libs/libcss/metadata.xml
+++ b/dev-libs/libcss/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vdupras@gentoo.org</email>
-		<name>Virgil Dupras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 10e07d897c31..5361985f2c00 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,6 @@
 DIST libevdev-1.6.0.tar.xz 411512 BLAKE2B 0e9190fd4c28b36bcf325953aa634c0d8c604cef7f56e46679fc88351536d78b0bddedbbdfffe4164e0039c7d56ef604b143e23de2c4bb9a66653a03d6844fa9 SHA512 73046da447773716c9f0c9f511f3a0a6ababcf92a146eba363014afcbdb465f4c3cd8be0917f2f01561a72f24f20fe8ecd333467437d9d85c03afcb433d05060
 DIST libevdev-1.7.0.tar.xz 438264 BLAKE2B 3f71ccdfbd68598afed7316dd4902a8ac439c6f094788abed5cb8ed24acaf070edaeceefad17de51cadb039259aa0de6a8ec576fa1f8dbd60878ee75aeb39fde SHA512 bc43723fd1ca251a77ee549022609f73c15a33ae470fc843ac687542fb1938fba4d046d3ee1dc814bc38a4292a7f2ad9e71fcce45525b518a4f4a5bef099aa6f
 EBUILD libevdev-1.6.0.ebuild 1108 BLAKE2B 0c193d4337e4d2c4608b56c4bfa1fb6ca8324b979bdb83ff2df1d2b75f120d406a294ffc32c2fe503b7c5a5efb75a6c77421469609a33c9783f662b342e341f0 SHA512 3046e3c9b2144aa12e5133dfe3131d3a6115d8437073c41f21e7c202a3af100732d2f1523544500a0c8964126c89c5679b6eafbe977117fe712b55238bfb9fb8
-EBUILD libevdev-1.7.0.ebuild 1119 BLAKE2B 84c1cd909ea8f81ab025940c58b2969fc6d68be3360bfab21b865f23c1d3c26564fc1de9d1c149184efd9c517e28bcde305bc4713d8d5d1474f1c748d4c25b1c SHA512 9ecbd94c60955824c7100b0427a6417a47301618111787ca6e64d8207ac765b6de2c95994c17f8f6412f95d819b533a794add1582d526cd9e930dacbeaaf2a77
+EBUILD libevdev-1.7.0.ebuild 1117 BLAKE2B 8017521e78dd392e884447bd7944db29c5a849b1e5d9e83f7c6b7f0c942206a10768f9d93bbc426c5af36927970c2f5b63125a30389443c927dc80afbb922e6f SHA512 82f627ff89ff8d8d85d66bc0d32f5678019fa81d18b7396a1142ac567c623efeb560f9f36572827f07d20c13a1e4ed140d40a3a1e58ad5c52fdb8656e76fa05a
 EBUILD libevdev-9999.ebuild 1119 BLAKE2B 84c1cd909ea8f81ab025940c58b2969fc6d68be3360bfab21b865f23c1d3c26564fc1de9d1c149184efd9c517e28bcde305bc4713d8d5d1474f1c748d4c25b1c SHA512 9ecbd94c60955824c7100b0427a6417a47301618111787ca6e64d8207ac765b6de2c95994c17f8f6412f95d819b533a794add1582d526cd9e930dacbeaaf2a77
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.7.0.ebuild b/dev-libs/libevdev/libevdev-1.7.0.ebuild
index c32b139bc873..a94f2d69a592 100644
--- a/dev-libs/libevdev/libevdev-1.7.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.7.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 1410370bd646..45365ab0ff3c 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,10 +1,7 @@
 DIST libevent-2.1.10.tar.gz 1074897 BLAKE2B 15c86f9d82a54912dc8ebde54192e77dc105a9b7fab215a3ba0b85de31e9caccef8aa02ace0172e22ee394cff0e7b5a4e8ff2a8c5c3e472378630f66b1c0d33b SHA512 2a449b60c5bba0908f693d3169a2941f0952b462ea18cf3c7a7288cd902592f35a42c76096af502f04259ffce2567233fda3586578c2ac53fbfce6e00d35c086
 DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
-DIST libevent-2.1.9_beta.tar.gz 1067050 BLAKE2B d59f424995742e6a57df74420d91c8a1614d7dbb6e3928a3dd666269f7c2f4876d6fedd649e4e947a6db63c15f69c18866bda9997c3bb3571452a8dbf126916a SHA512 672bff332292ec76503bc0ccb9462058e093f1867740fece51f77bb666c77c85e10271730b32b36d6faa9ab2ccee0433879457e201bf94b6bf704dba2c066051
-EBUILD libevent-2.1.10.ebuild 1679 BLAKE2B 6fc0538071b7ed07bfd223f25297b33059c3003cdc06e9ab46f6cd7a0725fecb809888be078c3f0dec80b12ea786b49aac9945a18e65f443f1ca4f4ca8bb3783 SHA512 c7ea1349503ec810f61cb3c6569ed34763bdbef0c4ccbf2959cf1faadbf9e2033a97161802742e287e1d7c6f9e2f924647919e66c37474dabf8ad2d027a25c77
-EBUILD libevent-2.1.8-r1.ebuild 1723 BLAKE2B 07f20b57d7ae3fa923149fde4f47dc299ac5f638fd784f7fb67d2fd1f500875d462a98cd6f23050b223e562c2b3b326e99162c9e21fa4aa596f1d4b368d2d82c SHA512 042d0843a134418417fa521a86316fd4001c23615c9b6b36990da1222175bff8e750e3c6d28dc403201e1cb157acbf74e6019ca5dec01e11fd726a3f0c22a373
-EBUILD libevent-2.1.8.ebuild 1705 BLAKE2B d483a5f882b40db3891d48f3e7de7f7b4916c45711e60e83d92249988f6afdece6808c71a7212680548d45f58ed3163cad4bcdbb2ad67d2a8a62df5ea66658ca SHA512 b44f94eb5db73acad177149232465f1dd11eb2bd37fb3680e4ef050ef5429d49080f978046e9a8af7aa203fa0504580f24dae9d51ed7b624e6a6aeca1bde1f3f
-EBUILD libevent-2.1.9999.ebuild 1304 BLAKE2B ca5125cb04834e449294880d988eee53abbb0818c46d46aead9feba8ba5fc92b0bd88c47906e40322b47104b9f964f6ab4dfb03b71fb7249d19e0fa9353aa4a3 SHA512 e39b9eb34693d1fd59c1ffbad2e784c3fb0ee752378c00c0c884837134d03fa8018af27a436a5b95b103f1b109e05a81f629eb06eb51f15719f21e5129907b38
-EBUILD libevent-2.1.9_beta.ebuild 1726 BLAKE2B 799c28b736a7ad7b97a6963928c1a998f0ec2ace029f1069aa758505bff1caa27efece9ca3e82ec586dd8d9d14382f81f02428115c712904ae2e74ccfc9c7a56 SHA512 5854eaa1cef7292f5932b9574e5c177180c5ee65c419e681b24d443d609cbdf069c1ded4eea8565c079228ca6fd4e13fd2b52695c19802d63f126c759db595a0
-EBUILD libevent-9999.ebuild 1241 BLAKE2B b45af1e1260ea97758c8c83df2f300e08866340dffdc23f4db3aaa2d4cd05290445cd50bc43e7022276a5891c6188bc29a3acdbc22a21f96d747aeb67d68001d SHA512 77ba2b774b0d8ac4fbb3da98eb8b838343e78b1aebe884f2222132d55cebe7cf5e8960b0b7648cb91928c6351aee59a218c51b5c76d9c814a9e53c7941705352
+EBUILD libevent-2.1.10.ebuild 1680 BLAKE2B 38059071769d093178d31de9ff77a3f00e188f3bec08c688d35be003e8a6ec76f090263c22239b57032b261ddd190f34d06052555458ceab756847810fc06742 SHA512 4b4a40df65a482542d2e9086744ce8c793320c74389c995239299811ac17e663ea97c084375025eb568e298c8b5419cc46bee6b294a537532be167676dd0534d
+EBUILD libevent-2.1.8.ebuild 1703 BLAKE2B ab36dd6165c91aba3eee97f652f50d20a8bf5f391c01cd568453b31ff24390eab17d10a0669e7f34759e25ea65163e463e95bc320a94ab14df1acbbb89b460b4 SHA512 aadd8949ea76bab2d03f5155456ddf9b7740c408ab818a2efe48959d839ca61a29ca01ac96557af0cddb5a7e3c9810e888eeb5dd4be52e72a189e1d4466aab68
+EBUILD libevent-2.1.9999.ebuild 1305 BLAKE2B b55445f376cf87b92c0921a45d9afb86d6108ae052305f7311045845931a384a08e6963286e5f124df52b924b5f6f7855ac850cad77c13162ae878e12e74a2ae SHA512 d9e19f90f9dccda27e4cc9758dce3ac52ca4d666cbb3ed325f72f5e72162bc404604f20c7a86a4ec74aa9601607a92972ed5927aad54ea8f26cba70d089c8326
+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.10.ebuild b/dev-libs/libevent/libevent-2.1.10.ebuild
index d8985a9c4837..89ba66189985 100644
--- a/dev-libs/libevent/libevent-2.1.10.ebuild
+++ b/dev-libs/libevent/libevent-2.1.10.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit multilib-minimal
 
 DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
-HOMEPAGE="http://libevent.org/ https://github.com/libevent/libevent/"
+HOMEPAGE="https://libevent.org/ https://github.com/libevent/libevent/"
 SRC_URI="
 	https://github.com/${PN}/${PN}/releases/download/release-${PV/_/-}-stable/${P/_/-}-stable.tar.gz -> ${P}.tar.gz
 "
diff --git a/dev-libs/libevent/libevent-2.1.8-r1.ebuild b/dev-libs/libevent/libevent-2.1.8-r1.ebuild
deleted file mode 100644
index 5413468c95d1..000000000000
--- a/dev-libs/libevent/libevent-2.1.8-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
-HOMEPAGE="http://libevent.org/ https://github.com/libevent/libevent/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}-stable/${P}-stable.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-# libevent-2.1.so.6
-SLOT="0/2.1-6"
-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"
-IUSE="debug libressl +ssl static-libs test +threads"
-
-DEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-"
-RDEPEND="
-	${DEPEND}
-	!<=dev-libs/9libs-1.0
-"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/event2/event-config.h
-)
-
-S=${WORKDIR}/${P}-stable
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# fix out-of-source builds
-	mkdir -p test || die
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-samples \
-		$(use_enable debug debug-mode) \
-		$(use_enable debug malloc-replacement) \
-		$(use_enable ssl openssl) \
-		$(use_enable static-libs static) \
-		$(use_enable test libevent-regress) \
-		$(use_enable threads thread-support)
-}
-
-src_test() {
-	# The test suite doesn't quite work (see bug #406801 for the latest
-	# installment in a riveting series of reports).
-	:
-	# emake -C test check | tee "${T}"/tests
-}
-
-DOCS=( ChangeLog{,-1.4,-2.0} )
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.8.ebuild
index 61f244304c9f..abe87a0df52a 100644
--- a/dev-libs/libevent/libevent-2.1.8.ebuild
+++ b/dev-libs/libevent/libevent-2.1.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit autotools eutils multilib-minimal
 
 DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
-HOMEPAGE="http://libevent.org/ https://github.com/libevent/libevent/"
+HOMEPAGE="https://libevent.org/ https://github.com/libevent/libevent/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}-stable/${P}-stable.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-libs/libevent/libevent-2.1.9999.ebuild b/dev-libs/libevent/libevent-2.1.9999.ebuild
index edf6dbca9001..0a40893390d8 100644
--- a/dev-libs/libevent/libevent-2.1.9999.ebuild
+++ b/dev-libs/libevent/libevent-2.1.9999.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Library to execute a function when a specific event occurs on a fil
 EGIT_BRANCH="patches-$(ver_cut 1-2)"
 EGIT_REPO_URI="https://github.com/libevent/libevent"
 HOMEPAGE="
-	http://libevent.org/
+	https://libevent.org/
 	${EGIT_REPO_URI}
 "
 
diff --git a/dev-libs/libevent/libevent-2.1.9_beta.ebuild b/dev-libs/libevent/libevent-2.1.9_beta.ebuild
deleted file mode 100644
index caa338247fd9..000000000000
--- a/dev-libs/libevent/libevent-2.1.9_beta.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib-minimal
-
-DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
-HOMEPAGE="http://libevent.org/ https://github.com/libevent/libevent/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV/_/-}/${P/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-# libevent-2.1.so.6
-SLOT="0/2.1-6"
-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"
-IUSE="debug libressl +ssl static-libs test +threads"
-
-DEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-"
-RDEPEND="
-	${DEPEND}
-	!<=dev-libs/9libs-1.0
-"
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/event2/event-config.h
-)
-S=${WORKDIR}/${P/_/-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# fix out-of-source builds
-	mkdir -p test || die
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-samples \
-		$(use_enable debug debug-mode) \
-		$(use_enable debug malloc-replacement) \
-		$(use_enable ssl openssl) \
-		$(use_enable static-libs static) \
-		$(use_enable test libevent-regress) \
-		$(use_enable threads thread-support)
-}
-
-src_test() {
-	# The test suite doesn't quite work (see bug #406801 for the latest
-	# installment in a riveting series of reports).
-	:
-	# emake -C test check | tee "${T}"/tests
-}
-
-DOCS=( ChangeLog{,-1.4,-2.0} )
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild
index 16a0b3af8b69..b18a797059eb 100644
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-9999.ebuild
@@ -7,7 +7,7 @@ inherit autotools git-r3 multilib-minimal
 DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
 EGIT_REPO_URI="https://github.com/libevent/libevent"
 HOMEPAGE="
-	http://libevent.org/
+	https://libevent.org/
 	${EGIT_REPO_URI}
 "
 
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index c0b40e32dc1f..14287ffee533 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,7 +1,9 @@
 AUX libgdata-0.17.8-disable-demos.patch 1941 BLAKE2B e8c3b0b558d3c446f3e383268b75bc17a2149cefaa2fe1005ed695b1d0c4bd66cf4a89a4ea4e11e598d044b1b8bf469f3ddf96f3365a5542ae138d4262752d57 SHA512 4df919d8b09ef0b1af0b47c3262e08faa158b99e444a5d7d4d1b19a2987883fbb9e3f1a6dc2f858b8d343fbd5c2d266c3e02a47ad310aee92d1a5b14983d8f55
 AUX libgdata-0.17.9-ax2019-compat.patch 788 BLAKE2B f08605ae9ba096ed20b08c324727be214de5b1746280881f3017e066dfbda6eabd3a83908964c17e6932fafccf0021cc3eb775d2523c1f5bf828d97371527702 SHA512 35eacb0e1af5ae35e458a44563f830a4f19798bc3423e5bbe5fef9df048a20fabfead94a597343b7b342b510fc9e21cdf8bc2a69d7b930cbcb6ffc8ab7cbc66f
+DIST libgdata-0.17.10.tar.xz 836836 BLAKE2B a34f133289eb64ca24d96f38851ac07347e1b2a88860bf926072945d64d3064bbf5c4f674bfb262f27c290fa2b243d5f82805e09290194a9614dbf8dc0993e05 SHA512 01f8bb121c402fc0af8e9f12cafba326a87cef6756ced72652890c834fd4f497a060f6455ab66d4af92d9cd34b4d6fdf58033dca0f91bb806c80b60987955c22
 DIST libgdata-0.17.8.tar.xz 1464812 BLAKE2B 787b5d6e4a62e70f76ca4080fb5c3ff1e7d68745f388be646dd980ef8be18275997bca46a1f3639c9457c8310f9c3f4cd34892be88db284a9ee5e5f43e9723fa SHA512 dfc4c825a7053a6fd7659d04c7077bed8539b4cf3ef3da1d5ece4da3ce17941900e960a300a50b284010ed890dcab87e4c4726403f04481c672832fd34b975b0
 DIST libgdata-0.17.9.tar.xz 1434700 BLAKE2B e0b10bdd962aa5d294d75c15c3aa9187342cd85b9a28816fe5628864bc2236e10ee2765ed8123c8b90422f0394b342a2a144dc7ef844486193c8eec2a46cb17f SHA512 90289309cbdc4ec6932bf385ddbfcc75c0c2f8b9ca356329298aaa37f6c3db7a16de20e5c947c16c595e43e729a664e4d6d3e2c5a60bb1e463a13d1306f374ce
+EBUILD libgdata-0.17.10.ebuild 1823 BLAKE2B 70137f7e3c7561933db4f872f7eb7dc9b72f5b839826a7b11528204d9e34a7c1f72b9f0ce06b842bd2c22a84afe615ea8f6b559579d5852ff61fc6b19da1ec08 SHA512 9d45a14fd920a437c9b2a382dc4616fd3b5e8b8bfdba4b20a677f5fdd2324b243b839ef1789b770527b6ffc95724534b0bf71d1e056a8df0a6b716b3d7e3a8dc
 EBUILD libgdata-0.17.8.ebuild 1641 BLAKE2B 8bab41b7e782b93b1c0be447f60aea096d9b18284c4e684034cf7475be39db2751f34c9c80791396c39a95ce3df16da72573bc979c18ee21793306a1f1c5cb6d SHA512 7bce4dfccc02a77a70f0d1ecd8e1c6d121016004138917fa5505aa2cdc33205e5665c367aee3b3b45ee7524ffe041c8f3a561e8c11e835d213fd01f2a2910b6e
 EBUILD libgdata-0.17.9-r1.ebuild 1755 BLAKE2B 1ad712e61fd4e87765588c399324cb6955bcbd46490f5d0e246d0001f44737729c8d2beb751131b7e504cb181420c1f3681a633ef2725c49ab0c4f9c03e6ba0d SHA512 5a12a0a05f2cd95f659cc301af235ab6a4bd8cd90a111de8c73dc9a98f3567abf604155100d31dbb77d30c384156b470749b6694f8e9f9b94171e43e28e671df
 MISC metadata.xml 362 BLAKE2B f10a4dba3d98334e8c3092595559b1a0e9036388c3d9b72a53fd1dda5935721198ef7c751efd2179701c4805b6116b3f61965fb5037fe63ef9bccfcb8b37bdfb SHA512 00513b8910b0cf0f0c42b1723c8e22a93c95a702ba3ba9f139ba8e2a25a6c408f1e8f97302ee300189ea534717b1f7d21a909cab0ebf6ba8d6cd19d38df2f30d
diff --git a/dev-libs/libgdata/libgdata-0.17.10.ebuild b/dev-libs/libgdata/libgdata-0.17.10.ebuild
new file mode 100644
index 000000000000..112574624d47
--- /dev/null
+++ b/dev-libs/libgdata/libgdata-0.17.10.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
+HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/22" # subslot = libgdata soname version
+
+IUSE="+crypt gnome-online-accounts gtk gtk-doc +introspection test vala"
+# needs dconf
+RESTRICT="test"
+
+REQUIRED_USE="
+	gnome-online-accounts? ( crypt )
+	vala? ( introspection )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/json-glib-1[introspection?]
+	>=dev-libs/libxml2-2:2
+	>=net-libs/liboauth-0.9.4
+	>=net-libs/libsoup-2.55.90:2.4[introspection?]
+	gtk? ( x11-libs/gtk+:3 )
+	crypt? ( app-crypt/gcr:= )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.25
+	sys-devel/gettext
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	test? ( >=net-libs/uhttpmock-0.5
+		>=x11-libs/gdk-pixbuf-2.14:2 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	eapply_user
+}
+
+src_configure() {
+	local emesonargs=(
+		"-Dinstalled_tests=false"
+		-Dgnome=$(usex crypt enabled disabled)
+		-Dgoa=$(usex gnome-online-accounts enabled disabled)
+		-Dgtk=$(usex gtk enabled disabled)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use gtk-doc man)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use test always-build-tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 0cd9e36f4244..f867468dd74a 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -4,8 +4,10 @@ DIST libgweather-3.24.1.tar.xz 3350680 BLAKE2B 9265cb3c280446d5f380f62b60efb5578
 DIST libgweather-3.26.2.tar.xz 3409528 BLAKE2B 1c5cdc7125aac8df95e97db8fa1d63bcb06865e70691621bc3a1c0ece2e602862cef9a2a5daa2ebbc5fa7eaefa32bf89507f1eef8fa4eeff294d43132e83fab4 SHA512 75b936f93814005b4317dcb51777036f589f343526428d9a74de96aac1badd4fe81c117184e2bff84a7a3078d6f2a2000e7b63f1e1d80f839b3513cc470fb25b
 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
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/libgweather-3.32.2-r1.ebuild b/dev-libs/libgweather/libgweather-3.32.2-r1.ebuild
new file mode 100644
index 000000000000..55ebb469e066
--- /dev/null
+++ b/dev-libs/libgweather/libgweather-3.32.2-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Location and timezone database and weather-lookup library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
+
+LICENSE="GPL-2+"
+SLOT="2/3-15-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suffix for silent ABI break after 3.28 without soname bump as per distro-list
+
+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"
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=x11-libs/gtk+-3.13.5:3[introspection?]
+	>=net-libs/libsoup-2.44:2.4
+	>=dev-libs/libxml2-2.6.0:2
+	sci-geosciences/geocode-glib
+	>=sys-libs/timezone-data-2010k
+
+	glade? ( >=dev-util/glade-3.16:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.11
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+PATCHES=(
+	"${FILESDIR}"/3.32.1-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically
+)
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use glade glade_catalog)
+		$(meson_use vala enable_vala)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index d1dc305be38f..8eaecc0cff46 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -3,5 +3,5 @@ DIST libinput-1.13.2.tar.xz 529488 BLAKE2B 489f962ca0b0385817fc76a5bc7254143d12c
 DIST libinput-1.13.4.tar.xz 530000 BLAKE2B 96345625b98ecc5476b9525cac84ec6cffb5854ce8d9e197fa73dbcb3548ebfea7820fa32d4e808222c0471fc94d89003775587cc0ed9c8445dd5902d3463792 SHA512 ccfdfc704dab9ea19a503399ecd4ce3a95b8d9480b8dfddeb80be01236c34c6f2f472be0e12e04dddd68092611470d303351e092141bc7491729639bcf7e64d7
 EBUILD libinput-1.12.6.ebuild 2055 BLAKE2B c8dea3e1942f7ec25de860c377afd70ad5baacf632d12670ac5394bcfc9476ec987dd92630558a47d54d5a6aa58a779da51414bf534e6b32b82b556c2af6b087 SHA512 1638b3ec959a58c1b198990e028df0319360485e352e1f1fe4b20690cea0549b6272636213e38952f5b236ff335cff557d37e1e11919cd996d10b28eee0184dc
 EBUILD libinput-1.13.2.ebuild 2071 BLAKE2B e6703ecfa1191fcc8e5f3ae3a630513497121cf2d709fa4f2b6992d86e8071bb1e502ee9f858e28f5bfbcc40018095cb5cc5337e338fbd4a9097623ccd7e2248 SHA512 2a63e6bac28abe072bc0cc6648fcdebf3722113167d7cfd2f27d95fd955e114420b0e2f94c9e020e17a676d1f1e69e9d47e182c29cbec2cfc7b3bdb6d893312f
-EBUILD libinput-1.13.4.ebuild 2071 BLAKE2B e6703ecfa1191fcc8e5f3ae3a630513497121cf2d709fa4f2b6992d86e8071bb1e502ee9f858e28f5bfbcc40018095cb5cc5337e338fbd4a9097623ccd7e2248 SHA512 2a63e6bac28abe072bc0cc6648fcdebf3722113167d7cfd2f27d95fd955e114420b0e2f94c9e020e17a676d1f1e69e9d47e182c29cbec2cfc7b3bdb6d893312f
+EBUILD libinput-1.13.4.ebuild 2069 BLAKE2B 081aa59319ad894238ef20b94e45f24d7266e3e255d82ffe2182a0fd67ac316420d529f4f37a93409b8725919e9b50df7a9a120b1ac264bedbe51fa0783a91fc SHA512 f1e18728cd6aa0b66bdf6898fd7e36516c4017912fb89fee2d0b553dd27b35d02ce4ad9b4c2e5a34e00af3e2ff8ab330e2977e04d5081f6e635c7f21f8025af3
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.13.4.ebuild b/dev-libs/libinput/libinput-1.13.4.ebuild
index fd529371d3d1..00be31022aab 100644
--- a/dev-libs/libinput/libinput-1.13.4.ebuild
+++ b/dev-libs/libinput/libinput-1.13.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
 IUSE="doc input_devices_wacom"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index 689bcd6d3f85..34e55bd052a6 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -2,6 +2,6 @@ DIST gettext-0.19.7.tar.gz 19235781 BLAKE2B 4c2cfcb0b21a66a9f8d2d57de7420e624a12
 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 2100 BLAKE2B 9b655e464aeac02ab8310be730489c98cedfa880d7afe8a8df71b28e81cfe068248052137f77eb28dbb2a2435ea4e5698b6786b08e71443a1c51dc500fc94b94 SHA512 9fc279db2f3a42d087572e8bb3bad92794bb7ece576ed1fa97160250264de2a586e7b3f2b0d68893456458cdd45cb4b8decb7b1f8bf020898ff7a5affa71c7be
-EBUILD libintl-0.19.8.1.ebuild 2107 BLAKE2B e61df48a0f3afdfe56eb23addfb59ff1a96f9dcf818e99d0155171369b5a3784ce923ebfbdb7184826f56389406072fd3159ac5d66eca7eda6ba97261764f8b0 SHA512 2204410b0b03f7aedfc994bf0e00396213b3d0f21ca13f2fa73b2bc91d46a58303b287b7167a20c278ec13974aabae3907726c0df28e3ea226c7481b593477cf
+EBUILD libintl-0.19.8.1.ebuild 2106 BLAKE2B 7577fe6f200c7ecb0c63e93e1539761cd0bc9cc85124f3e0aa884ec24fee2c6b2cbf782c170ed717d5946d739fa6c19532ee30aaf4120b79b5b9ddc406422e22 SHA512 f4ea7cd325cd7c0d58629b09931130e45037650f165c0b13635ef32a908ef8bad025da2cda7db248f4fc42220119fd1dc9916b5e6f40d66c107373b622679995
 EBUILD libintl-0.20.1.ebuild 2122 BLAKE2B 4ea73f2f4bf1dcdf2d762e378ddc196d7c4723e6b2ac484eb6050a58f589877aa7b888fe7c5403ddf1b5189012733a817ba58616081e22ae966e3e0558de533c SHA512 d0b6f6527dc1ded47374ef404391f8d10ac27d6d835750c73e0e308d673f48be7aae7429e308f33cb60a4a946a1bed33e7bf95f703ab813d867cf9b974da964f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libintl/libintl-0.19.8.1.ebuild b/dev-libs/libintl/libintl-0.19.8.1.ebuild
index 8088bddc8dd4..25e6cde3bcec 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index a3d7459e42c3..8a776f161581 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,4 +1,3 @@
 DIST libmateweather-1.22.0.tar.xz 3386920 BLAKE2B 312bd8cd12a1d51216b9509b2badaccb23779f1c7c314ecf02c9789837fa619d6029e97bf06f9fd320ba590936888d51fe178cffbb7dca87eb167ed4fbf3eabb SHA512 43371fc615dda2b9042633a63ac4c1fb0b1ea43b20c783e443b0f57e10ad8fddedbd593f03bd6c942729f0a9c80484266fe1ef900d128fa4b02f80d6a80ae9bd
-EBUILD libmateweather-1.22.0-r1.ebuild 867 BLAKE2B 8af6aa5a0b13b613916f74a6c3d96966e8aa746268676435d800463ebc11ba493cd331ceb3a567419ac18843d020641fcfd2ce96845e1dcdda52e9cc45f8e3aa SHA512 f9b3e38831be3e513325bffac63ab9ef5b553548bfad8d5531ffcd3794a91d8f106451d235ea19cee77d24f0b466afd2e5653e529c8d3eed4dfaa45c496c9e23
-EBUILD libmateweather-1.22.0.ebuild 864 BLAKE2B ddd1d3cffad117cae2e3072f5dfec1476374228df0caa8b8cb3cb8ab3cf9b147ed73c35fd76e40122ba6d6fda6fd805eee5cb823f3e34c17a03f7a7d30db5009 SHA512 97e891e24b6ea067eaf4b03f6ed132d875ca838243ee92f17d283e0fe3a80a80b4abdd10866edfa0b4dd5fc917fe3b200662edf733445c0c1e22159c97787d6f
+EBUILD libmateweather-1.22.0-r1.ebuild 865 BLAKE2B 2d3a0dc7799985e8a7e9c64a8e2624fb2ed168862b0d36f8f367c783b9a927071c24f31c6bb7685697585f5d57d2c50692dbe80419afac224ab44d83e372c71b SHA512 bd94bf6cffcabfafab5226cbbd53d98aecff62b6990536f3ce8b159a3a573ce02a5e3fe4234421c7d4e5755baa90eeb0e46556258483cc4c6030e97c93cddca3
 MISC metadata.xml 343 BLAKE2B 2c44370234b1e71de86ca5e1fc09ab633185cd1401071d3487b8d4c582115f92e30ace26aca5d3dfb89b8c4aefade6ae4bf6b93776fa123206e638b83e0df9d7 SHA512 1bc3a926850df9eabb80136639bc47809b0c49bcefc37c990cb7941a3629c7a0b2b4e6b538c5af7dcb2187239792b500185349a1ba6befe5b85f191b73467a2a
diff --git a/dev-libs/libmateweather/libmateweather-1.22.0-r1.ebuild b/dev-libs/libmateweather/libmateweather-1.22.0-r1.ebuild
index 2fef43535398..783a9ab05bd1 100644
--- a/dev-libs/libmateweather/libmateweather-1.22.0-r1.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.22.0-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE library to access weather information from online services"
diff --git a/dev-libs/libmateweather/libmateweather-1.22.0.ebuild b/dev-libs/libmateweather/libmateweather-1.22.0.ebuild
deleted file mode 100644
index e3a5753eeca6..000000000000
--- a/dev-libs/libmateweather/libmateweather-1.22.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE library to access weather information from online services"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.6:2
-	>=net-libs/libsoup-2.34:2.4
-	>=sys-libs/timezone-data-2010k:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.0:3"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locations-compression \
-		--disable-all-translations-in-one-xml \
-		--disable-icon-update
-}
diff --git a/dev-libs/libnsfb/Manifest b/dev-libs/libnsfb/Manifest
index fa76b413b1ce..1ad6b52b2438 100644
--- a/dev-libs/libnsfb/Manifest
+++ b/dev-libs/libnsfb/Manifest
@@ -1,4 +1,4 @@
 AUX libnsfb-0.1.0-autodetect.patch 734 BLAKE2B bba90c622e559b8238672068792a558ac408954b85cc9798b12163564837e4fb44ec80eca33ca856e5344fafeb862a3eff43bddca27a9ae7603478505982a440 SHA512 72f3af574fadf38a514a6f6d4d24246ad1e76d9c9daa9700f0b37cb465f7afd4e4d7fdde6e53657740db3a6f87f1e8bfaeb1b008c43462d67f224c728af98993
 DIST libnsfb-0.2.0-src.tar.gz 82322 BLAKE2B d805478728015663b4bf9c8de018bda33dcd84a7ace7246c450a7c31cc3358f834ade21ac1df9f0ca0e4dcea1138369cc3cd9ac468ebb484cce139d4bc89441e SHA512 b90eca76c8dcb22e554e13b5bea4268e5c9fc6e4711bafa5acbed92cc83513c3a3965208b3956de250fb3013cc3db6a33922ded471fa7a24bde97f748d2212c5
 EBUILD libnsfb-0.2.0-r1.ebuild 1173 BLAKE2B 77786478bf9c16f0cb9cfd32aa8a2810c0f9b5e5514b40de69f2d8ccf3094ffe514acb1763399bcadf78a0b65a216e4cb982ea69dc291c89b16776872ce5f897 SHA512 fe3cf0b6f40d492d45f1230f0eceb9adacd4ef34d4031bcadc9e2ebf6fd68157016f2bb0e13eefa21b3f0675330129d7756bb109b0e740decb80bb4f714e1e26
-MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libnsfb/metadata.xml b/dev-libs/libnsfb/metadata.xml
index 88de5fc462b1..7a38bb900964 100644
--- a/dev-libs/libnsfb/metadata.xml
+++ b/dev-libs/libnsfb/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vdupras@gentoo.org</email>
-		<name>Virgil Dupras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libnsutils/Manifest b/dev-libs/libnsutils/Manifest
index 53da62932b2b..227a376819d7 100644
--- a/dev-libs/libnsutils/Manifest
+++ b/dev-libs/libnsutils/Manifest
@@ -1,3 +1,3 @@
 DIST libnsutils-0.0.5-src.tar.gz 7653 BLAKE2B 4f7810f436f5ffd33084bc67095f3cb48a7744ef6f9ab0d632cd7b87467ff8bca54809de5a8ea837a00429c951d4e701909bd5f185e1c600a7323393017596cb SHA512 b9611db39adf11aa4e29387614bf55e241c075a223c687f5520e5b6808cc392c847be1a1d74559928e385a93886c4a67158504342384a1b200cf9ce13c00db50
 EBUILD libnsutils-0.0.5-r1.ebuild 657 BLAKE2B 988d672774084cc4982ca32f1cac5557d9c5f1e5eb19972eb5a48855c311c616d4495c4af75992e91a86448a3fe5664a861afaffce7b5c508ad0f4c71d76f61b SHA512 8a865cb43e07729243e512deec4a47d98f3a9fc722ec4e60ff6a9ced797170c83fffb2edaac2203dbaee04ee92e03319a43f9f6446e70d19ae0498f5ad314ff4
-MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libnsutils/metadata.xml b/dev-libs/libnsutils/metadata.xml
index 88de5fc462b1..7a38bb900964 100644
--- a/dev-libs/libnsutils/metadata.xml
+++ b/dev-libs/libnsutils/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vdupras@gentoo.org</email>
-		<name>Virgil Dupras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index f85a4d892c3a..f69470825dd0 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,9 +1,3 @@
 DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676afdd9f3891a3bc66fa006c353b2adad269708cee714985b495ed0b0d691f31964d7099125147ec630f3c63143e8 SHA512 7005dbbab170dff48bee99de67ab9ffbfd2004f4b5150a0a67717aabb30eb93a34495b6d084da5d05162dd8666e8ff4c451d0d153ee4dd5422b59f6f6ca2130c
-DIST libp11-0.4.4.tar.gz 450709 BLAKE2B 4424c8dd8ee1f581c179c36b47bc03269f1c6b38bed2517a1209c8eaf2d8c2ab62da928b4cd20f1355b56dfbecbd2bd695118f7690c3eba2f5c188c6c4b5b169 SHA512 12d1e39981e62d758dc12a39c2ed5b6967a6e8c1db706c491db2c9aa0394fac278fa47dd4c64aa961e3b5ea98c1799b4ef7ef617ac076a414d88a6e29d5f0c4b
-DIST libp11-0.4.7.tar.gz 475538 BLAKE2B 81d36f0795cae00a20be935790441b46257728cc5b1d9eb16d6c5df2609a795a68e12d0dc6b34b0348107fbd8c136d27dbadc42e0bc8970d5e491529e1903091 SHA512 8142b32bee9e6763b506b93be788a4df2b28ae8cb3ad6e11fc53ba3db770d77bdcc0362661c2f906cab1b5afc2828019f3d0f0b9d898414c0d6266201b7e08e6
-DIST libp11-0.4.9.tar.gz 492083 BLAKE2B df84d9303e6e143fbfeaaf2e8d0b57f3c4cd63356b15d629ab210196611ab42e396cf7efa69392ac81dd9fd591aea5580e0b38f545bf9bad9ec4748d08da90d2 SHA512 0c4a76ee7a5d98ec144dac1de8d4f52ad2515e6c578b3ee9705ef861bc06a27477b6ec42cf1d96944844f006992aef449b579b430b2e32d367f29d1a0d82f8ee
 EBUILD libp11-0.4.10.ebuild 780 BLAKE2B 81d859abc6f65ca3a0a388ced3f91b37505b97d33e2a5f18e088dff0d4e74851aea55beb1ed427fda9b04648d13edfeb3762667c041f3a8ac92af5bfcc33dd21 SHA512 ad72e746e165f1261f0c0ea4a080d5d5b0c2d53c687461156ca691cbdf5cbda6b0c7c0d953975063128a734f87a6cdacdd4ad352876c547357806b7d4698c50f
-EBUILD libp11-0.4.4.ebuild 782 BLAKE2B e2ea80c9b0a6c514806ecf69da143c3bc0f981cbff1aca891c7ca9ce1a4e36314b26a23166e8a6b0af141fb288244dae23c4e610687af39301403afc6b51f12e SHA512 6dd12ffe649c25f7320f1d5809d7b792fd3efd46725306193ed5fe92b246441e54e662fd9a2ac657c16977dffb146947f4a8a15fab2e1934711a7088ab310604
-EBUILD libp11-0.4.7.ebuild 786 BLAKE2B f44f40db44fd3455989171a60014fca0128b43741123a57c7d7418d626c716431e992809e175f6b8f6e71c2686b214991c5d6f7c793568915a4725418521f3d2 SHA512 9a934922c8731336e4b950ad9543b07e90b303d164bef57d4ff41dc99a2933e008613113a8f302d1e0a1324bc3e0d7a01590208a45428816b7a8bbfc023f92e0
-EBUILD libp11-0.4.9.ebuild 775 BLAKE2B 8605353f5a55c1e0ee467ec751bfcf5307c963f735095a9630201f230308dba02bc10837812f01d6735a912a8b7114987a452ac7980574d0985bfa4e24f6d24b SHA512 0b53c57f47b1f29d239f54f870b98fd010556b41a26d6f6213980dc3d606b5b7156eee3cf89685b361d546fbeb16fa67ec9f9af8db6886af310e7727bc31e802
 MISC metadata.xml 612 BLAKE2B 603fa1505d9001be83c192a30130fd3a2aed2c817fabbaa7970e9c883290eda3aafa41a6e9bcec57ee993fb97fe6edf448eaddbd68bf8246ae272ef4066ebb7e SHA512 85d70948ec35a42c1707729c325159abf0a097a7b0c07b4db36453e25a8dbc713b6f7c347b545cae71104d166be9b8c93e4835f79633bee2e06d64a1c28e15b7
diff --git a/dev-libs/libp11/libp11-0.4.4.ebuild b/dev-libs/libp11/libp11-0.4.4.ebuild
deleted file mode 100644
index 544232ea39d5..000000000000
--- a/dev-libs/libp11/libp11-0.4.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit ltprune
-
-DESCRIPTION="Abstraction layer to simplify PKCS#11 API"
-HOMEPAGE="https://github.com/opensc/libp11/wiki"
-SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="libressl bindist doc static-libs"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0=[bindist=] )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable doc api-doc)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/dev-libs/libp11/libp11-0.4.7.ebuild b/dev-libs/libp11/libp11-0.4.7.ebuild
deleted file mode 100644
index 1feb03bf57e5..000000000000
--- a/dev-libs/libp11/libp11-0.4.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Abstraction layer to simplify PKCS#11 API"
-HOMEPAGE="https://github.com/opensc/libp11/wiki"
-SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="libressl bindist doc static-libs"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0=[bindist=] )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable doc api-doc)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libp11/libp11-0.4.9.ebuild b/dev-libs/libp11/libp11-0.4.9.ebuild
deleted file mode 100644
index 63a7d2537fc1..000000000000
--- a/dev-libs/libp11/libp11-0.4.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Abstraction layer to simplify PKCS#11 API"
-HOMEPAGE="https://github.com/opensc/libp11/wiki"
-SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="libressl bindist doc static-libs"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0=[bindist=] )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable doc api-doc)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest
index 0d01a05abf61..da023dd59568 100644
--- a/dev-libs/libparserutils/Manifest
+++ b/dev-libs/libparserutils/Manifest
@@ -3,4 +3,4 @@ DIST libparserutils-0.2.4-src.tar.gz 74521 BLAKE2B 85e39d64bb8365f95da227e3a52ea
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
 EBUILD libparserutils-0.2.3.ebuild 570 BLAKE2B 831f0a7473a068b051550eb316c096dcd4b7e5007210eb86d23136967cf7be7769964ceedf1caa77065c1e9e0b3f9f8af2d03cc3274c12e0e29e2d0085d2c1e1 SHA512 cd4cf38173e2231dd443c3c534cf1470566e6ffb8645341d9679fed0d469125141a52a6bc4078035b6f81c6fcc5eaa8521217e6864584a0df1edbe956f0a870b
 EBUILD libparserutils-0.2.4-r1.ebuild 907 BLAKE2B 3baae55074a4df8cb0eb0cc22c88e425c9b1c4d6a37129b8f55a86eb1a60a15fc4a8ba84b975e92ce5211d8833d333ac89dd91c9a819e55a8fd3019979e65ea4 SHA512 101ee3de44ada6a8c4558a7f4b1a827eb19cfda77760ee0b4f0b4ffd8324045f178ed5658b6a167f9bebb772e86f84f9356b5c4bbf6f44a6983a0aa485b3353b
-MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libparserutils/metadata.xml b/dev-libs/libparserutils/metadata.xml
index 88de5fc462b1..7a38bb900964 100644
--- a/dev-libs/libparserutils/metadata.xml
+++ b/dev-libs/libparserutils/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vdupras@gentoo.org</email>
-		<name>Virgil Dupras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 6d6352b38702..d2ba0aa5efb9 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -8,5 +8,5 @@ DIST libressl-2.9.2.tar.gz 3607549 BLAKE2B 496e993e4f1c85167e0344afab61259d4e3f0
 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 1719 BLAKE2B f3227d823d5474fe4ded274d359b03b3432459dddd4c3622b870fee76041aca1b8d5fd2186b7965201cac9a8ff16bfd69418a1f96eb326a0d27c3416d44f8274 SHA512 d7c34d383ebb5cd0d911fab5da899901befa888fe69035506b8415bf74f3b1b85198b62fe790487b5ea870f01336c13cc0af2c8414ed6fa422ef9a2224a1db13
+EBUILD libressl-2.9.2.ebuild 1717 BLAKE2B 96c38e88353e777ea55a41f6fc26df5903db5745cdfc7f8b7b0299328415d366487a184f6f717ba7878e288df650fd60704d78f5b6231771ef3303012b069e51 SHA512 c87d30436bca375fddbac45d5b040443114de018cc25030d57be2978a2032c29fa5a5f42917ea46ce6ece7ad4f65f73e9397be34f51c22b2c13daaa8ace04002
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.9.2.ebuild b/dev-libs/libressl/libressl-2.9.2.ebuild
index abce8a6234e1..c3163fd00f3a 100644
--- a/dev-libs/libressl/libressl-2.9.2.ebuild
+++ b/dev-libs/libressl/libressl-2.9.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/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"
+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 )"
 
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index f7e3c78f24c4..fda07da3268a 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -3,4 +3,4 @@ DIST libsass-3.6.0.tar.gz 332747 BLAKE2B be4ad469aa55f89ce54e6cf1cc5cf0a72f47276
 EBUILD libsass-3.5.5.ebuild 1121 BLAKE2B 1be11be93f262d319d986335d725388e2fc4b1ea18841e5a89841d761873d24a36aa4d602ee0e8714ca852f4915c4e2e4d9eb9efc07c307253bd1912ac95ede3 SHA512 a955b393ca0180f6ead993584d544a9a2bf6a0d5b0652377369a94716e41167898237ec7c8e9d8c7a7f2e181adb8ec0ea2db599ba30b3bfa9ffcdb9b2a7fd95e
 EBUILD libsass-3.6.0.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
 EBUILD libsass-9999.ebuild 1124 BLAKE2B 2f1ca97c541132b85dbcf409fd6b0a128e7cda7ffb59227d944092929b64a46d5ff03095a5130bace065bef12abd6aefce2a64e83c92fc4fc603b0dd27011c69 SHA512 adbb0d42b8abd0a63a5e61abef9d318a1c2689ee8a4eb04b4f9c183c8f6202dcb79a72bbb69afdd162518aa8518708f961e0fc2c68902a180d4ed5fd1007e45b
-MISC metadata.xml 635 BLAKE2B 88705faeb11d0f69615b94933da84ce8784e73c5dcf36bb248fd1e3796a17da347d005c8c95a9f4cc0b591d208718e347384531cad60bb3d9ead910456eff621 SHA512 794b10c517680dc0b460208eea733891cb7bc8b65875f5617d086f86eb8b08e436c441c2ad00dba80bb643090182a42a77484b5934eb1df2e36f2119a1c5fbdf
+MISC metadata.xml 555 BLAKE2B 5bf541c7be60dbded36d2dbf944111095a7b911809236b110a9d5d79fb99d2315019c8082489699e0c984a5cc6b1fa07b845afef28f887191dd6f9243cb93ace SHA512 b4b4252aefabd61569690f83ec264a19ac00aee9559f7e1857770b560f74de1134aa3e628d12f3d04bebf426d779eb7bbb40a5d714d841ed480c8178763eb8f0
diff --git a/dev-libs/libsass/metadata.xml b/dev-libs/libsass/metadata.xml
index 58b843a9d6a9..191514e58505 100644
--- a/dev-libs/libsass/metadata.xml
+++ b/dev-libs/libsass/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vdupras@gentoo.org</email>
-		<name>Virgil Dupras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		LibSass is a C++ port of the original Ruby Sass CSS compiler with a C
 		API. It is coded with portability and efficiency in mind. You can
diff --git a/dev-libs/libspnav/Manifest b/dev-libs/libspnav/Manifest
index 0f8a2f416e41..94b5dfb11b2d 100644
--- a/dev-libs/libspnav/Manifest
+++ b/dev-libs/libspnav/Manifest
@@ -1,5 +1,8 @@
 AUX libspnav-0.2.2-custom-flags.patch 2151 BLAKE2B 90868c4c60627a16c247a99cf3dd1fb1d9a49b39f2062de22a7d35223b86be553b9f76f2b363ece3593dec976eb3144163d3ce3ab416d6f8436e79e97fb84144 SHA512 f0f2ea3dcd689168780d17ca94b7c20378afeae72442da9c62f1d618b29ad7877d6f6a78e06ed276cff67e1fc57c2bf6fe371f1545fda99ce74f5ee260baa320
 AUX libspnav-0.2.2-makefile.patch 926 BLAKE2B 28533b0e1b91de397d150302be3ea35dfab22fd1fe2235ff41c5a755db48a4eac2365e2f5b03306157336cd9b09b422877c63c9798ddd2d8525ece94af7d8697 SHA512 ebaa5f5685fc55c0f5c0783efd20b2970be8a4ce3e5564b23c65348b1c72e1840d8c2277843cb4d7d3899579810228835f4aa59f99188e79a5543dca93522a21
+AUX libspnav-0.2.3-makefile.patch 1329 BLAKE2B 8eccfcfa539703437326b4800597dc7b6074d7bda0246c27a819114969a6906901b6063a11cdf8dd29148cbf9ecef5d5301f842355b86600b3077b34d61cd6d0 SHA512 8cdc05d5b0d4aa16de59752d0ce204dd0db1df63554c53c2e0b9ea04a7a1b32a0fded8ba4f9f5fc94456f6d4b7b87213284f88944931903986f4df81784cc64f
 DIST libspnav-0.2.2.tar.gz 11615 BLAKE2B 470a533d9ae58b37cd1c1603381bfd3a3bca79b2fe15a81464727e2543433df2fdf32b8683464ade9aa9670f3c9af1ffddde58299678d89d977577ed324f1ebf SHA512 78b26e6fe4a98af579738743ac4bc2f1de5ccfa9316a103a58ebb935f281fba04b8c6c28c0d63abda15a52c0288e371231425a3a21b26c083a5de7ab101f1940
+DIST libspnav-0.2.3.tar.gz 11985 BLAKE2B 134a0c3f7c9a7ef7c4f68910e0266880958e2b74e253b75237b0fa8d3e482bcd1f42e715b85f0ffca3a62103530e854090818564d9c241bfc55de039cc4883ee SHA512 b2c452d979d455fc99bfdc172c8a2408a6e8dc40acc52964fa64f4d75a8ee77dda12e5e212c0c4e07a0a24d055f16f85bb6ce6287e24e6bd0665de457e37e6a7
 EBUILD libspnav-0.2.2.ebuild 1083 BLAKE2B dcd24705baba8b43e0cf62f92d5568a7edf84422851c0012349d45fbac7fc775be3d5f3014ec8b395612681565c6d16038392fcd3798ac46f241fb937f56959f SHA512 a6a7ff7c37d855cc4a53908b5dc6f4b9be3e176a409ba7431f9a068339470301d17dfb5e172daee032d7e7f09bcf23bc0d0ba5739f7dca5b2c380249c165bc16
+EBUILD libspnav-0.2.3.ebuild 897 BLAKE2B 1bf386e77eca6f20777979ff4ebac7b52bb4e8f74404108c51a732ab8fbc25531fcf05bf9810f2f7c94b0dc74c8de156ac39e3b32bd201de02bc898e1e2dfa44 SHA512 b452c5865b71a390455fbcfcce18e49d4865ef1f1be679d93431d5aa43799031147fbae168fb7e3ad0f9a60cb0d3f041df5f31fa0389be3e50d2b705c25d3a10
 MISC metadata.xml 811 BLAKE2B a39e9937eb3d7f59833369b4e983ac30dfdf7cce0e895916c5cb934b03fc41ea9b4a4fef3c7c8c8e98ffb0ff7398a3ed5c94015772481c2cd60a019f1fe714f4 SHA512 61f35f0ad4015cd020f0292d139bed2a5bb3c8ef7f11cc96c816ca6003941de0f8295a75ccd6da961bf4256988b788784ca4b41e98be0a9f96c04e0663d566e9
diff --git a/dev-libs/libspnav/files/libspnav-0.2.3-makefile.patch b/dev-libs/libspnav/files/libspnav-0.2.3-makefile.patch
new file mode 100644
index 000000000000..6fbd73debcbf
--- /dev/null
+++ b/dev-libs/libspnav/files/libspnav-0.2.3-makefile.patch
@@ -0,0 +1,39 @@
+From 7b988445b29b2bffb0714ad419c9b6dd90baccd2 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 7 Jul 2019 21:51:44 +0200
+Subject: [PATCH] Makefile.in: Ignore /usr/local/ + fix .so symlink creation
+
+---
+ Makefile.in | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 7abe595..39714f8 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -5,8 +5,8 @@ hdr = spnav.h spnav_magellan.h spnav_config.h
+ name = spnav
+ lib_a = lib$(name).a
+ 
+-incpaths = -I. -I/usr/local/include -I/usr/X11R6/include
+-libpaths = -L/usr/local/lib -L/usr/X11R6/lib
++incpaths = -I.
++libpaths =
+ 
+ CC = gcc
+ AR = ar
+@@ -54,9 +54,8 @@ install: $(lib_a) $(lib_so)
+ 	cp $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so)
+ 	[ -n "$(soname)" ] && \
+ 		rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) && \
+-		ln -s $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) && \
+-		ln -s $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) || \
+-		true
++		ln -s "$(lib_so)" $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) && \
++		ln -s "$(lib_so)" $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink)
+ 	for h in $(hdr); do cp -p $(srcdir)/$$h $(DESTDIR)$(PREFIX)/include/; done
+ 
+ .PHONY: uninstall
+-- 
+2.21.0
+
diff --git a/dev-libs/libspnav/libspnav-0.2.3.ebuild b/dev-libs/libspnav/libspnav-0.2.3.ebuild
new file mode 100644
index 000000000000..0cde20cb7aa1
--- /dev/null
+++ b/dev-libs/libspnav/libspnav-0.2.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib toolchain-funcs
+
+MY_PN='spacenav'
+DESCRIPTION="libspnav is a replacement for the magellan library with a cleaner API"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}%20library%20%28SDK%29/${PN}%20${PV}/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="X"
+
+CDEPEND="X? ( x11-libs/libX11 )"
+RDEPEND="app-misc/spacenavd[X?]
+	${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-makefile.patch
+	eapply_user
+}
+
+src_configure() {
+	local args=(
+		--disable-opt
+		--disable-debug
+		$(use_enable X x11)
+	)
+	econf "${args[@]}"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	local args=(
+		DESTDIR="${D}"
+		libdir="$(get_libdir)"
+	)
+	emake "${args[@]}" install
+}
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 0d93da923c67..6a17607ee304 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -4,4 +4,4 @@ DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ff
 DIST libutf8proc-2.4.0.tar.gz 154936 BLAKE2B a4fea823806bb784c83504de2ade985d3f0e86aa8d64747f389724ef10122953312e398a7a342cf28f25502693ee507be246338dba37c976998f6a1922cd94c5 SHA512 2bbd056b488cd30faca26618389d8af84edc39ade9b705e147b676bf39eee65b40239d01c32c46dfc2a289d79e869ed1bb3c347365603dcaab2f69e34427441a
 EBUILD libutf8proc-2.2.0_p1-r1.ebuild 734 BLAKE2B 178c2fe8fe6699cb413b6bfb9f68b13b2e90abd9bafb402ff43275f2d363fcc9ba10a36c369edb6516b8acfe0c210b640fda5047dbeac89e45a803c41ea5671d SHA512 fa2c3e9e096b7b664a30c62437246e31f2cd8eb62d45c37077e76fb605f67acf0e2b80f848b946b994c85f7d2c33aee28621698a05224af5c07a29550e8fb4ea
 EBUILD libutf8proc-2.4.0.ebuild 1451 BLAKE2B 8a6f1cc2bdca5f2036732f230b5115c048b260446cba58b351fcd02606a928cf4ce566e3ae888bed70e6f98a386b14d2ed679338dec35443d24f0d96cd41c262 SHA512 8758b048b085e8fc0ae96107c4c868e5ffeed99eeb009c3097a8cb926f82e81c42599810df1b2fc0e9c6e8859ac54ad8bf895ec6e8bd7f5fa619cbee5ea21cfc
-MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libutf8proc/metadata.xml b/dev-libs/libutf8proc/metadata.xml
index 88de5fc462b1..7a38bb900964 100644
--- a/dev-libs/libutf8proc/metadata.xml
+++ b/dev-libs/libutf8proc/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vdupras@gentoo.org</email>
-		<name>Virgil Dupras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 6d1334319065..bf221bcf2cff 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,8 +1,10 @@
 DIST libuv-1.28.0.tar.gz 1218769 BLAKE2B 444881479688144b36559a258f998e99e663d856c349086f74a21c3946f8d48d0fd9ed0a7c64c76c18b47edd3df037936fd87c4d47e9ae7c5639bb6e289e026d SHA512 5f49b980b69011897bbb7a00d779fe0e71528d106626bc13fc130cd09afb7c8188007f354cd6320b1eba67f77c938ae3e83f3bd4a3ef5b9ea65a3adf51f66a53
 DIST libuv-1.29.1.tar.gz 1224127 BLAKE2B f116b0e0df9c2b65bafb8ebe0259ac1e1702232e751e015dbffa9be403f39727d255a7abc560b219279caff1bfab9528f38e32dbd2cf42dc0274dbaa57727861 SHA512 7e1ed1bc500bfaab44858b3ff4685ec3d2abce412718ad144d642f7526f6dbcba643ea9a623bb129d545599570be64ed9a498d85485c1716c4c365bb7ab61898
 DIST libuv-1.30.0.tar.gz 1228356 BLAKE2B 1e70ff162f5b6200e1a88c069360cbbc246d8bd5428c918ff80fadd139b3416301116c1015953ff7be583523a5c977b1da003958e6dd66cf2f43ef5adfc798c3 SHA512 3ba158cea5027fe7c30314da08a620a718cb30ca38997e46ad00912eefac9d2d94f9dd256c204771686a546d7445da2db1be2a0abed7ba14f122332767ee5ee8
+DIST libuv-1.30.1.tar.gz 1228593 BLAKE2B db45d283b7aec00ee5b617a6d3578112aeae6f006da5b09c9d0eb07ce9ceee59d6acc0ae9e476602f664c67d24685c4e1ac0e1524f38475da1f00e89c8376bd8 SHA512 bf6d99e4807da3e90c1852b901953fb5ddb9354942a433d8ddfef9a0766abfe3783216936c546ea1b9f2872d0d031dd184519bb5c7f58f6baeae4446f0f5e3fd
 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 1237 BLAKE2B 05df78f6a04e72033411d2c2e4523ca314c1d11aadbdc599fcd83f84fc3758044a56d1f02709cace36675ce56f61c6df4d6d26a806c5e358b2c56cf4fca891ee SHA512 8426a40e2dce0793b9cc6defa6dde8525d0702fa46b3eeaeb05fc6a8d5fbc3527d76126920660e41b0d9382480dec8dfd7b40165fd2d46cf082f2898e180751c
 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.30.1.ebuild b/dev-libs/libuv/libuv-1.30.1.ebuild
new file mode 100644
index 000000000000..82a9f17f9244
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.30.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 autotools multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	# upstream fails to ship a configure script
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libwapcaplet/Manifest b/dev-libs/libwapcaplet/Manifest
index bee3930454df..9cf18479c360 100644
--- a/dev-libs/libwapcaplet/Manifest
+++ b/dev-libs/libwapcaplet/Manifest
@@ -1,4 +1,4 @@
 AUX libwapcaplet-0.4.1-makefile.patch 391 BLAKE2B 0536fdc5fd0e8bca72b0fc33198eba058cefc253d9e6ca112e2d7d0cdfb082a024c739e101eec03470319ce766694507d6d4ed2cd3b1810242c5313e8b3af5ad SHA512 62d0e6b7a5ec8c5e5c695933a886002bf81c5ac73e2f47917d9942932045cf66f5023eac039e21b8cf915a145dba2d3c12da4a85e9ae1a7340e522f36bdc3157
 DIST libwapcaplet-0.4.1-src.tar.gz 31448 BLAKE2B a686a357dc84135da902380de17b0f8415a682cdb258ea0a8f7899581d23f6fef3aa1600e2657aa728b5689a8fa31a3fe489a7ce8a339adf958c3c25f6151a04 SHA512 49efb958ee79e932916a956844970780723cc71b4b2e5f442507566b2d632cc17c67d984018b48ae31a9bd7d92797766e39110dec02937b45ead26523e8cc2e1
 EBUILD libwapcaplet-0.4.1-r1.ebuild 840 BLAKE2B 29f3f3df3e2ebbae0702e543427e4ed5f708432ad944946560f3e73726dcf4e05a8d8b31e0856b23fd7bcc51ee85bc7463a85b58391219e648fd752cdaea71a0 SHA512 8ffc409e82a6d17eccd2542c4234c47b56a2813e9acc5f821471ef2901f489fcaa0e0fc07ac854a8c36e6ed64ffd351ef286a9bcfe1734aed4cfaeabac1cd0bd
-MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libwapcaplet/metadata.xml b/dev-libs/libwapcaplet/metadata.xml
index 88de5fc462b1..7a38bb900964 100644
--- a/dev-libs/libwapcaplet/metadata.xml
+++ b/dev-libs/libwapcaplet/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vdupras@gentoo.org</email>
-		<name>Virgil Dupras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 941c6edfe67f..10f2c1dc372a 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 6787 BLAKE2B b7faf904734ae17ee583d3bf6adcaee337cc478fc60a22fb0378e82e2d1bf4f8bd8239380a5c77d8f08ec66b9053a679139f86f9b8c985cf4e4ba1371c5bcf60 SHA512 63190aa823afab1a4f869d75a2509e348584c4afe1374d1ab550ed9a65ce7beac221278d424b9e431464c95e6ffd57d4d19225afe9a3a452edecf9058350e938
+EBUILD libxml2-2.9.9-r1.ebuild 6786 BLAKE2B 51eca1da04c119caa23c022502c766d9c1fbc24f75c48a70ee24eb99adc97dcc7d6cd917790d779a79afc7d4f369e3707e58004e6e430b723c8dced96219a4b0 SHA512 3268c259914c567df9830f8846fdb966d2889d450602fd4b016d3567995ea1408351f56d32254ef1942f4642b09b9e97e2df763972944c2d059cd80c06d21a70
 EBUILD libxml2-2.9.9.ebuild 6531 BLAKE2B b4b9d5c06f04316bb31aca3aeb1f60a9c0ae045ecc9e04d863c517120c4dbdd580c5bb7d88e85f16cb63b0f8a8d0751c5d9df42bf8fafe6a3af185292149a11a SHA512 63e8a73380c3a1798af17075f9e5ff5821b53b4d3e782dbf51dcca6d604ef8315b3fc3b5f6d3bffbb0336d4418e47e5f4c220d4798cf20042dde8cd766924f7a
 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 88ae676189e8..8f07efb6168f 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-fbsd ~x86-fbsd ~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/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 22e00f65288d..08aba8b8ad8a 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,8 +1,6 @@
 AUX 1.1.32-simplify-python.patch 7487 BLAKE2B 401c691c12cd7aaae4eeef26bbd34ba17346a9bd5801d89989504fff34de65a0afe706d4ff7f4ecd29894ffdfd54958d0c3e9da97946ced540b797ff7c9ddd25 SHA512 7aec9780cd092bea6cf4e443e79da44de22abab18a4c2ff9dbfa3ee44beb193029d9f2474a379812efad452412efdfcef1af5658d0843fb946247f2bbbf8cee8
 AUX libxslt-1.1.28-disable-static-modules.patch 1109 BLAKE2B fc4c8c1dc932ff9bdce27064bf68b7bb7c8de94902e26250ba280d771464e9c92bc069f36910ed96269bd1c4270e1f881921d8f7f9101941a4fcdbe9f77380e9 SHA512 d7a091d2b303450d46e94ca53df630ec6cdee8707ffd7d7d2920a56a624f1f8f53d2c1753768b49786c0ce17b6512f8de7740b54bf1c3cdbc5e8a5f3d052b1d1
-DIST libxslt-1.1.32.tar.gz 3440715 BLAKE2B 8d5dead5788d8d09ab121d6e33397ee8ed8836f573adba4b5f0e3f2e1410acfca0c50dbe06ea3b50a2df819aa01e7522902fbd5270e5329075b854881150ab64 SHA512 e1ed3c103cd4c9897e7dd2360a11f63cf30382b7566ce6fcc81117804e203714446b5a62179ce628c3834b0b32ecdeeceecbdfa417507ce9ed5a107a0ebefb39
 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.32.ebuild 3275 BLAKE2B 8c62899c0f9744559d7aac7be6f73ae599303b848699eb89f9276ab8e72a038024773a5754c5ba08f223ceab334a5a22c91137343b0c89a5b3bebd56d59739c6 SHA512 7fc90253308d84200aac763dce0e4fea507c0d43ab36b07d55bd40bcbf4a2365c496977ff963200b68966b892646b05680138c1e94e790def07f3fb5d4f4ac95
-EBUILD libxslt-1.1.33-r1.ebuild 3470 BLAKE2B 1d617d336bd6657a95ee899959d4c82bb4bf69f35572a9a12ac5fd1e436575ff68e914b0187e16a7d05f54d34162507bf59de8fd2de44a8e4f3a22e2924326a1 SHA512 f2bda537dc764809da2a96030067d74df3af87dfdd80c4dbe2dd1cbe22cf1c48812a50058251961198dfd4e9b800f885a088bdc624b294e48d8fa6efbe55c958
+EBUILD libxslt-1.1.33-r1.ebuild 3467 BLAKE2B d8663a0bf1b2ac475552d0319c05a702ad079c52f29da813ffe3b5815a1a93620731a415db5178e455452fcaa211eb9bfb6b70bee642a306a372a36bfae51b6b SHA512 48e01883b6660fe9e636b4fb128923e9a0d11b910aa922a72fec1b97a3126fb6dbf1986ef07d1a7e883e0202331312cf7b3e3d547693042f90f7205388510844
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/libxslt/libxslt-1.1.32.ebuild b/dev-libs/libxslt/libxslt-1.1.32.ebuild
deleted file mode 100644
index c5440100fdec..000000000000
--- a/dev-libs/libxslt/libxslt-1.1.32.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools ltprune python-r1 toolchain-funcs multilib-minimal
-
-DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="http://www.xmlsoft.org/"
-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"
-
-IUSE="crypt debug examples python static-libs elibc_Darwin"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}]
-	crypt?  ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/libxml2:2[python,${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xslt-config
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libxslt/xsltconfig.h
-)
-
-src_prepare() {
-	default
-
-	DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
-
-	# Simplify python setup
-	# https://bugzilla.gnome.org/show_bug.cgi?id=758095
-	eapply "${FILESDIR}"/${PV}-simplify-python.patch
-	eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch
-
-	eautoreconf
-	# If eautoreconf'd with new autoconf, then epunt_cxx is not necessary
-	# and it is propably otherwise too if upstream generated with new
-	# autoconf
-#	epunt_cxx
-	# But Prefix always needs elibtoolize if not eautoreconf'd.
-#	elibtoolize
-}
-
-multilib_src_configure() {
-	libxslt_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
-			--with-html-subdir=html \
-			$(use_with crypt crypto) \
-			$(use_with debug) \
-			$(use_with debug mem-debug) \
-			$(use_enable static-libs static) \
-			"$@"
-	}
-
-	libxslt_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
-		run_in_build_dir libxslt_configure --with-python
-	}
-
-	libxslt_configure --without-python # build python bindings separately
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl libxslt_py_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && use python && libxslt_foreach_py_emake all
-}
-
-multilib_src_test() {
-	default
-	multilib_is_native_abi && use python && libxslt_foreach_py_emake test
-}
-
-multilib_src_install() {
-	# "default" does not work here - docs are installed by multilib_src_install_all
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		libxslt_foreach_py_emake \
-			DESTDIR="${D}" \
-			docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
-			EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
-			install
-		python_foreach_impl python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use examples && use python; then
-		rm -r "${ED}"/usr/share/doc/${PF}/python/examples || die
-	fi
-
-	prune_libtool_files --modules
-}
-
-libxslt_foreach_py_emake() {
-	libxslt_py_emake() {
-		pushd "${BUILD_DIR}/python" > /dev/null || die
-		emake "$@"
-		popd > /dev/null
-	}
-	local native_builddir=${BUILD_DIR}
-	python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@"
-}
diff --git a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
index 7e819007b152..bab71915297a 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-fbsd ~x86-fbsd ~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/nettle/Manifest b/dev-libs/nettle/Manifest
index 8f151400abf9..a805c461a2c9 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -2,5 +2,5 @@ AUX nettle-3.4.1-build.patch 1598 BLAKE2B ce10cb8a59bf8e2d1dea57ceff5bb2fcf2da13
 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
-MISC metadata.xml 351 BLAKE2B 72daad9a603f171d2a9df465705317fd5609f8a5ddbe464c45db1de5be1502edbf8a4bdaaa229e52d5b06af6f5884f8d84bde515f726d1292d44bebb22d50f1a SHA512 9b5fcbf997fbd4fcc238c20a4968adbb1c24c84ce9764360a21c2bb000fe891cc8293c7fb5a1d93c9c811791a6524f727b16befbe95f1d65f68c8a3916224f60
+EBUILD nettle-3.5.1.ebuild 1654 BLAKE2B 5300b1cb61d942c5f3407a825764019cd8670ffdd1e76bb947a0cddcd7b5cc02a062c4218cddf279602883fac31a5a937f7b02497b5eccced4763ebb091f5209 SHA512 3bf8471459e114b180b9ef41fef7685dcb827ff2df5a359e786b2c5d1eae7e198987569777f341d7214e396bd8fae7fff42d07c3387951f734c6726d829e4dcd
+MISC metadata.xml 240 BLAKE2B 019d24354f525c2754c3fa8a9dfc0a35fbdf5ea285db4cbc20535f6123679544c06acae8c5ced17ae7c299318b6a0b9115b645188fccd5945ff47b6bf9cd1f1d SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d
diff --git a/dev-libs/nettle/metadata.xml b/dev-libs/nettle/metadata.xml
index 2992d1b3df8e..040cba5f7c5b 100644
--- a/dev-libs/nettle/metadata.xml
+++ b/dev-libs/nettle/metadata.xml
@@ -5,7 +5,4 @@
 		<email>crypto@gentoo.org</email>
 		<name>Crypto</name>
 	</maintainer>
-	<use>
-		<flag name="cpu_flags_x86_sha">Enable support for Intel's SHA instruction set (SHA-NI)</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-libs/nettle/nettle-3.5.1.ebuild b/dev-libs/nettle/nettle-3.5.1.ebuild
index 5bf45e8446d6..45fc672b7231 100644
--- a/dev-libs/nettle/nettle-3.5.1.ebuild
+++ b/dev-libs/nettle/nettle-3.5.1.ebuild
@@ -12,7 +12,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"
-IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes cpu_flags_x86_sha"
+IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
 
 DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[static-libs?,${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
@@ -50,7 +50,7 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		$(tc-is-static-only && echo --disable-shared) \
 		$(use_enable cpu_flags_x86_aes x86-aesni) \
-		$(use_enable cpu_flags_x86_sha x86-sha-ni) \
+		--disable-x86-sha-ni \
 		$(use_enable doc documentation) \
 		$(use_enable gmp public-key) \
 		$(use_enable neon arm-neon) \
diff --git a/dev-libs/nsgenbind/Manifest b/dev-libs/nsgenbind/Manifest
index b218139add1a..a369e59030c9 100644
--- a/dev-libs/nsgenbind/Manifest
+++ b/dev-libs/nsgenbind/Manifest
@@ -1,3 +1,3 @@
 DIST nsgenbind-0.6-src.tar.gz 106862 BLAKE2B 9b40ae6298921736f7d876ae664207eb71102adbe44f4072ea46b08b63cb5cf608df4c96f3ade1c8cca964d8d8b32d68aad25431f6fd455eb8392d8313faa9e9 SHA512 3083b48e48fcf8c7f32b09d040998470d5917469e020c4ccbfb8ffdb7d1252fd27dd02f590f5a2485c6984cdbc005ea87adf0db45077aee0a91f68037c542ffb
 EBUILD nsgenbind-0.6-r1.ebuild 689 BLAKE2B e2992845a2fe26aa5b2cee030abc4889cf487942153409d5887de62befcfb52478d5eb296e63e2f69a525ce337d4d887ca44a3c08ac769de9b63194433f4a70f SHA512 928673eca4f9fd02c5d75acdd12e783c4a73c0d203af02edd331617c8cf76dd6d676cead44d2d204afffb46e3d2ff53f8d9cc3c50146aac3dad9f2300067f243
-MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/nsgenbind/metadata.xml b/dev-libs/nsgenbind/metadata.xml
index 88de5fc462b1..7a38bb900964 100644
--- a/dev-libs/nsgenbind/metadata.xml
+++ b/dev-libs/nsgenbind/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vdupras@gentoo.org</email>
-		<name>Virgil Dupras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index e54f932e2cb3..46e55fa4e17a 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -8,5 +8,5 @@ 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
 EBUILD nspr-4.20.ebuild 3792 BLAKE2B 2f6c9e7d9cbe04da44e9e34e45c416d77d610d045fe3cce5e2c60c7655be78853bba9428a91a0dad388f6fc1e26876b26e0bab2d6495616c4941b8585aacba38 SHA512 5f2f0b397fb9dfd274b73e9026c4e5d6ccdae99f32c98a9fbb4497f87609d7e9afaaaf08cd0dd9dc8b21f8b63f91043988f7e2171cf26703447467314b4d6c4f
-EBUILD nspr-4.21.ebuild 3890 BLAKE2B 4f15642216d57f646fa65f690dd3213f8158458b6c9dc68a76f3b2a0a1f0c76d95146d3246d65724bae08fbf65d67a57ad8f62ab5939eaa6eaf3951b5035c51a SHA512 aa0deedd867dadde431b3fc6028c3316b02931c9952e6702262cb57c5dea245ab6aed2eb5b17983876872928490f40fc35c427ce9a001a381da319cb1d4b5b9e
+EBUILD nspr-4.21.ebuild 3897 BLAKE2B dbc3e8d02f14a0c22e2969ce9cd0cf644c2ec290f247b9581dfcfff954e1d544c05e84968a6b8ee1690c778b975ad57395cbd1cdc2313ddc048ae100c00e715a SHA512 04c3a557fe7be670d98790c499f2a7e20606a1cfa8be64247669b40057244135e32e8da5a8bf6243b9fe7164b706cadd442d3d61b7e06676bc0b820d90b9f3a1
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/dev-libs/nspr/nspr-4.21.ebuild b/dev-libs/nspr/nspr-4.21.ebuild
index dd4c8f167bb7..172a334d4b2d 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 ~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"
 IUSE="debug elibc_musl"
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 5332d4cccd21..36f432a0ffe3 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -4,14 +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.42.1.tar.gz 23416408 BLAKE2B 9c008ce599f3cc4de50af3a32f680e16058a42df7a844aa8f151c729a1c783177d8410b0aa2ea9887f5e69a359d84b655b78808fd817b8ccdeae458d9c7b4488 SHA512 468e1d4ea9d2b832c7b8975443ee6fe2790b39cbbd9f8e3d8428a43f47cce0e81d5ca21e3566701b75bcd4af09110c0134e204b2850d30ecfd6347ec27e6e265
 DIST nss-3.44.1.tar.gz 75986343 BLAKE2B b0a91ffdf879c8fd684abcb92480dd465466e83d3bad346d937bae285543705d10817527ed4f5ddbb618ad52103d4aedfc25e03053225010abc80267d2f94034 SHA512 eb8777701a25b54377026633b6bf284e4c62308012058355f348a7c57525afe96db74a07de41ba01754e316a7dff06689de527359a5474ed7ab606779c4cf169
-DIST nss-3.44.tar.gz 23474704 BLAKE2B 8e3b49c7dd4ca1795eff0af55bcf8c8586a5658f0d671306d166dd8d758cc056858dbaf028d5e4ea4bba40e473aa246251f07ed7108bc2f40990b53aea40a1a6 SHA512 c4d7343a66f91c5888a121e266d1f1471da798a21d608a29caf598a828725e4bf9ea7411a105b23335f20bd7c12788dad567922ceeaebeb0c98fbf9bbe4006f7
+DIST nss-3.45.tar.gz 76017462 BLAKE2B 33b310a2cfe86bbbcbb34aa0ea8f11ef8bc9ba45301bf338a1271e88f606b89cb98ad12fad9ae248fa1205218bcf10a106437972fbf56c6563255f3ba0cbf466 SHA512 33360a1bb4e0a0a974070c354ee82c515d5cfa2a12c9c96817a9fdb3e4ca1ad62eb95886b9b0d60e2f69efda964376d0671c1e3c920b2ea614aeecb719c6ff29
 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.42.1.ebuild 9427 BLAKE2B 1397f9e77b881d76e0dd512441c4daa9edfe717e8197ece18baa619ed9320b0eed9fd8641ea4e85707f55833308500deaaec5116b08ef9021629ae0c9ef67e7b SHA512 c9d249473eef867e5c82cc6ee46b92f10819b8fdd00db122a7d03a772056dafa1e3a89c2a553c48a8fc882b8ac15fdb25520dfcef869325f834fe8eb5a057d78
-EBUILD nss-3.44-r1.ebuild 8524 BLAKE2B ab0cbe7d2e92a722a70a43146b030f43e6afb558592daad7b7547623bb63b11000e3395ba92e334437982867f3274a8de2d408c45911cb2c3f39a0a7039b71f9 SHA512 588405c82fecdacbed9e602313dadfb29ec925adca9d0f70f5b166ca5a275f1889302a8b3a3e25e5e4a1c31854c00a2b8412052c8d2f7c260556c7069702cce4
-EBUILD nss-3.44-r2.ebuild 9488 BLAKE2B 1e9068af29f3d798a4b7a47931e77ffa04e1e3b37c7cdac7c9a4d11a91ae2eeeee2c8f5d688952204c7a2235a020e05e97e5b2c266f85d09ee97a8c0998e911d SHA512 7df96c4826322101639975574cbc2c621cecd97e7b40641fff918c8283efd85b670c84feb02e3ccc7e47af6131f9841b19668afefb9219f975fd54acbda88088
 EBUILD nss-3.44.1.ebuild 9488 BLAKE2B 1e9068af29f3d798a4b7a47931e77ffa04e1e3b37c7cdac7c9a4d11a91ae2eeeee2c8f5d688952204c7a2235a020e05e97e5b2c266f85d09ee97a8c0998e911d SHA512 7df96c4826322101639975574cbc2c621cecd97e7b40641fff918c8283efd85b670c84feb02e3ccc7e47af6131f9841b19668afefb9219f975fd54acbda88088
+EBUILD nss-3.45.ebuild 9488 BLAKE2B 1e9068af29f3d798a4b7a47931e77ffa04e1e3b37c7cdac7c9a4d11a91ae2eeeee2c8f5d688952204c7a2235a020e05e97e5b2c266f85d09ee97a8c0998e911d SHA512 7df96c4826322101639975574cbc2c621cecd97e7b40641fff918c8283efd85b670c84feb02e3ccc7e47af6131f9841b19668afefb9219f975fd54acbda88088
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/nss-3.42.1.ebuild b/dev-libs/nss/nss-3.42.1.ebuild
deleted file mode 100644
index af7bfd8bc223..000000000000
--- a/dev-libs/nss/nss-3.42.1.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.16"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
-PEM_P="${PN}-pem-20160329"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
-	nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-src_unpack() {
-	unpack ${A}
-	if use nss-pem ; then
-		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
-	fi
-}
-
-src_prepare() {
-	if use nss-pem ; then
-		PATCHES+=(
-			"${FILESDIR}/${PN}-3.21-enable-pem.patch"
-		)
-	fi
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	# Do not let `uname` be used.
-	if use kernel_linux ; then
-		makeargs+=(
-			OS_TARGET=Linux
-			OS_RELEASE=2.6
-			OS_TEST="$(nssarch)"
-		)
-	fi
-
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
-	export FREEBL_NO_DEPEND=1
-	export ASFLAGS=""
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits:-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d}
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED%/}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED%/}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.44-r1.ebuild b/dev-libs/nss/nss-3.44-r1.ebuild
deleted file mode 100644
index 8e716b19d507..000000000000
--- a/dev-libs/nss/nss-3.44-r1.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.16"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
-PEM_P="${PN}-pem-20160329"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
-	nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cacert +nss-pem"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}
-"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-src_unpack() {
-	unpack ${A}
-	if use nss-pem ; then
-		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
-	fi
-}
-
-src_prepare() {
-	if use nss-pem ; then
-		PATCHES+=(
-			"${FILESDIR}/${PN}-3.21-enable-pem.patch"
-		)
-	fi
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	# Do not let `uname` be used.
-	if use kernel_linux ; then
-		makeargs+=(
-			OS_TARGET=Linux
-			OS_RELEASE=2.6
-			OS_TEST="$(nssarch)"
-		)
-	fi
-
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export NSS_ENABLE_ECC=1
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export ASFLAGS=""
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits:-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d}
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED%/}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED%/}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.44-r2.ebuild b/dev-libs/nss/nss-3.45.ebuild
index bd22251e6050..bd22251e6050 100644
--- a/dev-libs/nss/nss-3.44-r2.ebuild
+++ b/dev-libs/nss/nss-3.45.ebuild
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index e0a1c75f90f4..68f7eb0153a7 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,4 +1,6 @@
 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
-EBUILD opencl-clang-8.0.0.ebuild 794 BLAKE2B 83c4637eccfdf8133fcffe8b3aff6be4472aa9f4f08ef4eb2ff0bd818542eadf61aa0ccdf44a5a1230064b23b5d05159f7e0ef79c6f5e67aec4b10935f61b36f SHA512 092b54fff58beaa14daa3701b87381e8cda45d19334185be4fda1bab8175f1d5be81511397e268c7f2cd49aee682ea65980fd97bc4feec94e0f14a5d95c550d9
+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
 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
index 119d5523a020..ac93a0e876ba 100644
--- a/dev-libs/opencl-clang/opencl-clang-8.0.0.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-8.0.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="UoI-NCSA"
 SLOT="8"
 KEYWORDS="~amd64"
 
-COMMON="sys-devel/clang:8=[${MULTILIB_USEDEP}]"
+COMMON="sys-devel/clang:8=[static-analyzer,${MULTILIB_USEDEP}]"
 DEPEND="${COMMON}
 	dev-util/spirv-llvm-translator:8=[${MULTILIB_USEDEP}]
 	dev-vcs/git"
diff --git a/dev-libs/opencl-clang/opencl-clang-8.0.1.ebuild b/dev-libs/opencl-clang/opencl-clang-8.0.1.ebuild
new file mode 100644
index 000000000000..914e05911fec
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-8.0.1.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-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"
+
+BDEPEND="dev-vcs/git"
+COMMON="sys-devel/clang:8=[static-analyzer,${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}
+	dev-util/spirv-llvm-translator:8=[${MULTILIB_USEDEP}]"
+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/quazip/Manifest b/dev-libs/quazip/Manifest
index b776c43228a8..204e84f5ede3 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,5 +1,3 @@
-DIST quazip-0.7.6.tar.gz 149029 BLAKE2B 7eb99f550dc06d8d2911b22214294accaa5126657598bfd60614267715ea968790f470cea2820e1a78a8581ab0d4b75c90589c0da1ae815067e083e389020762 SHA512 4325a69918216bb66c6a7c53589ef73473c3752151522a135dd9c92dbf722b29656aea7be0314c84399a214391eca79296ecda5811ab31845d8cf53c010110d1
 DIST quazip-0.8.1.tar.gz 150584 BLAKE2B 4a1d61b65b01eee06e1292ee88b543675c77ac922d0fb1726ac0afd447d74e8c8154db82da0ce95c2f2c303c036f2795e8938a412dc22e921ee09a0ef99278f6 SHA512 d65dab16c2cbc4d8bb23dae5b2fdff5ef787aaff2653b8e75c3fc8ba1701f5568a52bdde39009f83c5069a9fe3331cd1a49cf965822c4180e88bbc341faa2bfb
-EBUILD quazip-0.7.6.ebuild 1128 BLAKE2B c688ed7a4574358ea89fbeb4965e23e3c25ed78a71dae0f202d98274322a1752f35a10e3a4a9442fd28676b96885037c3b3b71ce988a01d8301ef74586cc804f SHA512 56358d0d23a4b366cf9819a09b71bc494af7368b7825d1a328f1c638d012308507e3c26db6bcc0775d9a32e50da6a2e0a5a5a84b9fa4ea42ce668d6af9fdf072
-EBUILD quazip-0.8.1.ebuild 1135 BLAKE2B afbdecce212d599f744301cd459cb4ed1c5d9098f9cdac936d4cf703c74e6e6eb2e3876adb1a654448260cee2c352cd3b9bf289f00129545706074ec350786ea SHA512 2a3b5b44ef06d67257c52f6fc6afe828a1927704d16b388950712264570104c99106dbccaadd78fb4be89e975c043e49f0f22fe9eb7092a7ad8c4b1d963f89cb
+EBUILD quazip-0.8.1.ebuild 1133 BLAKE2B 8b939d526b052909a81d0b6e35f3b421338b2b95d2e529337bd88c079a3b6fd7ad062a8b9d461300ad8b6c9a791afcb778deba0efaa5b1a1cf8d5a055b32b46b SHA512 ab6c233f28b72753597e91dcc02b13e37a607554fd487eef655d74bb3f038bd6c21ff74aae2c939865d9cacd9f67726af7d917002959c13627aac2373ba0c50b
 MISC metadata.xml 291 BLAKE2B c82030a8bb517384360ea44225c9c472868d2460ddc9f95f267ef58f8275d7386a87fc7f074995636bf88e056cdf516a3a89500d6d0da09ea97d0d70507eca73 SHA512 4bbb5644633f8430cf5aa8e2e0108154b9480129ebdfcdcd2e3138c550d03d4d4b2d5554ec2a2fcf592375cda4ce4825f59db8921256c491a3216500f8df0a98
diff --git a/dev-libs/quazip/quazip-0.7.6.ebuild b/dev-libs/quazip/quazip-0.7.6.ebuild
deleted file mode 100644
index 5e502d2c03b7..000000000000
--- a/dev-libs/quazip/quazip-0.7.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic qmake-utils
-
-DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
-HOMEPAGE="https://stachenov.github.io/quazip/"
-SRC_URI="https://github.com/stachenov/${PN}/archive/${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"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	if ! use static-libs ; then
-		sed -e "/^install/ s/quazip_static//" -i CMakeLists.txt || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local -x CXXFLAGS="${CXXFLAGS}"
-	append-cxxflags -std=c++11 -fPIC
-
-	local mycmakeargs=(
-		-DBUILD_WITH_QT4=OFF
-		-DLIB_SUFFIX=${libdir/lib/}
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# compatibility with not yet fixed rdeps (Gentoo bug #598136)
-	dosym libquazip5.so /usr/$(get_libdir)/libquazip.so
-}
diff --git a/dev-libs/quazip/quazip-0.8.1.ebuild b/dev-libs/quazip/quazip-0.8.1.ebuild
index f7369d5659a1..3dfa73e6c0bd 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 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/dev-libs/tvision/Manifest b/dev-libs/tvision/Manifest
index d0b597e27d5b..7e526c03c469 100644
--- a/dev-libs/tvision/Manifest
+++ b/dev-libs/tvision/Manifest
@@ -10,11 +10,12 @@ AUX tvision-2.1.0_pre2-perl-INC.patch 680 BLAKE2B e525daf089b00cd22338dd48339459
 AUX tvision-2.1.0_pre2-underflow.patch 279 BLAKE2B e0eee5f31987b57f39db001ede136a919e306a128adf256791bf1a8c1465958072518baa19d35aed92bedd9b6ec9b31c3a708bfae216857941bc1165e721a375 SHA512 aec060b923adc3c98f21ca659eb26f3c3cbd5164c1287a1e61e4a5d34ba6dc609cc352a465f937b851d63379a8682f44a199e64822f1d590042d75a120a42bda
 AUX tvision-2.2.1.4-build-system.patch 1119 BLAKE2B 98d594371ba91cb70acb8865b1817c4cfa4563bd7965d4079357ccdab2c679f584677f209275e9a4851b31cca0de7ca2ca1688d523970704a3cc126620b4df59 SHA512 60b239c4f2c6a5c3ca00e5f6c29293f92ebb5f00e6dcfc709bee986a1960a01cb77c542921c2e02c576ef9ffc2a7a600534997d8c2a6e5d691ae2825b38b161d
 AUX tvision-2.2.1.4-fix-dot-INC.patch 675 BLAKE2B 8fd53d6e384b5cd71a2850fa0d80fdcd4544f1462d21cbfeb0cd5056ed23f5892d5f97d4f5fca7d8a86757ae171aae19fb689df98927f8ae0acac2d351e92e5f SHA512 49ab191bb74388d1cb6fd31c825b924dccfee5e9a85a55e86c2df50c5a186f78e6112b3fc0dde361f481ea7daea5b9b656aaa93ebbaccb80bcf146d460efda7d
+AUX tvision-2.2.1.4-fix-overloaded-abs.patch 2771 BLAKE2B 84be3f2028a24fdd60a214fc27e99b2d09c7aa67380bd94d171d799424f745bc269d8df7e848326b0dcec0a37c05b56cc066e574c3f686d26b7db29615164516 SHA512 fb0bc0091e7101947497b3ddaf2e539b86fcdd4613bdb7f607d956b503a13bf285ce1eb1d32d809ad0f1a8d6b6fee7e74bd7e47ba69af46515386655247bb14e
 AUX tvision-2.2.1.4-flags.patch 392 BLAKE2B 8124537533a9a9e6568dec6aebdae766f05b1c59f7bbfbb34f8096ce0c4b61e9e5f0a70f525505592fe57c41ee61c8e31db1cd5e6fad5c977c73649c6b4f9b8e SHA512 8b3ccdf1dd49d436d9ebb05ee69081ca0abfb6b1dc6b41042788ef7b0c1328cbcf67788837577897d2e2485b41aaf620d789b39b33a0f82d442a263508f52017
 AUX tvision-2.2.1.4-gcc6.patch 1108 BLAKE2B 7a99bd2aa759d7995fa1bd0afd93c4b1a329d764f9dfff47796a997079718d90eeabe71e09046a6801644fcbf04caa05c955225a3fc77a0f031cad6d6ccc45e8 SHA512 05f55ad5f99107419bac22226b82dd2f94ec673e2c10e9872b59d47a42c7ab12e0f36c30bb1d019b15c8c07d8f5ebe2cf7637d42ca271d34c2042bb259fab3af
 AUX tvision-2.2.1.4-ldconfig.patch 596 BLAKE2B 672d0c67c4cc95d0857a79d824c34aa5bb25d68e5c9ad8d09c2fd16ca6e7a5c52c1febc2e8547b4f3444339f806415a396cccd140db1df10de6a3dbdb6ebff0f SHA512 92c867111f4f528da29ff612c72c90d77709eb46c587b5759f2bc69392d538a6c25ed2d54b8fe7eca0cd3b167a7db0c50de94e88f2107f7527884d15485c1a3f
 DIST rhtvision_2.1.0-2.tar.gz 1590449 BLAKE2B f5c31f997396f7b41b40089d3ebad8cdb5f24fce22f19defe3530d8a6cfcd728bf9cd3bcbb4e5d1d76c1fa3bc13c3b84f1147bd3c5aa07810077f5f159684eb0 SHA512 0593cd2eee9490d5cd6e79a6b8f4c0b384f78e5bb24b0728876fb9df482a43ee97c141d89127254210b4e012970327adfc5c8815d7c3c580a6d54a09291d42a1
 DIST rhtvision_2.2.1-4.tar.gz 1777675 BLAKE2B 04fee72d25c01825c8e21115bf16348e1f204371055490520d86a7eb6ad07d73c3d46f6046e11e01f7725b4fe8bd9eaf039ed72233f9141aaa19193635d6fe98 SHA512 bbbaab611fc7831eb339ddb612ef208a16e74f8e0961268e7e63f69c38cdfe45013d440861f3396aceabddf1a44e4cd65023b5b4238a39d55bbf133bde37dd8f
 EBUILD tvision-2.1.0_pre2-r4.ebuild 1275 BLAKE2B c1c538a7a489f6854e67ad163bd6258a217e6401fabcbe0757162835e5775dd262c5f8bb0a2e6e32f72cac5983e962ac5c09f1152b0d5934f6ac24f371e32df2 SHA512 e63b0507b474f10a61c3c369cbaa18c1f51a7d6fadffc74a1a19309b2cd151047e9e40884e826a32d154d0a83259c2b3f76bef9c4f87250283b6829634cd7cc5
-EBUILD tvision-2.2.1.4.ebuild 1593 BLAKE2B 723fab61c34c17187bf486c75003ff9ac3669e0c7e5a53d51b1264ac82cae7582b60df64241375b61c00969c8611c90f0f896ad2e2c1b837b3923c1ba0864168 SHA512 bf7c9a101bd696abe85c49570f78e919541b068631cfc1da7e2e2c2b0b7318d43ad9ba09f99564bad9240b6df4ad026c05aa639142381aad2b96e46dfef6590e
+EBUILD tvision-2.2.1.4.ebuild 1529 BLAKE2B 1b53eb32da985f60ae0a1175344845355f9ced9b9bd389e03d52a94728bc35cb6faca17c2926fd7e4291e1813e21f563f082d8428a744708aa7acb34a2aa2164 SHA512 6515f50efad2f73fe08445cdea72fa6995b1dcd061731ec76b15dadd26ae797c446ab45a570aad8f1c02223be30bbc9f2eb0b76fee5282c841f537093c0c0fb4
 MISC metadata.xml 694 BLAKE2B d6d43df5a039473776af219de660a9c1d288a31b401f2486c9f5366cde7173d86e18f1ca772dcbbbdbf1ec2d19e85f334714ac8f9b1dbb19340219e14fd2c852 SHA512 19b0c4d1690a4bc85a6b018d5032a5809d772b9982aa932af486223329fbe10562e287e08692a6c1d772f627d158b6d82bf6844e1365f3a248c7bc9195535aca
diff --git a/dev-libs/tvision/files/tvision-2.2.1.4-fix-overloaded-abs.patch b/dev-libs/tvision/files/tvision-2.2.1.4-fix-overloaded-abs.patch
new file mode 100644
index 000000000000..aab66f3a8cba
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.2.1.4-fix-overloaded-abs.patch
@@ -0,0 +1,100 @@
+From 85185e7787b34545faf095b64935d80982b5cf81 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Wed, 12 Jun 2019 11:52:16 +0200
+Subject: [PATCH] Patches from upstream to address abs issue with >gcc-6 See
+ https://sourceforge.net/p/tvision/bugs/17/
+
+The patches declare inline static abs functions where they are
+needed to make gcc happy.
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ classes/dos/sescreen.cc | 6 ++++++
+ classes/tdesktop.cc     | 6 ++++++
+ classes/x11/x11src.cc   | 6 ++++++
+ 3 files changed, 18 insertions(+)
+
+diff --git a/classes/dos/sescreen.cc b/classes/dos/sescreen.cc
+index 4dd3195..8a500d5 100644
+--- a/classes/dos/sescreen.cc
++++ b/classes/dos/sescreen.cc
+@@ -248,6 +248,12 @@ static int is_plane_mode = 0;
+ static int TextModeXres;
+ static int TextModeYres;
+ 
++inline
++static unsigned abs(unsigned v)
++{
++ return unsigned(abs(int(v)));
++}
++
+ /*****************************************************************************
+ 
+ ***************************  VESA BIOS ROUTINES ******************************
+diff --git a/classes/tdesktop.cc b/classes/tdesktop.cc
+index 38f1be4..26447eb 100644
+--- a/classes/tdesktop.cc
++++ b/classes/tdesktop.cc
+@@ -26,6 +26,12 @@ Modified cursor behavior while desktop locked by Salvador E. Tropea (SET)
+ #define Uses_TVCodePage
+ #include <tv.h>
+ 
++inline
++static unsigned abs(unsigned v)
++{
++ return unsigned(abs(int(v)));
++}
++
+ TDeskInit::TDeskInit( TBackground *(*cBackground)( TRect ) ) :
+     createBackground( cBackground )
+ {
+diff --git a/classes/x11/x11src.cc b/classes/x11/x11src.cc
+index 538457e..dc350df 100644
+--- a/classes/x11/x11src.cc
++++ b/classes/x11/x11src.cc
+@@ -141,6 +141,12 @@ void    (*TScreenX11::writeLine)(int x, int y, int w, void *str, unsigned color)
+ void    (*TScreenX11::redrawBuf)(int x, int y, unsigned w, unsigned off)=
+                 TScreenX11::redrawBufCP;
+ 
++inline
++static unsigned abs(unsigned v)
++{
++ return unsigned(abs(int(v)));
++}
++
+ TScreenX11::~TScreenX11()
+ {
+  STOP_UPDATE_THREAD;
+-- 
+2.21.0
+
+From 9b9f1aea8c9972ab9c1e633835ed4359d7fe000c Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Wed, 12 Jun 2019 12:05:58 +0200
+Subject: [PATCH] classes/tdisplay.c: Also add abs patch to tdisplay.cc
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ classes/tdisplay.cc | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/classes/tdisplay.cc b/classes/tdisplay.cc
+index 9225d48..569bc1d 100644
+--- a/classes/tdisplay.cc
++++ b/classes/tdisplay.cc
+@@ -22,6 +22,12 @@ same used in original Turbo Vision for compatibility purposes.
+ #define Uses_TVCodePage
+ #include <tv.h>
+ 
++inline
++static unsigned abs(unsigned v)
++{
++	return unsigned(abs(int(v)));
++}
++
+ // Remove me please!
+ int TDisplay::dual_display=0;
+ 
+-- 
+2.21.0
+
diff --git a/dev-libs/tvision/tvision-2.2.1.4.ebuild b/dev-libs/tvision/tvision-2.2.1.4.ebuild
index 0e8e0a50a556..4cbbeea9403b 100644
--- a/dev-libs/tvision/tvision-2.2.1.4.ebuild
+++ b/dev-libs/tvision/tvision-2.2.1.4.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+MY_PV=$(ver_rs 3 -)
 
 DESCRIPTION="Text User Interface that implements the well known CUA widgets"
 HOMEPAGE="http://tvision.sourceforge.net/"
-MY_PVR=${PVR:0:5}-${PVR:6}
-SRC_URI="mirror://sourceforge/tvision/rhtvision_${MY_PVR}.tar.gz"
+SRC_URI="mirror://sourceforge/tvision/rhtvision_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -33,7 +34,7 @@ RDEPEND="
 		x11-libs/libXext
 		x11-libs/libXmu
 		x11-libs/libXt
-		x11-libs/libxcb
+		x11-libs/libxcb:=
 	)"
 DEPEND="${RDEPEND}"
 
@@ -43,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-build-system.patch"
 	"${FILESDIR}/${P}-gcc6.patch"
 	"${FILESDIR}/${P}-flags.patch"
+	"${FILESDIR}/${P}-fix-overloaded-abs.patch"
 )
 
 src_configure() {
@@ -63,8 +65,5 @@ src_install() {
 	dosym rhtvision /usr/include/tvision
 
 	# remove CVS directory which gets copied over
-	rm -rf "${ED%/}/usr/share/doc/${P}/html/CVS" || die
-
-	# TODO: remove locales which are not needed, depending on current user
-	# locale settings. How?
+	rm -r "${ED}/usr/share/doc/${P}/html/CVS" || die
 }
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 6c3e062d5f85..52ae0d1be66a 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -2,7 +2,7 @@ DIST userspace-rcu-0.10.1.tar.bz2 503347 BLAKE2B 32e75d5d94b15fdcb28397aa64c871f
 DIST userspace-rcu-0.10.2.tar.bz2 503833 BLAKE2B 17e2102e096903f301d1a08d606cf98e28a413ef26a3dc8fa6f400ba74aa14aabdef5e28d4fed5fb01cee33b0bd5de9fb0682523aaa50c6053fd3471711a02e7 SHA512 47413b4a593d19185ee3d455e5744042c060cb50008dac25e9135c5cd2250ef5129a419258b18c665c8c794ad3b09234fdd70a106c72d8fc64631172b13d0e22
 DIST userspace-rcu-0.9.1.tar.bz2 468197 BLAKE2B ac2ae4ea788feef5463571e1a0d5dac35a5d6e298f628e0b0b2acea68d01e52a513cd5d1b58886d8b42d07455823fdfb91c1548caffb969cb9fe8c6b4d17adc7 SHA512 958234d72319decef07093c13b067e398c1b285ac714ab1dda89c2ad2ba0627d053e0cdabb07d480e399ebd60215445002876bd99f2829ca1e5582ada639f730
 DIST userspace-rcu-0.9.2.tar.bz2 468871 BLAKE2B f8a13b9683e8c32942a3d675ca94715de82b40b1a39be8161e1ea6009373f2ea6ae57b2e9ba4068544db2c9064457aaa8e83bad5e4af600bede248bf0780d11f SHA512 36264119d68569565a7b1222c4b0ca90128d121f032b388f27204ceaa9c964901f35be25584e1553b1a7613aad01d11766983ae245860df09444eb2f8ac913fc
-EBUILD userspace-rcu-0.10.1.ebuild 674 BLAKE2B ea32ac5800156b5c1d4a56f2fa457a0b5c7b489983ab9db59b4a5d0ee470542ecae24302be7e1c43f7d265c3cbbd835862ae29a240725fdadcfdb38406a19224 SHA512 b0d254f6ecec5252812a41a9010e4f5cace84a6e662c608ada5b81ea8417e121927817ce96569f72d36278d0f65b37ecc938b6ed72f7c4ee0efc9b645a6544c8
+EBUILD userspace-rcu-0.10.1.ebuild 673 BLAKE2B 2524941a62c95d2511da008f6ee0ff4751e49e8321c93c2f24399f888e3d786ddb81251d76c89b75ecd119012626f81a784d5e3d29d34cf499f1b86af9b4ace9 SHA512 8dd0e48b45c781297f9bf37ec36677c8c995e623ade8c36a45a66b3043de5dd7c970919b8212efb65107cb87a23270d7eb09c3fc48248299cc74f6742517a425
 EBUILD userspace-rcu-0.10.2.ebuild 680 BLAKE2B 45f02f09faae2fd0a10eaf5bbe8b385e4bebe2af15e9aa9a9a65d4e7b7e25f13af41d150c363823a2d9914cc555b863f4547a457114afb931fc285ba619843f0 SHA512 e0d4eedaa1420a5e7d4a4f5c3cfefb28c47a8789c4a48711d541cd8204fce7958cca7de85599f25427cfeae8109d604977fd484bf5921a0f534de863f00edf2a
 EBUILD userspace-rcu-0.9.1.ebuild 740 BLAKE2B b14e6a5df0fe84b42d932333de46b1c370ee594ddc37e33805ef00e6af75a42fc72df610ea083dd5b818e7b77d8177b86bab602f864e279fabbd99356943de77 SHA512 b12eff3a56fefb0fb9c1a181b47f25eb1278d171f919c1a0dae2f788f95437eb418d8ddb64cedba9e7b95b81f4ae9ea8b8b125fd07f816a2511871f692a69322
 EBUILD userspace-rcu-0.9.2.ebuild 746 BLAKE2B e47e73ff204d61dd97063ce7c00df11750fe27406ca7c3166d947e55c094eee04142658917841bca424b4d6614fd33694f932f16876182f963c53a50f251d1e3 SHA512 ff838cf89d63324f8a9741bf5064abe2fd814b5758930046cfec333ccbaad16fd0d682371978ea6382ae84772278409fa8e7c0822de379503eee852a828dc8a4
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
index cefca5c03e1f..38ef33a68087 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="static-libs regression-test test"
 
 DEPEND="test? ( sys-process/time )"
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 5d02ba99f1f6..a1c227f38ebc 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,5 +1,5 @@
 DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8
 DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
 EBUILD vala-common-0.40.14.ebuild 2517 BLAKE2B c39aa1eaadca30724db5ffc17c26a2df6f932b3aec82273c0cf8dff0ea7407ba6673d403f33040d4c8b361385a71be0e2c39c02b119b67b3f93801b2f8be890a SHA512 5acbad84f92b78270ce6dca6474bfdaa5b9df36f23eac4f16f715ceb75933b45783178d9b4a63a546255e0e899090954f6b9fed7d3b31ee33c42584c7658faca
-EBUILD vala-common-0.42.7.ebuild 2520 BLAKE2B 2e1710b17bd39d5445db2bf168feacd6a8fdc0e13d9b33d6aaeb0529ec0b58559104390cf5bffb7e8afa17013977777d4d89091277ac100b3524af4b41887dd8 SHA512 f8d5e485b20429929bab5ad2fe5948908d72351ca6c96b61983ea3d9a1df076930987ec0db124b9bdbe2cb2b134d1e7b4d650cf2158f2e4c79ca55726fa02746
+EBUILD vala-common-0.42.7.ebuild 2519 BLAKE2B 5d93ea1f5ca2bf8ed9eaec641c6f3b7cea571d202936e795faf69b137ed9af69a8381ace8c1b12827ca33c0c07b004abefade2ced3762e190496ccc89cb380d7 SHA512 faddf738ae5cedb6c1208def12167e0f0221e4e9e67f34f1a4e4af3242f13f493e6b53513db153fa1f5477523abd26fa7eda555ed415f61a71e44df3f6294130
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
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 7a9c764c47d3..b70e8f8cf8e4 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 1eb1fe9a4cc0..e605b7a1e078 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -9,7 +9,7 @@ DIST xapian-core-1.4.9.tar.xz 2880024 BLAKE2B 25272128fbbd7cb23dab92c87be03fee8d
 EBUILD xapian-1.2.24.ebuild 1580 BLAKE2B 381e09ce792274d6142ee236e0f1422a7bcb4947cb9efffb3b2e65bb44f5f879d554f871551b02e5482549eebff8b094f242b0399482eed984db6d8aa6b87ed1 SHA512 b9db357b0eeb6d2bfedd9641df740aeba2d435d1618aa6f46dbb2801cf69136d308b5c0c5a41bcfcbdc10fdd09dafa15af1dfac4543ee22de19908b21bb24cb8
 EBUILD xapian-1.2.25.ebuild 1849 BLAKE2B d1b5198ecb2c78befcf92017ffc74e2626a4575f0464ea22612543ea0fbdf2024aed6c24c4e741f9f97d9f70f1f4cc83607f1a1a549da056f77c4a271f86fa28 SHA512 abd485682ed6071849ce5b28e9235acf2bf7cb017cda6668ec1409581ca1e6dc528c516087d3ccc6b2757dd2cae700c474e6e65e9fc74e7fe40c634eb94abf81
 EBUILD xapian-1.4.10.ebuild 1944 BLAKE2B 91d5dd19c21679b7b68691f90981c330be0b81f65887c90b0e781ee3943622067a91e850910256378bc47b832589be92115163f65d6ae64f5428a024b9c7d1da SHA512 47329f8de89aa602baeae23980ed3d3d7a23532c1102d5fc25b43e38ebe2f5029ad775adffc99759ceffb403b112809bea2a76c0e16556179b704b62b404b43a
-EBUILD xapian-1.4.11.ebuild 1910 BLAKE2B 0d5fac58808ad36c8abe25fdf09cf5879fe90312fe2ed04549060fa0f71914f24c18ca5846fa4c8ba2a3e9378a8f7b003bb82ce6fb97c7149b2e5334d3a77513 SHA512 87a01a8b23e26ed0a780293090ae5e08d4948814114ced9b41443b6b4b6a5b22b0688cdf8381b659308ab2b8fd68cfbd33ad154fa733ee0b2b844334d51f17eb
+EBUILD xapian-1.4.11.ebuild 1909 BLAKE2B 76e2704a42e30c3c35655d8cebe5bf928922a8e4186f1c95ce89b3c061417d1837a37b36bcb5a373779f9a4443198afe20a75ebf008df1a149784ab0026511f9 SHA512 b7957c875af0e2e3e046190f8dff93bebc0cbd1838965368f79b7c5c565a0193ff16be377adc91f99e3d935ec3328dfb755756f3ff83a1f9fc618c91855cdef5
 EBUILD xapian-1.4.5.ebuild 1936 BLAKE2B 76f950ad9162610700da01eff6d6f33ab694d1e09b55b08592912323d70f67d09cdec09bd4f1c8316761c4b31c40e978eef683222cfbea90cb21b41cb9444f8e SHA512 6add7e80ac66f69ebbffd464d782ceefe23919faec529dc33fe53fbdc3b9cd17bfaa5be8b8580f2046601654fdd17e611d4395e262ef4a4cfe97aab85dc5844c
 EBUILD xapian-1.4.7.ebuild 1937 BLAKE2B 64996a418dcf2969c826deadfdf8b62474189cf1c32c9c017c1baa1d2ba2b18fdbe0175ff4f7d92347a21e78d4557dec0ac28abb50f7e432486aa52ff9373f22 SHA512 df6f4147fda42057fa70e9d144055cc143472657e5f5767bb2a27aacd95f09cec3e321c75501fe0cbea568141e7222d58990f85ac11141995045cc64aa065a11
 EBUILD xapian-1.4.8.ebuild 1944 BLAKE2B 6cc1549770b5283f153665c3b015264cd5ca3f6a173f3bddc509c09f14735293fa39ad4da9e761e92708cfd54c5dbadb3b056f4327d646b15af074e3757e50af SHA512 d33a78e9db80b47f09c372ed1141db6cda833d333d978af14abcd0026918217e8b7deccf42e286322a25aae04c5427e33595b93f38ae6e2787f09b8bc62a923e
diff --git a/dev-libs/xapian/xapian-1.4.11.ebuild b/dev-libs/xapian/xapian-1.4.11.ebuild
index 4bca5359538b..f0b969186af2 100644
--- a/dev-libs/xapian/xapian-1.4.11.ebuild
+++ b/dev-libs/xapian/xapian-1.4.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-solaris"
 IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +inmemory +remote"
 
 DEPEND="sys-libs/zlib"
author	V3n3RiX <venerix@redcorelinux.org>	2019-07-10 23:40:16 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-07-10 23:40:16 +0100
commit	51af5f0eb4cddbe6aa7953717873691d77aae9ff (patch)
tree	1541525274162b033ebbc3ed38abaf335fbbd49a /dev-libs
parent	7014a5a3ea0feffab9701fdd6b64cc7667a985af (diff)