gentoo resync : 18.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-18 10:15:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-18 10:15:03 +0000
commit: b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch)
tree: 16fe44748708acacd909d4e2e160a09a7f6d936a /dev-libs
parent: 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff)
132 files changed, 612 insertions, 2477 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 094fe2b29129..fa0d90849fa1 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index d227d1520897..d12216b264f9 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,7 +1,5 @@
 DIST AppStream-0.12.7.tar.xz 1958948 BLAKE2B 51a70395e4801ceeb3e97ac081f4c45be242cca14728f8efc5eec0d4b3cfa4cc9fab9ef7429c18e9bbb0dedb693a847258be1b11491155658a6ffa2a28358e35 SHA512 53ca7ebde3fcd345a895527da2ac5d829a09f25d28836a867b500282fba3465bde657cd75a4030cb831022f7a0d9f50aadb36078d62924e4d0edad6bfe3c5561
-DIST AppStream-0.12.8.tar.xz 1992072 BLAKE2B ae1d6801119798f360b7eae36b0c46b0511a93ae00adb2437e7dda830d5293c622b04475664055bee392dc824f398d42c6a0a4000392f82fc8bdfc828fa0295e SHA512 4354ef1840d919102647feffc38687f508b14fe9c047c868448347d888aa821dd8a4d25787a2ffb55247f8e9e20e9e03ba330ad74ad61d476be0c414c04a7c30
 DIST AppStream-0.12.9.tar.xz 2023312 BLAKE2B aa5de7936909be54401e4df80363c9b59ad60dc29b3d02ef1ed8203dd480dfb4222816cde5ea6e469039448684142afc028275e619665f15cef99af6745d80e8 SHA512 af3d5e7885ee09fb6ef9ea0a5c2386141736166ce42912e618f1ee04f2b28866b27c7c5e326221574eb78933b32de8db9f76023bf54e528aded1607e5130992e
 EBUILD appstream-0.12.7.ebuild 1592 BLAKE2B 005c91236cae8d6abdc3bcc8d88fb35b51f8fada8ba4d34b5bc669765da015789019f1a04c5bbc1ac5184a8fdc3954b565a9bf17bc11ef5c26f2cb810d7296ee SHA512 a6c840fee66ab6eb0273810497de22e3812c5d309dc863938f1308735c0202f296a3ed36626806f92084422f4bfb7033f604259c8bf431c4c2405a7cacdd02ad
-EBUILD appstream-0.12.8.ebuild 1595 BLAKE2B 34b1c48910d151e7a603efbf9b95aa96a54c6d676824a11a01a38ada5e81bbf518393fb51b56a29da8c1cce0cbbd01824fd2e0679bf0595d18998ecebf69f510 SHA512 0f537725005bee2b72e28ae0ea29741f388689199406652ee1eec2168a26e557c010266d2390262c0cb8c1d5ac3b990abd76bbc20cd42b2e70efef194090cd19
 EBUILD appstream-0.12.9.ebuild 1624 BLAKE2B 601740e5e85b497741afdf50dea87406aaf3ace959e0e3e5926ec9c73211ea756a48f2cfee0455aaa3a4fc7e045486d3c5525ea7ce21e9716b4866177223dbb2 SHA512 0baa93cc9c0605400add5633e9f413d77e0e0e31fb6029df538e6ae4bd39788e5de610b1acdc56f6c4d3624c83aec26dc62d1facc8e840495b8f9c9e1509251c
 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.12.8.ebuild b/dev-libs/appstream/appstream-0.12.8.ebuild
deleted file mode 100644
index cbbde57065d8..000000000000
--- a/dev-libs/appstream/appstream-0.12.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ximion/${PN}"
-else
-	MY_PN="AppStream"
-	SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
-HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-# check as_api_level
-SLOT="0/4"
-IUSE="apt +introspection qt5 test"
-
-BDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=dev-util/meson-0.42.0
-	>=sys-devel/gettext-0.19.8
-	test? (
-		dev-qt/linguist-tools:5
-		qt5? ( dev-qt/qttest:5 )
-	)
-"
-DEPEND="
-	dev-db/lmdb:=
-	>=dev-libs/glib-2.54:2
-	dev-libs/libxml2:2
-	dev-libs/libyaml
-	dev-libs/snowball-stemmer
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-	qt5? ( dev-qt/qtcore:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
-	if ! use test; then
-		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
-	fi
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local emesonargs=(
-		-Dapidocs=false
-		-Ddocs=false
-		-Dmaintainer=false
-		-Dstemming=true
-		-Dvapi=false
-		-Dapt-support=$(usex apt true false)
-		-Dgir=$(usex introspection true false)
-		-Dqt=$(usex qt5 true false)
-	)
-
-	meson_src_configure
-}
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index e295f26fa326..b2e9811f461e 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -1,14 +1,3 @@
-AUX boehm-gc-7.2e-automake-1.13.patch 372 BLAKE2B 5e385b21e4868cee8928d5137c7eb6a5f9acfd20883ea116bc2fe974a35ea4d62866573dc414beec72439d8a1e128b9a4d3e9d9b358c79ebab7ed0f0ec3c3f2b SHA512 19efd52b91b985b31e190b77e5370fb510ad582a54868bb1a7fe54ae57e0625df113ad059a6d636a10f314624137704af8e193460b55c8ba422b9255aadae020
-DIST gc-7.2e.tar.gz 1291186 BLAKE2B 8c320aac2d9deb8fcca2e93622aa122f96c4152d2b18bd284be32d5a041f357beaf8f3142548685fe167642070471862d04c0e6c3ba1c99bc9c05e63d6854005 SHA512 80d1d50e38714b4f198743cd8cd5ab80a35cfbb7f5f9d66c89f40319604e989125870f010d4499876978594a5823d7b61213224a68da8664b9e4f8e14076c999
-DIST gc-7.4.2.tar.gz 1082597 BLAKE2B 5ca30e786a995941fdf2d803d201e7263bdd7d9974a71f672ff259c75ee36dc5d499a614334e570100ddbcb25fd06176f48429b64bad95fb218c35ba584ad4c6 SHA512 2e21516addf268780641ee55c0cb3ecc2d96fa963faffee5beadcade9c6bf1ee49ee1a75b076b5d49ddde7c839fb94f4c3623ca8412d14c2a5bf6ca30d424a72
-DIST gc-7.6.10.tar.gz 1143650 BLAKE2B 5dce84de2e842c98dc552b4a6fc28311e241f419a792523be2e5cb0f7d5b34a57608f8c40e1d85cf06fb3f9c6212855438a0d20c23e2b2d9ba37485d91d78a3e SHA512 6952ff38ed39203c8ff9aae516d81cf5210f3f17fac030325ba58b89c266d2d6ffa281b996c481b9d821638a0334da68f00c15dc4774759ff1f7b57b4678f08f
-DIST gc-7.6.4.tar.gz 1120784 BLAKE2B e7cad27d2144fd37aebad44093e1a0814fe9a1cc887701e485681cdd01f3ea4477150697d535d0873a1255abff0765084119096c7ed61d3caeda439cf2a7644f SHA512 2c85be3e24b85732b3dc6f08fe98cf1a82b6fb2a22ec73090f80920721c737ef92cee8f0cd7ea7228d686005d164e7da54ce3907c3a1ba5eefa43355a472085e
-DIST gc-8.0.2.tar.gz 1159207 BLAKE2B f3dfcecbc9ba59c2abac868278eb6fdca4bda46a5303393a8fb63717f01bc19fa007b6530a536c32600db30f3a45d8d5558fe72adefecd9b97075dfadb3eddc2 SHA512 b1401abb2e82b143b9a2a9013f5b2efa4015b256e7ea8ef2c897ef3c0d2d41fc893413bf6a49efc1845018e8ab823adb485fb3358eb47715982259ace9ffd7c6
 DIST gc-8.0.4.tar.gz 1160528 BLAKE2B ec42378c964fc573e53f6f58aa22fa63a0b421c91b81336acfeb2e2afdb5c89514edace3a9500699e13ff1cadc4205ea245af4f0dfa5e439ed9b78cabf6058f7 SHA512 57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e
-EBUILD boehm-gc-7.2e.ebuild 1323 BLAKE2B 561c204460337982755efa5330e5065630f610f0ccf894abb71f6b3da958137c39a178cb5365fc8e1b320497923ed95f6b7f10bc4f65fba5272d1f70023cc89a SHA512 115b98f3abffd1d0363f1c94ec3003e503c6b802b1679937c7184d2ce4ed34fe01d15f28d093a57c21e412fd501de5c9dc1ba9abc5c573150d1b1a8f98e9f929
-EBUILD boehm-gc-7.4.2.ebuild 1238 BLAKE2B db76c94532ff49fed18517ab43363bfde8e267daaf6b98ebb3205a5c9bffd1aefba3a5bead362577a9ab3d97a305b2ca0e8df23dd8bdc3867f4d3435b735cd5f SHA512 5cc6d74756e7c9c9f1984b73dc3627487226e1398399376e295480e9432abb9c13feb08ad89db6ec4995c7df62e1d7c9979240a6a0973a9a6c522506838e1056
-EBUILD boehm-gc-7.6.10.ebuild 1360 BLAKE2B 4ecb71e1e01a277cc5aa95c16394037946f1dab46f8818bb9c168d57b4d5a0e37a4ac7c467b07dc9eccd1bcb6cfee3a38be1e92850d02bc84d790574b3c7da87 SHA512 38ab835f7d2e2701a4023425ce60d5f8d8816935c9ccf8da1d3b57c609d9dbe03dbaa68e3e5cfabf5e1d0ec28406f609fd54dc0135d967c004d53bee93a1576d
-EBUILD boehm-gc-7.6.4.ebuild 1349 BLAKE2B ce0f3df2c93471bf8c109295efbd4054544faf6717a6d71ce1049a8d0c1e6ab8d4e5928805089834042b41aa86b9cc9fb4f1b9989583d2baa08eca398eae24dc SHA512 7f62ad8810224a35d6eb31b2c435ab5f3fa7e491f12ca2e402781e32fc51f2f37211db7905b442e89deb261ee97d53aa002f394255a37dac4acf5b9a3c86bac2
-EBUILD boehm-gc-8.0.2.ebuild 1358 BLAKE2B 5e67c09c36170c6291e27005ddf8807f3d4ae69322c4c294b02ebd94d7fe115a37f6a0c810a2589eed56c21d49083f7a3f5e580b63ba17a36f217d4f7f71574c SHA512 05f3a3d8ae22d05d4238475c3c019a4ab43d40a63cac0f4115b4c85eadfc0504b56e53cd94971479b462ececa8755dd083bde96c43af8eb01a00e2fa240023db
 EBUILD boehm-gc-8.0.4.ebuild 1382 BLAKE2B 9cca475a48372734a32ea4eb8a9bdb17d1d6aed7f40570620f1927f9fd881d8b334eb19174b18506f804d055ac837c8d225c0d93c7d21b5b19d81023cf7e59b7 SHA512 7bf5ffb109e04af137923570a013763a841fd2ce69a39f2e63d4c4fd954bb7f4bdb64824772b726eb05b919ec2f4d90b116d355da96abd159c98af19aaa17399
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/boehm-gc/boehm-gc-7.2e.ebuild b/dev-libs/boehm-gc/boehm-gc-7.2e.ebuild
deleted file mode 100644
index 59ec2bd7d212..000000000000
--- a/dev-libs/boehm-gc/boehm-gc-7.2e.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-MY_P="gc-${PV/_/}"
-
-DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
-HOMEPAGE="http://www.hboehm.info/gc/"
-SRC_URI="http://www.hboehm.info/gc/gc_source/${MY_P}.tar.gz"
-
-LICENSE="boehm-gc"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cxx static-libs threads"
-
-DEPEND=">=dev-libs/libatomic_ops-7.2
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P/e}"
-
-src_prepare() {
-	rm -r libatomic_ops || die
-
-	epatch "${FILESDIR}"/${P}-automake-1.13.patch
-	eautoreconf
-}
-
-src_configure() {
-	local config=(
-		--with-libatomic-ops
-		$(use_enable cxx cplusplus)
-		$(use_enable static-libs static)
-		$(use threads || echo --disable-threads)
-	)
-	econf "${config[@]}"
-}
-
-src_install() {
-	default
-
-	rm -r "${ED}"/usr/share/gc || die
-
-	# dist_noinst_HEADERS
-	insinto /usr/include/gc
-	doins include/{cord.h,ec.h,javaxfc.h}
-	insinto /usr/include/gc/private
-	doins include/private/*.h
-
-	dodoc README.QUICK doc/README{.environment,.linux,.macros} doc/barrett_diagram
-	dohtml doc/*.html
-	newman doc/gc.man GC_malloc.1
-
-	use static-libs || prune_libtool_files #457872
-}
diff --git a/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild b/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
deleted file mode 100644
index f3b4936c05cf..000000000000
--- a/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils libtool
-
-MY_P="gc-${PV}"
-
-DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
-HOMEPAGE="http://www.hboehm.info/gc/"
-SRC_URI="http://www.hboehm.info/gc/gc_source/${MY_P}.tar.gz"
-
-LICENSE="boehm-gc"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cxx static-libs threads"
-
-DEPEND=">=dev-libs/libatomic_ops-7.4
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	elibtoolize #594754
-}
-
-src_configure() {
-	local config=(
-		--with-libatomic-ops
-		$(use_enable cxx cplusplus)
-		$(use_enable static-libs static)
-		$(use threads || echo --disable-threads)
-	)
-	econf "${config[@]}"
-}
-
-src_compile() {
-	# Workaround build errors. #574566
-	use ia64 && emake src/ia64_save_regs_in_stack.lo
-	use sparc && emake src/sparc_mach_dep.lo
-	default
-}
-
-src_install() {
-	default
-	use static-libs || prune_libtool_files
-
-	rm -r "${ED}"/usr/share/gc || die
-	dodoc README.QUICK doc/README{.environment,.linux,.macros}
-	dohtml doc/*.html
-	newman doc/gc.man GC_malloc.1
-}
diff --git a/dev-libs/boehm-gc/boehm-gc-7.6.10.ebuild b/dev-libs/boehm-gc/boehm-gc-7.6.10.ebuild
deleted file mode 100644
index 0da64af2b440..000000000000
--- a/dev-libs/boehm-gc/boehm-gc-7.6.10.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib-minimal libtool
-
-MY_P="gc-${PV}"
-
-DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
-HOMEPAGE="http://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/"
-SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="boehm-gc"
-# SONAME: libgc.so.1 libgccpp.so.1
-# We've been using subslot 0 for these instead of "1.1".
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cxx static-libs +threads"
-
-DEPEND="
-	>=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	elibtoolize #594754
-}
-
-multilib_src_configure() {
-	local config=(
-		--disable-docs
-		--with-libatomic-ops
-		$(use_enable cxx cplusplus)
-		$(use_enable static-libs static)
-		$(use threads || echo --disable-threads)
-	)
-
-	ECONF_SOURCE=${S} econf "${config[@]}"
-}
-
-multilib_src_install_all() {
-	local HTML_DOCS=( doc/*.html )
-	einstalldocs
-	dodoc doc/README{.environment,.linux,.macros}
-
-	# package provides .pc files
-	find "${ED}" -name '*.la' -delete || die
-
-	newman doc/gc.man GC_malloc.1
-}
diff --git a/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild b/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild
deleted file mode 100644
index 33dcfa26fb12..000000000000
--- a/dev-libs/boehm-gc/boehm-gc-7.6.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib-minimal libtool
-
-MY_P="gc-${PV}"
-
-DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
-HOMEPAGE="http://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/"
-SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="boehm-gc"
-# SONAME: libgc.so.1 libgccpp.so.1
-# We've been using subslot 0 for these instead of "1.1".
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cxx static-libs +threads"
-
-DEPEND="
-	>=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	elibtoolize #594754
-}
-
-multilib_src_configure() {
-	local config=(
-		--disable-docs
-		--with-libatomic-ops
-		$(use_enable cxx cplusplus)
-		$(use_enable static-libs static)
-		$(use threads || echo --disable-threads)
-	)
-
-	ECONF_SOURCE=${S} econf "${config[@]}"
-}
-
-multilib_src_install_all() {
-	local HTML_DOCS=( doc/*.html )
-	einstalldocs
-	dodoc doc/README{.environment,.linux,.macros}
-
-	# package provides .pc files
-	find "${ED}" -name '*.la' -delete || die
-
-	newman doc/gc.man GC_malloc.1
-}
diff --git a/dev-libs/boehm-gc/boehm-gc-8.0.2.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.2.ebuild
deleted file mode 100644
index d76e217151d7..000000000000
--- a/dev-libs/boehm-gc/boehm-gc-8.0.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib-minimal libtool
-
-MY_P="gc-${PV}"
-
-DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
-HOMEPAGE="http://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/"
-SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="boehm-gc"
-# SONAME: libgc.so.1 libgccpp.so.1
-# We've been using subslot 0 for these instead of "1.1".
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cxx static-libs +threads"
-
-DEPEND="
-	>=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	elibtoolize #594754
-}
-
-multilib_src_configure() {
-	local config=(
-		--disable-docs
-		--with-libatomic-ops
-		$(use_enable cxx cplusplus)
-		$(use_enable static-libs static)
-		$(use threads || echo --disable-threads)
-	)
-
-	ECONF_SOURCE=${S} econf "${config[@]}"
-}
-
-multilib_src_install_all() {
-	local HTML_DOCS=( doc/*.md )
-	einstalldocs
-	dodoc doc/README{.environment,.linux,.macros}
-
-	# package provides .pc files
-	find "${ED}" -name '*.la' -delete || die
-
-	newman doc/gc.man GC_malloc.1
-}
diff --git a/dev-libs/boehm-gc/files/boehm-gc-7.2e-automake-1.13.patch b/dev-libs/boehm-gc/files/boehm-gc-7.2e-automake-1.13.patch
deleted file mode 100644
index e987c42a5852..000000000000
--- a/dev-libs/boehm-gc/files/boehm-gc-7.2e-automake-1.13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ee6693d..d258252 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -26,7 +26,7 @@ AC_PREREQ(2.64)
- AC_REVISION($Revision: 1.1 $)
- GC_SET_VERSION
- AM_INIT_AUTOMAKE([foreign dist-bzip2 nostdinc])
--AM_CONFIG_HEADER([include/private/config.h])
-+AC_CONFIG_HEADER([include/private/config.h])
- AM_MAINTAINER_MODE
- 
- AC_SUBST(PACKAGE)
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index b296452391cb..9872952a1f52 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -8,5 +8,5 @@ DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c2
 DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
 EBUILD boost-1.65.0.ebuild 12413 BLAKE2B 46cecac07c7772137d690212714fa54f29b1afd623ca17270565ac75960408e54185f1b8e70883397084e761cfbaeabf2b5d83879d2e5f81f5693101a911a896 SHA512 d1d91b697c7027587dd90f0ecdc07e0c5af1a3ab922fc33caa7a2850f597e4cf4c67603dd8ba651c0afc02ef09451ee2417c869c64ea16ccbced9151380acf19
 EBUILD boost-1.70.0.ebuild 10140 BLAKE2B 3248ad7f134f001c8a626d0062ce39c72ab00ea451d57c4d78c82f2994a490df20798ebedff5d8e072999abbf5ca7b93b8340f1be9ae411072434720440f7e33 SHA512 8934c3d1ec1f4e35d58779e440db7da9403fe57a49c2bbb3bb87b6bd0f5d2c5f08e3138e96c14dfa99b183f9e67c5e35b87db89b8879b3b243e5112172f4ff2a
-EBUILD boost-1.71.0.ebuild 10629 BLAKE2B 652eff310a718fbe573126b7266437166d335e9966f0c6ee3b5432e4e376871b65597356585fe8f88b9922e4507e96a3f2778a65aea3e28784d81e14a0b90e79 SHA512 50c3e617bb34ffd62c5950823c045e2ea3262aeca58298f9efcb13277db37761b20fd850524393be4bc783a12d424f9c7f22b44e3410252318670b1b365b0327
+EBUILD boost-1.71.0.ebuild 10627 BLAKE2B 20f1f871b900e36f86e66eb22f99de57b44d6fe8b87a06df4203353b68eb5ddd43d38a4db2734dbd3d01100e195c2e6679d559688ffddac1dd87a9c22fe65a50 SHA512 6b5407cb47c297cd75aa069b3c54d2d57de17a04b95537b65d8afe0f9581e7ff65907259797f2b5346b3d95ece976789b1c7eace7b7179b0399c932feeddf034
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.71.0.ebuild b/dev-libs/boost/boost-1.71.0.ebuild
index 0b088001803d..af9362277197 100644
--- a/dev-libs/boost/boost-1.71.0.ebuild
+++ b/dev-libs/boost/boost-1.71.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
diff --git a/dev-libs/btparser/Manifest b/dev-libs/btparser/Manifest
index ccbdf4299da6..00bce697e1bc 100644
--- a/dev-libs/btparser/Manifest
+++ b/dev-libs/btparser/Manifest
@@ -1,3 +1,3 @@
 DIST btparser-0.26.tar.gz 564940 BLAKE2B 979b530764d0ebb413c670c44aeb05bc3ac6dfbce54d35ff62ca851aa671a58aa223972ad3a6880e0d8f2e9c849ff60ee3adbc35cfae0f996aa085e771383375 SHA512 c5520f0aae3217482b97eac7c9cc5ae9be596df936ce958d84cb8e46a67c4b97a9184f9cd4bcab185d35c64f5ea98acd6cfb6f98512b9fa492a3aa9931d6668c
-EBUILD btparser-0.26.ebuild 885 BLAKE2B df2e1060db6b76036b423f90e2f452cfd9bc6449212a57c736f8ec68e75fd34dd13890c0250af8a565bfa16a046b8fdfaa7132e248dd751bceb06851faa2a37c SHA512 70402eee95a1ef0da66e1b7c8963645351690b073acba904e6bc2c85f0c63c06ce0454f71684e8f280787eb4d06f3ae8f7be5ba22425576caf1f9bbeae9eb577
+EBUILD btparser-0.26.ebuild 880 BLAKE2B fa0287ce4182a32bb640f270ebe2348f68f22459d02c1132c0e79553ab059f0679a7db8ce954c7e7f602bed76c7154d8143e975bae47d9ee23dca00b43b98174 SHA512 b5d6fe52819d2f629c696d82bcb6a322ec2a442eb2074c5bc7444760f25106c7b27995e7c0846f98727069818ba11e723ea17cb581738180c7d4a538c481f19d
 MISC metadata.xml 341 BLAKE2B f3a4f723dbe9bd67b919dc3dbbae6ec4390122123dcd9441727a0697eefc03bd8805ddde5e5ee4175b7c06f275c83142f4dedb6c94492d28562c56f31cbd4df8 SHA512 ba348a6b7ada0d823316f48c43d8a94e081c099a18ea2488905ee2b27c8a8106639ce15ce83749a5534259c9245c118e19aa32a9fc6177e8012bf9e21f9124a3
diff --git a/dev-libs/btparser/btparser-0.26.ebuild b/dev-libs/btparser/btparser-0.26.ebuild
index 73a04ca15ff5..797e437f244b 100644
--- a/dev-libs/btparser/btparser-0.26.ebuild
+++ b/dev-libs/btparser/btparser-0.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit autotools gnome2 python-single-r1
 
 DESCRIPTION="Parser and analyzer for backtraces produced by GDB"
-HOMEPAGE="https://fedorahosted.org/btparser/"
+HOMEPAGE="https://github.com/abrt/btparser"
 SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/dev-libs/busybee/Manifest b/dev-libs/busybee/Manifest
index 62fd918cf4c9..e5db569fdb27 100644
--- a/dev-libs/busybee/Manifest
+++ b/dev-libs/busybee/Manifest
@@ -1,7 +1,3 @@
-DIST busybee-0.5.2.tar.gz 359617 BLAKE2B 26f5daebb2d5686de8ca942e127ee0523f9f6c7bfbcd4f92f5597feefc5131180ad603442f0a531bae77b36d70d6edc31fdaa9ab17b8d4925bfe1ef6e0b794f7 SHA512 f6eba1e6d9f78dbb048214766105829eae53d060d247ac316e931ac887454f4fcf2217c01b4b6d61108de8d837d0a6861951aeda5f8a6a93de6b145247aaeac8
-DIST busybee-0.6.0.tar.gz 364241 BLAKE2B 31e4e6b479f6d230e453a7309a6c2f4e7e2480b7f06b9bd542ac004f98353a516ef4b8786bc108f33734f2317e32aa713347ee39638debc85904791d86137c9a SHA512 3c4376d008ae5028773e43bfc9dcf651ed0ed0134370ae763799af0a91e693ab13384915d655a342009520ce346615b0b006b1cbc0cd30b898137bb2567c87af
 DIST busybee-0.7.0.tar.gz 367175 BLAKE2B 29dc5c021dbbc91497d855b26adbeb6464999a92ac9d13af689ec09e76f9779f0ec8d36b210e432eb77ee6eec125f0bfbc7eb0b87f085969a422a2a7e2286002 SHA512 9bf868b6d02b0286d89ff371964e7d32dd373049c1437459b79f0789741421ebb2810d9d58c51d86225cc190d6e23d57c816d079298b0bcfa1e4da815bda2474
-EBUILD busybee-0.5.2.ebuild 398 BLAKE2B fe83a4741a0091d5c8a329a3968bd5192e95c05fb2b6ea9bd0f4dad531d38c32ce746533309137e0df13df33b37baaf8a1edf248d380cf1ee1e9d6d7db207e12 SHA512 ae4c0caf54f82c3352894ffd3d657f72b063322e285fbbb86949a6b2d46262e59f9d763e0312e32827994e5630273f6bc66a15d38c0516aa4cec86a04581eb22
-EBUILD busybee-0.6.0.ebuild 398 BLAKE2B fe83a4741a0091d5c8a329a3968bd5192e95c05fb2b6ea9bd0f4dad531d38c32ce746533309137e0df13df33b37baaf8a1edf248d380cf1ee1e9d6d7db207e12 SHA512 ae4c0caf54f82c3352894ffd3d657f72b063322e285fbbb86949a6b2d46262e59f9d763e0312e32827994e5630273f6bc66a15d38c0516aa4cec86a04581eb22
-EBUILD busybee-0.7.0.ebuild 395 BLAKE2B 014525647070094183ccf112426a6a7a59028c8a657e5380282fa0dc66dbb64aa3852e0f0f1f19e7393563d740fa2feb39c4af27f1c45373bbac41f884c94431 SHA512 03913dc5821a69fec9a93547b68bed6ce212c6e4621716712eab13ea720bea1855c9383c3bba1fb57f59d7edde78799e342ac76d110168e6175b8598213c19fa
+EBUILD busybee-0.7.0.ebuild 392 BLAKE2B 3628f9d51a9bb1466e239f3fb6b17eec80c10c42a06f17c49644fb95f0ef242db63557a35dd97bcf41e78acabee0d8d1222c8622e6a435abbde55bc761206de2 SHA512 055ddd2181cd75cd661fd543149df943df867f4ac2041ee99324b04aa0d3f69562aea61a954afc7c80a3df652950734c262ff683bcedb83b62e8ba063cb21cd1
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/busybee/busybee-0.5.2.ebuild b/dev-libs/busybee/busybee-0.5.2.ebuild
deleted file mode 100644
index 8fa8fb05ff36..000000000000
--- a/dev-libs/busybee/busybee-0.5.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A messaging abstraction on top of TCP sockets used in HyperDex"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-${PV}
-	>=dev-libs/libe-${PV}"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/busybee/busybee-0.6.0.ebuild b/dev-libs/busybee/busybee-0.6.0.ebuild
deleted file mode 100644
index 8fa8fb05ff36..000000000000
--- a/dev-libs/busybee/busybee-0.6.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A messaging abstraction on top of TCP sockets used in HyperDex"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-${PV}
-	>=dev-libs/libe-${PV}"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/busybee/busybee-0.7.0.ebuild b/dev-libs/busybee/busybee-0.7.0.ebuild
index ee89822abdde..165343bc960f 100644
--- a/dev-libs/busybee/busybee-0.7.0.ebuild
+++ b/dev-libs/busybee/busybee-0.7.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="A messaging abstraction on top of TCP sockets used in HyperDex"
-
 HOMEPAGE="http://hyperdex.org"
 SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 78d1bcd9ebc8..17a87b6b429e 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -4,5 +4,5 @@ DIST check-0.12.0-github.tar.gz 281127 BLAKE2B d7dc89c10022594a37e9a4bc6b9fe1e8f
 DIST check-0.13.0.tar.gz 301386 BLAKE2B fbc79ad9f0bacd7c7461cde631a499d92e004233b5d35ba35cb0791195362e12fc21ca059e2019280cbf256215528af239de988755e0183cb6e332a5b145624e SHA512 7943021c5bc3b5ca7bc552f6fe1287e384724d69e5bb128d58256692e810b194e506fc1b65ea4fed27d065e2176e7371483e918beb48125abfe3b6f1ca68eb8f
 EBUILD check-0.10.0-r1.ebuild 1792 BLAKE2B 258840e8effd0212bda0d7851ebaf09b8685a479566e8cbb50660b00f133b4b5d129db93e4022297757bba8ff2486353e4767d6279c430bf2f9d0cbc864bb359 SHA512 b058e308c58f2988a63d0b7e4fa0c3c1cac7cb34afbaab74d1b032eb0512420bd0330c20df527e23b5211bf14a1c5212f3e2bb79feeeef89952ce430f3af0dc0
 EBUILD check-0.12.0.ebuild 1783 BLAKE2B da5d9b52a93cb886150e906f778578aaddf923467b4275bb38eb94388fd01b55a16d02ce43309259a349616b1c200b2c2708932a05145cf652ce5e94bd518cf3 SHA512 03b6274c56da34948c52843cadbb610e5eef33a67a6da2203c037d71e87719ffdd9f9f9b76098822b494617689387955b2a1c3784a417dc523a15746e846c92b
-EBUILD check-0.13.0.ebuild 1481 BLAKE2B bd9c08fe2754ebb540f40caf81be0b93f0a23f692150a2974ae34b2129ff1bf24850b53f4b8755c692639d4851df568e2594fb7b154539c0505394d072e565d6 SHA512 d7490e59df3204aa2b7247412632ff7b13da78ea8c456795b149bdb40af2cb434a1f5921ad133697bea4d114606fdb0a15b42d438ba01360fb665408efe5d0a3
+EBUILD check-0.13.0.ebuild 1488 BLAKE2B 104a8ac09018d0f937bbde18e2de13e226a8f2d8e7ffcece5d1dceb49a98578d562aad5bd6f142701bb6cf6fd810039f1918e822dd89090dffdad0431350cd0f SHA512 4b36695b4e7b3dc38c6239924c85e60591bd43de39847ef01584274a9351ecc2a1346306f917ffbc9000d317c2c7751382f55ef2d4f96d03af047fcd2f51ee6b
 MISC metadata.xml 488 BLAKE2B 27eb0323a4d7cac50b2f4ee935c75e7a35c34066a0dbc5bf21f8b4fb93abe82aa79a5fa1fafed0e623417ceaa553dc8395f201a24c3e0123df3104be44106bb7 SHA512 4b69b4b1ca91bfe4b04d03935d3d6e9b8ca10ecaa538884834f357708db5380a90e9cf1fdcef7996b7c4d8a23c0cb8e1d9eb9d34faa584637804ebc67657be69
diff --git a/dev-libs/check/check-0.13.0.ebuild b/dev-libs/check/check-0.13.0.ebuild
index dad18b128cb3..bda5701d57b8 100644
--- a/dev-libs/check/check-0.13.0.ebuild
+++ b/dev-libs/check/check-0.13.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs subunit test"
 
 # https://github.com/libcheck/check/issues/208
diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest
index 112957ab87f7..ad1a701760bd 100644
--- a/dev-libs/cloog/Manifest
+++ b/dev-libs/cloog/Manifest
@@ -1,11 +1,6 @@
-AUX cloog-0.18.3-isl-0.15.patch 2621 BLAKE2B 4e39bc94154f195d085b433f77218c1de4d1271a90cafc1a120f11c0540e4ce5cffdb18716f9bae28f3b9195c92cb49b7f0eb6e33041c78a9eae010f045d30e4 SHA512 bace93aa2ae345f4b7a0261cf3b195e070c99f08494dad66b15576c35a0269893fc4f250a941be4af9505d13d5c9cb7b9b157afb0af6c83016c4e868add83735
-DIST cloog-0.18.0.tar.gz 3776262 BLAKE2B fec90c701f2042c0bfdd68099ec6ef66ecc261193ff48c76787d1ad28e689be8d1685dfc99f0ddbe2a1cbf83aebe30eb0571dfeca53c03f6abaf190ca35d492c SHA512 34404984c4269dfc19673712271b08f220b6b49e451e7479cefbc5d2f27ab8e780f5d51fbbc7cecb974dab655673d8348f2a1ece3a60feaeeb9413fccf16eb1d
 DIST cloog-0.18.1.tar.gz 3857324 BLAKE2B 5898cb8d8f36e55dbe38e7866e07c0abaf8ca0b9e619a5ff963ae975148166fc9bb1c77a33aef1ea2014e739e4ea1c37e4bc2ce5e7411d900fb472192e6fed7b SHA512 0b12d9f3c39a2425e28e1d7c0a2b3787287fe3e6e3052f094d2ab6cffeb205ce19044100cbfd805659b3e6b3d21ac2f5a3c92848f476de54edfe6b1cbd2172e9
-DIST cloog-0.18.3.tar.gz 4577597 BLAKE2B 179f13d4cf1f3c13ed5afcbad9226a1fc496aac5c56f6129457516a8e52ec753c8ac3532f7ac975b62e0dc09ed4b84523ebb7146a7bd991bee04d3416558c8c4 SHA512 14fc2af0da62cd17b1a9f5a7a1704da6bfe5dc78639928637588203e61847795a652ff788c313c34b6e7dd85fb329678eb4f72e0e1c9c149be6619ebf046cff8
 DIST cloog-0.18.4.tar.gz 4796456 BLAKE2B 9d1f281abe48d40f726c3fc66c58c0d7cb90f6d3ca47af02c8f00b5cc69c6de6b0362b2dc406a8cb6310e07c6b2991f6de3b6b407ad7db0190b9bc69ac82773f SHA512 d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23
-EBUILD cloog-0.18.0.ebuild 840 BLAKE2B d63d1b1784224c0899582ee6ebb5db655fb8b200b7eeffc4341e6a4ff2c7ca9aa09e44ad68b471a60f47d41dd38dd34c790333c2f831ecc64450d3afde8e5f30 SHA512 d54e4fc522de8958bcf9646ea93d75051d69d2fb2513bc688a878a171958958159e7e8c8a878cd270d36ece4bf22475c7c5bfc9c22cdfd36f737a5dc8d53541d
-EBUILD cloog-0.18.1.ebuild 980 BLAKE2B 215f1dcf700347cb08524aaa48c59280f219a92030f2e66477cec0fb78743cb8ab7764b158a6870b2dc1cd223e59903cdb9062485065f66841b1da360c724c76 SHA512 bfeb6d8c65bd0fc0660202096d1ed81ef1f12b39044e7510c332778a66525d79ca1da67e5e3091fec49d57e237b874d806997049b58ca6c1d48a6d135e296595
-EBUILD cloog-0.18.3.ebuild 1459 BLAKE2B 825d4835090613a1c3c1afaa268df3ccbc3a144ae448e6249579d8c0d17eb67c34f87e248e6455183f3e1638729bc691622492f63d24a9b8cfe0684a97f73908 SHA512 6015ddc56d837da19424d3ea9c8ed1e22574ce74cd6e2a5956af6c4747decefef7c0fc6821eb89aca740dbeb0bfedeaabc873885621cbccf0980dca567ae6fc5
-EBUILD cloog-0.18.4.ebuild 1404 BLAKE2B c4b1fff243f356387c1519f6656ec5c5597edb5792aba006b5993c4081b877bc0507fc05b178dde6a14984fce516addf829c62b3d9babbdfbf16791c94b856b9 SHA512 80a9e7a7dce501f3b0fcf03db3659fe1bc4c59eb7f95105941fed6064394bce50579f5df84faa2ec226a2b620d7ca918ac9a7720109f12f6f43408dc5db5622b
-EBUILD cloog-9999.ebuild 1444 BLAKE2B acd027483a3a3722c216caff695c1cb10e7110c4b42a99ab56810d6909747c32d10b2ad8b4d16f843d6646cb7b590a778843d521064ad729da8c33342811341d SHA512 25d3f5b6e24f118f2fb65df7400e0a077063593186034dbe86665b452d95d3fa76f6c8a0cc3ccb0248b83ea5b11e16da3fc1a7ba288288b7370ff772595709b0
+EBUILD cloog-0.18.1.ebuild 956 BLAKE2B c44da8bbbf08d94f698afdcde8df7036afb48311b08ed2d4b621b4ea60fb94930a9d66b932b583cde71f38605c32eece10671fa146575039a8ef6799b4e18153 SHA512 04efdf5e56db932ec5f2d79be56d636ddec2c4e1ab4a0b2bff1d2aa51cecd1baa83421a333eb59c8a518cc692f2730788580c5deaa4449c439d407c1cab8a805
+EBUILD cloog-0.18.4.ebuild 1380 BLAKE2B 4a7a58ae194c707f99604da1f8d414d326d386f08eea555a2f243d8665f7fa34f7307c305ec4ffe0bc26c148aed645f01680b1b3d45bb4bc0e972be71885b0ce SHA512 5d28cf652cb5f9818a39cedde6a4efb420772df45cd8590f83942640e102b8ae4ecc319f2d56a686f40f50c074299d3b03c9d2c2b570c0a4b461a82d15b9f17e
+EBUILD cloog-9999.ebuild 1423 BLAKE2B d49b09e116b2def2833c51cb36368c4de5a6a93028c4bec106a5fe1b1196db363b621c0be13d1f2183cf45e91e875a41f26af01a62d3c2ec41e1494153453d28 SHA512 c4926861ae72ba72f661140986c2da1fbec32bdc169f7bdc4455ce73e0539741b1f764e94a921aa7061832718d3e33f89384c602dd9338de755613f368adc931
 MISC metadata.xml 221 BLAKE2B 79f6de476af31c1da59c7aeebab26fa0db49c902398f6f73beeca03d3077820240bc51a25d2945642d9a07470470f2ca9548c2d8f1c63a8592966f6df9955926 SHA512 edb14bd2dae6ad57f77c07fc601cf2782589165c7e48e1e123eff7e47044febfdb1e19d18cd0b240fd2ca494e3401b5aa1f1243480769e0faf5dbfa377d20a3b
diff --git a/dev-libs/cloog/cloog-0.18.0.ebuild b/dev-libs/cloog/cloog-0.18.0.ebuild
deleted file mode 100644
index 8e70a9c5c215..000000000000
--- a/dev-libs/cloog/cloog-0.18.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="A loop generator for scanning polyhedra"
-HOMEPAGE="http://www.bastoul.net/cloog/"
-SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static-libs"
-
-DEPEND="dev-libs/gmp
-	<dev-libs/isl-0.13
-	!dev-libs/cloog-ppl"
-RDEPEND="${DEPEND}"
-
-DOCS=( README )
-
-src_prepare() {
-	# m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
-	# sed to avoid eautoreconf
-	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
-}
-
-src_configure() {
-	econf \
-		--with-isl=system \
-		--with-polylib=no \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/cloog/cloog-0.18.1.ebuild b/dev-libs/cloog/cloog-0.18.1.ebuild
index 9d689ab51e63..a6a8e669c6db 100644
--- a/dev-libs/cloog/cloog-0.18.1.ebuild
+++ b/dev-libs/cloog/cloog-0.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,8 +15,7 @@ KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/isl-0.12.2:0/10[${MULTILIB_USEDEP}]
-	!dev-libs/cloog-ppl"
+	>=dev-libs/isl-0.12.2:0/10[${MULTILIB_USEDEP}]"
 DEPEND="${DEPEND}
 	virtual/pkgconfig"
 
diff --git a/dev-libs/cloog/cloog-0.18.3.ebuild b/dev-libs/cloog/cloog-0.18.3.ebuild
deleted file mode 100644
index 12ab4e9cdeb5..000000000000
--- a/dev-libs/cloog/cloog-0.18.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib-minimal
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="git://repo.or.cz/cloog.git"
-	inherit autotools git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="A loop generator for scanning polyhedra"
-HOMEPAGE="http://www.bastoul.net/cloog/"
-
-LICENSE="LGPL-2.1"
-SLOT="0/4"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/isl-0.14:0=[${MULTILIB_USEDEP}]
-	!dev-libs/cloog-ppl"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-DOCS=( README )
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		./get_submodules.sh
-		eautoreconf -i
-	else
-		# m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
-		# sed to avoid eautoreconf
-		sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
-	fi
-
-	epatch "${FILESDIR}"/${P}-isl-0.15.patch
-
-	# Make sure we always use the system isl.
-	rm -rf isl
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--with-gmp=system \
-		--with-isl=system \
-		--with-osl=no \
-		$(use_enable static-libs static)
-}
-
-# The default src_test() fails, so we'll just run these directly
-multilib_src_test () {
-	echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	emake -j1 check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/cloog/cloog-0.18.4.ebuild b/dev-libs/cloog/cloog-0.18.4.ebuild
index e02d356227a4..88f667583d90 100644
--- a/dev-libs/cloog/cloog-0.18.4.ebuild
+++ b/dev-libs/cloog/cloog-0.18.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,8 +21,7 @@ SLOT="0/4"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-6.0.0[${MULTILIB_USEDEP}]
-	>=dev-libs/isl-0.15:0=[${MULTILIB_USEDEP}]
-	!dev-libs/cloog-ppl"
+	>=dev-libs/isl-0.15:0=[${MULTILIB_USEDEP}]"
 DEPEND="${DEPEND}
 	virtual/pkgconfig"
 
diff --git a/dev-libs/cloog/cloog-9999.ebuild b/dev-libs/cloog/cloog-9999.ebuild
index fa0e96d64965..87fbec10982d 100644
--- a/dev-libs/cloog/cloog-9999.ebuild
+++ b/dev-libs/cloog/cloog-9999.ebuild
@@ -21,8 +21,7 @@ SLOT="0/4"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-6.0.0[${MULTILIB_USEDEP}]
-	>=dev-libs/isl-0.15:0=[${MULTILIB_USEDEP}]
-	!dev-libs/cloog-ppl"
+	>=dev-libs/isl-0.15:0=[${MULTILIB_USEDEP}]"
 DEPEND="${DEPEND}
 	virtual/pkgconfig"
 
diff --git a/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch b/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch
deleted file mode 100644
index 70ce3b86ec02..000000000000
--- a/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-add support for isl-0.15+
-
---- a/source/isl/domain.c
-+++ b/source/isl/domain.c
-@@ -68,25 +68,39 @@
- void cloog_domain_print_constraints(FILE *foo, CloogDomain *domain,
- 					int print_number)
- {
-+	isl_printer *printer;
- 	isl_basic_set *bset;
- 	isl_set *set = isl_set_from_cloog_domain(domain);
- 
--	if (print_number)
--		isl_set_print(set, foo, 0, ISL_FORMAT_EXT_POLYLIB);
--	else {
-+	printer = isl_printer_to_file(isl_set_get_ctx(set), foo);
-+	printer = isl_printer_set_indent(printer, 0);
-+	printer = isl_printer_set_prefix(printer, NULL);
-+	printer = isl_printer_set_suffix(printer, NULL);
-+
-+	if (print_number) {
-+		printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB);
-+		printer = isl_printer_print_set(printer, set);
-+	} else {
- 		assert(isl_set_n_basic_set(set) == 1);
- 		bset = isl_set_copy_basic_set(set);
--		isl_basic_set_print(bset, foo,
--					0, NULL, NULL, ISL_FORMAT_POLYLIB);
-+		printer = isl_printer_set_output_format(printer, ISL_FORMAT_POLYLIB);
-+		isl_printer_print_basic_set(printer, bset);
- 		isl_basic_set_free(bset);
- 	}
-+
-+	isl_printer_free(printer);
- }
- 
- 
- void cloog_scattering_print_constraints(FILE *foo, CloogScattering *scattering)
- {
-+	isl_printer *printer;
- 	isl_map *map = isl_map_from_cloog_scattering(scattering);
--	isl_map_print(map, foo, 0, ISL_FORMAT_EXT_POLYLIB);
-+	printer = isl_printer_to_file(isl_map_get_ctx(map), foo);
-+	printer = isl_printer_set_indent(printer, 0);
-+	printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB);
-+	printer = isl_printer_print_map(printer, map);
-+	isl_printer_free(printer);
- }
- 
- 
-@@ -343,6 +357,7 @@
- void cloog_domain_print_structure(FILE *file, CloogDomain *domain, int level,
- 				  const char *name)
- {
-+	isl_printer *printer;
- 	int i ;
- 	isl_set *set = isl_set_from_cloog_domain(domain);
- 
-@@ -358,7 +373,11 @@
- 	for (i = 0; i < level+1; ++i)
- 		fprintf(file, "|\t");
- 
--	isl_set_print(set, file, 0, ISL_FORMAT_ISL);
-+	printer = isl_printer_to_file(isl_set_get_ctx(set), file);
-+	printer = isl_printer_set_indent(printer, 0);
-+	printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB);
-+	printer = isl_printer_print_set(printer, set);
-+	isl_printer_free(printer);
- 
- 	fprintf(file, "\n");
- }
---- a/source/isl/constraints.c
-+++ b/source/isl/constraints.c
-@@ -450,7 +450,7 @@ CloogConstraintSet *cloog_constraint_set_copy(CloogConstraintSet *constraints)
- {
- 	isl_basic_set *bset;
- 	bset = cloog_constraints_set_to_isl(constraints);
--	return cloog_constraint_set_from_isl_basic_set(isl_basic_set_dup(bset));
-+	return cloog_constraint_set_from_isl_basic_set(isl_basic_set_copy(bset));
- }
- 
- 
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 29f7fd16ca03..a7e8eb178727 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -4,6 +4,6 @@ AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b1
 AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f55e0611fe83782374d5201b984e85e7c27897d0d056f53af40ebb383e8cbe315a57adce2af378348ee1a573cfeb005e7a43 SHA512 2660ee456b62d6b1ed72ede92d8b00e9d1cd4b0a5778a80bfbdc3139e5527758591cdb05110b39a5c5811f60e2223cc8c83a488ac055a554f5b3c71fc5980acb
 DIST elfutils-0.176.tar.bz2 8646075 BLAKE2B 7f23d59b7f5d74946fea928a7fada7764c1f96a5eefefc4a3a382090eb7cad07c80419218300d853ccbef8f4e2288eb443ff06b3e64bf4511d9fa7aa84f5b794 SHA512 7f032913be363a43229ded85d495dcf7542b3c85974aaaba0d984228dc9ac1721da3dc388d3fa02325a80940161db7e9ad2c9e4521a424ad8a7d050c0902915b
 DIST elfutils-0.177.tar.bz2 8852413 BLAKE2B 03f432342651f7646d73b7847325bd14b722ce34d85df01b1ad072b916af9b9da2d0d119cd24e952073bd584ec76b027ba9b6c7d45fb057372b3e700b1f5741a SHA512 2779987463a22ed220759e25a09c9a1eb84c0f36db37675136e59aa55c7f8f90b7a7d34ffc4e6a4291d7fa73692a1bd1a303a74270b11d1623b4f9868d19498f
-EBUILD elfutils-0.176-r1.ebuild 1943 BLAKE2B e919191bb34934b44f7a38a008ad2eb09879fdc6b7b7656505505c97dfb4e82051f6f6ee388fa8a224d4b8374d0f4705a23db9fc30dada09411693a71f9ad719 SHA512 b04f95f56bbdc77d8b610272cda54393757bb76c70fa23f4d72dd09e59ccf1636d189f92a6e1b349a4c69e278d960853f30266208e009cb5a07b1273dcd3e242
-EBUILD elfutils-0.177.ebuild 1971 BLAKE2B de7d187c85c9984af4ad6b71f33d23268912298f0273f4ee370d6ad257ca136882301386380185b3b8ec0c5fa53a0324ab5593c23ece3489fbc3625652eaef2a SHA512 fec602e67e6b6517ec7c71877eee13e9c422ca77055fb51c890a300cd555c72363dc376429cd0aceb8c981eb31529955c3156070e8c93f5337f68104944a54ff
+EBUILD elfutils-0.176-r1.ebuild 1971 BLAKE2B e9ea01a2147d318c75c8c6157c2d830db85cba78585e96d182a52c39c55b97da56bbab955dd34bda74a9e28fcdc49441ba08812b86e055e53f3aabe01723d4e5 SHA512 f73f6d944944730a1b0d389a2b6a1a7dff50c7f1aba0332472180100c4869e5266b78c76f451d8ed00cbc6e58e2bd9d07f50ba9f97c1bae0a1b7940e21d0bea4
+EBUILD elfutils-0.177.ebuild 1999 BLAKE2B f58770ef1ccc48112761207c6e7897b056ede80ed13bafdba5ba9c91b603d8aaaf3601e5223913fc5fd20e7cf8b3ef7202160ea4cbfc1c379aa473406a18dd9b SHA512 d0aa6897f4db082cfb56098e266bcc1982fcb5204381738f3ddc4a2b9bb09fe7217b4c4ad76791f2c0a3a26d7b7b28180dd1c7057f2ba039a64dd9c273d3c941
 MISC metadata.xml 630 BLAKE2B a868e2c1506f03ed2a36575a7395f4cff5688ef1ffd629d0db737a33305dc58a368aca03179f5a7e428b478c317789a4600b9cf4e2a90a3a34a2f402781b966e SHA512 81099941ba6bca61567b62e353c488b3705408cca1d8c097beb1e0f0baacc4d45dd1708932d8f255efb8691d6b94844d267054251cacc0860a369701203d9b82
diff --git a/dev-libs/elfutils/elfutils-0.176-r1.ebuild b/dev-libs/elfutils/elfutils-0.176-r1.ebuild
index 88b231edf8a4..986869931b4a 100644
--- a/dev-libs/elfutils/elfutils-0.176-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.176-r1.ebuild
@@ -23,6 +23,8 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4a
 	sys-devel/m4"
 
+RESTRICT="!test? ( test )"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.118-PaX-support.patch
 	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
diff --git a/dev-libs/elfutils/elfutils-0.177.ebuild b/dev-libs/elfutils/elfutils-0.177.ebuild
index 0bb7a5297f04..307449017a35 100644
--- a/dev-libs/elfutils/elfutils-0.177.ebuild
+++ b/dev-libs/elfutils/elfutils-0.177.ebuild
@@ -23,6 +23,8 @@ BDEPEND="nls? ( sys-devel/gettext )
 	>=sys-devel/flex-2.5.4a
 	sys-devel/m4"
 
+RESTRICT="!test? ( test )"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.118-PaX-support.patch
 	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index ac685a5f59c4..a61d135d9ebd 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,7 +1,7 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
 DIST gmime-3.2.3.tar.xz 2217320 BLAKE2B 29c8004636b27acd1dfd102d45bad39c09c677475c5e063e73b26ed242070b66ce1030d6ecfbf16d76d83ff403685bd62bcad832b94883fc5b3c770d9f800fa8 SHA512 abaf9059baf0c045d5b62757953ee2fa0779462eb32142bb41be40c376fc7ac2b3e4a56fd66177fbbe1dca35c6168a251542b14a844125c2cfcc9a99888179b4
 DIST gmime-3.2.4.tar.xz 2219876 BLAKE2B 210941d10dd5c0ce8a638a54a51da9000b4638ae2cc8a37be757fb331c0c2360fc497d7bcf2101ed6bf22de668fe0b779984e83ab40d00d551a5b2971d7a5dcd SHA512 34592e89a2f923dacc37ac535da785918c2c0d6a63b0f2ec1d86393264aace44d1060e8ef4a77e60fd57e97475435f8e79d87e46b269ae332db9b9aaf98bf61b
-EBUILD gmime-2.6.23.ebuild 1722 BLAKE2B 9e3fb8377a4908c8569739940a39fe147dfa02bc1983812e041a37f66b0d53569d666b5cf27645a27b325fed4d73fb3503b18fcd2b79c91d0c6e89679336c3ed SHA512 73455c2979fc958713fb9f7df51bdcacaba08c76ca3205a6993bb2ded1784f27a41bb7fb2a22dfbca648bdee908dc7103733f4f86c231cecede6cb757c25c97c
-EBUILD gmime-3.2.3.ebuild 1554 BLAKE2B 21b99a57ad848545e879df34eac874a423f3892b55757ea30c379586a88bcb24a8f5bf5446ee9fbe00b8dcf8e63a6fb3a670af2271d529671edb3bbced553612 SHA512 69d726e3a11b73103725d9ce3d0bcad3100de5e7cdd9d6cd23cffb78ccb749662a7fa8a99a556173818d90179a16534e3bc00b576f23d159f58d8fab3cdf9c40
-EBUILD gmime-3.2.4.ebuild 1556 BLAKE2B e5130c728d1348b3e96ebe56b5723b10127aecadff2dca05ca55288c211e8ac6269616c2fa127e0695809a786e5db5bd7f14786edb80754658074167e65868ef SHA512 bf54e2b56e5874b4dad0060aafd810f29f00cec0655f074fe8abc7fa3ca0353a23c055c6d9f482f92d8f17f61e7d79098432f8564ff08833afbd1d5e26442235
+EBUILD gmime-2.6.23-r1.ebuild 1497 BLAKE2B 5526b533983b0cc9cfbf6787b8e02652c91abdb3b5403d68dbe01b94f150307e549014f924d430c06eccb3e82ec19ce5e6e4b40a16ed04e4f30f683c31b04924 SHA512 20830a222e7c0ea845168c0a76be0efad72474078f93e65f4025a70b4cfebd9fa2a667c49be7d445b50d342e456b714bf6b78040266fbb80778af93ca99e2a86
+EBUILD gmime-3.2.3.ebuild 1581 BLAKE2B d3b4f70d96de01af0cc7062245b218b246dbf71e21bde1a384f8b05ffd6ca2f71e1628f41ec7ad07188469aa00269cdd0aa3932c97240758c2fae2b3247d15a4 SHA512 33b540735166e91d3f2fbf2cd4bf3e41f700e950295a0d6116f0679e1a94cbdf0705bdd1f973c08258f445d10e4782f022b67ea338c6a1ff8cfd0b309e9adb5e
+EBUILD gmime-3.2.4.ebuild 1583 BLAKE2B 2b934d6ad1c215315b5617ba051d576b61665d7a935a83d6001140ea09185f3448f1dc7d1b22c570bb8e636a094325a8f1263161f65cb46277ff1a9440c9d602 SHA512 7e4aef4193be091d005a5ba26199d4a51baac83d0d3a040e3b58109fba1e7f5e72624e9fdfc291b616c56cffcc8bd4c85e97941742ee6b72feb2085641b5c43d
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-2.6.23.ebuild b/dev-libs/gmime/gmime-2.6.23-r1.ebuild
index fe5a962ae414..7053fa2ffa85 100644
--- a/dev-libs/gmime/gmime-2.6.23.ebuild
+++ b/dev-libs/gmime/gmime-2.6.23-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 VALA_USE_DEPEND="vapigen"
 
-inherit mono-env gnome2 vala flag-o-matic
+inherit gnome2 vala flag-o-matic
 
 DESCRIPTION="Utilities for creating and parsing messages using MIME"
 HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/"
@@ -12,14 +12,12 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime
 SLOT="2.6"
 LICENSE="LGPL-2.1"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc mono smime static-libs test vala"
+IUSE="doc smime static-libs test vala"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.32.0:2
 	sys-libs/zlib
-	mono? (
-		dev-lang/mono
-		>=dev-dotnet/gtk-sharp-2.12.21:2 )
 	smime? ( >=app-crypt/gpgme-1.1.6:1= )
 	vala? (
 		$(vala_depend)
@@ -34,10 +32,6 @@ DEPEND="${RDEPEND}
 "
 # gnupg is needed for tests if --enable-cryptography is enabled, which we do unconditionally
 
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-}
-
 src_prepare() {
 	gnome2_src_prepare
 	use vala && vala_src_prepare
@@ -48,22 +42,21 @@ src_configure() {
 	gnome2_src_configure \
 		--enable-cryptography \
 		--disable-strict-parser \
-		$(use_enable mono) \
+		--disable-mono \
 		$(use_enable smime) \
 		$(use_enable static-libs static) \
 		$(use_enable vala)
 }
 
 src_compile() {
-	MONO_PATH="${S}" gnome2_src_compile
+	gnome2_src_compile
 	if use doc; then
 		emake -C docs/tutorial html
 	fi
 }
 
 src_install() {
-	GACUTIL_FLAGS="/root '${ED}/usr/$(get_libdir)' /gacdir '${EPREFIX}/usr/$(get_libdir)' /package ${PN}" \
-		gnome2_src_install
+	gnome2_src_install
 
 	if use doc ; then
 		docinto tutorial
diff --git a/dev-libs/gmime/gmime-3.2.3.ebuild b/dev-libs/gmime/gmime-3.2.3.ebuild
index d90c88951c2e..124cc35b6ccb 100644
--- a/dev-libs/gmime/gmime-3.2.3.ebuild
+++ b/dev-libs/gmime/gmime-3.2.3.ebuild
@@ -13,6 +13,7 @@ SLOT="3.0"
 LICENSE="LGPL-2.1+"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn static-libs test vala"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.32.0:2
diff --git a/dev-libs/gmime/gmime-3.2.4.ebuild b/dev-libs/gmime/gmime-3.2.4.ebuild
index 9ee27431db57..3ae7bfbbc5f2 100644
--- a/dev-libs/gmime/gmime-3.2.4.ebuild
+++ b/dev-libs/gmime/gmime-3.2.4.ebuild
@@ -13,6 +13,7 @@ SLOT="3.0"
 LICENSE="LGPL-2.1+"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn static-libs test vala"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.32.0:2
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index 48177cbe1df8..cb7403371742 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -3,6 +3,5 @@ AUX iniparser-3.0b-cpp.patch 1446 BLAKE2B e538e93d01e8521b9f3726bc4d24fee827f5ae
 DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86
 DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968
 EBUILD iniparser-3.1-r1.ebuild 1124 BLAKE2B 08600b9bf4d0c36f5964d91b66c80c28f5bbd9bcd6791ae5d16553e9917ecd141e8af342cebf9add3ab24970ee2a34717e6dbfe10da081b1a9f7c96080279c88 SHA512 d61590d1b93e6aa993a7cf84df3a0c269e2c57321bb7d725244b828961646be4b000297ef7f247e2dc6025bd369a9f02747f7636efa2baf7d2ca5bdcfbde56bd
-EBUILD iniparser-3.1.ebuild 976 BLAKE2B af047e1d922bccf82569707b8f2fbf160858fe2a5ab8f83866935f60dec316f4adfcfc28851681664bf45d95225f766b54f13de524fd67f34d9f21094e082458 SHA512 9ceb0089a50c66b42ae9dd3164c6640412f7cc9bf90c9aa0c3f5b502d851f46783a7ac30726e16b09aa9418b8d4c90ac82ba006a0300bf93c3f8aba688d4556d
 EBUILD iniparser-4.1.ebuild 1738 BLAKE2B 20b78bd168542b2ad574eac3c000cefe5ed9c2948285a410980a8cdc02ee8d14a46ceee8a58ba91858a35e64d647eb5a718c232814fb3c718ef728e9dc78eec6 SHA512 714cb972ed91378756de579ab7eee404bcb4965e151c5ea4c9f6c780f3b7d759e0158451456b6c3192f23c12abcbbfbab45714592a4a416f7ab005bf3363e48a
 MISC metadata.xml 435 BLAKE2B 788d24983bfab5491f783ec20479370e6e01686d0f5a379c490a0b93d8379a3062e46b497cb911298df3d0de7f0eaaf1606e11a365e92ca5b93041dc935fc9ad SHA512 452ccec03580def2966c0eb2f50af057776387e01819e1ce5226e628204ea94554658309dfb0c54d413f95ed588f44b84133526b164ae557ad6ac7926aa51a51
diff --git a/dev-libs/iniparser/iniparser-3.1.ebuild b/dev-libs/iniparser/iniparser-3.1.ebuild
deleted file mode 100644
index a052691ec001..000000000000
--- a/dev-libs/iniparser/iniparser-3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
-
-DESCRIPTION="A free stand-alone ini file parsing library"
-HOMEPAGE="http://ndevilla.free.fr/iniparser/"
-
-SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc examples static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )
-		sys-devel/libtool"
-RDEPEND=""
-
-# the tests are rather examples than tests, no point in running  them
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}"
-
-DOCS=( AUTHORS README )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0b-cpp.patch"
-	"${FILESDIR}/${PN}-3.0-autotools.patch"
-)
-
-src_install() {
-	autotools-utils_src_install
-
-	if use doc; then
-		emake -C doc
-		dohtml -r html/*
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/*.{c,ini,py}
-	fi
-}
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index 5c41aea26a3e..c067cda45f6c 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1,25 +1,9 @@
 AUX isl-0.07-gdb-autoload-dir.patch 871 BLAKE2B c3bbc1db60cbf0c844839f07190e81265e606d7796438be1e7d370f559316f4a0096ce12fc93b583c0663de83592e6f4c50bef838eb42273059ac2cea16e17b5 SHA512 ffe4db1e1bc2199718667d7e3835d5d3fcabfa82402d39ec540fb86641ced3a46d43cd60682188883927c796925679142b4481b231d218bd776cb3c08ef8117e
 AUX isl-0.19-gdb-autoload-dir.patch 809 BLAKE2B 59dce21b8f0a7226b7b266eebd6226c0821658a548d6b1f896e58f09b03f703162db287df2f2dcaaebe58bcb76ea7e24075802e6df32581cf5e96f3e43ca1e58 SHA512 396c7c00b00c19a269540abf464f6e30d4473c9413d67a436cd4294b3cb53a5c94ab34e8e5c76c863243437d8754edaf924148596e547ef551e6d72c8122ff27
 DIST isl-0.12.2.tar.bz2 1319434 BLAKE2B 53f009dc8093fb3d7d2db40db8f6fd9d7de630777e0308ac3c5918c2c106eda0edd7451df18c954ed6c9fc3ed7d18c73708d7b1f94c8c5c55aa94f8845f5b219 SHA512 b5dea4d6b504fac22f2d8cd9c47d6896994d3966635a514d45010243db44cfbc009574b808f3587f35d91de629110bc11b52941d4075e21f8646c59656e62aea
-DIST isl-0.13.tar.bz2 1351299 BLAKE2B f2fe57b42d639a5125655067996e508cb16d03d7f054b15f22e4bfb624c26bc5c422742060be81af91fc59f719e7b6cf9e1c40790f51fca9ddedab175d998a10 SHA512 ac94cc6448ce8ed5ccf987fb29d86ddd5a63c904a83df3f24f66cde25e5657180a3f2b55b207635d43930e92c860d1043d3f14e9e715d593d53c956eb8346743
-DIST isl-0.14.1.tar.xz 1248204 BLAKE2B d4728a17a91131da65d61dc36293a5633712d4372a93721d428d0edc76835e3e9783b64cedd04fee3e1d94d37a6dee51856ef754d29316a4675cf1b02bd0610a SHA512 ccae0464771db50c498fd1f9f1006c9bc183fd77a0716507daeb5da6d435fdcffffa0942efc4589464f205615f9e46242a066f61790c40206be02f6cf8506635
-DIST isl-0.14.tar.xz 1247052 BLAKE2B f75a78b98c5662d0f67e9700b10cf70214ef27fb2ed775e678e4f60e05db9923aea51d1dec489d94d341e4c64a60d91ef0a7229bed737f6cdf616fb61d9b53c2 SHA512 cf43868d466d6ff08c5e15345d222ad153e8c4e86831f9854df716eb914c6c15f4c44b73aa6e0b16eb556d1a4d3c26af6f71e85421bf464cbbd053d5f3c515ee
-DIST isl-0.15.tar.xz 1406988 BLAKE2B baa3a7d8c77e7d8416a1c9215c35fc1d6d0034c1c2cdf2bd1da752aa564c0d946e4a6e0e26196209459e4a2309dcbd6ea1731564494374b95c657c7c58aeee02 SHA512 5e72816da133714fb752ddd10fbe9e8f18deef496445672c0a77429679e50f1def22e05e5ebe9acb5534fc8939a6e6a452ffa3607d479671864a76b6789bdab4
-DIST isl-0.16.1.tar.xz 1449164 BLAKE2B 8c048ad398d7c3de79f4d6a6c3d906b4086bbcf59c4c014a1f02cff472dc7ce92d8fec518dd3f13d389a8ffefda431ee335084c68191ec1350e78c12cf8cda03 SHA512 6faff2fe07267ba05c156158c36c25aa9beec6058f949b7bb9b8f042c5d01b7a3a17a6117c2c2a13ad6180308c8d03cfd469b237abf85290411599dde614788f
-DIST isl-0.17.1.tar.xz 1440564 BLAKE2B ab2dfd50a4c5adc5ebba172ab969475adf15f541305e63bed273e6a30d6087bcb9383cce16207bbcf89578bd98527f56df86b2a264c078dc9d730e3d59c326d2 SHA512 03d73e81db2a01c5dd31bec12816975988bf731f29b95637bc15ea24abf0becad6e8d650ca0bad45eaad4197cb0a1f5ca189aec638db162c56092a001e35d86b
-DIST isl-0.18.tar.xz 1475708 BLAKE2B 216d4d75e2bc03b3027c67ac7ab373aca6040ead12b2844504890d6fe6dd80e82c66d0f89eb1fc7451a23470445d2656f704971d3b8bfa2916154973e9b52038 SHA512 3606609765fc34740ab3014e2256d6bba7ff730463b014a0e4f5fcfb2e3dbef974503dff1f3702b307ef79ff86c5bc2c3ce3c3c8511533971fd5d53ab45f6eea
-DIST isl-0.19.tar.xz 1515156 BLAKE2B 1be213df736f59123072778b9721db06130c935edf0805fd489d74c9effeb9eaf5b191de0a28e8a5138f79dc23ac9ebb213c57c020d0411afb305788b5f312cd SHA512 eeda0405d38f77a18c6e69128948dc29af7e44ce827e9fb538d3844c6e22db3b4126287ca0937d9bee7b528bbab7aad8d3729db36e74864196f57e81943dade4
-DIST isl-0.20.tar.xz 1539064 BLAKE2B f1347c0126ba3ae9b5fa073d0f206a7f48d53edb40d87ddff18005d94754ea4d1fd3801ee913d3b7234124b6c1447990e5d299fad6c6b7ff1d022ede82bba9b2 SHA512 394bccd22d8e63cb052a60ad8b1a75f4ec43916a9482c66f5167b534b538161179c47919815983b7fbc20dfaa1a590e88b251850aa092bbffc2891635bf30dc4
 DIST isl-0.21.tar.xz 1621680 BLAKE2B ffd0c8aa7d489283ac958c280c05fe0c9ad621a10bd157d0522ac209a58e9bb6a8aad76c7a49b42d5e1c0f3605d0fb05a41ed6f2bb9aabb4f06060a5bbb65de5 SHA512 87ebc2fd6d4325cdfa82295a659ed6dbd70760a776b733e5503bbf8baa8fe80d905879728e9c7f23d2f3bcd7e78c00a66ab166c013ae97b603f7c460c69668ec
+DIST isl-0.22.tar.xz 1676992 BLAKE2B 1cb2125761adec02d9f337e8730faa5bc3a4e63cb7d968f7f4de3a3360b1f9be6caf6a27031f02df1ebe149fb70b6a32bdddbe8ae03032b8ff366f4eac274483 SHA512 7c3c9502ea07e4d47a823841837c3aa0b9d7ba0fe58deaf180734e44c18e53735ec783645da0bdc56b617c9e639b226cc03b40a947f852e1e787166a64f59424
 EBUILD isl-0.12.2.ebuild 1026 BLAKE2B 8757a140cee7104d9907c54bd72836aef56ad58c3b2972f9b130831ca0b2eda1eeee45a896eca8b28b08a22cfc2d11d053ee73d677127fea4450bbde7e6a5390 SHA512 9e40b23cef96116fd7709e8b4e0fe74cf7f54b410bb8676ba95a7d8c87d76e4be5339a68cf7ac036ef3dcbd88a1c711649b0497c015003f78c43fcd9d1e808d8
-EBUILD isl-0.13.ebuild 1038 BLAKE2B 65a4769a80a659841fac88c9d8a881c579de7825f7a32de564d5aa7f85422361766075494edc206f7cb68c3d8f3355b08b9c9873ced5be6463d7090682e54f3f SHA512 c241101da68229bb06f302caf9f33fd5dd36470d3da6c1e790a341fa90e6fb61b3b1a13312af52ddb2415b1d23eb94d14c05a831bccecbb88be66315b2ee3250
-EBUILD isl-0.14.1.ebuild 1056 BLAKE2B a50b3afa0a17f0b71c7ca3fa6961942b23ed1c3289579c8c27f837dec4b21f7be453667e7bc4c1d1f5301f977da7d568c3f0438ef0244a7cac6eff261bf3adda SHA512 d73c0cc9c6aab8669c3c33bc25739373a768135a812a6bb54253b4691936925cf54e63102436c79ffef5fb01da06ef6cd38a3f7924796be5785345f67c384456
-EBUILD isl-0.14.ebuild 1056 BLAKE2B a50b3afa0a17f0b71c7ca3fa6961942b23ed1c3289579c8c27f837dec4b21f7be453667e7bc4c1d1f5301f977da7d568c3f0438ef0244a7cac6eff261bf3adda SHA512 d73c0cc9c6aab8669c3c33bc25739373a768135a812a6bb54253b4691936925cf54e63102436c79ffef5fb01da06ef6cd38a3f7924796be5785345f67c384456
-EBUILD isl-0.15.ebuild 1045 BLAKE2B dcc289c4da4c056590a06793c8ef9a314c5dff62edc6106fa9e2250693a9ea511d6a40621160289a0ad923039e9f85c4de2826576543d458444c77e7bc283d8e SHA512 98a73850f03547f1a612f92425d817f17ab9f31f399d367b66fb774d4c217074dbb540809d3671acacb76648286dfa80d5ffcbbe6df6c2634982d4999dcae71f
-EBUILD isl-0.16.1.ebuild 1056 BLAKE2B c9f7a5fe1dfca48511d5365dd93ccac8a59c4e848b93f5f18f74960e9be358bb35fc71f08236b0b7cfb3f8a9a1e58c3ed682fc8f7f9c101e8ea28fc0495ddf76 SHA512 300aa90a8afaa4cda00987dac9096ae623cc6b3747be6539adf89216d6b888b5b1c4bc86b6e2b69eabae865629170b1b34107b68efeadfdfa7245c48963ecae0
-EBUILD isl-0.17.1.ebuild 1056 BLAKE2B c9f7a5fe1dfca48511d5365dd93ccac8a59c4e848b93f5f18f74960e9be358bb35fc71f08236b0b7cfb3f8a9a1e58c3ed682fc8f7f9c101e8ea28fc0495ddf76 SHA512 300aa90a8afaa4cda00987dac9096ae623cc6b3747be6539adf89216d6b888b5b1c4bc86b6e2b69eabae865629170b1b34107b68efeadfdfa7245c48963ecae0
-EBUILD isl-0.18.ebuild 1056 BLAKE2B c9f7a5fe1dfca48511d5365dd93ccac8a59c4e848b93f5f18f74960e9be358bb35fc71f08236b0b7cfb3f8a9a1e58c3ed682fc8f7f9c101e8ea28fc0495ddf76 SHA512 300aa90a8afaa4cda00987dac9096ae623cc6b3747be6539adf89216d6b888b5b1c4bc86b6e2b69eabae865629170b1b34107b68efeadfdfa7245c48963ecae0
-EBUILD isl-0.19.ebuild 1340 BLAKE2B 442a4ec9050b9f86ad312a1a55134b528669a5a7295c1b2fe128ee3490be57e599eed76d3a6428a336560b4c004259d8f0ab3e94d84f08ac07dcb82de3ac8a90 SHA512 b343004007bb6172717ff45a978cc4f46082d4b76423cb1b3e1b99bbde69af56d9ab48ca2baa98151a8e613bfbf0c85b025fc1659a4cea9e40f7a763cd19815a
-EBUILD isl-0.20.ebuild 1340 BLAKE2B 442a4ec9050b9f86ad312a1a55134b528669a5a7295c1b2fe128ee3490be57e599eed76d3a6428a336560b4c004259d8f0ab3e94d84f08ac07dcb82de3ac8a90 SHA512 b343004007bb6172717ff45a978cc4f46082d4b76423cb1b3e1b99bbde69af56d9ab48ca2baa98151a8e613bfbf0c85b025fc1659a4cea9e40f7a763cd19815a
 EBUILD isl-0.21.ebuild 1237 BLAKE2B 579f3ed0505f6f65bea2de1f430bbd176483601ed209123b1c2f2ea42bc12757fae3f87100b9cc8ad6ffaa52b6bc1e6b3c2e9b2cfc676409c12f95e16238f79b SHA512 875116ea7e07024e08908610c2dcb0bdc8e74c8d55b213c2bd92e897741f72d216e64e5ba0ec5d1dacc6cdb44a47d9594716f9b90f12d6c4677267ae8698a6c4
+EBUILD isl-0.22.ebuild 1344 BLAKE2B d2cada2dcaa6f46c38ecb0d199d71e0c5456736a17d9acd757aa8fe8c7d9297cfaf0a187d67b2bb0d508ef503020bf164d2b60563dae57a550fb03833d895532 SHA512 16f6e4f0219eeed1108814c6921a4bee91ced76782ecb9dae34423c23b82c3a68246e5955bee6714bb47d8a8b559d940366d427b28da452ebe2f461a09cd2d4f
 MISC metadata.xml 225 BLAKE2B 901efe1bb7f8f4397683b11d3fbf7ce4ede981f34596ac97d8c1bd77589d4732135b23b9791c2af3cae65ca152a706baaa13a17ea5c777090bab0aae0d64a310 SHA512 2997fa08fd2cfcf45753278a609cf2d75076f97848a83f09ff57b5cb71599495736a3a43f47ad24e1e3940bd937bf37592eff1d917e23f647995daf456e87d73
diff --git a/dev-libs/isl/isl-0.13.ebuild b/dev-libs/isl/isl-0.13.ebuild
deleted file mode 100644
index 0da87b58fb06..000000000000
--- a/dev-libs/isl/isl-0.13.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
-HOMEPAGE="http://isl.gforge.inria.fr/"
-SRC_URI="http://isl.gforge.inria.fr/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS doc/manual.pdf )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.07-gdb-autoload-dir.patch
-
-	# m4/ax_create_pkgconfig_info.m4 is broken but avoid eautoreconf
-	# https://groups.google.com/group/isl-development/t/37ad876557e50f2c
-	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die #382737
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/isl/isl-0.14.1.ebuild b/dev-libs/isl/isl-0.14.1.ebuild
deleted file mode 100644
index f3de71966fe9..000000000000
--- a/dev-libs/isl/isl-0.14.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
-HOMEPAGE="http://isl.gforge.inria.fr/"
-SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/14"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS doc/manual.pdf )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.07-gdb-autoload-dir.patch
-
-	# m4/ax_create_pkgconfig_info.m4 is broken but avoid eautoreconf
-	# https://groups.google.com/group/isl-development/t/37ad876557e50f2c
-	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die #382737
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/isl/isl-0.14.ebuild b/dev-libs/isl/isl-0.14.ebuild
deleted file mode 100644
index f3de71966fe9..000000000000
--- a/dev-libs/isl/isl-0.14.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
-HOMEPAGE="http://isl.gforge.inria.fr/"
-SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/14"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS doc/manual.pdf )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.07-gdb-autoload-dir.patch
-
-	# m4/ax_create_pkgconfig_info.m4 is broken but avoid eautoreconf
-	# https://groups.google.com/group/isl-development/t/37ad876557e50f2c
-	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die #382737
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/isl/isl-0.15.ebuild b/dev-libs/isl/isl-0.15.ebuild
deleted file mode 100644
index 59228af626a5..000000000000
--- a/dev-libs/isl/isl-0.15.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
-HOMEPAGE="http://isl.gforge.inria.fr/"
-SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/15"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS doc/manual.pdf )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.07-gdb-autoload-dir.patch
-
-	# m4/ax_create_pkgconfig_info.m4 is broken but avoid eautoreconf
-	# https://groups.google.com/group/isl-development/t/37ad876557e50f2c
-	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die #382737
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/isl/isl-0.16.1.ebuild b/dev-libs/isl/isl-0.16.1.ebuild
deleted file mode 100644
index 91bb1d6d1bc9..000000000000
--- a/dev-libs/isl/isl-0.16.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
-HOMEPAGE="http://isl.gforge.inria.fr/"
-SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS doc/manual.pdf )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.07-gdb-autoload-dir.patch
-
-	# m4/ax_create_pkgconfig_info.m4 is broken but avoid eautoreconf
-	# https://groups.google.com/group/isl-development/t/37ad876557e50f2c
-	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die #382737
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/isl/isl-0.17.1.ebuild b/dev-libs/isl/isl-0.17.1.ebuild
deleted file mode 100644
index 91bb1d6d1bc9..000000000000
--- a/dev-libs/isl/isl-0.17.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
-HOMEPAGE="http://isl.gforge.inria.fr/"
-SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS doc/manual.pdf )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.07-gdb-autoload-dir.patch
-
-	# m4/ax_create_pkgconfig_info.m4 is broken but avoid eautoreconf
-	# https://groups.google.com/group/isl-development/t/37ad876557e50f2c
-	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die #382737
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/isl/isl-0.18.ebuild b/dev-libs/isl/isl-0.18.ebuild
deleted file mode 100644
index 91bb1d6d1bc9..000000000000
--- a/dev-libs/isl/isl-0.18.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
-HOMEPAGE="http://isl.gforge.inria.fr/"
-SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS doc/manual.pdf )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.07-gdb-autoload-dir.patch
-
-	# m4/ax_create_pkgconfig_info.m4 is broken but avoid eautoreconf
-	# https://groups.google.com/group/isl-development/t/37ad876557e50f2c
-	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die #382737
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/isl/isl-0.20.ebuild b/dev-libs/isl/isl-0.20.ebuild
deleted file mode 100644
index 75b8910b3c30..000000000000
--- a/dev-libs/isl/isl-0.20.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib-minimal preserve-libs
-
-DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
-HOMEPAGE="http://isl.gforge.inria.fr/"
-SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/19"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS doc/manual.pdf )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.19-gdb-autoload-dir.patch
-
-	# m4/ax_create_pkgconfig_info.m4 is broken but avoid eautoreconf
-	# https://groups.google.com/group/isl-development/t/37ad876557e50f2c
-	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die #382737
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
-
-pkg_preinst() {
-	preserve_old_lib \
-		/usr/$(get_libdir)/libisl$(get_libname 14) \
-		/usr/$(get_libdir)/libisl$(get_libname 15)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify \
-		/usr/$(get_libdir)/libisl$(get_libname 14) \
-		/usr/$(get_libdir)/libisl$(get_libname 15)
-}
diff --git a/dev-libs/isl/isl-0.19.ebuild b/dev-libs/isl/isl-0.22.ebuild
index 75b8910b3c30..ece2ffe52ba1 100644
--- a/dev-libs/isl/isl-0.19.ebuild
+++ b/dev-libs/isl/isl-0.22.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit eutils multilib-minimal preserve-libs
 
@@ -10,8 +10,8 @@ HOMEPAGE="http://isl.gforge.inria.fr/"
 SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
-SLOT="0/19"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+SLOT="0/22"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
@@ -21,13 +21,9 @@ DEPEND="${RDEPEND}
 
 DOCS=( ChangeLog AUTHORS doc/manual.pdf )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.19-gdb-autoload-dir.patch
-
-	# m4/ax_create_pkgconfig_info.m4 is broken but avoid eautoreconf
-	# https://groups.google.com/group/isl-development/t/37ad876557e50f2c
-	sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die #382737
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.19-gdb-autoload-dir.patch
+)
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
@@ -35,17 +31,21 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	prune_libtool_files
+	find "${ED}" -type f -name '*.la' -delete
 }
 
 pkg_preinst() {
 	preserve_old_lib \
 		/usr/$(get_libdir)/libisl$(get_libname 14) \
-		/usr/$(get_libdir)/libisl$(get_libname 15)
+		/usr/$(get_libdir)/libisl$(get_libname 15) \
+		/usr/$(get_libdir)/libisl$(get_libname 19) \
+		/usr/$(get_libdir)/libisl$(get_libname 21)
 }
 
 pkg_postinst() {
 	preserve_old_lib_notify \
 		/usr/$(get_libdir)/libisl$(get_libname 14) \
-		/usr/$(get_libdir)/libisl$(get_libname 15)
+		/usr/$(get_libdir)/libisl$(get_libname 15) \
+		/usr/$(get_libdir)/libisl$(get_libname 19) \
+		/usr/$(get_libdir)/libisl$(get_libname 21)
 }
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index 42be7b8f3ffb..b773c7476490 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -18,5 +18,5 @@ EBUILD jemalloc-4.5.0.ebuild 1787 BLAKE2B 06f3036d060df40707bb79c6520b62c13c55c3
 EBUILD jemalloc-5.0.1.ebuild 1943 BLAKE2B c63f49de52d468421fcd74f4726b673f1e50c356bcbda8212dc09b3d81d5515ce97d068b3ae5785d3deb55c65f847b975a4496e9d82b1edfdc6aeea2baec5c0c SHA512 d3d32d6b3ed70746106bb881ad251e16e428ea35d361b53bb845f66cb0fab72c8b2fd3f59dec0893525663038ea30e8343bf10c2fecb30d0e4598d771327f1e8
 EBUILD jemalloc-5.1.0.ebuild 1900 BLAKE2B e720371595b0652033dda4960c561a623a2076ca081deeba87bdeeb51bd3734588308a2dc2ae91be7d16637b452e4de11c4022caf330dcb76eeacdbda68d104e SHA512 1cca96a6ba7e45d3bbaae91749dc93a6ff32ab90b473bc179ef35c7f7d8ab9f89db92eab0cc893f3192b979815db9b843edecd9c1ddfa8b3f8ccee9056a764a2
 EBUILD jemalloc-5.2.0.ebuild 1845 BLAKE2B fb4289d6d0a5e3c95adb88bc129efcaa85a81e009a216a1d60b133a5f567c02f21fd9bbdfeecc7f8a582697c0ef98952e2955f3718d8827aff87e2ebb6c98a44 SHA512 d7cfc4732f7830098f1afda42f34d6d2d77e4e0cdb3b9616139b149d9f7e7b29ed27af0324fd2d7c1065f7e44d0d200b03bca1c2baf76e044a64575a6cdda9fe
-EBUILD jemalloc-5.2.1.ebuild 1845 BLAKE2B fb4289d6d0a5e3c95adb88bc129efcaa85a81e009a216a1d60b133a5f567c02f21fd9bbdfeecc7f8a582697c0ef98952e2955f3718d8827aff87e2ebb6c98a44 SHA512 d7cfc4732f7830098f1afda42f34d6d2d77e4e0cdb3b9616139b149d9f7e7b29ed27af0324fd2d7c1065f7e44d0d200b03bca1c2baf76e044a64575a6cdda9fe
+EBUILD jemalloc-5.2.1.ebuild 1838 BLAKE2B 7e901ba6319fc0c5ae63cc8cb511abafe23a749a1284522807331e404c7f4038079a46e7f8e717b9afb42bae3bbd3164369ef215c18f74a6a1a27473107bfe21 SHA512 f24f7e2a2091ea42243010ec8ca188734e3f2f1bf46c354af2463459dd38b06f71e2abbc8a6bbcd3e95a5adc1466fed8b50d446845cac4a6a8383fb6cd3f9aba
 MISC metadata.xml 817 BLAKE2B d5d6f72de6d230f5f1145859729384bfabdfff47430900d7b9d814afb471effd0fd6bdfa9859e20df4568d3af63cf839732e93838c74c626a1cc03a752f0865b SHA512 2859064d9e92245d040e2056719df537b4d4ecccbb6390b6dd878dd739a82a16f31dbe4c6ebbae0fb9c907031f4beaa19a99cb28ca83bfe638b798e5a66988e0
diff --git a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
index 3e82a451db07..c0e109b5f3d7 100644
--- a/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="debug hardened lazy-lock prof static-libs stats xmalloc"
 HTML_DOCS=( doc/jemalloc.html )
 PATCHES=( "${FILESDIR}/${PN}-5.2.0-gentoo-fixups.patch" )
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 35f65d4ced7a..6c3ddf89fed6 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,7 @@
 DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
 DIST jsoncpp-1.9.1.tar.gz 203067 BLAKE2B 654f39b1265b344bb24d3fefb34d4d8b44f69ec819f333f00033ef90acfd5b926fdcc743badf403af797a6f58fe58d195ec0cdf4a1514629f8a1e75c20a6e2f6 SHA512 4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766
+DIST jsoncpp-1.9.2.tar.gz 211341 BLAKE2B 9081bf2b2599194c1c77476287e34aaeacc3c331147db79e3343eae28321e55dbfc8d74faf899912c257194030d39eac4fdb016a68290755badd1b68b0a69dd4 SHA512 7c7188199d62ae040d458d507ba62f0370c53f39c580760ee5485cae5c08e5ced0c9aea7c14f54dfd041999a7291e4d0f67f8ccd8b1030622c85590774688640
 EBUILD jsoncpp-1.8.4.ebuild 1358 BLAKE2B 44a52626b84622c18285dc24eaccbf064151314769da1caca9727a4e16ca803878569350ea0a02e662cac212c1f290ecdad6b9c62e02c1c37e9f6ee4e060375f SHA512 dd4fdf4b0b85d571c63f3151f9252f471d15a4420342535caca055dd000f15fb483573b93748ddd27f8518c7e687e7e695f9f89fbad87294831a839a7dfad0ac
 EBUILD jsoncpp-1.9.1.ebuild 1366 BLAKE2B 61aab4ecaf27074ef443ea80b3f49d1c5a7efb5cc8c72534744b83599e0721db7b7b6a836e0241478ea6feb9731799c099e3e39b3b6d5422390dad99a52fd094 SHA512 389464ed9b6b1ae0713673c7937478da5d0dfc896efdbc75df6cbea4a5c5c7c7ff4281adcc8a6f978e4ccf41b9e24dbe75f79b26ad62426eef987323124e3007
+EBUILD jsoncpp-1.9.2-r1.ebuild 1394 BLAKE2B e9bfc10e5a5d3ab0311da795982767253c45799a9badf6925b4b229cf0462774597256caa786e3f422a13b18006e7d807409d5216199091b49e241025313343b SHA512 3b0e99bc5ae8913fe26a7a4f01520571882f08e3123df6c3648d1ad7d88a32039f255478b00badd32f293b37b682373996c0b6f54829876f65464c4d20569092
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..e75db90c760b
--- /dev/null
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+
+inherit 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/22"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	doc? (
+		app-doc/doxygen
+		${PYTHON_DEPS}
+	)
+	test? (
+		${PYTHON_DEPS}
+	)"
+RDEPEND=""
+
+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
+		cp "${BUILD_DIR}"/version . || die
+		"${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/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 424f56d4b7d3..530e29eedbfe 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,10 +1,8 @@
 AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164a96b07d6a3054b555c572c6c80e79dbf5092da5fb23e9fb95f3db0bff02788ef4a9ac40483b1673382f4c1d11b0b3833 SHA512 35bfb2d3b1ca98cf7f10e9356e899532516d4a9671b0cebca1780e602ef53f9a5705ee6c4c03d70aecad163faccdce6ec15d7e32f00ebcda946d0cf6638a22a2
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
-DIST leatherman-1.7.3.tar.gz 815236 BLAKE2B 26bb6cbf19675741c0d325f42ccce993cd7fa58b116601fa5fc79d2fb443f2c8b26799138289714a1663996247c267efb5485b04cfa68161bc291d91758f7f84 SHA512 4ce424d90c83e5268925095f267f3365b0a75e60d92af83836c790f538d381153c200fff1a1e152b60e247240698d3cbe9a59c4e366040eece0101819775ddff
 DIST leatherman-1.8.0.tar.gz 815287 BLAKE2B a8377cedac49e0845e689e4e8ff58fb59e6e59c77e8cd363774d22650b4b286d85e0b5e52b926c3e4169ba2eadf9fc50f16f5161001a16f63c49f3ca66c996cc SHA512 fb308025f0807b12527fe6fc287fee861eb27b6987df38c03e1da73c477aec5a2a6c92860c983c4cc10282388ee34f2cf657a38831db007519c471f815f492f6
 DIST leatherman-1.9.0.tar.gz 815504 BLAKE2B 62b4b9aeca3279b7f89fba1c3a7655e59c5d490cb44ba92e4c2dfe5ffa78eeb02a448bd6c6e6b08c324531b799ab5d1800a3b57c4e490794f76bf9737db16963 SHA512 d8e0fe7f165845056a0308241ef0e656077269cd6cbc656b1a72295ff475e813d3f523c8d45b14d7e10a8deebe786ac7fc836c46d4230142812a9c0362cd8967
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
-EBUILD leatherman-1.7.3.ebuild 1150 BLAKE2B 0d173c50865b8b66b27286a2e0df530c857ba5a9d48cf81e363905ff2cb0668fb6aca0c282fd56a5d3713d79cde73079eb96c8726c786ebbb9ef32aaabd3071e SHA512 91b7cedb5026b117f5d538d50a3b2f6b3d8583d7eb4944bff08cbc3e756acd255fc5f6d199a9f77b06258c34eda317aff32b4878207e645cc93e17638573699d
-EBUILD leatherman-1.8.0.ebuild 1152 BLAKE2B ccc089da10bfdf3835dc76aeb5dd2f087e974014566dcf62dec23551f1acc7e67d4741cb0c7f2d8c25a51fcf89a516bbb5ee11960c7b148a1713211722288f78 SHA512 d5af35ebba8fd2dc44c7bd264c33c898667812ce95e3557a9f151e8c5b44a351278414ac93dc93162b8bcd63e2a943b5004e359f6a8f1184d8f50c81da839792
+EBUILD leatherman-1.8.0.ebuild 1150 BLAKE2B 0d173c50865b8b66b27286a2e0df530c857ba5a9d48cf81e363905ff2cb0668fb6aca0c282fd56a5d3713d79cde73079eb96c8726c786ebbb9ef32aaabd3071e SHA512 91b7cedb5026b117f5d538d50a3b2f6b3d8583d7eb4944bff08cbc3e756acd255fc5f6d199a9f77b06258c34eda317aff32b4878207e645cc93e17638573699d
 EBUILD leatherman-1.9.0.ebuild 1152 BLAKE2B ccc089da10bfdf3835dc76aeb5dd2f087e974014566dcf62dec23551f1acc7e67d4741cb0c7f2d8c25a51fcf89a516bbb5ee11960c7b148a1713211722288f78 SHA512 d5af35ebba8fd2dc44c7bd264c33c898667812ce95e3557a9f151e8c5b44a351278414ac93dc93162b8bcd63e2a943b5004e359f6a8f1184d8f50c81da839792
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.7.3.ebuild b/dev-libs/leatherman/leatherman-1.7.3.ebuild
deleted file mode 100644
index 3e365ff23fc8..000000000000
--- a/dev-libs/leatherman/leatherman-1.7.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-IUSE="debug static-libs test"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
-SLOT="0/${PV}"
-
-RDEPEND="net-misc/curl"
-DEPEND=">=dev-libs/boost-1.54:=[nls]
-	net-misc/curl
-	>=sys-devel/gcc-4.8:*"
-
-PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-	)
-	if ! use static-libs; then
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=ON
-		)
-	else
-		mycmakeargs+=(
-			-DLEATHERMAN_SHARED=OFF
-		)
-	fi
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.8.0.ebuild b/dev-libs/leatherman/leatherman-1.8.0.ebuild
index 335426971404..3e365ff23fc8 100644
--- a/dev-libs/leatherman/leatherman-1.8.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 SLOT="0/${PV}"
 
 RDEPEND="net-misc/curl"
diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index 63176a7c75bb..ce2b646d6475 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -4,17 +4,8 @@ AUX leveldb-1.20-memenv-so.patch 1877 BLAKE2B fa75c48f438248ec73765d959bbe746b3b
 AUX leveldb-1.9.0-configure.patch 990 BLAKE2B 8e658003078100ee071d79709532e37edec29aca816cd5864faea8f2cbad6d4212da09a268dec767b695823557f0d38744d13932eb0fcb50dee7ad065018ed92 SHA512 28f08e257d0f067d93ea88ee30719c092660ab7d220a55d4fa1cec5c5fd8195465e374670aa46c7a125f218ae3a689f3bb58ce66ddc720a2fc1caed552ed27e5
 AUX leveldb-1.9.0-forwardcompat.patch 3464 BLAKE2B 628e0898b9648d14bdd8a043b0646d8af0300310b9b03d7224e52b5be2a2be60d39934b1885bb602334aa64f5f3dbcd7d0ed32e936f3575047005f0d27e03438 SHA512 d55d4469a9cb118688233b82df3f19d08a8fb3f53a3d1d990d485a0cb91872eb2fd3699288369a96ee59739be730ce9437f9d1f8b51d095dd014adf475de7824
 AUX leveldb-1.9.0-memenv-so.patch 1957 BLAKE2B b26ddad37bba050ae2626aad164a3e403fc8ff3a050f79b08d11c19aff27d729bbcb51b35489badc4981f6ceee518482b9d8ceb30585dcc28a1a21f86d097413 SHA512 fbd1e43dba18b9dc8717651052323ea71182a758eccc3637f3ab1aade1a5de5b00f6a54ea0a8f34e2b9a91173b72eb23530ae77bc2b1ac0e454e0e2dfffcfd75
-DIST leveldb-1.15.0.tar.gz 205691 BLAKE2B 29ebe99ba8b2c44943a2c07c6c0e3a2136c53e15cbbb1fb807cb198b8849433c84ee5c4976fd898a84f2bddb38e543a0e45aedfabc1a46029ca23d39f8b0103e SHA512 af5b18a7750ac553659075c1c34aa2fddf6322b6837f096589cf5908c7050fd19053cd98d19fd7097e0840392b318f0166360d3a0595adcaaabcfdf393246775
-DIST leveldb-1.17.tar.gz 207037 BLAKE2B edeb366b9b17fec1a2bc0c0ca8636068bdd65dd1c017a4508c787714da0a202912d1283de9c77c94c9d34784fe552ab344e671fa351ec14f775b1e1037ffbef0 SHA512 d35401a92fa2b59c46e97ab94a9c70d0d5f97dbc7868a75354e088489338c078f47feaa3371489c481317b45ace6bd207d29676f5c18076ced86aa3f9fa44e58
 DIST leveldb-1.18.tar.gz 209376 BLAKE2B 08d63fe8aed45d38befd29caddee5a229ff847d254b30be55715793a621e840641d53af47e4fd93286ff0445d6001be26aa00063c075681659f7ceb692184249 SHA512 3d9c55a7bf8692914784ec33c273704ce9978496b071c7b661708f049d0d4ccd51a44441f50c3e536725caeb9896575192f52708a4bb1c0222cecdeec89919a3
 DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9c70215dd325daebfd93b30aa9bbe3c993a1758aa9804a7cd6f2c31df7cf98bdf98320cd1aebc14f5eb77d9a5 SHA512 c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2
-DIST leveldb-1.9.0.tar.gz 203872 BLAKE2B 5fa6d361d82bd386a722b24f52b851791555c6cf77939bd6b55feaa75f0db0e216f84b2b3d23f4cac3bf522fb5fcbbf8b7adb46e4731d0ba161c82124cde9abf SHA512 47b0a3272eef2d677ddeb8d0c973e59a1be4bff580528c3bc3f83a654f41485ecc86892d9124ce21ef747c220f98cdad687436849dc978adfd42f8c8c05b9160
-EBUILD leveldb-1.15.0-r1.ebuild 1434 BLAKE2B 9f38a16de6c75e7f6d0b4ac8172d7c7abbc6b95da6729c3ad67977dc17702486d1f5b10b28a7259ee8d7a32b9c6891666113f90e9fa797654bf068ad15314ee0 SHA512 686476d32f6922e79672b07c934662b09a2b9615b6014b9048dee4398fde71c8c26e46a47ee048c258568d5cd723ca6857db2fd046c846f187092b04e6dd15d8
-EBUILD leveldb-1.15.0.ebuild 1230 BLAKE2B bbaa78014b6f36a8c6d8e5a71ff56995b95f9fd195c54cb4fcc50d1ae5327eff1d4f116b60b79e03a4a2d561bd592eda2a5ad91c3dc09ba1e1d778ec9a50a296 SHA512 0b235df8d0bc8559a1e9b79498c2a3009134683a6edfe671abeb29e6a1517817622e03989e9d0c3a6e59aa6127b74a0f86ea6bb08c28974f1ca1dfb742c80033
-EBUILD leveldb-1.17.ebuild 1720 BLAKE2B 683381ebc3ae11d8844e52fb2c7161348a6495f4f83bd29369f991d4169619d526ae6bd1ed878bae9269715da5a9d7f80efc298253fa78c35aa1c7eea9b98bd5 SHA512 a59df720d900c7da98a4e0c9c865f5cb962b1843461289cd0a4e78cbcb5bcfff93b0d4213fde486df0a9f5d2dc7bfe86ecfec757c83513932fb1ab02859feb25
 EBUILD leveldb-1.18-r2.ebuild 1866 BLAKE2B a2d85d2b76188cf1da2b5651933c085eb91439b7385aaca594d3074124fb771bd858725745a0269e8ecd17e2be5cafbaee13cce5ca32550f0d4069fad3994be4 SHA512 f564389eba2fb0d5189c9dff09c85373990efcd412148e6bd53ab715fac22a29a0a405981768b5c40ed487f68d2aa721196dbfd94cb499e27d769126e2938533
-EBUILD leveldb-1.18.ebuild 1647 BLAKE2B 65c40aea5784964fcdf7550ff41f20980b61e3eae2e69ea790d1e1db1c3b152abb18c7ec679bbdaca21c2c91ace348e7b8a8bee53fa5c39528f1b0c1ac76108c SHA512 5a8feaeca45690fbb5d6f7ecfe7074e176532765900cb343107da542b32e61935bb0832a6682550d57a7e74bc20fec0469a7b0b20a1de9636f628fafd3de4193
 EBUILD leveldb-1.20.ebuild 1729 BLAKE2B 2dc41230f1dfd71aa7bc808cefda1000d2f0eb03c86c696a312082d052e534d0271b53bc8e54f0fe2fee43977414238b21b617b70434db1b4d000c9336dd2bb4 SHA512 072b10a31156fb1adf282041adbedff81c9dcf435413c3746abad0cba9d0af906ff5559a163bc4f581c0dd27563a4ed5f13dbd8d17cc5ffaf0a3c83a7e5a2530
-EBUILD leveldb-1.9.0-r5.ebuild 1223 BLAKE2B 7bbb2958034b96f22b3bb5e55fd9f1383e2cd01b7a523dc32ead090b31cefcf4299d581e85430dbec267746ded520ed21ddb89a5fad9c40a1f6a652677961ecd SHA512 a97ee6357c3e37208d7900f216e4d4270bd7b6c9add1449e3a0c52d49755a1be88f6008e9ae9bb6a021d3345fa57db18e3751073a63ccc8e4270e7ba684216ea
-EBUILD leveldb-1.9.0-r6.ebuild 1277 BLAKE2B 9e581129c37d33f46037eeef50916c5ce6916e6f671f01144b9f0f7cffed096dff724076f36261d552df6cd8f396a38725ee476258211a1cdbf42af9bef6b289 SHA512 ca4965119338028813e0cdb5d1b303c88ef2e2450f471f4d58e16a276485fcb001d6c4818097f5b0c47eb66ce1b23b561ad37809415654c4cee771d0ac17137a
 MISC metadata.xml 400 BLAKE2B 770ed89274db8fd29e68bcc792bd9f593ea0785ff4f1651d85902bb0272cfdff3914ecd98e81dea4160ad085e1e0da6938ebfa801b2b5484cf5edd6666908e24 SHA512 b7284da0474b747738d6da09be217c815ec8b333f2b1f571594531fb77ec15a6cf4564b6053dbab84ceb94f3bcc5d16ed374780852920a7ca823df0ed00be5dc
diff --git a/dev-libs/leveldb/leveldb-1.15.0-r1.ebuild b/dev-libs/leveldb/leveldb-1.15.0-r1.ebuild
deleted file mode 100644
index f2ea73b72f90..000000000000
--- a/dev-libs/leveldb/leveldb-1.15.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="a fast key-value storage library written at Google"
-HOMEPAGE="https://github.com/google/leveldb"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+snappy static-libs +tcmalloc"
-
-DEPEND="tcmalloc? ( dev-util/google-perftools )
-	snappy? (
-		app-arch/snappy
-		static-libs? ( app-arch/snappy[static-libs] )
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cp "${FILESDIR}/${PN}-1.9.0-memenv-so.patch" "${S}/patch"
-	sed -i 's/\(^ SHARED_MINOR =\).*/\1 15/' "${S}/patch"
-	epatch "${S}/patch"
-}
-
-src_configure() {
-	# These vars all get picked up by build_detect_platform
-	# which the Makefile runs for us automatically.
-	tc-export AR CC CXX
-	export OPT="-DNDEBUG ${CPPFLAGS}"
-	# Probably needs more filling out
-	export TARGET_OS
-	case ${CHOST} in
-	*) TARGET_OS="Linux";;
-	esac
-	export USE_SNAPPY=$(usex snappy)
-	export USE_TCMALLOC=no
-}
-
-src_compile() {
-	emake $(usex static-libs '' 'LIBRARY=') all libmemenv.a libmemenv.SHARED
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/include
-	doins -r include/* helpers/memenv/memenv.h
-	dolib.so libleveldb*$(get_libname)*
-	use static-libs && dolib.a libleveldb.a
-	dolib.a libmemenv.a
-	dolib.so libmemenv*$(get_libname)*
-}
diff --git a/dev-libs/leveldb/leveldb-1.15.0.ebuild b/dev-libs/leveldb/leveldb-1.15.0.ebuild
deleted file mode 100644
index 0b1c19884483..000000000000
--- a/dev-libs/leveldb/leveldb-1.15.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="a fast key-value storage library written at Google"
-HOMEPAGE="https://github.com/google/leveldb"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+snappy static-libs +tcmalloc"
-
-DEPEND="tcmalloc? ( dev-util/google-perftools )
-	snappy? (
-		app-arch/snappy
-		static-libs? ( app-arch/snappy[static-libs] )
-	)"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# These vars all get picked up by build_detect_platform
-	# which the Makefile runs for us automatically.
-	tc-export AR CC CXX
-	export OPT="-DNDEBUG ${CPPFLAGS}"
-	# Probably needs more filling out
-	export TARGET_OS
-	case ${CHOST} in
-	*) TARGET_OS="Linux";;
-	esac
-	export USE_SNAPPY=$(usex snappy)
-	export USE_TCMALLOC=no
-}
-
-src_compile() {
-	emake $(usex static-libs '' 'LIBRARY=') all libmemenv.a
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/include
-	doins -r include/* helpers/memenv/memenv.h
-	dolib.so libleveldb*$(get_libname)*
-	use static-libs && dolib.a libleveldb.a
-	dolib.a libmemenv.a
-}
diff --git a/dev-libs/leveldb/leveldb-1.17.ebuild b/dev-libs/leveldb/leveldb-1.17.ebuild
deleted file mode 100644
index 932d7cd196df..000000000000
--- a/dev-libs/leveldb/leveldb-1.17.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs versionator
-
-GITCRAP="e353fbc7ea81"
-
-DESCRIPTION="a fast key-value storage library written at Google"
-HOMEPAGE="https://github.com/google/leveldb"
-#SRC_URI="https://${PN}.googlecode.com/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+snappy static-libs +tcmalloc"
-
-DEPEND="tcmalloc? ( dev-util/google-perftools )
-	snappy? (
-		app-arch/snappy
-		static-libs? ( app-arch/snappy[static-libs] )
-	)"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${GITCRAP}"
-
-src_prepare() {
-	local SHARED_MINOR=$(get_version_component_range 2)
-	cp "${FILESDIR}/${PN}-1.9.0-memenv-so.patch" "${S}/patch"
-	sed -i "s/\(^ SHARED_MINOR =\).*/\1 ${SHARED_MINOR}/" "${S}/patch"
-	epatch "${S}/patch"
-
-	# lacks execution bit
-	chmod +x "${S}"/build_detect_platform || die
-}
-
-src_configure() {
-	# These vars all get picked up by build_detect_platform
-	# which the Makefile runs for us automatically.
-	tc-export AR CC CXX
-	export OPT="-DNDEBUG ${CPPFLAGS}"
-	# Probably needs more filling out
-	export TARGET_OS
-	case ${CHOST} in
-	*) TARGET_OS="Linux";;
-	esac
-	export USE_SNAPPY=$(usex snappy)
-	export USE_TCMALLOC=no
-}
-
-src_compile() {
-	emake $(usex static-libs '' 'LIBRARY=') all libmemenv.a libmemenv.SHARED
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/include
-	doins -r include/* helpers/memenv/memenv.h
-	dolib.so libleveldb*$(get_libname)*
-	use static-libs && dolib.a libleveldb.a
-	dolib.a libmemenv.a
-	dolib.so libmemenv*$(get_libname)*
-}
diff --git a/dev-libs/leveldb/leveldb-1.18.ebuild b/dev-libs/leveldb/leveldb-1.18.ebuild
deleted file mode 100644
index 4d12e3776624..000000000000
--- a/dev-libs/leveldb/leveldb-1.18.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs versionator
-
-DESCRIPTION="a fast key-value storage library written at Google"
-HOMEPAGE="https://github.com/google/leveldb"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+snappy static-libs +tcmalloc"
-
-DEPEND="tcmalloc? ( dev-util/google-perftools )
-	snappy? (
-		app-arch/snappy
-		static-libs? ( app-arch/snappy[static-libs] )
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.18-mips.patch
-
-	local SHARED_MINOR=$(get_version_component_range 2)
-	sed \
-		-e "s/\(^ SHARED_MINOR =\).*/\1 ${SHARED_MINOR}/" \
-		"${FILESDIR}/${PN}-1.9.0-memenv-so.patch" > memenv-so.patch
-	epatch memenv-so.patch
-
-	# lacks execution bit
-	chmod +x build_detect_platform || die
-}
-
-src_configure() {
-	# These vars all get picked up by build_detect_platform
-	# which the Makefile runs for us automatically.
-	tc-export AR CC CXX
-	export OPT="-DNDEBUG ${CPPFLAGS}"
-	# Probably needs more filling out
-	export TARGET_OS
-	case ${CHOST} in
-	*) TARGET_OS="Linux";;
-	esac
-	export USE_SNAPPY=$(usex snappy)
-	export USE_TCMALLOC=no
-}
-
-src_compile() {
-	emake $(usex static-libs 'libmemenv.a' 'LIBRARY=') all libmemenv.SHARED
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/include
-	doins -r include/* helpers/memenv/memenv.h
-	dolib.so libleveldb*$(get_libname)*
-	use static-libs && dolib.a libleveldb.a libmemenv.a
-	dolib.so libmemenv*$(get_libname)*
-}
diff --git a/dev-libs/leveldb/leveldb-1.9.0-r5.ebuild b/dev-libs/leveldb/leveldb-1.9.0-r5.ebuild
deleted file mode 100644
index 6a25a27fc933..000000000000
--- a/dev-libs/leveldb/leveldb-1.9.0-r5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="a fast key-value storage library written at Google"
-HOMEPAGE="https://github.com/google/leveldb"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
-IUSE="+snappy static-libs"
-
-DEPEND="
-	snappy? (
-		app-arch/snappy
-		static-libs? ( app-arch/snappy[static-libs] )
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.9.0-configure.patch
-}
-
-src_configure() {
-	# These vars all get picked up by build_detect_platform
-	# which the Makefile runs for us automatically.
-	tc-export AR CC CXX
-	export OPT="-DNDEBUG ${CPPFLAGS}"
-	# Probably needs more filling out
-	export TARGET_OS
-	case ${CHOST} in
-	*) TARGET_OS="Linux";;
-	esac
-	export USE_SNAPPY=$(usex snappy)
-	export USE_TCMALLOC=no
-}
-
-src_compile() {
-	emake $(usex static-libs '' 'LIBRARY=') all libmemenv.a
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/include
-	doins -r include/* helpers/memenv/memenv.h
-	dolib.so libleveldb*$(get_libname)*
-	use static-libs && dolib.a libleveldb.a
-	dolib.a libmemenv.a
-}
diff --git a/dev-libs/leveldb/leveldb-1.9.0-r6.ebuild b/dev-libs/leveldb/leveldb-1.9.0-r6.ebuild
deleted file mode 100644
index 397354b0f635..000000000000
--- a/dev-libs/leveldb/leveldb-1.9.0-r6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="a fast key-value storage library written at Google"
-HOMEPAGE="https://github.com/google/leveldb"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
-IUSE="+snappy static-libs"
-
-DEPEND="
-	snappy? (
-		app-arch/snappy
-		static-libs? ( app-arch/snappy[static-libs] )
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.9.0-configure.patch
-	epatch "${FILESDIR}"/${PN}-1.9.0-forwardcompat.patch
-}
-
-src_configure() {
-	# These vars all get picked up by build_detect_platform
-	# which the Makefile runs for us automatically.
-	tc-export AR CC CXX
-	export OPT="-DNDEBUG ${CPPFLAGS}"
-	# Probably needs more filling out
-	export TARGET_OS
-	case ${CHOST} in
-	*) TARGET_OS="Linux";;
-	esac
-	export USE_SNAPPY=$(usex snappy)
-	export USE_TCMALLOC=no
-}
-
-src_compile() {
-	emake $(usex static-libs '' 'LIBRARY=') all libmemenv.a
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/include
-	doins -r include/* helpers/memenv/memenv.h
-	dolib.so libleveldb*$(get_libname)*
-	use static-libs && dolib.a libleveldb.a
-	dolib.a libmemenv.a
-}
diff --git a/dev-libs/libbegemot/Manifest b/dev-libs/libbegemot/Manifest
deleted file mode 100644
index 49aa7df95cfb..000000000000
--- a/dev-libs/libbegemot/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libbegemot-1.11.tar.gz 266310 BLAKE2B c76b2b5e6fe6af0b55da779d6a98d52f1f519b717472338ce17bd2fd709bf397b3801782e1be89dbe2ba289ba9fe19c5527f544f1709770f019f2ad745ffbbd1 SHA512 ea5b0b548ad4240aa945ee9376e13a8ec5848bd9675f7fdc57c3daf1e79735e442c44a550430617a1048d5a0cef06adc9b48d45f42cca9f6049e3f3d0571e627
-EBUILD libbegemot-1.11.ebuild 396 BLAKE2B b74a5c021e0cba3bf0387e8f2f51558fadb19c788c29b52c3e8bb0c7ce60d5fc8383845577f8aac2d8476a135fa5b9780c2f6c84c2e361cc92cc3389eb74044a SHA512 511adeaaee30394ef93c87e1c82da2d650855b9cc3a705b2a11a00ba3e29301b928ff2f8764f09c96d2aaf97b3a4180b311ab4a8e86c6281d3212c2750406bdc
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libbegemot/libbegemot-1.11.ebuild b/dev-libs/libbegemot/libbegemot-1.11.ebuild
deleted file mode 100644
index a66e0e144ee8..000000000000
--- a/dev-libs/libbegemot/libbegemot-1.11.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool
-
-DESCRIPTION="begemot utility function library"
-HOMEPAGE="http://people.freebsd.org/~harti/"
-SRC_URI="http://people.freebsd.org/~harti/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-src_compile() {
-	emake -j1
-}
diff --git a/dev-libs/libbegemot/metadata.xml b/dev-libs/libbegemot/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-libs/libbegemot/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index c44fe6dbd271..dcc2fa59f7dd 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -9,6 +9,7 @@ DIST libbson-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54
 DIST libbson-1.13.0.tar.gz 5734887 BLAKE2B ce5c78dde31edc753a6678e90889a0da7129cd1fcf1dce7222df4d25ca109b1bfbb545c755abf8e4cc39dd40dde7ba4c50dd51dcfc67c970e2b8eb278bd543fc SHA512 d2f5b04b3d2dbdeba4547ec1fe8a0da7bad5214de92fff480ef0ff7d97ea45d5e6347c11c249867d4905b1dd81b76c7cfbb9094a58df586dae881955ee246907
 DIST libbson-1.13.1.tar.gz 5740487 BLAKE2B 92184df6f15f951564a7df14d8ec52eb0199a49af102d44c8fb7678db82a41f915c984e95f5301f533dde63139221cb6e161fa5053b9fcc33080abe1095d9c35 SHA512 454670a145a5f2272daa5ca88f2e7d7e42c9b7df62dfc29b3c4b602ef8f819a740890c40872fa47dc411cc5ef9a34b55a6feea3657a802a5be378c4dbe79f42d
 DIST libbson-1.14.0.tar.gz 6573651 BLAKE2B 0b1157473554a5aa49e61cf1c85dc7b1f1917581e661a4295876d4c93e72137b4c7c04e1b7545ba7272706499dbe868a36f1c888d2d07a8176f1c4dc01f9fa5f SHA512 99ca4001341d044a8ffc02a5d7175d40f8a998bdaad15a668a7db0558fa616ec18152faeda6da7f28b34c5d2cf4b649180c9390d2229e1342b6c4f6742816994
+DIST libbson-1.15.1.tar.gz 6699867 BLAKE2B afb75b6f50173bbe161a37a5cd3afd7d2ce3d9ab73019e2a27e2b15b0be0a54c5e3b423dda2e6d65b85ff7c1dbbd883f3a0e0ebc244a13c531d2c39297d9a5e9 SHA512 7544900809dd008da110b412acc1e5e42ea908d804fdf3bced8100e48f1695844605407c9733b285b8833b636bcaec8687df25a01c9749612c61df2325214fe5
 DIST libbson-1.3.5.tar.gz 4547720 BLAKE2B e5e258344aea0969ac74d88d040a464b72d460a13776c5c8c639e569ed3208fabd2641e850bf035c6889b466ddcc33d487da0aeab58f308bee7446b5fd0a31a1 SHA512 b55ae1d424f786aabed6567a77cd09aa26c74ab0a09392e88faef8c156b1650c026f86f245bc8431a0ebcf404c4f80eb1b22e978a24289d32692c84375a66596
 DIST libbson-1.3.6.tar.gz 4546329 BLAKE2B fa9102cd02e40e0ddb7518d34502f6ff63109b91af18a2285422530dae8c6cc04041b7589f340f2e6ed7a80e2474fea2684001b7ced5e8c911d4ba51e1a6edcc SHA512 a7da914ed0f03212d4fb01879543f0b2c7629923e33200fe30335a9a90a1082ffa2566c7a556b90a6c7ffbef5665a45ec67f87ffff2a5fcb89830769b1df5130
 DIST libbson-1.6.2.tar.gz 4835257 BLAKE2B ebe20a6c9ac8a4fcbd8e838d1a7cd319a6b31956690aa2dfca2be42eaafb646405ea01fe2bf20b2dc21bf933c0eafc330fd45409f7c902a7bf0c0641cfe0891d SHA512 f95f5bb829cff3aac6c1d95a159e38396d8fccef66d3026dac8085ba13ec376274cddeb92277d711ac4d40cafd8b89b73e9a9d1cf29e22f7f79aa9422c69488b
@@ -23,6 +24,7 @@ EBUILD libbson-1.12.0.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d68
 EBUILD libbson-1.13.0.ebuild 949 BLAKE2B 66d9d8d61397c5c09ae66f01fddf9f200a893beda6fc42d7de9d64bdffbae75daac11a40520a0cd228c7c41c2607985962f67007d689f771ecc54e82bf28e3c5 SHA512 efd6fa747afce9dffde09f23475f944a8df869ef4f997712f0ebb536d77c074a198955eea663f16de138684df5601298a9046e8fec1d4e6f17fc3e533b1b62c6
 EBUILD libbson-1.13.1.ebuild 924 BLAKE2B 7c1d43932fdbb16e0b21f81fe81d5b52adc60341463affe63746f6e014137721f3a300dcbd08e51da092336f5fb19357cbec2e667b09263c0773df21e7b3552b SHA512 78d83659129ef419351106ddc48584a5ba8de957df2f6dfe9dd6dd2bc00e7fa3aaf6023fd74ecffe57470a6324126fa5efed8b4dbfb547bbb588304eb7384f4f
 EBUILD libbson-1.14.0.ebuild 1011 BLAKE2B 1fd3f9eabb58d7851351e122f0e5f1c83705aedd9fabb60afa4479d4ff54f3e98b83502c526c9b7737c4e00f51ea0153c60dceadcde3e79e3dc829f6b3124a84 SHA512 389b9149d0b3a3e47bac57f9c5435586be324493ee194349225850a84590de921ac189af4f4438ec87164029d74d267c0a12c2ee86941a244e5f9a6ac183b4ab
+EBUILD libbson-1.15.1.ebuild 1011 BLAKE2B 1fd3f9eabb58d7851351e122f0e5f1c83705aedd9fabb60afa4479d4ff54f3e98b83502c526c9b7737c4e00f51ea0153c60dceadcde3e79e3dc829f6b3124a84 SHA512 389b9149d0b3a3e47bac57f9c5435586be324493ee194349225850a84590de921ac189af4f4438ec87164029d74d267c0a12c2ee86941a244e5f9a6ac183b4ab
 EBUILD libbson-1.3.5.ebuild 1145 BLAKE2B 6467960799504edf6ad9ecd42af2ec474e0884cc63380cf736a0e771a5994f7aac46236965c5345dc4f5576ea4fdc7070c9d4579a1189e96dd9200dcd079cdf5 SHA512 015f73d09a48b70c80943cccfcba82a4978bcbbf72e41d5f44fb3137b81384f78e3811528f5292b4d57d88ebfdeab03f2779552ecd0359b5a460d054eabe83e5
 EBUILD libbson-1.3.6.ebuild 1127 BLAKE2B c712b6aa9fc634c293446adeacdd8c7d97056a2c219bbf2bd2954f911778b7001c091e2044c3ab607e576d4a3124121576aaad528d0f1a5c9f2b549c43008117 SHA512 0b814d017de2a19d79dc7502e9b25d924b20d4358c88b5a8180695b2559b9ffde1bd906180614548551c7e5cea2fc528485dd5460989d14cce8ba0f61c6b6ee3
 EBUILD libbson-1.6.2.ebuild 1029 BLAKE2B f0a06a4ce9183946888f5ccc420e14c14ea2efa69904816355d5cfba5f69ead47bfbd385f2bd9b905e9af670f9476be3163551c1677694c6ebd55091fed46a0c SHA512 1dfdf5109c4ddc3820fa445c22aa0f8ca49bd141cbd6ef733bcfd689dce291b31073f172e53054f241d6860eff34e76411ab77fb381948ee147ff1d1aa4a6843
diff --git a/dev-libs/libbson/libbson-1.15.1.ebuild b/dev-libs/libbson/libbson-1.15.1.ebuild
new file mode 100644
index 000000000000..a21a401d4d66
--- /dev/null
+++ b/dev-libs/libbson/libbson-1.15.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
+HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
+SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/mongo-c-driver-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="examples static-libs"
+
+DEPEND="dev-python/sphinx"
+
+PATCHES=( "${FILESDIR}/libbson-1.14.0-no-docs.patch" )
+
+S="${WORKDIR}/mongo-c-driver-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_BSON=ON
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MONGOC=OFF
+		-DENABLE_TESTS=OFF
+		-DENABLE_STATIC="$(usex static-libs ON OFF)"
+		-DENABLE_UNINSTALL=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc src/libbson/examples/*.c
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 55f4d078317a..fc22ebb4862c 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,3 +1,5 @@
 DIST libburn-1.5.0.tar.gz 979953 BLAKE2B 7fdd6d8314d65547e48baa3bb7c0b8f94c5d5a799e62d79d8dfcd5de644c555be437fc7c84134598703b9335c2330c49e8c7c7adbaefa9e1f288109e0010f8df SHA512 c524d672d79db2f6dc22f6381cd422ddaa3b61d6741c998c773772722e37c53576ae9549dd17a33c2d020c66857ecbb948f353bc22cdf28c2bb115bd2b82d4a2
+DIST libburn-1.5.2.tar.gz 988375 BLAKE2B 838a19e1e99786633e13f7265eb90922a82d5b3b2094e1397ad6eb3ec4b853ad9d18e3377e2308724a94bf99b903b856ffa3a0b98b6404f874845933ac3da18e SHA512 a8887907bbfcd9b743dfc2e8924cc9290d7af5a71651aeabfdc5874f2df076278ccdbc94f81efd6a720972f380512d330576739837ba685055ee717dd74797d3
 EBUILD libburn-1.5.0.ebuild 837 BLAKE2B 07610778a96cd06a233651aa98cde8e94b058794400b4dcb0d8bc7ce845c42d2702b2eae78a9018900f6b574ef2cfa84feeec70108e0c8cdb1fb6f037310b65f SHA512 6f7964daf2343c017cb88e87b1d9d064fa4e3819e42a3f1fa1d0677926efc0d1ded1d0a53c31fbc515fe82768f82da08824590a71489b56f9ee773d548bcb66e
+EBUILD libburn-1.5.2.ebuild 847 BLAKE2B e53346b68d0581aa21e9baf0481789337029f81b470690b49c91ecec725b98136ca97ae5cca990e000cee1031d3afa52ee37eb53ba1a03d941b82636c8bd83b8 SHA512 e6ff684fa8582d58cd3e0753c2fd6bee3939b75dd6ef413039d6af103f6fa9f93f49c6ef9782db7a3e3a97b8d65067d76d3c0fb830b4a75aa48a09362fd7a639
 MISC metadata.xml 374 BLAKE2B ed3416052b36f8644d2231fd2d4d16e4177fd2feb09f4e5d81222dc9b4fb32cb5772d8eb86a739fc8ad11e398013c50ec802685848cc298a9e7f5efbe8928879 SHA512 1b78c0e0f60761b001b44216ac4c3de7fb6491a4d8b79b45c6e1f81f438df95ebe2cb70b273ed4a470283ec6e57c91d4fb1981fb365ed61a692214bed4097860
diff --git a/dev-libs/libburn/libburn-1.5.2.ebuild b/dev-libs/libburn/libburn-1.5.2.ebuild
new file mode 100644
index 000000000000..3be51babba79
--- /dev/null
+++ b/dev-libs/libburn/libburn-1.5.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	--disable-ldconfig-at-install \
+	$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	dodoc CONTRIBUTORS doc/{comments,*.txt}
+
+	docinto cdrskin
+	dodoc cdrskin/{*.txt,README}
+	docinto cdrskin/html
+	dodoc cdrskin/cdrskin_eng.html
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libe/Manifest b/dev-libs/libe/Manifest
index 4fb8bb7fafaf..348c57d391bf 100644
--- a/dev-libs/libe/Manifest
+++ b/dev-libs/libe/Manifest
@@ -1,7 +1,3 @@
-DIST libe-0.10.1.tar.gz 412727 BLAKE2B f9602d728e8d85ab75411bdd0e288ca66e680e527e1a679a1f513f57dfd0cbab4c0dafd78d8ae9ed94b1a106779878732ccbd5f0d6d0b0a654f069e664373e31 SHA512 aa81d6740e46accd7bfc26fcf5b53c6cc43556b897f2692cff1db563c7a5869797c540669d3bc8b4a0aee9442a7b92ef6690fa8384bb3ef38aed40f065a5ab5f
 DIST libe-0.11.0.tar.gz 414542 BLAKE2B 5b7c312b837659811cca7e64c0006fb5b3378086b82f44b5819f975a11038cc305338555d60758e1f8435672a855668ab2e6719a4a42c9c7d596ca4d35a1aa5d SHA512 178003b19f5ad2b3503a929bce131d329e5eafba9f46ae3343cf4271e248ef883b84945e642239a7cdc96185e1b975bcf62004831042c2ab232e7813efbb5339
-DIST libe-0.9.0.tar.gz 411601 BLAKE2B a9d0653e2508656eb4562e16ceda0f8fb0b8694b7d3ee4561d1f37d3ad34db562d6b40088e3655c179eab8f9099980bf8d1ffc66d248195fc39e74e17d8eea68 SHA512 711097a59814b0dac9ca26dcbc30678060dd05d05e8f1a311b3f8b0dc67ef7d4e5d2b4150f51bd881acd4dfea067c79d37841d182881f1393a73cbc7beddc492
-EBUILD libe-0.10.1.ebuild 529 BLAKE2B 0a963ab870e16e3a397bc7fa5273fa37caf543a50c1597f90a186e2e85ffdf45c4b8fb2c74dcad2490d081919cccf5fb42fffc142785c908965b5ca913c8cc07 SHA512 3201a4088c8fac57fa9084e61c3ddb4b6962c6028024ff31095e7267cb799983bd734cee654575ca1f236d82c714b54f4a9c304e3c680b0d17b2408a5e689b61
 EBUILD libe-0.11.0.ebuild 529 BLAKE2B fb93bfe1be9e7d509caf08796ea516086ffa94199d95b715ff4a9e3cbef7fb1ed1f7c91910afa63eea3d9a1913f7dbaa5952a1bb998bd6dbc096cb1799b0630e SHA512 eea4f6e3820d187a0d5f128e943493211571e97f2761f99fc8df36c9e043fa4eeda725b359996302d5d8f061f856a87dc85e1b3105c5f68133ebead0da0e5081
-EBUILD libe-0.9.0.ebuild 529 BLAKE2B eeb0c89cdfc2e7c9b3c7654a0aaba0864bce3157dac865b7c65a68284293ee81ebe3eee397ed55f99f7c339b82cdd911690371ba3f8ca21a645859b3f5c48653 SHA512 367e1a29709ab738ba56eb5e54c59cdfaa2560e9d6f9774dee8d208083c1fb49c18f220b1b4c4a78788fd91ab0873f9c02744c6c02ba99c8a58445ce997125e0
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/libe/libe-0.10.1.ebuild b/dev-libs/libe/libe-0.10.1.ebuild
deleted file mode 100644
index d6bc1d4fdbf6..000000000000
--- a/dev-libs/libe/libe-0.10.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-# bit messy at the moment, next release should fix it I hope
-RESTRICT="test"
-
-DESCRIPTION="Hyperdex libe support library"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND=">=dev-libs/libpo6-0.7.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e 's/_strtoui64/strtoul/' e/convert.h || die
-}
diff --git a/dev-libs/libe/libe-0.9.0.ebuild b/dev-libs/libe/libe-0.9.0.ebuild
deleted file mode 100644
index 183694fbe184..000000000000
--- a/dev-libs/libe/libe-0.9.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-# bit messy at the moment, next release should fix it I hope
-RESTRICT="test"
-
-DESCRIPTION="Hyperdex libe support library"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND=">=dev-libs/libpo6-0.6.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e 's/_strtoui64/strtoul/' e/convert.h || die
-}
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index 8de94b5f7ed0..6d074a4415b1 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -6,6 +6,6 @@ DIST libev-4.25.tar.gz 545817 BLAKE2B a6ce69ba0a5824afc9e49afa8dba67f15b5945bb01
 DIST libev-4.27.tar.gz 556658 BLAKE2B a4cd33aa9320c0c81912b50c0f03cd338e09e9c1c63f14d682317322a3c875229b2317af00a48e65be9e56b165b994a385692b103cae7c44012a1281e764f27a SHA512 18fbac15c3a24b2efcd547d98d423fe59a1684cd3afe7ff25a3da54d8df3e11f351df455657d830df93366853f74d584f6e47a7c9ffaba84aa586957bf39ea82
 EBUILD libev-4.23.ebuild 1076 BLAKE2B ccb46133baf1abbfbe8999d6763201819ecd0ba91d2035cd837c059eb2f575d851b1093d83bb951c74f29a50e1c82f563d583f6ff3991a323b6f1e9932602ed8 SHA512 1e001c0b698429b355e0c4e783676edb4a3215a9c184ea423e6d91b637132c42d5839a7422300fa064d4b88f057948937fcf1b65648ba6dc763425505eb2e9f7
 EBUILD libev-4.24.ebuild 1093 BLAKE2B 70318df4f7926477dff4822bf6a53b6769a70d093eadf8eea12264bb5f7bfdece5c4846b62b5fdc86b332590ac3902029fdd12ae69968af2eb789d210bb7f9fe SHA512 0071e46906d078048052970e511285c95343f141ad1f871e52a5b329990caa3ae731dd321562851137f54d274235c665e1c39f00df791f1110bbc4f85d51159a
-EBUILD libev-4.25.ebuild 1124 BLAKE2B 287e487fcdd92c3a1c0a867a99b7e8499e9515d709349cd6674030400fad46e8963b969d37a570a0b8d2f3bb3ccd23da71b478311125147a3d7a46417d8e309d SHA512 114717b614ec4557d4e53e5fd353c2ffb9589a127ad63e990997c6516f4765964af6e0b4aef264c8eed18c4e437edd8d86c87439cb3772bce6de80684783c2f1
+EBUILD libev-4.25.ebuild 1122 BLAKE2B 72a683a63c004ef07500cf7f1f0a381ac862ae2e36eb459c5da2482ac3b784469745810155f4001acc1c63a51ec241bc3b326066ddf89cb67273ad1e8b9adac3 SHA512 9531e11b30ceb7d8992181b93f28e939735d40ad6c12fec3151ee21683f77b6b4eeb9c0338a2f9216fb2f70580c9689484728d7698a7d96af45b230633ee7dd2
 EBUILD libev-4.27.ebuild 1139 BLAKE2B 0b8c753c1f77f9a3e7b1486efdcd499031a8444d7c41903e5a04fd58fff1160ab8b29640ace1785fe2b7a3c2ab1f9a50ffff682e04702a1b545274551f36e7e7 SHA512 acdc3bd84f41ed391df8e9f6f5d676fe8ff009b0a897820d403714dcf0983caf8d6374897cec644a65b256c946aa4ebb8f7dd488cc063fde470af07725152b80
 MISC metadata.xml 246 BLAKE2B 65c152b918cef5b72db59bbb3fd1a71a6fd444bbbb3e95a87aa880e23f33d418b96f842f4a2070ad1bbd0c1d1c3753e935841e6fccf088954bb58f297b672dc4 SHA512 9977bb6fcdb8374bf6148fef57fa31bf04fdd8eb3701ecd75be5ea62a48382fb0ef703b3d01bbc996f91322b6fd0f8365dfa4134426770fa98d624d69d8073d9
diff --git a/dev-libs/libev/libev-4.25.ebuild b/dev-libs/libev/libev-4.25.ebuild
index 2480cdb45c60..65e7f7475e68 100644
--- a/dev-libs/libev/libev-4.25.ebuild
+++ b/dev-libs/libev/libev-4.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="elibc_glibc static-libs"
 
 # Bug #283558
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 6c5f68e1c63b..80d9d567182c 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -6,5 +6,5 @@ DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02ad
 EBUILD libgcrypt-1.8.3-r1.ebuild 2292 BLAKE2B 38d4a9d686f779239cff3c17886f080de25659644cc85f2f3aa8a8edff513796bc422f21cc22bbfdfd76d295bd50cc2efef05e387364b43bfe044b0d8919f510 SHA512 8e63df596a948a263d9ca3f8cf61c754e4de3c44415f2caa8302b78a82a653609f507b270533274d8d6f13bf10ccee51b5ab4eb8533decaad5f392b4f44f2fd9
 EBUILD libgcrypt-1.8.3.ebuild 2164 BLAKE2B 6eeaf43d21631f90044c7bd235f1babaa3fb7289c4f98efd5925b136862460977ffedbda6a6077991da97292827fb2e287d94fd80ac718331ff7215aa6cb902b SHA512 98fb08e085e9eb8c434284da991012b2fe9c299e2f264700b078a1200b22872a966e5747b8cfb0a641d08028a7c164c1294f5f46b375349566f31bc94afcddfc
 EBUILD libgcrypt-1.8.4.ebuild 2299 BLAKE2B f9abd685b5e83a619f2368c2761db3e045f229d007c8b5256756514b26654a356102ad844ac4938c06261c9705b253751fb33d765d1ebeb8868e94f0739ad61f SHA512 a201729f2b2240aed59732a3056c4af64f240f3dc9d67938ab9a2c1e4f101f02c08bbad92cd5b5e18e42865796b9fa9570b6f65994169d08a9adde7e80c87d94
-EBUILD libgcrypt-1.8.5.ebuild 2289 BLAKE2B f1c1497fa83f56cff96e22e63395911b231faea4b8eba4936b7759013b60ef08b8c2a023274a0be2b31ac4f50902897114b94ea7fff44303c733cde0b6b3d991 SHA512 4aca14090f0f2809e858e81826d0ac4f489b0c735fd4afe4d75ca3308808e29cb704aad0c5c950a1ef64df4a3a486d15ef355fea59f0a42f6f7ac06e25b789a9
+EBUILD libgcrypt-1.8.5.ebuild 2288 BLAKE2B 83716796b83f99fa246e558e71cc8fbc348c71677dfe39446ac23522801929e0b1412d30d2a057d38cf728b1023b1c9ddf6cbd0b593ac170e0ece34fc8d3ed5d SHA512 f87e367bae547419381d7758c000bd5d86dd7add06336f41378b5db920a5923aeb38b07543f4b163c41e7a05fb42c10a20e5328bac72bd19803b1bd7477e016e
 MISC metadata.xml 520 BLAKE2B bad7a2483330a66817b97b268b4bdedc48665f7697d8880263c890e74ca279616d857fbea686329d38385668e7b71c4ed5caaf42eadb49c0e0fecd1b4f23615f SHA512 26704a1e1e8d37cd7ea9002a0e2ad8cd0585b86486dcf8e3a419cce7945fa41b170f1e563ff62cf0a1ecc776b0a04c463cf4e8424ccb953484d2adfb708cfbd4
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
index 58a9e654361e..9ebaaa0c2060 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 95bd0fa323a1..eaf3c39113a3 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -4,5 +4,5 @@ AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091
 DIST libical-3.0.5.tar.gz 881800 BLAKE2B 64f95950cc6f128c9ea475129e54d9c58b26d9866f8183762d34c996934a1b2bcc528c47442357a12fb6444831caa8f39772a6810d81f8c0b6596fd724f0de6c SHA512 9bf24b535864f66ea0b8d52d902d15fbfd20efbc480b5188ecd1b3d4aafdba063219763f99a8c30413964f7a024c7a902bade6bc40224bc59a438e672f65d656
 DIST libical-3.0.6.tar.gz 879939 BLAKE2B 365e16cd7011df7e9e8bcf011035aeeb904a511c5a0ff76cde5b559a7c56049646108d1c2b499cd044e2784aef7bb1370ee3dbf88c24b745a349a0ee7c312157 SHA512 d1a3397071c2989983893e3bbaeb088f7cb9a3639dca39709e9422c334dd1e9a869bba9292a250f83eb2a5b6727bd91b73c8e420bd1814422d97aff9fc6b26fc
 EBUILD libical-3.0.5.ebuild 2063 BLAKE2B de5f7497391cd3be77755b00b034ea61d584cc68c7ac10f6270d14387a237b753f0ca8eceb2fde5ef9e6d1fb5b2fb479dcf0770f37b8959f6e094fb53f16ff00 SHA512 7fc2aef6bb07ecacccf61471b7f3ba429b11d2026cadec9e531ab70fc40bf1a6843b214002f52a5e8295258613b6c5bb21ee7816a1f8cf2df6fc269fada0131b
-EBUILD libical-3.0.6.ebuild 2284 BLAKE2B c7a023ea2f55a07bfcd1bd4ae01595bedfcc114e67e99f382b340654989707339bc5f24f4509e2c6fa66d2ab0f758442b9d09c616970a0df1cbb6b658e7b0fea SHA512 ec6fcca1bd101b87e16d9e0487c1aafde113e2b6740fc3832a37fe8ec247328304810def0ba52ef73268b0c77c02b7e769732159403042a22defa39559657f04
+EBUILD libical-3.0.6.ebuild 2283 BLAKE2B 2977bf90429e2c3748ea3ed41c7a1fa3da2c436fde2a1badec129b984a04294480fd94900577b426267d2d9228f2e83ff1cb10e10636816f09b7cd892cc6f066 SHA512 a4577b44bcce86bbcdd353f162b047b3276168ade45d753f14eb839c694b5e32f86c52e4b10460dfdabdff08a6c591016cfc17bf7f1a5a885ebd16a177441cfd
 MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/libical-3.0.6.ebuild b/dev-libs/libical/libical-3.0.6.ebuild
index 2cd4dc69c9ee..decef5a1b82e 100644
--- a/dev-libs/libical/libical-3.0.6.ebuild
+++ b/dev-libs/libical/libical-3.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="berkdb doc examples introspection static-libs test vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index 7d4da4254649..3b6baf5d3714 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,3 +1,5 @@
 DIST libisoburn-1.5.0.tar.gz 1550656 BLAKE2B 447c383b3847b7ca0c4aca73f5317dec03ef79b34debc3ad2149fae4e7216f29c4a0dd918271087b530fb6c476b219430159e1515bec4bcf51c47d5b2ee05d89 SHA512 c74a9e2887244c28c82abe70d2603dbcd49b639c370e5b7fea03aabce59ff2b361345cd6ec88fe8152727e8a416d4759b88d91e2b5aec8a697408e00b7dc9e4d
+DIST libisoburn-1.5.2.tar.gz 1564700 BLAKE2B 5c7a77f427adff46923f9dc8833f40db36f6ac1ee3b0e58d0111a03ee5c7ae5cc60d613f47d4bb64b848feeb24599b424284cffdbe5c1eebcf7b5e3c58b19b53 SHA512 b481aa5ff20bb35ab0ab19f3f4f3ebc4f2baa8366a14a5afe4f262788441679b6501e140e182f4e80045c747f1cf48db40832d8d5cd064e58a02de2882536897
 EBUILD libisoburn-1.5.0.ebuild 1831 BLAKE2B 8668b61a0732dfa562df9362afcaaa6e9c00938211cfe4e1b6efa91a968ad01aa68b7f85debd6c25946f425cdd976f5b2cdb4a36f9ebe72fc3aea6fc532e04bb SHA512 1c23c13158803e6fc631a2efacb66f654269d111dd36b62fc5d8e48ead6745d8b79670f60158b4c190cc4fe3a52eaeeb5fa74f40accd5d1da4e50e8077ee1bd9
+EBUILD libisoburn-1.5.2.ebuild 1840 BLAKE2B 05a5666b81d848ee6c841bc7e82bb4768d76f7f329e9ad5af8b0a523d423f9ec52d5b0ebe4bd87ce4a0569a71279e16f91c6db9e4d4be1bae95426dc9bd9519d SHA512 26b28195ee02de2afb5255876befd7dfc78664a191986f9a131b292f9d196bfac6299e471e44957286aac40a2601de8daba15a8895890909b8aacf722efdb6a0
 MISC metadata.xml 829 BLAKE2B 3a7a3c710e8886e60f6447baba781e98cd29d64daeae498ed8423ba40ef08258e8b249530666c487a1ddff81e837a97dfa6a9746872ee1feb7c66dd949471edc SHA512 0a3690bc939275faf4c7179c1e26d4dd93464820d3c21e8694119faab3a417b823661ac399f33d423793b2cc234828445a5d6af7d5067150b5e5a3018ecdae7f
diff --git a/dev-libs/libisoburn/libisoburn-1.5.2.ebuild b/dev-libs/libisoburn/libisoburn-1.5.2.ebuild
new file mode 100644
index 000000000000..7142387b37cb
--- /dev/null
+++ b/dev-libs/libisoburn/libisoburn-1.5.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl debug external-filters external-filters-setuid frontend-optional
+	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
+
+REQUIRED_USE="frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/libburn-1.5.2
+	>=dev-libs/libisofs-1.5.2
+	readline? ( sys-libs/readline:0= )
+	!readline? ( libedit? ( dev-libs/libedit ) )
+	acl? ( virtual/acl )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+	launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 )
+	launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 )
+	frontend-optional? ( dev-tcltk/bwidget )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	$(use_enable readline libreadline) \
+	$(usex readline --disable-libedit $(use_enable libedit)) \
+	$(use_enable acl libacl) \
+	$(use_enable xattr) \
+	$(use_enable zlib) \
+	--disable-libjte \
+	$(use_enable external-filters) \
+	$(use_enable external-filters-setuid) \
+	$(use_enable launch-frontend) \
+	$(use_enable launch-frontend-setuid) \
+	--disable-ldconfig-at-install \
+	--enable-pkg-check-modules \
+	$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	dodoc CONTRIBUTORS doc/{comments,*.wiki,startup_file.txt}
+
+	docinto frontend
+	dodoc frontend/README-tcltk
+	docinto xorriso
+	dodoc xorriso/{changelog.txt,README_gnu_xorriso}
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index 00f30bc06721..07d4f0d997bd 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,3 +1,5 @@
 DIST libisofs-1.5.0.tar.gz 834099 BLAKE2B 57dbdb4173df635d2811c61a0b88e49f617b628909a6f87eeca7715a2c94b25b381860722cd56752cac28993bb314c9b0371ae5c0ca73e37044192f50aa47179 SHA512 1d0bc488c18b95971b7aa89765d7b5772b64d17eadeae9ec52c0f880c6f68acee80ee39b603752a1f9fbe0f35029c27023d5a6710d149a0f568bb396c3dcede8
+DIST libisofs-1.5.2.tar.gz 857346 BLAKE2B 25e03054e2bea2dfdbe07af77eed07a94e98288d059873c6fd06dab9b7dd3985af585a8938a11bb6834034a545fad4240546bd307ba83411d566b2a3dfbb7c70 SHA512 65048f2e33e96091ebce5b432ea607242050a3561c8eac18364bbe966d38c4f12ac1f4b38da5ea95ad4414f2b79b5fca99c1c0827e754bbbf6f7668d7e2c2bab
 EBUILD libisofs-1.5.0.ebuild 958 BLAKE2B 4621b9fa67538fb5d88f623a97fbfaafec4240cd634bb7ab85cdd0bc3e81d1af2264d9716f1274e6f83e73d53285e4e9ee9c74c3a4da53c8eb2a0f021e785365 SHA512 f1173bbfb7f3def135b7eeef2cd68c9286234727d7392b2a3616564f31b12acff805e72225060d06d037f07110fa8832cc2ea6dda0c6e45d2fb6fc12d83e1c14
+EBUILD libisofs-1.5.2.ebuild 967 BLAKE2B 77cf7ba476381df2d7b6eada717502fdc36ebd059327bd86f18467f35bf67bdf0019f6f16d11037261f8ff50f5c1cb3895c298ae23cda61bcb2dba5f87d6c47f SHA512 8516bfe16db4eb5df427851096f0ed27fb529d3cf821624bd8fb8d59ae1fe8c0197bb0dad9dcf099174950bc1946f0b58b50c9a403b2493547d5a920b56ab337
 MISC metadata.xml 320 BLAKE2B 04767bbd76091dc5cbb1d5aad9f7c8b1adf5f36a98b82efb2047ee8c60f7c341b8cbff45c966bc549d975a7d7f4234609a47090cd8919a19c51b9d290c263366 SHA512 cce70181ca955dc89d0d02186bbc8fca4608e41ac59b00ad1e10dca94fb259797bf93d9bf942b38d00feaad274f85c0b79ab0f5e672dff405af799a4799871ce
diff --git a/dev-libs/libisofs/libisofs-1.5.2.ebuild b/dev-libs/libisofs/libisofs-1.5.2.ebuild
new file mode 100644
index 000000000000..0d969ee783c8
--- /dev/null
+++ b/dev-libs/libisofs/libisofs-1.5.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
+HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl debug static-libs verbose-debug xattr zlib"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	acl? ( virtual/acl )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_configure() {
+	econf \
+	$(use_enable static-libs static) \
+	$(use_enable debug) \
+	$(use_enable verbose-debug) \
+	$(use_enable acl libacl) \
+	$(use_enable xattr) \
+	$(use_enable zlib) \
+	--disable-libjte \
+	--disable-ldconfig-at-install
+}
+
+src_install() {
+	default
+
+	dodoc Roadmap doc/{*.txt,Tutorial}
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index 8a82c358e990..5e47235b1ad4 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,5 +1,5 @@
 DIST libmirage-3.2.2.tar.bz2 234131 BLAKE2B e3f2825b9e799447a6201f8d46fbb8cf229a5393c73d85ee8a230225603f5e42cb07af4e984aa8602fcce667b16c2af7e2ef9d27862022327a39d0b7189c1eb1 SHA512 f41a095d7a9a3bb0d00ac2bfb8ad443d8d065f446ca2635041e24a570b72c14a27d3c3b300d5fa941253284c4b05b1913715c1169cd26a80db920df9d27cd535
 DIST libmirage-3.2.3.tar.bz2 234761 BLAKE2B f3fc24dae81643c4fea99d12e4f7f1d600586a7c5e546e854d4391ecb11f39a6d1108ac86c79b917fb96cc53424975ff548522a0f0e035ffd4b99638fc18608a SHA512 25cc3ccfac9332d06edff7e73d992e9d74b7464f61b857c3fb40ec9e2584a8f61b8aaef96a6d6f4b8f3a7c871b6b7b7803502d5e1ef771fc239021a827b90f09
 EBUILD libmirage-3.2.2.ebuild 1128 BLAKE2B fbf5a809841d07edef43316e9363c6405d1262c422431f3623b882df6f0972cf1ba43bffaddb608ae865ff8d26728603b08169199e61b40d1d5b2bdb81950977 SHA512 a793624c4915c326d3fc99dee5ce2a103f8f82bd3322ee83ff438413fc0b1b1d7619d40c74b5cc7cedd9a708ad69f405ca5ca1ede848a14bc118a656905702fc
-EBUILD libmirage-3.2.3.ebuild 1161 BLAKE2B 3661674fe2968ba2e4257219aa4bd636f16665752c611e8675f2848ed8c4c2fdf434f207b1f80ce928dbf681e4e45b5986ca22721be1a79dd5dc47ead508c1dd SHA512 0c01bf4477189aa681db1b9fa38733cd7eea631aceae3a697ecfb16a2306dda440015e90e471bff04085a49f42a1d0958c0b2ff87e07eb10b26a08fc96a4b5cf
+EBUILD libmirage-3.2.3.ebuild 1160 BLAKE2B e5a33aa6a2d9c3827a7b49b0de806072c291ee8a16f5448542508ad3a5d03edbfe2e3f479eec61e9a40f24d3ca1001b244486e04cdd44a2debe26d81ed3b0b91 SHA512 bfcaabfab5dc6b9f265cbfddef81c61ac975d0e1ace22fa300943cda0ecc1c28c984b4719e8fe88bc2a6e07ab6f24ce457a7480db730d8f210cbf46aef5ee309
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/dev-libs/libmirage/libmirage-3.2.3.ebuild b/dev-libs/libmirage/libmirage-3.2.3.ebuild
index 28c1c7527cf0..7e744521c1fa 100644
--- a/dev-libs/libmirage/libmirage-3.2.3.ebuild
+++ b/dev-libs/libmirage/libmirage-3.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/cdemu/libmirage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/11" # subslot = libmirage soname version
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc +introspection"
 
 RDEPEND=">=app-arch/bzip2-1:=
diff --git a/dev-libs/libnfc/Manifest b/dev-libs/libnfc/Manifest
index 8016541d343f..c774641e9b27 100644
--- a/dev-libs/libnfc/Manifest
+++ b/dev-libs/libnfc/Manifest
@@ -1,8 +1,3 @@
-AUX libnfc-1.5.1-glibc-2.17.patch 248 BLAKE2B 24111865fe8724814f4edac0bf418f6386c41bc7e89b04061be6d5e0eeda8070dfafa0032088b0441885323ac4151c70e5e5be1a427746a9535e659fb593a789 SHA512 de0a95e25de757c4892120137e481940564e1efa079e061f626b20576c4f46b45d3f493c4509383d5a7932c065d6ddb524a34be906996d40c3226c3afdb8b346
-DIST libnfc-1.4.2.tar.gz 487310 BLAKE2B 9a92bebcdf5e28245b8087799d65ee67b3133d737aba781af19732bf839d16c40509ef5d87bca67a2946925a5265ad2b949bbbc93dd180c9b146615fae6e2483 SHA512 96710f1a808ab1cf90d86f687ec82339a3efab78253f840fba0188c01beadb326f1b521b67a8b7d47b217eae63ff6c5ec3906b4cbd743afa970aecf801b448ef
-DIST libnfc-1.5.1.tar.gz 534349 BLAKE2B b7d1654f596040dff81d8f6c42c9a587827051adb6883c70f51d6ed3a7839d981be921d0fac96697e18f66cdea93f1ca476bb48aae6e01d3ac9c8e59032e1820 SHA512 1b496b9368f0a19f5286c63c17ddf9c8afa3bae5106c8a85d89bbb8bb700948782722c30d9703d4348b45f362b47f5d63cbc0d7b4a4fe7d31dbbaedfa3354533
 DIST libnfc-1.7.1.tar.bz2 484309 BLAKE2B 7a86394e8902421410d54de2b2710cee7ea34a6f950f6d76ec59d24d6e46798cd10a9725f405c729df44da84b810b5853a5eef0ec5f2a10ccbcf7585d33f34ef SHA512 6a03d197c450c0ab8f2d16ae8c1f80e206fa909ece84a32dbb962acd0f7ef693a419608cdaa4c2207a1d2593599e44479520d7413eace7fca19d3230442e506c
-EBUILD libnfc-1.4.2.ebuild 651 BLAKE2B 45aca5aafc163538de0c6ae02cdde9f9156feb52867a4a0e423f45dbe880b099728c7d33efcf0ea78f503f30231fd23713ea088b298747c92be20f52403d8bca SHA512 c3bec379f2d8fc223717a4113e155055130f226f2fd7e935114cb68af85d7e5c90e88a76475df911ddfaa682f3218ccb6c29ca42d0afe6613ab6d7a6c95da44d
-EBUILD libnfc-1.5.1-r1.ebuild 1235 BLAKE2B f1f98da4bcc055b7d388b406629208ad00d07e2560f118b44d802794467d0a63d840f92c3b6343a85ab357c398074401f45b59ed6c47fc60453766ca73ce39d5 SHA512 13ef9d98491d45e30e1ecfdcbd590493e94bf1989c7fcb8ef0764ee94087150757c2a8518ba5ceeb2d0659710e50c7fe56569843b04f5961846d1fd0e7ac01a5
 EBUILD libnfc-1.7.1.ebuild 1028 BLAKE2B bee89d075ef440e75098aaa3b17562b24d3c2c9a1e57b8eb4241491123b6afc98ac7459024d692b17f93b386bf1dcd24a4ce62fcca712d9a26c05dfe34023b05 SHA512 d022f3e1de007df189e8c72fe57e07531f8462c45a535dad9ce87324edce108a140facc80985a898499052e166a8fb87537292af3e3e86d8787d0507939865c0
 MISC metadata.xml 463 BLAKE2B ef027bb940311ecc6a1c0095114924a3daefc3b85b1bcdddd83d0c1b87e6a2b210c3b5411fcc7a9fdd9940cd709758e743c6e3a462c100fcc31904cc88af9e8c SHA512 20f4b81da686998f0e779615d995433aab1cdc89f30bb79bf5426b2dad480da5ec90d65d371f6fad11ad94773bd758c9650a157067dc73547c180c8ce4c54dc6
diff --git a/dev-libs/libnfc/files/libnfc-1.5.1-glibc-2.17.patch b/dev-libs/libnfc/files/libnfc-1.5.1-glibc-2.17.patch
deleted file mode 100644
index fc3af861d21c..000000000000
--- a/dev-libs/libnfc/files/libnfc-1.5.1-glibc-2.17.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libnfc/log.h b/libnfc/log.h
-index 90cb747..3438511 100644
---- a/libnfc/log.h
-+++ b/libnfc/log.h
-@@ -18,6 +18,8 @@
- #ifndef __LOG_H__
- #define __LOG_H__
- 
-+#include <stdint.h>
-+
- #if defined(HAS_LOG4C) && HAS_LOG4C
- 
- #define LOGGING 1
diff --git a/dev-libs/libnfc/libnfc-1.4.2.ebuild b/dev-libs/libnfc/libnfc-1.4.2.ebuild
deleted file mode 100644
index 513d1ac16830..000000000000
--- a/dev-libs/libnfc/libnfc-1.4.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Near Field Communications (NFC) library"
-HOMEPAGE="http://www.libnfc.org/"
-SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="sys-apps/pcsc-lite
-	virtual/libusb:0"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	emake || die "Failed to compile."
-	use doc && doxygen
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "Failed to install properly."
-	use doc && dohtml "${S}"/doc/html/*
-}
diff --git a/dev-libs/libnfc/libnfc-1.5.1-r1.ebuild b/dev-libs/libnfc/libnfc-1.5.1-r1.ebuild
deleted file mode 100644
index 8621ed61ec10..000000000000
--- a/dev-libs/libnfc/libnfc-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Near Field Communications (NFC) library"
-HOMEPAGE="http://www.libnfc.org/"
-SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc pcsc-lite readline static-libs usb"
-
-RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite )
-	readline? ( sys-libs/readline )
-	usb? ( virtual/libusb:0 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.5.1-glibc-2.17.patch"
-}
-
-src_configure() {
-	# Upstream doesn't use the right macro, so we need to force this.
-	# https://code.google.com/p/libnfc/issues/detail?id=249
-	export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	local drivers="arygon,pn532_uart"
-	use pcsc-lite && drivers+=",acr122"
-	use usb && drivers+=",pn53x_usb"
-	econf \
-		--with-drivers="${drivers}" \
-		$(use_enable doc) \
-		$(use_with readline) \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	default
-	use doc && doxygen
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name 'lib*.la' -delete
-	use doc && dohtml "${S}"/doc/html/*
-}
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 72a0faf2d5c4..690166d35474 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -2,6 +2,6 @@ DIST libpcre2-10.33-patchset-1.0.tar.xz 17812 BLAKE2B 7a6e73101ed12676e1acf1beaf
 DIST pcre2-10.32.tar.bz2 1641814 BLAKE2B fdd512312547ae90b36b6c9eb86b6fcfea9b03fcfd9766063c901819c6bf7536e1f3da89bd69ae62309069bc07c705e96e81f4a36355bf934c566f343e3104e4 SHA512 3d712e7d6afbaef227952680ded69fadbdec0b1abdfcac17cf071415c3c93edd152d6d268dec80570aedf24f82ba954f74f5f9e62c9b9991be75080a3d6ab5fe
 DIST pcre2-10.33.tar.bz2 1690739 BLAKE2B e59cf47a5068b2ec2d647d6dfe1cb5f8d6cdcc6fc6b47aa65a4c3d5aae256e7f0b090487d372c62aa7ec7f15a1f037650088b53385fc2fe31aa405878855e5d5 SHA512 c6aa52cdbb0c906b02e9a9f255697a1b9b99d9c7dccdaa484ffdb04fe3582d232ba3cb3c421d6df589a387b415dedb0817f58ec5391488b25b4e7bd9da6bab8f
 EBUILD libpcre2-10.32.ebuild 2337 BLAKE2B a6659156d613e53ef1bce927e42c1a948a73868278c335bdb49b89bdc1b5dc9090afb994635e0395921748312c84ab1125a3e5acb66d916540795c9733e7fcc3 SHA512 9c8ebe7887d4ae6c6cf4138ec62021bba726a2052cb7b3c1d34ed276310e3b18e4c01d3a3ba0eb048e8234f2a72418e3749141a3bb0121c5193cfcdd72879fc2
-EBUILD libpcre2-10.33-r1.ebuild 2514 BLAKE2B b2402d7df16c96fe58648f776533d111898c35467d21bd0a47a03b232ea5d76f4666a141d25bbe3a9b750c56fc87404c4f761d643fe5995caca230fdec238cd7 SHA512 8633819d9741a2d08631367c0d7bf6cc2a4cd9b70dcc8b77e1640a7e9c46248bb7cbc54d8c6b3411de99bdb802b77d08e21195a49476e13e6d484f44392a1a2e
+EBUILD libpcre2-10.33-r1.ebuild 2511 BLAKE2B abcd065375574623703679dffbb248dab0262e04a6a664f34443dae45865be1785611107cc5e58d9f76777cd8a87d74be6e785709ea89d0bbcec73a8a3bf8f99 SHA512 01fb195504b20e6fe88cb066fcaecfae1d133958d60ddfd5a9b3c96f16770becdee5e95d8230356e62c8200e2d625c8331068c20cfa3fd57821d82a37d466f10
 EBUILD libpcre2-10.33.ebuild 2357 BLAKE2B ac53d62cdc00e46b508cf3a554342782df4bba0ed0f772a3e33204f80378fe70349df2b2989e79845f6979ac42df99566820439cf26ce401236b30913651fa40 SHA512 93dcd6ed77ed7f193c7409f8847f209513b69d09adb0332de92103547c9fa0f58148dd29702be9c114c423728292446a5335e7b1f85b280e4f60a5bb6ed999e1
 MISC metadata.xml 1228 BLAKE2B da9f4403aa5618f793335621cecafefc6c3a475f7339884fdebe661002cf724e0b27d49270ce4dd4092bf9fe00371c53798988d28376475f630c965e7fbd1c09 SHA512 33c0cbcd3fd188d2c594cda3e8aa100a1528f40af2aad398c6371cf01c639b54d0cca52adf15a123fc036738031729f2950b8409b91b40240211ec7e9fbb80a8
diff --git a/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
index 405ebf5cca5c..3d383639ccad 100644
--- a/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpo6/Manifest b/dev-libs/libpo6/Manifest
index 9aae6739cdb9..1276a0ae245d 100644
--- a/dev-libs/libpo6/Manifest
+++ b/dev-libs/libpo6/Manifest
@@ -1,7 +1,3 @@
-DIST libpo6-0.6.0.tar.gz 117418 BLAKE2B cb7c6f6ba6e0276c6e9956eb4bd37087aacb2b7f4cd60e3bea45e521363b27c34ab0747256edaddcb4fe5400ee0012d605e85dbbba02ed36e3261d02f7436d54 SHA512 b944c496339bfcd92945c87dc2500e404beebdbea51d986333043564f88edc75b6d38f8fd2fdaadb0d51b88b0b1ebfd1d27728bce3764b6821bbc71c9fbdf8ab
-DIST libpo6-0.7.0.tar.gz 118321 BLAKE2B d83d4788bed1e0dd8561d5f94b4f985e4c9153a2f83f5ea7f8b77940fdbdde54bf53b8f1d6527cef15157482b380e50f73568a10855dc9af139f4875031c4dff SHA512 622469adf38a22e8f7e1e6c5ce4507a073654169897a877f5319e2237764afd5ed3528bc8ab201fc4448e1d7b718e39ac527bcb4098b2cb458ef6ad778ad78e9
 DIST libpo6-0.8.0.tar.gz 364709 BLAKE2B 848a69ee3e4685bd81a3c6974b342b420c00e20cd78058a3f87bdbe7ee20b47cf4a43d5bbc3c613bcf01a70c7cf19658521a5450f54f18b4a2717e53408e57d0 SHA512 0fed5af37f47245ecdd84dd4dcc5d24dd84dacbd93cf1eb9b4b2e86fba6d26e7f459a9a274b0c42397fc5e22d48cb603ee2b809979cf48675710ba9221d8a3bf
-EBUILD libpo6-0.6.0.ebuild 321 BLAKE2B fb104c8450187846d936437d8a766745ac511a47f451a9b385933045e4b90bfc8d455fe9eb6a2fa2f9ecf15920481b594ecec2a9857921a9a90d389aefccbcb2 SHA512 6826b04f7c3f02713c7fe2d26871bd0580115030c623819db2e4ba90df540af86bab877c52dbfcca84b1777307f5f73254474dfbdb24fa1743c8daa972172abb
-EBUILD libpo6-0.7.0.ebuild 321 BLAKE2B fb104c8450187846d936437d8a766745ac511a47f451a9b385933045e4b90bfc8d455fe9eb6a2fa2f9ecf15920481b594ecec2a9857921a9a90d389aefccbcb2 SHA512 6826b04f7c3f02713c7fe2d26871bd0580115030c623819db2e4ba90df540af86bab877c52dbfcca84b1777307f5f73254474dfbdb24fa1743c8daa972172abb
-EBUILD libpo6-0.8.0.ebuild 321 BLAKE2B fb104c8450187846d936437d8a766745ac511a47f451a9b385933045e4b90bfc8d455fe9eb6a2fa2f9ecf15920481b594ecec2a9857921a9a90d389aefccbcb2 SHA512 6826b04f7c3f02713c7fe2d26871bd0580115030c623819db2e4ba90df540af86bab877c52dbfcca84b1777307f5f73254474dfbdb24fa1743c8daa972172abb
+EBUILD libpo6-0.8.0.ebuild 318 BLAKE2B df5eb949760adc946f41209237c5df0df9f443d14611add21bdb1f93c681cee294a0a608f4472592f792715fd7f52ea818cee98740d545b0c3931241ff5d8688 SHA512 8753e951e9cbdfa941c6e279a2620622466fa10f9ff85691acdf6706c25f12af4ee3da27631c433f26612d02131469391eede408b07e1cb292f2a70d7697dc0d
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/libpo6/libpo6-0.6.0.ebuild b/dev-libs/libpo6/libpo6-0.6.0.ebuild
deleted file mode 100644
index ff18663ad5b7..000000000000
--- a/dev-libs/libpo6/libpo6-0.6.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Hyperdex libpo6 support library"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/libpo6/libpo6-0.7.0.ebuild b/dev-libs/libpo6/libpo6-0.7.0.ebuild
deleted file mode 100644
index ff18663ad5b7..000000000000
--- a/dev-libs/libpo6/libpo6-0.7.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Hyperdex libpo6 support library"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/libpo6/libpo6-0.8.0.ebuild b/dev-libs/libpo6/libpo6-0.8.0.ebuild
index ff18663ad5b7..810e8444c7be 100644
--- a/dev-libs/libpo6/libpo6-0.8.0.ebuild
+++ b/dev-libs/libpo6/libpo6-0.8.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Hyperdex libpo6 support library"
-
 HOMEPAGE="http://hyperdex.org"
 SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index b121bdc5c8fe..9ffea767aff0 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,6 +1,8 @@
 AUX librdkafka-1.1.0-remove-automagic-on-zstd.patch 972 BLAKE2B 3ebe1a2895f5e06070e89c1b4aa23a771dcdb1e45b145ffcdeabb44dd061450eb98d160d4aa0ba297b909e6964d4d0f270346bf825a93a5883aef825d79011c6 SHA512 5a6318c9ba33da6c9c1fbaf08f3c9ff43a9f4b532ae4f220f0b2cbde6769358d0bfaf8de68102f9e3d6bb4b2e3005462036e024796a1fa81be65ea3ca914691a
 DIST librdkafka-1.1.0.tar.gz 2511445 BLAKE2B 00c20361058d537d045da6961afc45e40e0ac641918df9eb457937dc3ca566639b81d8aa10cc6ed2f57988eded180f3d2eaea72ca4b910a652b93b54b9388253 SHA512 35561399b07278a09a51245c5503c86eb0cc8971692b4e65a332144bfb71e2e86d4ceaf1804534b6a416bcace74cef493b6465c20b32c14de97f45f2854359c6
 DIST librdkafka-1.2.1.tar.gz 2547009 BLAKE2B f55c2f23339294d54c1a3cbe064b0ddb6a638adfd192351a69bba91c81f7d33dfad13b45d50a8ea008e397400c89e90fe267549566a8dff07ca701ae59934126 SHA512 57341a0e4dbe98b9da912f5a63cc82490222bd91aef7c3cda3acaa4807e1d13ac047fbff8898f7459e7a1cb46f02dfc665e8c5bddffd8153d67a2c0546000a62
+DIST librdkafka-1.2.2.tar.gz 2588441 BLAKE2B 27cf73c61a56cd899926a2022f3751f66a2569d3065d5c3d8d542df8c0c92db08095188a08c91e347d2c1439f244d417eacbfb218e49c08fe4b5b2ef76f2bd6d SHA512 ef6fc34989e5e484cb0b9f6a6f8a5c4816d89239c18d65becc2004cdfeedbfb541e18affbb8662b05831003249630cb2119ee496b5b844c963b01eb6d4ebac5a
 EBUILD librdkafka-1.1.0.ebuild 1540 BLAKE2B 9060364fe3e3927f991161e72a5d4fbcd1f9386538ab47f9c2640a93ae174a019ebede893281c52e65ac8ae306cfaa78e130ffd14437200cb92d958c91515ade SHA512 5025fd3a0bcfc99d7a771855e2304ae10990c0d4b62532fb7704ccf1e8127fb4ff2667440eb46ca15321294c7cc64773e233d80a07e0524677b0ee092c05982d
 EBUILD librdkafka-1.2.1.ebuild 1475 BLAKE2B c8b5a4d4f4d946e7a1d78b0a92b737686c1dd8f975122923de2994076a13fb7826f889ec893928c82dd206e2a3c9e777723a5ab1e7ff26f8a7f863f0e82f049c SHA512 a5e794ae2bce3f2aae32642986edc962e5861a745656440fd765a557e695a7d8570c0f90ba5bad57e18a399c1d294c2cd696284d598a074ab742ef49e241c46b
+EBUILD librdkafka-1.2.2.ebuild 1475 BLAKE2B c8b5a4d4f4d946e7a1d78b0a92b737686c1dd8f975122923de2994076a13fb7826f889ec893928c82dd206e2a3c9e777723a5ab1e7ff26f8a7f863f0e82f049c SHA512 a5e794ae2bce3f2aae32642986edc962e5861a745656440fd765a557e695a7d8570c0f90ba5bad57e18a399c1d294c2cd696284d598a074ab742ef49e241c46b
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.2.2.ebuild b/dev-libs/librdkafka/librdkafka-1.2.2.ebuild
new file mode 100644
index 000000000000..6d51d76e53fb
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-1.2.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs zstd"
+
+LIB_DEPEND="
+	lz4? ( app-arch/lz4:=[static-libs(+)] )
+	sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
+	ssl? ( dev-libs/openssl:0=[static-libs(+)] )
+	zstd? ( app-arch/zstd:=[static-libs(+)] )
+	sys-libs/zlib:=[static-libs(+)]
+"
+
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	static-libs? ( ${LIB_DEPEND} )
+"
+
+src_configure() {
+	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+	local myeconf=(
+		--no-cache
+		--no-download
+		--disable-debug-symbols
+		$(use_enable lz4)
+		$(use_enable sasl)
+		$(usex static-libs '--enable-static' '')
+		$(use_enable ssl)
+		$(use_enable zstd)
+	)
+
+	econf ${myeconf[@]}
+}
+
+src_test() {
+	emake -C tests run_local
+}
+
+src_install() {
+	local DOCS=(
+		README.md
+		CONFIGURATION.md
+		INTRODUCTION.md
+	)
+
+	default
+
+	if ! use static-libs; then
+		find "${ED}"/usr/lib* -name '*.la' -o -name '*.a' -delete || die
+	fi
+}
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index a65772e4eb03..85229f31596c 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -1,12 +1,5 @@
-AUX libreport-2.0.13-automake-1.12.patch 2285 BLAKE2B 13df72a3fe5e4501b3bb9e886c8a6a44d7d4ec725b7e5bc8446b03958ecc7cac414aa5e1fa041bc8c512069c8a748423ca20ccdc8d3a4c2682cea991e2f2c54b SHA512 59a6f857604ab45c049030ab351cef28dc51b78aabd5575ff45abdd607d6b973020f32687666fd11a879e0ee18aca75650fa9e3fa2284a8e05c6b65216479b9f
-AUX libreport-2.0.13-gentoo.patch 10369 BLAKE2B 4d5203f41ee5f6f9892faa351b1cc3989f905640b2c74c18a04f701493d2b54b8e4f481664c4e3a812b7cccc93e597132678bb7ea12685cb5875bd3eb0e2b220 SHA512 762e389c62efaeaad08a04871e5dec05aadc26fb9457291bf2308835128241068b2e799585060b3ce4f7bd17f275a4e5c7da37835d4e8940651ea5e5928402f0
-AUX libreport-2.0.13-json-c-0.11-pc.patch 1780 BLAKE2B bce31a7535097d11d26a36afb10ec486b103a9c64d37d32f1122b418bf9bba794f861699cbdd58115d6d34f99c90e07799e5bd767be63e6ceaf5dc4643b45cae SHA512 8eb64ac64b0bfb42dafda02c7c65c5becaf27d16233b941f0d0594a3fc0314b33b793b05e3bda07dc6225854d2dcb1cfeca1ae8bf5fa959a84fd01ac9179cdfa
-AUX libreport-2.0.13-json-c-0.11.patch 1145 BLAKE2B 2e4bd653b4c378875ffe846f8cfb84f6feabb9e571079fee873c064a092a97a89b4cc7a82e53c57a34a8a9b7510ddac24f907f4dc92cbc3cb6563247dbbad46a SHA512 fd07c360d599d71fddb6766860203052fb390cde6cb795779e75a2d2a826affd6f03c6977eb99237caffdc41ac9f0e1c600a9414f72629ff5fc2102c70d8ca67
-AUX libreport-2.0.7-uploader_event-syntax.patch 610 BLAKE2B 5bdd1835310125c3adddef9e338928505e204668ef5448d4991fb67cb9742740dd802caf67d3be3616bcc17c1022f48a4f3d1db9989e171ba30054985b53d0a6 SHA512 b0ae2617a013fd8cb3475e5a51073677f2ea965a57169c760e542474351293e70f70e678a66beeb3b3fa163589aaf7f79f0883fa55ff524e62b5fcd3ae919bf0
-DIST libreport-2.0.13.tar.gz 1190147 BLAKE2B fe79d924fbf7bd11cc3fd23956a137fb296baf9c40f12f3ecfefe68c82281f62299887511a096196b4fdcdc9245ab268592dace4e728c2c34af47581e52f5132 SHA512 cfe963db8091b245f8ceb7d8501466f4f9464c28d298faeafc9f6e57deafdfdc6501d468bf5ffd83703adb67bc1e05e06c56b5c0e0028bb2e0134788ddbb2181
 DIST libreport-2.10.0.tar.gz 2278084 BLAKE2B 95ac1fbf32e6e021e9553b35b10f9e46b7ea2e9cc6f21e53eb39a32a5261f7a6e49b2172381fdea30341fcc4311928691e68749a8bb5c41a4bf709151935687a SHA512 978ea442d82b75abf80b2075f540cb05c5577387a9221f2070c9695c4546d36169738d223f5e903d0b774b7e1566a6111c55a6bb51a0822ad1676095f067c45b
 DIST libreport-2.9.5.tar.gz 2271742 BLAKE2B e74d694c0012e984aab8044e99fee8e12a197c0a2edb933e78f045260043d40557509056b1093bc13cbe983976d5525cde1f7596a942760df10c857e99d6b56e SHA512 f207710d88f39870d08e3a5fdfa3e1d5a808625bd36b1dcce363cefd39e582bad6be6dc4224db5e1df4404734c3dd69c437c377303fe978ae21b608fceb833ce
-EBUILD libreport-2.0.13-r1.ebuild 2141 BLAKE2B b49f76f03adeaefd952003d1e7bb561b10d7af1b7b399748f0209cd33ea9a40f49e3861e95500a781eaa940735b6d387cb6d168411672d234173e15edd4b8979 SHA512 c0666dd82fcec73ef563886376a6d1449e505239308417e8145e2ce5b394dcc9b4811e9cc3f166a61898b6c7877831b66a1c0d8ef8c76d39e4b5024a54ac4ce7
 EBUILD libreport-2.10.0.ebuild 1944 BLAKE2B 5fa85fcf2ffe31a78cf4839456a22d40acdd83e1944520c26883a34e12b09adf11e8adc874cd7b369307c1a56d14ebd72a8dc4dad5db92275aebaaf33031c501 SHA512 519480eedf933657622cfeb0852458a15bd5046c07477be73f231297abb7333d00725ebd8b8c6f7ea545fe8e26c69b7f79e0bc2423e43fd1036e170a417045ad
 EBUILD libreport-2.9.5.ebuild 1935 BLAKE2B 90a23feca95ca1e9554ac3a27ff29806b22022dcecfc5151ba536e8743b52e34aa0b37f2d3b408a44fc4fad5af78dc54098229c9c5ef318ea4c41cdda4bea6c8 SHA512 c56d82d090b3a0385c0abc5b6758f55cf386af34b6e1f02d77f13f7035831f75b5831627db4e6373e7eb0ed2b47f646b836a1087d4b61766730f88542f534b5d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libreport/files/libreport-2.0.13-automake-1.12.patch b/dev-libs/libreport/files/libreport-2.0.13-automake-1.12.patch
deleted file mode 100644
index 4baaedd4d8eb..000000000000
--- a/dev-libs/libreport/files/libreport-2.0.13-automake-1.12.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From cb7d7fe5b2daf4dac3b8a1616461a0c840e18b73 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 22 Sep 2012 03:06:03 -0400
-Subject: [PATCH] Fix automake-1.12 autoreconf issues.
-
-Need -Wno-portablity for '%'-style pattern rules in doc/Makefile.am
-
-Need AM_PROG_CC_C_O for src/cli/cli.c
-
-gettext-0.18.1.1's AM_GNU_GETTEXT requires AM_PROG_MKDIR_P, causing
-problems for automake-1.12.
----
- configure.ac            | 8 +++-----
- src/lib/Makefile.am     | 2 +-
- src/plugins/Makefile.am | 2 +-
- 3 files changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index dd50bcf..3955689 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,7 +3,7 @@ AC_INIT([libreport],
- 	[crash-catcher@fedorahosted.org])
- 
- AC_CONFIG_MACRO_DIR([m4])
--AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-+AM_INIT_AUTOMAKE([-Wall -Wno-portability -Werror foreign])
- # Support silent build rules. Disable by either passing --disable-silent-rules
- # to ./configure or passing V=1 to make
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
-@@ -11,8 +11,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
- AM_SILENT_RULES([yes])
- 
- AC_DISABLE_STATIC
-+AM_PROG_AR
- AC_PROG_LIBTOOL
--AC_PROG_CC
-+AM_PROG_CC_C_O
- AC_PROG_LN_S
- 
- AC_SYS_LARGEFILE
-@@ -33,9 +34,6 @@ GETTEXT_PACKAGE=libreport
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
- 
--AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.17])
--
- IT_PROG_INTLTOOL([0.35.0])
- 
- dnl ****** END ****************************************
-diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
-index 5befe7d..2c51931 100644
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -121,7 +121,7 @@ libreport_web_la_LIBADD = \
-     libreport.la
- 
- $(DESTDIR)/$(DEBUG_DUMPS_DIR):
--	$(mkdir_p) '$@'
-+	$(MKDIR_P) '$@'
- # no need to chmod it here
- #chmod 1777 '$@'
- install-data-local: $(DESTDIR)/$(DEBUG_DUMPS_DIR)
-diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
-index 3f9dfd7..795d198 100644
---- a/src/plugins/Makefile.am
-+++ b/src/plugins/Makefile.am
-@@ -40,7 +40,7 @@ EXTRA_DIST = \
-     report_Uploader.xml.in
- 
- $(DESTDIR)/$(DEBUG_INFO_DIR):
--	$(mkdir_p) '$@'
-+	$(MKDIR_P) '$@'
- 
- reporter_upload_SOURCES = \
-     reporter-upload.c
--- 
-1.7.12
-
diff --git a/dev-libs/libreport/files/libreport-2.0.13-gentoo.patch b/dev-libs/libreport/files/libreport-2.0.13-gentoo.patch
deleted file mode 100644
index 89c6a17354a3..000000000000
--- a/dev-libs/libreport/files/libreport-2.0.13-gentoo.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-From 624d523361dcf8c10742cbcb1a017e21675002ff Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 22 Sep 2012 02:17:08 -0400
-Subject: [PATCH] Replace Fedora defaults with Gentoo ones, and disable code
- not relevant for Gentoo
-
-Disable bugzilla and ureport plugins (they require Gentoo infrastructure
-changes). Fix libreport-web.pc to not rely on xmlrpc.pc, which Gentoo
-does not have.
-
-Disble mailx post-create by default to avoid "abrtd: 'post-create' ...
-exited with 141" errors.
----
- doc/Makefile.am                    |  2 -
- doc/reporter-bugzilla.txt          |  2 +-
- libreport-web.pc.in                |  6 +--
- src/lib/dump_dir.c                 |  2 +-
- src/plugins/Makefile.am            | 83 ++------------------------------------
- src/plugins/bugzilla.conf          |  2 +-
- src/plugins/mailx_event.conf       |  2 +-
- src/plugins/report_Bugzilla.conf   |  2 +-
- src/plugins/report_Bugzilla.xml.in |  4 +-
- src/plugins/reporter-bugzilla.c    |  2 +-
- src/report-python/__init__.py      |  4 +-
- 11 files changed, 16 insertions(+), 95 deletions(-)
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 542fe4c..863b6d1 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -9,11 +9,9 @@ XMLTO_SILENT_0 = @echo "  XMLTO " $@;
- 
- MAN1_TXT =
- MAN1_TXT += report-cli.txt
--MAN1_TXT += reporter-bugzilla.txt
- MAN1_TXT += reporter-kerneloops.txt
- MAN1_TXT += reporter-mailx.txt
- MAN1_TXT += reporter-print.txt
--MAN1_TXT += reporter-rhtsupport.txt
- MAN1_TXT += reporter-upload.txt
- MAN1_TXT += report.txt
- 
-diff --git a/doc/reporter-bugzilla.txt b/doc/reporter-bugzilla.txt
-index 3cedf73..734d598 100644
---- a/doc/reporter-bugzilla.txt
-+++ b/doc/reporter-bugzilla.txt
-@@ -44,7 +44,7 @@ Configuration file lines should have 'PARAM = VALUE' format. The parameters are:
- 	Password to Bugzilla account.
- 
- 'BugzillaURL'::
--	Bugzilla HTTP(S) address. (default: https://bugzilla.redhat.com)
-+	Bugzilla HTTP(S) address. (default: https://bugs.gentoo.org/)
- 
- 'SSLVerify'::
- 	Use yes/true/on/1 to verify server's SSL certificate. (default: yes)
-diff --git a/libreport-web.pc.in b/libreport-web.pc.in
-index c9af1d2..14505f8 100644
---- a/libreport-web.pc.in
-+++ b/libreport-web.pc.in
-@@ -6,7 +6,7 @@ includedir=@includedir@
- Name: libreport
- Description: Library providing network API for libreport
- Version: @VERSION@
--Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 xmlrpc xmlrpc_client json btparser libreport
--Libs: -L${libdir} -lreport-web
--Cflags:
-+Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 json btparser libreport
-+Libs: -L${libdir} @XMLRPC_LIBS@ @XMLRPC_CLIENT_LIBS@ -lreport-web
-+Cflags: @XMLRPC_CFLAGS@ @XMLRPC_CLIENT_CFLAGS@
- 
-diff --git a/src/lib/dump_dir.c b/src/lib/dump_dir.c
-index 0fc7da7..41e4f55 100644
---- a/src/lib/dump_dir.c
-+++ b/src/lib/dump_dir.c
-@@ -556,7 +556,7 @@ void dd_create_basic_files(struct dump_dir *dd, uid_t uid, const char *chroot_di
-         release = load_text_file("/etc/system-release",
-                 DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE);
-         if (!release)
--            release = load_text_file("/etc/redhat-release", /*flags:*/ 0);
-+            release = load_text_file("/etc/gentoo-release", /*flags:*/ 0);
-         dd_save_text(dd, FILENAME_OS_RELEASE, release);
-         if (chroot_dir)
-         {
-diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
-index 967596f..3f9dfd7 100644
---- a/src/plugins/Makefile.am
-+++ b/src/plugins/Makefile.am
-@@ -1,36 +1,27 @@
- pluginslibdir = $(PLUGINS_LIB_DIR)
- 
- bin_PROGRAMS = \
--    reporter-bugzilla \
--    reporter-rhtsupport \
-     reporter-kerneloops \
-     reporter-upload \
-     reporter-mailx \
-     reporter-print \
--    report \
--    reporter-ureport
-+    report
- 
- pluginsconfdir = $(PLUGINS_CONF_DIR)
- 
- reportpluginsconfdir = $(REPORT_PLUGINS_CONF_DIR)
- 
- dist_reportpluginsconf_DATA = \
--    bugzilla.conf \
--    rhtsupport.conf \
-     mailx.conf
- 
- eventsdir = $(EVENTS_DIR)
- 
- dist_events_DATA = \
--    report_Bugzilla.xml \
--    report_Bugzilla.conf \
-     report_Logger.conf \
-     report_Logger.xml \
-     report_Mailx.xml \
--    report_RHTSupport.xml \
-     report_Kerneloops.xml \
--    report_Uploader.xml \
--    report_uReport.xml
-+    report_Uploader.xml
- 
- @INTLTOOL_XML_RULE@
- 
-@@ -39,74 +30,18 @@ eventsconfdir = $(EVENTS_CONF_DIR)
- dist_eventsconf_DATA = \
-     mailx_event.conf \
-     print_event.conf \
--    bugzilla_event.conf \
--    rhtsupport_event.conf \
-     uploader_event.conf
- 
- EXTRA_DIST = \
--    report_Bugzilla.xml.in \
--    report_Bugzilla.conf \
-     report_Logger.conf \
-     report_Logger.xml.in \
-     report_Mailx.xml.in \
--    report_RHTSupport.xml.in \
-     report_Kerneloops.xml.in \
--    report_Uploader.xml.in \
--    report_uReport.xml.in
-+    report_Uploader.xml.in
- 
- $(DESTDIR)/$(DEBUG_INFO_DIR):
- 	$(mkdir_p) '$@'
- 
--reporter_bugzilla_SOURCES = \
--    reporter-bugzilla.c rhbz.c rhbz.h
--reporter_bugzilla_CPPFLAGS = \
--    -I$(srcdir)/../include \
--    -I$(srcdir)/../lib \
--    -DBIN_DIR=\"$(bindir)\" \
--    -DCONF_DIR=\"$(CONF_DIR)\" \
--    -DLOCALSTATEDIR='"$(localstatedir)"' \
--    -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
--    -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
--    -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
--    -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \
--    $(GLIB_CFLAGS) \
--    $(LIBREPORT_CFLAGS) \
--    $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \
--    -D_GNU_SOURCE
--reporter_bugzilla_LDADD = \
--    $(GLIB_LIBS) \
--    $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \
--    ../lib/libreport-web.la \
--    ../lib/libreport.la
--
--reporter_rhtsupport_SOURCES = \
--    abrt_rh_support.h abrt_rh_support.c \
--    reporter-rhtsupport.h \
--    reporter-rhtsupport-parse.c \
--    reporter-rhtsupport.c
--reporter_rhtsupport_CPPFLAGS = \
--    -I$(srcdir)/../include \
--    -I$(srcdir)/../lib \
--    -DBIN_DIR=\"$(bindir)\" \
--    -DCONF_DIR=\"$(CONF_DIR)\" \
--    -DLOCALSTATEDIR='"$(localstatedir)"' \
--    -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
--    -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
--    -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
--    -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \
--    $(GLIB_CFLAGS) \
--    $(LIBREPORT_CFLAGS) \
--    $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \
--    $(LIBXML_CFLAGS) \
--    -D_GNU_SOURCE
--reporter_rhtsupport_LDFLAGS = -ltar
--reporter_rhtsupport_LDADD = \
--    $(GLIB_LIBS) \
--    $(LIBXML_LIBS) \
--    $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \
--    ../lib/libreport-web.la \
--    ../lib/libreport.la
--
- reporter_upload_SOURCES = \
-     reporter-upload.c
- reporter_upload_CPPFLAGS = \
-@@ -200,16 +135,4 @@ report_CPPFLAGS = \
- report_LDADD = \
-     ../lib/libreport.la
- 
--reporter_ureport_SOURCES = \
--    ureport.c
--reporter_ureport_CPPFLAGS = \
--    -I$(srcdir)/../include \
--    -I$(srcdir)/../lib \
--    $(GLIB_CFLAGS) \
--    $(LIBREPORT_CFLAGS) \
--    -D_GNU_SOURCE
--reporter_ureport_LDADD = \
--    ../lib/libreport.la \
--    ../lib/libreport-web.la
--
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-diff --git a/src/plugins/bugzilla.conf b/src/plugins/bugzilla.conf
-index 18eba5a..f5afe6f 100644
---- a/src/plugins/bugzilla.conf
-+++ b/src/plugins/bugzilla.conf
-@@ -1,5 +1,5 @@
- # Bugzilla URL
--BugzillaURL = https://bugzilla.redhat.com/
-+BugzillaURL = https://bugs.gentoo.org/
- # yes means that ssl certificates will be checked
- SSLVerify = yes
- # your login has to exist, if you don have any, please create one
-diff --git a/src/plugins/mailx_event.conf b/src/plugins/mailx_event.conf
-index a8c5d11..1c07a73 100644
---- a/src/plugins/mailx_event.conf
-+++ b/src/plugins/mailx_event.conf
-@@ -1,3 +1,3 @@
--EVENT=post-create reporter-mailx --notify-only -c /etc/libreport/plugins/mailx.conf
-+# EVENT=post-create reporter-mailx --notify-only -c /etc/libreport/plugins/mailx.conf
- 
- EVENT=report_Mailx      reporter-mailx
-diff --git a/src/plugins/report_Bugzilla.conf b/src/plugins/report_Bugzilla.conf
-index f1a77f5..bb2e651 100644
---- a/src/plugins/report_Bugzilla.conf
-+++ b/src/plugins/report_Bugzilla.conf
-@@ -1,4 +1,4 @@
--Bugzilla_BugzillaURL = https://bugzilla.redhat.com
-+Bugzilla_BugzillaURL = https://bugs.gentoo.org/
- Bugzilla_Login =
- Bugzilla_Password =
- Bugzilla_SSLVerify = yes
-diff --git a/src/plugins/report_Bugzilla.xml.in b/src/plugins/report_Bugzilla.xml.in
-index 8151d32..acaf7fb 100644
---- a/src/plugins/report_Bugzilla.xml.in
-+++ b/src/plugins/report_Bugzilla.xml.in
-@@ -16,8 +16,8 @@
-             <_label>Bugzilla URL</_label>
-             <allow-empty>no</allow-empty>
-             <_description>Address of Bugzilla server</_description>
--            <default-value>https://bugzilla.redhat.com</default-value>
--            <_note-html>You can create bugzilla.redhat.com account &lt;a href="https://bugzilla.redhat.com/createaccount.cgi"&gt;here&lt;/a&gt;</_note-html>
-+            <default-value>https://bugs.gentoo.org/</default-value>
-+            <_note-html>You can create bugs.gentoo.org account &lt;a href="https://bugs.gentoo.org/createaccount.cgi"&gt;here&lt;/a&gt;</_note-html>
-         </option>
-         <option type="text" name="Bugzilla_Login">
-             <_label>User name</_label>
-diff --git a/src/plugins/reporter-bugzilla.c b/src/plugins/reporter-bugzilla.c
-index a3e8855..17a686d 100644
---- a/src/plugins/reporter-bugzilla.c
-+++ b/src/plugins/reporter-bugzilla.c
-@@ -34,7 +34,7 @@ static void set_settings(struct bugzilla_struct *b, map_string_h *settings)
-     environ = getenv("Bugzilla_BugzillaURL");
-     b->b_bugzilla_url = environ ? environ : get_map_string_item_or_empty(settings, "BugzillaURL");
-     if (!b->b_bugzilla_url[0])
--        b->b_bugzilla_url = "https://bugzilla.redhat.com";
-+        b->b_bugzilla_url = "https://bugs.gentoo.org/";
-     b->b_bugzilla_xmlrpc = xasprintf("%s"XML_RPC_SUFFIX, b->b_bugzilla_url);
- 
-     environ = getenv("Bugzilla_SSLVerify");
-diff --git a/src/report-python/__init__.py b/src/report-python/__init__.py
-index 9c5e6b3..7188392 100644
---- a/src/report-python/__init__.py
-+++ b/src/report-python/__init__.py
-@@ -21,8 +21,8 @@ from report.io import TextIO, GTKIO, NewtIO
- 
- import os
- 
--SYSTEM_RELEASE_PATHS = ["/etc/system-release","/etc/redhat-release"]
--SYSTEM_RELEASE_DEPS = ["system-release", "redhat-release"]
-+SYSTEM_RELEASE_PATHS = ["/etc/system-release","/etc/gentoo-release"]
-+SYSTEM_RELEASE_DEPS = ["system-release", "gentoo-release"]
- 
- _hardcoded_default_product = ""
- _hardcoded_default_version = ""
--- 
-1.7.12
-
diff --git a/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11-pc.patch b/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11-pc.patch
deleted file mode 100644
index bd764c82cc87..000000000000
--- a/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11-pc.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 438344fe7ce2edbd23f4df2dfd8e7b6be0a2d7c2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 11 Sep 2013 11:10:32 +0200
-Subject: [PATCH] Use proper json-c requirement in libreport-web.pc.
-
-Depending on whether json-c was found as 'json' or 'json-c', require the
-same package in the generated .pc file.
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.0.13]
----
- configure.ac        | 9 +++++++--
- libreport-web.pc.in | 2 +-
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1e32c64..ace4cde 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -102,9 +102,14 @@ PKG_CHECK_MODULES([DBUS], [dbus-1])
- PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
- PKG_CHECK_MODULES([NSS], [nss])
- PKG_CHECK_MODULES([CURL], [libcurl])
--PKG_CHECK_MODULES([JSON_C], [json],,[
--    PKG_CHECK_MODULES([JSON_C], [json-c])
-+PKG_CHECK_MODULES([JSON_C], [json], [
-+    JSON_C_PACKAGE=json
-+], [
-+    PKG_CHECK_MODULES([JSON_C], [json-c], [
-+        JSON_C_PACKAGE=json-c
-+    ])
- ])
-+AC_SUBST([JSON_C_PACKAGE])
- PKG_CHECK_MODULES([BTPARSER], [btparser])
- PKG_CHECK_MODULES([NEWT], [libnewt])
- PKG_CHECK_MODULES([PROXY], [libproxy-1.0], [
-diff --git a/libreport-web.pc.in b/libreport-web.pc.in
-index 14505f8..2a7c926 100644
---- a/libreport-web.pc.in
-+++ b/libreport-web.pc.in
-@@ -6,7 +6,7 @@ includedir=@includedir@
- Name: libreport
- Description: Library providing network API for libreport
- Version: @VERSION@
--Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 json btparser libreport
-+Requires: glib-2.0 libcurl libproxy-1.0 libxml-2.0 @JSON_C_PACKAGE@ btparser libreport
- Libs: -L${libdir} @XMLRPC_LIBS@ @XMLRPC_CLIENT_LIBS@ -lreport-web
- Cflags: @XMLRPC_CFLAGS@ @XMLRPC_CLIENT_CFLAGS@
- 
--- 
-1.8.3.2
-
diff --git a/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11.patch b/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11.patch
deleted file mode 100644
index e5191e8e313d..000000000000
--- a/dev-libs/libreport/files/libreport-2.0.13-json-c-0.11.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4a874dde53cf6acca7db2e7be3c10106fb50ec62 Mon Sep 17 00:00:00 2001
-From: Markos Chandras <hwoarang@gentoo.org>
-Date: Sun, 28 Apr 2013 12:27:57 +0100
-Subject: [PATCH] configure.ac: Fix json-c detection for json-c >= 0.11
-
-json-c-0.11 renamed the pkgconfig file to json-c
-https://github.com/json-c/json-c/blob/master/ChangeLog
-The configure.ac file was fixed to look for json-c if json
-is not available.
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.0.13]
-
-Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
----
- configure.ac | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index dd50bcf..0ca5e67 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -104,7 +104,9 @@ PKG_CHECK_MODULES([DBUS], [dbus-1])
- PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
- PKG_CHECK_MODULES([NSS], [nss])
- PKG_CHECK_MODULES([CURL], [libcurl])
--PKG_CHECK_MODULES([JSON_C], [json])
-+PKG_CHECK_MODULES([JSON_C], [json],,[
-+    PKG_CHECK_MODULES([JSON_C], [json-c])
-+])
- PKG_CHECK_MODULES([BTPARSER], [btparser])
- PKG_CHECK_MODULES([NEWT], [libnewt])
- PKG_CHECK_MODULES([PROXY], [libproxy-1.0], [
--- 
-1.8.2.1
-
diff --git a/dev-libs/libreport/files/libreport-2.0.7-uploader_event-syntax.patch b/dev-libs/libreport/files/libreport-2.0.7-uploader_event-syntax.patch
deleted file mode 100644
index 4f43ec90591c..000000000000
--- a/dev-libs/libreport/files/libreport-2.0.7-uploader_event-syntax.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 88e39835f1f94eff58e6d0cc0bee20ceae10bdd2 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 16 Nov 2011 02:07:24 -0500
-Subject: [PATCH] fix uploader_event syntax
-
----
- src/plugins/uploader_event.conf |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/plugins/uploader_event.conf b/src/plugins/uploader_event.conf
-index 2406008..bd13c5e 100644
---- a/src/plugins/uploader_event.conf
-+++ b/src/plugins/uploader_event.conf
-@@ -1 +1 @@
--EVENT=report_Uploader analyzer=libreport reporter-upload
-+EVENT=report_Uploader reporter-upload
--- 
-1.7.8.rc1
-
diff --git a/dev-libs/libreport/libreport-2.0.13-r1.ebuild b/dev-libs/libreport/libreport-2.0.13-r1.ebuild
deleted file mode 100644
index 13ec36a6da4a..000000000000
--- a/dev-libs/libreport/libreport-2.0.13-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-r1 user
-
-DESCRIPTION="Generic library for reporting software bugs"
-HOMEPAGE="https://fedorahosted.org/abrt/"
-SRC_URI="https://fedorahosted.org/released/abrt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND=">=dev-libs/btparser-0.18:=
-	>=dev-libs/glib-2.21:2
-	dev-libs/json-c:=
-	dev-libs/libtar
-	dev-libs/libxml2:2
-	dev-libs/newt:=
-	dev-libs/nss:=
-	dev-libs/xmlrpc-c:=[curl]
-	net-libs/libproxy:=
-	net-misc/curl:=[ssl]
-	sys-apps/dbus
-	>=x11-libs/gtk+-3.3.12:3
-	x11-misc/xdg-utils
-	${PYTHON_DEPS}
-"
-RDEPEND="${COMMON_DEPEND}
-	|| ( gnome-base/gnome-keyring >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/intltool-0.3.50
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-# Tests require python-meh, which is highly redhat-specific.
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup abrt
-	enewuser abrt -1 -1 -1 abrt
-}
-
-src_prepare() {
-	# Replace redhat- and fedora-specific defaults with gentoo ones, and disable
-	# code that requires gentoo infra support.
-	epatch "${FILESDIR}/${PN}-2.0.13-gentoo.patch"
-
-	# Modify uploader_event so that the gui recognizes it
-	epatch "${FILESDIR}/${PN}-2.0.7-uploader_event-syntax.patch"
-
-	# automake-1.12
-	epatch "${FILESDIR}/${PN}-2.0.13-automake-1.12.patch"
-
-	# json-c-0.11, https://github.com/abrt/libreport/pull/{159,174}
-	epatch "${FILESDIR}/${PN}-2.0.13-json-c-0.11"{,-pc}.patch
-
-	mkdir -p m4
-	eautoreconf
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir econf \
-		--disable-bodhi \
-		--localstatedir="${EPREFIX}/var" \
-		$(usex debug --enable-debug "")
-	# --disable-debug enables debug!
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir default
-
-	# Need to set correct ownership for use by app-admin/abrt
-	diropts -o abrt -g abrt
-	keepdir /var/spool/abrt
-
-	prune_libtool_files --modules
-}
diff --git a/dev-libs/libtreadstone/Manifest b/dev-libs/libtreadstone/Manifest
index 9dc0687fed9b..e73d9b8f2af3 100644
--- a/dev-libs/libtreadstone/Manifest
+++ b/dev-libs/libtreadstone/Manifest
@@ -1,5 +1,3 @@
-DIST libtreadstone-0.1.0.tar.gz 361686 BLAKE2B 3900b43a91c0dd3225ba04ba35e9178bdfcab635a3224f109600c055b5069af08da27e57a29f24eeea4bdd0e61a3c88f68ac58e2963639a227a87cdc810287fb SHA512 72aec4b03d3824bb88c6d09cc8f5a32058ea3e1da8878af6987e656464c929c136003d37d6fb87a76980642f8af2d9cfc902946d5b523cf642368fc080c70a97
 DIST libtreadstone-0.2.0.tar.gz 364127 BLAKE2B 803ae1b61be62b067219198de526bb5e23a2e25f91ca928a7e92a83222f3f921835310f2a101c29309889129d15c872e679e4a5779747db5cdf87473f781406b SHA512 dfa8a592b4dbe8106716160e3108ba62a24e15d9ec827a4086f95db7dc8216c4d571c065f0e6773776693a29cca3aee29991b95f9aafae20d175403374a96014
-EBUILD libtreadstone-0.1.0.ebuild 374 BLAKE2B b219fff914a9d9cb954745ffdbe19533fc3ad23381845e3622051be7a21b8a9317c508d9464e1b7cda4428a46cdfff10ed486a810b3e05de2f4335b84a5f4b53 SHA512 794c4aecfb803128287a202446066d56e4e82089a4df15de1b16aa9e407b482c16485842f125ab671641e982e4bc644147eb4b71507abe540de8f1ad9ddb2f5a
-EBUILD libtreadstone-0.2.0.ebuild 375 BLAKE2B dafc30c44b13ba9b4e24be6e0fe5fb75efbc00b01c076bca185d0bb2071abe0d76953d416fade9d0b9da73b00dbc8d76f27ff9f063e9794d9ed9346179afeb0f SHA512 795e131aa7d38cf1d6ae06109fa117819fad1a2d2dc1853037eb04a74218ea2dd89fc855b46a06a05f47f1548482bb2dd47bc505e15cf311f234390b57eeebf0
+EBUILD libtreadstone-0.2.0.ebuild 372 BLAKE2B a59d4b0e4ff5ae0c25f335b7430d9bef65632c1290d3aa41b86135572ac489f1c3a26c34acf9d60d0bccc0d347c462cc28042d3fd5fdd7888d3c3d961d2f4b70 SHA512 449f1d448cc087a05ed86d3f9a3ab97ed60b55e0c9a420f55cda1fc9539379aeebd6b89a228f5af65bb6c636e805606ffbb8d29ff824f886e5b53df84d136f77
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/libtreadstone/libtreadstone-0.1.0.ebuild b/dev-libs/libtreadstone/libtreadstone-0.1.0.ebuild
deleted file mode 100644
index 2860c46c030a..000000000000
--- a/dev-libs/libtreadstone/libtreadstone-0.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Hyperdex libtreadstone support library"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-0.6.0
-	>=dev-libs/libe-0.9.0"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/libtreadstone/libtreadstone-0.2.0.ebuild b/dev-libs/libtreadstone/libtreadstone-0.2.0.ebuild
index 6c6343ce6db3..1ab31ea5b9ff 100644
--- a/dev-libs/libtreadstone/libtreadstone-0.2.0.ebuild
+++ b/dev-libs/libtreadstone/libtreadstone-0.2.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Hyperdex libtreadstone support library"
-
 HOMEPAGE="http://hyperdex.org"
 SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index ee201adfbc01..903592bc26c6 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -5,6 +5,6 @@ DIST libuv-1.33.1.tar.gz 1251944 BLAKE2B fc20883dbd96df0d91fbcc75255ae2a371cd2d4
 EBUILD libuv-1.28.0.ebuild 1198 BLAKE2B e10d86b654ee8671e588dbcf0a509770c828d512a2c7476362c18518254946c52da758549fc20ffcc356349b758cfb518557249e1557211de670bba9cb1162d6 SHA512 cd2c514b8939ca68d0e2c7313dfa3878bce8b2b73e4ceadfe9f7e57024463ab08234e60be2451be1cb7b937e33614de70d91877da8b6001d374e37bd55c766ef
 EBUILD libuv-1.31.0.ebuild 1222 BLAKE2B 949a822dba0c539f7a5119e2478346007a37fef5f51ad67e603bc40586f721efb69e071a1ff45f702c991212874b1012b4f8d6bf86a497437caad77f58612bf0 SHA512 a1f75038807ef26e55189771b6584b66431e4c62b664637ba7e48e73e1af53faf2b11d918995448b9d9e148a11e77263b181c554087d3ef799875d6b2d365f5e
 EBUILD libuv-1.32.0.ebuild 1222 BLAKE2B 949a822dba0c539f7a5119e2478346007a37fef5f51ad67e603bc40586f721efb69e071a1ff45f702c991212874b1012b4f8d6bf86a497437caad77f58612bf0 SHA512 a1f75038807ef26e55189771b6584b66431e4c62b664637ba7e48e73e1af53faf2b11d918995448b9d9e148a11e77263b181c554087d3ef799875d6b2d365f5e
-EBUILD libuv-1.33.1.ebuild 1216 BLAKE2B c62ac4f3cfa40721d0ba1769abd9d2c7a6571abd6eb8d6587dea8ed44d4366b0b975401308c3cfaa7a4f3a51a464850e1d5847a5288e579c0fb494b797ee9540 SHA512 19f7c0ad8c85c8c23c3b4b11244a23514a5247b087f783599906bd93dbd08554fff7cb9b53693aa95b48282fbbf235d2b73796ee098af4ae53cdec912b6ae095
+EBUILD libuv-1.33.1.ebuild 1213 BLAKE2B 27a70224d2326c4c7154de5570eca7a9a6b2967d69ddd5366139ed8817857cdefa266a693c699d27d35725f672860dc214c4a8d028afd1aa091f785ccffbc720 SHA512 5e6ef36fa654925eb1cb235e655763446fdd6b85e8a10305e05f66d9f73e2cd326889e5865f9e03451536df3935c80f7d529906f3cf314b8a27a7a4e6e5c0e24
 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.33.1.ebuild b/dev-libs/libuv/libuv-1.33.1.ebuild
index 974f7290cdd8..733f3b6463ed 100644
--- a/dev-libs/libuv/libuv-1.33.1.ebuild
+++ b/dev-libs/libuv/libuv-1.33.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/libvoikko/Manifest b/dev-libs/libvoikko/Manifest
index 7f04b59cdf0e..5f847eea9453 100644
--- a/dev-libs/libvoikko/Manifest
+++ b/dev-libs/libvoikko/Manifest
@@ -1,5 +1,3 @@
-DIST libvoikko-4.2.tar.gz 653769 BLAKE2B 6c0e665d7b5eca394b49dbebf38a0815b1fe1ea328efa305e9d1574b551c633be6b2326b5b402bbc454557a559a821a28c668a1845b21a71c378d0e97103ca53 SHA512 483d3c259a52ae772d52f708789c3df39a4857188c7b9035ce5db8b16bfa4ef144e2ffd557dd6a0655e4c9a6984529784e4098bc949a1bc8a0a50529fee49656
 DIST libvoikko-4.3.tar.gz 655465 BLAKE2B a5c0cfd420d51f873bbd707dfddf2e20ea3df8285a88a13fd6a2af947183be42137aefd1ae088b7b01e938864b3fc9402b110cc8a577efb8331a7ea24f795c2e SHA512 804d55d34deca52f882580ff8699a548d0b62d79eb8e27f8f5783a9e0e57d1ab8986963084df2b5fc7ca9f45546e6e4d66e195a42cfbe0327ca02dc211563988
-EBUILD libvoikko-4.2.ebuild 887 BLAKE2B 1ef2412c5a3142334811ed071b2c155d2bf1aa97d3c056739bc411854ff9bf3fc47a808f2be0f2257acda0846db90ae73cc00f9dcfb30290bcc176ce0122f206 SHA512 b64ba2188d30d79700b29bf57546cd54bd9d7c05cdbbb0025cad438a88bd398c74f0883eeae3d30806365698363c9e3ad93ef5b03c78968f0c283bb5ab9b9b92
 EBUILD libvoikko-4.3.ebuild 887 BLAKE2B 1ef2412c5a3142334811ed071b2c155d2bf1aa97d3c056739bc411854ff9bf3fc47a808f2be0f2257acda0846db90ae73cc00f9dcfb30290bcc176ce0122f206 SHA512 b64ba2188d30d79700b29bf57546cd54bd9d7c05cdbbb0025cad438a88bd398c74f0883eeae3d30806365698363c9e3ad93ef5b03c78968f0c283bb5ab9b9b92
 MISC metadata.xml 419 BLAKE2B dbdf2112c9dec7639da8529d60e49c4da9cc413ca6a64d9175428495e73e7daca3d2a31306984d12f3d264fecc9d0258c7849f8533da3880ca287469c749a5fc SHA512 62374b7251abadedc04b5581551429300ba783b1ad02f237d8a73c3bbe60b1c8495e0de5540418c02d79ff14f58b4b7820be9f6f6dd8c529003a7fc6a7584b5b
diff --git a/dev-libs/libvoikko/libvoikko-4.2.ebuild b/dev-libs/libvoikko/libvoikko-4.2.ebuild
deleted file mode 100644
index 7bdff963650d..000000000000
--- a/dev-libs/libvoikko/libvoikko-4.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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..7}} )
-
-inherit python-r1
-
-DESCRIPTION="Spell checking, hyphenation and morphological analysis tool for Finnish language"
-HOMEPAGE="https://voikko.puimula.org/"
-SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+expvfst +hfst"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-DEPEND="${PYTHON_DEPS}
-	hfst? ( >=dev-util/hfstospell-0.5.0 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myconf=(
-		--prefix=/usr
-		--with-dictionary-path=/usr/share/voikko
-		$(use_enable expvfst)
-	)
-
-	if ! use hfst ; then
-		myconf+=( --disable-hfst )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	python_setup
-	default
-
-	python_foreach_impl python_domodule python/libvoikko.py
-}
diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index d16237e79f36..22b9bd572df0 100644
--- a/dev-libs/libyaml/Manifest
+++ b/dev-libs/libyaml/Manifest
@@ -1,3 +1,3 @@
 DIST libyaml-0.2.2.tar.gz 79465 BLAKE2B fd37cac256b40b0c5daa32584d271448e5e1c196a7fa7eeda753fb962c7d916b3c415425170d70db67c3f114b27d03fdd67fb4e380c04027198a601e1bd5a094 SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06
 EBUILD libyaml-0.2.2.ebuild 1002 BLAKE2B 60a0925c00142dfe1f195f6921b698d8d3cbf0f0e944afe298dab5171f89215cf4067cd002246d284ac9349260a091dff5b20fd0c6b02e48206bdb610fbbb277 SHA512 62ffa4402594dd8d78bbd9c2f73cac70df2822da1216cbb96855cee3a06856c469e0bbcf0f7e99434cd160321dd6bcc458e1f9def820ae90dd5ce569b72dd6b1
-MISC metadata.xml 393 BLAKE2B cce8a44acadbabe965899f786d3855d19b49549e42e39b2311a1d125a22789aa28924136767b42c074210fee6dd1b17f337968195aacf3190418979898bafe03 SHA512 ce775cab169e0601244583a8b771dc9f3fa58ccbe6e9bd315d5a778cc92e887b97ee63c7d5bcbc87d0b0483d89444855562aabf0d7f0067f660c173c4aeaad37
+MISC metadata.xml 314 BLAKE2B faf993f4437ac11e1c1f301d5c54f54f9bd5d704e0fcbba3dbdfe633e5a209019bff0c734f1fa12bcdf50d58b7da9883d98e801a41effa22630ecf48250f307f SHA512 d84dff0d4f37c633c81224e56d1030c1f623037b5eb9ad485c93fe5710bbafda3e115569fc5877233459d5525175c305d9f94ca0bcf01434493e6ba0553c7730
diff --git a/dev-libs/libyaml/metadata.xml b/dev-libs/libyaml/metadata.xml
index 7a9a3509acdf..2e0223066045 100644
--- a/dev-libs/libyaml/metadata.xml
+++ b/dev-libs/libyaml/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>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		LibYAML is a YAML 1.1 parser and emitter written in C.
 		It's in an early stage of development.
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 3ebcf0447be6..794f2733d300 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -18,6 +18,7 @@ DIST mongo-c-driver-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def722
 DIST mongo-c-driver-1.13.0.tar.gz 5734887 BLAKE2B ce5c78dde31edc753a6678e90889a0da7129cd1fcf1dce7222df4d25ca109b1bfbb545c755abf8e4cc39dd40dde7ba4c50dd51dcfc67c970e2b8eb278bd543fc SHA512 d2f5b04b3d2dbdeba4547ec1fe8a0da7bad5214de92fff480ef0ff7d97ea45d5e6347c11c249867d4905b1dd81b76c7cfbb9094a58df586dae881955ee246907
 DIST mongo-c-driver-1.13.1.tar.gz 5740487 BLAKE2B 92184df6f15f951564a7df14d8ec52eb0199a49af102d44c8fb7678db82a41f915c984e95f5301f533dde63139221cb6e161fa5053b9fcc33080abe1095d9c35 SHA512 454670a145a5f2272daa5ca88f2e7d7e42c9b7df62dfc29b3c4b602ef8f819a740890c40872fa47dc411cc5ef9a34b55a6feea3657a802a5be378c4dbe79f42d
 DIST mongo-c-driver-1.14.0.tar.gz 6573651 BLAKE2B 0b1157473554a5aa49e61cf1c85dc7b1f1917581e661a4295876d4c93e72137b4c7c04e1b7545ba7272706499dbe868a36f1c888d2d07a8176f1c4dc01f9fa5f SHA512 99ca4001341d044a8ffc02a5d7175d40f8a998bdaad15a668a7db0558fa616ec18152faeda6da7f28b34c5d2cf4b649180c9390d2229e1342b6c4f6742816994
+DIST mongo-c-driver-1.15.1.tar.gz 6699867 BLAKE2B afb75b6f50173bbe161a37a5cd3afd7d2ce3d9ab73019e2a27e2b15b0be0a54c5e3b423dda2e6d65b85ff7c1dbbd883f3a0e0ebc244a13c531d2c39297d9a5e9 SHA512 7544900809dd008da110b412acc1e5e42ea908d804fdf3bced8100e48f1695844605407c9733b285b8833b636bcaec8687df25a01c9749612c61df2325214fe5
 DIST mongo-c-driver-1.3.5.tar.gz 5860804 BLAKE2B a55de56d285638f21caff06446e3c0c19a5b8722a2ed69fdf046c35973c9bedcc1686065e4355db28afc83c1415872eee2972a6fb3f21647d2cafce12706adc0 SHA512 23844ffe20580998308aa9c8409afcb87dccde874077eefc6806b705e5de5743846ba0513f3a3fe83147fc47842ab8c7438ad1de5f3f55b81586b9e19046aabf
 DIST mongo-c-driver-1.6.2.tar.gz 6907818 BLAKE2B 7922a50ba58d92d2954eb5c2ccb02fd3b70861bd26516fd12fe6bdf79a926799fbc3a367e1c24a57932870726aa5abc1d264215ea964a56bc318ab0f413afc60 SHA512 b3fe08a31bc83707a4d94f8ea2742fc9b17d024d6c2f92b49cfc4fe012e58cd441c9f0fa4bae9f4205fca44b2a0d8c6d5bc32a05fc9ede9bab0011839a1394af
 DIST mongo-c-driver-1.8.2.tar.gz 7308675 BLAKE2B ca82c2824486cee78b164d1fdfcf1de062804f0f8637a36ec197efe434ae23a387ec0e6b2e4aa3e9c8bb2434a3cef48fecd17fc4b159a92ad86b8b940b17598a SHA512 af23601ba33694d80acdb890c1b85a354fda966491c4bbfb341a884bcd6314886e405efa3a09e47398adf8dbfdeb1b05ae8b022a72f04a66265bfaeddb661f76
@@ -33,6 +34,7 @@ EBUILD mongo-c-driver-1.12.0.ebuild 2343 BLAKE2B e711508f266ed482c496fce0f593e62
 EBUILD mongo-c-driver-1.13.0-r1.ebuild 2431 BLAKE2B ca1cb9c45b3e7b5a78763afbdd0e4105d6eb1d2c60e647081923fcf5c460b9b56568ee2e47dbcf743cf5d15870091546981bb7f68c5903da46c40849d948cae7 SHA512 8cb7d48ee5d1f1a7bf66042dc87ebe685db83b96b8ffa107d72b1faa5b9266b139810e3cb9cbbd3dbb1d3b752b87bb8dd810f43a5ac02dee5c16af6f9784c7c7
 EBUILD mongo-c-driver-1.13.1.ebuild 2466 BLAKE2B 8f5e8d47c5e0b69876f6701986d70c3db75b6e4d28a817f3e880aa630eef6e1eb8307bf91bd98fc170aaee702aec9e8961058d83cae0d009457213bc1088fcc7 SHA512 2c2cc1f028ddcd1b93227a8022ecd47655aa43088ba8e4f5d782a31cd5122752be80d6904d85353c92cde040fae6f5333ca91e1fe678a3ed1bdec4b7aeee024f
 EBUILD mongo-c-driver-1.14.0.ebuild 2535 BLAKE2B 39a56e6dcac4bacd8c18d4c78d7186833533ffe9e998576a38edddeffc88b27a18707b93694fdfccece8029a26431eb5b3d82eb059d14dcacced898e536d5d6e SHA512 c47c698ae7e76969a8cc5c778a0a5b121628a6fb625a7cc90e114a6943872d3520cac0e8cecb5a7066226d140711b40077ebd098de30b6052687a18f97a1eb31
+EBUILD mongo-c-driver-1.15.1.ebuild 2536 BLAKE2B b4d2263f92d32b3605188b6ea91d8dd1a3100ad13e73c300b6efe5a684483a9669c389d591c6681c5f6a2a1501bbc1d2fc4c1db88533c868ca1b4fe30348203c SHA512 393ffad442d3db5ad0661459f3ef9cbe9d37a5087079436ac6c534dee378d207c802f928b6dbef13626d6c77026971215c52413e8ea7bf21167f74526b9b6560
 EBUILD mongo-c-driver-1.3.5.ebuild 2155 BLAKE2B 45fe20fe538367ac6005a6029fe2607be500aacc9558cf24bc16931bb6eaf5629f8b7d6611ff745876707d04a30776604b09a73b7d09d2dbe8ed8c9f7347aa04 SHA512 a80ee2ed4231f6da38f4cc812258efbc768e4ad3c0b2632aa8fab30a25361dad4ed4a9ec98c4ffab05ff0976e0b85a5c1080439ce8899bfec42c5ebef8ec59ff
 EBUILD mongo-c-driver-1.6.2.ebuild 2095 BLAKE2B 25dc744ab32604d799ed4af21a2495ae146920b93ba8e8cbd318e2b912c94903514631c592e493593e7b5b2e629b77aeec2cc44bc718a6a794a3921a9f581a9e SHA512 f75d4ff29770a6ca306a8414d29f23b90d3dbd56e9a897d51baf6eabb9be19fdf247eb0804989d1052079a01f55b52086921fe24152ab45ac53ca5f492c0efc7
 EBUILD mongo-c-driver-1.8.2.ebuild 2153 BLAKE2B 404dd02861d6acad7d2622254759e817e3d993a540cada00576752fc688120532cc07e9ed934da403337bc829baaebd6de0eb1b2d50b73bf7305eabb33c17c5b SHA512 172a89e04ea99583b7587949dde56b1a79ed7d5db00897ada797fefb6d8e8a94338ea4e4b00ad2792275a241468158e055832a783f018f9281023e0f37e76619
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.15.1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.15.1.ebuild
new file mode 100644
index 000000000000..6bded6a0a993
--- /dev/null
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.15.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Client library written in C for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
+SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~s390 ~x86"
+IUSE="debug examples icu libressl sasl ssl static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="app-arch/snappy:=
+	app-arch/zstd:=
+	>=dev-libs/libbson-${PV}
+	dev-python/sphinx
+	sys-libs/zlib:=
+	icu? ( dev-libs/icu:= )
+	sasl? ( dev-libs/cyrus-sasl:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		dev-db/mongodb
+		dev-libs/libbson[static-libs]
+	)"
+
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )
+	!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.14.0-enable-tests.patch" # enable tests with system libbson
+	"${FILESDIR}/${PN}-1.14.0-no-docs.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# copy private headers for tests since we don't build libbson
+	if use test; then
+		mkdir -p src/libbson/tests/bson || die
+		for f in bson-context-private.h bson-iso8601-private.h bson-private.h; do
+			cp -v src/libbson/src/bson/${f} src/libbson/tests/bson/ || die
+		done
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
+		-DENABLE_BSON=SYSTEM
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_ICU="$(usex icu ON OFF)"
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_MONGOC=ON
+		-DENABLE_SNAPPY=SYSTEM
+		-DENABLE_ZLIB=SYSTEM
+		-DENABLE_SASL="$(usex sasl CYRUS OFF)"
+		-DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)"
+		-DENABLE_STATIC="$(usex static-libs ON OFF)"
+		-DENABLE_TESTS="$(usex test ON OFF)"
+		-DENABLE_TRACING="$(usex debug ON OFF)"
+		-DENABLE_UNINSTALL=OFF
+		-DENABLE_ZSTD=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+# FEATURES="test -network-sandbox" USE="static-libs" emerge dev-libs/mongo-c-driver
+src_test() {
+	local PORT=27099
+	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
+		--dbpath="${T}" --logpath="${T}/mongod.log" || die
+	MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
+	kill $(<"${T}/mongod.lock")
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc src/libmongoc/examples/*.c
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index 3d99cb9c301d..c48be88a07e1 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -4,5 +4,5 @@ DIST mpc-1.0.3.tar.gz 669925 BLAKE2B 4b5a1db5220b58070f9356041f44f021c2c9ec46aa4
 DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628
 EBUILD mpc-1.0.3-r2.ebuild 1045 BLAKE2B d633849f8800b5ceafa524fcb2f01dbaae5eb04898667f902303af6bd439da3f7acad1f95946e083e90b41bdf4c1d3095d9ad76ecd748a8fb9035fe7c6f8cd19 SHA512 2e3af6ce3b2c0cd2dc670bb689087ffa84eacb31b96f373e8e621b6a628e4fffa3ca9386e81c93b07c19343e9cb7f9806198ba7ad7265a3dae3f7c6cef10b7ca
 EBUILD mpc-1.0.3.ebuild 955 BLAKE2B b81c6d279157a3a47c6e78cf40b625d29226b79ef587c22cf1e25095bd1605823c94207cf75b8a0271dc988bd8bac1b6ebb2915080171322e0ba50f4b55aeead SHA512 aed001c22031eca558034bc9deac4d235c9aba28e9c9187a75b71bfcf91f65d7be18d722b29abebb781df72ef8442febe7e40ed5241c1ed3c768d2bf9d6e5509
-EBUILD mpc-1.1.0-r1.ebuild 919 BLAKE2B 2f1aaea8d1b94e565d9d0dae800b98b9afdbfb634703d8f42bf6039303cade232752ac5f202f404583b8799adde5a8f4345e66e26cae4745eb6bbcc4f1228d75 SHA512 e3bb382c716a0b798298174e0476bc4d84b69aee1eb0a2635447da6dada7472499a940654afef5634331e3f106d21d00c5f7ff2caad2fd0d3b3ef263a9ad2eaa
+EBUILD mpc-1.1.0-r1.ebuild 913 BLAKE2B 6b93f0d4020fd5b715f4c1f6b3b6b50fa1c9583def3e10981ecd1d29fb8b46574804f0bd716f63ff466ab890044ebe2c58d9020165c598fa8c54fbf1f37b8ee8 SHA512 3ebb63aeff24a0cdb44fa51e2d50b9a45e7cf155903cc69b7f9495ee55bd40cc5cf9610c1fd3366289afa41f50aeab9f4e10e1a17ba0867c31c862370aa432e7
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.1.0-r1.ebuild b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
index d08903a02d24..4282e9245588 100644
--- a/dev-libs/mpc/mpc-1.1.0-r1.ebuild
+++ b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 227436542dcf..ac69b0eb93f9 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -17,5 +17,5 @@ EBUILD mpfr-3.1.5_p2.ebuild 1672 BLAKE2B 4cb61b40f2d8495d460ad6e804ec8ecf6bf4ca0
 EBUILD mpfr-3.1.6.ebuild 1591 BLAKE2B e83822443f4cefba6133397afadd04771cd4e5fb93598bf64fa9d94bde0bed823bc61114fe315488dd82a03c969ff78825d772a04e2fc643fd41f1d03a4f613b SHA512 3e2871fd594f7799f28e67e25223febdadbfec6fc96928d13ef1e0a394d69a88634a8ac490f22df9ec6827b0aab7926e377f10830d7bd74d87df163d64fd106e
 EBUILD mpfr-4.0.0-r1.ebuild 1698 BLAKE2B 6357828969ceaa9854aa801fc52cb02a273d8f25cf20bc082fc3e4226b8eacaf8a6f28cafd6db7c58f6e1d597d7b179a95f6052f19ee0ad89351c87f7a01b8bc SHA512 e68e3ca70ab845ea8762be1ba670d533ca714963f8ddf03af07575a7ad0603810e9b22871413c17d6828068e07f06bbec6ca8aeeb2c161d3cc32dac9e346cbc8
 EBUILD mpfr-4.0.1.ebuild 1698 BLAKE2B 6357828969ceaa9854aa801fc52cb02a273d8f25cf20bc082fc3e4226b8eacaf8a6f28cafd6db7c58f6e1d597d7b179a95f6052f19ee0ad89351c87f7a01b8bc SHA512 e68e3ca70ab845ea8762be1ba670d533ca714963f8ddf03af07575a7ad0603810e9b22871413c17d6828068e07f06bbec6ca8aeeb2c161d3cc32dac9e346cbc8
-EBUILD mpfr-4.0.2.ebuild 1697 BLAKE2B 72ba1a6325edc37a5dab6f270611efd228332e18235253cf48d2602bdc0924b6b038f9e8f883184cc103d8f8f5b96dd12144cca922372703ff33c6a002c58e61 SHA512 730dd767ddd903b6c04231a0b7768d5a8e40e7ad823027435bdf2df0e4e806d92b24d1ee1210d03e8b0e0fcd5b5a1a50be49734060f13ef70b7a910327670684
+EBUILD mpfr-4.0.2.ebuild 1691 BLAKE2B e239cbc030ec4963fd12314c9e578116b72a8f828729fab526f54f515f128d2d4d1bf929d206b026489282aae4ad8a0ff6752829d895534f94cfddaa26d05a3a SHA512 ca2c6d4f25d9e54fa586992dc391214070f4535e37affafcee530504344a4ba566bdc6b34beffebe097c97c503a45b395955f5cfe51860936e8c69c5bedd2c3a
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-4.0.2.ebuild b/dev-libs/mpfr/mpfr-4.0.2.ebuild
index 1a33a370780d..9324c6acc82f 100644
--- a/dev-libs/mpfr/mpfr-4.0.2.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 50d01fbb06c6..9d29f288b472 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -15,5 +15,5 @@ DIST openssl-1.1.1d-bindist-1.0.tar.xz 13180 BLAKE2B 680bd7400d3dd3930067ee7efa9
 DIST openssl-1.1.1d.tar.gz 8845861 BLAKE2B d3155f07b487ebd8dd4fe25396c874f9af18b5cfd7e622298d29c4f2c8ce14ad4534609d321314a4bcd0d44414e1306190340daaacd3c8fca061c04498446244 SHA512 2bc9f528c27fe644308eb7603c992bac8740e9f0c3601a130af30c9ffebbf7e0f5c28b76a00bbb478bad40fbe89b4223a58d604001e1713da71ff4b7fe6a08a7
 EBUILD openssl-1.0.2t-r1.ebuild 9848 BLAKE2B 27e23ff21c452778cf65563c571fd89837ba5c60fd783f9b55da5b40bfc1981492e172bc2757fa4dbcef553cc848ad378d37e3bb79583a850239be3e0e5fc008 SHA512 53c3a31e3dd8226ef8c24a11b6a82c97dba4251d8b09986d5d48547f0d53e93c05cb30d9591ecd945f670a4d142fc3595b1c2c44034fca4e53eccd29c4d26caf
 EBUILD openssl-1.1.0l.ebuild 9579 BLAKE2B c60a96f76591ac3e913d28e86bcfd53cabe5428707d1ce0f713908ae7c88b0624f34b6334b2745f1817b4f173d581c11eff1b4ef7a22b7a5c660523b54b8c9ab SHA512 70222a86f55a87e7811c17af0f6d642290024b7635dc3f3c6f5bebb27394c797ed021f9390b33a3fc303ef9b6c600a69e63ecf6d0713c68f0710d72bef8cb4a8
-EBUILD openssl-1.1.1d-r2.ebuild 10306 BLAKE2B 7104748f994d7a1d8933c4da08a94a90cbd01594517ef5ccadf2e04477ef7b85e6ede4af0e43fe8b13c5d33dc4c2e5c3db2eaf133bbd26a8e2c2b373638226c3 SHA512 8d5d81e4913242dc7e69b6d890480a8138e679aff1cf57fb02ba8f18176e01b92d4e564d080c5d456e8c94cbf24af70b93f91d434be4b3d19fddd6b97f52c8b5
+EBUILD openssl-1.1.1d-r2.ebuild 10306 BLAKE2B 4865788cfb9f3dc1e03e1f1748009c6970f867329c8e42a7c03d56e77f671193511adffd9cc4738cadc7bf9401f8f8b51a8a1cbf15c9def30b857b0210671ffb SHA512 916025522d0f5fac0f9db404bf9898b0c71f870e309eb3a6f55dd082669783a0d7763e5d747a5c4677099feaee15e0879ca0ea71ce3692a6bab83f6b3573ce40
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.1.1d-r2.ebuild b/dev-libs/openssl/openssl-1.1.1d-r2.ebuild
index 68fb0b3b5ad9..1b8d0ea6945d 100644
--- a/dev-libs/openssl/openssl-1.1.1d-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1d-r2.ebuild
@@ -75,6 +75,10 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
 	if use bindist; then
 		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
 		bash "${WORKDIR}"/hobble-openssl || die
@@ -142,10 +146,6 @@ src_prepare() {
 	# and 'make depend' uses -Werror for added fun (#417795 again)
 	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
 
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
 	append-flags -fno-strict-aliasing
 	append-flags $(test-flags-CC -Wa,--noexecstack)
 	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index 7e029f2624cc..b58d5c4344d0 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -1,5 +1,6 @@
 DIST ppl-1.1.tar.xz 14734820 BLAKE2B 2c96d86b534c7f06569bfe37d0ca1938b0c7c708b38d62e210d868db005275e392b2cc9e6dded7d4a5bf1e901136c298b0ff86d2933dc89b4607d5ef9e286b86 SHA512 ae0503fb3eac494fa3edf5d5c9ec61e2419e6e2fa57d30323f7d0360ff080b033686410c7462f5b2ff5514803451cb91e9c0fc14cf953485c5f5fd664448cc27
 DIST ppl-1.2.tar.xz 14136236 BLAKE2B 060b73384dac558dc8b2b0f1027ed0aa270b0adf0992c2ca1a281fa7bcdf959cba3a9e8ee29e978d12c3eee606b819075c5bcab59f4aed24fbf1c5512b5e2c36 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350
-EBUILD ppl-1.1.ebuild 1589 BLAKE2B 82d6a50faa6173d6c85429f8b0aeace735b519ae77b8eec6c204ad30de3f0b5c887f3891a0e4dc712d6aa3fe23be88e0fbf6f57c1732324a59489cba7d40775d SHA512 c2c7fd8b97b008fee843de17cb9319779ff731ee421b0e65b7039bb750846c23825b0f4950e7b0ce3b19f8bc423a3e5a6d057d3de10ae42e721fadb71005737b
-EBUILD ppl-1.2.ebuild 1593 BLAKE2B ddfa57fd25701c8c53df4c5900d85770796137a47d901ec60cca87fc70e58131ba37cb4c1d5371860692a5331e6503029365e123f18b6ed9caaf355198d07eef SHA512 5ab574fe9692b7f0ab15cf3408bba0e6a3c9a4826f6e0ea6c6641f29b29ab103f3a5cd74c9360fa56415dd5f84dc7987ab070c1b82e10c089e8e5d4e0608f9cb
+EBUILD ppl-1.1.ebuild 1593 BLAKE2B e40f20ac2e1d0a84f39ce36f6250e1cb90e98f95ae682105ee2faa4db0191fc068f5335d7d704bae3a9ab665129a9845c440328afb3d683685cfa6095b776c0c SHA512 98c2fabbd4c254fa4ac8089def203a944425d3d6516e7fd345ea69734fa4c1b022b98313866347f7354a3e635926cf8ff19f838bb89f17af9008d069c0c3001b
+EBUILD ppl-1.2-r1.ebuild 1305 BLAKE2B 59322ae53b8692ffbf0e19322790db29c669cbaa974a1f53330abdeafedc1b12b8ada729cead24fbc4ae8bacbfddbd47e2b58d4b3f6c9ed2fa45b9a5be513944 SHA512 aa9991b0c96ae26b59be875c3bfc36566bcf021cec2e8aa5bd158354f7158224dc4b847469532b8374718323f3d0a7f4c7150e5dba650f807b27c428c35d9ed4
+EBUILD ppl-1.2.ebuild 1597 BLAKE2B d10d1eac0c5a0e9d4ddbe84f9538035dc5ef6276b679d17e92851401bd9fee6b6da61d9166d7d6797ed36830bfc6c9d7889e53693b147af5e623b4e5735eadc2 SHA512 d92a3cf5ef73e721fe0ccd8dbaa85cc9c6a3c686a33917696b22b9aa0bd1fbc6d1f3bc0d02b8b6683fcd3426999905ccefdcf871bf0064bd09c76c16f385b0bb
 MISC metadata.xml 354 BLAKE2B 77e58ca8f59039d9814e8388a7fa941fe88130fadd21720447f050f09cbccdf289153f15874c6f48cd7d8720841d181e4904e515df87c3a16fc8673283b41b4c SHA512 5f42b5399f8961160bd6ed9db93c11e2f7c7f1e750c227068fb828ac7519c927b55786d7cf60481d21813d48af51e7cae7e1c8baca12f8fbe6a1f4e701377a50
diff --git a/dev-libs/ppl/ppl-1.1.ebuild b/dev-libs/ppl/ppl-1.1.ebuild
index fa6ffdcc1e63..2808c73b96a7 100644
--- a/dev-libs/ppl/ppl-1.1.ebuild
+++ b/dev-libs/ppl/ppl-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,12 +13,13 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x8
 IUSE="+cxx doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx]
-	lpsol? ( sci-mathematics/glpk )
-	!dev-libs/cloog-ppl"
+	lpsol? ( sci-mathematics/glpk )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	sys-devel/m4"
 
+RESTRICT="!test? ( test )"
+
 pkg_setup() {
 	if use test ; then
 		ewarn "The PPL testsuite will be run."
diff --git a/dev-libs/ppl/ppl-1.2-r1.ebuild b/dev-libs/ppl/ppl-1.2-r1.ebuild
new file mode 100644
index 000000000000..f522c2384bc9
--- /dev/null
+++ b/dev-libs/ppl/ppl-1.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="The Parma Polyhedra Library for numerical analysis of complex systems"
+HOMEPAGE="http://bugseng.com/products/ppl"
+SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0/4.14" # SONAMEs
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~sparc-solaris"
+IUSE="+cxx doc lpsol pch static-libs test"
+
+RDEPEND=">=dev-libs/gmp-6[cxx]
+	lpsol? ( sci-mathematics/glpk )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/m4"
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local interfaces=( c )
+	use cxx && interfaces+=( cxx )
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--disable-debugging \
+		--disable-optimization \
+		$(use_enable doc documentation) \
+		$(use_enable lpsol ppl_lpsol) \
+		$(use_enable pch) \
+		$(use_enable static-libs static) \
+		--enable-interfaces="${interfaces[*]}" \
+		$(use test && echo --enable-check=quick)
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}"/usr -name 'libppl*.la' -delete
+
+	pushd "${ED}/usr/share/doc/${PF}" >/dev/null || die
+	rm gpl* fdl* || die
+	if ! use doc ; then
+		rm -r *-html/ *.ps.gz *.pdf || die
+	fi
+}
diff --git a/dev-libs/ppl/ppl-1.2.ebuild b/dev-libs/ppl/ppl-1.2.ebuild
index 7b7669adc3b7..8805f55b2eab 100644
--- a/dev-libs/ppl/ppl-1.2.ebuild
+++ b/dev-libs/ppl/ppl-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,12 +13,13 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
 IUSE="+cxx doc lpsol pch static-libs test"
 
 RDEPEND=">=dev-libs/gmp-6[cxx]
-	lpsol? ( sci-mathematics/glpk )
-	!dev-libs/cloog-ppl"
+	lpsol? ( sci-mathematics/glpk )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	sys-devel/m4"
 
+RESTRICT="!test? ( test )"
+
 pkg_setup() {
 	if use test ; then
 		ewarn "The PPL testsuite will be run."
diff --git a/dev-libs/replicant/Manifest b/dev-libs/replicant/Manifest
index 4cb01d766612..95ac433882a5 100644
--- a/dev-libs/replicant/Manifest
+++ b/dev-libs/replicant/Manifest
@@ -1,9 +1,3 @@
-DIST replicant-0.6.4.tar.gz 423835 BLAKE2B 6c1a0a512ba093a72d457e86b36443841a216763ef363000e0299894f6ed18f0c540e47351b5d09ad058b814d74064cb7184593cd892b761f50ad6b35d309282 SHA512 a4b82a2ba4f00807e999511e7549cb1e490cbef6e9b69b735e760c2d505a76e8dffc5338a7a2b2224c9a9518f2259eeb24dae340529d6004a26b7929a90a2c1f
-DIST replicant-0.7.1.tar.gz 443142 BLAKE2B b88e9e78792badc91d9b6f282694bb6c591f454eeb591e5beb5ba4191db2fa5cfe80c59651c72c415598d6bd2a5be13ff818f8e69a2eca0ac3ea164f142a42e8 SHA512 d1eaae7b36e3738a39adebf9eeca92dbf83a8075bb8fc69c4a8b291d35d3df89dbbaf8a546f97464cea3431609e19b5f8252e67c82cf8fc20bd5f3447c0761a7
-DIST replicant-0.8.0.tar.gz 444032 BLAKE2B 20c0f4bd574663730c4e3759380e8e6ebb249d01c882340583fa71863b54f01563d7cb4aa6e81d57b3e777d30999ad7cb4d244e0aabaa576d49d8971bc6df15a SHA512 6161fc9f480952aa9d2e53065a21561585db0a859f715814eeacc5ea46f1bc6caf2e9df8e5b0b4500f2e9946a36ce28d398580323f1f6074620f505e870db846
 DIST replicant-0.8.1.tar.gz 444074 BLAKE2B 0e4c87437268a86d67b0452e77bca4b4787d44deac29daa4535e851e007c5f6641f2c2cc7f650493ff89e69fa65ee8075658aa70ea0212253334d1af7a6155ae SHA512 a968b92717156656d8f3d8302cedf3405fe1efdf2be79905900f3e3ef26002ec83d4337dceb60ea493bb1607a0b0f9bcba92d766bb11463818483d64ecaaef38
-EBUILD replicant-0.6.4.ebuild 447 BLAKE2B 1c26e551418b7641fbd350112965cc3a1443e50e82b92d2111bf4c122cc4fd8414816ccf30d5e795f8ec3ade09200d0295e745dd601173e38cb93295786874c8 SHA512 8127dca411d73c47a22bcdfe7fa03a410576ddab462bc4cd445a7d5404049740c7132f56a19bddaa3e1a8b551f5e4ecf647759771020712034a45403f4b1bd58
-EBUILD replicant-0.7.1.ebuild 447 BLAKE2B 1c26e551418b7641fbd350112965cc3a1443e50e82b92d2111bf4c122cc4fd8414816ccf30d5e795f8ec3ade09200d0295e745dd601173e38cb93295786874c8 SHA512 8127dca411d73c47a22bcdfe7fa03a410576ddab462bc4cd445a7d5404049740c7132f56a19bddaa3e1a8b551f5e4ecf647759771020712034a45403f4b1bd58
-EBUILD replicant-0.8.0.ebuild 448 BLAKE2B 354f3055277b47893a09eb7ffed5554adc00a04d5d5f78f9b5a3a38d193f396e46e66c001b8c8b0a3fc054f66343a3fb43a366a8a67134b999bc7c6a2063c53d SHA512 58740fff6a7ff01718fc6f97769d14851ed7639057dbdb662c0c4c64c74a873f54419928f28a502c8db4fb7470c2c1e60f7604b5b2b99d818addafeed3483357
-EBUILD replicant-0.8.1.ebuild 448 BLAKE2B 354f3055277b47893a09eb7ffed5554adc00a04d5d5f78f9b5a3a38d193f396e46e66c001b8c8b0a3fc054f66343a3fb43a366a8a67134b999bc7c6a2063c53d SHA512 58740fff6a7ff01718fc6f97769d14851ed7639057dbdb662c0c4c64c74a873f54419928f28a502c8db4fb7470c2c1e60f7604b5b2b99d818addafeed3483357
+EBUILD replicant-0.8.1.ebuild 445 BLAKE2B 994961ba47084a29fa54da653d2f77f48c84781d8b1076a48c41c8474a12c8ec0262249eaf07f661ba8c0d96e2caa98b3e8d3d60ac943d150a774297f5b2fbca SHA512 d01e33a5acde789b665d210cf33636413c8931446e54d31e2fc0095ea928c924f7a366fb09fffffc1e4be3b65298d9f6d13572b01740edd0da08f1001557a229
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-libs/replicant/replicant-0.6.4.ebuild b/dev-libs/replicant/replicant-0.6.4.ebuild
deleted file mode 100644
index ec4adccd11e7..000000000000
--- a/dev-libs/replicant/replicant-0.6.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Hyperdex replicant support library"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-0.4
-	>=dev-libs/libe-0.4
-	>=dev-libs/busybee-0.4
-	dev-libs/hyperleveldb
-	dev-cpp/glog
-	dev-cpp/sparsehash"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/replicant/replicant-0.7.1.ebuild b/dev-libs/replicant/replicant-0.7.1.ebuild
deleted file mode 100644
index ec4adccd11e7..000000000000
--- a/dev-libs/replicant/replicant-0.7.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Hyperdex replicant support library"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-0.4
-	>=dev-libs/libe-0.4
-	>=dev-libs/busybee-0.4
-	dev-libs/hyperleveldb
-	dev-cpp/glog
-	dev-cpp/sparsehash"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/replicant/replicant-0.8.0.ebuild b/dev-libs/replicant/replicant-0.8.0.ebuild
deleted file mode 100644
index c0dafa79a4d7..000000000000
--- a/dev-libs/replicant/replicant-0.8.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Hyperdex replicant support library"
-
-HOMEPAGE="http://hyperdex.org"
-SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-DEPEND=">=dev-libs/libpo6-0.8
-	>=dev-libs/libe-0.11
-	>=dev-libs/busybee-0.7
-	dev-libs/hyperleveldb
-	dev-cpp/glog
-	dev-cpp/sparsehash"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/replicant/replicant-0.8.1.ebuild b/dev-libs/replicant/replicant-0.8.1.ebuild
index c0dafa79a4d7..1f24b21f9eb7 100644
--- a/dev-libs/replicant/replicant-0.8.1.ebuild
+++ b/dev-libs/replicant/replicant-0.8.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Hyperdex replicant support library"
-
 HOMEPAGE="http://hyperdex.org"
 SRC_URI="http://hyperdex.org/src/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
diff --git a/dev-libs/rremove/Manifest b/dev-libs/rremove/Manifest
index 158c174b8257..0c91bd99ed4a 100644
--- a/dev-libs/rremove/Manifest
+++ b/dev-libs/rremove/Manifest
@@ -1,3 +1,3 @@
 DIST rremove-1.0.5.tar.gz 304916 BLAKE2B 65c11959d333007d4ad13b51cc91e903e24517d7bcf5e8a41912338bc3664063a72ad2529f39de2706b0b72fd11aa6ca36c88ff469df79ed0680ce3d793f1a16 SHA512 d7e31d18a3b54d506954703db4d2753eb4884bfda682c46f6f9100d7c9e69ba8d2faad64791869a22256babd29d2df79861e15018d075617f39ba3bfe4b36797
-EBUILD rremove-1.0.5.ebuild 393 BLAKE2B 0ab2484b4a3efbed82bc2669793a1dbce96c82e1dfd6b008c22ea6d55090c5768b25fed16211ab2d0bc5d59e003299cdf2c940ddf524e0e63326074ca082309d SHA512 1ed3762a3a3e76f7f159151a2c097a7e7f73fa3938159395d15e2a79cd1893cef6fb290a85e7ad36c245154fdf85cc3ab3e53faa52ecd9f845288ba845552c41
-MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
+EBUILD rremove-1.0.5.ebuild 506 BLAKE2B 773894cb2d8d7e77e33ec1849aebcda6a9cd53f77de95122aac25c7637e3c6215171a5758e4ad04e9cc594266a543ee224ef656a8b7d9d80d07cc9e6dd3b3b02 SHA512 57c4debe5fb399730b1590199989965da047bb05abfde52ebac8a0965dd4516d4d38fce39df717e8b9baa69beb419771bba0e756b88b65a6fd25840c99181916
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/rremove/metadata.xml b/dev-libs/rremove/metadata.xml
index 78e64a5cf1ad..6f49eba8f496 100644
--- a/dev-libs/rremove/metadata.xml
+++ b/dev-libs/rremove/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>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/rremove/rremove-1.0.5.ebuild b/dev-libs/rremove/rremove-1.0.5.ebuild
index d2f3c32d9e53..ff834f43a16e 100644
--- a/dev-libs/rremove/rremove-1.0.5.ebuild
+++ b/dev-libs/rremove/rremove-1.0.5.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-
-inherit autotools-utils
+EAPI=7
 
 DESCRIPTION="A simple library to recursively delete non-empty directories"
 HOMEPAGE="https://frigidcode.com/code/rremove/"
@@ -13,3 +11,12 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index cd89399dc466..71d1e63474a5 100644
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -3,4 +3,4 @@ AUX stfl-0.22-ruby-sharedlib.patch 735 BLAKE2B 6b2b9e835f57f62ff1e1ff871103bc0b1
 AUX stfl-0.22-soname-symlink.patch 444 BLAKE2B 9aa44343a18a8d7fb2f75a60ae94c30ef92b6f02190cefbefedacd9f8d5c877ac71b83c41b008bfd46a4d5ffe04f91f03f898e27ef098162d0b43f274ccff298 SHA512 e85c6f96edd8cd08d3408f976fff5f9fbcdc9892109233e78d932eb07502b00d3a0b52393542de8af5b2d26808b3574736f78b7ef9c7bdd0abffa3901fc55dab
 DIST stfl-0.24.tar.gz 45585 BLAKE2B a601f373f19baa3a11fb823852ada19ab824828935240280c74ff442a1e5c4abdf0abe56e445869e43785df3940a8c7269bc16457436abbe5e2853f907071059 SHA512 95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0
 EBUILD stfl-0.24.ebuild 2929 BLAKE2B 1763330001db9f888bd0255bde7732a39124383b6365f134cf22278d6c59b5534a5ad5f0ec6d92e78f0c3a596456838d92dbf1f085a9f7edc1074edb3320d3c4 SHA512 7f31eca16ec6373901784af07f3f3251bd336ec725d55e90be016e6ea4bd9f8aeb4c1ade5ea7053fdd721d330ec1fb15ba58343a18bb7cd4fe943cca9345e04d
-MISC metadata.xml 914 BLAKE2B 723117eb04ce97ded544a44d56808ef7ac0e54efd5447543e5faeb65cd361b77b066a7058a91b5fd488fe6c58a6f5f5082837e99fb2a25a8ec8f901b427353c5 SHA512 4cc4e6aa78baa99eaf0224743934011b8fe542566847533368eae86afefa61ba14909eb333c8d7f36801f84afafe2e7f54d8f3aca56516d8c6c034d42b640936
+MISC metadata.xml 835 BLAKE2B 9b1973c44652dcce024f65586aee64af73b7e565e3681e42dc429d58c769cc316720a6fc48baeabb9288499f9d24c42d5161cf3bdfe718265d0b203eded36c8f SHA512 7c326da342ebd368f624757f1aab37d158f752ebe45e52d85bec640c6f6cde7c5e473d9214e24e09d71b22f7790dcad22f339181b6bc7333f1187bd8ff3c6e3f
diff --git a/dev-libs/stfl/metadata.xml b/dev-libs/stfl/metadata.xml
index abb4b8f2540d..43428f619e97 100644
--- a/dev-libs/stfl/metadata.xml
+++ b/dev-libs/stfl/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>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		STFL is a library which implements a curses-based widget set for text
 		terminals.
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-18 10:15:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-18 10:15:03 +0000
commit	b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch)
tree	16fe44748708acacd909d4e2e160a09a7f6d936a /dev-libs
parent	77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff)