gentoo resync : 28.04.2019

456 files changed, 4770 insertions, 5855 deletions

diff --git a/dev-libs/Ice/Ice-3.6.3-r1.ebuild b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
deleted file mode 100644
index 33984c1d8119..000000000000
--- a/dev-libs/Ice/Ice-3.6.3-r1.ebuild
+++ /dev/null
@@ -1,357 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby23"
-
-PHP_EXT_NAME="IcePHP"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-PHP_EXT_OPTIONAL_USE=php
-
-USE_PHP="php7-0"
-
-# This variable does not belong to any eclass. It is solely used in this ebuild
-# db:6.2 breaks the build process
-BERKDB_SLOTS=( 6.1 5.3 5.1 4.8 )
-
-inherit db-use eutils mono-env php-ext-source-r2 python-r1 ruby-ng toolchain-funcs versionator
-
-DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="https://zeroc.com/products/ice"
-SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( http://download.zeroc.com/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
-LICENSE="GPL-2"
-SLOT="0/36"
-KEYWORDS="amd64 ~arm x86"
-IUSE="doc examples libressl +ncurses mono php python ruby test debug"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/expat-2.0.1
-	>=app-arch/bzip2-1.0.5
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	|| (
-		$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
-	)
-	dev-cpp/libmcpp
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby23) )
-	mono? ( dev-lang/mono )
-	php? ( dev-lang/php:7.0 )
-	!dev-python/IcePy
-	!dev-ruby/IceRuby"
-DEPEND="${RDEPEND}
-	ncurses? ( sys-libs/ncurses:0= sys-libs/readline:0= )
-	test? (
-		${PYTHON_DEPS}
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)"
-
-# Maintainer notes:
-# TODO: java bindings, multiple ruby versions (supports 2.{1,2,3})
-
-S="${WORKDIR}/${P/I/i}"
-PHP_EXT_S="${S}/php"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-arch-opts.patch"
-	"${FILESDIR}/${P}-csharp.patch"
-	"${FILESDIR}/${P}-libressl.patch"
-)
-
-pkg_setup() {
-	# prevent ruby-ng.eclass from messing with pkg_setup
-	return
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	default
-}
-
-src_prepare() {
-	epatch -p1 "${PATCHES[@]}"
-
-	sed -i \
-		-e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
-		-e 's|-L\$\(libdir\)||' \
-		cpp/config/Make.rules || die "sed failed"
-
-	sed -i \
-		-e 's|\(install_phpdir[[:space:]]*\):=|\1?=|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		php/config/Make.rules.php || die "sed failed"
-
-	sed -i \
-		-e 's|\(install_pythondir[[:space:]]*\)=|\1?=|' \
-		-e 's|\(install_rubydir[[:space:]]*\)=|\1?=|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		{python,ruby}/config/Make.rules || die "sed failed"
-
-	sed -i \
-		-e 's|-O2 ||g' \
-		-e 's|-Werror ||g' \
-		cpp/config/Make.rules.Linux || die "sed failed"
-
-	sed -i \
-		-e 's|install-common||' \
-		{cpp,csharp,php,python,ruby}/Makefile || die "sed failed"
-
-	sed -i \
-		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		-e 's|\(install_pkgconfigdir[[:space:]]*\):=|\1?=|' \
-		csharp/config/Make.rules.cs || die "sed failed"
-
-	# skip mono tests, bug #498484
-	sed -i \
-		-e '/SUBDIRS/s|\ test||' \
-		csharp/Makefile || die "sed failed"
-
-	# skip udp test due to multicast
-	# skip IceGrid/admin bug #649850
-	# skip IceSSL tests due to requirement of internet connection
-	# skip IceStorm/single bug #636834
-	# IceStorm/stress fails without USE=debug
-	# IceUtil/stacktrace fails with USE=debug
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress|' \
-		cpp/Makefile || die "sed failed"
-
-	# mainly broken .ice files
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \
-		python/Makefile || die "sed failed"
-
-	# fails even on unicode locale
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
-		ruby/Makefile || die "sed failed"
-
-	# fix for x86 IceBox test
-	sed -i \
-		-e 's|"32"|""|' \
-		scripts/TestUtil.py || die "sed failed"
-}
-
-src_configure() {
-	suitable_db_version() {
-		local ver
-		for ver in "${BERKDB_SLOTS[@]}"; do
-			if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
-				echo "${ver}"
-				return 0
-			fi
-		done
-		die "No suitable BerkDB versions found, aborting"
-	}
-
-	MAKE_RULES=(
-		"prefix=\"${ED%/}/usr\""
-		"install_docdir=\"${ED%/}/usr/share/doc/${PF}\""
-		"install_configdir=\"${ED%/}/usr/share/${P}/config\""
-		"install_mandir=\"${ED%/}/usr/share/man\""
-		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
-		"LP64=yes"
-		"new_dtags=yes"
-		"NOTEST=$(usex !test)"
-		"USE_READLINE=$(usex ncurses)"
-		"OPTIMIZE=$(usex !debug)"
-	)
-
-	local BERKDB_VERSION="$(suitable_db_version)"
-	MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
-	sed -i \
-		-e "s|g++|$(tc-getCXX)|" \
-		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
-		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
-		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
-		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
-		cpp/config/Make.rules{,.Linux} python/config/Make.rules || die "sed failed"
-
-	if use python; then
-		local S="${S}/python"
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		SITERUBY="$(ruby23 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
-		MAKE_RULES_RUBY=(
-			"install_rubydir=\"${ED%/}/${SITERUBY}\""
-			"install_libdir=\"${ED%/}/${SITERUBY}\""
-		)
-
-		# make it use ruby23 only
-		sed -i \
-			-e 's|RUBY = ruby|\023|' \
-			ruby/config/Make.rules || die "sed failed"
-		sed -i \
-			-e 's|env ruby|\023|' \
-			ruby/config/s2rb.rb || die "sed failed"
-		sed -i \
-			-e 's|env ruby|\023|' \
-			ruby/scripts/slice2rb || die "sed failed"
-		sed -i \
-			-e 's|output.write("ruby|\023|' \
-			scripts/TestUtil.py || die "sed failed"
-	fi
-
-	MAKE_RULES_MONO=(
-		"GACINSTALL=yes"
-		"GAC_ROOT=\"${ED%/}/usr/$(get_libdir)\""
-		"GAC_DIR=\"${EPREFIX}/usr/$(get_libdir)\""
-		"install_libdir=\"${ED%/}/usr/$(get_libdir)\""
-		"install_pkgconfigdir=\"${ED%/}/usr/$(get_libdir)/pkgconfig\""
-	)
-
-	if has_version ">dev-lang/mono-4"; then
-		MAKE_RULES_MONO+=("MCS=mcs")
-	fi
-
-	use test && python_setup
-}
-
-src_compile() {
-	# Do not remove this export or build will break!
-	tc-export CXX
-
-	emake -C cpp "${MAKE_RULES[@]}"
-
-	if use php; then
-		local i
-		for i in $(php_get_slots); do
-			mkdir -p "${WORKDIR}/${i}" || die
-			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
-
-			pushd "${WORKDIR}/${i}" >/dev/null || die
-			ln -s "${S}/cpp" || die
-			ln -s "${S}/config" || die
-			ln -s "${S}/slice" || die
-			ln -s "${S}/Makefile" || die
-
-			emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
-			popd >/dev/null || die
-		done
-	fi
-
-	if use python; then
-		building() {
-			emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}"
-		}
-		local S="${S}/python"
-		python_foreach_impl building
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
-	fi
-
-	if use mono; then
-		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
-	fi
-}
-
-src_test() {
-	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake -C cpp "${MAKE_RULES[@]}" test
-
-	# php tests require the extension loaded and are therefore skipped
-
-	if use python; then
-		testing() {
-			emake -C "${BUILD_DIR}" \
-				"${MAKE_RULES[@]}" \
-				PYTHON="${EPYTHON}" \
-				install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
-				install_libdir="\"${D%/}/$(python_get_sitedir)\"" test
-		}
-		local S="${S}/python"
-		python_foreach_impl testing
-	fi
-
-	if use ruby; then
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
-	fi
-
-	if use mono; then
-		# skip mono tests, bug #498484
-		ewarn "Tests for C# are currently disabled."
-		#emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
-	fi
-}
-
-src_install() {
-	local DOCS=( CHANGELOG*.md README.md )
-	use doc && DOCS+=( "${DISTDIR}/${P}.pdf" )
-	einstalldocs
-
-	insinto /usr/share/${P}
-	doins -r slice
-
-	emake -C cpp "${MAKE_RULES[@]}" install
-
-	if use examples; then
-		docinto examples-cpp
-		dodoc cpp/config/*.cfg
-		docompress -x /usr/share/doc/${PF}/examples-cpp
-	fi
-
-	if use php; then
-		insinto "/usr/share/php/${PN}"
-
-		local i
-		while IFS="" read -d $'\0' -r i; do
-			doins "${i}"
-		done < <(find "${S}/php/lib/" -name '*.php' -print0)
-
-		pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die
-
-		local -x LD_LIBRARY_PATH="${ED%/}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
-		for i in *; do
-			mkdir -p "${ED%/}/usr/share/php/${i}" || die
-			"${ED%/}"/usr/bin/slice2php \
-				-I"${ED%/}/usr/share/${P}/slice/" --all \
-				--output-dir "${ED%/}/usr/share/php/${i}" \
-				--ice "${ED%/}/usr/share/${P}/slice/${i}"/*
-		done
-
-		for i in $(php_get_slots); do
-			php_init_slot_env "${i}"
-			insinto "${EXT_DIR}"
-			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
-		done
-		php-ext-source-r2_createinifiles
-
-		popd >/dev/null || die
-	fi
-
-	if use python; then
-		installation() {
-			mkdir -p "${D%/}/$(python_get_sitedir)" || die
-
-			emake -C "${BUILD_DIR}" \
-				"${MAKE_RULES[@]}" \
-				install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
-				install_libdir="\"${D%/}/$(python_get_sitedir)\"" \
-				install
-		}
-		local S="${S}/python"
-		python_foreach_impl installation
-	fi
-
-	if use ruby; then
-		dodir "${SITERUBY}"
-		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
-	fi
-
-	if use mono; then
-		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
-	fi
-}
diff --git a/dev-libs/Ice/Ice-3.6.4.ebuild b/dev-libs/Ice/Ice-3.6.4.ebuild
index 39a11bd852c4..d5a8c64e0f6d 100644
--- a/dev-libs/Ice/Ice-3.6.4.ebuild
+++ b/dev-libs/Ice/Ice-3.6.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 
 RUBY_OPTIONAL="yes"
 USE_RUBY="ruby24"
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 6a1a3c363b0d..493b140ae235 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -1,10 +1,7 @@
 AUX Ice-3.6.3-csharp.patch 1573 BLAKE2B 9c1c645a25006ff5e120f7a14933511394315da6e72ebe1f93ff3ad8add69ff1a0b778433f9d70b4982322aed20d99ee37480d316cd3e0534ac84977a952edb5 SHA512 62741327524cea96652179811c0591ed7e75b75a27623cb24fe2e55c47150692d862aa78039ed82a081236273163015d4b7e56817ac13ccd63ca1042e641704f
 AUX Ice-3.6.3-libressl.patch 6461 BLAKE2B ab5f4b8812adb7f7b15257bbc5f2745ca3da46c9c4d6b80764475045bedb78f15047eb70a76697e1fd299f913861ca39692ea87ed872761e1bb0884ac93a1550 SHA512 386ed4d666ea76a16255e7e5023be9880ac1f5e26ffec3d19560484eb6ace158f134c1d425586c1f654d7dc58732c17ed4b190eaf26f4aba0cd4bc319abe50cb
 AUX Ice-3.6.3-no-arch-opts.patch 1462 BLAKE2B 0adbbb302a3fde0dab4dba0b5947ee5da3413a8c3dc02fb8612837f4a2b3ecb56b92628430d8f3c2315f1fb0fa057bf0942dd389941b61d70d12b4078ce45d84 SHA512 236abce89a7bcf64d6a12db5a82d62db1effa2b5a105ae7c83910f02ca1ccd610193097a2c959d2a487f0d641af70ba8013bcfe570e2af40976d9a1017272e6e
-DIST Ice-3.6.3.pdf 8844957 BLAKE2B 137e3ce85885305931cbbb2c838ccc52175dffb7ad51264837b2db77eea05987ebecc5e3678e2f589bef1cc94c133f0f298ecce23031fcf2654621921c2bd541 SHA512 44638a315b0da9c26519c053c48ab8ee216c43410f53844465535a972ae01031f1603769e9b3169fdf9358de67e0d0c7e238b2918b5d5b1c4cb95cb922fa922a
-DIST Ice-3.6.3.tar.gz 5512741 BLAKE2B 7219cd263ccf6207c0d1e788358004744bd53717bba79a53be468b5e38ddbc81895ef078ba31c98d90ac9ccdd9e17123f4a7ab590fa354c28f6d82f09bf0301d SHA512 6e17d21f55a8504af87a64c498a0c4d2084ed96a85c7a66d00319324774f671ace6afa03108d8d4e9bedf5fcfc2f3dba247949a27deecacdd0d298bd0bfe0a45
 DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0
 DIST Ice-3.6.4.tar.gz 5523841 BLAKE2B 4e50dcf0f004f14a38c173f181cabb97fdc201786c338800b9750dc0cf6ce9b1397ea26b4357de1f6e1ac6b4e69abbe2bf464a5f9c2926f6ae45abbf5a69803b SHA512 fdb412ce591bca7aede2ac7d70600184f3b67279e8ffdfee3649f517d5531d2dfee54b37d0cc6de2ef5de8ecd281c39d6c951781b68f9a36316a7607cefb9e57
-EBUILD Ice-3.6.3-r1.ebuild 9438 BLAKE2B c1e2831c78f8f34027f51dfecdaa23f3ae0fb5f84c2bb970124242c363b1bf68d57a1af66c865969617fc448c6df0c1c8f753b477dfa37c1e2eaf6431969ded7 SHA512 21ddf1a8d4f441dcfd5316f7cf5c12b2980ee2e6d3cdcf54ff6a677e5ab6a7aa63c582dcf5c4f3aab7d49a9ef626c5c8f27e21f49ffd34de90e7dfe161f7aceb
-EBUILD Ice-3.6.4.ebuild 9414 BLAKE2B 036f590336c7c868253d74c68841aad8e10f630127b979e970288748dcddc43c17eab4168be22a467764f49d1f23c690b05905a3dc7247b68396ea725bbea6fc SHA512 8e126b002363e0ea6397d52f3955b69b8397e732af32f8125e36d408a095f08735685f2410ac7c436c0488c681c8468637b528e2b8229c9947677fd24907a429
-MISC metadata.xml 520 BLAKE2B f2658367fc9c7720a8b6338c8c79cc88ce7687bbcd58d61e50efa3e452c6bbfe2eaf71563895a1de22bfd8513adeb0439fd4c2674c370199fb37cb7a86c25ace SHA512 8958293c1fbc414bd911848999b0414dc64befc865b012c4c5c40350dce69f366e329c6aac793877eca8cf5e4b8bd477df3055a0ce7481d3c6d9ae1a4b76dfe5
+EBUILD Ice-3.6.4.ebuild 9410 BLAKE2B 891f785e18fab23bbe4100e16293bdb8b92bbd2a43b393051b66b898726d3c75348d8d907f2dca70b194fe061dcfa4b43b08bf6c096cd1caf3eb77da5f7f5666 SHA512 9290b16e43bb79116c4b67c1a66d3612463889615b7870aba18504d66eedc9bb4531f4c84e7e15601ced3f69943943cc31d805580c81ba5156051b7ba8faa3c2
+MISC metadata.xml 444 BLAKE2B 8b9fba7aa50ad72edb2952c794f622764f5114982c9b08ce98cd823dd60bdf01d3c888549b85e825b13b9036a4665ec329550b9f9e36262696a762eca060f4cc SHA512 3ef14fb411277afedffb42d6f4857bd160ceb97d886f98d9ee0ebfbe0bae543c7f8688c2c58558cf09405a3ecdda9779356b381fb20382c0c3dffa2486e3e05b
diff --git a/dev-libs/Ice/metadata.xml b/dev-libs/Ice/metadata.xml
index c4c331cd2dd6..7e0482802ddd 100644
--- a/dev-libs/Ice/metadata.xml
+++ b/dev-libs/Ice/metadata.xml
@@ -1,13 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>Dessa@gmake.de</email>
 		<name>Robert Förster</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Ice is a C++ middleware technology with bindings for other languages.
 	</longdescription>
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7214874414b6..565a2b05c4f9 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/ace/Manifest b/dev-libs/ace/Manifest
index 1f38ccccd367..e373d7004adc 100644
--- a/dev-libs/ace/Manifest
+++ b/dev-libs/ace/Manifest
@@ -6,4 +6,4 @@ DIST ACE-5.7.2.tar.bz2 9724175 BLAKE2B 9338bf66a13187ee1040ba41489da83e4272d9b45
 DIST ACE-5.8.3.tar.bz2 8956345 BLAKE2B 81b01b223a0d232ad42df12cc3eddd869abf720788b517b2f898846259127ee0e8ab4026f127c9118142c82d7f4698d61b61d18c6c98632da397f5d3762e2210 SHA512 3b1e0dfdd59dacbfd987499653e42ad41273de28bb5e920105b897567eed96f6e1b09a03c7f342277c2cf82231426b2bee4ed76ad98fec05e0fe589c9d86c469
 EBUILD ace-5.7.2.ebuild 2463 BLAKE2B 11ccc979c270d9eec37fd49ca521d82b6e49991946fe1d85b5bed77c1a3500dcd542763824ebfdcb10b33ab91e53571aa2629174cbddce5fe51a42a85dc2cafd SHA512 e231fa4cdad81f282cff9c406fb6a36919a4e4ef598cefb7d2268ba56c67f7bb1c66ac526afa024d55288eb8b47c969febd1eb1cd4878b3803ede560b59973dd
 EBUILD ace-5.8.3.ebuild 2439 BLAKE2B fb8bbd6262a0c8e35fff6e34eb9ef74308e0429da7cb55f6cf8a8714fb827f7926a4b75b28a3511f8de18b8548510f73680157dbc7d13a0d23d928901c9e37d0 SHA512 95e6875eec96e69a46f759c242ced39ef711d2fd5186591084f1539471f2a269274c249507312104bad4f69332ca4562445faf62b43c60bd259833a3a27edc4d
-MISC metadata.xml 450 BLAKE2B e4e2693d417d61efacc6b62538b49c1e77a2ec101945bf04bcf0e7eefc36001c6c05f01c15af12d8a550d9bd0b855da90da4374e8f6c0d0c8fec60528e64cd69 SHA512 a1f66a959567a84d6440486b368e9b727eb7e7b3ece31c8b8ae6c54bba822da453bce3f2ab0f50f1efc962fd4a443ba0889ca75af6d077636864d72bf0a0ec05
+MISC metadata.xml 369 BLAKE2B 4462121d58d353caa02eae3017b095ca534e200b240fb796a1b7664d93f9937359750b8be6bc8f9481cc3385d6d3b19c8e2658740eca95cfa5006bbb327236d0 SHA512 195090493a8e245474cac96fa26c5b336a814e5332d7036397e0822c8d0659547f8dc77adc8cd52dfee42729db931b15825fc2c117b4b5d034e6c5e90e65c286
diff --git a/dev-libs/ace/metadata.xml b/dev-libs/ace/metadata.xml
index 6c94047225c3..c66369011495 100644
--- a/dev-libs/ace/metadata.xml
+++ b/dev-libs/ace/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>cpp@gentoo.org</email>
-  <name>Gentoo C++ Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
   <flag name="ciao">Include Component Intergraced Ace ORB into the build of
     ace</flag>
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 54781a3b9e4c..06c505db9ffd 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -4,5 +4,5 @@ DIST apr-util-1.5.4.tar.bz2 694427 BLAKE2B 6de337fa48f0ca3775ba5b054b3a59726e25a
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
 EBUILD apr-util-1.5.4-r3.ebuild 3685 BLAKE2B 6de15972c714d4077aeeaf62771b0427c96d7022ffbe8f639576d1c422562806ac5daf93b6d6841f581f0d8e2419a33692abe392bdb583b1722ae3734865af9c SHA512 576d513d8716117cbbe854d14e183c13060408f187a22b000e5e21f2f6b71c8774bf197612ae27080a3d97ea0bbbb078579db2551c54c12a6a1b75dd63fb2c7b
 EBUILD apr-util-1.5.4.ebuild 3214 BLAKE2B a90ae943aba394503d08cfad961e603c5aaf1460b28f040e35c0a330ad59ea333606cc909e6d8543f1c24a4a0898492dc50d988cfcf6e7ea681dd12207870838 SHA512 a419670fc4df0a4b7c7f1c2d07b67428dda3d72663e45ab1c2cd72268c33100a4d9319398086666530d69524f61eae196198e4622f0dc889f7413b763c3ec5c2
-EBUILD apr-util-1.6.1-r3.ebuild 3754 BLAKE2B 383ac17d4207ae3b8ac2748ecd72794c1183ecb15337b374b447659d120a353f397568a937e5dcce340c7c5a24d6fb914f60db5149581b7e2f23c65467a90a48 SHA512 c8faa9b04edf8632d5057d22b9a1cca170b936d9281f0087a14e18898c924fba4647a50f0b24876f53719dff4e2f9a416fe8e781aadc4e9aaab49a39fef676c4
+EBUILD apr-util-1.6.1-r3.ebuild 3750 BLAKE2B 4809d994a0892f89751ebca1ebbd06a754d88b8099251f63db81d6d254c2f697c45e62951f7474aff6595c113f8524072487b5ab1ca014028bb7aa3866063dcd SHA512 ce15fa08f7040d9433f06a9eec2c00f482a003143f582d95182a1f3e6d72233b3ce1f71a2f7684be9713c67e8f535ac3c2a015e59bf8dd9e2e7e0f957d36fa2e
 MISC metadata.xml 515 BLAKE2B d300be91135a6a7dcc55a61b484b5dd1785663b9f3b51d621dcacffd9ec5747b69bb227f60dce1bf30a57fe93629de3c82fa7138a5f056e4f349ce6909453020 SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
index ebf60b55f79f..a4d3584e8c93 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
@@ -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=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 5a5238ef861e..eba1422611c6 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -5,12 +5,10 @@ AUX apr-1.5.0-sysroot.patch 1309 BLAKE2B de3dc13a44a9d5071c249875322b7d6be9ed765
 AUX apr-1.6.3-fix-overflow-check-in-overflow_strfsize.patch 567 BLAKE2B 7a41d3aeb1e69af2a90bc55ac5aeb1e8395c5b0f6ff569f65f88de15c29c1df794415526b1ef13ca2deedfe48f8801e93b2eca655086518d9cd7bc5159252d1a SHA512 d2c4e0fbd9d4b909669820c30642c34de51b87edfc746875c0743430a7cc2599b68a037a6146f9c0f49d8e78844617c392819367636e2b6175bd919fce5ec5a8
 AUX apr-1.6.3-skip-known-failing-tests.patch 512 BLAKE2B 29607bce9a35853d824f8872557f361f3d5ffa0f2c7cd35e06cbf4d449e54f1b12978c0220b8ce4ae5d590ee9e04b5cd77af22876e3880deef115efbeb5a1dcc SHA512 ac097d28d5ae0b2437522da0578ff8bd049190d8df576e4e5298426f827b2bf69891e4f33bd1ffaf1a3c53143927e71f10d8362567121faa03cdf908d4fbc6c2
 AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4af9e65169c1c5862c3fa3532cc02df8e084b540e7a81091c3b16d50388c6234cba469b15fff896d0428fc SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf
-DIST apr-1.5.2.tar.bz2 826885 BLAKE2B 62953c31cd6cb9a80142cf65f791543febffd1716d9e4babd55c8010c6fc6e60ba3c287b21e146c19446185c03407f3990d862a0b9816039c2d1b7158ac90cd3 SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
-EBUILD apr-1.5.2.ebuild 4073 BLAKE2B b5cbc0f22c8d180930a15008f374c9cf738dddea1bc1389e64c058389f1aa25476b6e52a31f1e2203479ad256e5a1c633c89d32558256b389a2026b05c84a729 SHA512 a29bce9c56a8c9075eb7ebcc01f628b52c46564b4f34afba7735676dcd2959e76edecfce1de6207e70052ffcabfaefe0e1bfe42ce05513b130ea3126e7b5ae19
-EBUILD apr-1.6.3-r3.ebuild 4395 BLAKE2B 30248b2a3bca45f85ad301b214cac07349b0b2ef5e20e2f8a29b6f403c17bdd9a61cc406186bf2397c968381a6afae7320633b5b85aec81d1c51797727562a59 SHA512 1199ea5e34049f6f1b22b54588c074437508dc8d3bf3d8d71b65b96c9e6c3638d314f5433a5085f2059d7d83c478b9ff0505bf6b2bf9b46fa8ad9510af60a082
+EBUILD apr-1.6.3-r3.ebuild 4394 BLAKE2B 87533c1bf662271c3684658f09943d0dbe0196ac06e3d03d319e0a4d4bc160cabd88c05b96e517aa3dd32eb257cfc443dca9fd714fb2474622c031169c545ce9 SHA512 aa649c0d762f031d164eeab493d7cd3257d59e08351f1e1f7f2438913d0a6e6855ca8c35186cc72ed013f30969679c99bc5bb5f61e4c358957452922f2df3d36
 EBUILD apr-1.6.5.ebuild 4344 BLAKE2B 9ce9356d89d4433ceb9f987f8f13d152d0bdec5d9f3e733c71ae2ede16deacf29e6cc9a84fcd7c5773edbcc3f3963c03248b1c14ad5ede26ec393a858b338503 SHA512 9d18249bda4c4bd1d10de424bfea14b5a2b998279745010aa937be31519a8e7407434f53537af6616e48b97915d604bc4312c21eb3b715c99fc1d3c3cc4ed3f5
 EBUILD apr-1.7.0.ebuild 4260 BLAKE2B f04cbbc17205fd627ac2235ee4862bfff141e52cae21fd588116606264402b81647ce4270bd94c7d11b5a0daf0964f5d2ab2e7c237b5d02767f3fab5e929dcac SHA512 5c58b65b4ccb8a974d2b4d33af1b648c0fd1478c8291ef830f787c4b43ba0aae2501545d50509e583698c4bf1fb560550470341da7e79f913a19d9d1d6ac17fa
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.5.2.ebuild b/dev-libs/apr/apr-1.5.2.ebuild
deleted file mode 100644
index a3288dfe3f6d..000000000000
--- a/dev-libs/apr/apr-1.5.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils libtool multilib toolchain-funcs
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
-
-CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-apache )"
-DEPEND="${CDEPEND}
-	>=sys-devel/libtool-2.4.2
-	doc? ( app-doc/doxygen )"
-
-DOCS=(CHANGES NOTICE README)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.0-mint.patch
-	epatch "${FILESDIR}"/${PN}-1.5.0-libtool.patch
-	epatch "${FILESDIR}"/${PN}-1.5.0-cross-types.patch
-	epatch "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
-
-	epatch_user #449048
-
-	AT_M4DIR="build" eautoreconf
-	elibtoolize
-
-	epatch "${FILESDIR}/config.layout.patch"
-}
-
-src_configure() {
-	local myconf=()
-
-	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
-
-	if use older-kernels-compatibility; then
-		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
-		export apr_cv_accept4="no"
-		export apr_cv_dup3="no"
-		export apr_cv_epoll_create1="no"
-		export apr_cv_sock_cloexec="no"
-	fi
-	if tc-is-cross-compiler; then
-		# The apache project relies heavily on AC_TRY_RUN and doesn't
-		# have any sane cross-compiling fallback logic.
-		export \
-			ac_cv_file__dev_zero="yes" \
-			ac_cv_func_sem_open="yes" \
-			ac_cv_negative_eai="yes" \
-			ac_cv_o_nonblock_inherited="no" \
-			ac_cv_struct_rlimit="yes" \
-			ap_cv_atomic_builtins="yes" \
-			apr_cv_accept4="yes" \
-			apr_cv_dup3="yes" \
-			apr_cv_epoll="yes" \
-			apr_cv_epoll_create1="yes" \
-			apr_cv_gai_addrconfig="yes" \
-			apr_cv_mutex_recursive="yes" \
-			apr_cv_mutex_robust_shared="yes" \
-			apr_cv_process_shared_works="yes" \
-			apr_cv_pthreads_lib="-pthread" \
-			apr_cv_sock_cloexec="yes" \
-			apr_cv_tcp_nodelay_with_cork="yes"
-	fi
-
-	if use urandom; then
-		myconf+=( --with-devrandom=/dev/urandom )
-	elif (( ${CHOST#*-hpux11.} <= 11 )); then
-		: # no /dev/*random on hpux11.11 and before, $PN detects this.
-	else
-		myconf+=( --with-devrandom=/dev/random )
-	fi
-
-	tc-is-static-only && myconf+=( --disable-dso )
-
-	# shl_load does not search runpath, but hpux11 supports dlopen
-	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
-
-	if [[ ${CHOST} == *-solaris2.10 ]]; then
-		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
-		*atomic_cas_ptr*) ;;
-		*)
-			elog "You do not have Solaris Patch ID "$(
-				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
-			)" (Problem 4954703) installed on your host ($(hostname)),"
-			elog "using generic atomic operations instead."
-			myconf+=( --disable-nonportable-atomics )
-			;;
-		esac
-	fi
-
-	econf \
-		--enable-layout=gentoo \
-		--enable-nonportable-atomics \
-		--enable-posix-shm \
-		--enable-threads \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	if tc-is-cross-compiler; then
-		# This header is the same across targets, so use the build compiler.
-		emake tools/gen_test_char
-		tc-export_build_env BUILD_CC
-		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
-			tools/gen_test_char.c -o tools/gen_test_char || die
-	fi
-
-	emake
-
-	if use doc; then
-		emake dox
-	fi
-}
-
-src_install() {
-	default
-
-	# Prallel install breaks since apr-1.5.1
-	#make -j1 DESTDIR="${D}" install || die
-
-	prune_libtool_files --all
-
-	if use doc; then
-		dohtml -r docs/dox/html/*
-	fi
-
-	# This file is only used on AIX systems, which Gentoo is not,
-	# and causes collisions between the SLOTs, so remove it.
-	# Even in Prefix, we don't need this on AIX.
-	rm -f "${ED}usr/$(get_libdir)/apr.exp"
-}
diff --git a/dev-libs/apr/apr-1.6.3-r3.ebuild b/dev-libs/apr/apr-1.6.3-r3.ebuild
index 78beeba65ab8..bf354b41d133 100644
--- a/dev-libs/apr/apr-1.6.3-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/asyncresolv/Manifest b/dev-libs/asyncresolv/Manifest
index 9228e2006eb9..7358e50d0e9b 100644
--- a/dev-libs/asyncresolv/Manifest
+++ b/dev-libs/asyncresolv/Manifest
@@ -1,3 +1,3 @@
 DIST asyncresolv-0.0.3.tar.gz 310716 BLAKE2B 39b751996f5b422d41e5a4e4ede14595b61ef88675503e7b61fe96cf0a98c0d90a890d6505bfe7ce9e878b41a443dcd8fd20cde76c7fe4c22712785ebab79648 SHA512 956eb5d793c58b98ddd95137c74552801131fd07cf97e5f69fec366ad6919f720023115ad50e78186f448b840446108a0f5dac9e66c650ef98fe61f0985572d4
 EBUILD asyncresolv-0.0.3.ebuild 576 BLAKE2B d40d8af7b10d6560f11f009aeb1fb149704ecc9356ae3016bbfd6a15be901b057d5e2738699164e26cc10e558ccff94a46a1dafb186b4dff1789c1d1206744a1 SHA512 92dfc63ea3ab9a6ac68618eaa1d7a59e7f798b1f893e031ccefa3b6f97aa33cc41ecbdd95f7f1534eeaf952ffc9ad8f09b58f15df9ea4b83db80a93af1b3c3a1
-MISC metadata.xml 330 BLAKE2B db2b3e02b6ed2bd3cfe8549bc1358bb5c5055ae16a5a6e6f5bd302c1bab86e202a061eca74ddd77d139bf5ac325b545954b4b2a4e665eac7e16d7064270c4730 SHA512 fc09c316877aa85a374042bea824601545a6faeded6a7d762626deb27ea6dc57a6638ce1a2aeeb0b125f65af1700e2e3d2d45f9d90d7063286dc15a86028b96e
+MISC metadata.xml 248 BLAKE2B 1e7511ebac5bd2b9bef215d61acee6b59f8fdb94c2d4436572b0396307e4bb1e79b25ccb3151e3f938811370510ecaa5bd807c34ff6a31f6a8376897fb637b4e SHA512 47dda831828e89e4a6e9faf520e446c97dad4c83e195b979656b02cb955f9a390f3a9b46f752798869c9c32afdcb411bf115f51f2b5f7a89c74ed0c8898a5495
diff --git a/dev-libs/asyncresolv/metadata.xml b/dev-libs/asyncresolv/metadata.xml
index eb626190773d..437e9d649d85 100644
--- a/dev-libs/asyncresolv/metadata.xml
+++ b/dev-libs/asyncresolv/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">asyncresolv</remote-id>
 	</upstream>
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 73d2608bed6c..53664dc53feb 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -8,8 +8,8 @@ AUX beignet-1.4.0_no-debian-multiarch.patch 862 BLAKE2B 54fb9124832e57b3466c1169
 AUX llvm-terminfo.patch 788 BLAKE2B cb652c28aac1cca566cb801b9e7f2b6ea8a9ff9457896a50b3323b41a009e039085d2d4aeff14d9d8cf35fca3e4a23bacb3078451c4981b6f806cec4146aec83 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312
 AUX no-debian-multiarch.patch 1652 BLAKE2B 4d112429412a7ada957228aa8e6beb145fbaf04065d6f816b0f13513631211894c57e9999157db5f22d7044f231be65396040efe450d090e3774bd24c9c93482 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a
-EBUILD beignet-1.3.2-r1.ebuild 2735 BLAKE2B beaded25151a0a27c56d7a211228859857aa3bf5171f53e8aaddc4632f5fd2803007147cb045f5f5ec91e401c2aa681afb56546b7c5d2e3843c81550ce41f6ad SHA512 592f6254baaa3e308795f8b5fbdd197347640b3918b05a350ff5134afec541e91886fc3a5d037d0fa6d4e2047d95089dbf19d903392ab61b56df349e89636491
-EBUILD beignet-1.3.2-r2.ebuild 2963 BLAKE2B 659900b2d71c764c470c0e7cc3370ad4d98be15a1e233ef8fecd356b1d4316a4d6498300d3b85f8e309e14f519f10dd4ff3ffed7eeb2a0fc68188df5c1ffb861 SHA512 9981da07752d0a6a9b0bff0c64a9e56a050651db6e10ff6683e80fa1f7cf09da29165fd89109f76fd440fb7c026cbca4376715896282ea2ed87672705d8d7ada
-EBUILD beignet-1.3.2.ebuild 2677 BLAKE2B 136a60bd3e37b356fd3894da33d2d14ac0e5cf6615a3c97645c83e35e7d580be74033374764ef1c0e479c057c7a3acefc6d416561c1dc6f445496cf0beef8672 SHA512 c756db3374352e3cb35dcf3cc2c89c3b124bb4a4df2beef135c37279674e56c47f29b78b2aae7e5e56618dc22fe1e33927a11c30664dfcd362e8a78d1ea8b44b
-EBUILD beignet-9999.ebuild 2499 BLAKE2B 3902b84585b58a17bb7152ee677bd79619da8434a11f4cd3f22c3292293af46e5eb13729c7513ed9d5902491718d63f58f632424989faa95d5793e5f60c89e2b SHA512 4ef2e9a67fdd219cefca7104e746b74f0cccfcec1187e6cbf90a86d2c7a382f8b45fdbf4afbf1ef0f3aee0bd69dd1cab5f331f06a2807d6e2e4129aa27e8369d
+EBUILD beignet-1.3.2-r1.ebuild 2731 BLAKE2B 28cf32641aebc20518c7f1d9c7443a6d70df6586bef1d44f7412e9df9d385db05799ad4abf4f47777724e5627fc98becad0c0e9ca35996b3949fd30382b1e140 SHA512 2804dc211c9ac1b2ad59c0fcb94c0b254ab4cc38491f439f8113da9b0125edd008eafa598d1b03fce3bbc5294086254e31a121fa5485d55a064022e65b8d06a8
+EBUILD beignet-1.3.2-r2.ebuild 2959 BLAKE2B bd67d958a8ab72669c924c28fcd487d677098370c357045cad33b4fc627a182c41bc8037388255d16215a9ad7d73663f36d91bc4ad1bef32fffcdbce29de551a SHA512 64ebc3b96c4a9e41fa36f1c5260a9ef47779c11f9d8dac83deab2777ad8a9cdf5259348d67b2ce2fa8e41e2a093dac85b073580b70827729498fa4febcffd56c
+EBUILD beignet-1.3.2.ebuild 2673 BLAKE2B 8edf3cb1b0dfe6201405afe50117e79172e20f9d5aafdecaba72cd85301c01c472a9be024d0b3a8a2c723b84bfd4a72c631d76bec3f08dc8412aa9d6ebd8f2dc SHA512 bf959b3ce52019d83e4a8bd3871155386c2e3c5de4f241044d77a1282c56c9837be6f12a78ca648833b2e21b533f42ba85de31d16027cb66cb47d52a985ac8b2
+EBUILD beignet-9999.ebuild 2495 BLAKE2B 71c35c38df5b0c3492510bc19f79ecff277488e9be8ad2c8f08e36b9569de28e005172256984618417a9aecf78588766bc6aa7974fb7e458d3c71b15f5db007e SHA512 d60e4b39d4a078bf7ee0958536a37f734faa578884ca79b329496d852b28727961f9f20f272a6dbf47ff910e4eff677e1ed2701331184dfc1efe46a9bae925bd
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2-r1.ebuild b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
index 3d33e0075c62..c7cc20e5302c 100644
--- a/dev-libs/beignet/beignet-1.3.2-r1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 CMAKE_BUILD_TYPE="Release"
 
 inherit python-any-r1 cmake-multilib flag-o-matic llvm toolchain-funcs
diff --git a/dev-libs/beignet/beignet-1.3.2-r2.ebuild b/dev-libs/beignet/beignet-1.3.2-r2.ebuild
index 17d7f95bfa0e..661cc49ff2a7 100644
--- a/dev-libs/beignet/beignet-1.3.2-r2.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 CMAKE_BUILD_TYPE="Release"
 
 inherit python-any-r1 cmake-multilib flag-o-matic llvm toolchain-funcs
diff --git a/dev-libs/beignet/beignet-1.3.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild
index a9918a01ce3a..da0b9d27ffe9 100644
--- a/dev-libs/beignet/beignet-1.3.2.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 CMAKE_BUILD_TYPE="Release"
 
 inherit python-any-r1 cmake-multilib flag-o-matic llvm toolchain-funcs
diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild
index 3a7b1b4f1fc9..735edfd2e512 100644
--- a/dev-libs/beignet/beignet-9999.ebuild
+++ b/dev-libs/beignet/beignet-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 CMAKE_BUILD_TYPE="Release"
 
 inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs
diff --git a/dev-libs/blitz/Manifest b/dev-libs/blitz/Manifest
index b80573d19043..5773aea57057 100644
--- a/dev-libs/blitz/Manifest
+++ b/dev-libs/blitz/Manifest
@@ -4,4 +4,4 @@ AUX blitz-0.10-set-default-arg-value.patch 4809 BLAKE2B cc0b67bf45b9735520b23a89
 DIST blitz-0.10.tar.gz 3777276 BLAKE2B 0817a5189c0967c073a3da8fecef6159d53c058e93222bf03f9b33a51bc9b5a6a1976f94d8a6ca6f33ddcefe222eece011443fb2f29555ee2e156c24749249ba SHA512 04fb0c8735d8ae173e6e907bd04fd739c482b7816c25b7dfe58c8641b90c17321e9a6849ced73a04ca9cc55439070de1a1e395497887317b553b0550fa0a2462
 EBUILD blitz-0.10-r1.ebuild 1620 BLAKE2B 5ddd7fbac1cd92c40961180929f415dc41a33323781ec3c269d5111aca9d60a772a8daea69bb5c10debb71f5657ad9b4fb92ef3eb97f1bcd550bf401e00a889b SHA512 2979767087474edf5cd565c29a3889341a2693fc6731593e09df23babd9beedd93a1d8e31918fa2fbfa40752cbb1d7295edc8d95fa8b7868db6bd3bd4fce3692
 EBUILD blitz-0.10.ebuild 1556 BLAKE2B 7ccd37706a64dfd643d4d009b681b8eec0f7ccdf3b1abd2ab93f3b4052654131fc0d289ba92d13f54f2dd36901cf6247458d6f37bcdcaae18668babd8fbed5bf SHA512 94358c22d0aa0cb652a5372e962ddd35932f7e8cd6d52e86e397c8e8a3663b678aca4875580aea19f66092f454740e193bacc64e18b580dfa640d5dc786e7e84
-MISC metadata.xml 950 BLAKE2B 9b19f47d88c5569d38de494da4e263c860bf1c19baf9193d190109d42b9c5c311a2d90a4796837f8f118f4c9b2929afa730a32030af7cbb8a5223c6c8dc86953 SHA512 9d38d81706a42f393c66b34dbfd292daf3e16556ca47c55039abaa1a6dfe18201a3420698a1a93310a1cb5f8c2ca6956737c9811aefb2dd79e95482c9cc9d91b
+MISC metadata.xml 868 BLAKE2B 6e53bc0ebb71bc01d68934fed25d74f924ebe24dcb9ebc1e7974ed19b2d0361e8497274d8548e2da8aaf64b5b473683cdcb1705838571ce48158f13e59203b24 SHA512 09f6245e830a48f7da8c6a9cfb19abf921c3d99d6036164e4aca746f72cba1e4581684a1c33606eb4b8c49637983d0e76fdaca815efb5ef8321eef05b3f63e81
diff --git a/dev-libs/blitz/metadata.xml b/dev-libs/blitz/metadata.xml
index ff6aefb9c92b..6234be90a17f 100644
--- a/dev-libs/blitz/metadata.xml
+++ b/dev-libs/blitz/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Blitz++ is a meta-template library for array
 		manipulation in C++ with a speed comparable to Fortran
diff --git a/dev-libs/boost-mpl-cartesian_product/Manifest b/dev-libs/boost-mpl-cartesian_product/Manifest
index edeffe76ef4a..21e23ccb8bbb 100644
--- a/dev-libs/boost-mpl-cartesian_product/Manifest
+++ b/dev-libs/boost-mpl-cartesian_product/Manifest
@@ -1,3 +1,3 @@
 DIST boost-mpl-cartesian_product-20161205.tar.gz 4391 BLAKE2B 1ed647de2cf98f78aa58fcf9fa4122c3b4a8a40c00c6379d9abb8c7f36ccf1b3360ed3fc3143effc7a7e228404c496d9b93dd3c4f9ced59be15148ae122d7316 SHA512 cbe1f10b45bbb3db84bba7aa935698d7d79a59ae8b40c786df31da2936500feffe5589755ea53f31e3fc869ca4e87a880f013967d2829ce55412900b244252e7
-EBUILD boost-mpl-cartesian_product-20161205.ebuild 1052 BLAKE2B 8ace6bffc30bf73daa449386d37e112164181a6aa5f04d51b38d20d9b1b7edd776d887380a1dc0841a5a37d006480d732f9849dca7e50f75ac7db7ce2a33f49b SHA512 47e8ef7c9a3f777fe82737fcd2f67d8bf5201d3490932276f89c8bffccf623f86f89b698db32583bc4d987d0587aed4d48c9609c6723184a295d3269406dcb86
+EBUILD boost-mpl-cartesian_product-20161205.ebuild 981 BLAKE2B 140c8d83aa8642312492f3442e814b2630901c83266dc949fc54a75c53638b051f5cf861de4e5e5a4fe5c30eedfd1fe26f14ed26c2bcb6fd4b0b3c3fc996d3c6 SHA512 1239631b92d98662f5754ba022c7bebaa5f10ae3dc643089b763f8907e1db824a1bf0b0d6ea93d683789252b497cbc381d2e4614885b7c79206a9343940e9594
 MISC metadata.xml 472 BLAKE2B ec58c693ec625618d6a11e4639365572c555253bc3a84168151cefa286e4c27edc8e7447778d4a8c992e6dbc76fd965e040f834bd5ba3299e3e06bb15c3a1239 SHA512 9ebb1a50e9e3924a4fc5237741f017a0963ddb60e4a39ec0b118c09937772bb1934acf5e80549f4204437ba2803981b12776e795a3b1918b0700b1e9717b8aac
diff --git a/dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild b/dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild
index 29f9dfb72665..ac621115d48c 100644
--- a/dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild
+++ b/dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit vcs-snapshot toolchain-funcs
 
 COMMIT="aeb0266b3a89f32c390dff51cb73a454d5d7a745"
 DESCRIPTION="an extension to the Boost.MPL library"
-HOMEPAGE="http://www.organicvectory.com/index.php?option=com_content&view=article&id=75:boostmplcartesianproduct&catid=42:boost&Itemid=78"
+HOMEPAGE="https://github.com/quinoacomputing/BoostMPLCartesianProduct"
 SRC_URI="https://github.com/quinoacomputing/BoostMPLCartesianProduct/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Boost-1.0"
diff --git a/dev-libs/boost-numpy/Manifest b/dev-libs/boost-numpy/Manifest
index 33d289b95bcf..3daba8152087 100644
--- a/dev-libs/boost-numpy/Manifest
+++ b/dev-libs/boost-numpy/Manifest
@@ -1,2 +1,2 @@
-EBUILD boost-numpy-9999.ebuild 1015 BLAKE2B f4a64e0316f8300c21068ca4cff033e9f7b7601fd6b076a76620994ee7d7d859e23f423c87180faea5aaf8d2c12c5c69d945c60b1e12b1a43a16406a38a15cc5 SHA512 63aef7073e39e94a8bd14196c8f45507672b9bc7794d0b446e899bab0487760d9379666be50e994caaf20718ccbb333f7259efb26db46e160c744dd34d1a770b
+EBUILD boost-numpy-9999.ebuild 1014 BLAKE2B 28d281979a92353aaa778e2ea2f19e01a879dbd041f1aecd816d24b1f1025da56d8d9688f1a4aa183e17aea0ed069e5763f67ac7fcb8e4a8c2a165b5462934ea SHA512 c33b5f1cad7a187d6b03c58ec2518f23ba236c62f5bd89fbdb135f1f71b7ce559774ed8713e6e4caa7b687d5eb3101b8029ee0bb7fc17b583ffebc41d6b07057
 MISC metadata.xml 537 BLAKE2B 9f60a0689c92fcc61b005c56d5412b33423c03fad54e589a3ce268ba875538555f152f54e6b7107bf4c0294cd00811ac081acff6d4cddcfdcfd747f20ea9cce0 SHA512 44ff7d8681515dc0c0179e3922115c8260f19c39832ac0f190037a2d1dd117998e89163e33ecb4ca3214d2effd852e3bea5e0902cd269e3834aab82e91f622e7
diff --git a/dev-libs/boost-numpy/boost-numpy-9999.ebuild b/dev-libs/boost-numpy/boost-numpy-9999.ebuild
index c084c9a645f9..d7c8b5b6a0d6 100644
--- a/dev-libs/boost-numpy/boost-numpy-9999.ebuild
+++ b/dev-libs/boost-numpy/boost-numpy-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-utils python-single-r1
 
@@ -27,7 +27,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	${PYTHON_DEPS}
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-libs/boost[python,${PYTHON_USEDEP}]"
+	<dev-libs/boost-1.70[python,${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index d5a3bad41635..2d958dc05284 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,16 +1,10 @@
 AUX boost-1.48.0-disable_icu_rpath.patch 1077 BLAKE2B 367246d711de06ef20a93a0e2a354fff4e8360ef79582a75d262b2e6dfcd76a5c2bb00e719a05ca79c7f5f0f3fefa975713251e65cb9f2c09e76cb6c3b16888b SHA512 013503fd16bcb609c624c9952a5448e612b81150db9ce60b5a51acbb57b62ce1cf0e7c5dd4a58c110ca7895c86effef24d8fe55ea3f316c9e47d5c549a33180c
 AUX boost-1.55.0-context-x32.patch 1077 BLAKE2B 76ff0e52ca076ccddd58a469b4531f49782d6373bfa9d65ac63fe365fe90d25d10557fa041584f8d0bcf04438a90e78b69624006220f53983a456485b868cbc9 SHA512 0e2e45abe5833396508666355e26bafe114fa4ada628b24d8d9953268edddcb2f8e3dcfe8bc7f27d6c1794418990dc9ef914c936dfa64ed6e5e647a40e3f8a73
 AUX boost-1.56.0-build-auto_index-tool.patch 412 BLAKE2B 4449dbe600547f339eba9afc4d3da5310f08baa2dd1beb30f9c1b4076e95e867c8fa84fef8a84e2aa38bf35368173e52057e73499a66766cbb81e2d3312fa07b SHA512 9fe245adddf76375d0ee8066952c46d229c9e37fdce83ff608fcc1fb5942b1c226a0fba6e28f859bbcd58863dc49a356f32c7fcc3b90baca4069c6bdc9c0f203
-AUX boost-1.63.0-fix-python.patch 4210 BLAKE2B f39a501c9a2718ff77300d97ec8d1ec0a99e90b6f4f2f4ef970a5daaebe1065a870d98f759c0e946707251a93bda0c54f3f864b1e4189f915226d638738e7dca SHA512 0f390cae5a53f48f548e65149aaca4b1191ca6610863e7e471686556107c8ac398eb4bcad71a92849e941cad031cec9cbd543c646ee122238579ca881c420aad
 AUX boost-1.65.0-fix-python.patch 9210 BLAKE2B 31e32cfbc8fa0c4e8a5c142f56a4a7b1d06173b6a5b7b4bc1c2fcc64e645eac22e9e4f85c8b278a1fcefcb15e389a38d82ec90facdbb1e7812f9f4cc77d2fe93 SHA512 df2e8841b3415724b2920230da36e3e3aa610a5d7ee7dcada847cb4d6c921405ef4f0c034f96d1ac078d33bb3f32408b748cf7835f173b6e7692c76c6135e2f2
-AUX boost-1.67.0-fix-python.patch 6017 BLAKE2B e249ea8f387bb2b87f58bb2a538992ea20c12ad2a127da940bc86f1b6f5231a5d8b77b46cd8e946b723b2e0a2d05240e1bbf66ab738980f95f2407e325bc6bc5 SHA512 bcd0c5fad2dc5ca4964f6b366fb5bb2d5e016b0d67480a3abebee03743d337c8514b580d610e9cbe215bd1602a6846963aeab7f04ac72cbc0ed146c7869b4f32
-AUX boost-1.67.0-lockfree-next.patch 661 BLAKE2B fa81c2d9628645e3980dcf66019c74c47163e19c27680200695fed8273bb40f137e612d835413dccb7301e004440096cb30601c28921af9515c9d54e5ca0b4ac SHA512 9c11e719679262b071195474c8595ae0c324d5a046df89637c5636f8b3e0fcefd4e32c28c2d18ac2a620a5bde46750372b6295d84b55283d48033eb42a0fcb6c
-DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6ae289996501812cd8b13bf74bbe9b677d0110948265cab59a60deb36c4fc08440af74ac5a5219ea4eaea4fa6918f SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad
+AUX boost-1.69.0-context-x32.patch 1116 BLAKE2B 16b6ddbdc47d72d5afd39e61441f9f094dff8db46bd7fa4e04e5a8b132c8894c51db506d20356c352022f42d5b9a9923f23c5db2b0f9fa1c64ceeb4e50e16be1 SHA512 cf76691d4adbc4b43f468c587fea23c43e1b337ba7eebff2c856b0403bf32b78826f483faca25a4459c1d47eabbd5b67c65863a4d44407990178022433f718bf
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
-DIST boost_1_66_0.tar.bz2 85995778 BLAKE2B 9ab1fe396b10ab85d7e4084ec7abb8d785ecd892c8f51aea5a401cb565b111c256533364fe028da74ed376534889f43c5ccbdcd703cd236526ae66a064220765 SHA512 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b
-DIST boost_1_67_0.tar.bz2 87336566 BLAKE2B 85ea00fc2197b1bbfc35d69427c87f23ea43d7592f1c9ce66e2afcde8476bdec86f6debdac815b23de59f4665a8e0c7f1519ab66a31d39df629723bc45710058 SHA512 82bf33d7d2c3db109c9d1f12d40bc2d364c8c95262386f906ccd1a71cd71433bcc01829e968b4a13a5003cf0b50cbdf0b435a1d76530cea7bb05725c327411e8
-EBUILD boost-1.63.0.ebuild 12466 BLAKE2B 7aedf34bbef100bb52457e3906422ae22435a34486a921f60a7b0a5a4f48f251228331f1cebb9317c1c43355a8dffb4f9f555e4477136fc4cfc51f057b118c0f SHA512 215acc04fd1fc80271bb1d64c5e508a1c9162613ea526aabf291445f58a6f547155c0d000987a3a98c8dde8387db012978c42b140d03352b52f91df33d18aa5a
-EBUILD boost-1.65.0.ebuild 12440 BLAKE2B 777d2025ef7319680d49995f9570250d9a9305e20e1553451e8f4b802debe147a5631ebf29a75a44c53bc044fea57b5c167401c333f2599c583c66ca212e4855 SHA512 34414d084369ef1d225881a44dbf187141aebb689b8d06d4ee0a34952f58447fbb0ef44683ed1d87305305599c86275ebbb38e844e54bfa70d99ee32fa7de8c9
-EBUILD boost-1.66.0.ebuild 12459 BLAKE2B 6653ddd8bc307f9c91166bac312ee146e174bf09cfbc28afb3dbb8aff8bf286bb37f766bc2735f0cedd5cb113bd26637a3116bdeb6be0afca93d6bd80a89c093 SHA512 6ccbd309c502220afb9da6abedb36fb52791dcaee848acc102c1fcf69f538e3477939b14c0a1892fd31babf3002307adae2b310503d1f9bd17d2393611b2ce6a
-EBUILD boost-1.67.0-r1.ebuild 12403 BLAKE2B f3087055657b4541f6a1c8bdec9dd4128fbd77092971b402c33f7edc56a2cb91ae5f60eb198497eabad302e476fdc35943057906aab04b2ff7b47eb1fec2a4ff SHA512 14ef3c29398e5b4e1a034af93ed4789c8a76a85e7fb177d44f6b6a7845595892dadfe9ea72c06506a810c36ecbef06a19472f32999a799c931e81b8b268f3bd6
-MISC metadata.xml 1526 BLAKE2B 11c2e9eb5b41e3fa0b100d58d672acefe4a949d0fa428b4ce1d100cc8f95eec7c1279c725741033ca50f61cb258b388270c18361a5b714a684398cc3ae1a445c SHA512 4ba131f2492ae41f642a28dd69e5bd1d5d79c013e42a6c18ba135b36d470990ea20c8aa7cec6e3cb1d6ea8d7f6b6a5b45efb4b3dcba198bcf43809eff0f65ae6
+DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
+EBUILD boost-1.65.0.ebuild 12435 BLAKE2B 6d676b8dad7340828f95a16aece6296c006cae693a1ee7bf2e8dbcb82da443f8aa0c460eaf2ab1f5f0a5c26ec50073db463919c3a3cff2015065d371b1bdc375 SHA512 f04be75c396b21449cde08f40a79e40a733fba706a7170fa233d0c6a4e568bb55d9a539ec9eaa65316de41e24c0b5e739f3ca08fd6a8760e1999caf6c2b0a688
+EBUILD boost-1.70.0.ebuild 10162 BLAKE2B 67b85064587e5f5efdd73492914dd650c53fbd00d4fcaaa02982308db30f77f7adca171b22f0be37d478a56861a61ac74d30f1582e8d5e053c770a19c331d893 SHA512 85c2302eb83645f0e9033efae07acf8b2c66ba1bdaccc8597509a8ba6e001913ac1e235257bf248fab2590761db881f1a2fca8ca093b0331d52cdc6be48eab63
+MISC metadata.xml 1343 BLAKE2B ef8b2150e8e0b69fdb1c6878c8ca7da10bf74a896514139b6e00053803d9e4271e7144661e975d0b497ba298e8f9ae74104ce7ccc4ef0e824a6db8695b0fde14 SHA512 4fd2419b80d6f55d5cd41eb6d464d6a04b036e032a5f5361d91f2911190129af017b6b15203ac282c88c3f256cfb0d171d73b51d1a0f3a570e4a23076f5bc2b0
diff --git a/dev-libs/boost/boost-1.63.0.ebuild b/dev-libs/boost/boost-1.63.0.ebuild
deleted file mode 100644
index 4f43846220fc..000000000000
--- a/dev-libs/boost/boost-1.63.0.ebuild
+++ /dev/null
@@ -1,440 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit eutils flag-o-matic multiprocessing python-r1 toolchain-funcs versionator multilib-minimal
-
-MY_P="${PN}_$(replace_all_version_separators _)"
-MAJOR_V="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="https://www.boost.org/"
-SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
-
-IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
-	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
-	python? ( ${PYTHON_DEPS} )
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	!app-admin/eselect-boost"
-DEPEND="${RDEPEND}
-	=dev-util/boost-build-${MAJOR_V}*"
-REQUIRED_USE="
-	mpi? ( threads )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
-	"${FILESDIR}/${PN}-1.55.0-context-x32.patch"
-	"${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch"
-	"${FILESDIR}/${PN}-1.63.0-fix-python.patch"
-)
-
-python_bindings_needed() {
-	multilib_is_native_abi && use python
-}
-
-tools_needed() {
-	multilib_is_native_abi && use tools
-}
-
-create_user-config.jam() {
-	local compiler compiler_version compiler_executable
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-		compiler_executable="$(tc-getCXX)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-		compiler_executable="$(tc-getCXX)"
-	fi
-	local mpi_configuration python_configuration
-
-	if use mpi; then
-		mpi_configuration="using mpi ;"
-	fi
-
-	if python_bindings_needed; then
-		# boost expects libpython$(pyver) and doesn't allow overrides
-		# and the build system is so creepy that it's easier just to
-		# provide a symlink (linker's going to use SONAME anyway)
-		# TODO: replace it with proper override one day
-		ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
-
-		if tc-is-cross-compiler; then
-			python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
-		else
-			# note: we need to provide version explicitly because of
-			# a bug in the build system:
-			# https://github.com/boostorg/build/pull/104
-			python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
-		fi
-	fi
-
-	cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die
-using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-${mpi_configuration}
-${python_configuration}
-__EOF__
-}
-
-pkg_setup() {
-	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT%/}/etc/site-config.jam" ]]; then
-		grep -q gentoorelease "${EROOT%/}/etc/site-config.jam" && grep -q gentoodebug "${EROOT%/}/etc/site-config.jam" ||
-		(
-			eerror "You are using custom ${EROOT%/}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
-			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT%/}/usr/share/boost-build/site-config.jam to it."
-			die
-		)
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Do not try to build missing 'wave' tool, bug #522682
-	# Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
-	sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
-
-	multilib_copy_sources
-}
-
-ejam() {
-	local b2_opts=(
-		"--user-config=${BOOST_ROOT}/user-config.jam"
-		"$@"
-	)
-	echo b2 "${b2_opts[@]}"
-	b2 "${b2_opts[@]}"
-}
-
-src_configure() {
-	# Workaround for too many parallel processes requested, bug #506064
-	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
-	OPTIONS=(
-		$(usex debug gentoodebug gentoorelease)
-		"-j$(makeopts_jobs)"
-		-q
-		-d+2
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	elif [[ ${CHOST} == *-winnt* ]]; then
-		compiler=parity
-		if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
-			compilerVersion=trunk
-		else
-			compilerVersion=$($(tc-getCXX) -v | sed '1q' \
-				| sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,')
-		fi
-		compilerExecutable=$(tc-getCXX)
-	fi
-
-	# bug 298489
-	if use ppc || use ppc64; then
-		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
-	fi
-
-	# Use C++14 globally as of 1.62
-	append-cxxflags -std=c++14
-
-	use icu && OPTIONS+=(
-			"-sICU_PATH=${EPREFIX}/usr"
-		)
-	use icu || OPTIONS+=(
-			--disable-icu
-			boost.locale.icu=off
-		)
-	use mpi || OPTIONS+=(
-			--without-mpi
-		)
-	use nls || OPTIONS+=(
-			--without-locale
-		)
-	use context || OPTIONS+=(
-			--without-context
-			--without-coroutine
-			--without-coroutine2
-			--without-fiber
-		)
-	use threads || OPTIONS+=(
-			--without-thread
-		)
-
-	OPTIONS+=(
-		pch=off
-		--boost-build="${EPREFIX}"/usr/share/boost-build
-		--prefix="${ED%/}/usr"
-		--layout=system
-		# building with threading=single is currently not possible
-		# https://svn.boost.org/trac/boost/ticket/7105
-		threading=multi
-		link=$(usex static-libs shared,static shared)
-	)
-
-	[[ ${CHOST} == *-winnt* ]] && OPTIONS+=(
-			-sNO_BZIP2=1
-		)
-}
-
-multilib_src_compile() {
-	local -x BOOST_ROOT="${BUILD_DIR}"
-	PYTHON_DIRS=""
-	MPI_PYTHON_MODULE=""
-
-	building() {
-		create_user-config.jam
-
-		local PYTHON_OPTIONS
-		if python_bindings_needed; then
-			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
-		else
-			PYTHON_OPTIONS=" --without-python"
-		fi
-
-		ejam \
-			"${OPTIONS[@]}" \
-			${PYTHON_OPTIONS} \
-			|| die "Building of Boost libraries failed"
-
-		if python_bindings_needed; then
-			if [[ -z "${PYTHON_DIRS}" ]]; then
-				PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
-			else
-				if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
-					die "Inconsistent structure of build directories"
-				fi
-			fi
-
-			local dir
-			for dir in ${PYTHON_DIRS}; do
-				mv ${dir} ${dir}-${EPYTHON} \
-					|| die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed"
-			done
-
-			if use mpi; then
-				if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
-					MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
-					if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
-						die "Multiple mpi.so files found"
-					fi
-				else
-					if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
-						die "Inconsistent structure of build directories"
-					fi
-				fi
-
-				mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \
-					|| die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed"
-			fi
-		fi
-	}
-	if python_bindings_needed; then
-		python_foreach_impl building
-	else
-		building
-	fi
-
-	if tools_needed; then
-		pushd tools >/dev/null || die
-
-		ejam \
-			"${OPTIONS[@]}" \
-			${PYTHON_OPTIONS} \
-			|| die "Building of Boost tools failed"
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use python; then
-		rm -r "${ED%/}"/usr/include/boost/python* || die
-	fi
-
-	if ! use nls; then
-		rm -r "${ED%/}"/usr/include/boost/locale || die
-	fi
-
-	if ! use context; then
-		rm -r "${ED%/}"/usr/include/boost/context || die
-		rm -r "${ED%/}"/usr/include/boost/coroutine{,2} || die
-		rm "${ED%/}"/usr/include/boost/asio/spawn.hpp || die
-	fi
-
-	if use doc; then
-		# find extraneous files that shouldn't be installed
-		# as part of the documentation and remove them.
-		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
-		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
-		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
-		docinto html
-		dodoc *.{htm,html,png,css}
-		dodoc -r doc libs more tools
-
-		# To avoid broken links
-		dodoc LICENSE_1_0.txt
-
-		dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
-	fi
-}
-
-multilib_src_install() {
-	local -x BOOST_ROOT="${BUILD_DIR}"
-	installation() {
-		create_user-config.jam
-
-		local PYTHON_OPTIONS
-		if python_bindings_needed; then
-			local dir
-			for dir in ${PYTHON_DIRS}; do
-				cp -pr ${dir}-${EPYTHON} ${dir} \
-					|| die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
-			done
-
-			if use mpi; then
-				cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \
-					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
-				cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \
-					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
-			fi
-			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
-		else
-			PYTHON_OPTIONS=" --without-python"
-		fi
-
-		ejam \
-			"${OPTIONS[@]}" \
-			${PYTHON_OPTIONS} \
-			--includedir="${ED%/}/usr/include" \
-			--libdir="${ED%/}/usr/$(get_libdir)" \
-			install || die "Installation of Boost libraries failed"
-
-		if python_bindings_needed; then
-			rm -r ${PYTHON_DIRS} || die
-
-			# Move mpi.so Python module to Python site-packages directory.
-			# https://svn.boost.org/trac/boost/ticket/2838
-			if use mpi; then
-				local moddir=$(python_get_sitedir)/boost
-				# moddir already includes eprefix
-				mkdir -p "${D}${moddir}" || die
-				mv "${ED%/}/usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die
-				cat << EOF > "${D}${moddir}/__init__.py" || die
-import sys
-if sys.platform.startswith('linux'):
-	import DLFCN
-	flags = sys.getdlopenflags()
-	sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
-	from . import mpi
-	sys.setdlopenflags(flags)
-	del DLFCN, flags
-else:
-	from . import mpi
-del sys
-EOF
-			fi
-
-			python_optimize
-		fi
-	}
-	if python_bindings_needed; then
-		python_foreach_impl installation
-	else
-		installation
-	fi
-
-	pushd "${ED%/}/usr/$(get_libdir)" >/dev/null || die
-
-	local ext=$(get_libname)
-	if use threads; then
-		local f
-		for f in *${ext}; do
-			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
-		done
-	fi
-
-	popd >/dev/null || die
-
-	if tools_needed; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED%/}"/usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# Yai for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT%/}/usr/include/boost" "${EROOT%/}/usr/share/boostbook"; do
-		if [[ -L ${symlink} ]]; then
-			rm -f "${symlink}" || die
-		fi
-	done
-
-	# some ancient installs still have boost cruft lying around
-	# for unknown reasons, causing havoc for reverse dependencies
-	# Bug: 607734
-	rm -rf "${EROOT%/}"/usr/include/boost-1_[3-5]? || die
-}
diff --git a/dev-libs/boost/boost-1.65.0.ebuild b/dev-libs/boost/boost-1.65.0.ebuild
index 370eb8ce9a92..25d033ea698d 100644
--- a/dev-libs/boost/boost-1.65.0.ebuild
+++ b/dev-libs/boost/boost-1.65.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit eutils flag-o-matic multiprocessing python-r1 toolchain-funcs versionator multilib-minimal
 
diff --git a/dev-libs/boost/boost-1.66.0.ebuild b/dev-libs/boost/boost-1.66.0.ebuild
deleted file mode 100644
index 7cec3890e28d..000000000000
--- a/dev-libs/boost/boost-1.66.0.ebuild
+++ /dev/null
@@ -1,439 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit eutils flag-o-matic multiprocessing python-r1 toolchain-funcs versionator multilib-minimal
-
-MY_P="${PN}_$(replace_all_version_separators _)"
-MAJOR_V="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="https://www.boost.org/"
-SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
-
-IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
-	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
-	python? ( ${PYTHON_DEPS} )
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	!app-admin/eselect-boost"
-DEPEND="${RDEPEND}
-	=dev-util/boost-build-${MAJOR_V}*"
-REQUIRED_USE="
-	mpi? ( threads )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
-	"${FILESDIR}/${PN}-1.55.0-context-x32.patch"
-	"${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch"
-	"${FILESDIR}/${PN}-1.65.0-fix-python.patch"
-)
-
-python_bindings_needed() {
-	multilib_is_native_abi && use python
-}
-
-tools_needed() {
-	multilib_is_native_abi && use tools
-}
-
-create_user-config.jam() {
-	local compiler compiler_version compiler_executable
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-		compiler_executable="$(tc-getCXX)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-		compiler_executable="$(tc-getCXX)"
-	fi
-	local mpi_configuration python_configuration
-
-	if use mpi; then
-		mpi_configuration="using mpi ;"
-	fi
-
-	if python_bindings_needed; then
-		# boost expects libpython$(pyver) and doesn't allow overrides
-		# and the build system is so creepy that it's easier just to
-		# provide a symlink (linker's going to use SONAME anyway)
-		# TODO: replace it with proper override one day
-		ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
-
-		if tc-is-cross-compiler; then
-			python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
-		else
-			# note: we need to provide version explicitly because of
-			# a bug in the build system:
-			# https://github.com/boostorg/build/pull/104
-			python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
-		fi
-	fi
-
-	cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die
-using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-${mpi_configuration}
-${python_configuration}
-__EOF__
-}
-
-pkg_setup() {
-	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT%/}/etc/site-config.jam" ]]; then
-		grep -q gentoorelease "${EROOT%/}/etc/site-config.jam" && grep -q gentoodebug "${EROOT%/}/etc/site-config.jam" ||
-		(
-			eerror "You are using custom ${EROOT%/}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
-			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT%/}/usr/share/boost-build/site-config.jam to it."
-			die
-		)
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Do not try to build missing 'wave' tool, bug #522682
-	# Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
-	sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
-
-	multilib_copy_sources
-}
-
-ejam() {
-	local b2_opts=(
-		"--user-config=${BOOST_ROOT}/user-config.jam"
-		"$@"
-	)
-	echo b2 "${b2_opts[@]}"
-	b2 "${b2_opts[@]}"
-}
-
-src_configure() {
-	# Workaround for too many parallel processes requested, bug #506064
-	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
-	OPTIONS=(
-		$(usex debug gentoodebug gentoorelease)
-		"-j$(makeopts_jobs)"
-		-q
-		-d+2
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	elif [[ ${CHOST} == *-winnt* ]]; then
-		compiler=parity
-		if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
-			compilerVersion=trunk
-		else
-			compilerVersion=$($(tc-getCXX) -v | sed '1q' \
-				| sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,')
-		fi
-		compilerExecutable=$(tc-getCXX)
-	fi
-
-	# bug 298489
-	if use ppc || use ppc64; then
-		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
-	fi
-
-	# Use C++14 globally as of 1.62
-	append-cxxflags -std=c++14
-
-	use icu && OPTIONS+=(
-			"-sICU_PATH=${EPREFIX}/usr"
-		)
-	use icu || OPTIONS+=(
-			--disable-icu
-			boost.locale.icu=off
-		)
-	use mpi || OPTIONS+=(
-			--without-mpi
-		)
-	use nls || OPTIONS+=(
-			--without-locale
-		)
-	use context || OPTIONS+=(
-			--without-context
-			--without-coroutine
-			--without-fiber
-		)
-	use threads || OPTIONS+=(
-			--without-thread
-		)
-
-	OPTIONS+=(
-		pch=off
-		--boost-build="${EPREFIX}"/usr/share/boost-build
-		--prefix="${ED%/}/usr"
-		--layout=system
-		# building with threading=single is currently not possible
-		# https://svn.boost.org/trac/boost/ticket/7105
-		threading=multi
-		link=$(usex static-libs shared,static shared)
-	)
-
-	[[ ${CHOST} == *-winnt* ]] && OPTIONS+=(
-			-sNO_BZIP2=1
-		)
-}
-
-multilib_src_compile() {
-	local -x BOOST_ROOT="${BUILD_DIR}"
-	PYTHON_DIRS=""
-	MPI_PYTHON_MODULE=""
-
-	building() {
-		create_user-config.jam
-
-		local PYTHON_OPTIONS
-		if python_bindings_needed; then
-			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
-		else
-			PYTHON_OPTIONS=" --without-python"
-		fi
-
-		ejam \
-			"${OPTIONS[@]}" \
-			${PYTHON_OPTIONS} \
-			|| die "Building of Boost libraries failed"
-
-		if python_bindings_needed; then
-			if [[ -z "${PYTHON_DIRS}" ]]; then
-				PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
-			else
-				if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
-					die "Inconsistent structure of build directories"
-				fi
-			fi
-
-			local dir
-			for dir in ${PYTHON_DIRS}; do
-				mv ${dir} ${dir}-${EPYTHON} \
-					|| die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed"
-			done
-
-			if use mpi; then
-				if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
-					MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
-					if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
-						die "Multiple mpi.so files found"
-					fi
-				else
-					if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
-						die "Inconsistent structure of build directories"
-					fi
-				fi
-
-				mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \
-					|| die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed"
-			fi
-		fi
-	}
-	if python_bindings_needed; then
-		python_foreach_impl building
-	else
-		building
-	fi
-
-	if tools_needed; then
-		pushd tools >/dev/null || die
-
-		ejam \
-			"${OPTIONS[@]}" \
-			${PYTHON_OPTIONS} \
-			|| die "Building of Boost tools failed"
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use python; then
-		rm -r "${ED%/}"/usr/include/boost/python* || die
-	fi
-
-	if ! use nls; then
-		rm -r "${ED%/}"/usr/include/boost/locale || die
-	fi
-
-	if ! use context; then
-		rm -r "${ED%/}"/usr/include/boost/context || die
-		rm -r "${ED%/}"/usr/include/boost/coroutine{,2} || die
-		rm "${ED%/}"/usr/include/boost/asio/spawn.hpp || die
-	fi
-
-	if use doc; then
-		# find extraneous files that shouldn't be installed
-		# as part of the documentation and remove them.
-		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
-		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
-		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
-		docinto html
-		dodoc *.{htm,html,png,css}
-		dodoc -r doc libs more tools
-
-		# To avoid broken links
-		dodoc LICENSE_1_0.txt
-
-		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
-	fi
-}
-
-multilib_src_install() {
-	local -x BOOST_ROOT="${BUILD_DIR}"
-	installation() {
-		create_user-config.jam
-
-		local PYTHON_OPTIONS
-		if python_bindings_needed; then
-			local dir
-			for dir in ${PYTHON_DIRS}; do
-				cp -pr ${dir}-${EPYTHON} ${dir} \
-					|| die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
-			done
-
-			if use mpi; then
-				cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \
-					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
-				cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \
-					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
-			fi
-			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
-		else
-			PYTHON_OPTIONS=" --without-python"
-		fi
-
-		ejam \
-			"${OPTIONS[@]}" \
-			${PYTHON_OPTIONS} \
-			--includedir="${ED%/}/usr/include" \
-			--libdir="${ED%/}/usr/$(get_libdir)" \
-			install || die "Installation of Boost libraries failed"
-
-		if python_bindings_needed; then
-			rm -r ${PYTHON_DIRS} || die
-
-			# Move mpi.so Python module to Python site-packages directory.
-			# https://svn.boost.org/trac/boost/ticket/2838
-			if use mpi; then
-				local moddir=$(python_get_sitedir)/boost
-				# moddir already includes eprefix
-				mkdir -p "${D}${moddir}" || die
-				mv "${ED%/}/usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die
-				cat << EOF > "${D}${moddir}/__init__.py" || die
-import sys
-if sys.platform.startswith('linux'):
-	import DLFCN
-	flags = sys.getdlopenflags()
-	sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
-	from . import mpi
-	sys.setdlopenflags(flags)
-	del DLFCN, flags
-else:
-	from . import mpi
-del sys
-EOF
-			fi
-
-			python_optimize
-		fi
-	}
-	if python_bindings_needed; then
-		python_foreach_impl installation
-	else
-		installation
-	fi
-
-	pushd "${ED%/}/usr/$(get_libdir)" >/dev/null || die
-
-	local ext=$(get_libname)
-	if use threads; then
-		local f
-		for f in *${ext}; do
-			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
-		done
-	fi
-
-	popd >/dev/null || die
-
-	if tools_needed; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED%/}"/usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# Yai for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT%/}/usr/include/boost" "${EROOT%/}/usr/share/boostbook"; do
-		if [[ -L ${symlink} ]]; then
-			rm -f "${symlink}" || die
-		fi
-	done
-
-	# some ancient installs still have boost cruft lying around
-	# for unknown reasons, causing havoc for reverse dependencies
-	# Bug: 607734
-	rm -rf "${EROOT%/}"/usr/include/boost-1_[3-5]? || die
-}
diff --git a/dev-libs/boost/boost-1.67.0-r1.ebuild b/dev-libs/boost/boost-1.67.0-r1.ebuild
deleted file mode 100644
index 1c9de953032d..000000000000
--- a/dev-libs/boost/boost-1.67.0-r1.ebuild
+++ /dev/null
@@ -1,420 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
-
-inherit eutils flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
-
-MY_P="${PN}_$(ver_rs 1- _)"
-MAJOR_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="https://www.boost.org/"
-SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
-
-IUSE="context debug doc icu +nls mpi python static-libs +threads tools"
-
-RDEPEND="icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
-	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
-	python? (
-		${PYTHON_DEPS}
-		>dev-python/numpy-1.7[${PYTHON_USEDEP}]
-	)
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	!app-admin/eselect-boost"
-DEPEND="${RDEPEND}
-	=dev-util/boost-build-${MAJOR_V}*"
-REQUIRED_USE="
-	mpi? ( threads )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
-	"${FILESDIR}/${PN}-1.55.0-context-x32.patch"
-	"${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch"
-	"${FILESDIR}/${PN}-1.67.0-fix-python.patch"
-	"${FILESDIR}/${PN}-1.67.0-lockfree-next.patch"
-)
-
-python_bindings_needed() {
-	multilib_is_native_abi && use python
-}
-
-tools_needed() {
-	multilib_is_native_abi && use tools
-}
-
-create_user-config.jam() {
-	local compiler compiler_version compiler_executable
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-		compiler_executable="$(tc-getCXX)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-		compiler_executable="$(tc-getCXX)"
-	fi
-	local mpi_configuration python_configuration
-
-	if use mpi; then
-		mpi_configuration="using mpi ;"
-	fi
-
-	if python_bindings_needed; then
-		# boost expects libpython$(pyver) and doesn't allow overrides
-		# and the build system is so creepy that it's easier just to
-		# provide a symlink (linker's going to use SONAME anyway)
-		# TODO: replace it with proper override one day
-		ln -f -s "$(python_get_library_path)" "${T}/lib${EPYTHON}$(get_libname)" || die
-
-		if tc-is-cross-compiler; then
-			python_configuration="using python : ${EPYTHON#python} : : ${SYSROOT:-${EROOT}}/usr/include/${EPYTHON} : ${SYSROOT:-${EROOT}}/usr/$(get_libdir) ;"
-		else
-			# note: we need to provide version explicitly because of
-			# a bug in the build system:
-			# https://github.com/boostorg/build/pull/104
-			python_configuration="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) : ${T} ;"
-		fi
-	fi
-
-	cat > "${BOOST_ROOT}/user-config.jam" << __EOF__ || die
-using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-${mpi_configuration}
-${python_configuration}
-__EOF__
-}
-
-pkg_setup() {
-	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT%/}/etc/site-config.jam" ]]; then
-		grep -q gentoorelease "${EROOT%/}/etc/site-config.jam" && grep -q gentoodebug "${EROOT%/}/etc/site-config.jam" ||
-		(
-			eerror "You are using custom ${EROOT%/}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
-			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT%/}/usr/share/boost-build/site-config.jam to it."
-			die
-		)
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Do not try to build missing 'wave' tool, bug #522682
-	# Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
-	sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
-
-	multilib_copy_sources
-}
-
-ejam() {
-	local b2_opts=(
-		"--user-config=${BOOST_ROOT}/user-config.jam"
-		"$@"
-	)
-	echo b2 "${b2_opts[@]}"
-	b2 "${b2_opts[@]}"
-}
-
-src_configure() {
-	# Workaround for too many parallel processes requested, bug #506064
-	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
-	OPTIONS=(
-		$(usex debug gentoodebug gentoorelease)
-		"-j$(makeopts_jobs)"
-		-q
-		-d+2
-		pch=off
-		$(usex icu "-sICU_PATH=${EPREFIX}/usr" '--disable-icu boost.locale.icu=off')
-		$(usex mpi '' '--without-mpi')
-		$(usex nls '' '--without-locale')
-		$(usex context '' '--without-context --without-coroutine --without-fiber')
-		$(usex threads '' '--without-thread')
-		--boost-build="${EPREFIX}"/usr/share/boost-build
-		--prefix="${ED%/}/usr"
-		--layout=system
-		# building with threading=single is currently not possible
-		# https://svn.boost.org/trac/boost/ticket/7105
-		threading=multi
-		link=$(usex static-libs shared,static shared)
-		$([[ ${CHOST} == *-winnt* ]] && printf -- '-sNO_BZIP2=1\n')
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	elif [[ ${CHOST} == *-winnt* ]]; then
-		compiler=parity
-		if [[ $($(tc-getCXX) -v) == *trunk* ]]; then
-			compilerVersion=trunk
-		else
-			compilerVersion=$($(tc-getCXX) -v | sed '1q' \
-				| sed -e 's,\([a-z]*\) \([0-9]\.[0-9]\.[0-9][^ \t]*\) .*,\2,') || die "sed failed"
-		fi
-		compilerExecutable=$(tc-getCXX)
-	fi
-
-	# bug 298489
-	if use ppc || use ppc64; then
-		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
-	fi
-
-	# Use C++14 globally as of 1.62
-	append-cxxflags -std=c++14
-}
-
-multilib_src_compile() {
-	local -x BOOST_ROOT="${BUILD_DIR}"
-	PYTHON_DIRS=""
-	MPI_PYTHON_MODULE=""
-
-	building() {
-		create_user-config.jam
-
-		local PYTHON_OPTIONS
-		if python_bindings_needed; then
-			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
-		else
-			PYTHON_OPTIONS=" --without-python"
-		fi
-
-		ejam \
-			"${OPTIONS[@]}" \
-			${PYTHON_OPTIONS} \
-			|| die "Building of Boost libraries failed"
-
-		if python_bindings_needed; then
-			if [[ -z "${PYTHON_DIRS}" ]]; then
-				PYTHON_DIRS="$(find bin.v2/libs -name python | sort)"
-			else
-				if [[ "${PYTHON_DIRS}" != "$(find bin.v2/libs -name python | sort)" ]]; then
-					die "Inconsistent structure of build directories"
-				fi
-			fi
-
-			local dir
-			for dir in ${PYTHON_DIRS}; do
-				mv ${dir} ${dir}-${EPYTHON} \
-					|| die "Renaming of '${dir}' to '${dir}-${EPYTHON}' failed"
-			done
-
-			if use mpi; then
-				if [[ -z "${MPI_PYTHON_MODULE}" ]]; then
-					MPI_PYTHON_MODULE="$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)"
-					if [[ "$(echo "${MPI_PYTHON_MODULE}" | wc -l)" -ne 1 ]]; then
-						die "Multiple mpi.so files found"
-					fi
-				else
-					if [[ "${MPI_PYTHON_MODULE}" != "$(find bin.v2/libs/mpi/build/*/gentoo* -name mpi.so)" ]]; then
-						die "Inconsistent structure of build directories"
-					fi
-				fi
-
-				mv stage/lib/mpi.so stage/lib/mpi.so-${EPYTHON} \
-					|| die "Renaming of 'stage/lib/mpi.so' to 'stage/lib/mpi.so-${EPYTHON}' failed"
-			fi
-		fi
-	}
-	if python_bindings_needed; then
-		python_foreach_impl building
-	else
-		building
-	fi
-
-	if tools_needed; then
-		pushd tools >/dev/null || die
-
-		ejam \
-			"${OPTIONS[@]}" \
-			${PYTHON_OPTIONS} \
-			|| die "Building of Boost tools failed"
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use python; then
-		rm -r "${ED%/}"/usr/include/boost/python* || die
-	fi
-
-	if ! use nls; then
-		rm -r "${ED%/}"/usr/include/boost/locale || die
-	fi
-
-	if ! use context; then
-		rm -r "${ED%/}"/usr/include/boost/context || die
-		rm -r "${ED%/}"/usr/include/boost/coroutine{,2} || die
-		rm "${ED%/}"/usr/include/boost/asio/spawn.hpp || die
-	fi
-
-	if use doc; then
-		# find extraneous files that shouldn't be installed
-		# as part of the documentation and remove them.
-		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
-		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
-		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
-		docinto html
-		dodoc *.{htm,html,png,css}
-		dodoc -r doc libs more tools
-
-		# To avoid broken links
-		dodoc LICENSE_1_0.txt
-
-		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
-	fi
-}
-
-multilib_src_install() {
-	local -x BOOST_ROOT="${BUILD_DIR}"
-	installation() {
-		create_user-config.jam
-
-		local PYTHON_OPTIONS
-		if python_bindings_needed; then
-			local dir
-			for dir in ${PYTHON_DIRS}; do
-				cp -pr ${dir}-${EPYTHON} ${dir} \
-					|| die "Copying of '${dir}-${EPYTHON}' to '${dir}' failed"
-			done
-
-			if use mpi; then
-				cp -p stage/lib/mpi.so-${EPYTHON} "${MPI_PYTHON_MODULE}" \
-					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to '${MPI_PYTHON_MODULE}' failed"
-				cp -p stage/lib/mpi.so-${EPYTHON} stage/lib/mpi.so \
-					|| die "Copying of 'stage/lib/mpi.so-${EPYTHON}' to 'stage/lib/mpi.so' failed"
-			fi
-			PYTHON_OPTIONS=" --python-buildid=${EPYTHON#python}"
-		else
-			PYTHON_OPTIONS=" --without-python"
-		fi
-
-		ejam \
-			"${OPTIONS[@]}" \
-			${PYTHON_OPTIONS} \
-			--includedir="${ED%/}/usr/include" \
-			--libdir="${ED%/}/usr/$(get_libdir)" \
-			install || die "Installation of Boost libraries failed"
-
-		if python_bindings_needed; then
-			rm -r ${PYTHON_DIRS} || die
-
-			# Move mpi.so Python module to Python site-packages directory.
-			# https://svn.boost.org/trac/boost/ticket/2838
-			if use mpi; then
-				local moddir=$(python_get_sitedir)/boost
-				# moddir already includes eprefix
-				mkdir -p "${D}${moddir}" || die
-				mv "${ED%/}/usr/$(get_libdir)/mpi.so" "${D}${moddir}" || die
-				cat << EOF > "${D}${moddir}/__init__.py" || die
-import sys
-if sys.platform.startswith('linux'):
-	import DLFCN
-	flags = sys.getdlopenflags()
-	sys.setdlopenflags(DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL)
-	from . import mpi
-	sys.setdlopenflags(flags)
-	del DLFCN, flags
-else:
-	from . import mpi
-del sys
-EOF
-			fi
-
-			python_optimize
-		fi
-	}
-	if python_bindings_needed; then
-		python_foreach_impl installation
-	else
-		installation
-	fi
-
-	pushd "${ED%/}/usr/$(get_libdir)" >/dev/null || die
-
-	local ext=$(get_libname)
-	if use threads; then
-		local f
-		for f in *${ext}; do
-			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
-		done
-	fi
-
-	popd >/dev/null || die
-
-	if tools_needed; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED%/}"/usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# Yai for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT%/}/usr/include/boost" "${EROOT%/}/usr/share/boostbook"; do
-		if [[ -L ${symlink} ]]; then
-			rm -f "${symlink}" || die
-		fi
-	done
-
-	# some ancient installs still have boost cruft lying around
-	# for unknown reasons, causing havoc for reverse dependencies
-	# Bug: 607734
-	rm -rf "${EROOT%/}"/usr/include/boost-1_[3-5]? || die
-}
diff --git a/dev-libs/boost/boost-1.70.0.ebuild b/dev-libs/boost/boost-1.70.0.ebuild
new file mode 100644
index 000000000000..570df6cc8443
--- /dev/null
+++ b/dev-libs/boost/boost-1.70.0.ebuild
@@ -0,0 +1,332 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
+
+MY_P="${PN}_$(ver_rs 1- _)"
+MAJOR_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="https://www.boost.org/"
+SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
+REQUIRED_USE="
+	mpi? ( threads )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# the tests will never fail because these are not intended as sanity
+# tests at all. They are more a way for upstream to check their own code
+# on new compilers. Since they would either be completely unreliable
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+RESTRICT="test"
+
+RDEPEND="
+	!app-admin/eselect-boost
+	!dev-libs/boost-numpy
+	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
+	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
+	python? (
+		${PYTHON_DEPS}
+		numpy? ( >=dev-python/numpy-1.14.5[${PYTHON_USEDEP}] )
+	)
+	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.48.0-disable_icu_rpath.patch
+	"${FILESDIR}"/${PN}-1.69.0-context-x32.patch
+	"${FILESDIR}"/${PN}-1.56.0-build-auto_index-tool.patch
+)
+
+python_bindings_needed() {
+	multilib_is_native_abi && use python
+}
+
+tools_needed() {
+	multilib_is_native_abi && use tools
+}
+
+create_user-config.jam() {
+	local user_config_jam="${BUILD_DIR}"/user-config.jam
+	if [[ -s ${user_config_jam} ]]; then
+		einfo "${user_config_jam} already exists, skipping configuration"
+		return
+	else
+		einfo "Creating configuration in ${user_config_jam}"
+	fi
+
+	local compiler compiler_version compiler_executable="$(tc-getCXX)"
+	if [[ ${CHOST} == *-darwin* ]]; then
+		compiler="darwin"
+		compiler_version="$(gcc-fullversion)"
+	else
+		compiler="gcc"
+		compiler_version="$(gcc-version)"
+	fi
+
+	if use mpi; then
+		local mpi_configuration="using mpi ;"
+	fi
+
+	cat > "${user_config_jam}" <<- __EOF__ || die
+		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
+		${mpi_configuration}
+	__EOF__
+
+	if python_bindings_needed; then
+		append_to_user_config() {
+			local py_config
+			if tc-is-cross-compiler; then
+				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
+			else
+				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
+			fi
+			echo "${py_config}" >> "${user_config_jam}" || die
+		}
+		python_foreach_impl append_to_user_config
+	fi
+
+	if python_bindings_needed && use numpy; then
+		einfo "Enabling support for NumPy extensions in Boost.Python"
+	else
+		einfo "Disabling support for NumPy extensions in Boost.Python"
+
+		# Boost.Build does not allow for disabling of numpy
+		# extensions, thereby leading to automagic numpy
+		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
+		sed \
+			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
+			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
+	fi
+}
+
+pkg_setup() {
+	# Bail out on unsupported build configuration, bug #456792
+	if [[ -f "${EROOT}/etc/site-config.jam" ]]; then
+		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}/etc/site-config.jam"; then
+			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+			eerror "Boost can not be built in such configuration."
+			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
+			die "Unsupported target in ${EROOT}/etc/site-config.jam"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Do not try to build missing 'wave' tool, bug #522682
+	# Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
+	sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
+
+	multilib_copy_sources
+}
+
+ejam() {
+	create_user-config.jam
+
+	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
+	if python_bindings_needed; then
+		append_to_b2_opts() {
+			b2_opts+=( python="${EPYTHON#python}" )
+		}
+		python_foreach_impl append_to_b2_opts
+	else
+		b2_opts+=( --without-python )
+	fi
+	b2_opts+=( "$@" )
+
+	echo b2 "${b2_opts[@]}" >&2
+	b2 "${b2_opts[@]}"
+}
+
+src_configure() {
+	# Workaround for too many parallel processes requested, bug #506064
+	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
+
+	OPTIONS=(
+		$(usex debug gentoodebug gentoorelease)
+		"-j$(makeopts_jobs)"
+		-q
+		-d+2
+		pch=off
+		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
+		$(usex mpi '' '--without-mpi')
+		$(usex nls '' '--without-locale')
+		$(usex context '' '--without-context --without-coroutine --without-fiber')
+		$(usex threads '' '--without-thread')
+		--without-stacktrace
+		--boost-build="${BROOT}"/usr/share/boost-build
+		--prefix="${ED}/usr"
+		--layout=system
+		# CMake has issues working with multiple python impls,
+		# disable cmake config generation for the time being
+		# https://github.com/boostorg/python/issues/262#issuecomment-483069294
+		--no-cmake-config
+		# building with threading=single is currently not possible
+		# https://svn.boost.org/trac/boost/ticket/7105
+		threading=multi
+		link=$(usex static-libs shared,static shared)
+		# this seems to be the only way to disable compression algorithms
+		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
+		-sNO_BZIP2=$(usex bzip2 0 1)
+		-sNO_LZMA=$(usex lzma 0 1)
+		-sNO_ZLIB=$(usex zlib 0 1)
+		-sNO_ZSTD=$(usex zstd 0 1)
+	)
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# We need to add the prefix, and in two cases this exceeds, so prepare
+		# for the largest possible space allocation.
+		append-ldflags -Wl,-headerpad_max_install_names
+	fi
+
+	# bug 298489
+	if use ppc || use ppc64; then
+		[[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
+	fi
+
+	# Use C++14 globally as of 1.62
+	append-cxxflags -std=c++14
+}
+
+multilib_src_compile() {
+	ejam "${OPTIONS[@]}" || die
+
+	if tools_needed; then
+		pushd tools >/dev/null || die
+		ejam \
+			"${OPTIONS[@]}" \
+			|| die "Building of Boost tools failed"
+		popd >/dev/null || die
+	fi
+}
+
+multilib_src_install_all() {
+	if ! use numpy; then
+		rm -r "${ED}"/usr/include/boost/python/numpy* || die
+	fi
+
+	if ! use python; then
+		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
+	fi
+
+	if ! use nls; then
+		rm -r "${ED}"/usr/include/boost/locale || die
+	fi
+
+	if ! use context; then
+		rm -r "${ED}"/usr/include/boost/context || die
+		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
+		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
+	fi
+
+	if use doc; then
+		# find extraneous files that shouldn't be installed
+		# as part of the documentation and remove them.
+		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
+		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
+		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
+
+		docinto html
+		dodoc *.{htm,html,png,css}
+		dodoc -r doc libs more tools
+
+		# To avoid broken links
+		dodoc LICENSE_1_0.txt
+
+		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
+	fi
+}
+
+multilib_src_install() {
+	ejam \
+		"${OPTIONS[@]}" \
+		--includedir="${ED}/usr/include" \
+		--libdir="${ED}/usr/$(get_libdir)" \
+		install || die "Installation of Boost libraries failed"
+
+	pushd "${ED}/usr/$(get_libdir)" >/dev/null || die
+
+	local ext=$(get_libname)
+	if use threads; then
+		local f
+		for f in *${ext}; do
+			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
+		done
+	fi
+
+	popd >/dev/null || die
+
+	if tools_needed; then
+		dobin dist/bin/*
+
+		insinto /usr/share
+		doins -r dist/share/boostbook
+	fi
+
+	# boost's build system truely sucks for not having a destdir.  Because for
+	# this reason we are forced to build with a prefix that includes the
+	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
+	# but to do it the dirty way of manually setting the right install_names.
+	if [[ ${CHOST} == *-darwin* ]]; then
+		einfo "Working around completely broken build-system(tm)"
+		local d
+		for d in "${ED}"/usr/lib/*.dylib; do
+			if [[ -f ${d} ]]; then
+				# fix the "soname"
+				ebegin "  correcting install_name of ${d#${ED}}"
+				install_name_tool -id "/${d#${D}}" "${d}"
+				eend $?
+				# fix references to other libs
+				refs=$(otool -XL "${d}" | \
+					sed -e '1d' -e 's/^\t//' | \
+					grep "^libboost_" | \
+					cut -f1 -d' ')
+				local r
+				for r in ${refs}; do
+					ebegin "    correcting reference to ${r}"
+					install_name_tool -change \
+						"${r}" \
+						"${EPREFIX}/usr/lib/${r}" \
+						"${d}"
+					eend $?
+				done
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	# Yai for having symlinks that are nigh-impossible to remove without
+	# resorting to dirty hacks like these. Removes lingering symlinks
+	# from the slotted versions.
+	local symlink
+	for symlink in "${EROOT}/usr/include/boost" "${EROOT}/usr/share/boostbook"; do
+		if [[ -L ${symlink} ]]; then
+			rm -f "${symlink}" || die
+		fi
+	done
+
+	# some ancient installs still have boost cruft lying around
+	# for unknown reasons, causing havoc for reverse dependencies
+	# Bug: 607734
+	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
+}
diff --git a/dev-libs/boost/files/boost-1.63.0-fix-python.patch b/dev-libs/boost/files/boost-1.63.0-fix-python.patch
deleted file mode 100644
index 18ca2f566711..000000000000
--- a/dev-libs/boost/files/boost-1.63.0-fix-python.patch
+++ /dev/null
@@ -1,138 +0,0 @@
---- a/boostcpp.jam
-+++ b/boostcpp.jam
-@@ -104,7 +104,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
--    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
- }
- 
- 
---- a/libs/python/build/Jamfile
-+++ b/libs/python/build/Jamfile
-@@ -30,22 +30,6 @@
-         ;
- }
- 
--rule find-py3-version
--{
--    local versions = [ feature.values python ] ;
--    local py3ver ;
--    for local v in $(versions)
--    {
--        if $(v) >= 3.0
--        {
--            py3ver = $(v) ;
--        }
--    }
--    return $(py3ver) ;
--}
--
--py3-version = [ find-py3-version ] ;
--
- project boost/python
-   : source-location ../src
-   ;
-@@ -53,10 +37,16 @@
- rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
- rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
- 
--rule lib_boost_python ( is-py3 ? )
-+rule lib_boost_python
- {
-+    local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
-+    local python2 ;
-+    if $(python_major_version) = 2
-+    {
-+        python2 = true ;
-+    }
- 
--    lib [ cond $(is-py3) : boost_python3 : boost_python ]
-+    lib boost_python
-         : # sources
-         numeric.cpp
-         list.cpp
-@@ -90,20 +80,9 @@
-         :   # requirements
-             <link>static:<define>BOOST_PYTHON_STATIC_LIB 
-             <define>BOOST_PYTHON_SOURCE
-+            [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
-           
--            # On Windows, all code using Python has to link to the Python
--            # import library.
--            #
--            # On *nix we never link libboost_python to libpython.  When
--            # extending Python, all Python symbols are provided by the
--            # Python interpreter executable.  When embedding Python, the
--            # client executable is expected to explicitly link to
--            # /python//python (the target representing libpython) itself.
--            #
--            # python_for_extensions is a target defined by Boost.Build to
--            # provide the Python include paths, and on Windows, the Python
--            # import library, as usage requirements.
--            [ cond [ python.configured ] : <library>/python//python_for_extensions ]
-+            [ cond [ python.configured ] : <library>/python//python ]
-             
-             # we prevent building when there is no python available
-             # as it's not possible anyway, and to cause dependents to
-@@ -112,7 +91,6 @@
-             <dependency>config-warning
- 
-             <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--            [ cond $(is-py3) : <python>$(py3-version) ]
- 
-             -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-             <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
-@@ -125,51 +103,8 @@
-         ;
- }
- 
--rule lib_boost_numpy ( is-py3 ? )
--{
--    numpy-include = [ python.numpy-include ] ;
--    lib [ cond $(is-py3) : boost_numpy3 : boost_numpy ]
--        : # sources
--        numpy/dtype.cpp
--        numpy/matrix.cpp
--        numpy/ndarray.cpp
--	numpy/numpy.cpp
--	numpy/scalars.cpp
--	numpy/ufunc.cpp
--        :   # requirements
--            [ cond [ python.numpy ] : <library>/python//python_for_extensions ]
--            [ unless [ python.numpy ] : <build>no ]
--	    <include>$(numpy-include)
--	    <library>boost_python
--            <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--            [ cond $(is-py3) : <python>$(py3-version) ]
--
--            -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
--            <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
--
--        :   # default build
--            <link>shared
--        :   # usage requirements
--            <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--        ;
--}
--
- libraries = boost_python ;
--libraries3 = boost_python3 ;
--if [ python.numpy ]
--{
--    libraries += boost_numpy ;
--    libraries3 += boost_numpy3 ;
--}
- 
- lib_boost_python ;
--lib_boost_numpy ;
--
--if $(py3-version)
--{
--    lib_boost_python yes ;
--    lib_boost_numpy yes ;
--    libraries += $(libraries3) ;
--}
- 
- boost-install $(libraries) ;
diff --git a/dev-libs/boost/files/boost-1.67.0-fix-python.patch b/dev-libs/boost/files/boost-1.67.0-fix-python.patch
deleted file mode 100644
index 6f51152d12e3..000000000000
--- a/dev-libs/boost/files/boost-1.67.0-fix-python.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-Python module needs to be built without these extra renames.
-MPI module needs to reference correct python
-
-~Index: boost_1_64_0/libs/mpi/build/Jamfile.v2
-~===================================================================
-~--- boost_1_64_0.orig/libs/mpi/build/Jamfile.v2
-~+++ boost_1_64_0/libs/mpi/build/Jamfile.v2
-~@@ -61,10 +61,10 @@ libraries += boost_mpi ;
-~     lib boost_mpi_python
-~       : # Sources
-~         python/serialize.cpp
-~+        /user-config//boost_python_alias
-~       : # Requirements
-~         <library>boost_mpi
-~         <library>/mpi//mpi [ mpi.extra-requirements ]
-~-      	<library>/boost/python//boost_python
-~         <link>shared:<define>BOOST_MPI_DYN_LINK=1
-~         <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
-~         <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
-~@@ -92,8 +92,8 @@ libraries += boost_mpi ;
-~         python/skeleton_and_content.cpp
-~         python/status.cpp
-~         python/py_timer.cpp
-~+        /user-config//boost_python_alias
-~       : # Requirements
-~-      	<library>/boost/python//boost_python
-~         <library>boost_mpi_python
-~         <library>boost_mpi
-~         <library>/mpi//mpi [ mpi.extra-requirements ]
-Index: boost_1_67_0/libs/mpi/build/Jamfile.v2
-===================================================================
---- boost_1_67_0.orig/libs/mpi/build/Jamfile.v2
-+++ boost_1_67_0/libs/mpi/build/Jamfile.v2
-@@ -60,33 +60,13 @@ libraries += boost_mpi ;
-
-   if [ python.configured ]
-   {
--    py2-version = [ py-version 2 ] ;
--    py3-version = [ py-version 3 ] ;
--
--    # These library names are synchronized with those defined by Boost.Python, see libs/python/build/Jamfile.
--    lib_boost_python(2) = boost_python ;
--    lib_boost_python(3) = boost_python3 ;
--
--    lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ;
--    lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ;
--
--    lib_boost_mpi_python(2) = boost_mpi_python ;
--    lib_boost_mpi_python(3) = boost_mpi_python3 ;
--
--    lib_boost_mpi_python($(py2-version)) = $(lib_boost_mpi_python(2)) ;
--    lib_boost_mpi_python($(py3-version)) = $(lib_boost_mpi_python(3)) ;
--
--    for local N in 2 3
--    {
--        if $(py$(N)-version)
--        {
--            lib $(lib_boost_mpi_python($(py$(N)-version)))
-+    lib boost_mpi_python
-               : # Sources
-                 python/serialize.cpp
-               : # Requirements
-                 <library>boost_mpi
-                 <library>/mpi//mpi [ mpi.extra-requirements ]
--                <library>/boost/python//$(lib_boost_python($(py$(N)-version)))
-+                <library>/boost/python//boost_python
-                 <link>shared:<define>BOOST_MPI_DYN_LINK=1
-                 <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
-                 <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
-@@ -94,12 +74,12 @@ libraries += boost_mpi ;
-                 -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-                 <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
-                 <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--                <python>$(py$(N)-version)
-               : # Default build
-                 <link>shared
-               : # Usage requirements
-                 <library>/mpi//mpi [ mpi.extra-requirements ]
-               ;
-+            libraries += boost_mpi_python ;
-
-             python-extension mpi
-               : # Sources
-@@ -116,8 +96,8 @@ libraries += boost_mpi ;
-                 python/status.cpp
-                 python/py_timer.cpp
-               : # Requirements
--                <library>/boost/python//$(lib_boost_python($(py$(N)-version)))
--                <library>$(lib_boost_mpi_python($(py$(N)-version)))
-+        <library>/boost/python//boost_python
-+        <library>boost_mpi_python
-                 <library>boost_mpi
-                 <library>/mpi//mpi [ mpi.extra-requirements ]
-                 <link>shared:<define>BOOST_MPI_DYN_LINK=1
-@@ -125,16 +105,7 @@ libraries += boost_mpi ;
-                 <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
-                 <link>shared <runtime-link>shared
-                 <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--                <python>$(py$(N)-version)
-               ;
--
--            libraries += $(lib_boost_mpi_python($(py$(N)-version))) ;
--        }
--        else
--        {
--            alias $(lib_boost_mpi_python($(N))) ;
--        }
--    }
-   }
- }
- else if ! ( --without-mpi in  [ modules.peek : ARGV ] )
-Index: boost_1_67_0/libs/python/Jamfile
-===================================================================
---- boost_1_67_0.orig/libs/python/Jamfile
-+++ boost_1_67_0/libs/python/Jamfile
-@@ -36,9 +36,10 @@ local rule split-version ( version )
- # For example, Boost.Python built for Python 2.7 uses the suffix "27"
- rule version-suffix ( version )
- {
--    local major-minor = [ split-version $(version) ] ;
--    local suffix = $(major-minor:J="") ;
--    return $(suffix) ;
-+    # local major-minor = [ split-version $(version) ] ;
-+    # local suffix = $(major-minor:J="") ;
-+    # return $(suffix) ;
-+    return "" ;
- }
-
-
-diff -ur boost_1_67_0.orig/boostcpp.jam boost_1_67_0/boostcpp.jam
---- boost_1_67_0.orig/boostcpp.jam	2018-07-30 16:26:03.346187542 -0700
-+++ boost_1_67_0/boostcpp.jam	2018-07-30 16:26:18.839081472 -0700
-@@ -105,7 +105,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
--    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" _ ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" _ ] ;
- }
-
-
-diff -ur boost_1_67_0.orig/libs/python/Jamfile boost_1_67_0/libs/python/Jamfile
---- boost_1_67_0.orig/libs/python/Jamfile	2018-07-30 14:56:15.591366992 -0700
-+++ boost_1_67_0/libs/python/Jamfile	2018-07-30 16:26:31.662993677 -0700
-@@ -47,7 +47,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
--    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" _ ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" _ ] ;
- }
-
- rule python-tag ( name : type ? : property-set )
diff --git a/dev-libs/boost/files/boost-1.67.0-lockfree-next.patch b/dev-libs/boost/files/boost-1.67.0-lockfree-next.patch
deleted file mode 100644
index acf9a96777e5..000000000000
--- a/dev-libs/boost/files/boost-1.67.0-lockfree-next.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/671724
-
-From 12726cda009a855073b9bedbdce57b6ce7763da2 Mon Sep 17 00:00:00 2001
-From: Peter Dimov <pdimov@pdimov.com>
-Date: Sat, 2 Dec 2017 04:10:46 +0200
-Subject: [PATCH] Add #include <boost/next_prior.hpp>; no longer in utility.hpp
-
----
- include/boost/lockfree/spsc_queue.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/boost/lockfree/spsc_queue.hpp
-+++ b/boost/lockfree/spsc_queue.hpp
-@@ -17,6 +17,7 @@
- #include <boost/assert.hpp>
- #include <boost/static_assert.hpp>
- #include <boost/utility.hpp>
-+#include <boost/next_prior.hpp>
- #include <boost/utility/enable_if.hpp>
- #include <boost/config.hpp> // for BOOST_LIKELY
- 
--- 
-2.19.2
-
diff --git a/dev-libs/boost/files/boost-1.69.0-context-x32.patch b/dev-libs/boost/files/boost-1.69.0-context-x32.patch
new file mode 100644
index 000000000000..9ee3d545d618
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.69.0-context-x32.patch
@@ -0,0 +1,38 @@
+--- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S
++++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S
+@@ -24,6 +24,10 @@
+  *                                                                                      *
+  ****************************************************************************************/
+ 
++#ifdef __x86_64__
++#include "jump_x86_64_sysv_elf_gas.S"
++#else
++
+ .file "jump_i386_sysv_elf_gas.S"
+ .text
+ .globl jump_fcontext
+@@ -81,3 +85,5 @@
+ 
+ /* Mark that we don't need executable stack.  */
+ .section .note.GNU-stack,"",%progbits
++
++#endif
+--- a/libs/context/src/asm/make_i386_sysv_elf_gas.S
++++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S
+@@ -24,6 +24,10 @@
+  *                                                                                      *
+  ****************************************************************************************/
+ 
++#ifdef __x86_64__
++#include "make_x86_64_sysv_elf_gas.S"
++#else
++
+ .file "make_i386_sysv_elf_gas.S"
+ .text
+ .globl make_fcontext
+@@ -105,3 +109,5 @@
+ 
+ /* Mark that we don't need executable stack.  */
+ .section .note.GNU-stack,"",%progbits
++
++#endif
diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml
index 4f85afb6e3f1..9d4579b80fb2 100644
--- a/dev-libs/boost/metadata.xml
+++ b/dev-libs/boost/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>office@gentoo.org</email>
@@ -11,12 +11,12 @@
 	</maintainer>
 	<use>
 		<flag name="context">Build and install the Boost.Context (and Boost.Fiber) library and all other Boost libraries that depend on it</flag>
-		<flag name="tools">Build and install the boost tools (bcp, quickbook, inspect, wave)</flag>
-		<flag name="debug" restrict="&lt;dev-libs/boost-1.50.0-r3">Build and install debug versions of the Boost libraries. These libraries are not used by default, and should not be used unless you're developing against Boost.</flag>
-		<flag name="debug" restrict="&gt;dev-libs/boost-1.52.0-r2">Build and install only the debug version of the Boost libraries. Only enable this flag if you're developing against boost.</flag>
-		<flag name="threads">Build multi-thread-compatible libraries instead of single-threaded only.</flag>
-		<flag name="nls">Build libboost_locale. This library requires compatible C library interfaces, which might not be provided by uClibc or other embedded libraries.</flag>
+		<flag name="debug">Build and install only the debug version of the Boost libraries. Only enable this flag if you're developing against boost.</flag>
 		<flag name="doc">Install the full API documentation documentation. This takes over 200MB of extra disk space.</flag>
+		<flag name="nls">Build libboost_locale. This library requires compatible C library interfaces, which might not be provided by uClibc or other embedded libraries.</flag>
+		<flag name="numpy">Optionally build NumPy extensions when Boost.Python is enabled</flag>
+		<flag name="threads">Build multi-thread-compatible libraries instead of single-threaded only.</flag>
+		<flag name="tools">Build and install the boost tools (bcp, quickbook, inspect, wave)</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">boost</remote-id>
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 0ae4a9bcdad0..80f51276ba64 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,12 +1,13 @@
 AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432ee7af503dd2fc8a59185c5406b659629ee5a0c4f73c2c090dfccf64757baea196fcca4f60379a2b2f04baf81ee6 SHA512 bccb615e832ef31381afd0996a06cfb4c37f29bd8d7691435d592f2ec88f525f3e9e19adf84c78ebd6f24f60e407e29ef99bdff11103ef1344250fe5251fca0a
 AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642
 AUX botan-2.8.0-build.patch 614 BLAKE2B 99a1d63c4703014d858dcd7296eb63d5d46ecb38d349532e9ad2fb7f57e97eefc9421fce9db6e0d28f0464ccad390995bccb7c985cc5498aeb05b063e429ff44 SHA512 0f2e089caa6a65acb955ef74a1776950eaf00b83c6c2bed1e0b6876dbcbb01487fb64be9e6492ddf6428ae7e513c38f49899280bfe23065ceb137678eb2cd9e5
+AUX botan-2.9.0-build.patch 1886 BLAKE2B 62f6b5f9c47ded4c460c6c6b3057cbbb95711b5b5db300523f45e25e6bc161277174ea4c461e872f24bfd23839510a7857c44733a333cb6054b7dc183faa3e2e SHA512 90948e75d5bb6f2620a92fe4aea37d05aaf25e98430b112651aa6ad635f19f8659658ae79d16e60e27ca61ec5da92d5dd1c234c4c9e2ae0fab44b92806bcafe0
 DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649
 DIST Botan-2.7.0.tgz 7021654 BLAKE2B 3f18b7ba660a72a409beeaba8bd1b1bd021f645c135bed56d75b6ba906b7c28d1e14eac9550862500dda9c4b3ac3135cfc9c340e073c573deb66b236e09f8054 SHA512 992138d83e18aedf80337d825f80c34dd3d2177eb30967573c57cf9fb7e7f9a9965ae3d75f23635f4c93b4efb7bb5adbb3423702663c78a5eb905dd567561858
 DIST Botan-2.8.0.tgz 7152674 BLAKE2B 7838423fc7cc3521b3feb95ab3958f8cd4df86534f1ef30d717b47e54a9a7ae0d2ed6618370b9adfd0a178b509750e5aacda8457caa89f408292837fe3426de0 SHA512 12f734eea3e60a956f75a5b58e9bd83fac7b0dbcd71fb9577b025d171702d87a9a11e2e73162320bdefb2d25f3900757d89dd7fe13089321c88d948efc2ba214
 DIST Botan-2.9.0.tgz 7216373 BLAKE2B 5ad2e15db871ccc3a32b29b7f54a02d69f251f0aca2ce656b557dbbb3814a793053a54905371b3414ad72952a64bece43e2383da91f205f68b0fe31be2f9439c SHA512 b88f3894a4a5b7b2fbff9be6eb0b774bf679a014bd2364811b7e63d4f323e22ca9ef916491afbc2cdf9db68727c1449fbeb6fd417e591560add0955517db3f65
-EBUILD botan-1.10.17-r2.ebuild 4274 BLAKE2B cc2cc4d510a95803463c477848e09cfec79a11e5246d9c9d5678502f1f279989b0ebb92840e62c445bc13a0fe1276a41b63a3c1a14ad4b8bde058f51ac91e586 SHA512 5e256c4785e2560bcb151d687136688b3a2daa11e8f87a46965aa9e687b781c7fb00cabce5ee90b6fba6aca800ff636ee9921093d1de8d22a1780d809f0613de
-EBUILD botan-2.7.0.ebuild 2480 BLAKE2B 3207ded4663f1cf2cd55153f4369fef6a4a93967703a1afbe8f91b2dc0cca944a89eeaef3dd64b3ee8253deb034b8c69e4adcc0c018f80b3dafbe145d0955ce1 SHA512 e5cd37b8ff517686c295b094e66305d5b3d5741d95ee42e62c03dc6e0d5b452257033bd7c740c59bc65e47b179c2e4b2ade7cd11ebbf629f12a0c2c842590ff7
-EBUILD botan-2.8.0.ebuild 2539 BLAKE2B b81003c69fd64e252e2fa20e79eeed1ae1340cbdd284ea5c9224ae8c2ccb55660510f1350e856615cc9fb8a21ff73ef8e483a823a0aaaf10255af347b5149b88 SHA512 5c332f6e8a7160333d54ded63285c3a8f56cf9ee1ce47d55ce5f3522014abf4cd53c2ab6699bef5724f50fc7daca5a1b2006e076ded7e03c6a0aa8b0685589a0
-EBUILD botan-2.9.0.ebuild 2494 BLAKE2B 8c11d04312a38dc971b1476451f979079b75449ffe31119715e3d8bb6fe3dc4dfd2b931bd7e5f4c07a7f5ba3a1ff6c18d070875500c5b36a4de9b3b29e28cafc SHA512 3a062c53638ba7a9d0f40bf0e122bff4a0f92c7cd365486cc6f1e2b331ef009113110549e1c1f8d48a35fd001ec237602f7fcece0ccc45e4e879af8b6f3eb873
+EBUILD botan-1.10.17-r2.ebuild 4270 BLAKE2B 7b8f1a4722002c8dee3d30c9f29c9aa27e2d1cf3e98e7b41ddc2b9b959e51b5b451b945cbaa9c13890f555e077843cbc94106f2c0032c9f4fb181513f159b432 SHA512 fd4b7886680da84254c19e546ddb4a96491263b228caf5408e48b01ad02c1156058ba11c8aef6722e99be92af6f6f5bd9599730f93820c40f0598513000ab9d7
+EBUILD botan-2.7.0.ebuild 2476 BLAKE2B eec45b4b7ac06952b9c93753d50ca45e2a4c00b7502f471a901a49ae9a8123eaf24f556b99dadd3706c97af3ec79328fc30d4fc2bb4e13a2f4a891dc8296a220 SHA512 11fe68f739d0090a9a2002ae7c2bbec51cf75efd974560236a9ec37bb30e6c5c1d57e2adb7075e8bf7c8ac25399fd87c9da143b17885151c802eba1f3079b8f8
+EBUILD botan-2.8.0.ebuild 2535 BLAKE2B 5985f79ecd22ecfae7f91743ebbfb85cffcfea39c8e60e3d8a2bef918a5579fe7e8cfd9ce1fde70ba65892f4ad9b17648535516d6013b03aaaf83aa03ba218f4 SHA512 bdfbefbbbb5f5e221f105470646fe2318284c941428f6d610d096903ae3b87da77f4be5583b3506fe6aa00f0cf38952b5384ed71b53a5cf6714f0611406c4de3
+EBUILD botan-2.9.0.ebuild 2531 BLAKE2B c231f9ac6f47478ec4d29bd2787b6e92a8771bea8f6a79edaaded0b640e3b710188efd0ec9453690d0dc3a4a35275613494b5a15b29a8b466788787e0e4b4d06 SHA512 2e772f90c51b641cb529eb5cb6cdc0aae84b6273de0fba8c7e8f2286b3ee3712ea9b52fe3d0a88213500befe6a73c6eeb5e2ad41d88ada48b091fc9aaccc77e3
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-1.10.17-r2.ebuild b/dev-libs/botan/botan-1.10.17-r2.ebuild
index 6e97aaa2be67..132f27c34fb1 100644
--- a/dev-libs/botan/botan-1.10.17-r2.ebuild
+++ b/dev-libs/botan/botan-1.10.17-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit multilib python-r1 toolchain-funcs
 
diff --git a/dev-libs/botan/botan-2.7.0.ebuild b/dev-libs/botan/botan-2.7.0.ebuild
index 10f8cd214c78..dbd4d804dc08 100644
--- a/dev-libs/botan/botan-2.7.0.ebuild
+++ b/dev-libs/botan/botan-2.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit multilib python-r1 toolchain-funcs
 
diff --git a/dev-libs/botan/botan-2.8.0.ebuild b/dev-libs/botan/botan-2.8.0.ebuild
index 4f995a89686a..e46dbb8f1ef7 100644
--- a/dev-libs/botan/botan-2.8.0.ebuild
+++ b/dev-libs/botan/botan-2.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit multilib python-r1 toolchain-funcs
 
diff --git a/dev-libs/botan/botan-2.9.0.ebuild b/dev-libs/botan/botan-2.9.0.ebuild
index 8f92905d738a..90a1e9416b8d 100644
--- a/dev-libs/botan/botan-2.9.0.ebuild
+++ b/dev-libs/botan/botan-2.9.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit multilib python-r1 toolchain-funcs
 
@@ -12,7 +12,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="https://botan.randombit.net/"
 SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
 SLOT="2/$(ver_cut 1-2)" # soname version
 LICENSE="BSD"
 IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
@@ -34,6 +34,10 @@ RDEPEND="${DEPEND}
 BDEPEND="dev-lang/python:*
 	doc? ( dev-python/sphinx )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
 src_configure() {
 	local disable_modules=()
 	use boost || disable_modules+=( "boost" )
diff --git a/dev-libs/botan/files/botan-2.9.0-build.patch b/dev-libs/botan/files/botan-2.9.0-build.patch
new file mode 100755
index 000000000000..6208ffdbf0ad
--- /dev/null
+++ b/dev-libs/botan/files/botan-2.9.0-build.patch
@@ -0,0 +1,63 @@
+From 86df247e4f090f984e050962ed5a4a536ec63b33 Mon Sep 17 00:00:00 2001
+From: Ralf van der Enden <Ralf.vanderEnden@deltares.nl>
+Date: Fri, 5 Apr 2019 14:58:14 +0200
+Subject: [PATCH] boost 1.70 compatibility
+
+Fixes issue #82
+---
+ src/cli/tls_http_server.cpp | 8 +++++++-
+ src/cli/tls_proxy.cpp       | 8 +++++++-
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/src/cli/tls_http_server.cpp b/src/cli/tls_http_server.cpp
+index cc59a71c33..0a6428cd65 100644
+--- a/src/cli/tls_http_server.cpp
++++ b/src/cli/tls_http_server.cpp
+@@ -41,6 +41,12 @@
+ 
+ #include "credentials.h"
+ 
++#if BOOST_VERSION >= 107000
++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
++#else
++#define GET_IO_SERVICE(s) ((s).get_io_service())
++#endif
++
+ namespace Botan_CLI {
+ 
+ namespace {
+@@ -435,7 +441,7 @@ class TLS_Asio_HTTP_Server final
+       session::pointer make_session()
+          {
+          return session::create(
+-                   m_acceptor.get_io_service(),
++                   GET_IO_SERVICE(m_acceptor),
+                    m_session_manager,
+                    m_creds,
+                    m_policy);
+diff --git a/src/cli/tls_proxy.cpp b/src/cli/tls_proxy.cpp
+index 49ffbe3766..42ce156b12 100644
+--- a/src/cli/tls_proxy.cpp
++++ b/src/cli/tls_proxy.cpp
+@@ -33,6 +33,12 @@
+ 
+ #include "credentials.h"
+ 
++#if BOOST_VERSION >= 107000
++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
++#else
++#define GET_IO_SERVICE(s) ((s).get_io_service())
++#endif
++
+ namespace Botan_CLI {
+ 
+ namespace {
+@@ -370,7 +376,7 @@ class tls_proxy_server final
+       session::pointer make_session()
+          {
+          return session::create(
+-                   m_acceptor.get_io_service(),
++                   GET_IO_SERVICE(m_acceptor),
+                    m_session_manager,
+                    m_creds,
+                    m_policy,
diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 98d4faeeac2f..0e757daeb700 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,4 +1,4 @@
 AUX c-blosc-1.11.2-fix-build-system.patch 803 BLAKE2B 1472877db42d6a952b8f91a75ba437c6693701cc255a44638c5035d4f723563a5c0dfb5baee73ce0eb061bbaf45c8a49988ba799f35ff3d8b79159e73ea15afe SHA512 3064040af07acc445e4c7a9e962939eafa02d75366e6eee2ce12f15cc5846fbb4214a17d27f9366e8c08b69a3565cb04910008b1e4bd62d6ded3087e1a27124b
 DIST c-blosc-1.11.2.tar.gz 633280 BLAKE2B 426de12ffa0db784fc26316e5758836517f3b3498111cfea64ebd2bc4582ebc6236f64845d41e75db272d3741ab8a7f22a12e0847fb7c98ba10a3ae2c2906e22 SHA512 c1282f60f4ef9d24844be225587e7f46c43ba8a5071f5ee49a7326bce9e84b65312c4f9606e78fd3d1209a4ca50f1c31312a7c377caf9522c9915177c92a4d7b
 EBUILD c-blosc-1.11.2.ebuild 1295 BLAKE2B 6fa832e8eadb8974601885ca87434c0cae161bb7754549a632a654bca7cfa35f69fccf663f40d4f433f06110b95e56ae8c69f78c97809e54eb593be6c7eaffb3 SHA512 cc150fa9fc5f1d0529f09e2e015dde5914a45e5a4e00a6b726ac7b56810b50a8c143e3e2715144ecf58ed82ed21bb738a7fa94ed77d59faa381b3e2413648d37
-MISC metadata.xml 900 BLAKE2B f517d69206738bc44ce57589b720e290fadc3b7e3303cb31782ab8fb6fca859b837716b6ee95a874b22cea713dc7aea436d4a2ec2520f4d5d460f6d6018c2aa0 SHA512 6d6221a4cc1c0f347158f0b2fa729ffb6e87dc720c0a7866529a7120a2b6534daf630f8812b2c5525d7c00646dbe3cfa953257f89330107621c9be08d2c5db0d
+MISC metadata.xml 849 BLAKE2B 70e37bcda75b729721c0058a14ff68a5ec76fb5617ede18c82b1db44e9441179f2cf5b8532bc69c4674a9599dbf344bd24d1786c8986bd505fec9e7a78811bf2 SHA512 6cdb0e8ce0d3f33917d37b8cc3d4db7e688dbd00a33e0702dd5566bef8421467d3ec40d9f1885cb7a4181386f58db842174d2fd3bc09ef41e898debfd089619b
diff --git a/dev-libs/c-blosc/metadata.xml b/dev-libs/c-blosc/metadata.xml
index 646211224e11..4ce6ebd129d5 100644
--- a/dev-libs/c-blosc/metadata.xml
+++ b/dev-libs/c-blosc/metadata.xml
@@ -15,7 +15,6 @@
 	<use>
 		<flag name="lz4">Enable lz4 compression</flag>
 		<flag name="snappy">Enable snappy compression</flag>
-		<flag name="zstd">Enable zstd compression</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">Blosc/c-blosc</remote-id>
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index cc1cff6ba04e..489bc486287d 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -6,8 +6,8 @@ AUX capstone-4.0-no-fuzz-tests.patch 367 BLAKE2B 890047c65669c6d323fa5f8bb80df44
 DIST capstone-3.0.5_rc2.tar.gz 2829338 BLAKE2B dd35fc6c31ec008f78840410ea0d20de56ea8f01c3af1d28488beaceee7fa06ce03c8cd0f56d834eb738d23f528d240693586122b9c1e353365f7348fb6f8362 SHA512 31bafdb0b3183d0c054a4244cc135db9a3c3dc5cb2e2af706bfede0d53cca8cba81d74b74ef9a4adbfd6c79cc408864dd80b8203791e17bd6c98bb69ea4f6894
 DIST capstone-4.0.1.tar.gz 3434276 BLAKE2B 585e0ee19b76d96116c67b021bbe19fd01d8db600b565094ff71a01d8a87b1123a8c5e2f944f1551c411565d5a25dfbfbb3138ca220b1281044a31004002399e SHA512 43c52024065b41b45eff9423341db3f3d5163fa7aa01b360faa30437786740c8f2c34c36faa04dced5308e09d8bd78df3bad0ab9c06f98612169edb176f83c36
 DIST capstone-4.0.tar.gz 3411532 BLAKE2B 3e60a946e81f6d6ea88c314ad066e1855e2401cd9e8e61a67d48071b0fe4b705b2276b0d2b52d0979f472895a69cbe7609f6a2c60b79be668730f41ea98bf92e SHA512 5a10c67e88b246ad905364c62c56b4741df242c22f1b62bdea171e4d1d43e484f42f30b33e17324be6cff4c6fb10365528a9c3f4b2a5339ad24b0564fdd40bdb
-EBUILD capstone-3.0.5_rc2-r1.ebuild 1444 BLAKE2B d1be427a65e94ba5651b0097e32bc087a9b93790f996e6c966bba8f12114723e16ad0cf3892f3caee7fe5bece69093343e07d4cf05cd93c659be8988cd3ae027 SHA512 abf20572bd401faab86e3ffb8ca03945e7665328c0b66f3946249513bec5fb6fcb13f98c5239ec468c414924768aaa4b73a648d304b28a3eda6450bfa607b01d
+EBUILD capstone-3.0.5_rc2-r1.ebuild 1437 BLAKE2B a3867e2cbc40acc823bbdbb2908aac3b70ce7abaabff84e98b393ef38a07872c9553f3e2ec225b72a1dd67fba61986b661f6b0faeb46d43545f377c079b65606 SHA512 732b223711c0e7b5c3f1cc935de1d7f28ea7d70b77a733ff25c40fefce6dcf3cee0a180876c79812187a40223f27030d119e7fbfb245efa418a016ea3e5f59d0
 EBUILD capstone-3.0.5_rc2.ebuild 849 BLAKE2B 8954f0ab824ca3532d0fba48e7b41abcc2b463a26bd7795553d8299f64f3b27e850c79bb04f210c3eeb4b27263390e2a0990be5ca76e4774bdfb16aa2921f748 SHA512 7896e5759c146a82b47239bf0fede1c67f49ec9970d3ca82ff1db6d4c53c7c8f3a3a657491ed12a8ca5de585ffcdaf032f3c3d1b9db6db0d4c75e613ef4dfc70
-EBUILD capstone-4.0.1.ebuild 1451 BLAKE2B 01418b507ec79d9224461267013e6ce8229315de52e98b9a92f7287c8d1b63082f76ced8da608e5a40f59f3381f5dbf8ff7ba92a3a070c840d67ccc4e70801b2 SHA512 57deabf8bce191530a926bfc5750a316a4e1054622c731fdac07dba571c36ed24b6cc1c14b30e5cd84e7c4e9d3619c529ad9e78948cd948da2e4762560c6cf18
-EBUILD capstone-4.0.ebuild 1482 BLAKE2B a58f57f87f1d03efe7ea2335ee3073a43f36a7ac41b01aea3f65f1cc036d16094707aeb1a7f9a2fcf26a57e7e78fe0555cee8513690f1dadba69cc46534b49de SHA512 403ad9a8f467376fc00c4648895c9def8b48f98b406f294ba474f94cbc85b2b99cd16399c736cc280e66df6626dc254751564ab87a93d37033890893e52fe166
+EBUILD capstone-4.0.1.ebuild 1447 BLAKE2B b4a995e7ba3e84d5497d7de003d268f2fbb71d2abab9ce1e759962c4cb84b7fe65ae3ffb85e109307e16317dfd5938f49affe8ba466cb0320f113ee312e0b985 SHA512 0f52d5c354020d7e6d0cb79bfffe046edf3434e133f3f3c7d1116e46886d40668e8177c44d51062dc22ccaa68e8c9068fa36bdcde16339cefe14620b9262744f
+EBUILD capstone-4.0.ebuild 1478 BLAKE2B 26377bd2101a7d07b96a2a4694dc65c703ed01c4025c89c8f7a605c6d6eb96770848dae7bd2a1787dbdf11555fdcefe8fae077406f3e86a6d9035a2c0495e7d6 SHA512 43a98ec5866876de4872bdd6d8e1c41e355792c40d74b67ffd3068ab24b6ba7c87a99bfc2cc815882b5e1d5cd04de024ceb640ef0880d2fc249e3271acd3bb86
 MISC metadata.xml 332 BLAKE2B 944b66779658094b7b1020400c1821dcf1f5138c85531fb83e853fa6d38219606f0f92673f57b3b621ffb3149eb50d60da281acaf469e97fc4c826b90c06b5a3 SHA512 a4952a89d043c4c8aec5a7a307d37d895880d49b381e5b881ffecf74b61c9c22cd854a68a1d1de3926431cdfad4f8ba70812be36bb7cac2df5dee8efe96dc269
diff --git a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
index 17f8b6cd3aff..a371dec0b3b5 100644
--- a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-libs/capstone/capstone-4.0.1.ebuild b/dev-libs/capstone/capstone-4.0.1.ebuild
index c0b0864f5e26..10fabceeab04 100644
--- a/dev-libs/capstone/capstone-4.0.1.ebuild
+++ b/dev-libs/capstone/capstone-4.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-libs/capstone/capstone-4.0.ebuild b/dev-libs/capstone/capstone-4.0.ebuild
index 78213838489a..2d3c1f9c4544 100644
--- a/dev-libs/capstone/capstone-4.0.ebuild
+++ b/dev-libs/capstone/capstone-4.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1 toolchain-funcs
 
diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest
index 0404a56a29dd..d822e36033e0 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -1,4 +1,4 @@
 AUX cdk-5.0.20120323-parallel-make.patch 181 BLAKE2B 2e69c15f66e63837dd430d0d22fbbcdc020d38c6faa23622020a69dc9cee0a22577427b5ed8eca2bcb386d635c970d7bde575ec9a44e5675660fa6ba398a267b SHA512 632f272cb5e5e9f927d7cd608ac7a001bfe560a035cde68e0243d80bda5cb1ddce2263fd8823455c96044676ab36067306572e6ed0347b83d4b630956b611c3b
 DIST cdk-5.0-20160131.tgz 516298 BLAKE2B 5e899afea1f034a48e46fef073303d0069e14310194342094392da517fa47793a1ac3ac33774369842daa1966dc9a4ad7404046874bc9cae24ceaa98a3dd7c47 SHA512 f8f7fc5fec3c040cdbfc2a0d886e9d9d9d231e56ed69adae0b91e03243b5edd550c5435f973a93d4cf7ab723bd27b55712af75162c4bfd3ae28b3c16cd68f755
-EBUILD cdk-5.0.20160131.ebuild 1186 BLAKE2B 727e03f849c3b59cec1318b1edb5e282fdfcefbeab8873fa7710a8f081a96c5bc982864f9ac720d7f42f3fedfd86172216106f174536539039d496a5b9717fe1 SHA512 1d53bef3c77a13ae07f67aa79e3633ad9795e16b00ed090a71fb9b7f99cd4dc038e1ec84350d34efa7f7370e07e21004216df5a6c21307464cfddd58b8e21fab
+EBUILD cdk-5.0.20160131.ebuild 1184 BLAKE2B 973c1573acdb51726ad3f3701bd86e1b7a57ad9de6d1ec87650cdb840dc992d22129c81c0f888ac94d42724ddc882548743b9489c326d790fb5503b8f20b9088 SHA512 03eabdfbfe446da5c711601e29286bdb2bb9cce79058adabb319ed4199a4cf3f4bb75202704a3432e95456b9fcf6770a35d5f56950a4cdd60b924a37be4df8ea
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/cdk/cdk-5.0.20160131.ebuild b/dev-libs/cdk/cdk-5.0.20160131.ebuild
index c6f6730a94da..4a42b99812b4 100644
--- a/dev-libs/cdk/cdk-5.0.20160131.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20160131.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit versionator
 
 MY_P="${PN}-$(replace_version_separator 2 -)"
 DESCRIPTION="A library of curses widgets"
-HOMEPAGE="http://dickey.his.com/cdk/cdk.html"
+HOMEPAGE="https://dickey.his.com/cdk/cdk.html"
 SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
 
 LICENSE="BSD"
diff --git a/dev-libs/cgicc/Manifest b/dev-libs/cgicc/Manifest
index d9d98ae09a8a..278dd5317b14 100644
--- a/dev-libs/cgicc/Manifest
+++ b/dev-libs/cgicc/Manifest
@@ -4,4 +4,4 @@ DIST cgicc-3.2.16.tar.gz 1409037 BLAKE2B 414f0f9e1cfe8cac0bc55ed34bdd6d745595e2f
 DIST cgicc-3.2.9.tar.gz 2087796 BLAKE2B ed8049397edb1a232c4636e27bd6e37153df853e08b9a4c9cc34a0f7f196cd1fddb32f968a6bd63bf669e482781f1706ae61c3b5c1e07bc0b5a71a24616f4ba6 SHA512 bd02750a0ad81a64c017e8ccf6cee0c6801506bdc00ea4b0a5e4ea28e35e453122e3e25b3578cb1cb7b22011d5147b99ed79bf7c4702d4c7ab404096aabca623
 EBUILD cgicc-3.2.16.ebuild 937 BLAKE2B 1770a5d37e03b1fa9ea56ba19393ab75fa3855ec6dec254df8a3efc079ec122db7da54757684d18dec53f022a5299d7bbdc6fb8075a14becd3ce80423817acfb SHA512 71f02a35b62b36e57064776817b4407f5ab32d404f8760e92a93c4131fce786536cdbd0807636df5c8fff23f11589b9b36d7fd1b21596b176291c37bc6d0047c
 EBUILD cgicc-3.2.9.ebuild 898 BLAKE2B 7b1d06160131dbe1640af50e8ececacba051be1af684ffb63bdfbf3230f9facdf854de054f18a9f9d390d293bb7f1ba2be2690a168150ad184b212f1a596c35d SHA512 429e72a2428969da7d93ef99f6be25148cc25f980305bb929957ff8775a2dc1308f31d972e48dd653fe74bba83a09b23749e663a2d83a427f3c58ef42c97f77f
-MISC metadata.xml 878 BLAKE2B 69184de1b0a4a848ef5890137cc1621413d1bf1cc40595f60f15b6cfe7bf01c9e2361d4ae2ecd1631a41cd9a340c2a1ef4da20fbc5ac97f30a570bc28ffcabdc SHA512 d95378e3c4f346f62f2d6801f1ce4ccc32fb8c20c17f773f628c7d45018a225c9d3e22a9a7b26b485757d434882b47ccdb6e2ef4d19641b4b0c89db9b177c188
+MISC metadata.xml 796 BLAKE2B 8b502996ad54d8dabf3c8279440115f39fb64bb70c1e72bd5ddb90b224f0103c0e011dc0f5985b5fd279a3bd24a05e98d6ea2f408d13cf7881b90bf71efb230f SHA512 5cf675335892f7f230841d62bb77fb947207869083f340c735d3a5b78d39b43b9f0cb911e206f854c2291481420e72fea1abcde2853566b2e6fea858b2695fbc
diff --git a/dev-libs/cgicc/metadata.xml b/dev-libs/cgicc/metadata.xml
index 8d6f3edbe619..c65be4a96414 100644
--- a/dev-libs/cgicc/metadata.xml
+++ b/dev-libs/cgicc/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		GNU cgicc is an ANSI C++ compliant class library that greatly
 		simplifies the creation of CGI applications for the World Wide
diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
new file mode 100644
index 000000000000..524cccf8516a
--- /dev/null
+++ b/dev-libs/clhpp/Manifest
@@ -0,0 +1,3 @@
+DIST clhpp-2.0.10.tar.gz 129954 BLAKE2B 1beb9b41ce1ad8ec88d0ccfa5f1d7a7af931841fa64d79b9eb9db90538f1b43f3cee5c74dc015ba835ee4ded2e926967bc3aa00dcc6ec0f5b65a04f9618ea1a9 SHA512 4a4898540c55422ca0cc6ba7f0c5495b915fc34df50f8add90e7f06dd5ef1d01a767234ecdee3757292980aa2f938e773177bcc73f28ac9c1b42d386863dea58
+EBUILD clhpp-2.0.10.ebuild 964 BLAKE2B e727a53b2b985851b1689002e5eb303bb9e728d5e3218c5a518e31f14b4f00ec0a52be3ef61a998a892b22e02ab9ddcc1ff5de161e84d8e92c38be5293c746a5 SHA512 c43291742252f91a58de66909adf2ead8f005712f3ecbe334abb1cc8661ca62b35566582509b70b914e0b71fc99c4106bc39a072bafbbed3c528a9ef6ba9549d
+MISC metadata.xml 336 BLAKE2B cf9637d462e3606aa1a49639f60217f003e2271fa064d6bb36e9d1744c3b84815c0b75c2d42a3e761876879ea7eb92c32986f8e54926ed7e544690035985a86a SHA512 77d25c077302f6e92b83c869c45c9f91131160fa250f5a5087067e3291a1a0954e883ae110d20d9420cd9c01720803977ccf1d5ff6250bee91d6e5192798e55d
diff --git a/dev-libs/clhpp/clhpp-2.0.10.ebuild b/dev-libs/clhpp/clhpp-2.0.10.ebuild
new file mode 100644
index 000000000000..dcea074146dd
--- /dev/null
+++ b/dev-libs/clhpp/clhpp-2.0.10.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+
+DESCRIPTION="Khronos OpenCL C++ bindings"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-CLHPP/"
+SRC_URI="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Khronos-CLHPP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+inherit python-any-r1 cmake-utils
+
+DEPEND="virtual/opencl"
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+src_unpack() {
+	unpack ${A}
+	# create symlink to change name
+	ln -s OpenCL-CLHPP-${PV} ${P}
+}
+
+src_prepare() {
+	# User patches + QA
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/include"
+		-DBUILD_DOCS=OFF
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_TESTS=OFF
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-libs/clhpp/metadata.xml b/dev-libs/clhpp/metadata.xml
new file mode 100644
index 000000000000..61f42884c3d1
--- /dev/null
+++ b/dev-libs/clhpp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+<longdescription lang="en">
+Khronos (tm) provided headers for C++ bindings for OpenCL.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index eebd9a2af603..3204f6348b1d 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -6,5 +6,5 @@ DIST pcsc-cyberjack-3.99.5final.SP12.tar.bz2 957583 BLAKE2B 02499e2e366a2caaf488
 DIST pcsc-cyberjack_3.99.5final.SP13.tar.gz 1617714 BLAKE2B 344f00217fa5dfb18e5318d2b8ccb88a3cc12b86a9c14d41a9800d701d0fc7a0a486a0b3c05188d07d1f7c51c4c514c48a55d987d8d9d2af574f427e550c8654 SHA512 74ac56a0f74a69006c87e2c22e147b65d26582d29753de03d56e4ad76413f4477a031d47f5eb074323b4ffd000b0908a1fb2b12fb7d91e9b3ee67e983e09e968
 EBUILD cyberjack-3.99.5_p11.ebuild 1800 BLAKE2B f19269d69cfcb7e080213d5b06e11b9f39c839b76f0bb5dc35aa4f2411fc7af4a9f5d7e38b4a93c4aee8519cf4a4177424fa54724f7d777315ce4205f5ea7e29 SHA512 801ed1eb4d1e075ea51ff068bb9ba817eeb9bb5e0dbae0b41121b562439d9ba9b096cde776c8bffcf441a26a6e246e97b48d9499c280586870cd60b1d7139bfe
 EBUILD cyberjack-3.99.5_p12.ebuild 1911 BLAKE2B 0c1088a95e833594dd288ed9f4304cf0114a906006decfa6f672d9236cdc0b809c2d7a63f6f08a384e968fb2a46d955b4834e7a6e6800ce25f6fbfe5e5786d25 SHA512 26685c406eeba3219780172c5ed699942ac99bdd17b9e018e36785b253f26aa67e3d37320e3293dbeea5da88ab5ea8ff7060460ab5b2b319adf2f932cf26c77e
-EBUILD cyberjack-3.99.5_p13.ebuild 1911 BLAKE2B 887a3098ddec770ca75ce1f8ee4f7dee8d26737cbac5a7d238eeb0658639344e81490d99c4d5647d20d601c75e97e9769275e4952391466d32cbd03280f449d9 SHA512 fe00c842aaea7b9036f5f443321a0a7fc0540d40292406a5a728c6d2eeeaf9aa284b25f5bce0391308ba2bffa2f40627cf371198d136f98947911893db01d225
+EBUILD cyberjack-3.99.5_p13.ebuild 1909 BLAKE2B 89a8930abaf196be95b6657497a5756469ffb0d1021aea7fb383aa4cbe0a44bdf4f19eb89e91908f79afcefd42d48c9c66d89ddc645270c610c2d7fce4fcd945 SHA512 e639adafff9fbc49deafaba8c35886bc3efb260a37dfdcd18200b70a6fb43cfa8781609e5ab87fbeb844c9bf10908d5a880468130c6522e592062bda29040862
 MISC metadata.xml 741 BLAKE2B 1660cf6afa7c5988573bb7a651560b0ce38832ad7149784aabd2589407c3d6fff7a9a76a0ee3bef81c1e3efaa46c8733e7e8de724d07bff7766280ebb8dcc4be SHA512 442fce5186e7a04e0d96b2d179db3438a4d7b8f0b5b11443d494d8b0203881c63dd4e4238eae594ad5c15b7eab683c7d35d50d24e147ce896128784ffe7442bf
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild
index 5ee1c4a0d768..edde80805904 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
 HOMEPAGE="https://www.reiner-sct.de/"
 SRC_URI="https://support.reiner-sct.de/downloads/LINUX/V${PV/_p/_SP}/${MY_P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE="static-libs threads tools +udev +usb xml"
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index e98dbd483b67..05d14f0d0008 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -35,5 +35,5 @@ EBUILD cyrus-sasl-2.1.26-r12.ebuild 8431 BLAKE2B 0b769d0f97c9607da49eb82b5720351
 EBUILD cyrus-sasl-2.1.26-r13.ebuild 8465 BLAKE2B 48ad450be4078bea4077b8e22d664eab654136b264af31cd08037d78846d4989d3ca16d31123cbd266af0e62f29b0b5017a26dad4673fe56dac61a6e5519edd0 SHA512 80635f22cebf55ab59ae7575d3ea3e6eeeffaee25ad452577ef5af16c04eb9c5dbf300cd824814c09dfe701415b19343951dea40b8cbe957de848693c2d609b9
 EBUILD cyrus-sasl-2.1.26-r9.ebuild 7662 BLAKE2B 8a7b96ca43d133164a9818727486f2d15bd6f66d66e083dee2ac0a8d83c921a86e3e1f34dfa04689c81b5227cf80f06d1fea3c1da74b48c828e4a31f51b67c9e SHA512 6515a66682bc8c0d18b13a3cc540d00f07d26374a6bbefdcb6c974b3184164cfcce80e965b29bc10e81345e2abb8c04eb7edb21adf4097af741d5df1557ae04d
 EBUILD cyrus-sasl-2.1.27-r1.ebuild 8080 BLAKE2B e5ec4df72f32f8e29cb06fe0ab9015dfdc906721065ea09d1a625b04687a02cdcdf93df8aa1661849d8341c3a9432d49fbf052f3f9adbaf8d59e1e0827503cec SHA512 345fe84f61ff18b8fb6917d264db8db552d029937d9de242cfc6df0c36e2728d02bac6a7c7a1975b64ffdf1e0922da27339304b9fa5984689382b2650c94ac0a
-EBUILD cyrus-sasl-2.1.27-r2.ebuild 8150 BLAKE2B 9923a5f9fe1f8b84f753bd4372155fd7a6355900a02ca6712ab67a72591d9e37648c86e74e75b1887c48bafef083d952dd5a78df3395595b156f6e84422202bb SHA512 947efa55ea12172afb8d11ba45cba0872a8d6ccd41774630b6dfce6f9a4d5eff59f8690ab95088c655ce7c0d5611fac9548115d088e236d59e3d75841df489a4
+EBUILD cyrus-sasl-2.1.27-r2.ebuild 8143 BLAKE2B 930e5a3e6c84b59151f4913b1f37497ac98dd9617e95282efc60f268f5e9ef45b62c4b16084a376e36560976ef27ab8fba9dd7f6ad97b9691d164df7226ab7f6 SHA512 7d98464a8e275e2bcc5a7b136e64897b09ad245699bd967d1b890cbbbe6f1839a441427d37380cdec552c8bef9615adeaefb9b058675b455a6ad41140b86da46
 MISC metadata.xml 630 BLAKE2B b24d644395a824cc17a25bef92679a2dd50656722223ded02b3311cd9b386470f4f2dafe8c8d604fd042a096d8f0f2d532e2bbc261e3c0affe4dc8d7a1db816c SHA512 45178682e8cfab5eda20e3244f42ce37be7f0e16c87405d0a1e198f561a73f8105df384055f6f228864030f4a196dcdd6b2eaf51b65b7e49f84827df9b56fba4
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
index 26a629baa177..53d51e6525ae 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
 
 CDEPEND="
diff --git a/dev-libs/darts/Manifest b/dev-libs/darts/Manifest
index 48c354235119..066eb96662ea 100644
--- a/dev-libs/darts/Manifest
+++ b/dev-libs/darts/Manifest
@@ -1,3 +1,3 @@
 DIST darts-0.32.tar.gz 234001 BLAKE2B e40f16e6ead25809d981c98924867903e1d0f3734682b61ad1be40a10a4212795dfdef55a0eb6f9d0f60ef7676ed27929a6812bf8f57972dcf00875e99d9917b SHA512 b9af8ce60688f5858dac2cac35a8666848dba6729f9f4364786123a1c0484e56c8b981ec04e59653afbcf20cce3b326a49243095213efb525b5669472ac7358e
 EBUILD darts-0.32.ebuild 716 BLAKE2B e422d2b73ae39488d2fc3fbb81987337712b2206ff8d11fc4f704de8c8483b334f8160f23247f0e867f5939a4742c6945136b6023959fa9f77805f62dd9f853f SHA512 14cb09b610018d813bda854aa26e90cae94700180f91af0bc966e6bca6b9f5c7ceebff9550c72ad5cbe1b9a51f5855771fb275699005d5fa6214f43ba90cc708
-MISC metadata.xml 336 BLAKE2B 470c2bb132fcaa9cc43ea062d98e055f2a5c4489f8552923baf23550f62331073f5f0df7e474502c7a4d77cf58f72ff4a17fb5814e5304c4182c573b828f5ffa SHA512 a9123f4e8d27bc921cf8164d42c485d05f1d3f447d8de7d5d719bf5862472d3d866eb334c6319473b9abc06e0dba96676a7b70431da4c1eda26ee6c8e8626446
+MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/dev-libs/darts/metadata.xml b/dev-libs/darts/metadata.xml
index c1d3ea90071b..c921b96adf6c 100644
--- a/dev-libs/darts/metadata.xml
+++ b/dev-libs/darts/metadata.xml
@@ -5,8 +5,4 @@
 	<email>cjk@gentoo.org</email>
 	<name>Cjk</name>
 </maintainer>
-<maintainer type="project">
-	<email>cpp@gentoo.org</email>
-	<name>Gentoo C++ Project</name>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index 269648b6a6e0..14ce91c55953 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -5,5 +5,5 @@ DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc
 EBUILD ding-libs-0.4.0.ebuild 492 BLAKE2B 56a1412b2906d75ba6623c7e3f57aff2829a95c4fbdf8b21f3127754b5950deeaafaad6e918e6f97a26e44ea5127b7cbce2e58b4a2d16faca17a85bc9791eace SHA512 169e8d203a8aac008017dd1d61e7c160d75b97f90f4874ab6e6321c61a6c58b7bf04817520b081d33598290dde2069cad8e4e60c785bebde332a611783fb252f
 EBUILD ding-libs-0.5.0.ebuild 548 BLAKE2B b85dc9940e7d1249f3d729f8b2aca392ebccc4a8af068712fb68c31f7996dd1704eac4cc9247bc447715b9f8aacc5a0dc32d7bd37ffab00f5bc8a811fedf454e SHA512 ece4b10606274a789cb9a6877b7cad4fc87d7a011c48b7d0791fbd4a1a9b8859acb800c0c1b95cda542edf1abf63c364dab01ff6c149ca0fba742eb70138705e
 EBUILD ding-libs-0.6.0.ebuild 598 BLAKE2B f0212d264f319d4ac2c3204e8e187b0f00b35359a69987814eb1a2242e5ab4234aef0f16efb244c262f0bfe2e745d32ba3c9961cc8f01cc0c81573f59d39a515 SHA512 5e13b98a2defd0fcbb2c0e6ca17b06981ddaaf0ee09b83095f6c63edcf4f9f4eda0d1049f03705c9c677935d601f25e66acf36e3b3e7bdadf9b034a86c3b84d7
-EBUILD ding-libs-0.6.1.ebuild 603 BLAKE2B 36c5ec0674329382387be092b92278aec1e5f6f4b689553230c884c6f32a25dd8b64bc64fe503dcb9896041c98b2529b9ce6a85aec5d4c964bd383568ce6418c SHA512 103944fc4f531c596976def499a8c4af2494aff85ba4086b22e85e1d98c089f5226b6b67940a12d6d50a9a40477d22f27128112521b742450723281328587303
+EBUILD ding-libs-0.6.1.ebuild 597 BLAKE2B 77c0cc82eb2b042968c4a8088432bd3f1990f5365b1eddaab067538046b7be0faaa8c4787ba4150e46a888178088e9e5e862ac34a678c8c1f6f2e8c1982e9152 SHA512 21659592ccaaa94c8c6b4206cade55a644998da29b913e0bf8f3bd5c56025b696d331558e4c4c0b75785953f74f07e4ca17e3953de2a51b93ae40f9d8f870313
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
index b29bfb4ea957..f4e891709dbf 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="test static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/distorm64/Manifest b/dev-libs/distorm64/Manifest
index ced9f302a84b..b2f3c9643612 100644
--- a/dev-libs/distorm64/Manifest
+++ b/dev-libs/distorm64/Manifest
@@ -1,5 +1,5 @@
 DIST distorm-3.3.8.tar.gz 219869 BLAKE2B 91be3a56f1ffcff96ab345c8dd42a4f17b22f40299c5c16b77b3074ba2e071d747aa2e91adeea3cb78e3787cc42d5ad4544b89c3ed5b7940d9156168acc8da62 SHA512 bf65fe500089b4aa38d6430eb985f1dc3494b43c829379c56f91b5b4b25d19504fa3781a2fb2b03946f541962f6e564e46d6ec464c469ee21ecb773303b8494e
 DIST distorm-3.4.1.tar.gz 220042 BLAKE2B a845fb3b5a3c98c1b25601896785273668b48c8477dd29c5db4c4ddcf3cdfe73095e3c4c883ca0909820430989a412d9b47c87471450eba2a4d969a9a03d32c1 SHA512 0e9f8b62bc190ef7d516f1902b6003adef9c7d5d4a5f985fb0bdfc5d4838b2805e2b8836b02d5eccdb3401e814417de615dec675aed9e606c93122ca8a0d2083
-EBUILD distorm64-3.3.8.ebuild 550 BLAKE2B f71c0b181fbe93a299fd54fc1452e18da3b34b5e2cc157f520fcb6e14dd33c0917787606e481b592ddf2a09b8f418fee165223903577edc5b3e0c3f7f3d0a427 SHA512 d3ecc5fd272ff2cad173e58b5fd92c6967df5a6c12b0de33219714da28b001ed447249c183002dc69cd65d1cccae042bf4e5e6f10fa5933fcc6d8c4bea5d3b2f
-EBUILD distorm64-3.4.1.ebuild 513 BLAKE2B c440e7e48e82941ae968080eaabdc4a7d6d1d62ad89e5b011b56e1e92396eca0d5692295aa1bdf5e0d89f0d82ace9ade89a2c2a1ed78ecc432f15c4f563c9218 SHA512 c931b5a2aec707bebb7310177d5bc012cae136bff46fbd7b45f11771b91cb39729d639807e200c1878dc89a622789dbaf6840f49b6f11bda45449129029f419a
+EBUILD distorm64-3.3.8.ebuild 548 BLAKE2B 071920883d027d9916cdff0389492b2f11920ef0040930ee9ef15d4de286b8bafadd8385e9a52165ce06baa13bb4bdf0008baebe35603d8d89f194583cf3ffef SHA512 2331947ad506986ea47740ed19fdb079fe67bf9c7e9aaf8c978920d82eda8c68bd082c0b98a77775054076e0cfb820a0409f8e3b4878ba79f28cc0a4450eae13
+EBUILD distorm64-3.4.1.ebuild 511 BLAKE2B 78d69d4c5a2ca795cfa16816e32639dbc101cee5791be4056cfc8b3f6bb87f39dd7e185bdb02b3ca6c76dd559ed081182bb1a7dc9b3b0e40bbdd529a30d530ed SHA512 c62d3efe2adfec5da4c7c49a2ce5e7adbf46e632ec6899151386f759555468f78965fae19b07d1c8c908d83ba36793ade075a7aa08133b53c5b1adea2a315628
 MISC metadata.xml 541 BLAKE2B 6c2f81faf6c95690ba0ca52f27f9a8dceae7eb3e85690f9f9cb3825ddb9da76e0beddb21c45f7a914f13197857cb4d2701204fbd194a032e102f3703b3bcabae SHA512 264cfb7a150b89d0c84d275466c5dce39631a939523990b728c9c3bd6db7854f0a23ec3403b92c3a8c1fff6c8b436eeb6e1503706008aadde11b7c51834b0b57
diff --git a/dev-libs/distorm64/distorm64-3.3.8.ebuild b/dev-libs/distorm64/distorm64-3.3.8.ebuild
index 0da2a51b4f1f..26cda2dbaba9 100644
--- a/dev-libs/distorm64/distorm64-3.3.8.ebuild
+++ b/dev-libs/distorm64/distorm64-3.3.8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # does not work with python3_4 as-is
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-libs/distorm64/distorm64-3.4.1.ebuild b/dev-libs/distorm64/distorm64-3.4.1.ebuild
index 7b6289f97eac..7642f63664f1 100644
--- a/dev-libs/distorm64/distorm64-3.4.1.ebuild
+++ b/dev-libs/distorm64/distorm64-3.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index c90b6b91f33f..59b6ee6f8791 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,3 +1,6 @@
+AUX 0001-CMake-install-to-correct-lib-dir.patch 1957 BLAKE2B a8139d2c7474b96526ba983a3d66ae406c5239f04585b0c9156b9f85ce456924ebf6cc0fe052c48670229fbe86523ba40a7d0d37cfd2badc54d0b6cb4b99e8b9 SHA512 1145dffdba811bc09dd76c0f39fc6bae275a1c94ca4700bfa0487db85f48e3a899c0010af39549990d2610bac3d5f0fd6b0faeb000b6c8cd22e2bc6f2c0f8069
 DIST double-conversion-3.0.3.tar.gz 7019705 BLAKE2B 65d7729b55dbb9fd0cf31b258738f3e9f3350b4ecf0204d3d2d23de24cb24651788e844aa1a10d6ec452ca6484c43ed1d218d434fc18be7bb1f15bf8ba97102a SHA512 3a8e956da485195753508c90cd6fa3d9fde42103291a8e65a0d95488faa02e98dddff21935625519c0ce49d8911d66d0773ddf6012264094f3edd851b461f62b
+DIST double-conversion-3.1.4.tar.gz 7022872 BLAKE2B 270f318e6b37205ab3da3ccf5c598ca7a02dc2e728a5d8e3467523bc8f21039651bea3f70aeb9f8579505812d63181de9d1e8106997795a79efeb663e1bc22d7 SHA512 715a34ace2ff74b79d80a8c003c16cfbf958ebc92264e28cc572e1a12a786e1df9678abb46f032c2be387495e1a3d02957b12fa4a245ec6cfe19ca637519ac3c
 EBUILD double-conversion-3.0.3.ebuild 1345 BLAKE2B 054cea2fe264a7f76cd26b48a72718eb806c22a89e47b697b8163618c62dd4c6c112c9030aef9bf42487c63c004413ca86faef3cc99b00132077de4755dc694a SHA512 5f525223d86923f672e0652effd7b30dfcbffa4b507ab4c5151d00b3b427e45619f50eaa4f80ef4750f02041440f47360636436ce4ba19cff6fa2f0b1e19a1e4
-MISC metadata.xml 606 BLAKE2B 6c92fbf6c8247fdaa5f1cdf29f58b91b8374d8b8b4785a408145584030dfd06ba939999626575ea97bd7fcd65c2774f4e0bee6844a00e0f1c28d89f8e117d79f SHA512 0d6b6503f8ac11ede082ac8a1ec267620d5e6cbdb151ebd20cd775e9b832e396c434e6ef6e843d13ceedb9cea7dae002e93564d823161f4ff845053699c3312a
+EBUILD double-conversion-3.1.4-r1.ebuild 1406 BLAKE2B ee2c19ab3f09979f74a8d0ca893f20c6fb6af182903cde3b83dc1cf395bfde2c715d4a62d03d84c04226ccb1f28bb4cf6a5688c02fed5e10873518fd02725df5 SHA512 7df8b0d1ee62142b4c9f74b0187514d7fb1f79efd5cffec13273675576a2f9ab6a89ab2fd54d7dde173159d5adba6f6beb30896088960fb25bc6af221803aee2
+MISC metadata.xml 681 BLAKE2B add558ddf626cde6768c25b9a6c3f004ca0e588e99f247d7c1000ca9e7f572429a2d321af2c39b82b61ad1cf66b87f108a241100f6ef28cf85f8daf172e05489 SHA512 e7eee783d9ed17369d7dabdb78eb1bed547c6d75a527b418fc42815ab161688740633d062d59f6b7b30ca26872b40163a8188eefbb4f2eb19299a8809bd49524
diff --git a/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild b/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..12f039be2356
--- /dev/null
+++ b/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils multibuild
+
+DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
+HOMEPAGE="https://github.com/google/double-conversion"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+
+PATCHES=(
+	"${FILESDIR}/0001-CMake-install-to-correct-lib-dir.patch"
+)
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
+		if [[ ${MULTIBUILD_VARIANT} = shared ]]; then
+			mycmakeargs+=( -DBUILD_SHARED_LIBS=ON )
+		fi
+		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+			mycmakeargs+=( -DBUILD_SHARED_LIBS=OFF )
+		fi
+
+		cmake-utils_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_test
+}
+
+src_install() {
+	myinstall() {
+		[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_install
+		[[ ${MULTIBUILD_VARIANT} = static-libs ]] && \
+			dolib.a ${BUILD_DIR}/libdouble-conversion.a
+	}
+
+	multibuild_foreach_variant myinstall
+}
diff --git a/dev-libs/double-conversion/files/0001-CMake-install-to-correct-lib-dir.patch b/dev-libs/double-conversion/files/0001-CMake-install-to-correct-lib-dir.patch
new file mode 100644
index 000000000000..3dbbfafec111
--- /dev/null
+++ b/dev-libs/double-conversion/files/0001-CMake-install-to-correct-lib-dir.patch
@@ -0,0 +1,63 @@
+From 0d65c903c600d983eabfa5be793fa60c346d8303 Mon Sep 17 00:00:00 2001
+From: Jason Zaman <jason@perfinion.com>
+Date: Sun, 14 Apr 2019 16:38:10 +0800
+Subject: [PATCH] CMake: install to correct lib dir
+
+64-bit libraries should be installed in /usr/lib64, not in /usr/lib/
+Make the destination lib dir configurable.
+
+Commit e13e72e17692f5dc0036460d734c637b563f3ac7 removed
+include(GNUInstallDirs) and ${CMAKE_INSTALL_LIBDIR} which broke
+installing on 64-bit systems.
+
+Signed-off-by: Jason Zaman <jason@perfinion.com>
+---
+ CMakeLists.txt | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9f4be8..2a06c71 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,12 +40,13 @@ endif()
+ ####
+ # Installation (https://github.com/forexample/package-example)
+ 
++include(GNUInstallDirs)
++
+ # Layout. This works for all platforms:
+ #   * <prefix>/lib/cmake/<PROJECT-NAME>
+ #   * <prefix>/lib/
+ #   * <prefix>/include/
+-set(config_install_dir "lib/cmake/${PROJECT_NAME}")
+-set(include_install_dir "include")
++set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+ 
+ set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
+ 
+@@ -81,17 +82,17 @@ configure_package_config_file(
+ install(
+     TARGETS double-conversion
+     EXPORT "${targets_export_name}"
+-    LIBRARY DESTINATION "lib"
+-    ARCHIVE DESTINATION "lib"
+-    RUNTIME DESTINATION "bin"
+-    INCLUDES DESTINATION "${include_install_dir}"
++    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++    INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ 
+ # Headers:
+ #   * double-conversion/*.h -> <prefix>/include/double-conversion/*.h
+ install(
+     FILES ${headers}
+-    DESTINATION "${include_install_dir}/double-conversion"
++    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/double-conversion"
+ )
+ 
+ # Config
+-- 
+2.21.0
+
diff --git a/dev-libs/double-conversion/metadata.xml b/dev-libs/double-conversion/metadata.xml
index 2ffe8a46d242..e9ea0aac45f6 100644
--- a/dev-libs/double-conversion/metadata.xml
+++ b/dev-libs/double-conversion/metadata.xml
@@ -5,6 +5,9 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+	</maintainer>
 	<longdescription lang="en">
 		This library consists of efficient conversion routines that have
 		been extracted from the V8 JavaScript engine. The code has been
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 853fdfce0729..34c91b397e46 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,6 +1,8 @@
 AUX efl-1.21.1-fix_evas_preload_segfault.patch 381 BLAKE2B a4b8afbe06cd44154a41766fcf12775369c2243325eab17647423a3d2b78cc3646361c0a4884de71fd876698defb9816f50343c46690b595c3701a6295a95040 SHA512 90901ab26915a6d2aba80deb610eb8bb873cd4cc7210888a4f062057891024d4e0b3f051be2fda39680d2267301251abbfbfc47072cb5c22ba6eba8f9d9567fc
 DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
 DIST efl-1.21.1.tar.xz 71168368 BLAKE2B 4653e97f7b9a824d8e84dd1463dd6c95c0228bb3a03df1915f604136380343ad52e86e6b485f0aa14f1caef5a36451425b79cf2a5123c83d8e8a6d430ff213bf SHA512 1e26a57fca84ec85e45d707ee57abc50bd18edfa82e478e586300b6ad5ab8b9103a54a656902d29d80425988a6116a40aa01758fb8dd581dd48334ca0f4d5a63
+DIST efl-1.22.1.tar.xz 71314132 BLAKE2B 6222797da4815c7f863ff2a91b167fc78198b349d54948544b2c2bd19269836e48c343e782bf18a6eb3aeb92248a35590117ccb40f6a6f76978283a05ec41184 SHA512 2a961e2d36458e0f1f6a6b66fdd02b040590e130d9098f64e99d2fb29fa19bb292e92ab7ab8224223c186a256b3ffe7716ab218acd891a01fa9e4652c0e99230
 EBUILD efl-1.20.7-r3.ebuild 7708 BLAKE2B d16c5185d86e88f6cf202ddf864c1608dc42f5c5e6c93f2b2100c69d587be3f88274b8dda345beabedd8d1118bfa3833cbbc0cb543c243f95015d820ff8a1c72 SHA512 dc55ff7bf0bb0d35194bb804679284ef2ea6fd290cd54cf3c85b1fbda4f325fbf617374b7bfb33fbd7311927c1f4939601b38c7109ffa92c49db12402edcb218
-EBUILD efl-1.21.1-r3.ebuild 6624 BLAKE2B 7fd08fb919a063aeb05fb8040aa9bc48ea756c57b7c734a0e729f8186ce4b61da0c92985af5ced01f7bf67a5e711cab4143a06161a61ce44e7b270d7c423a556 SHA512 b4adf09b44ff904a553e7ddb6f885d83fa4d7cc09cc2f5427396155e5c2908b50eb7593144376ee715223bf47a2d2bed220ea7c26bd1d2ea9b3ce056654859be
+EBUILD efl-1.21.1-r3.ebuild 6631 BLAKE2B b127f01247ea7ce5b1c925b14b8d2222d3b2f837dea2cf059ad14b554de5cb8d0ff8e146ce2af8ecb6b338960ea38393555cb09304c9bb2ecc8cdb4510189413 SHA512 46c9b081cb79c0b39c026787ada23b50aef90e4ca265915c4d48516154caeccef5a3ecdc667a47ed0fe7ac5aaa978c71ab1b0951a68d3b30e27178f172cdfbf3
+EBUILD efl-1.22.1.ebuild 6879 BLAKE2B f6d0200b055bfe235b08053982243b64e4cdaa5290e91c173e86918a839a69a45385256651b0d013f6c0a854ac9d7dfd6281c9d8a529ba175d54e410081b2f10 SHA512 914afb7338f7c9889a35fc1e72bf4699439496e3c37aac13b83635a8cade901abcb17b45ebd0fd899fd7c725d546d767fc2e0b7db6ac42e2a64bdadd380f4f9c
 MISC metadata.xml 2123 BLAKE2B 73aacd157b7dfc9bef846c985a550179c6fc2d479f578edbaeb11e005249c51bf73b94e8d6988cc1f4e9256f459f646f800389e9d0255b6d7c045763fc0efcfa SHA512 7125edb182fb323470e4604f0829ea635b1eaa966100b767427c5dd43ffeb6a99f9183512b739d18a47d070e3c3d9a7bcc667100d73bed3f642ccf53e3a0d3ad
diff --git a/dev-libs/efl/efl-1.21.1-r3.ebuild b/dev-libs/efl/efl-1.21.1-r3.ebuild
index 4a976814b021..5d68d8ef7d72 100644
--- a/dev-libs/efl/efl-1.21.1-r3.ebuild
+++ b/dev-libs/efl/efl-1.21.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+bmp dds connman debug drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
 
 REQUIRED_USE="
diff --git a/dev-libs/efl/efl-1.22.1.ebuild b/dev-libs/efl/efl-1.22.1.ebuild
new file mode 100644
index 000000000000..dce1d89b8816
--- /dev/null
+++ b/dev-libs/efl/efl-1.22.1.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	?? ( gles2 opengl )
+	fbcon? ( !tslib )
+	gles2? (
+		|| ( wayland X )
+		!sdl
+	)
+	ibus? ( glib )
+	opengl? ( X )
+	pulseaudio? ( sound )
+	sdl? ( opengl )
+	vnc? ( fbcon X )
+	wayland? ( gles2 !opengl )
+	xim? ( X )
+	xpresent? ( X )
+"
+
+RDEPEND="
+	net-misc/curl
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-apps/util-linux
+	virtual/jpeg:0=
+	connman? ( net-misc/connman )
+	drm? (
+		dev-libs/libinput
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+		x11-libs/libxkbcommon
+	)
+	elogind? ( sys-auth/elogind )
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gif? ( media-libs/giflib:= )
+	gles2? ( media-libs/mesa[egl,gles2] )
+	glib? ( dev-libs/glib:2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	harfbuzz? ( media-libs/harfbuzz )
+	hyphen? ( dev-libs/hyphen )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:= )
+	libuv? ( dev-libs/libuv )
+	luajit? ( dev-lang/luajit:= )
+	!luajit? ( dev-lang/lua:* )
+	nls? ( sys-devel/gettext )
+	pdf? ( app-text/poppler:=[cxx] )
+	physics? ( sci-physics/bullet:= )
+	postscript? ( app-text/libspectre )
+	pulseaudio? ( media-sound/pulseaudio )
+	raw? ( media-libs/libraw:= )
+	scim? ( app-i18n/scim )
+	sdl? (
+		media-libs/libsdl2
+		virtual/opengl
+	)
+	sound? ( media-libs/libsndfile )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	system-lz4? ( app-arch/lz4 )
+	systemd? ( sys-apps/systemd:= )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib:= )
+	unwind? ( sys-libs/libunwind )
+	valgrind? ( dev-util/valgrind )
+	vlc? ( media-video/vlc )
+	vnc? ( net-libs/libvncserver )
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[gles2,wayland]
+		x11-libs/libxkbcommon
+	)
+	webp? ( media-libs/libwebp:= )
+	X? (
+		media-libs/freetype
+		x11-libs/libXcursor
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+		gles2? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+		opengl? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+	)
+	xine? ( media-libs/xine-lib )
+	xpm? ( x11-libs/libXpm )
+	xpresent? ( x11-libs/libXpresent )
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Upstream still doesnt offer a configure flag. #611108
+	if ! use unwind ; then
+		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
+		configure || die "Sedding configure file with unwind fix failed."
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--enable-cxx-bindings
+		--enable-image-loader-generic
+		--enable-image-loader-jpeg
+		--enable-image-loader-png
+		--enable-libeeze
+		--enable-libmount
+		--enable-quick-launch
+		--enable-threads
+		--enable-xinput22
+
+		--disable-cancel-ok
+		--disable-cocoa
+		--disable-csharp-beta
+		--disable-csharp-bindings
+		--disable-doc
+		--disable-ecore-buffer
+		--disable-ecore-drm
+		--disable-ecore-wayland
+		--disable-eglfs
+		--disable-g-main-loop
+		--disable-gesture
+		--disable-gstreamer
+		--disable-pixman
+		--disable-tizen
+		--disable-wayland-ivi-shell
+
+		$(use_enable bmp image-loader-bmp)
+		$(use_enable bmp image-loader-wbmp)
+		$(use_enable dds image-loader-dds)
+		$(use_enable drm)
+		$(use_enable drm elput)
+		$(use_enable eet image-loader-eet)
+		$(use_enable elogind)
+		$(use_enable examples always-build-examples)
+		$(use_enable fbcon fb)
+		$(use_enable fontconfig)
+		$(use_enable fribidi)
+		$(use_enable gif image-loader-gif)
+		$(use_enable gles2 egl)
+		$(use_enable gstreamer gstreamer1)
+		$(use_enable harfbuzz)
+		$(use_enable hyphen)
+		$(use_enable ico image-loader-ico)
+		$(use_enable ibus)
+		$(use_enable jpeg2k image-loader-jp2k)
+		$(use_enable libuv)
+		$(use_enable !luajit lua-old)
+		$(use_enable neon)
+		$(use_enable nls)
+		$(use_enable pdf poppler)
+		$(use_enable physics)
+		$(use_enable postscript spectre)
+		$(use_enable ppm image-loader-pmaps)
+		$(use_enable psd image-loader-psd)
+		$(use_enable pulseaudio)
+		$(use_enable raw libraw)
+		$(use_enable scim)
+		$(use_enable sdl)
+		$(use_enable sound audio)
+		$(use_enable static-libs static)
+		$(use_enable svg librsvg)
+		$(use_enable system-lz4 liblz4)
+		$(use_enable systemd)
+		$(use_enable tga image-loader-tga)
+		$(use_enable tiff image-loader-tiff)
+		$(use_enable tslib)
+		$(use_enable v4l v4l2)
+		$(use_enable valgrind)
+		$(use_enable vlc libvlc)
+		$(use_enable vnc vnc-server)
+		$(use_enable wayland)
+		$(use_enable webp image-loader-webp)
+		$(use_enable xcf)
+		$(use_enable xim)
+		$(use_enable xine)
+		$(use_enable xpm image-loader-xpm)
+		$(use_enable xpresent)
+		$(use_enable zeroconf avahi)
+
+		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
+		--with-glib=$(usex glib)
+		--with-js=none
+		--with-net-control=$(usex connman connman none)
+		--with-profile=$(usex debug debug release)
+		--with-x11=$(usex X xlib none)
+
+		$(use_with X x)
+	)
+
+	use drm && use wayland && myconf+=( --enable-gl-drm )
+
+	if use opengl ; then
+		myconf+=( --with-opengl=full )
+	elif use gles2 ; then
+		myconf+=( --with-opengl=es )
+	elif use drm && use wayland ; then
+		myconf+=( --with-opengl=es )
+	else
+		myconf+=( --with-opengl=none )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if host-is-pax && use luajit ; then
+		# We need to build the lua code first so we can pax-mark it. #547076
+		local target='_e_built_sources_target_gogogo_'
+		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
+		emake -C src "${target}"
+		emake -C src bin/elua/elua
+		pax-mark m src/bin/elua/.libs/elua
+	fi
+
+	V=1 emake
+}
+
+src_install() {
+	V=1 emake install DESTDIR="${D}"
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${D}" -name '*.la' -delete || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 6a4915bc226a..76a6f5f82e39 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -6,7 +6,7 @@ DIST elfutils-0.173.tar.bz2 8684782 BLAKE2B c5905bb864059bdfb2699a0681a0ec576b6b
 DIST elfutils-0.175.tar.bz2 8786600 BLAKE2B d6d4ade37741da788c6c2eec9688c6f8ac9707e0b17e0518398972dab3cf77a70cc82346c2e37b41f0ea414b9a1e925a7567567fcf43d504d75c92971ab25f5d SHA512 2c3168a34bbc8f22425faa263fc24ec50df39258a4f9ace4e6cd88e9764c435fee70c1a82db8273dbab70a75e5216a200bebf05af1d3ea77e444e35d71a4ed84
 DIST elfutils-0.176.tar.bz2 8646075 BLAKE2B 7f23d59b7f5d74946fea928a7fada7764c1f96a5eefefc4a3a382090eb7cad07c80419218300d853ccbef8f4e2288eb443ff06b3e64bf4511d9fa7aa84f5b794 SHA512 7f032913be363a43229ded85d495dcf7542b3c85974aaaba0d984228dc9ac1721da3dc388d3fa02325a80940161db7e9ad2c9e4521a424ad8a7d050c0902915b
 EBUILD elfutils-0.170-r1.ebuild 1790 BLAKE2B 2581434109a567bc3c57d6ebaf6b1416377d2fbfcc1cadc51efbefa02caab505dcdfa22e58b33c80ce37637c5abb1559ebdb117999eb5f552095f85da8f0dafc SHA512 22d72fdb2e2c1e8d4e1d47113a8c0d6aeb2e8e7b9f0759d445e32509c7bce9cc6dc8edd38e12ffa556447981fc60c7a04df76fd6d529b79d07d28cb10314f6ce
-EBUILD elfutils-0.173-r1.ebuild 1859 BLAKE2B 56ee16d685c6cf7cdd9e0caa995c6d3df78b7681028d3ac52f792daf54d16283833663342666c313dba744764e668b91b1bb35ecd11df70da876700572c57a99 SHA512 33886b083eb9b5a7126e2fa02ab38851aaa97e742a9139fae11b3a0fa6dc02d4d8f431df1e6022baf3dfa768915828f47df79b37f10bebb6927de16430767a95
+EBUILD elfutils-0.173-r1.ebuild 1913 BLAKE2B 5bce756dc0f8d4534b490f5239ce2acd4687b6edc53243dacf908883893f6ea160991e46d1987a3f3cf8425e76e717114625ba43ab6cee999af2ff13120e704b SHA512 fe9ff7574f33791275607296f7cff8d41cd2b5e9629e2dc5119e56517a107fd25c381e9753d22ca9b41320a47540511f6a77622afd92e611669447de6241012f
 EBUILD elfutils-0.173.ebuild 1813 BLAKE2B e364165c42a078dfeea283efdd0268261a57862dcd98f26f10c363edb54f1c12990148b9ac2d6c1170e719e81c902953f1212d4a43a61d5fb6839205ac836190 SHA512 21afb93206de176856703f5ba64ba990a108160e004f66251a3557b110063414cc4d9b90558ea2be6c38b676fbd15b9cb5f03b49681ac52d723dd7ee6add14a4
 EBUILD elfutils-0.175-r1.ebuild 1954 BLAKE2B b4e6aec7008d866b1f0060908cfcf9b1d6b239162d16108e08a7e7e16f4d735c0db19a5ecac2e697e0f3360dad9e441b2266ac3baac8f6849669ebbd3f8db53e SHA512 d3b4faefebb70143d4f5ba2559910206ef0ae6abe232f57b94affc65d57beb157ca7e682710410ecf4941911bd92a94995f6d454496922797cc03570a4af7a6c
 EBUILD elfutils-0.176.ebuild 1908 BLAKE2B 1472eb100a0844c972eb09a7ddc6d19d0875c2c8e3dae44ed8bc033ce5f7e868c3b990b38b40b92840675e3a215d4e1a28f153847c5f02f633f9b6cbd4a4882a SHA512 44187ea7978b94cf0a540ae4bc1df337357bc2a6a29f13c5ab2933d70ebce256b3c28e1819214a86deb47b59be0b2f1c08c9bc503c964aaa36354b8066801818
diff --git a/dev-libs/elfutils/elfutils-0.173-r1.ebuild b/dev-libs/elfutils/elfutils-0.173-r1.ebuild
index 0b41180c4eba..02689c5904f0 100644
--- a/dev-libs/elfutils/elfutils-0.173-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.173-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.118-PaX-support.patch
 	"${FILESDIR}"/${PN}-0.173-partial-core.patch
+	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index c9bb6457b433..47285dc056d6 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,8 +1,8 @@
-DIST ell-0.17.tar.xz 434024 BLAKE2B 1e6b1917d897eeb4d1308db388accad26077ec1f39b9fdd5fea7c79926d5b3eaa51178d0af9089a2614225f26188fc2c380ec5b1116c321658edac9a4c0573be SHA512 5ca82bf3dbfacb7770fe1132ec3d93d7ebd139f1781157f1def8d810b21c84b212c555c981f7b80152e49e0da0a82b46fbd6322aadc25c56f26c21065a8886ef
 DIST ell-0.18.tar.xz 439368 BLAKE2B 9e65ed73119f322fea7177771d21e46ce9ad7d4060e50d8850451939a66bc82dcc1731ddff56458f4cd60c1b6b82b5023bb96adaf3992d3ec982ed845283c8dd SHA512 cc62d01ffaa11a491d1a3ab2898da001f0a418b968350c2bdba2f381df931e53c4281cc4287937264eee72da263844886816af9baea96d7f65309b3e47e42d31
+DIST ell-0.19.tar.xz 439472 BLAKE2B 9d29f49ce401c686b2e2262310bb00552d703455dbe9190acbb479e8fa2be7a03e732250ed63c9721f6079a46841a7bbb954fd0943edf520893eccb1a4fb9b6f SHA512 f7a22d0c385d45661b7c630d39f31b67321d20635c938ef5ad3ddce7194501652381a6bfc39a1b9a404a59108977216e24e2c32f6f30fc00972a0ebca909fcab
 DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
-EBUILD ell-0.17.ebuild 826 BLAKE2B 82b9b509da0da2788efc4956968184dc14e2949394e6b719da0b243c2139ab301b51c64e6d778ea3ec04f051d59212dc0a39be6e2c99cba112cfde7f48f986b8 SHA512 cc777d37b4a92eef6f75c2d22309ecf69f9bcd9482ca1bef75a1cb6fca209038b2cecc4e3297b405c46ce8434113ed159bacabe1515498ebede4f7fde1a7ca4d
-EBUILD ell-0.18.ebuild 1027 BLAKE2B 308455a53f88d1f6f901c5f00bf8a53719f7c35265937eb08e0f2f4a2364ff518ab8a447f8b38e708455b9fb2363a37b0aed92a429ac8b228a3ae4264d0fbca4 SHA512 fba6a65c1be5b80daab305675c1b8a82b75bed76c53c765a034a443a593c4a84009184517e6f233d98ccc0755d14d8f25699f9e7a835950bc20b9092625e7dd7
-EBUILD ell-0.9.ebuild 817 BLAKE2B 2f2b6e969efeaaff67b5a230c6945fb38cd78a1faf2e9ce4265dd5defc56b51057ea5459503813726326be1068140136a5f0faa376449cd4ef0bf3d501152690 SHA512 8e33d9f84792330409fb0ce95ca53c321f0286e52d9d764645d6b9d27386292684bdfea2ba0369703252585b33fa4841a325ba6ec43952ee09d76b0c8ff718ca
+EBUILD ell-0.18.ebuild 1034 BLAKE2B c2097125e1880957c12dcc23eb8de05c8fc05df26b56a01c1199803bb33ba69539f4269c806cee507180891c6ce337eb9b9fadb83acc8def0ef49e914ac6869c SHA512 de0cc98a2b9d1c47ff7b29711ab2641357d039193aa1a6790e9ec5d0fba885975d10104b3b8545c86b0bdd04ca5a8adf65ac33908490e565d7a06dd0edbc489c
+EBUILD ell-0.19.ebuild 1027 BLAKE2B 308455a53f88d1f6f901c5f00bf8a53719f7c35265937eb08e0f2f4a2364ff518ab8a447f8b38e708455b9fb2363a37b0aed92a429ac8b228a3ae4264d0fbca4 SHA512 fba6a65c1be5b80daab305675c1b8a82b75bed76c53c765a034a443a593c4a84009184517e6f233d98ccc0755d14d8f25699f9e7a835950bc20b9092625e7dd7
+EBUILD ell-0.9.ebuild 823 BLAKE2B e5903b8f005ada47a5307a4b5aa46d6694072d85d5e32d946999109c0d57d170d1bfe1ff6e0d19bea94ed5065dc3bb406da5d3f70e286b4894c93bdc84417aaa SHA512 f627588913e1259ff0b4d0fceb248aee840641150d3b0fe674b31da9fff714ac451e0a8b638c752408f59b1129d219c4827b66721eb6a5aceec3a3f1cdd15d42
 EBUILD ell-9999.ebuild 1027 BLAKE2B 308455a53f88d1f6f901c5f00bf8a53719f7c35265937eb08e0f2f4a2364ff518ab8a447f8b38e708455b9fb2363a37b0aed92a429ac8b228a3ae4264d0fbca4 SHA512 fba6a65c1be5b80daab305675c1b8a82b75bed76c53c765a034a443a593c4a84009184517e6f233d98ccc0755d14d8f25699f9e7a835950bc20b9092625e7dd7
 MISC metadata.xml 343 BLAKE2B 520f23aef2f64a4592c7252ad8a956763fa337b746fa8b968d66cbf94c06e2c2cf435553340ca82720c83b653e7caab95394c3ce20c52cdc53bf7fbd4099e7dd SHA512 0a4654d2652442d1ab324cc2ea849506381d7f250e3c52bceb966a61795a81072d35e9656b9d472725f4ff78a84bd58b3576fcc837b4ec9e93cc5c34c92d6fae
diff --git a/dev-libs/ell/ell-0.18.ebuild b/dev-libs/ell/ell-0.18.ebuild
index 7cc62bc675eb..2eeaed548a92 100644
--- a/dev-libs/ell/ell-0.18.ebuild
+++ b/dev-libs/ell/ell-0.18.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/ell-0.17.ebuild b/dev-libs/ell/ell-0.19.ebuild
index 0211e5991e16..7cc62bc675eb 100644
--- a/dev-libs/ell/ell-0.17.ebuild
+++ b/dev-libs/ell/ell-0.19.ebuild
@@ -7,11 +7,16 @@ inherit flag-o-matic multilib-minimal
 
 DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
 HOMEPAGE="https://01.org/ell"
-SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+fi
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="glib pie"
 
 RDEPEND="
@@ -19,6 +24,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
 multilib_src_configure() {
 	append-cflags "-fsigned-char" #662694
 	local myeconfargs=(
diff --git a/dev-libs/ell/ell-0.9.ebuild b/dev-libs/ell/ell-0.9.ebuild
index 4fab6351b424..4a78a0408c52 100644
--- a/dev-libs/ell/ell-0.9.ebuild
+++ b/dev-libs/ell/ell-0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 x86"
 IUSE="glib pie"
 
 RDEPEND="
diff --git a/dev-libs/fampp2/Manifest b/dev-libs/fampp2/Manifest
index 2cd619f51fd0..54d126e79431 100644
--- a/dev-libs/fampp2/Manifest
+++ b/dev-libs/fampp2/Manifest
@@ -3,4 +3,4 @@ AUX fampp2-7.0.1-fix-gcc6.patch 1514 BLAKE2B b94986a1166089672d1e5d229bee1b3902e
 AUX fampp2-7.0.1-libsigc++-2.6.patch 1041 BLAKE2B 33c0c437602c48008599cf6ea670e2ad6fe1fd7b41d6c16860a7ac559435e5ea8a5c0d583d53afee13f7d0a23a685160877bca45dec1574885bfdf50323c5402 SHA512 6139c238551b4dd8396ed7df23353245b7668a27c109da3f720acc582d6b08d0b6f3227924ea8ca4c101706eae9036aa84f7f5ecd91c41f0f54d700a73a49b55
 DIST fampp2-7.0.1.tar.bz2 288073 BLAKE2B f74659c83af82eeed6c5f711a9273f2d8c7704f04c8407992bee7478d2ef20b6d2ecf37c5d292be35c126474052341c49f8a0d30d056c24e2404b17d0123dfd7 SHA512 317a5cfd383418265cafea0840af8b7c714a04b34265ebfba73230ff2492df8f7884797529916693ab489bdbc94799ca83e015cf0bcfffaea6b28b3a7f9ccbd0
 EBUILD fampp2-7.0.1-r3.ebuild 1234 BLAKE2B 810284de8a066038277b1388e105b707c5a2877d865d1691ea54afcd2cffe3cf7a27c9816ff202d33fd8f60eb995a688e8a76d2f269d86c57c87487898580cce SHA512 51f1696cf3eb0e5efde0bfa586e0f6e99afb2b06ec1beaa4f9d222ffc92655dcea14e1a5e3feaa6a4cd4097d6f764e06a155dac739971ff3debf66b2daefc789
-MISC metadata.xml 324 BLAKE2B af36dbfa1fbe2235c3e7a28d4bb6ce2eb03b7d5a5918e010bc0cf7b171bdd5a160eeed79d2eac315b93628115e3af8d6e85f42355eca162875b2768adfdbd92c SHA512 c87cbdc39f88103e6ebb534a0c65a3ea4ae784a198a5286c7d43d935386588a7900e27894b9f6d552fd199b4c4fc2fa7daad7624145976cc8c82f61ddd327fc0
+MISC metadata.xml 242 BLAKE2B 7f55f6c94b1dbefea3658a413342ac07dc109292cdf862a757b516411a3ebf2acf2ddbe1056e616920c1618a76cc57b3264f8b6efc04c20376aa8ef926c8607e SHA512 fc1dbdb68705088da51bd64d8dca4d40592cadae51b86458cee01252e5393c0c0e5d6143b56621defa23fa720afdb0d412db3314d1f9bb29641ec80a22d700b3
diff --git a/dev-libs/fampp2/metadata.xml b/dev-libs/fampp2/metadata.xml
index 37d3ef415f8a..ff43a116ec95 100644
--- a/dev-libs/fampp2/metadata.xml
+++ b/dev-libs/fampp2/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">fampp</remote-id>
 	</upstream>
diff --git a/dev-libs/ferrisloki/Manifest b/dev-libs/ferrisloki/Manifest
index d1747afd17dd..a7b0c0054069 100644
--- a/dev-libs/ferrisloki/Manifest
+++ b/dev-libs/ferrisloki/Manifest
@@ -1,3 +1,3 @@
 DIST ferrisloki-3.0.13.tar.bz2 350509 BLAKE2B fb53ba610deafd52b2fc0a288e49624480957b9a29f3cb0c82a345323d2f8b7a606bfe85f26a222fabc2cca2f5ecaa1b1d31aafd05e04cb9bde1d853ff5bc114 SHA512 1ccf8118c05babd8e4856dd40d60a1340d5db40b27aa8527343dabfeec74e8cbf99a713a19028f68e6a36369670a69f769b20a80f7aad27d2ccbbda32b393d40
 EBUILD ferrisloki-3.0.13-r2.ebuild 1034 BLAKE2B 59bf80c6741583df6ed8e0ced8639854676a51ef57c93f04fee09409b47a2d3461493b818e15f8fb429c44bacc7abeabed95db78db2c00cfe2b972283793b67b SHA512 2653b98a0c94d206c6457f48595dfbe73c2956e9253643f19fce5bd2a5d482fedc45a632438f8135f15c9744bce58ac25f9924f2d205ef7bd67b21a0d7490769
-MISC metadata.xml 324 BLAKE2B 26651060a67259024686c495627c7e15ce20b9cd7da21fbfe355d2d407172b9e37e1015f1648e238c555fedf741c5d713138f3df6de82082b33b153cd29f27fd SHA512 ab505f6158ad3a071a47609be7833bda33168b023c98f0b8614d3d70aab5b5cdbc148910d3d078f190d5e69cbd998df27a2b94f11364a92cae00468d6d7516c3
+MISC metadata.xml 242 BLAKE2B de0b4a4216bc28681d09da2cad9504416ff967c2eed12b78f4d9dc1a7f9bf53e80a0b486ec5e400097a42619da39f99f948437b47c8c2c4a641ee1f2ed848ffd SHA512 e99ea7f58533a7cfbdfb94a2c25ec6fb6ac46eb40bfab2dd1ea329cf4bb6f3c665eeeab4e9a2b701870c0599bbba76bcd255f322f327ebb8ebeb8ddc4ecbed54
diff --git a/dev-libs/ferrisloki/metadata.xml b/dev-libs/ferrisloki/metadata.xml
index 505d1020ffcc..bf7dc7343030 100644
--- a/dev-libs/ferrisloki/metadata.xml
+++ b/dev-libs/ferrisloki/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">witme</remote-id>
 	</upstream>
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 4a88ecc2c987..a1a0761c9626 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,5 +1,4 @@
 AUX 0.11.4-vala-0.42-compat.patch 1073 BLAKE2B 06381277531ded9adda4dc6246176de7f1d6243d05746b667071d76f9e7246d63b8a56aa51b364c02e8ef5c3aa924109d4e9c01a9b311868f66287b769443e45 SHA512 f925fe81d6422fd73aa1b0b624d8bbc7a18f029ed8e806a418c752d32a084d6c2d8b8d205e8a5d65a5a6e6f212c00165b70377f7c6e6caf1d84d7bcd31a7f0fc
 DIST folks-0.11.4.tar.xz 1972272 BLAKE2B 69fa21f9baf34a3597f8a7e3f789ab3d03ad508ec74e0e1dfaa8df09865cb99748483b4fa4aa9c219803c512a49a23e95d4c3ded5b285b0a0d2f7416a1d9bf7f SHA512 bd4088322c34b5d6e633d7d5d83dfb61eb3499014adf6fecad27231ec63509401b2867186d019a2f7c92cc3b3f2e6cfbc80e0d4700d84ce7a08d8153af3d2392
-EBUILD folks-0.11.4-r1.ebuild 2480 BLAKE2B 8f775b05f7cd02a8d8470969052f3b685fdf6a349de6c81414e963e8f4c365f211ddf68fc655e77ae063591afa5acd13cbaa3bb3fae9e4483ab72cfdacc93809 SHA512 814df8c8b00c5b724e9763c8369c2df52486fc5b751895d4e5e2a9651a357e30ab0b3b7ace666700166b104586f2e8cbf7e87b1338db5581c04c834979a059c7
-EBUILD folks-0.11.4.ebuild 2315 BLAKE2B 62bf6fdc24e0b1702084e9a9b559f281a93b4b36e619b877b6f2d42149e1e83514a72339ba1a0f2b8ba858fdd95c0df1a55e89068a60e6a4665be47cbea59de1 SHA512 d8038166bd0970f3fe22df78479906c3d332da58d695e1b1238bf6f964cc939e3f03c6a40e09483f40aa4a7fbbd80e91614e70318f4b37a5e8de486f55184be1
+EBUILD folks-0.11.4-r1.ebuild 2478 BLAKE2B 1374b653afb4d043e01eeba556839b32914bd7cd3fba274b431f0ff53d3843a9e7c097cc12df6a12f824122de95a1a151f3e50decb92dc34c490af50428089ed SHA512 cdc7da518c16b6be0110802d3974b9128c86b33acf8aafac1dae7b4680eaa17271948d28867e950084bdbca1eb54f76e41f6830f9906e7e8a0e1d6c99116295c
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/folks-0.11.4-r1.ebuild b/dev-libs/folks/folks-0.11.4-r1.ebuild
index 9b5eebac778a..e3dd9684ea10 100644
--- a/dev-libs/folks/folks-0.11.4-r1.ebuild
+++ b/dev-libs/folks/folks-0.11.4-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 
 # TODO: --enable-profiling
 # Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
diff --git a/dev-libs/folks/folks-0.11.4.ebuild b/dev-libs/folks/folks-0.11.4.ebuild
deleted file mode 100644
index ce7878547564..000000000000
--- a/dev-libs/folks/folks-0.11.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-VALA_MAX_API_VERSION="0.40"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-
-# TODO: --enable-profiling
-# Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
-IUSE="bluetooth debug eds +telepathy test tracker utils"
-REQUIRED_USE="bluetooth? ( eds )"
-
-COMMON_DEPEND="
-	$(vala_depend)
-	>=dev-libs/glib-2.40:2
-	dev-libs/dbus-glib
-	>=dev-libs/gobject-introspection-1.30:=
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	dev-libs/libxml2
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-
-	bluetooth? ( >=net-wireless/bluez-5 )
-	eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] )
-	telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] )
-	tracker? ( >=app-misc/tracker-1:0/100 )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${COMMON_DEPEND}
-	net-im/telepathy-mission-control
-"
-# folks socialweb backend requires that libsocialweb be built with USE=vala,
-# even when building folks with --disable-vala.
-#
-# FIXME:
-# test? ( bluetooth? ( dbusmock is missing in the tree ) )
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.0
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	test? (
-		sys-apps/dbus
-		bluetooth? (
-			>=gnome-extra/evolution-data-server-3.9.1
-			>=dev-libs/glib-2.40:2 ) )
-"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Rebuilding docs needs valadoc, which has no release
-	gnome2_src_configure \
-		$(use_enable bluetooth bluez-backend) \
-		$(use_enable debug) \
-		$(use_enable eds eds-backend) \
-		$(use_enable eds ofono-backend) \
-		$(use_enable telepathy telepathy-backend) \
-		$(use_enable tracker tracker-backend) \
-		$(use_enable utils inspect-tool) \
-		$(use_enable test modular-tests) \
-		--enable-vala \
-		--enable-import-tool \
-		--disable-docs \
-		--disable-fatal-warnings \
-		--disable-libsocialweb-backend
-}
-
-src_test() {
-	dbus-launch virtx emake check
-}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 742f365f5c17..8ce5ffcb9f25 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,10 +1,5 @@
-AUX 2.56.2-network-monitor-race-test-iterations.patch 1128 BLAKE2B c34bbf557917c3ab21ffb083cd1bb161dac888215a6ccbc121886e7b6798ac3227954952af42236b5ea80913702cefad5af29d1e28752b14f18a0e8d66157709 SHA512 b2650628b90545fbc16cc21bef81ad6e36ad30e69df13129553191bb6ef86cd9d37286f018aed2d2c01342465b7f43c9f3afe0911cebacb18c9b782da6e27dff
-AUX glib-2.54.3-external-gdbus-codegen.patch 3233 BLAKE2B 6b96851b7485164ef6c94da1847152a87064eb5c9f9b0ae6996eca84e89c7807bea5cb7c58b8d42dee07eee96647d2439b8c62af023b37849d4465e0c013eca6 SHA512 70d942086f6181532b5f95c5a3e0d8bfc7d204ca2d4ee68850af82062b572cc146ac4a5516547011ef39386e10bc291deea32a19fe518e649f4f8ac60271b69c
 AUX glib-2.58.2-external-gdbus-codegen.patch 5452 BLAKE2B caf66af10958c1e6672a615965ec45f76d4fe9f58599f3d09ecee543e1b5e47a49014f7ef7a6f4e0030370935c4f82ab11b3a81ca42fc09153f02e355400dd55 SHA512 d36ac5d4fa810524795d099c218604b0db22dbc7fe9ba57821fdad292725d9c159b24cc224d1bd68824dc24ddb1f1e7c6878dbc36a3b0a8188f9e01a4b6c5ea0
-AUX glib-2.58.2-gvariant-test-fix.patch 3423 BLAKE2B b0dd08cf1629da3c8e42e43e4f9b64be07116c836d1c218368ab1dd312d06313845c70f21b54db95b068816171b268d35192a3521c5856e410ba5b99f1d0943e SHA512 af8fd3cd431d1bc3aef4447ce26911b107a57903f66cc5e1825c3a26386084838500f2f6f250552f96d93bea18b5412ad338e84f2ff3783573161a2d0a336337
-DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0
 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD glib-2.56.4.ebuild 9947 BLAKE2B 50af8725895ea42d6999c4de74a08f4cd65cd96d9320aa31eed39e2fcd474ee6ae58a5846df34abf6703bd7111ba0eefbe4293e860bc2386433a680e90846a2c SHA512 650dc7e115ed3f7e857e4bc180849c2ddf05a206a8090bcad21988e83fcfbc387ea25d3ae7f7bcaa051c22e12bd2ed2a33057ac586beefda55b13239f2613179
-EBUILD glib-2.58.3.ebuild 10677 BLAKE2B 9808d6754c29a9fdca2d5b37765cbb71b9fa95630311978eef5047b43faf70404ce193dd12748fda650a52366d788de100a9d60b320e3eb4df3a601acb532c74 SHA512 90791045f385aa4d794d869d44f64c0d27d7b71f3055ae1d3b1312b01cf52ee8ecb83da46bfc7b47ec1a5ba221e5cb18152bcd15abda4fe2dae50d1e7ae7f4ce
+EBUILD glib-2.58.3.ebuild 10674 BLAKE2B 84f2d6b7512a86826b32d0feeb00dafae07b3c3e1decaf27bd964e07602502efb88fbc6bc6072e0d2da160d6a6dee3c0827f028bd325fe25a03462049f2c2a69 SHA512 6fbe02233660577875a8649e47bae242c472ec918d9b4c5740ab6f7ac8794805ccdc3d55287609bf12a429ce025daa631cb36ffefb692b66294508c3e4a866e6
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch b/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch
deleted file mode 100644
index 1ddec6db9467..000000000000
--- a/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a90c578952219e740f24d9f2560f54f19ae7e906 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <withnall@endlessm.com>
-Date: Wed, 11 Apr 2018 15:45:10 +0100
-Subject: [PATCH] tests: Lower number of iterations in network-monitor-race
-
-While 333 runs is very likely to reproduce the bug, Milan has previously
-reproduced it with as few as 9 runs. Since this test will be run by the
-CI machinery quite often, a lower number of runs each CI run will still
-probably catch any regressions over time.
-
-This reduces the total test runtime from 33s to 2s.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=793727
-
-Signed-off-by: Philip Withnall <withnall@endlessm.com>
-Reviewed-by: nobody
----
- gio/tests/network-monitor-race.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gio/tests/network-monitor-race.c b/gio/tests/network-monitor-race.c
-index 4b92c87a5..cadd62cee 100644
---- a/gio/tests/network-monitor-race.c
-+++ b/gio/tests/network-monitor-race.c
-@@ -18,7 +18,7 @@
- #include <glib/glib.h>
- #include <gio/gio.h>
- 
--#define MAX_RUNS 333
-+#define MAX_RUNS 20
- 
- static gboolean
- quit_loop (gpointer user_data)
--- 
-2.17.0
-
diff --git a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch
deleted file mode 100644
index a27966e0391d..000000000000
--- a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 2e47d49bc91d83cd0abea4c1944bfca4336040fa Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhan@gentoo.org>
-Date: Fri, 23 Feb 2018 15:27:33 +0330
-Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools
-
----
- configure.ac                                       |  1 -
- docs/reference/gio/Makefile.am                     |  1 -
- gio/Makefile.am                                    |  2 +-
- gio/tests/Makefile.am                              |  6 ++----
- gio/tests/gdbus-object-manager-example/Makefile.am |  6 ++----
- 5 files changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0457c90..07166c9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3469,7 +3469,6 @@ gobject/glib-mkenums
- gobject/tests/Makefile
- gthread/Makefile
- gio/Makefile
--gio/gdbus-2.0/codegen/Makefile
- gio/gdbus-2.0/codegen/config.py
- gio/gnetworking.h
- gio/xdgmime/Makefile
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 5741a3e..d38e768 100644
---- a/docs/reference/gio/Makefile.am
-+++ b/docs/reference/gio/Makefile.am
-@@ -177,7 +177,6 @@ man_MANS +=				\
- 	gsettings.1			\
- 	gresource.1			\
- 	gdbus.1				\
--	gdbus-codegen.1			\
- 	gio.1				\
- 	$(NULL)
- 
-diff --git a/gio/Makefile.am b/gio/Makefile.am
-index b2db995..53d7162 100644
---- a/gio/Makefile.am
-+++ b/gio/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/glib.mk
- 
--SUBDIRS = gdbus-2.0/codegen
-+SUBDIRS = 
- 
- if OS_UNIX
- if !OS_COCOA
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index acc1da4..7c51eab 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -460,10 +460,8 @@ gnotification_SOURCES                    = $(gdbus_sessionbus_sources) gnotifica
- 
- BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h
--gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+gdbus-test-codegen-generated.h: test-codegen.xml Makefile
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org.project. \
- 		--generate-c-code gdbus-test-codegen-generated \
- 		--c-generate-object-manager \
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
-index 1d0464c..f390dca 100644
---- a/gio/tests/gdbus-object-manager-example/Makefile.am
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \
- 	gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml	\
- 	$(NULL)
- 
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
--	$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
--		UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--		$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
-+	$(AM_V_GEN) gdbus-codegen \
- 		--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
- 		--c-namespace Example \
- 		--c-generate-object-manager \
--- 
-2.16.1
-
diff --git a/dev-libs/glib/files/glib-2.58.2-gvariant-test-fix.patch b/dev-libs/glib/files/glib-2.58.2-gvariant-test-fix.patch
deleted file mode 100644
index 0bd3a85b018c..000000000000
--- a/dev-libs/glib/files/glib-2.58.2-gvariant-test-fix.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 8a028c250a82b667562efcfdf51d35506383adbb Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Wed, 19 Dec 2018 16:22:21 +0200
-Subject: [PATCH] tests: Allocate gvariant data from the heap to guarantee
- alignment
-
-On glib-2-58 branch we don't have !455, thus we need aligned data
-for the gvariant tests to not fail on i686.
-
-Fixes #1626
----
- glib/tests/gvariant.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/glib/tests/gvariant.c b/glib/tests/gvariant.c
-index 8047ef5e8..5ca7b964e 100644
---- a/glib/tests/gvariant.c
-+++ b/glib/tests/gvariant.c
-@@ -4770,6 +4770,7 @@ test_stack_dict_init (void)
- static void
- test_normal_checking_tuples (void)
- {
-+  gpointer aligned_data;
-   const guint8 data[] = {
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00,
-     'a', '(', 'a', 'o', 'a', 'o', 'a', 'a', 'o', 'a', 'a', 'o', ')'
-@@ -4778,13 +4779,15 @@ test_normal_checking_tuples (void)
-   GVariant *variant = NULL;
-   GVariant *normal_variant = NULL;
- 
--  variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, data, size,
-+  aligned_data = g_memdup (data, size); /* guarantee alignment */
-+  variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, aligned_data, size,
-                                      FALSE, NULL, NULL);
-   g_assert_nonnull (variant);
- 
-   normal_variant = g_variant_get_normal_form (variant);
-   g_assert_nonnull (normal_variant);
- 
-+  g_free (aligned_data);
-   g_variant_unref (normal_variant);
-   g_variant_unref (variant);
- }
-@@ -4896,6 +4899,7 @@ test_recursion_limits_array_in_variant (void)
- static void
- test_normal_checking_array_offsets (void)
- {
-+  gpointer aligned_data;
-   const guint8 data[] = {
-     0x07, 0xe5, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
-     'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'g',
-@@ -4904,13 +4908,15 @@ test_normal_checking_array_offsets (void)
-   GVariant *variant = NULL;
-   GVariant *normal_variant = NULL;
- 
--  variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, data, size,
-+  aligned_data = g_memdup (data, size); /* guarantee alignment */
-+  variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, aligned_data, size,
-                                      FALSE, NULL, NULL);
-   g_assert_nonnull (variant);
- 
-   normal_variant = g_variant_get_normal_form (variant);
-   g_assert_nonnull (normal_variant);
- 
-+  g_free (aligned_data);
-   g_variant_unref (normal_variant);
-   g_variant_unref (variant);
- }
-@@ -4944,6 +4950,7 @@ test_normal_checking_tuple_offsets (void)
- static void
- test_normal_checking_empty_object_path (void)
- {
-+  gpointer aligned_data;
-   const guint8 data[] = {
-     0x20, 0x20, 0x00, 0x00, 0x00, 0x00,
-     '(', 'h', '(', 'a', 'i', 'a', 'b', 'i', 'o', ')', ')',
-@@ -4952,13 +4959,15 @@ test_normal_checking_empty_object_path (void)
-   GVariant *variant = NULL;
-   GVariant *normal_variant = NULL;
- 
--  variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, data, size,
-+  aligned_data = g_memdup (data, size); /* guarantee alignment */
-+  variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, aligned_data, size,
-                                      FALSE, NULL, NULL);
-   g_assert_nonnull (variant);
- 
-   normal_variant = g_variant_get_normal_form (variant);
-   g_assert_nonnull (normal_variant);
- 
-+  g_free (aligned_data);
-   g_variant_unref (normal_variant);
-   g_variant_unref (variant);
- }
--- 
-2.17.0
-
diff --git a/dev-libs/glib/glib-2.56.4.ebuild b/dev-libs/glib/glib-2.56.4.ebuild
deleted file mode 100644
index 9cccbd6aa5be..000000000000
--- a/dev-libs/glib/glib-2.56.4.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-GNOME2_EAUTORECONF=yes
-
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \
-	multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx
-
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
-# adding new dependencies end up making stage3 to grow. Every addition needs
-# then to be think very closely.
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-# Added util-linux multilib dependency to have libmount support (which
-# is always turned on on linux systems, unless explicitly disabled, but
-# this ebuild does not do that anyway) (bug #599586)
-
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	utils? (
-		>=dev-util/gdbus-codegen-${PV}
-		virtual/libelf:0=
-	)
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-libs/libxslt-1.0
-	>=sys-devel/gettext-0.11
-	>=dev-util/gtk-doc-am-1.20
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/gdb
-		>=dev-util/gdbus-codegen-${PV}
-		>=sys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2
-"
-# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate
-# python depending package, which can be buildtime depended in packages that
-# need these tools, without pulling in python at runtime.
-RDEPEND="${RDEPEND}
-	>=dev-util/glib-utils-${PV}"
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
-	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
-
-	if use test; then
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-			ewarn "Some tests will be skipped due to missing terminal program"
-			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/Makefile.am || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
-	fi
-
-	# Less max runs in network monitor race test to avoid hitting timeout limits
-	eapply "${FILESDIR}"/2.56.2-network-monitor-race-test-iterations.patch # included in 2.57.1
-
-	# https://gitlab.gnome.org/GNOME/glib/issues/1626
-	eapply "${FILESDIR}"/${PN}-2.58.2-gvariant-test-fix.patch
-
-	# gdbus-codegen is a separate package
-	eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch
-
-	gnome2_src_prepare
-	epunt_cxx
-}
-
-multilib_src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig and
-	# native builds (cross-compiles won't need pkg-config
-	# in the target ROOT to work here)
-	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
-		if has_version sys-apps/dbus; then
-			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
-			export DBUS1_LIBS="-ldbus-1"
-		fi
-		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
-		export LIBFFI_LIBS="-lffi"
-		export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass
-		export PCRE_LIBS="-lpcre"
-	fi
-
-	# These configure tests don't work when cross-compiling.
-	if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		case ${CHOST} in
-		hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		*)            export glib_cv_stack_grows=no ;;
-		esac
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756474
-		export glib_cv_uscore=no
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756475
-		export ac_cv_func_posix_get{pwuid,grgid}_r=yes
-	fi
-
-	local myconf
-
-	case "${CHOST}" in
-		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
-		*)        myconf="${myconf} --with-threads=posix" ;;
-	esac
-
-	# libelf used only by the gresource bin
-	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable xattr) \
-		$(use_enable fam) \
-		$(use_enable kernel_linux libmount) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable systemtap systemtap) \
-		$(multilib_native_use_enable utils libelf) \
-		--with-python=${EPYTHON} \
-		--disable-compile-warnings \
-		--enable-man \
-		--with-pcre=system \
-		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
-
-	if multilib_is_native_abi; then
-		local d
-		for d in glib gio gobject; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	# Hardened: gdb needs this, bug #338891
-	if host-is-pax ; then
-		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
-			|| die "Hardened adjustment failed"
-	fi
-
-	# Need X for dbus-launch session X11 initialization
-	virtx emake check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit with meson
-	rm "${ED}usr/bin/glib-genmarshal" || die
-	rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}usr/bin/glib-mkenums" || die
-	rm "${ED}usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}usr/bin/gtester-report" || die
-	rm "${ED}usr/share/man/man1/gtester-report.1" || die
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${ED}/usr/$(get_libdir)/charset.alias"
-
-	# Don't install gdb python macros, bug 291328
-	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-
-	# Completely useless with or without USE static-libs, people need to use pkg-config
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"/${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	# force (re)generation of gschemas.compiled
-	GNOME2_ECLASS_GLIB_SCHEMAS="force"
-
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/glib/glib-2.58.3.ebuild b/dev-libs/glib/glib-2.58.3.ebuild
index 7fc1ec87abe9..7418fe069e73 100644
--- a/dev-libs/glib/glib-2.58.3.ebuild
+++ b/dev-libs/glib/glib-2.58.3.ebuild
@@ -21,7 +21,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index e761743278f3..90361a6cdcb8 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.56.1.tar.xz 1397812 BLAKE2B 070597f3bd6e4e58d1ae1964cf6e8d7881daa68aeeddc5e9b64bc410fad6d435f2041171f4dfc2a6b477d39f2d7e9181b9917d1244fcb45b3a37491726381649 SHA512 2bfcd45b8c5ad68a3f6550c2f80a6804db0e1a72ffaf4fdd3cec3d8acc23e79ad14bb5bf612fe26fc896691839ab19ca8dd1c9994db14d730e56fa79df9d973d
 DIST gobject-introspection-1.58.3.tar.xz 1378068 BLAKE2B 3ae0328892da30aeefcfb8f6d343312d4967345cc202ef137f29690fbd7a35fa9310f87b134fbdfd4fd753b68b47203cd306689d9892eccf17e303d1e7bcccd4 SHA512 0811cd08e224975b3aa55ae89d648fc65f3105cae8a077a5671593d84743b1db28e9fbffe53fc86a2b3e82ea98c35f3daae033d3df07c7020cc3bf8b5d94f796
-EBUILD gobject-introspection-1.56.1.ebuild 2127 BLAKE2B fd53f7a27db901bf2f0371ea7f63a3e42cfb35889770fe46892ac625afda5d5fa9ccebf3d066ae0582016baa2ef68efd8974fbe9d223a73d1d178a79c4e228f5 SHA512 cd5053739873a7313aac796efa96cb0bdd0ea6baffc9030250aa9929ede954315206dbc8dc7f21b05a6bccbd27d94907fe970e92b69c1ec21ef16c66fa9df917
-EBUILD gobject-introspection-1.58.3.ebuild 2214 BLAKE2B 8eab60230ba2403bcc0fd6f9bc7a992dfd2b62091aa4127be3879d5d2c6c4f9646f422a2e36d2251ef369c77f59c5489a7dfb8f023590a77ea81875bd03511cd SHA512 2233ef27e6ded47ee1be07d04a787fedaeba76955f6aa3bda9cf3856e56d18b74543d3f22979b659e8f1f0b8222bd1d3d33872ff482749896ec8d6519b842fa7
+EBUILD gobject-introspection-1.56.1.ebuild 2123 BLAKE2B ee5a7866e95a1a70b74e2313e51a0b443ef2effa47aa9a119bb3c06442ba98e54e45c0d2fad34ade22fd0e1a8c9f4bb54fa4182f9acda62d0570ac30685f9893 SHA512 0e4c52cecf5cd72848f62a89402207c97bc6073472af2b0a3933dfc0f44170d06969f0bd9a0bdb692b3fffce4a1f4b40aad3b55fb9e932dc3dfa90637b9a28dd
+EBUILD gobject-introspection-1.58.3.ebuild 2210 BLAKE2B 6c3cafc9477e039c6fd60b12b35233f32701e368bafa4f45bb27d0ba830257d076ae91df4067e874ac1025975bd62bb28511e5a49cf0af6f56cd7b7d999c5cb9 SHA512 81caa9b0d7c229eea0288ff096b958e482b9882e58395d3496d977992607bf3edc23ebc997498852b4f950b38e189aa66398c027be36980182cd8d476c912912
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
index 65075b57fd0f..a1a2c4ebd051 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.56.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome2 python-single-r1 toolchain-funcs
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
index 7f814af85a82..d6f5d48f6699 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.58.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome2 python-single-r1 toolchain-funcs
diff --git a/dev-libs/gom/Manifest b/dev-libs/gom/Manifest
index 33fbffbf7d79..a59250117f06 100644
--- a/dev-libs/gom/Manifest
+++ b/dev-libs/gom/Manifest
@@ -1,4 +1,4 @@
 AUX 0.3.2-fix-pkgconfig.patch 935 BLAKE2B cc769ecd649c5ee39a5f934268cd55b031bc64512f0abce40e440e9a7fed30b497e1d8d14e267647a0022736befa1880b56b8e1c37a879892bd47381eb9e312f SHA512 5a98cffcff486f485ce9b73ddcee65566689d45df18f86a0a5697df1b2fb4ed3fa1bfe9a915bb8f22c2f3afc4f24da97b739bc1a61310b34fded75bd7a415eb8
 DIST gom-0.3.2.tar.xz 410300 BLAKE2B c0c79c1c3f8a28a0ee992fa4c316538eb87ec26c77def353e8b2038e32f30f9daed433c6d6f6c81069e05e46a980f7d944c955182d973d42f3bd84a341c5a34d SHA512 a7bfb263e5ff6f89768d8fcbdcc949d4ec9b82ecbb80952becd357a3d5781a60e52a327e865e39e46d542b2a2c5e5c861e5302d7ae3c3a2258d3c3f698263675
-EBUILD gom-0.3.2-r1.ebuild 1601 BLAKE2B ed50116977a9a8fc9d9702988e13bc04e5e7016881aec917c23aaf094eeea605cfe3f4dcce007e5e868b9f3fe1705ba1526afa80169eca70fa2aa36ed0221bfb SHA512 59096c64c0aaa2989862a76ec87ae303d353aaa84047ff94e6ef61e6e013f0ca2967ad90cc43abc7d62058f8715247861c00536d2d277362ade78df25366632d
+EBUILD gom-0.3.2-r1.ebuild 1597 BLAKE2B 6fb2e7324f6a5ea072a90f2e699ff0adeda2636005ff5be7b1913fdacd1fb2e465e370e79451a9347002599b313204be1bf79e8ec699bc0b90d7424c0919e91a SHA512 81d86f2c7cbe692c9bc909fbc82a650d32a6789e52d376f526974e20a32f7f83c06584f47671f6c6f097b414f0710d4a76176650653e9ed690c3ec4f86858341
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gom/gom-0.3.2-r1.ebuild b/dev-libs/gom/gom-0.3.2-r1.ebuild
index 384abeb6ccdc..9f3a26b1dc48 100644
--- a/dev-libs/gom/gom-0.3.2-r1.ebuild
+++ b/dev-libs/gom/gom-0.3.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit epatch gnome2 python-r1
 
diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index 9c6683106e53..d4cadebfa750 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -2,5 +2,5 @@ AUX grantlee-0.3.0-nonfatal-warnings.patch 695 BLAKE2B 74d631feb939a6bac5045d151
 AUX grantlee-5.1.0-qt-5.13.patch 778 BLAKE2B 01c0c1fb6a3a9830134cc0d1bc19ead874d526a452dfb08ef0d4f298d979ee40ca70742ab8d6ad823982d80ff19bb695aa8e4b66ff90500f4f470d7eaf83554f SHA512 03b0168b886ec7a394bdd06acb98908dd002b0e9fb8763f71fee3f022fd1726c09da895154eb4022ea6e114b6f7c1b37f90f35ff77521e6f8272371961ff54c9
 AUX grantlee-5.1.0-slot.patch 1616 BLAKE2B b395e361dee3120f7cc0bfef36c5fc0ec2b7a3c8ea714fdb21a93a34cd309407d07488c926f6a67d921a5767d06c05b620d24fce7c253aaea93bb2ca20aa92e1 SHA512 62ec0d0e510fc7aaecfb2eaf9e52b395070833732aa840ff8fc4b4bb94b6716fe59765a7413263c2a6edb073cc379141955a99860c0fcf592d6f5227493482e1
 DIST grantlee-5.1.0.tar.gz 1175380 BLAKE2B 6468c0131a334c3ac52b841a64171093a41605686e4ec2af1a60bbb829f652d388fb48e501a0c1f5eef54ff3253c10b0d6ebd5a4439ed2852f8746188011f9e4 SHA512 2b806a0770b9c6d02f207d5b4939ae8cae325de4fa01901320ffef5c8442ef0f1c10dd799966d0bf0d223e6541f93db8568aaf922ea1b334bcb2f85f6373a936
-EBUILD grantlee-5.1.0.ebuild 1204 BLAKE2B 6f1a935ef7c5db37424121424d839bb2c8bb23edbc9643303bcff39f672c21a3127317e29c3c8c0b34c0bb93740894e811411c59c2c12b90a7073ef7e3f8076a SHA512 8cc50c96fc102582abcfa9ae8da1b38f9e6ed57384709bec4b26f571051ece28c5187ecef0bdb6504f1a0de8af04e82ab48586cce3c75fdabf8ec52904b8ed16
+EBUILD grantlee-5.1.0.ebuild 1234 BLAKE2B d1b4736a8d0ef07704bd386a3942039ef2d2f2d9003e3a6994871a530337874f017ebe49a287eef08cfe40e1b2ef9f0ca672636226c88a2fa7320920307eae45 SHA512 ecb833915fe40e5259870c6c38e59ebac879f610b6cd6340da26de3bd6911083a2c245af733ce583bc5f43931f37878d4d7f528490d5e6deb47e8b9f1042491a
 MISC metadata.xml 331 BLAKE2B 6dab7a95213e13aa8367317827224739d146430a1dba20837be5469221ba7e9403ab6edf7e439511fee5082d10d5fd883c3a25c871b4ff4aae7c24399d1f1cf1 SHA512 073a759e22f25e29be31689015b96dd3c8ab4748d59c31fabfc6a7c43cea6ca2a0a0f48ae49b36cc2a835d97fc2ea5a2f2a790a3cf74fb4d16e1e0f5d771b1b6
diff --git a/dev-libs/grantlee/grantlee-5.1.0.ebuild b/dev-libs/grantlee/grantlee-5.1.0.ebuild
index 328ce49c302e..59e9f458582d 100644
--- a/dev-libs/grantlee/grantlee-5.1.0.ebuild
+++ b/dev-libs/grantlee/grantlee-5.1.0.ebuild
@@ -25,6 +25,9 @@ DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
+# bug 682258
+RESTRICT="test"
+
 DOCS=( AUTHORS CHANGELOG README.md )
 
 PATCHES=(
diff --git a/dev-libs/hyphen/Manifest b/dev-libs/hyphen/Manifest
index 6ea4742b64b8..3e32c37bf73d 100644
--- a/dev-libs/hyphen/Manifest
+++ b/dev-libs/hyphen/Manifest
@@ -1,3 +1,3 @@
 DIST hyphen-2.8.8.tar.gz 638369 BLAKE2B b20bf9476d573c344eeaa5088da5dad17ef025d37717391965880b60b78908bfa00347b4840267a8bab77bbf0c3d653313e342b892581f1864381c476804c3c1 SHA512 ee514952be56869840b70fb74f60eba14dc4de246733ff8705492367e8cf00c485f8778a9d5a7ba374c988d4ac9fedbe75826dc559e1b62465dbfba21f6ce7de
-EBUILD hyphen-2.8.8.ebuild 738 BLAKE2B 1388a1069b4788512b10c1f0cd77e42cd2eb5ac43bcc76fc578c776a288df5fabefd98f170d27146bda9c4e8272d7d7ad0f9c5b2624654acf382292ad1068943 SHA512 79ee634a3bd0ea63c51a02e0dca8919f6c40d178a6aa1d9cefb21f5391ef8b188264d67a26ac64ac2018c7eec101050122da4cb4d586026454f5b6fa20ad08c9
+EBUILD hyphen-2.8.8.ebuild 734 BLAKE2B de2da4793092c5983ac26e00bb1821cf02ab3c0049a534eec809df9f6da65e229fafc3f71a6ed7a911ba879cb800629d49407c1122c79031c1b0dcbc39fa5914 SHA512 1df4e12da818407b838396fccf12303d2b37b60f2f645e7fd9a41996ba2ef409d0a15d2c0dfc1790a9852a49be9f1477339c4ab76592d8251b93abf55daa2e47
 MISC metadata.xml 333 BLAKE2B 989788782df7e4531d2ad8a12b49eb19f8651468467ef9c2894163c9089679622ed1bc597336afb881ca85bf0523e7e8077c8060d46b6237e4ff5dfe16bc1c1a SHA512 1c2849146c40fcf9b1c352d57e9580ea7d9c2fbdc71c5cf601343e3beb9580876b6dc1d42d41abe01163d92c0eb7837fedf85fc3e7408801f0d966ccc8e78ba2
diff --git a/dev-libs/hyphen/hyphen-2.8.8.ebuild b/dev-libs/hyphen/hyphen-2.8.8.ebuild
index 92c213dd346a..0f5203bddc06 100644
--- a/dev-libs/hyphen/hyphen-2.8.8.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-text/hunspell"
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 37ac0833022d..005251f8ccaf 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -2,7 +2,9 @@ AUX icu-layoutex-58.1-remove-bashisms.patch 5888 BLAKE2B 03a7197360a956799eb52a6
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
 DIST icu4c-64_1-src.tgz 24013136 BLAKE2B e577bd4c9b822e5ef3a101b3ef46b7b42ca18077d6e05fca543ff1eb702261f017981fb22dd3970662397530b390f648d4417c84dcf3d6ed0d298dd7a8c38897 SHA512 5eca8342d8bdf902689243506643e04512744b33962687e118f6810af6f7fd073678f67b991d2ae9139d257713b63abb4222b96687234df01ad5ff62df16ede0
+DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78
 EBUILD icu-layoutex-58.2.ebuild 2518 BLAKE2B 885f5583a750f60830f94e4fab7b80070cd9633fc16aca7d2713b16418685ce3eb8eeea27ac33f52a864edb8c3508e77592b729b63f690e9849c562f79d16c42 SHA512 f2b385bc0bad96157f3d321dc9f1b418438b3d390729b372d6c47b28bb7acf3792ff071288d25ed6a78741feb2831dc3e0733109380d86eda2e0631dd75bd8d7
 EBUILD icu-layoutex-63.1.ebuild 2525 BLAKE2B 7c45a83f8dcb5035d44c676edbeed9cb971eca673172a8ab5642589fd63c04f05d6c26b0346ea9caf5da340e5d29d5fc085a4e9e17390c5cbb358926f03257f5 SHA512 0f27c41556ab551538f95c086b39c85539138254d160284e6579a0ada90d93485a9ad41670518d7f27e9b93e9029a63bab484727101c5026d4d1f52e44536588
 EBUILD icu-layoutex-64.1.ebuild 2509 BLAKE2B c5f9d5cf312a3ba8ea2676845bcd423dea004b86b84be36162d0ddb09ff603e534559c064bfcf104b16889c4c7acdb512dcf42b62c6fe22bd05f5d366efd2cbd SHA512 745dd1f5f94c0aaf8d1c9a7ef0436a2ebefefc4cbdcec4e957d7d691b377a460aa89cb953d6be90bac98b843334333a3e666f96b8f86cf758d63b7acce7096ec
+EBUILD icu-layoutex-64.2.ebuild 2509 BLAKE2B c5f9d5cf312a3ba8ea2676845bcd423dea004b86b84be36162d0ddb09ff603e534559c064bfcf104b16889c4c7acdb512dcf42b62c6fe22bd05f5d366efd2cbd SHA512 745dd1f5f94c0aaf8d1c9a7ef0436a2ebefefc4cbdcec4e957d7d691b377a460aa89cb953d6be90bac98b843334333a3e666f96b8f86cf758d63b7acce7096ec
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild
new file mode 100644
index 000000000000..9f738852cf9d
--- /dev/null
+++ b/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="External layout part of International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug static-libs"
+
+BDEPEND="
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
+	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN/-layoutex}/source"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
+)
+
+src_prepare() {
+	# apply patches
+	default
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Use C++14
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--enable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	pushd layoutex &>/dev/null || die
+	emake -j1 VERBOSE="1" check
+	popd &>/dev/null || die
+}
+
+multilib_src_install() {
+	pushd layoutex &>/dev/null || die
+	default
+	popd &>/dev/null || die
+}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 0c36843dbff6..f8469f7b6058 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -4,11 +4,16 @@ AUX icu-58.2-CVE-2017-7867.patch 8934 BLAKE2B 7f934d75a99953d69ac54f8544c698d3bd
 AUX icu-58.2-darwin.patch 2076 BLAKE2B d85d07ae3ade827a81bf2ce4eb2813a6535d7cd70e68241b29ee72c0a41115e3cab0490727771309c32f1eb0853c1a8ce3cf6aae64186037d8ee75d035cb0478 SHA512 fe884a72d354324ad0b1e5502d834fbecafae22a290fb152058d6507b218c4f07efc34cc7d978bae0adb54f74dadf00df7a2679c480dc7681ee287da7f678cb7
 AUX icu-58.2-glibc226.patch 463 BLAKE2B 840440c4a3eb0882ac6733d3c5f44568bc081fce6f3f641e01d76f01fe1f35f74cc2465e89b3353ab86569c7478090df459a659d69143810ba121e15c27923dd SHA512 20d8e76c43ef5549ca7f104b052661269c99d4af45b2a65bd9d72e28b01d0c3b70c066b51799e09d7117a4a39e44fd463fae2522a238a41972c0679c290c5da3
 AUX icu-63.1-CVE-2018-18928.patch 2813 BLAKE2B 21940b9c1f17eed7f056a8c60b5a8da3790955fe6bab02336b0c042d80d90afd02a54dbe441fa38a536b2a77f08fb629510186a0419ad6352b3bc461c7b9b9e3 SHA512 f55cc50673e33dfba4d213bb4f18dd905e9db372dde4c64c1f389c0cd19b31e5fd0aaa113778068758497b35667061659d55fafd0eae818624c9374e17a8d5c5
+AUX icu-64.1-data_archive_generation.patch 473 BLAKE2B 88e77149ec92a316d5e534a6aba8808829ebdef16978fc7130bb4fba80f2bcc7886bafe3c944ff83f56cbf5f02860a35cb0a655722ce305e5e6b05dae15d5254 SHA512 3cf34c7ffaa200f841d605f11ee8145d70f2975be2ae5282a6de2fb5caf6bd8ae67e05cf652b0714023087fa145b4e5fdd4e4287dc331334ec347d957674d291
 AUX icu-64.1-guard-memory-include.patch 1449 BLAKE2B bc255a8ef9a8d7fece5fb10ad2a51b67c28307aa1954a1c690c923b9695b946bc5aceafae39687f60563f62112672b60405d47c393755147568272678516f334 SHA512 7cb0142486d0162a7e9441c55225e010db5dfcd0a9b67f3f738de2a619388e4323b1314e9531537259403fbdd5a263e58576991b6e90629feacdee522f40cee5
+AUX icu-64.2-darwin.patch 2162 BLAKE2B 74682494b903ee1cdcd2025afe36648adef39573754ccb0e0e86b5b7d7f26937c6ea54d655e8482ad9d7a2ccc64b5c8a8640d4e71390b19b64a25bde76b3d63d SHA512 e4e0eb9f953285f4221f2733a3a76c23e9e72127ce3ac0ecc67a46a9e37236dee352f28b7b9befdcae9e2f95297e01a98e0dd177697ee6335145ad5088d2f00f
+AUX icu-64.2-extern_c.patch 29978 BLAKE2B 398f371d256fd4e60fc069949d0d861e363c43889a762c9fffad176cb1164b069209a295475748c08a18a83b43abb561851f4d74359fc3fd683b97eb0cef2e50 SHA512 d45a8da416a573b69b76a615d11bf99f852cb1703cb0fd4ba35fe96411134fda97a29cddf3d14a23900a5099a930c32ff9d1865f02d07314268974c306832409
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
 DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c
 DIST icu4c-64_1-src.tgz 24013136 BLAKE2B e577bd4c9b822e5ef3a101b3ef46b7b42ca18077d6e05fca543ff1eb702261f017981fb22dd3970662397530b390f648d4417c84dcf3d6ed0d298dd7a8c38897 SHA512 5eca8342d8bdf902689243506643e04512744b33962687e118f6810af6f7fd073678f67b991d2ae9139d257713b63abb4222b96687234df01ad5ff62df16ede0
+DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
 EBUILD icu-63.1-r1.ebuild 3321 BLAKE2B b8e6b6ea9bb9379f0b09195382db18e7758fc919d626f49240f9b8a75b97c84833dc2741c528788348d090749229b18d610bcd5bb196506fec03803d3a78af3f SHA512 0efd9eeac3944f3ea14e20f99c3d3bf0f9a2ed22d62074a1d1342c8fb04f4bb76c30d51ca173a09a59abb832cdb134bd1120b065ce0c63536da08839f4abd2de
 EBUILD icu-64.1.ebuild 3338 BLAKE2B b79f6248fc64eafd37d25fdd58ba9752b038e1677c97d009bdcb925c2a665172bbf99a44c1c23b9fb1b0b38f7db057aeaea2833316d079f9e0444727fd578c53 SHA512 58a5dfc85fc423b9c81132c1df1cd9c6e3338e8e3132681c68fb13d729bf63fdd6662cb6457855b772de19eb03481142dd92d7592f953eff7752ce0de2cfcf0f
+EBUILD icu-64.2.ebuild 3399 BLAKE2B 0c3a64d213bf44a7242561e43e1a7aac25b70ebae2b331bb86cc0e7b653320018f94982abf3bf22395b0796a1aa76ecb9bd55d3ec712e8bb4be014085e4eaa05 SHA512 e949f94a78d35dcc71ddd7ff0256812c4aa7786977aeba6a23e7221617f765028cd6e52ba232c4dbc68fde437e5aaa2e3dc0debc57577feb587865c7d1b70bbc
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/files/icu-64.1-data_archive_generation.patch b/dev-libs/icu/files/icu-64.1-data_archive_generation.patch
new file mode 100644
index 000000000000..3bb7673f254a
--- /dev/null
+++ b/dev-libs/icu/files/icu-64.1-data_archive_generation.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/682170
+
+--- a/data/Makefile.in
++++ b/data/Makefile.in
+@@ -148,7 +148,8 @@
+ # and convert it to the current type.
+ ifneq ($(ICUDATA_ARCHIVE),)
+ ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat
+-$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR)
++$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE)
++	$(MKINSTALLDIRS) $(OUTDIR)
+ 	$(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE)
+ endif
+ else
diff --git a/dev-libs/icu/files/icu-64.2-darwin.patch b/dev-libs/icu/files/icu-64.2-darwin.patch
new file mode 100644
index 000000000000..e6af282bd0ef
--- /dev/null
+++ b/dev-libs/icu/files/icu-64.2-darwin.patch
@@ -0,0 +1,56 @@
+same as 4.7, but retargetted to apply with eapply
+
+forward-ported from v58.2 to v64.2
+
+--- a/config/mh-darwin
++++ b/config/mh-darwin
+@@ -6,6 +6,12 @@
+ ## Copyright (c) 1999-2012 International Business Machines Corporation and
+ ## others. All Rights Reserved.
+ 
++SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
++FINAL_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION).$(SO)
++MIDDLE_SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO_TARGET_VERSION_MAJOR).$(SO)
++
++IS_DARWIN = yes
++
+ ## Flags for position independent code
+ SHAREDLIBCFLAGS = -dynamic
+ SHAREDLIBCXXFLAGS = -dynamic
+@@ -33,7 +39,7 @@
+ ifeq ($(ENABLE_RPATH),YES)
+ LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
+ else
+-LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
++LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
+ endif
+ 
+ ## Compiler switch to embed a runtime search path
+--- a/stubdata/Makefile.in
++++ b/stubdata/Makefile.in
+@@ -34,7 +34,11 @@
+ 
+ 
+ ifneq ($(ENABLE_SHARED),)
++ifeq ($(IS_DARWIN),)
+ SO_TARGET = $(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO)
++else
++SO_TARGET = $(LIBDIR)/$(STUBDATA_LIBDIR)$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX)$(STUB_SUFFIX).$(SO)
++endif
+ ALL_SO_TARGETS = $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET) $(SO_TARGET) $(BATCH_STUB_TARGET) $(SHARED_OBJECT)
+ endif
+ 
+--- a/tools/ctestfw/Makefile.in
++++ b/tools/ctestfw/Makefile.in
+@@ -33,7 +33,11 @@
+ endif
+ 
+ ifneq ($(ENABLE_SHARED),)
++ifeq ($(IS_DARWIN),)
+ SO_TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
++else
++SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO)
++endif
+ ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) $(SHARED_OBJECT)
+ endif
+ 
diff --git a/dev-libs/icu/files/icu-64.2-extern_c.patch b/dev-libs/icu/files/icu-64.2-extern_c.patch
new file mode 100644
index 000000000000..9a757e12037b
--- /dev/null
+++ b/dev-libs/icu/files/icu-64.2-extern_c.patch
@@ -0,0 +1,789 @@
+From 26bdef634585eb24946dba035611266e9431873b Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 30 Mar 2019 09:59:46 +0300
+Subject: [PATCH] ICU-20530 Fix header issues based on test/hdrtst
+
+Remove explicit extern "C++" scope.
+
+Remove C++ macros in C mode.
+
+Fix issues detected by make -C test/hdrtst.
+
+Run test/hdrtest during CI to detect future breakage.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+Closes: https://github.com/unicode-org/icu/pull/613
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+diff --git a/icu4c/source/common/unicode/ucptrie.h b/icu4c/source/common/unicode/ucptrie.h
+index 2718c984e4..ce7340b890 100644
+--- a/icu4c/source/common/unicode/ucptrie.h
++++ b/icu4c/source/common/unicode/ucptrie.h
+@@ -216,25 +216,6 @@ ucptrie_openFromBinary(UCPTrieType type, UCPTrieValueWidth valueWidth,
+ U_CAPI void U_EXPORT2
+ ucptrie_close(UCPTrie *trie);
+ 
+-#if U_SHOW_CPLUSPLUS_API
+-
+-U_NAMESPACE_BEGIN
+-
+-/**
+- * \class LocalUCPTriePointer
+- * "Smart pointer" class, closes a UCPTrie via ucptrie_close().
+- * For most methods see the LocalPointerBase base class.
+- *
+- * @see LocalPointerBase
+- * @see LocalPointer
+- * @draft ICU 63
+- */
+-U_DEFINE_LOCAL_OPEN_POINTER(LocalUCPTriePointer, UCPTrie, ucptrie_close);
+-
+-U_NAMESPACE_END
+-
+-#endif
+-
+ /**
+  * Returns the trie type.
+  *
+@@ -642,5 +623,25 @@ ucptrie_internalU8PrevIndex(const UCPTrie *trie, UChar32 c,
+ U_CDECL_END
+ 
+ #endif  // U_IN_DOXYGEN
++
++#if U_SHOW_CPLUSPLUS_API
++
++U_NAMESPACE_BEGIN
++
++/**
++ * \class LocalUCPTriePointer
++ * "Smart pointer" class, closes a UCPTrie via ucptrie_close().
++ * For most methods see the LocalPointerBase base class.
++ *
++ * @see LocalPointerBase
++ * @see LocalPointer
++ * @draft ICU 63
++ */
++U_DEFINE_LOCAL_OPEN_POINTER(LocalUCPTriePointer, UCPTrie, ucptrie_close);
++
++U_NAMESPACE_END
++
++#endif  // U_SHOW_CPLUSPLUS_API
++
+ #endif  // U_HIDE_DRAFT_API
+ #endif
+diff --git a/icu4c/source/common/unicode/udata.h b/icu4c/source/common/unicode/udata.h
+index a0286e1e42..325ffcf17d 100644
+--- a/icu4c/source/common/unicode/udata.h
++++ b/icu4c/source/common/unicode/udata.h
+@@ -264,25 +264,6 @@ udata_openChoice(const char *path, const char *type, const char *name,
+ U_STABLE void U_EXPORT2
+ udata_close(UDataMemory *pData);
+ 
+-#if U_SHOW_CPLUSPLUS_API
+-
+-U_NAMESPACE_BEGIN
+-
+-/**
+- * \class LocalUDataMemoryPointer
+- * "Smart pointer" class, closes a UDataMemory via udata_close().
+- * For most methods see the LocalPointerBase base class.
+- *
+- * @see LocalPointerBase
+- * @see LocalPointer
+- * @stable ICU 4.4
+- */
+-U_DEFINE_LOCAL_OPEN_POINTER(LocalUDataMemoryPointer, UDataMemory, udata_close);
+-
+-U_NAMESPACE_END
+-
+-#endif
+-
+ /**
+  * Get the pointer to the actual data inside the data memory.
+  * The data is read-only.
+@@ -434,4 +415,23 @@ udata_setFileAccess(UDataFileAccess access, UErrorCode *status);
+ 
+ U_CDECL_END
+ 
++#if U_SHOW_CPLUSPLUS_API
++
++U_NAMESPACE_BEGIN
++
++/**
++ * \class LocalUDataMemoryPointer
++ * "Smart pointer" class, closes a UDataMemory via udata_close().
++ * For most methods see the LocalPointerBase base class.
++ *
++ * @see LocalPointerBase
++ * @see LocalPointer
++ * @stable ICU 4.4
++ */
++U_DEFINE_LOCAL_OPEN_POINTER(LocalUDataMemoryPointer, UDataMemory, udata_close);
++
++U_NAMESPACE_END
++
++#endif  // U_SHOW_CPLUSPLUS_API
++
+ #endif
+diff --git a/icu4c/source/common/unicode/uversion.h b/icu4c/source/common/unicode/uversion.h
+index 4aaa8b4d60..5700f62cbf 100644
+--- a/icu4c/source/common/unicode/uversion.h
++++ b/icu4c/source/common/unicode/uversion.h
+@@ -62,26 +62,22 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
+ /* C++ namespace if supported. Versioned unless versioning is disabled.      */
+ /*===========================================================================*/
+ 
++/* Define C++ namespace symbols. */
++#ifdef __cplusplus
++
+ /**
+  * \def U_NAMESPACE_BEGIN
+- * This is used to begin a declaration of a public ICU C++ API.
+- * When not compiling for C++, it does nothing.
+- * When compiling for C++, it begins an extern "C++" linkage block (to protect
+- * against cases in which an external client includes ICU header files inside
+- * an extern "C" linkage block).
++ * This is used to begin a declaration of a public ICU C++ API within
++ * versioned-ICU-namespace block.
+  *
+- * It also begins a versioned-ICU-namespace block.
+  * @stable ICU 2.4
+  */
+ 
+ /**
+  * \def U_NAMESPACE_END
+  * This is used to end a declaration of a public ICU C++ API.
+- * When not compiling for C++, it does nothing.
+- * When compiling for C++, it ends the extern "C++" block begun by
+- * U_NAMESPACE_BEGIN.
++ * It ends the versioned-ICU-namespace block begun by U_NAMESPACE_BEGIN.
+  *
+- * It also ends the versioned-ICU-namespace block begun by U_NAMESPACE_BEGIN.
+  * @stable ICU 2.4
+  */
+ 
+@@ -89,9 +85,6 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
+  * \def U_NAMESPACE_USE
+  * This is used to specify that the rest of the code uses the
+  * public ICU C++ API namespace.
+- * This is invoked by default; we recommend that you turn it off:
+- * See the "Recommended Build Options" section of the ICU4C readme
+- * (http://source.icu-project.org/repos/icu/icu/trunk/readme.html#RecBuild)
+  * @stable ICU 2.4
+  */
+ 
+@@ -105,8 +98,6 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
+  * @stable ICU 2.4
+  */
+ 
+-/* Define C++ namespace symbols. */
+-#ifdef __cplusplus
+ #   if U_DISABLE_RENAMING
+ #       define U_ICU_NAMESPACE icu
+         namespace U_ICU_NAMESPACE { }
+@@ -116,8 +107,8 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
+         namespace icu = U_ICU_NAMESPACE;
+ #   endif
+ 
+-#   define U_NAMESPACE_BEGIN extern "C++" { namespace U_ICU_NAMESPACE {
+-#   define U_NAMESPACE_END } }
++#   define U_NAMESPACE_BEGIN namespace U_ICU_NAMESPACE {
++#   define U_NAMESPACE_END }
+ #   define U_NAMESPACE_USE using namespace U_ICU_NAMESPACE;
+ #   define U_NAMESPACE_QUALIFIER U_ICU_NAMESPACE::
+ 
+@@ -133,12 +124,7 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
+ #   if U_USING_ICU_NAMESPACE
+         U_NAMESPACE_USE
+ #   endif
+-#else
+-#   define U_NAMESPACE_BEGIN
+-#   define U_NAMESPACE_END
+-#   define U_NAMESPACE_USE
+-#   define U_NAMESPACE_QUALIFIER
+-#endif
++#endif /* __cplusplus */
+ 
+ /*===========================================================================*/
+ /* General version helper functions. Definitions in putil.c                  */
+diff --git a/icu4c/source/i18n/unicode/reldatefmt.h b/icu4c/source/i18n/unicode/reldatefmt.h
+index 16ae91ad03..1e164a581a 100644
+--- a/icu4c/source/i18n/unicode/reldatefmt.h
++++ b/icu4c/source/i18n/unicode/reldatefmt.h
+@@ -246,6 +246,7 @@ class SharedPluralRules;
+ class SharedBreakIterator;
+ class NumberFormat;
+ class UnicodeString;
++class FormattedRelativeDateTime;
+ class FormattedRelativeDateTimeData;
+ 
+ #ifndef U_HIDE_DRAFT_API
+diff --git a/icu4c/source/i18n/unicode/uspoof.h b/icu4c/source/i18n/unicode/uspoof.h
+index d15ba4b242..ceb8484b6b 100644
+--- a/icu4c/source/i18n/unicode/uspoof.h
++++ b/icu4c/source/i18n/unicode/uspoof.h
+@@ -353,6 +353,8 @@
+  * @stable ICU 4.6
+  */
+ 
++U_CDECL_BEGIN
++
+ struct USpoofChecker;
+ /**
+  * @stable ICU 4.2
+@@ -674,25 +676,6 @@ uspoof_openFromSource(const char *confusables,  int32_t confusablesLen,
+ U_STABLE void U_EXPORT2
+ uspoof_close(USpoofChecker *sc);
+ 
+-#if U_SHOW_CPLUSPLUS_API
+-
+-U_NAMESPACE_BEGIN
+-
+-/**
+- * \class LocalUSpoofCheckerPointer
+- * "Smart pointer" class, closes a USpoofChecker via uspoof_close().
+- * For most methods see the LocalPointerBase base class.
+- *
+- * @see LocalPointerBase
+- * @see LocalPointer
+- * @stable ICU 4.4
+- */
+-U_DEFINE_LOCAL_OPEN_POINTER(LocalUSpoofCheckerPointer, USpoofChecker, uspoof_close);
+-
+-U_NAMESPACE_END
+-
+-#endif
+-
+ /**
+  * Clone a Spoof Checker.  The clone will be set to perform the same checks
+  *   as the original source.
+@@ -901,54 +884,6 @@ U_STABLE const USet * U_EXPORT2
+ uspoof_getAllowedChars(const USpoofChecker *sc, UErrorCode *status);
+ 
+ 
+-#if U_SHOW_CPLUSPLUS_API
+-/**
+- * Limit the acceptable characters to those specified by a Unicode Set.
+- *   Any previously specified character limit is
+- *   is replaced by the new settings.    This includes limits on
+- *   characters that were set with the uspoof_setAllowedLocales() function.
+- *
+- * The USPOOF_CHAR_LIMIT test is automatically enabled for this
+- * USoofChecker by this function.
+- *
+- * @param sc       The USpoofChecker
+- * @param chars    A Unicode Set containing the list of
+- *                 characters that are permitted.  Ownership of the set
+- *                 remains with the caller.  The incoming set is cloned by
+- *                 this function, so there are no restrictions on modifying
+- *                 or deleting the UnicodeSet after calling this function.
+- * @param status   The error code, set if this function encounters a problem.
+- * @stable ICU 4.2
+- */
+-U_STABLE void U_EXPORT2
+-uspoof_setAllowedUnicodeSet(USpoofChecker *sc, const icu::UnicodeSet *chars, UErrorCode *status);
+-
+-
+-/**
+- * Get a UnicodeSet for the characters permitted in an identifier.
+- * This corresponds to the limits imposed by the Set Allowed Characters /
+- * UnicodeSet functions. Limitations imposed by other checks will not be
+- * reflected in the set returned by this function.
+- *
+- * The returned set will be frozen, meaning that it cannot be modified
+- * by the caller.
+- *
+- * Ownership of the returned set remains with the Spoof Detector.  The
+- * returned set will become invalid if the spoof detector is closed,
+- * or if a new set of allowed characters is specified.
+- *
+- *
+- * @param sc       The USpoofChecker
+- * @param status   The error code, set if this function encounters a problem.
+- * @return         A UnicodeSet containing the characters that are permitted by
+- *                 the USPOOF_CHAR_LIMIT test.
+- * @stable ICU 4.2
+- */
+-U_STABLE const icu::UnicodeSet * U_EXPORT2
+-uspoof_getAllowedUnicodeSet(const USpoofChecker *sc, UErrorCode *status);
+-#endif
+-
+-
+ /**
+  * Check the specified string for possible security issues.
+  * The text to be checked will typically be an identifier of some sort.
+@@ -1027,43 +962,6 @@ uspoof_checkUTF8(const USpoofChecker *sc,
+                  UErrorCode *status);
+ 
+ 
+-#if U_SHOW_CPLUSPLUS_API
+-/**
+- * Check the specified string for possible security issues.
+- * The text to be checked will typically be an identifier of some sort.
+- * The set of checks to be performed is specified with uspoof_setChecks().
+- *
+- * \note
+- *   Consider using the newer API, {@link uspoof_check2UnicodeString}, instead.
+- *   The newer API exposes additional information from the check procedure
+- *   and is otherwise identical to this method.
+- *
+- * @param sc      The USpoofChecker
+- * @param id      A identifier to be checked for possible security issues.
+- * @param position  Deprecated in ICU 51.  Always returns zero.
+- *                Originally, an out parameter for the index of the first
+- *                string position that failed a check.
+- *                This parameter may be NULL.
+- * @param status  The error code, set if an error occurred while attempting to
+- *                perform the check.
+- *                Spoofing or security issues detected with the input string are
+- *                not reported here, but through the function's return value.
+- * @return        An integer value with bits set for any potential security
+- *                or spoofing issues detected.  The bits are defined by
+- *                enum USpoofChecks.  (returned_value & USPOOF_ALL_CHECKS)
+- *                will be zero if the input string passes all of the
+- *                enabled checks.
+- * @see uspoof_check2UnicodeString
+- * @stable ICU 4.2
+- */
+-U_STABLE int32_t U_EXPORT2
+-uspoof_checkUnicodeString(const USpoofChecker *sc,
+-                          const icu::UnicodeString &id,
+-                          int32_t *position,
+-                          UErrorCode *status);
+-#endif
+-
+-
+ /**
+  * Check the specified string for possible security issues.
+  * The text to be checked will typically be an identifier of some sort.
+@@ -1135,39 +1033,6 @@ uspoof_check2UTF8(const USpoofChecker *sc,
+     USpoofCheckResult* checkResult,
+     UErrorCode *status);
+ 
+-#if U_SHOW_CPLUSPLUS_API
+-/**
+- * Check the specified string for possible security issues.
+- * The text to be checked will typically be an identifier of some sort.
+- * The set of checks to be performed is specified with uspoof_setChecks().
+- *
+- * @param sc      The USpoofChecker
+- * @param id      A identifier to be checked for possible security issues.
+- * @param checkResult  An instance of USpoofCheckResult to be filled with
+- *                details about the identifier.  Can be NULL.
+- * @param status  The error code, set if an error occurred while attempting to
+- *                perform the check.
+- *                Spoofing or security issues detected with the input string are
+- *                not reported here, but through the function's return value.
+- * @return        An integer value with bits set for any potential security
+- *                or spoofing issues detected.  The bits are defined by
+- *                enum USpoofChecks.  (returned_value & USPOOF_ALL_CHECKS)
+- *                will be zero if the input string passes all of the
+- *                enabled checks.  Any information in this bitmask will be
+- *                consistent with the information saved in the optional
+- *                checkResult parameter.
+- * @see uspoof_openCheckResult
+- * @see uspoof_check2
+- * @see uspoof_check2UTF8
+- * @stable ICU 58
+- */
+-U_STABLE int32_t U_EXPORT2
+-uspoof_check2UnicodeString(const USpoofChecker *sc,
+-    const icu::UnicodeString &id,
+-    USpoofCheckResult* checkResult,
+-    UErrorCode *status);
+-#endif
+-
+ /**
+  * Create a USpoofCheckResult, used by the {@link uspoof_check2} class of functions to return
+  * information about the identifier.  Information includes:
+@@ -1199,32 +1064,6 @@ uspoof_openCheckResult(UErrorCode *status);
+ U_STABLE void U_EXPORT2
+ uspoof_closeCheckResult(USpoofCheckResult *checkResult);
+ 
+-#if U_SHOW_CPLUSPLUS_API
+-
+-U_NAMESPACE_BEGIN
+-
+-/**
+- * \class LocalUSpoofCheckResultPointer
+- * "Smart pointer" class, closes a USpoofCheckResult via `uspoof_closeCheckResult()`.
+- * For most methods see the LocalPointerBase base class.
+- *
+- * @see LocalPointerBase
+- * @see LocalPointer
+- * @stable ICU 58
+- */
+-
+-/**
+- * \cond
+- * Note: Doxygen is giving a bogus warning on this U_DEFINE_LOCAL_OPEN_POINTER.
+- *       For now, suppress with a Doxygen cond
+- */
+-U_DEFINE_LOCAL_OPEN_POINTER(LocalUSpoofCheckResultPointer, USpoofCheckResult, uspoof_closeCheckResult);
+-/** \endcond */
+-
+-U_NAMESPACE_END
+-
+-#endif
+-
+ /**
+  * Indicates which of the spoof check(s) have failed. The value is a bitwise OR of the constants for the tests
+  * in question: USPOOF_RESTRICTION_LEVEL, USPOOF_CHAR_LIMIT, and so on.
+@@ -1355,36 +1194,6 @@ uspoof_areConfusableUTF8(const USpoofChecker *sc,
+ 
+ 
+ 
+-#if U_SHOW_CPLUSPLUS_API
+-/**
+- * A version of {@link uspoof_areConfusable} accepting UnicodeStrings.
+- *
+- * @param sc      The USpoofChecker
+- * @param s1     The first of the two identifiers to be compared for
+- *                confusability.  The strings are in UTF-8 format.
+- * @param s2     The second of the two identifiers to be compared for
+- *                confusability.  The strings are in UTF-8 format.
+- * @param status  The error code, set if an error occurred while attempting to
+- *                perform the check.
+- *                Confusability of the identifiers is not reported here,
+- *                but through this function's return value.
+- * @return        An integer value with bit(s) set corresponding to
+- *                the type of confusability found, as defined by
+- *                enum USpoofChecks.  Zero is returned if the identifiers
+- *                are not confusable.
+- *
+- * @stable ICU 4.2
+- *
+- * @see uspoof_areConfusable
+- */
+-U_STABLE int32_t U_EXPORT2
+-uspoof_areConfusableUnicodeString(const USpoofChecker *sc,
+-                                  const icu::UnicodeString &s1,
+-                                  const icu::UnicodeString &s2,
+-                                  UErrorCode *status);
+-#endif
+-
+-
+ /**
+  *  Get the "skeleton" for an identifier.
+  *  Skeletons are a transformation of the input identifier;
+@@ -1463,38 +1272,6 @@ uspoof_getSkeletonUTF8(const USpoofChecker *sc,
+                        char *dest, int32_t destCapacity,
+                        UErrorCode *status);
+ 
+-#if U_SHOW_CPLUSPLUS_API
+-/**
+- *  Get the "skeleton" for an identifier.
+- *  Skeletons are a transformation of the input identifier;
+- *  Two identifiers are confusable if their skeletons are identical.
+- *  See Unicode UAX #39 for additional information.
+- *
+- *  Using skeletons directly makes it possible to quickly check
+- *  whether an identifier is confusable with any of some large
+- *  set of existing identifiers, by creating an efficiently
+- *  searchable collection of the skeletons.
+- *
+- * @param sc      The USpoofChecker.
+- * @param type    Deprecated in ICU 58.  You may pass any number.
+- *                Originally, controlled which of the Unicode confusable data
+- *                tables to use.
+- * @param id      The input identifier whose skeleton will be computed.
+- * @param dest    The output identifier, to receive the skeleton string.
+- * @param status  The error code, set if an error occurred while attempting to
+- *                perform the check.
+- * @return        A reference to the destination (skeleton) string.
+- *
+- * @stable ICU 4.2
+- */
+-U_I18N_API icu::UnicodeString & U_EXPORT2
+-uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
+-                                uint32_t type,
+-                                const icu::UnicodeString &id,
+-                                icu::UnicodeString &dest,
+-                                UErrorCode *status);
+-#endif   /* U_SHOW_CPLUSPLUS_API */
+-
+ /**
+   * Get the set of Candidate Characters for Inclusion in Identifiers, as defined
+   * in http://unicode.org/Public/security/latest/xidmodifications.txt
+@@ -1525,8 +1302,243 @@ uspoof_getInclusionSet(UErrorCode *status);
+ U_STABLE const USet * U_EXPORT2
+ uspoof_getRecommendedSet(UErrorCode *status);
+ 
++/**
++ * Serialize the data for a spoof detector into a chunk of memory.
++ * The flattened spoof detection tables can later be used to efficiently
++ * instantiate a new Spoof Detector.
++ *
++ * The serialized spoof checker includes only the data compiled from the
++ * Unicode data tables by uspoof_openFromSource(); it does not include
++ * include any other state or configuration that may have been set.
++ *
++ * @param sc   the Spoof Detector whose data is to be serialized.
++ * @param data a pointer to 32-bit-aligned memory to be filled with the data,
++ *             can be NULL if capacity==0
++ * @param capacity the number of bytes available at data,
++ *                 or 0 for preflighting
++ * @param status an in/out ICU UErrorCode; possible errors include:
++ * - U_BUFFER_OVERFLOW_ERROR if the data storage block is too small for serialization
++ * - U_ILLEGAL_ARGUMENT_ERROR  the data or capacity parameters are bad
++ * @return the number of bytes written or needed for the spoof data
++ *
++ * @see utrie2_openFromSerialized()
++ * @stable ICU 4.2
++ */
++U_STABLE int32_t U_EXPORT2
++uspoof_serialize(USpoofChecker *sc,
++                 void *data, int32_t capacity,
++                 UErrorCode *status);
++
++U_CDECL_END
++
+ #if U_SHOW_CPLUSPLUS_API
+ 
++U_NAMESPACE_BEGIN
++
++/**
++ * \class LocalUSpoofCheckerPointer
++ * "Smart pointer" class, closes a USpoofChecker via uspoof_close().
++ * For most methods see the LocalPointerBase base class.
++ *
++ * @see LocalPointerBase
++ * @see LocalPointer
++ * @stable ICU 4.4
++ */
++/**
++ * \cond
++ * Note: Doxygen is giving a bogus warning on this U_DEFINE_LOCAL_OPEN_POINTER.
++ *       For now, suppress with a Doxygen cond
++ */
++U_DEFINE_LOCAL_OPEN_POINTER(LocalUSpoofCheckerPointer, USpoofChecker, uspoof_close);
++/** \endcond */
++
++/**
++ * \class LocalUSpoofCheckResultPointer
++ * "Smart pointer" class, closes a USpoofCheckResult via `uspoof_closeCheckResult()`.
++ * For most methods see the LocalPointerBase base class.
++ *
++ * @see LocalPointerBase
++ * @see LocalPointer
++ * @stable ICU 58
++ */
++
++/**
++ * \cond
++ * Note: Doxygen is giving a bogus warning on this U_DEFINE_LOCAL_OPEN_POINTER.
++ *       For now, suppress with a Doxygen cond
++ */
++U_DEFINE_LOCAL_OPEN_POINTER(LocalUSpoofCheckResultPointer, USpoofCheckResult, uspoof_closeCheckResult);
++/** \endcond */
++
++U_NAMESPACE_END
++
++/**
++ * Limit the acceptable characters to those specified by a Unicode Set.
++ *   Any previously specified character limit is
++ *   is replaced by the new settings.    This includes limits on
++ *   characters that were set with the uspoof_setAllowedLocales() function.
++ *
++ * The USPOOF_CHAR_LIMIT test is automatically enabled for this
++ * USoofChecker by this function.
++ *
++ * @param sc       The USpoofChecker
++ * @param chars    A Unicode Set containing the list of
++ *                 characters that are permitted.  Ownership of the set
++ *                 remains with the caller.  The incoming set is cloned by
++ *                 this function, so there are no restrictions on modifying
++ *                 or deleting the UnicodeSet after calling this function.
++ * @param status   The error code, set if this function encounters a problem.
++ * @stable ICU 4.2
++ */
++U_STABLE void U_EXPORT2
++uspoof_setAllowedUnicodeSet(USpoofChecker *sc, const icu::UnicodeSet *chars, UErrorCode *status);
++
++
++/**
++ * Get a UnicodeSet for the characters permitted in an identifier.
++ * This corresponds to the limits imposed by the Set Allowed Characters /
++ * UnicodeSet functions. Limitations imposed by other checks will not be
++ * reflected in the set returned by this function.
++ *
++ * The returned set will be frozen, meaning that it cannot be modified
++ * by the caller.
++ *
++ * Ownership of the returned set remains with the Spoof Detector.  The
++ * returned set will become invalid if the spoof detector is closed,
++ * or if a new set of allowed characters is specified.
++ *
++ *
++ * @param sc       The USpoofChecker
++ * @param status   The error code, set if this function encounters a problem.
++ * @return         A UnicodeSet containing the characters that are permitted by
++ *                 the USPOOF_CHAR_LIMIT test.
++ * @stable ICU 4.2
++ */
++U_STABLE const icu::UnicodeSet * U_EXPORT2
++uspoof_getAllowedUnicodeSet(const USpoofChecker *sc, UErrorCode *status);
++
++/**
++ * Check the specified string for possible security issues.
++ * The text to be checked will typically be an identifier of some sort.
++ * The set of checks to be performed is specified with uspoof_setChecks().
++ *
++ * \note
++ *   Consider using the newer API, {@link uspoof_check2UnicodeString}, instead.
++ *   The newer API exposes additional information from the check procedure
++ *   and is otherwise identical to this method.
++ *
++ * @param sc      The USpoofChecker
++ * @param id      A identifier to be checked for possible security issues.
++ * @param position  Deprecated in ICU 51.  Always returns zero.
++ *                Originally, an out parameter for the index of the first
++ *                string position that failed a check.
++ *                This parameter may be NULL.
++ * @param status  The error code, set if an error occurred while attempting to
++ *                perform the check.
++ *                Spoofing or security issues detected with the input string are
++ *                not reported here, but through the function's return value.
++ * @return        An integer value with bits set for any potential security
++ *                or spoofing issues detected.  The bits are defined by
++ *                enum USpoofChecks.  (returned_value & USPOOF_ALL_CHECKS)
++ *                will be zero if the input string passes all of the
++ *                enabled checks.
++ * @see uspoof_check2UnicodeString
++ * @stable ICU 4.2
++ */
++U_STABLE int32_t U_EXPORT2
++uspoof_checkUnicodeString(const USpoofChecker *sc,
++                          const icu::UnicodeString &id,
++                          int32_t *position,
++                          UErrorCode *status);
++
++/**
++ * Check the specified string for possible security issues.
++ * The text to be checked will typically be an identifier of some sort.
++ * The set of checks to be performed is specified with uspoof_setChecks().
++ *
++ * @param sc      The USpoofChecker
++ * @param id      A identifier to be checked for possible security issues.
++ * @param checkResult  An instance of USpoofCheckResult to be filled with
++ *                details about the identifier.  Can be NULL.
++ * @param status  The error code, set if an error occurred while attempting to
++ *                perform the check.
++ *                Spoofing or security issues detected with the input string are
++ *                not reported here, but through the function's return value.
++ * @return        An integer value with bits set for any potential security
++ *                or spoofing issues detected.  The bits are defined by
++ *                enum USpoofChecks.  (returned_value & USPOOF_ALL_CHECKS)
++ *                will be zero if the input string passes all of the
++ *                enabled checks.  Any information in this bitmask will be
++ *                consistent with the information saved in the optional
++ *                checkResult parameter.
++ * @see uspoof_openCheckResult
++ * @see uspoof_check2
++ * @see uspoof_check2UTF8
++ * @stable ICU 58
++ */
++U_STABLE int32_t U_EXPORT2
++uspoof_check2UnicodeString(const USpoofChecker *sc,
++    const icu::UnicodeString &id,
++    USpoofCheckResult* checkResult,
++    UErrorCode *status);
++
++/**
++ * A version of {@link uspoof_areConfusable} accepting UnicodeStrings.
++ *
++ * @param sc      The USpoofChecker
++ * @param s1     The first of the two identifiers to be compared for
++ *                confusability.  The strings are in UTF-8 format.
++ * @param s2     The second of the two identifiers to be compared for
++ *                confusability.  The strings are in UTF-8 format.
++ * @param status  The error code, set if an error occurred while attempting to
++ *                perform the check.
++ *                Confusability of the identifiers is not reported here,
++ *                but through this function's return value.
++ * @return        An integer value with bit(s) set corresponding to
++ *                the type of confusability found, as defined by
++ *                enum USpoofChecks.  Zero is returned if the identifiers
++ *                are not confusable.
++ *
++ * @stable ICU 4.2
++ *
++ * @see uspoof_areConfusable
++ */
++U_STABLE int32_t U_EXPORT2
++uspoof_areConfusableUnicodeString(const USpoofChecker *sc,
++                                  const icu::UnicodeString &s1,
++                                  const icu::UnicodeString &s2,
++                                  UErrorCode *status);
++
++/**
++ *  Get the "skeleton" for an identifier.
++ *  Skeletons are a transformation of the input identifier;
++ *  Two identifiers are confusable if their skeletons are identical.
++ *  See Unicode UAX #39 for additional information.
++ *
++ *  Using skeletons directly makes it possible to quickly check
++ *  whether an identifier is confusable with any of some large
++ *  set of existing identifiers, by creating an efficiently
++ *  searchable collection of the skeletons.
++ *
++ * @param sc      The USpoofChecker.
++ * @param type    Deprecated in ICU 58.  You may pass any number.
++ *                Originally, controlled which of the Unicode confusable data
++ *                tables to use.
++ * @param id      The input identifier whose skeleton will be computed.
++ * @param dest    The output identifier, to receive the skeleton string.
++ * @param status  The error code, set if an error occurred while attempting to
++ *                perform the check.
++ * @return        A reference to the destination (skeleton) string.
++ *
++ * @stable ICU 4.2
++ */
++U_I18N_API icu::UnicodeString & U_EXPORT2
++uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
++                                uint32_t type,
++                                const icu::UnicodeString &id,
++                                icu::UnicodeString &dest,
++                                UErrorCode *status);
++
+ /**
+   * Get the set of Candidate Characters for Inclusion in Identifiers, as defined
+   * in http://unicode.org/Public/security/latest/xidmodifications.txt
+@@ -1559,34 +1571,6 @@ uspoof_getRecommendedUnicodeSet(UErrorCode *status);
+ 
+ #endif /* U_SHOW_CPLUSPLUS_API */
+ 
+-/**
+- * Serialize the data for a spoof detector into a chunk of memory.
+- * The flattened spoof detection tables can later be used to efficiently
+- * instantiate a new Spoof Detector.
+- *
+- * The serialized spoof checker includes only the data compiled from the
+- * Unicode data tables by uspoof_openFromSource(); it does not include
+- * include any other state or configuration that may have been set.
+- *
+- * @param sc   the Spoof Detector whose data is to be serialized.
+- * @param data a pointer to 32-bit-aligned memory to be filled with the data,
+- *             can be NULL if capacity==0
+- * @param capacity the number of bytes available at data,
+- *                 or 0 for preflighting
+- * @param status an in/out ICU UErrorCode; possible errors include:
+- * - U_BUFFER_OVERFLOW_ERROR if the data storage block is too small for serialization
+- * - U_ILLEGAL_ARGUMENT_ERROR  the data or capacity parameters are bad
+- * @return the number of bytes written or needed for the spoof data
+- *
+- * @see utrie2_openFromSerialized()
+- * @stable ICU 4.2
+- */
+-U_STABLE int32_t U_EXPORT2
+-uspoof_serialize(USpoofChecker *sc,
+-                 void *data, int32_t capacity,
+-                 UErrorCode *status);
+-
+-
+-#endif
++#endif /* UCONFIG_NO_NORMALIZATION */
+ 
+ #endif   /* USPOOF_H */
+-- 
+2.21.0
+
diff --git a/dev-libs/icu/icu-64.2.ebuild b/dev-libs/icu/icu-64.2.ebuild
new file mode 100644
index 000000000000..456e444769e1
--- /dev/null
+++ b/dev-libs/icu/icu-64.2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs autotools multilib-minimal
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="debug doc examples static-libs"
+
+DEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}/source"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/icu-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-58.1-remove-bashisms.patch"
+	"${FILESDIR}/${PN}-64.2-darwin.patch"
+	"${FILESDIR}/${PN}-64.1-data_archive_generation.patch"
+)
+
+src_prepare() {
+	default
+	eapply -p3 "${FILESDIR}/${PN}-64.2-extern_c.patch"
+
+	local variable
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--disable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+		$(multilib_native_use_enable examples samples)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	# make sure we configure with the same shell as we run icu-config
+	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
+	export CONFIG_SHELL="${EPREFIX}/bin/sh"
+	# probably have no /bin/sh in prefix-chain
+	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	emake -j1 VERBOSE="1" check
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/html/*
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	docinto html
+	dodoc ../readme.html
+}
diff --git a/dev-libs/ilbc-rfc3951/Manifest b/dev-libs/ilbc-rfc3951/Manifest
index bbbdc225f021..fde8fffa916c 100644
--- a/dev-libs/ilbc-rfc3951/Manifest
+++ b/dev-libs/ilbc-rfc3951/Manifest
@@ -1,4 +1,4 @@
 AUX ilbc-rfc3951-asneeded.patch 441 BLAKE2B 94e1c3b911c1eb18ecf162c43c8b653c1ace3be2ba868a05aa541b456c843e2972fb6f3195e336c0b3014cf2179395623920a48a8b69c6cdf125c005b288784a SHA512 bbb81eb3fe6a6004c5766299fd437247b3c4a8e11022a202943c332132026d8d2f3d74eeba4161533255e61dad5f26b60499012823c0928d740ac96e7bb188f9
 DIST ilbc-rfc3951.tar.gz 330306 BLAKE2B cf8c56d9fc3dd2dc6a2dd241f3b0cddb7e7f6cea126056d2ab94aaf8add382f1bc1d9b03c9a91110197e0d82253ca8e824cf37bc1622af26fdf0939204736c35 SHA512 7828a9c5a193ebdfcb383d1edad0868afdee0f71d1a8a878c7d9ea2078fd63f57d31b34ae2cf4890d5abc28c8f5f4ee940c665a126f0512d1e79c4f76a72fbcf
-EBUILD ilbc-rfc3951-0-r1.ebuild 670 BLAKE2B cb57e1a58732f8f341755bf2d667add3c5a942c465f20daa4b077ff2d92abfb5d8c1282601f1e4eef226cc5dd5450d71798272c49059b83e476f5eecac30468a SHA512 85e63e02f68ac45865aef96ea48bf8a9fb5c96972dc66063f6cc84600b25868d973512c8969356c1500bdd2ea886e9a552a20eecfe0a0b13176abe55122aa858
+EBUILD ilbc-rfc3951-0-r1.ebuild 683 BLAKE2B 40187053c7f3a19eb303c3ad16bce5227b9fe8a160b01c577998cd991de8fb7db836aac0c08bb51650e716e36d0059278ef8a8881db2c3f30fabe1492cdff23a SHA512 31186b59caf95d23fd8cc9da7fe44be311e050d3b6e6c4ff2fb7c71ee6d1a6f5cb1ffedff061ce4c4ea65ec264342ae3246c7a72845b7a873e044de372824e0f
 MISC metadata.xml 239 BLAKE2B 9d90102c70502e3f729b461b00c463f8958602cf2464e9834a5d680a802a46655051b741c47ec0eed98fb758f8a9e388a982c2db65bd644205a4f9bbd6a8d638 SHA512 c9696a97f8ba113ea6badf5fcb179b749639703ddea443d6d8170f0982214e59bd0bbe58b5e99f847c953df2d772d0bac6b2dc72f89b146ba55ea69e177a7615
diff --git a/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild b/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild
index 09b36c8a2380..d6f2d5ee5d01 100644
--- a/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild
+++ b/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=0
 inherit eutils autotools
 
 DESCRIPTION="iLBC is a speech codec suitable for robust voice communication over IP"
-HOMEPAGE="http://www.ilbcfreeware.org/"
+HOMEPAGE="https://webrtc.org/license/ilbc-freeware/"
 SRC_URI="http://simon.morlat.free.fr/download/1.1.x/source/ilbc-rfc3951.tar.gz"
 
 # relicensed under 3-clause BSD license, bug 390797
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index 0e320c096335..68d56b89437b 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -2,5 +2,5 @@ AUX ivykis-fix-segfault-glibc-2.28.patch 929 BLAKE2B 7bba4bc43cc07221bcb57b4302d
 DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
 DIST ivykis-0.42.3.tar.gz 654302 BLAKE2B 75a143b71bf69371b0b58c8ce342f404c8b67604480523e91b37541c74305950996696dae1c8b03277c240c7ff259560ce26a2899c52fb804f0114b8575918ed SHA512 d67560775d236dd205ef0f5de42bb7fedf52855ff0624f8abcb4ac80a75d4695650fcfbdf88b0e7339bf5c250df741428941881c3d7a2551ffe987cc31dff514
 EBUILD ivykis-0.42.2.ebuild 402 BLAKE2B 9fe4f5097ce2060c52b99c925cd12a9e79742396c7bb3ae84a7a89a1d7d082fc88152a4e06032ad988366f4323a2c10a329f6ff690a2278d0f6bfa4c3f5a6c09 SHA512 ca5974208c11a02c33f7a66c2336e64e054be78b9ed1bad43b55de065ab9a4b939f893c3286544dd87965dcc9a0b1e02a1435b36d02f8b657c41fc0a7c4e7da0
-EBUILD ivykis-0.42.3-r1.ebuild 698 BLAKE2B 37037b460321caf47d539161c8b48e30f4c6480addcb98dc0f55ea8cfaf79d3fa0e81b4883bb96cf27a59907fe7377157362c1aff236da170612afeec7c4068f SHA512 ee337aa472cf47b883c8d84830b78c2f38a14c2d2e6e820211c9aa83a520d97d632600fbe34e4ba33a1bda7690514f4f0f1612bbc3a7e8ad3e3531eebafbd033
+EBUILD ivykis-0.42.3-r1.ebuild 702 BLAKE2B f97e9d269f78e555f9b5c1ee7142861b3ca36b93e60bc78381db4e61acc77bb0e7d748ee07b6bd015a322547d8a306fabb5ef7f9d61334aac190b4ac065bfbe3 SHA512 9e80b57092211b71ac02fe2c046312acb7437831519c7d7978223e077247926e01a5d4532f38f9fe797779376ba5643bec6e644d3d4a651d4e5ab78515edbbbf
 MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
diff --git a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
index cae404ad28b4..d528d45d936a 100644
--- a/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/dev-libs/keystone/Manifest b/dev-libs/keystone/Manifest
index c1a609ff4bb0..c6d178007b15 100644
--- a/dev-libs/keystone/Manifest
+++ b/dev-libs/keystone/Manifest
@@ -1,4 +1,4 @@
 DIST keystone-0.9.1.tar.gz 4326151 BLAKE2B 2d41388f4beeff3c424386c77cb75eeca613c66f80e807035f709822f241ef74f64085260678772580cb82bcceda83b4b3c31b92393f8d70f24d54f77f7ba224 SHA512 3bd9c3793d5862a0a8628b52da381625e62445f661dbd5ed715723e7d9db01ce3f9586e5ca0a5cc71e8ceb6c912050f5c28e3ccd540e72c8abcfd2f0d1bbae17
-EBUILD keystone-0.9.1.ebuild 1756 BLAKE2B 41dfdc5d1d23fdb9d1cc53d219a768e941216c308d43bd0274d9089f8bd93d4e84d5c825bc7a94ef984a3ad3df6f1666c78cab11eed0303f82e2bbcb00db9706 SHA512 bceb2c00391b7d7f3889f42f2eeb0ff8aef5fc49843710141b6f3d3c66255f9a2fa090b476f595a24624a85a07e003e4eb9e5edf33a2ec7614c2bb5860e4acf9
-EBUILD keystone-9999.ebuild 1727 BLAKE2B dab4499cf878c8fc38b52f9e8ddb6db77b346056e105bf45048236c4ec4a500a31c0d731dd84dc64618f14aa6edde62d9ce8cc5e02adb1c7f8d935f0be2a7b7f SHA512 30b00a81d8dcec730b9f03f7d882a204a6dcb12c2c8efae7ec4b8e1a89909ade5ea840ed23cc4739ef220bb2b226a72ea2671d3ff681e0c83078c4147fc0bdcd
+EBUILD keystone-0.9.1.ebuild 1749 BLAKE2B 8cf7bb5945f3e3009db80637d9ab4d4f0ba58f771966fb20c8dc06b3f93da7b26732065e1b9c2c05542eaba7c9f138a0226bd30e8ada714dc7987ff63afe653c SHA512 eb3f249e93cf4d173524c591e5ef23c4f5b2ed08a615e4c9c12da79afb2a1e9107e6e1e45490dbe2c70cff58deda3d33561558dc57150e950f4df5562811d256
+EBUILD keystone-9999.ebuild 1720 BLAKE2B 565f348efacb1d0638b148fdb37f46bfd93abd91c1d1c98a8fdc6629764f1ba8b6f486f95014b4bf1a143428bfc81efba52042df047ef7a758d7c0ab1f3ddb84 SHA512 67ddf41d5fb963b2aa58bfc95534dcb651840242b6df0da9d3272631ed0319d72dbbf9eec928b7eee32ed93f9ac5676d1df6077096999ed8092a57aae3867059
 MISC metadata.xml 464 BLAKE2B c4a2f085ab1343377cc2f2579511924578e22d74b1204ed517e8cebfd163455b36bae21cf6454ae5a723b52d50a7fb228db363f38d0de032ab1ee5e84c6ccaf1 SHA512 b1b21373ba08d12d1e6508dc7aea5f65922436cd71eb864f20da08214e93d419a181da6af4a59397e632cdd27d279efaaac3bdf91e28c1b6145f61fdf2ae4490
diff --git a/dev-libs/keystone/keystone-0.9.1.ebuild b/dev-libs/keystone/keystone-0.9.1.ebuild
index 58dfd226f042..856671cc5809 100644
--- a/dev-libs/keystone/keystone-0.9.1.ebuild
+++ b/dev-libs/keystone/keystone-0.9.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
 CMAKE_MIN_VERSION=3.8.7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-utils distutils-r1 llvm
 
diff --git a/dev-libs/keystone/keystone-9999.ebuild b/dev-libs/keystone/keystone-9999.ebuild
index f3f700fb6607..74cfb58dfa96 100644
--- a/dev-libs/keystone/keystone-9999.ebuild
+++ b/dev-libs/keystone/keystone-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
 CMAKE_MIN_VERSION=3.8.7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit cmake-utils distutils-r1
 
diff --git a/dev-libs/kproperty/Manifest b/dev-libs/kproperty/Manifest
index 0b37ade480aa..e2c89d80a7f8 100644
--- a/dev-libs/kproperty/Manifest
+++ b/dev-libs/kproperty/Manifest
@@ -1,3 +1,5 @@
 DIST kproperty-3.1.0.tar.xz 123528 BLAKE2B 79d94bcdb83c343241d233b528f27e8fcabab587000562e695e03ac3877572c73be28574ecdb1fe2f538df9ea0ee20bc71e95f4c13943da585abccc7eeaf2f5d SHA512 6c6b9bc7db8e82b3c5ec216e42c439dfe30071804b2392026e6284ba7154338e2b6b108f0f14b5db556692de3230d8a780099e73349a740ce6edc68fd7fa54f5
+DIST kproperty-3.2.0.tar.xz 130208 BLAKE2B 22f5b4aafde41d285968f99579b757b8a88dbb12f7ed5e062e44f74c72765b915195961f5ab20e7ef9735a5f82f6c568fa807aa9bb061bfdf64ecfdfc0775793 SHA512 2d7fe5a18fd3520f0dc146ec844cf284c52eb330404666fa1400342c1489a88e1f72834d813cf52f2fd90c8312b5122f542acad7d86ae10a8d1a023c72c368ee
 EBUILD kproperty-3.1.0.ebuild 719 BLAKE2B 1cc093a55bdf549ddf4ab075b376151ccbfa5f90b1043f063b9ab568203982107f2eba2eadcea527b95d800d68cbd6d7ca87509b9a98795fd8d81307a95d2d8e SHA512 494a9d4cdcf4477177a53cbb6bc2d899d771175bd1d023f77f31e5d270804367acc2458ebc8124ae8fffc69e3dd668d45ae4f20946e8a09a2d278b407b80d912
+EBUILD kproperty-3.2.0.ebuild 736 BLAKE2B 8ddd86f127620951b1c83cb0535aee41e722fd0d6894c2a86eef74774f3df65f59f3844f2181b5eb84050087bd5db2b41d1294be1fc5a687a67415a1c814881b SHA512 53e7a181fba23f07af0edc175dbb45132dddd7987bc2d7558155304b3fa1e82e1b04a231ef240a2957bf67978f8f111078553e6b2c655bfeaf6c07f4ffd537da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kproperty/kproperty-3.2.0.ebuild b/dev-libs/kproperty/kproperty-3.2.0.ebuild
new file mode 100644
index 000000000000..a3ce3bb0b38c
--- /dev/null
+++ b/dev-libs/kproperty/kproperty-3.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_QTHELP="true"
+KDE_TEST="true" # build system adds autotests dir based on BUILD_TESTING value
+inherit kde5
+
+DESCRIPTION="Property editing framework with editor widget similar to Qt Designer"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="5/4"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+# tests require installed headers, bug 636108
+RESTRICT+=" test"
diff --git a/dev-libs/kreport/Manifest b/dev-libs/kreport/Manifest
index 3d7280a2596a..20dde93857df 100644
--- a/dev-libs/kreport/Manifest
+++ b/dev-libs/kreport/Manifest
@@ -1,3 +1,5 @@
 DIST kreport-3.1.0.tar.xz 378980 BLAKE2B 9f6289a38e7fc0d6a7522e55dd5e769a52306edb4855efe79f933f47dbc87f367c865fede453c04402ec03046a9b5c5bb7b9055ff1ec6808319939328ef74862 SHA512 9f96d65ee420aab497b591a4a0d48da8df21f3c6a230ec742f4b2ff12f0e14a86a82e4fb114bb91ff334bcd8bdf3beec0f533507923bec31a6e79bba55213268
+DIST kreport-3.2.0.tar.xz 374072 BLAKE2B b0e4a028464f424e1e6661a02233a0e6f711a890892ea34c8c8ebc12675379a233e9aa8b00f9165e9a82993d43ae2086c7a8c0f5cc17cfaa658614225c7b56c8 SHA512 3f7b8bf8d4c5e88de74b38c55b4c82ac1e3ae11db424b10b85884ff479d25640b0ef7c6f90567cf27a1bab099d4b14a042ddf4549cec9ca7d5b237c3a8f7104c
 EBUILD kreport-3.1.0.ebuild 1211 BLAKE2B fc5786598331a6f068df448b4ccf1ca1ec8d07b4b6441931cf617970e379898f48b23d0a942389bebd057bca874a92b07857570ffeb1a3209f432ad01b72a9d3 SHA512 0535792c6b520c8a5cf3cba244ddeecad9e2ee390f89388ef9cb9183bec62181de3a1ab2e1b470d3b1945969ca74fc25683461294048793ef4e6aa163293c212
+EBUILD kreport-3.2.0.ebuild 1229 BLAKE2B 86da19f27ab7f49e53abe7656bfe26088ca4a7277c5a3ac302195be1c45f0ac6e39045aba71da6234b8657c237e368e575774c9c197ae6f986c1e078b9ccf702 SHA512 3b7a100c3e8c0c6e3d6870c664df536d66e16174904d8789100abde7d158180d2505efb6e61c63184903f7a06391978b9243c06ca7b68ce30e5e3192658a3f57
 MISC metadata.xml 444 BLAKE2B 6bcc5b1d127a801fae72db2855c9b01ffeef4d118554164d8d7c02e3edd7d0f00e22f3f6dbf45cdbe1b8c764d6efdbd3034ffc6b8cf041b7e9537d59a6629740 SHA512 7356b187c34c57ab44573e7cd3da164888c2b261c2faecc8f890db1eedae63573587447f44356dba9ee2d6218034e13cb093dbed4f63589a6f0544123f7680b9
diff --git a/dev-libs/kreport/kreport-3.2.0.ebuild b/dev-libs/kreport/kreport-3.2.0.ebuild
new file mode 100644
index 000000000000..b47441c3979b
--- /dev/null
+++ b/dev-libs/kreport/kreport-3.2.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_QTHELP="true"
+KDE_TEST="true"
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+VIRTUALX_REQUIRED="test"
+inherit kde5 python-any-r1
+
+DESCRIPTION="Framework for creation and generation of reports in multiple formats"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="5/4"
+KEYWORDS="~amd64 ~x86"
+IUSE="marble +scripting webkit"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=dev-libs/kproperty-3.1.0:5=
+	marble? ( $(add_kdeapps_dep marble '' '' '5=') )
+	scripting? ( $(add_qt_dep qtdeclarative) )
+	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package marble Marble)
+		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+		-DKREPORT_SCRIPTING=$(usex scripting)
+	)
+	kde5_src_configure
+}
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index d443eada14f0..d5bf8d8769fb 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,8 +1,6 @@
 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.5.4.tar.gz 814395 BLAKE2B 251cacad45e1571d54e7b78201bb0b3578d983022267bfd3438e921f93ba466995629759d9657c71938a5866fc13d1b70dabe2f3a43137ef52164f67da3a8aa5 SHA512 67a3a0a946024d0cee44ccb314d13abb3df83d7c7d0bfe58d5e966d57ef26240dc011a8e6865f017674a00043429379ae9e033a9197c4173c3fa173918d0b0f9
 DIST leatherman-1.6.0.tar.gz 814463 BLAKE2B 1c990c261ded1fd32bb5b1912f84a4bef8ac3ccfae9172e0496f90283e1a2ac210bf9dc1c7e88bcb8776798674d93c1313359135051b4c7f023e1e3080104e2e SHA512 d0d22b60db2c164183268d29fe1bc1ee9ed16797d38174849eaa74841f801869d038e5672664aae89517487811a70f689a345a2c87d3a2f0a04d55214e7f9eaa
 EBUILD leatherman-1.3.0.ebuild 1067 BLAKE2B bcf0fd1db9579bdb3984cb0a7eab5e0e872cf69c2b4304678699d131b5106a02b8ff96a5ada99258ccfea9ae79b8868468e65aba548685ecb93f0e2084548475 SHA512 5195cc683cbce606a7221ae58ed251348559cc843cdb4a273d03a8abbb133a7c305bbe496caddfdaa534d560d6044e50376ce16d2773a04e43e378ebef2e9d8e
-EBUILD leatherman-1.5.4.ebuild 1150 BLAKE2B 0d173c50865b8b66b27286a2e0df530c857ba5a9d48cf81e363905ff2cb0668fb6aca0c282fd56a5d3713d79cde73079eb96c8726c786ebbb9ef32aaabd3071e SHA512 91b7cedb5026b117f5d538d50a3b2f6b3d8583d7eb4944bff08cbc3e756acd255fc5f6d199a9f77b06258c34eda317aff32b4878207e645cc93e17638573699d
-EBUILD leatherman-1.6.0.ebuild 1152 BLAKE2B ccc089da10bfdf3835dc76aeb5dd2f087e974014566dcf62dec23551f1acc7e67d4741cb0c7f2d8c25a51fcf89a516bbb5ee11960c7b148a1713211722288f78 SHA512 d5af35ebba8fd2dc44c7bd264c33c898667812ce95e3557a9f151e8c5b44a351278414ac93dc93162b8bcd63e2a943b5004e359f6a8f1184d8f50c81da839792
+EBUILD leatherman-1.6.0.ebuild 1150 BLAKE2B 0d173c50865b8b66b27286a2e0df530c857ba5a9d48cf81e363905ff2cb0668fb6aca0c282fd56a5d3713d79cde73079eb96c8726c786ebbb9ef32aaabd3071e SHA512 91b7cedb5026b117f5d538d50a3b2f6b3d8583d7eb4944bff08cbc3e756acd255fc5f6d199a9f77b06258c34eda317aff32b4878207e645cc93e17638573699d
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.5.4.ebuild b/dev-libs/leatherman/leatherman-1.5.4.ebuild
deleted file mode 100644
index 3e365ff23fc8..000000000000
--- a/dev-libs/leatherman/leatherman-1.5.4.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.6.0.ebuild b/dev-libs/leatherman/leatherman-1.6.0.ebuild
index 335426971404..3e365ff23fc8 100644
--- a/dev-libs/leatherman/leatherman-1.6.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.6.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/libaio/Manifest b/dev-libs/libaio/Manifest
index eab9eb608ae0..78138c20cba4 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -4,6 +4,12 @@ AUX libaio-0.3.109-x32.patch 2122 BLAKE2B 45d7487af74f14cb5212cdd87137de0714a91d
 AUX libaio-0.3.110-cppflags.patch 629 BLAKE2B 0fb7bee48ba36c68aad96f76254fb7efaa158158f7b786bc4e3b92fefb01cde79363b1ee9898d4b0a9b8637d32d7b0148b217291f3ea493c45fb29539e0e647e SHA512 b39fabcb37e75ab9300d78476a7468359efa883a49822db28d11d305d557f835ac9245b9c8c3e0a8ff6c7fd70125c841056f1e22175025d16a99ce94f849f80c
 AUX libaio-0.3.110-link-stdlib.patch 731 BLAKE2B 9599f75d405de3c1fd38c15cdcac6c65e624674d0be01982d13480fa0fe4020ebfebf0d22b1614cb70d4533f93d1dd58f293aff314a414d84c94fbab499db3da SHA512 b434da8190ca145fcdd64aa788be5d8bd1b44c112e117bfb8583cce91cfdcfb52038189bd9c92d690286e6576d82e74e62b465585f6333f1a920769ddbe29c32
 AUX libaio-0.3.110-optional-werror.patch 832 BLAKE2B d732c6c15247a6b601e4296acfe9733109360dc57f4397f7ae35a207b5c98e652d9c9dd67d52bf4997a26498a58722a77dcceb01df9b0b39289f51596e39aa2d SHA512 14b73acded7f67d01e199c411f2ea090b1d0d666521233d3829ca76572d6962f5dc3560096dc10e13c342eed046fb47a6e370e57fceab457696fad6c888a5067
+AUX libaio-0.3.111-optional-werror.patch 911 BLAKE2B f6ce9b16bfe7d3fe3fde520c4e6438b534b1ea54561faf94229cbdaa2cae40ee6e6ab0e9a689f08f7e43442d1b863bdf2c42e784774cca89003feb5dbbffd63b SHA512 8315c9ca018578d4b8e81b87ce155d8ebfc586be68f24659a91f027449cd27a9660b2cf33ce47fcf240ce44f2b7f1095e8d5996ad08782d91392f6dd8fafa5a8
+AUX libaio-0.3.112-cppflags.patch 610 BLAKE2B f3b79a3b1abdb40741b15a53e3308defa5538a01744f02b13a03af686176c753fad02d6977b9213ffcde6b6fd11261a7c23476adf1a23b87bbf1a64834a4b790 SHA512 160ba75e05066eb5114d7a7e6d14b2e92e670d664c2f179b9703140cbcfa96df803166dff008b0bc0c2edfa7050d03c7d5aa4fbf5d8f4fb1beea02e3ca172942
+AUX libaio-0.3.112-install.patch 1921 BLAKE2B 5338c1deab3152fec06dfcebc3c3527fd8df77640700e9a95db831b30c4b56ffef65fa50dd8669608c7dcc63eba302e87646e63d4fefb2313369ac175836ff23 SHA512 56009ed2cde7b9f7a6e7f64c4348d3b78807e2d72a44f39c811004a14e6757e53a94739e7513ae7e3a1f2efef1ecfdf98f61f24b70a65c6f9d320ea94415a443
 DIST libaio-0.3.110.tar.gz 42270 BLAKE2B e774e5888106ffcf4db08569a8b3dc6722f4e0e8278e9f2fafe865e282c0568059e8dbb37aab7a33719ab4d80f42404bfb1d4ab03f5c066d9eb75301676f525e SHA512 664295d330d6e9adc005e2331e77582619625b479ffc2b81728ba6a682487380ee936079c4a69d35144b458bbe35c612f4ed9b32e913bd7e109b824345763eb3
+DIST libaio-0.3.111.tar.gz 44557 BLAKE2B dc2f44599218de0ca80cfc17f604eb85c9b1241ce7221f49f1a4ee8c5bd3fa135c29ac8d97f6f97550a508e27b0dc92eb709256ffd803c1feca255016a4d674d SHA512 259b89647e22ba47edd4076b8d6aa8ab89af197b64930aa5b01b69fc1969b13b4a5e91c449ccdc9b2746c9eae3160211ce1fe110d252efeca5f2c56d0ea66e2e
 EBUILD libaio-0.3.110.ebuild 2213 BLAKE2B 109c4534a9c9c2329cba96f30bdc0262020e3bbb1d39494b4f0338914080aaee990b780076bad97030fe68e7eba5f9d6585b6011f09e45ff2cd605b531bc2ea5 SHA512 80601b081b9362ce194d91a760395ccbfac4bd8e0a089c55c1715504939b742ec9e4b313dd3fb382058d0ae5a08f9ea8670938a3405655e7de7feb3c1de6ec09
-MISC metadata.xml 486 BLAKE2B 43aa0a024083520564b0d28107823426803ffbc891c168c28a290f74f63b0e3b36d25d7d7d1f4caa6a32fc35ef203147d120c8c4b0b2929d7237a3a216906d93 SHA512 4506edd4b7820f2d86f36d212399d011efe56860319103cc93920672e4a49c2618bc96ed167e69356d2ed3f667520e7874a7a85024d08b81861c3ddf4f26bebb
+EBUILD libaio-0.3.111.ebuild 2189 BLAKE2B 290e8c4db10249c59c232baf00cbbca15ca2fc05fd6fd1ab5e824ecf22205be87fc484e0227ad25ea95167b49f492cc772eaa9fba3fc5e59de40a0a945718aa0 SHA512 5d956fd5d4b1d63468ae7ba8cddb2c57e34f724c9d6ebdbf0f90d2979c06a0d9fba3f7836472619f7529feef7282505ca2b67415f3bd7f4877e7321f6fa62c62
+EBUILD libaio-9999.ebuild 2135 BLAKE2B d77e5b3cbf65b30c3ffa974fa2ea703df4f30d70fe3ee8705644c297686c35e58e807e6f840c571f3fbdfc855f573e71f4f4564f6c0f8b525d82af5cb9878fb9 SHA512 2715b824d05430b8d5f3b252b2dc9354d71869fa7c6cbc676eeec169f8a1d7c1a85f224fa4fc9321b76b3d5280fe35f67f28a5c227c9ea75d21edd1d0475eacd
+MISC metadata.xml 486 BLAKE2B 68cdbe0bbc0e629e59f580672dee5d694d8f411d81f60c249220aa60a8fee8cbac7add2910e265afce266923127fa6d0ccdf7d3adecdc2a25c752cb80028b006 SHA512 e8301c12097a02130a43f9349dea0cfa5418db8c6f76ae638e01631039caf21cd3b9f8a39255c12a58c779270239d7bf086842997e96ff7c0cfedb550fe44ab1
diff --git a/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch b/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch
new file mode 100644
index 000000000000..5b6f91e56d98
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch
@@ -0,0 +1,30 @@
+From ebe62b178f3e5fcde8a311e64aaffe62099204a5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 21 Apr 2019 12:44:26 +0200
+Subject: [PATCH] make -Werror into an optional flag
+
+This lets distros disable the flag as random errors might come up with
+different compiler flags and older/newer toolchain versions.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ harness/Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/harness/Makefile b/harness/Makefile
+index f477737..a155c4b 100644
+--- a/harness/Makefile
++++ b/harness/Makefile
+@@ -6,7 +6,8 @@ PROGS:=$(PARTPROGS) $(EXTRAPROGS)
+ HARNESS_SRCS:=main.c
+ # io_queue.c
+ 
+-CFLAGS+=-Wall -Werror -I../src -g -O2 -DPAGE_SIZE=$(shell getconf PAGESIZE)
++CFLAGS_WERROR?=-Werror
++CFLAGS+=-Wall $(CFLAGS_WERROR) -I../src -g -O2 -DPAGE_SIZE=$(shell getconf PAGESIZE)
+ #-lpthread -lrt
+ 
+ all: $(PROGS)
+-- 
+2.21.0
+
diff --git a/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch b/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch
new file mode 100644
index 000000000000..2f1ba4b7aec1
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch
@@ -0,0 +1,25 @@
+From 1df69d571c5b764c42ba17970707cc29d2394a25 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 21 Apr 2019 13:04:24 +0200
+Subject: [PATCH 2/2] respect env CPPFLAGS
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ src/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Makefile b/src/Makefile
+index 66534b9..44bbef8 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -5,6 +5,7 @@ usrlibdir=$(libdir)
+ 
+ CFLAGS ?= -g -fomit-frame-pointer -O2
+ CFLAGS += -Wall -I. -fPIC
++CFLAGS += $(CPPFLAGS)
+ SO_CFLAGS=-shared $(CFLAGS)
+ L_CFLAGS=$(CFLAGS)
+ LINK_FLAGS=
+-- 
+2.21.0
+
diff --git a/dev-libs/libaio/files/libaio-0.3.112-install.patch b/dev-libs/libaio/files/libaio-0.3.112-install.patch
new file mode 100644
index 000000000000..d1b1873b501a
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.112-install.patch
@@ -0,0 +1,60 @@
+From f8fbbc9733035c96ffb085726bf24d15502e1095 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 21 Apr 2019 13:02:16 +0200
+Subject: [PATCH 1/2] fix up install paths
+
+This is similar to the Fedora patch, but this uses more common conventions
+like "DESTDIR" instead of "destdir".
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile     |  2 +-
+ src/Makefile | 11 ++++++-----
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c1fb831..e9dbdb0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,7 @@ all:
+ 	@$(MAKE) -C src
+ 
+ install:
+-	@$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir)
++	@$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir)
+ 
+ check:
+ 	@$(MAKE) -C harness check
+diff --git a/src/Makefile b/src/Makefile
+index 37ae219..66534b9 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,6 +1,7 @@
+ prefix=/usr
+ includedir=$(prefix)/include
+ libdir=$(prefix)/lib
++usrlibdir=$(libdir)
+ 
+ CFLAGS ?= -g -fomit-frame-pointer -O2
+ CFLAGS += -Wall -I. -fPIC
+@@ -58,12 +59,12 @@ $(libname): $(libaio_sobjs) libaio.map
+ 	$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
+ 
+ install: $(all_targets)
+-	install -D -m 644 libaio.h $(includedir)/libaio.h
+-	install -D -m 644 libaio.a $(libdir)/libaio.a
++	install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h
++	install -D -m 644 libaio.a $(DESTDIR)$(usrlibdir)/libaio.a
+ ifeq ($(ENABLE_SHARED),1)
+-	install -D -m 755 $(libname) $(libdir)/$(libname)
+-	ln -sf $(libname) $(libdir)/$(soname)
+-	ln -sf $(libname) $(libdir)/libaio.so
++	install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname)
++	ln -sf $(libname) $(DESTDIR)$(usrlibdir)/$(soname)
++	ln -sf $(libname) $(DESTDIR)$(usrlibdir)/libaio.so
+ endif
+ 
+ $(libaio_objs): libaio.h
+-- 
+2.21.0
+
diff --git a/dev-libs/libaio/libaio-0.3.111.ebuild b/dev-libs/libaio/libaio-0.3.111.ebuild
new file mode 100644
index 000000000000..1f25348ff600
--- /dev/null
+++ b/dev-libs/libaio/libaio-0.3.111.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs flag-o-matic
+
+DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
+HOMEPAGE="https://pagure.io/libaio"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://pagure.io/libaio.git"
+else
+	SRC_URI="https://pagure.io/${PN}/archive/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="static-libs test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.109-install.patch
+	"${FILESDIR}"/${PN}-0.3.110-cppflags.patch
+	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
+	"${FILESDIR}"/${PN}-0.3.110-link-stdlib.patch #558406
+)
+
+src_prepare() {
+	default
+
+	local sed_args=(
+		-e "/^prefix=/s:/usr:${EPREFIX}/usr:"
+		-e '/^libdir=/s:lib$:$(ABI_LIBDIR):'
+	)
+	if ! use static-libs; then
+		sed_args+=( -e '/\tinstall .*\/libaio.a/d' )
+		# Tests require the static library to be built.
+		use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' )
+	fi
+	sed -i "${sed_args[@]}" src/Makefile Makefile || die
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	if use arm ; then
+		# When building for thumb, we can't allow frame pointers.
+		# http://crbug.com/464517
+		if $(tc-getCPP) ${CFLAGS} ${CPPFLAGS} - <<<$'#ifndef __thumb__\n#error\n#endif' >&/dev/null ; then
+			append-flags -fomit-frame-pointer
+		fi
+	fi
+}
+
+_emake() {
+	CC=$(tc-getCC) \
+	AR=$(tc-getAR) \
+	RANLIB=$(tc-getRANLIB) \
+	ABI_LIBDIR=$(get_libdir) \
+	CFLAGS_WERROR= \
+	emake "$@"
+}
+
+multilib_src_compile() {
+	_emake
+}
+
+multilib_src_test() {
+	mkdir -p testdir || die
+	# 'make check' breaks with sandbox, 'make partcheck' works
+	_emake partcheck prefix="${S}/src" libdir="${S}/src"
+}
+
+multilib_src_install() {
+	_emake install DESTDIR="${D}"
+}
+
+multilib_src_install_all() {
+	doman man/*
+	dodoc ChangeLog TODO
+
+	# move crap to / for multipath-tools #325355
+	gen_usr_ldscript -a aio
+
+	# This lib is a bare minimal shim on top of kernel syscalls.
+	export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n')
+}
diff --git a/dev-libs/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-9999.ebuild
new file mode 100644
index 000000000000..ddaf4e22813e
--- /dev/null
+++ b/dev-libs/libaio/libaio-9999.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs flag-o-matic
+
+DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
+HOMEPAGE="https://pagure.io/libaio"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://pagure.io/libaio.git"
+else
+	SRC_URI="https://pagure.io/${PN}/archive/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="static-libs test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.112-install.patch
+	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
+	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=(
+		-e "/^prefix=/s:/usr:${EPREFIX}/usr:"
+		-e '/^libdir=/s:lib$:$(ABI_LIBDIR):'
+	)
+	if ! use static-libs; then
+		sed_args+=( -e '/\tinstall .*\/libaio.a/d' )
+		# Tests require the static library to be built.
+		use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' )
+	fi
+	sed -i "${sed_args[@]}" src/Makefile Makefile || die
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	if use arm ; then
+		# When building for thumb, we can't allow frame pointers.
+		# http://crbug.com/464517
+		if $(tc-getCPP) ${CFLAGS} ${CPPFLAGS} - <<<$'#ifndef __thumb__\n#error\n#endif' >&/dev/null ; then
+			append-flags -fomit-frame-pointer
+		fi
+	fi
+}
+
+_emake() {
+	CC=$(tc-getCC) \
+	AR=$(tc-getAR) \
+	RANLIB=$(tc-getRANLIB) \
+	ABI_LIBDIR=$(get_libdir) \
+	CFLAGS_WERROR= \
+	emake "$@"
+}
+
+multilib_src_compile() {
+	_emake
+}
+
+multilib_src_test() {
+	mkdir -p testdir || die
+	# 'make check' breaks with sandbox, 'make partcheck' works
+	_emake partcheck prefix="${S}/src" libdir="${S}/src"
+}
+
+multilib_src_install() {
+	_emake install DESTDIR="${D}"
+
+}
+
+multilib_src_install_all() {
+	doman man/*
+	dodoc ChangeLog TODO
+
+	# move crap to / for multipath-tools #325355
+	gen_usr_ldscript -a aio
+
+	# This lib is a bare minimal shim on top of kernel syscalls.
+	export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n')
+}
diff --git a/dev-libs/libaio/metadata.xml b/dev-libs/libaio/metadata.xml
index 9f4f6e46b46a..68c6fef5c3a6 100644
--- a/dev-libs/libaio/metadata.xml
+++ b/dev-libs/libaio/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>gokturk@gentoo.org</email>
-    <name>Göktürk Yüksek</name>
+    <email>whissi@gentoo.org</email>
+    <name>Thomas Deutschmann</name>
   </maintainer>
   <longdescription>Library to provide user-level kernel Asynchronous I/O (AIO)
  support for Linux (needs kernel patches as of 2.6.12)</longdescription>
diff --git a/dev-libs/libbrahe/Manifest b/dev-libs/libbrahe/Manifest
index 2e63f29d0aca..625925f95b37 100644
--- a/dev-libs/libbrahe/Manifest
+++ b/dev-libs/libbrahe/Manifest
@@ -1,4 +1,4 @@
 AUX 1.1.0-missing_libs.patch 225 BLAKE2B 9c5e3e5bd5f6ea0c1c1c20d27e8d4fe5a6e3b7a0a6adc7cb3012a4da1a884cbfc95dc580553f7f37e1193fc5a68891b839fd45c5a2fafd461389517f74862ce2 SHA512 2810c4ac9197c3b1541edc1ae0c30dd2b273b008b394999d3a96cc241d64befc5c3caa41af89398ddb65552ad72033f8ed593977b88fe7e8eeae05e12bdd1f84
 DIST libbrahe-1.1.0.tar.gz 344264 BLAKE2B 84d32344ce9a8f8447b2963d88352a48ec286d1f9c7f39f9ac0da019198cb06f5cc9909eef891ae1e324bfc4a29eea9df4c9a6685f388098ece0888fbeeb4c70 SHA512 54f2d0c9c1c04429fab59d365d6a4144eed29a400edccd7ed9e5d19876565071ac76686da73e7f84c857057c8c52e1b85d2e257203724cbd9f1877d76024927f
 EBUILD libbrahe-1.1.0-r1.ebuild 516 BLAKE2B 20353544e201b08b066ee1c6bd6761f3ba4f8d5e108c03b66c941f14532302fb2a05c0d40702b21198a8c7081baada9a016e9f4f3f489c9f6d46770025ca171f SHA512 a5520700aa021e498795291cc2e4a991c874a8a939dc0b43d68925e58fcba366e349a596f651f1a4543e3d1969657a844deba7ebf046356313b9696dff616f4b
-MISC metadata.xml 245 BLAKE2B 61823ae735b381c891f5cae47974d3b1ea6136d6f5f5d449a26dfcdf26472282d760b4ee8a605b8a7b75b9c97443cbc0db309ada118ce186030f276ed7c88963 SHA512 b098db4fb4d9ea116f6246bc6caf0f49e80e236d2fad78d287b638dbd5add7bfaf7feb1ca081ca557b23dde9227ce42fa808f3f6fd8eaba6a7e9cae93342f9c6
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libbrahe/metadata.xml b/dev-libs/libbrahe/metadata.xml
index 41cd682e0ecf..6f49eba8f496 100644
--- a/dev-libs/libbrahe/metadata.xml
+++ b/dev-libs/libbrahe/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cpp@gentoo.org</email>
-	<name>Gentoo C++ Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index da78c2aadd7c..c44fe6dbd271 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -1,4 +1,5 @@
 AUX libbson-1.13.0-no-uninstall.patch 866 BLAKE2B de38a7659be91d293b33c03036c14607bc3f6214a5970d28b8cbc02d77ee32a04f077e082cb7bf9ae126d13d5537a634c29e31230d444cfb72734fc417b0d604 SHA512 ccfca1aafb4b918a14950ccd99ca6b4f4a3d7d0178a726f6c9de7096a5e5ed700953672ae457a43064b61595df4e955774a4836e5d653d6d73b50cd5772f87d9
+AUX libbson-1.14.0-no-docs.patch 356 BLAKE2B 801760527a7511a0472d85ba6a6ca00d4b59306f5ec69f0f6b5d89c1858d342a7ec724c7dece3a56ea6506a794c876496e54c498d1d69ec8fb5d7869e68ee94e SHA512 e28f9099f382f7e96ce804c32d30976af4df26f2153c3dd250504b33f522f16ded73563a45f306a9439bf27e723c931df53217cc3735362120e88e4c8f3ce8aa
 DIST libbson-0.98.0.tar.gz 4451923 BLAKE2B 2d53cdc0cf1afa189eb1597ccc46a604c98011cc54b6f77c5848e10f044bf5edb9fd57f6a3dce6907ddcec76de043def6d488c8e1b7eda42d7b420b1026c58f5 SHA512 9bae7593198c8ac358978bd6a065d65fb872a15fd43d11839ad5dff1ffbe0362b06cd4bde08032a2c11e8633789328b5d504cd032b7636dc525f6df3e6fd641d
 DIST libbson-1.1.10.tar.gz 4431658 BLAKE2B 1e542797c6617296c0ca7cb6dbbd34be5b31789a39130fb61000f11dfce6f7e3584f884c9350234b9704143d6a3280635cd32572b35e83010a7e9ddcc3f86ff8 SHA512 636178bafb19e7b103b5192866dbda0c70b8d7173560b0466f88b3a85cce3292a7caac9521808fa8c09d187f8c96564dcd9fb787e855d1619610f813583379bc
 DIST libbson-1.1.2.tar.gz 4492014 BLAKE2B 684c5053faf5a7f3afe6063e34247cfe7709afe0c17e8f387cfb337e6cc62e7b79c3cbf018e245bc189899e094858e1caff156344e126ba889964b1112820d21 SHA512 03e2ee337445286c14b846cd7545707959b1d351fa466c6292379a85e48ea1a171dae37dd7aff092212239ad59aac6f1ab216ee5de74ef00a8a2a124559e34da
@@ -7,6 +8,7 @@ DIST libbson-1.11.0.tar.gz 5681593 BLAKE2B 43f70943cc7f1a9f6285c71136b1284be7ef0
 DIST libbson-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54c9ddb14cfc68ccf7ccb1995808f4c4c372806e85e1c8bb8b8541bb8b8b5236fd06d7605b78a4bbcee6560642bec SHA512 e4688da8a94fc499893b6001fc444b97fc05c89672fd9700bf30c6af7f1bbb02b1a658aa74470e0e5d5e72bc28a5753aa7dcda14dba7e75fbce0b4bb94b7373f
 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.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
@@ -20,6 +22,7 @@ EBUILD libbson-1.11.0.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d68
 EBUILD libbson-1.12.0.ebuild 902 BLAKE2B 42456aaffe57314a608d725eba8a97422dc7d686e018cd6d36fa82d6fd2ff8794d22e4198ca402d33d58c9b99c6f090914c89fd80fbde88006941ad35d70593a SHA512 9952847e9a73f83ecf46674ad99ecbde0e738ccdb98ace268bd9bd7cc86258cb4cd9880c057cd974b1fbd00e7454fee33a101eeaa9e13ced0a5f0c0bdacf265c
 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.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/files/libbson-1.14.0-no-docs.patch b/dev-libs/libbson/files/libbson-1.14.0-no-docs.patch
new file mode 100644
index 000000000000..d33fba105ab0
--- /dev/null
+++ b/dev-libs/libbson/files/libbson-1.14.0-no-docs.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3371dae..a6edf0f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -380,10 +380,6 @@ if (ENABLE_MONGOC)
+ 
+ endif ()
+ 
+-install (FILES COPYING NEWS README.rst THIRD_PARTY_NOTICES
+-   DESTINATION ${CMAKE_INSTALL_DATADIR}/mongo-c-driver
+-)
+-
+ if (ENABLE_UNINSTALL)
+    if (WIN32)
+       if (ENABLE_MONGOC)
diff --git a/dev-libs/libbson/libbson-1.14.0.ebuild b/dev-libs/libbson/libbson-1.14.0.ebuild
new file mode 100644
index 000000000000..a21a401d4d66
--- /dev/null
+++ b/dev-libs/libbson/libbson-1.14.0.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/libbulletml/Manifest b/dev-libs/libbulletml/Manifest
index ea2f1e2826ec..aa57a8793f90 100644
--- a/dev-libs/libbulletml/Manifest
+++ b/dev-libs/libbulletml/Manifest
@@ -1,5 +1,5 @@
-AUX libbulletml-0.0.6-gcc43.patch 589 BLAKE2B be9c071b8dfcfaac9ec1d0d55e47e5c83512607468c7c53d8adf03115fccd397c8273978cbcd1871d0b29a6b0c5a411b7ce2769e14db6131f6c9d20fe36ee2ab SHA512 63cf59a3d7edf660cefe103790d56e8f7c630a4247b0a704b538f3006b1159d4b9942bd1576993f7addb888029dfbf1668e802e809972c8273f58a21f1d339a0
-AUX libbulletml-0.0.6-gcc46.patch 400 BLAKE2B 6bd9f06ff92fc394c2a4ff40de819588ee2a71e56e6b5318864fa62bcfe55dac4ee8b6dc48d8348dd25e472eca37b178721c6d8c990e7df3c79402f42911f210 SHA512 5ad1ff38abaf23b8ff191cf2c5897029d8808303453a58e2749b6756f1e0829511c4376deda4d02047afe6e664245875176fe7d9ca505cdc31c7f9ac8f230e5a
+AUX libbulletml-0.0.6-gcc43.patch 577 BLAKE2B 14fe2e1087addc3d4230bdeab2ea19a318c721b1fef66de2a090c153b0e3c6e40f015385db724c2f244fbef94c1c80f792e875899137eab622f4fa27b81dc7dc SHA512 ae8e162ed7297302e40f5139557362fb1271ae8278c9efc0ddff73ab10cad6ec59c0aa281f4eed39d56b3ca64d0e42f7a51fabc2ecaee98870dd8f6458251803
+AUX libbulletml-0.0.6-gcc46.patch 400 BLAKE2B 55fe3b5b3c8f0b29f9df22976ba1647feb5ec3bbfb366b6057211c3f65c1933f97fd6818a232563f0aa3ae03fb5a981d47412786d66aeaf13405694daa880767 SHA512 4f053c3e7a7fb33317f4ac1bf4801593bf16b9c08a219ef2636ead641c7d1147ce01db59d7b9ae315c674f95d3e2973387368e555fa4883fcbb1867ff5349894
 DIST libbulletml-0.0.6.tar.bz2 94529 BLAKE2B 7ec9a69c4385adacc476cacb3f88219a5a7b506a36ece6d430a1a5c470ffddfd20f8f355ac5391c542850b98edf0d40e9dea6061b6ad5da7afcc66b14656311b SHA512 4428d8088eefd2a1336eb963e8c65188b67a82d875cdcb51bad9ca7aa3c864b3453464daf1e6691d52120332fe3a078b9827136d214d9ca87fdd0cb81bb60150
-EBUILD libbulletml-0.0.6.ebuild 824 BLAKE2B 14fba0b16a486cf2cac54d7207378de8f57eaec86b553c33bb2dc28b1dfb96d0b48a9f0dbaac578b84528599e22a07505faeacc395c4a5199473035650706d90 SHA512 9b10204e9dab81bca483934fe09a84ecd94ea72e2901b74f02a255a016a2180022df9003986b7cf36d4577bda6163fe2081141e0e31247baeb6be79c73849fca
+EBUILD libbulletml-0.0.6.ebuild 904 BLAKE2B 01872e65adae7dd8f898bfde9704b74a10a9bab404ba8744596a85b44515c1ebae6eb7852208825841e4cef5b8c7433bb7a68af3e6d5aae18e179add9ad5af40 SHA512 e92728d15989224258f7fe31970285ba7ac3c2597e5805dc9f87a2eea6a21744d47bd2ccc95e94376ea9e211fe62313b502da375d4661aa15f5e1faa3a8cc2ec
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch b/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch
index f7e9bfbab9b1..2cbbda199f4b 100644
--- a/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch
+++ b/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc43.patch
@@ -1,5 +1,5 @@
---- src/calc.yy
-+++ src/calc.yy
+--- a/calc.yy
++++ b/calc.yy
 @@ -8,6 +8,7 @@
  
  #include <cmath>
@@ -8,8 +8,8 @@
  
  #include <vector>
  #include <sstream>
---- src/tinyxml/tinyxml.h
-+++ src/tinyxml/tinyxml.h
+--- a/tinyxml/tinyxml.h
++++ b/tinyxml/tinyxml.h
 @@ -28,6 +28,8 @@
  #include <string>

  #include <stdio.h>

@@ -19,8 +19,8 @@
  

  class TiXmlDocument;

  class TiXmlElement;

---- src/tinyxml/tinyxmlparser.cpp
-+++ src/tinyxml/tinyxmlparser.cpp
+--- a/tinyxml/tinyxmlparser.cpp
++++ b/tinyxml/tinyxmlparser.cpp
 @@ -24,6 +24,7 @@
  

  #include "tinyxml.h"

diff --git a/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch b/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch
index 47e0dc411ac9..ab94deaf7c5f 100644
--- a/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch
+++ b/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch
@@ -1,5 +1,5 @@
---- calc.yy.old	2011-05-18 12:26:38.701666366 +0200
-+++ calc.yy	2011-05-18 12:27:43.020672135 +0200
+--- a/calc.yy	2011-05-18 12:26:38.701666366 +0200
++++ b/calc.yy	2011-05-18 12:27:43.020672135 +0200
 @@ -17,7 +17,7 @@
  #include "formula.h"
  #include "formula-variables.h"
diff --git a/dev-libs/libbulletml/libbulletml-0.0.6.ebuild b/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
index 8a90adf32396..045879e2c0f5 100644
--- a/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
+++ b/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A Library of Bullet Markup Language"
-HOMEPAGE="http://shinh.skr.jp/libbulletml/index_en.html"
-SRC_URI="http://shinh.skr.jp/libbulletml/${P}.tar.bz2"
+HOMEPAGE="https://shinh.skr.jp/libbulletml/index_en.html"
+SRC_URI="https://shinh.skr.jp/libbulletml/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
@@ -16,12 +15,16 @@ IUSE=""
 DEPEND="dev-libs/boost"
 RDEPEND=${DEPEND}
 
-S=${WORKDIR}/${PN#lib}/src
+PATCHES=( "${FILESDIR}"/${P}-gcc4{3,6}.patch )
+
+S="${WORKDIR}"/${PN#lib}/src
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc46.patch
+	default
 	rm -r boost || die
+
+	# don't override the system-wide flags
+	sed -i -e '/^CFLAGS =/d;/^CXXFLAGS =/d' Makefile ygg/Makefile || die
 }
 
 src_compile() {
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index a0b380aae297..64a49f1fda58 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,7 +1,7 @@
 DIST libbytesize-1.2.tar.gz 70598 BLAKE2B e136b1274703da7b3596e7583cea1ac773c1594af09c626f4dbb481dfcc23a3186b03ebdc54bba67d0a063c5d6587f6b7f8b610828c461cfd114eea1388dd193 SHA512 a8151e7440d0ec43d10239ddf08a9924827cdf08f20a16dff6177b444c1022fab905a0567384531e7610d854998111adb77f9a6a98e2d9648c02521f84ea2bf2
 DIST libbytesize-1.3.tar.gz 71648 BLAKE2B 40794a38af8ee1fcc03ef8000b20123c0e02e208f329a75e7da3a18b224e4a8456ce5982d72e4eefa2ff9d9dcd90b98142037dd37be6bc31f25e2ff347010829 SHA512 a50f5d4ea07a295909e09168518f8fc25da8dcd52859beca9c9c3b8c8c180b025c774c730d449ffbd4c7fd5aba07b5d071b6d9ad36f9d9ebc96bb06699aa08f3
 DIST libbytesize-1.4.tar.gz 80943 BLAKE2B d4c6c34d81be01bf7db2c37b0660886d99eff3c0a87024f5fbc12cc3606dc01e772b81dfbcacbf76c62213120253a9e7bda90adbc749b6d4c3e31e1ed3ae7702 SHA512 5dd13cf52a1674be776220ee1863f42261a47dc53af1ce4a31460d6d02ce87e19c5a52260f700928af98f1d9d7a96de7c11d8f384907b3187ef2effc10cbb593
-EBUILD libbytesize-1.2-r1.ebuild 1125 BLAKE2B cc37d56ae5b8e8461518c7d7debb7c8368616332cfe4760c61f96b5c44afa1dce272aa5ed5a9fdd670403690d7a5ce8a03d4aab78bf06af9412e79b4c4de9353 SHA512 d9416468e23420dd3a7af94b7d7513c0d2dc161de65c4dd8e22b900ba4ff0d55ff8d2eae448952a3c86f724f9127d103998be3d37bfb848b7e719f06504179b2
-EBUILD libbytesize-1.3-r1.ebuild 1180 BLAKE2B 74c7becb34b6e8e57e4f2d9eabb8ee593557f6b44be29999ca65d7f81183ad692074606147ad7c27e4dd000bfc961c25ee114c84bdb0a151d1669c11edf1da7e SHA512 eb1d7b1a37b988a41cf01cf922980cfff098d7f1185a259515d90a00b0b8025c91b395235b9bac3579b1b98b2552762f7ae3d9e2c184a4b2ebfa968fab03f165
-EBUILD libbytesize-1.4.ebuild 1231 BLAKE2B e89e69fe587e3612b0f87ba091d2081490071ecc6031aaf9679f7dc816b1710185e74ac3801a4c0c50fbfa8fbf31b196c346bd0002fb06121b0fba7ebe28149b SHA512 78a7d8c2ad3f650edb0c17703b61292819ab06bb028b2476fb13d46bb672b171b6a6a8a36f317534bc06a441569a4a734b85a8c98c3e4ae957a07f9981c1b9ba
+EBUILD libbytesize-1.2-r1.ebuild 1122 BLAKE2B 6f17b8fd6560664dd8dd33861e9016269f82be242785e1f8c30e5e55bf55d81082b68e5ab329286f505b31b2b6a30145e291ecb3665554a84bc4ae5130ea69af SHA512 918fd1fdeeb6b4df3d9f1a66fabac851dff049f14b62b12aea633c6b629fa54b54eb822ec17ff80f11f8784400d59f90eb49ea3812e54c86ca68de1f819700b0
+EBUILD libbytesize-1.3-r1.ebuild 1175 BLAKE2B ecf198112f90310f0a540a29d6dadecf716461c30ccf9d706553ac43424a0a66d06fd725b5eefd26dc2587d54bb463d635b0313582056d2ea5b7ddb1d2925357 SHA512 2f489188c42a90ede2e41d99e3267681d1abc8ccbabf4580797beff0210a595a179c0d38496338bee5b862dcac5d703227f08a9678e698c7a716254351467761
+EBUILD libbytesize-1.4.ebuild 1226 BLAKE2B 07fedb183ab087300409fc486a717a9c4c403d6efbd20d34a785cfe34cac804e215e72840bae8451a2b5f12b757c11025835abc9b02fcf3bacc4ade813255b2b SHA512 806d4df6f59c942c4259cadd6239838a8f57f78f6e11dc8781cf20142d308e2cec282d101aee59bc28c96aa87113bafc01aa38aa8d40a43bfa4d61b3e17dd6f1
 MISC metadata.xml 349 BLAKE2B 3dd4c7645734d29bef7f4224c72284f6bf3583287803ddd3fa94b75f784bb41762d96cd7eb0778f363e9fdbc014b52b93ea86900983553afab993cdba2c68282 SHA512 c54a783eca349652ac007075ff736d1cb53647e702ca8aa12915ae1109e5aee536591afc0b9fe0ac427e41fcf5b86d9d3f47fa5570001c84301c5cba8bca7e9a
diff --git a/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
index 3e6c24e5637b..2696962327c9 100644
--- a/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit autotools python-r1
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/rhinstaller/libbytesize"
 SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-libs/libbytesize/libbytesize-1.3-r1.ebuild b/dev-libs/libbytesize/libbytesize-1.3-r1.ebuild
index 3364440fc7b2..46301df5958b 100644
--- a/dev-libs/libbytesize/libbytesize-1.3-r1.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit autotools python-r1
 
diff --git a/dev-libs/libbytesize/libbytesize-1.4.ebuild b/dev-libs/libbytesize/libbytesize-1.4.ebuild
index 91c6409d7034..a350712ffa22 100644
--- a/dev-libs/libbytesize/libbytesize-1.4.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit autotools python-r1
 
diff --git a/dev-libs/libcdio-paranoia/Manifest b/dev-libs/libcdio-paranoia/Manifest
index cbc2c67ff449..c93e6c185bf6 100644
--- a/dev-libs/libcdio-paranoia/Manifest
+++ b/dev-libs/libcdio-paranoia/Manifest
@@ -2,11 +2,11 @@ AUX libcdio-paranoia-0.90-mkdir_p.patch 635 BLAKE2B ed82c6ad81e3fc9540f9dade8e7b
 AUX libcdio-paranoia-0.90-oos-tests.patch 1401 BLAKE2B 0b4ba222d667325b2413519e1cc16065c756c17c5739e6edf3ade9dc6e0156b5a769f0f608d75624047ae47ed2187f4c80e182e58cb51bf7433a433e6673a695 SHA512 b8f556f39daa9746a87804d2c35d0458f133a21a026c8e5fb7739826d86972b7ed85255e5c3e6e739da40d56a9b8166f9b096308c844a471d4e152b7d39a7b1a
 DIST libcdio-paranoia-10.2+0.90+1.tar.gz 634050 BLAKE2B 10a7f8b2a45e5605afa6961132f0bf949ba51222a6c23b7a933032e3e430e60104eae8f7d49fc6ec18894fe0e826e9387f67f186af0ba277a9e7341484aa8ac3 SHA512 c3d00b57f22deb19be929ba87f41bbd83fc51ca66e8ccc1da7acb4131d85449fdd38161cc3ec0f1714fc0571e219d72029b5a72f853c139aa479695df783aad6
 DIST libcdio-paranoia-10.2+0.93+1.tar.gz 686055 BLAKE2B 5b4c30687c907cc8dd0917263c20e3d55e425cb7fb2a935a79ec6c5cc82c6165a5504fe71b77e314bd4a828b0c652f948cce62fecf94341d20c920c66450d97a SHA512 2bb418c99ef037aeb90ba3db841ea9182c5bc401e74c6f4b552730e6c8561552f7d3e27be71ef4fbb07b4fcd9db418a4fe330d5278e8f41cdd99c757aa4b8bc6
-DIST libcdio-paranoia-10.2+0.94+1.tar.gz 703424 BLAKE2B 592ac7704f60e7701cff4edb7e4dc532cb35603ef47c159c84c6aa8bfa69bdc41e435ac566fd0483cee2a2fd1d03a31202382fc1ccaf179c9183f324d5605d80 SHA512 9b2381491271090bac08594cb1d84de98e9f0a5afc6a2c98e9ffcf4b95addc3adcd0f0b9adeb928dfbf8178356ad6a7ccfeb048685c823d138b2af232f0b4c93
 DIST libcdio-paranoia-10.2+0.94+2.tar.gz 704560 BLAKE2B babb912a7252b25b1d32f7d3cc80d73235383170b16118c4f6fcddd58ded534b2e5a8bb61aa8ca784270fc4631ea3e53cdc88d03b0a7686f74ab1cef7ca35980 SHA512 0e4ed5cc52d0758e945ac7f956c1ca870068f6444df912e2ba5f597947962c471d1c526b5cdab4e092fecb924ecb317667df454497b2e515a4e985693cd86f47
+DIST libcdio-paranoia-10.2+2.0.0.tar.bz2 588472 BLAKE2B 5593c967cc91e7db922c30a0e4fd6a71c81625527b3e3cd19494328c545237c64c6332969e6964ae27cce70b0a7ed9678c2dcf0cf675ea6ea81602071b5a9e1b SHA512 0398617f9af63632d74c5a93c4efae1bc69d339fb7ab2e36dbfa6d19c0940f3bf27ea3ed482698d2842838d2034df3e40304774f1648db8c274d441130ef40a2
 EBUILD libcdio-paranoia-0.90_p1-r1.ebuild 1574 BLAKE2B dbc8b3712c4e67372d2d5329130fc7bdee625ae7306ad8a61b357ac80446ccac85841f1431ab873d0ff7ad5bf443ce6fa56fb66803261dc469e5b61a32ab6acc SHA512 7aa1a3fb8258978074a86f04ec5bb78253505152a13aea868182b46daa2f7ff4ce97adc130e53a0a7f7a2fa2ab7a9959d3fbd71824eb11f42dfc7ff797af266c
-EBUILD libcdio-paranoia-0.93_p1-r1.ebuild 1762 BLAKE2B c43f64a13e6aec5229d0d774478e4c29719b6a9055aa314a56d11b7b3b00161674b85ceef8693f713f11436ce19c730ce502a4e2c5274d2c5d015790f7c3dc6a SHA512 a243098fd587b73e37cd71794618dd56a4351fb2391a63b5f2a7c817f4636c091abce590d6fdef8bb575bb275e06142202d22c93b3ca837a9972d27a6659640e
 EBUILD libcdio-paranoia-0.93_p1.ebuild 1754 BLAKE2B 5f61c570e2dc7e958893cfaa5ef3617c597de277e81fbd2c084efeaee47f0876f2657d4a0b298c201e9e66bf0fef16a86b5f6f82b87f25445c4257bc7e5e6bf5 SHA512 1243a48a69fea0103a7782c741148f7a5901541976907eb8ce948374cf691110be9a94c685bd7a7ec80fb297250f5f1d600db2a8bd851ce2317078308a54e39a
-EBUILD libcdio-paranoia-0.94_p1-r1.ebuild 1996 BLAKE2B cdcc9c4af325236f037f8746b30accb3ac3ba9b243db868d43aa80657a09bf23b3d6fbe83fe355b77fd572dda0d638df8781b4c1354cb12ba225940d1159ed84 SHA512 2da677ab4afc41ec79202dccb1482758da48d34e496b4b82010d0b3248e52794667841cba837ee639ed8debff363c30b67861ad9a9ff67744072bf99d5765daa
-EBUILD libcdio-paranoia-0.94_p2.ebuild 1983 BLAKE2B f52c30321180172fdba8646e329f565ca58153dd6a58efe66e1a4e33c7bf18a6ffc60754cc4da39d6295577162d513a4b33e893743378cf6aa2056b6ae0452f0 SHA512 902bc4b48df3f4948708871b6272a1ee6494aabb43ef2264ebec0e841ee52a4ff70ad1ee69ba1650cc31a5eb553d8e3baec6bda922b0377bd50e9ff5cd80b4f6
+EBUILD libcdio-paranoia-0.94_p2-r1.ebuild 2009 BLAKE2B cff2adbdac88fcf8cee94c35cb1c3f9cefea244a5d51f210ab6c3b19932f7096745a810b83be6a06f5bbe8265f316d36c97e28feb67138c93e1c0ec41b6af482 SHA512 89fb173584c80a3a5aff705e7909f271419b429c3c2f825b87a3b74000b52bc2a12df4444d2fce3a77ff137ed6cc54df0b609e7a4246d1b7c9eb8194b848fdf0
+EBUILD libcdio-paranoia-0.94_p2.ebuild 1982 BLAKE2B fb1b4690d302164cbe4f2f9e6d86fb5349b94916acea665c21a2e917257f4c44cfe702a62e60f3b4931ec7b331d2b7541e11801cd599c6708eb76121b124ca95 SHA512 4760f18a0ee97186eac7be774249f3151d1a96779a0f570368fe426696a5888dddabebd25b8711ed3b8b2cdbcc33267b293052ec0d95767797f0649da46b5c8e
+EBUILD libcdio-paranoia-2.0.0.ebuild 1743 BLAKE2B 7cce094a1f6ce6164989ff2ff540524ab03f17b603e53e72828835adabe356b866e70cdafd89bfd268365b865f88735f1e69a768a26b3750d7334d2503053dca SHA512 e7ebba79695fe2f2c6224168f4c10d34f0a08c20567cc68266bf80483683f3d47dcbb5cf2a63ff598e3350c3b9c322c141b8eb51c60589a905426048cb0fd7af
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r1.ebuild
index 0fe60647a429..85b83bfa513c 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p1-r1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MY_P=${PN}-10.2+${PV/_p/+}
 
-inherit eutils autotools multilib-minimal flag-o-matic
+inherit autotools multilib-minimal flag-o-matic
 
 DESCRIPTION="an advanced CDDA reader with error correction"
 HOMEPAGE="https://www.gnu.org/software/libcdio/"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
-SLOT="0"
+SLOT="0/2" # soname version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
@@ -33,7 +33,9 @@ S="${WORKDIR}/${MY_P}"
 
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
 
-PATCHES=("${FILESDIR}"/${PN}-0.90-oos-tests.patch)
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.90-oos-tests.patch
+)
 
 src_prepare() {
 	default
@@ -59,7 +61,7 @@ multilib_src_configure() {
 	# Darwin linker doesn't get this
 	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
 	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
+		econf "${myeconfargs[@]}"
 }
 
 pkg_postinst() {
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
index 3f1da82d0927..8ff3a41accbc 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-0.94_p2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
diff --git a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0.ebuild
index 4e154159b78b..b65c5ca8d3de 100644
--- a/dev-libs/libcdio-paranoia/libcdio-paranoia-0.93_p1-r1.ebuild
+++ b/dev-libs/libcdio-paranoia/libcdio-paranoia-2.0.0.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=6
+EAPI=7
 
 MY_P=${PN}-10.2+${PV/_p/+}
 
@@ -9,35 +9,34 @@ inherit autotools multilib-minimal flag-o-matic
 
 DESCRIPTION="an advanced CDDA reader with error correction"
 HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.gz"
+SRC_URI="mirror://gnu/${PN%-*}/${MY_P}.tar.bz2"
 
 # COPYING-GPL from cdparanoia says "2 or later"
 # COPYING-LGPL from cdparanoia says "2.1 or later" but 2 files are without the
 # clause "or later" so we use LGPL-2.1 without +
 LICENSE="GPL-3+ GPL-2+ LGPL-2.1"
-SLOT="0"
+SLOT="0/2" # soname version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+cxx static-libs test"
 
 RDEPEND="app-eselect/eselect-cdparanoia
-	>=dev-libs/libcdio-0.93:0=[${MULTILIB_USEDEP}]
+	>=dev-libs/libcdio-0.94:0=[${MULTILIB_USEDEP}]
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 "
 
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
 S="${WORKDIR}/${MY_P}"
 
-DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
-PATCHES=("${FILESDIR}"/${PN}-0.90-oos-tests.patch)
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
 
 src_prepare() {
 	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
+	#sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466410
 	eautoreconf
 
 	[[ ${CC} == *clang* ]] && append-flags -std=gnu89
@@ -45,16 +44,16 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
-		--disable-maintainer-mode
+		#--disable-maintainer-mode
 		--disable-example-progs
 		$(use_enable cxx)
 		--disable-cpp-progs
 		--with-cd-paranoia-name=libcdio-paranoia
 	)
 	# Darwin linker doesn't get this
-	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --without-versioned-libs )
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
+	[[ ${CHOST} == *-darwin* ]] && myeconfargs+=( --disable-ld-version-script )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 pkg_postinst() {
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 2c149f94fafe..5f40d562b512 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,15 +1,14 @@
-AUX libcdio-1.0.0-cddb.patch 1245 BLAKE2B e1b677c2cca08d30edd07caf9a0f55c0997497801ad47db3c88f8759bc8fb74b538bf6e611fdd7273ba5ecd257dacb4f0d26a83529780c65c234ef874becb85e SHA512 17ba1c822d0c6377b0714ac7652b4234bef7a0e8935f4345fcbfee788ed7eb668c14b7f59556d82ed10be61e82c007886a3b47cbc6a86f057deab3028f599638
-AUX libcdio-1.0.0-version.patch 589 BLAKE2B de6870005d782de2cdfd36b0777bace3fa8459745bb907b73a05c4b54bc2419cc8793eb0a9499dab3d60f9599211a518078e78b30935a79e7a36623732ba3a44 SHA512 aa1a647f669f6559af9002ef2173500b8684f51c7b752606bd27fde0bf2931a0922f215d6bb766f3801c593fd83869c9a0618a107d8f1a9d44511301b30da337
 AUX libcdio-2.0.0-iso-ioleak.patch 1093 BLAKE2B bd30e99cd35d2cb09dbbc7dd91133f1649a8761e7f23b1544a65477a77466f6b72bb99eb3ac21980b1cca54590fd5852dc1b9f7fde28a50bc5e101320576bdf5 SHA512 851fb3610ab801a5c62075426b9b51d42c60d35aaf4d247a825f8323d41bce692f48632604b7e6bc03ef83974f077ced371812ce50397dc054d16e353074f625
+AUX libcdio-2.1.0-ncurses_pkgconfig.patch 923 BLAKE2B 848a76241ca173c452cf7b04142c249ca6c33b7d0514f03353bb7b1f43635d1bec36cf9f3e3ce61ab51d6cb42ab123f620fe6fe1706b71148ec2ab9592c0bc02 SHA512 98c16eebd1cd6bf57e85dd3abafba22a4a1f2f88e0d5f1c9ee98d7409c360c6e3dda43233823de97429a54be66969cec1eb8df4bbb7d0341a54c6a1ae475dd7b
 DIST libcdio-0.93.tar.gz 2723371 BLAKE2B 3dc361f48c0ccc22c76ad691f856512a87906ddccdbf05a22d4c8f7f28221d201480e015532be382d576550ecabae40df9e325043fa6cff89b39d77e30b6509b SHA512 a2ea7a1f219e1abdbbb42633003e10ff77b6a879133c96a0c8e7a80fe205c08a48bade1d9941c6493f24d6eb2ed410469b57e19d9740a4400266a6f3f9d3da91
 DIST libcdio-0.94.tar.gz 2355452 BLAKE2B c6a720fb714e6aa0d4425ccf92e4c08172d26d77a94e8a6897ffee197a740de78da8d480ec9af2dcfd59c3f96fb2a823a4e39259389dd82ece4108c6a05a4646 SHA512 e1d3c96c4acc7be923c97109c3f76223adc00b293278daef7d5008b1e5d67f33402f9f224f05120e9e1e8b3a8d1fa1b0bd5069dc6dd309741e3590e2c19e0e66
-DIST libcdio-1.0.0.tar.gz 2343992 BLAKE2B d187a0aba99efa1172cab302fcd020dc2a581633368230a6ba00db6250c8e7d5e66111fba1804ecb0ba5416c876f88f1d07549118bb003d4631c14d0f3e85ba6 SHA512 2beb5c9cf455c5b56f0a8ba641b8fe322c487256b017108fadbdf288e92787fa0b956d2291aa877df5a9b4494f8425de58c0f71d587ef5f9346987733f66e5dc
 DIST libcdio-1.1.0.tar.gz 2348106 BLAKE2B c63959d6cd92288b2d098f19b28a61fc5a7005390186045c6f72392becf9eb5808da7a8b952de166c5b263b9c10e594031a3fb908331eda040c210b984b3e11e SHA512 fe5a0d726974c8678b59de74ce043a5ed464f6ab595bf938e90bc5a348e9e882755e75aa3eecce50ce910b28e2498b5a892402fc0ea8728d382d1af36db71985
 DIST libcdio-2.0.0.tar.gz 2354813 BLAKE2B d3ebf9a20004cc8c75d1e6f97a2cea68f490517e34a4cf84f343d717e49cbb9cd612a3c6911894501f16373e3222e7fc6d175fd6d93d1c967cd21502716b22f8 SHA512 8f48cc71d28b427b16f48e50bcaf0aea171055c72a9aeee383ac4374eee1d3d288323814c3a3f308a9ba097aa815319429c1931072897985a3b02b814766fd4f
+DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f
 EBUILD libcdio-0.93.ebuild 1757 BLAKE2B 1149aead21159668e3f89c703b67e0e21520d75e01c61db4e7ee2c161dd50821de024cd75337583c2d8038baed1eeea267f18a9379b437be9ebf8c6d3f0198a1 SHA512 1f952e8cb5a7490d67a7ac20e4c2eb0e35fb981fd523223548f33d77a5d2185766973933e864342c87baa2c1f29755229f5b643955c0527f3c958425e6244704
 EBUILD libcdio-0.94-r1.ebuild 1766 BLAKE2B a04ab2d78db793aff7738da80db945b159e367c47ddd88b3d1bcd3d8ef108d79074952d58f90a737589a246b55d03c8c57b1d77a2f9b25cbacdbdb7c9e460411 SHA512 0baafcfb707d39df24a23da80356415aa450637c0a70751c08ce7ce1eae2180bbd39e6cfe58c28359cee86c0ed54fa132f0a84efaafbe8130696b5aff5494bf3
-EBUILD libcdio-1.0.0-r1.ebuild 1867 BLAKE2B 6c5c7e85d381822cb8ab25d4e0c69b59160588d98e68e038e09816b686c7d57766d9bc9ed4697400f1fd8c06ddfcd3a2515e8896d4d5f09d251b354a34b87dea SHA512 af06569b609761255605ddc89fae69fe1e9a4e831023f8e5219de2ee19c6247d53e468e79d530f7935661fccf51cea1fac2f70d7b814abfaa396327248a15f0b
 EBUILD libcdio-1.1.0.ebuild 1790 BLAKE2B 1a0ddc06dff2c7a3f42f07f6877b0a76fd4ee4e6c32297c7d606afee07a3e78bdd77886c4ff07a783fadbcbc805427cff41d47211195b353212b6f3f0341dff9 SHA512 20f6efba15c4b0b9b86b54bd720e69cc25a9e87e54963f6c431b25634fd1624ea5277797fa5a2080341b55fea6de4cd0fc15c3e412e1ac70e1f6b8adf7af8456
 EBUILD libcdio-2.0.0-r1.ebuild 1838 BLAKE2B 7c0f3100156395d729a2e0f045c1c5d2d49509257c94c640b9ab2db3f887445548229d83552bf814f1a94eed4828dca959670e0a2e5125dcce859277dd5eecc0 SHA512 c4a412398d1c8c604e8b1a74a2baf6caf3146f9279d7d361338a4b342793afcd4a999a6b1840663db76f6591f4928178a2f51821f31435c6b8ecb288d762bbca
 EBUILD libcdio-2.0.0.ebuild 1789 BLAKE2B bd3747ef0f97375640f5a81ab756492564687a97292d74c75946b4f08ef22ab1e1f590f9db7d89ef4a98f4c4ca49afa1a306a1919da593b33f3e97ad0bd17037 SHA512 20bee0c8ef079f8597b7aa9a1b8dab14e5ca03423e5990fe89abbd7a9e0dd09d6d377e72158031df890ce9361e8067337e82db74d6459be1d7d9b1be86cdc611
+EBUILD libcdio-2.1.0-r1.ebuild 1814 BLAKE2B b70de7253568d6ee62bf0976c3719b5f6a3432240051ae81ed304203907d01433afb0ce767a413b4ea12ce63564d4ae704feaa0de464ab6ca00fd2e014ca90cf SHA512 98fa94ae717eb1792d919011bbbfae049b92a82bf965c88dc95280d919423fae4e405c4e67ecb073f9d5d68c8e87677cffa6a67bfe962b9685d94aea3dd64261
 MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9
diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch b/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch
deleted file mode 100644
index b3781d2a7e51..000000000000
--- a/dev-libs/libcdio/files/libcdio-1.0.0-cddb.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4305bc1e093e4341aeddb857bd1e6203228000cb Mon Sep 17 00:00:00 2001
-From: "R. Bernstein" <rocky@gnu.org>
-Date: Sat, 25 Nov 2017 14:03:37 -0500
-Subject: Fix breakage caused by unshadowing i_first_track
-
-Reported and patch by KO Myung-Hun
----
- src/cdda-player.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/cdda-player.c b/src/cdda-player.c
-index efeee19..333e1f5 100644
---- a/src/cdda-player.c
-+++ b/src/cdda-player.c
-@@ -531,8 +531,8 @@ static void
- get_cddb_disc_info(CdIo_t *p_cdio)
- {
- #ifdef HAVE_CDDB
--  b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track,
--                   i_tracks, &i_cddb_matches);
-+  b_db = init_cddb(p_cdio, &p_conn, &p_cddb_disc, xperror, i_first_track_global,
-+                   i_tracks_global, &i_cddb_matches);
-   if (b_db) {
-     int i_year;
-     i_year = atoi(year);
-@@ -831,7 +831,7 @@ get_cddb_track_info(track_t i_track)
- {
- #ifdef HAVE_CDDB
-   cddb_track_t *t = cddb_disc_get_track(p_cddb_disc,
--                                        i_track - i_first_track);
-+                                        i_track - i_first_track_global);
-   if (t) {
-     cddb_track_set_title(t, title);
-     cddb_track_set_artist(t, artist);
--- 
-cgit v1.0-41-gc330
-
diff --git a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch b/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
deleted file mode 100644
index bdde131ffc8e..000000000000
--- a/dev-libs/libcdio/files/libcdio-1.0.0-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,7 +32,12 @@
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
-          [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
- 
--LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
-+# Broken by design. See also
-+# https://savannah.gnu.org/bugs/?52491
-+# and
-+# http://git.savannah.gnu.org/cgit/libcdio.git/patch/?id=2d22ae18571caf29460a456340ff0603f04af6b4
-+#LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
-+LIBCDIO_VERSION_NUM=10000
- AC_SUBST(LIBCDIO_VERSION_NUM)
- 
- AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
diff --git a/dev-libs/libcdio/files/libcdio-2.1.0-ncurses_pkgconfig.patch b/dev-libs/libcdio/files/libcdio-2.1.0-ncurses_pkgconfig.patch
new file mode 100644
index 000000000000..b5ed62cc0722
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-2.1.0-ncurses_pkgconfig.patch
@@ -0,0 +1,30 @@
+From 04f7da2f190ddc636a5c268f2428f36517f92e25 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 19 Apr 2019 02:24:04 +0200
+Subject: [PATCH] configure.ac: Search for pkg-config with its
+ PKG_PROG_PKG_CONFIG macro
+
+Otherwise the pkg-config command might not be found and thus some of the
+required packages (like ncurses) as well.
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 5f9f9e78..711cb5df 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,6 +27,8 @@ AC_CANONICAL_HOST
+ AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ 
++PKG_PROG_PKG_CONFIG
++
+ # Enable silent build rules by default (Automake v1.11 or later).
+ # Disable by either passing --disable-silent-rules to configure or passing V=1 to make
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
+-- 
+2.21.0
+
diff --git a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
index 039608e47da5..a61b22b9d612 100644
--- a/dev-libs/libcdio/libcdio-1.0.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools libtool multilib-minimal
 
 DESCRIPTION="A library to encapsulate CD-ROM reading and control"
 HOMEPAGE="https://www.gnu.org/software/libcdio/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
-SLOT="0/17" # subslot is based on SONAME
+SLOT="0/19" # subslot is based on SONAME
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 
@@ -21,14 +21,15 @@ RDEPEND="
 	)
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-apps/sed
 	sys-devel/gettext
 	virtual/pkgconfig
 	test? ( dev-lang/perl )
 "
 
-DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
+DOCS=( AUTHORS ChangeLog NEWS.md README{,.libcdio} THANKS TODO )
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/cdio/cdio_config.h
@@ -36,8 +37,7 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 PATCHES=(
-	"${FILESDIR}/${P}-version.patch"
-	"${FILESDIR}/${P}-cddb.patch"
+	"${FILESDIR}/${PN}-2.1.0-ncurses_pkgconfig.patch"
 )
 
 src_prepare() {
@@ -45,10 +45,6 @@ src_prepare() {
 
 	eautoreconf
 
-	sed \
-		-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-		-i configure || die
-
 	elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510
 }
 
@@ -60,16 +56,18 @@ multilib_src_configure() {
 		util_switch="--with"
 	fi
 
-	# Tests fail if ECONF_SOURCE is not relative
-	ECONF_SOURCE="../${P}" econf \
-		--disable-maintainer-mode \
-		$(use_enable cxx) \
-		--disable-cpp-progs \
-		--disable-example-progs \
-		$(use_enable static-libs static) \
-		$(use_enable cddb) \
-		--disable-vcd-info \
+	local myeconfargs=(
+		--disable-maintainer-mode
+		$(use_enable cxx)
+		--disable-cpp-progs
+		--disable-example-progs
+		$(use_enable static-libs static)
+		$(use_enable cddb)
+		--disable-vcd-info
 		${util_switch}-{cd-drive,cd-info,cdda-player,cd-read,iso-info,iso-read}
+	)
+	# Tests fail if ECONF_SOURCE is not relative
+	ECONF_SOURCE="../${P}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index c606be258eea..8b707811fb37 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -1,6 +1,6 @@
 AUX libcec-4.0.2-no-tinfo.patch 829 BLAKE2B 2051bef2e92fa61f4afa90728c99f7943d1d382bb2e91633fd07f8cff73055eecabcd68f3c95928e83ca1e676f3f07c9a5118b51d7cba42029a3826530c3784f SHA512 7ea5c0334535e8f731c12e1f257ff9a08b303ecf449afc0fdff36b1f06107e47356dff42bbf38c9e838adcd511e059e71179fefecc892c631a453160576b0e8b
 DIST libcec-4.0.2.tar.gz 334995 BLAKE2B bdbebeb339ce39f2f740805c4c627cc5190cc0dd57d0d87e3d3aa4ba8feeba103336d035fb8b282358f2e08fa470111be43df4df48870be0e9aa93f35434d0ef SHA512 7bb80965cd1bef713f59bff136dc4a7f1172c4a9bdb8e2f59c6bcc5b74110848c0b2912263280ea68177908a688127e8d7208fc43ce6e65d589343b85395a0bb
 DIST libcec-4.0.4.tar.gz 344976 BLAKE2B ce88730ee6e9f57a3f874dd47343e8bb12bd9d3644b58703f0b797bfe656fa25461e6847db4023fec92d9e9740f0e58b59a203258d39d8883b8ae9cde147f455 SHA512 8991ba96fe9a87e5e1f63ff87f77fc0fc3b735c537e2ee6cb004fdc264d75cecd043e39b49cf9e64aeadd24bb1fb57911d9c4bd6c494d9ba4035d7320c268116
-EBUILD libcec-4.0.2-r2.ebuild 2163 BLAKE2B 4883f1ea58c7ca5cdbfa0d61c99e8f4b261ebf8d4e350d6fa764a333267a1f4e37324f085381cff91b329713ef0b3dd54e1579bbf7827125a6f6ef0109e6b9d2 SHA512 85f4ab4548364ceac25394e3939655ab404315e6e18f0fb8de2aec05250e359d08d187a2724557469e4fc092eb8a2a21a757f0dc317a0d59379bc90d55ddcca2
-EBUILD libcec-4.0.4-r1.ebuild 2039 BLAKE2B fffbfb3bd3063c8e22e4f607a698c505fff32644300c91c3095db8106b3f8bc4f45a5eba86510baa9178507eec2784bedbaa6aa309029f788313cded6d18bad9 SHA512 51478b0952d8c2fa1946d6b4d347182d64b80bded61c31877744d84c68e52b376fc64b0b3daeba10dcd77c64095ecccad973511635f1698805a1846cb7a61941
+EBUILD libcec-4.0.2-r2.ebuild 2156 BLAKE2B 0a245492984af445db8a51798b15b2c1a3df525247489fd404d52e81637cfdd16e734cc7870a40141be2675c164956bb60daa29df2444d718543152df3843565 SHA512 956c302374463bd798916c81ae5bce5adc74fd16fc21bb50272fa5b853aa464eac1657da1049ff0834ba39589e19d43a8b701e6335c6494e4c7c8769e0ccdd65
+EBUILD libcec-4.0.4-r1.ebuild 2035 BLAKE2B ae289b16a60c6e0e02e5a9854aa1466fadeb14c3967c0b4b71d1ed7c9968eee9a7a588549e7fb4037c8ad937e304abec039b6ce704393f569e9d082ae2eb7d27 SHA512 aa04477c02bca7b841d6723d34c66202bcc9f4e32eb8bd8d822d7544db4faed3c54601d63414d0318c9f60cf7a8597a492df974514b3aa46ddc96c954c0468d6
 MISC metadata.xml 662 BLAKE2B d87a9b256eb1cec65184415c8172819e8ffd47f38da6ef0aab46c0b8c40ff09b6b365d4051d44d2fee46a4bb0a7c0fbc0a87d92a171e92961b6f6b7a50d5868d SHA512 5abf50f31e2a18c7a5fce12414dd74efab13be9ea00a70b84384de8f95722f327d7446f51369b7feb33616bc0ff182cbbb7dd0be2855f5b54aee4e3c69dbc59e
diff --git a/dev-libs/libcec/libcec-4.0.2-r2.ebuild b/dev-libs/libcec/libcec-4.0.2-r2.ebuild
index fceba826543b..560a9443d235 100644
--- a/dev-libs/libcec/libcec-4.0.2-r2.ebuild
+++ b/dev-libs/libcec/libcec-4.0.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
diff --git a/dev-libs/libcec/libcec-4.0.4-r1.ebuild b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
index 029ac76b88ba..949084865bd2 100644
--- a/dev-libs/libcec/libcec-4.0.4-r1.ebuild
+++ b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
diff --git a/dev-libs/libcgroup/Manifest b/dev-libs/libcgroup/Manifest
index 3d5a53a00ed5..68c10eb12d26 100644
--- a/dev-libs/libcgroup/Manifest
+++ b/dev-libs/libcgroup/Manifest
@@ -11,5 +11,5 @@ AUX libcgroup-0.41-reorder-headers.patch 953 BLAKE2B dcc4936227cfc67ddc0c32b2074
 AUX libcgroup-0.41-replace_DECLS.patch 5193 BLAKE2B d22bded7e356b31e9f1e8ceec50f7987311f36453ffd13acaf48e95eacce06052c19a89aedfbcd068218a5fdefc26e5aec737d1c00576f25fdef0b1fe658513a SHA512 c7601810e491764c30e8adfadd65e1b1b578a07af24df62cc9a7b291622d806fc196a98e01957b5acbd3bca072617bd0ff54cae200a8e6c21b5cca4d18cd45db
 AUX libcgroup-0.41-replace_INLCUDES.patch 3064 BLAKE2B 1947d306117beb62dba48d46b9e3caa7e2d5195c6d661b2d061c982220b7d3d92d42d4ef23172e34bf32be2e54b6c82c531aa839432e0489c2abe463b93e25f4 SHA512 17c8fa471347da4973969b954f966501d54889050766dfdd225235dd4539bb4249d57e719fa7a894aadc2e0f7296d233c89c44c96291a9266c958ca3a319541b
 DIST libcgroup-0.41.tar.bz2 500120 BLAKE2B 3410b430aa58613b5b9abedba05bef99b1b8a1fd619d55fb446ab951e052a336efc918879217055bceee886a03d97c3ff46028a87e8231212653a886cfb80521 SHA512 1aedb02cd2ce3bc2e2a328a247a92976ad0978ca4d3aee4eb671fbcc6bb270348efc78dcf84f27fc500f8bfb9bb57c7d6e4d429ef2bc69e4e5118b7cd895a6bd
-EBUILD libcgroup-0.41-r5.ebuild 2418 BLAKE2B 84688a35fa6f7977bf60699e9397950de5878c414297d8ef3d826f21ec341348615cbfc1aaa5fd56f7ffead9466aa7733c0c79294ce45410e33897272a4b6bbb SHA512 f6e55ecf4b2a3edec4bdf513837819b254343717f1fa4192f5a5d2da09092ebf717d01ff42a975597c6e70bebf182dce2150d1a0e4bbb258cf4a037138d68f31
+EBUILD libcgroup-0.41-r5.ebuild 2424 BLAKE2B 3c6c60afca6aa1e70ea5f19cb2b3622fee78859ede6b9e5d7d515b4689524acb503f56bff562db03289926c2b5ec8e60734722c36c25a0de6fd1c20d81640caf SHA512 8a30f0acc708652af2e772d6869f80e03e5f71fd7920b65c89846f4520ff77493ee6459eed50ae23d1cfbbcd9953ee7fd1ef0c48d65846d1dbededbba3d7fee7
 MISC metadata.xml 700 BLAKE2B 4638c1287da7cb72c04f77ab1f8c9a46888f0c45194a1221fcc03e2f0ea0b148e7edd4608d2bf61a527dcd8f1701f91a123ecde3118b5f93bad67e56afd6e714 SHA512 faddc728ee6971cbf5e52bc89999f3bec9d312fe04d2c876a2ee69e6533ca1ba85350d0b504bff0c7da668b58a3531606fb3d67cb4f6925c08f65df2190ec0c1
diff --git a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
index 6c2563903010..1acdb65f88b8 100644
--- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
+++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/libcg/${PN}/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 IUSE="+daemon elibc_musl pam static-libs test +tools"
 
 RDEPEND="pam? ( virtual/pam )"
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index e503963f2dd9..7718466eadbd 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,5 +1,5 @@
 DIST libclc-0.2.0_pre20180915.tar.gz 170385 BLAKE2B 43a90347936be5ad383fe4e4b06523aac455596d6cb1fc58038811ea19b4f6ab2091ffc345e68ff2ad7f7f1615713085000711b31b9d1ad3911a85bc0db93d5b SHA512 5b8e68f7683d72390d8f9c263e15a54b4b4613b73eff2bf3881d7a35d6480468693a62dcaed159fd8421ae80768d6aaebcd6c33163b082c0a2cf15581d37dcab
 DIST libclc-0.2.0_pre20190313.tar.gz 176803 BLAKE2B c9ecd5053685c2de89d92ae4e9cc9e9f8bee24ca05e5ddca6fffd0b45356b7d4a96b54d9bebf316624e0a49594a33ebb156ae6c4b963093bdc6c1067548b2bd0 SHA512 22813bcd76e77c018acbdf2a3d3d300c2996e169c17729726ae8a93c39f85033cfa1f6d43907a7c026451bcdfcce6fbdc64a202961492aa951ef1b818c3f9335
-EBUILD libclc-0.2.0_pre20180915.ebuild 1929 BLAKE2B ed2f30e8c895d94fbb3eb7153b454985da5504123b9e53ced2d860f62c6c73db7e59489a448f986d3d6f125dbe359c4e563277755a4268a4eba4c941ecab971c SHA512 c9164c36b2c43561ecfe1c606a0dd1836e58cdb9458dc8b04ecbb3373dd69021f22f40b91df1fb8b098ced114af2d5fbed0166f45d6f5f782c2db8e81dc5e047
-EBUILD libclc-0.2.0_pre20190313.ebuild 1936 BLAKE2B 44159cedafce465f3387ea0986856f66ec946a9f292b6a9d88ed8eb08cbde836f6a9d7f03999f2c1e9750e81638412c43b041d4f51dcf5e19e94184ede7a3e90 SHA512 639a50a040eed72be279ff10e499deca9821b7c4fedbed56482c7a42e3083a3081452f2cabc43297b500695d66b783272b8a74862843ba930abf6fc271702f95
+EBUILD libclc-0.2.0_pre20180915.ebuild 1919 BLAKE2B 46b75b65909ecebed20e357e44929b861cf54a9838dfd05a33cb85f30794e4e92393c4b2cc86ed4113254c31aadea22c7bf0cc8e0375db77a99f8ac0979fcf34 SHA512 c0df7667b61caaff6cb607873fd691739bd3999e82862323d7c9144b076cb95583efd5f3ef4f744b7f26d5bc6f93e99498786f5cbb60bb682b6ed4993bbe664b
+EBUILD libclc-0.2.0_pre20190313.ebuild 1934 BLAKE2B 07b17d62e8e3b11a3a117bf874d5bcf91428b7865fa9893b557c39868fb202b406c1ad61c086af6c32d8d43e912f56ae678bf18256ffa9f9253be89c92fae642 SHA512 b8b1728446ce23bebfd88f559fa6dee45a31460ebe8d992039f4c0dc092ac63b29437de121e96df3413f71c8dd28c61891ef926574be887455ae6fe8a4fec759
 MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20180915.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20180915.ebuild
index d72f8432fec4..fb844443dd38 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20180915.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20180915.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
 
 EGIT_REPO_URI="https://llvm.org/git/${PN}.git
 	https://github.com/llvm-mirror/${PN}.git"
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20190313.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20190313.ebuild
index 04840dd6a547..4a5752c12239 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20190313.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20190313.ebuild
@@ -30,7 +30,7 @@ fi
 
 LICENSE="|| ( MIT BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
 IUSE="${IUSE_VIDEO_CARDS}"
 REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
diff --git a/dev-libs/libcoyotl/Manifest b/dev-libs/libcoyotl/Manifest
index cd26d7577cde..ff476514fa1f 100644
--- a/dev-libs/libcoyotl/Manifest
+++ b/dev-libs/libcoyotl/Manifest
@@ -2,4 +2,4 @@ AUX 3.1.0-gcc-4.3.patch 1106 BLAKE2B 1fbd61c40ccff44e3122ec297a645651f4288b13f6c
 AUX 3.1.0-gcc-4.7.patch 286 BLAKE2B 760411a919d57e0209d520225c7b73524a4fa7a9d96c1d07b57ac8aa7dec8de56aa243b69f0bcf9ef361e1b7e555b5778c3241e2154880ac2f7eed3f95bc5d2e SHA512 616ddbebe40254ac0d4b04f7f7633c3ae77a88d261ea8c74f4105f803c2bfffcf5eeb50822d65a9a3aab58cde020464b8ce7ff56a3e8551b9a04f33ecf35398f
 DIST libcoyotl-3.1.0.tar.gz 346384 BLAKE2B 7b3b63e5cd629bc5a53e95d6fb35f9f8d64df593eca95bafce71934560e38d37b89efa3fa8a0b12a50e570d761609cda4bbdfbd0a1577d062a8c4fa5e12a07a1 SHA512 18d0a71204dc57d44f73fe03fd88c2a040e83615557cf1f018c22ad7c9a11d793c7f71df8e10a156b9fd4fae910882ed6cec37f9e57efd3546ffc15fa82a51b5
 EBUILD libcoyotl-3.1.0-r2.ebuild 964 BLAKE2B d6ff2e1431a16d61c1facc9df9cf32206efa09f55e27f9e1258e5f25ff554efc5da5bd8a877ff95f352c69d0ef3388b77d155d6692281468be8ffdfea1b3da40 SHA512 7d31f5c23ecfaa484c37fdd22dae9fcb5bc907f862d8e67d499780259bbfd632090833ed67a9c65a8479b0530085ff762272787357e5aadbaf971aa0164742bd
-MISC metadata.xml 245 BLAKE2B 61823ae735b381c891f5cae47974d3b1ea6136d6f5f5d449a26dfcdf26472282d760b4ee8a605b8a7b75b9c97443cbc0db309ada118ce186030f276ed7c88963 SHA512 b098db4fb4d9ea116f6246bc6caf0f49e80e236d2fad78d287b638dbd5add7bfaf7feb1ca081ca557b23dde9227ce42fa808f3f6fd8eaba6a7e9cae93342f9c6
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libcoyotl/metadata.xml b/dev-libs/libcoyotl/metadata.xml
index 41cd682e0ecf..6f49eba8f496 100644
--- a/dev-libs/libcoyotl/metadata.xml
+++ b/dev-libs/libcoyotl/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cpp@gentoo.org</email>
-	<name>Gentoo C++ Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index 12e101ee0c9d..599323cf75f3 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -1,5 +1,7 @@
 AUX 0.6.12-CVE-2017-7960.patch 1285 BLAKE2B 10118fd008c5c009052f8802db3d65693806c4e90a29d06ae8cc9124b3ce4d2868d7cc689285b685841d989f66100ce50ccab0ea145152bfc818beeb1efff4fb SHA512 736240327aeddbb9a2d7272a7dd3dff2b459e5b99bd81ab9d881644c995e51879d9b3e9c8080571bd387d8dd46ab5cf656f8e2b4e3715fd5548ca32b1d77d58d
 AUX 0.6.12-CVE-2017-7961.patch 1437 BLAKE2B 8678147cc24ff674b067691a3eeae42a5731faec2740c23a4679f689b51b160e51f0ec451b38954fb644b2545fab120aa2e97bd22bce253f5f4e5c1b7c21e22a SHA512 88cbcaf64e4c8ceb7002ffd05ce5f42880bd37a25f8c89e927760f0fa982122cde3819ace2e730cc0dd0e093812ad8470e8783477bc2bd10fe05aacf0b3e0e4f
 DIST libcroco-0.6.12.tar.xz 482028 BLAKE2B d43b73ba21f600ec6d549b867a58db956e081ca8b0787db577062e36487d23cd99b384ca3269421d26aff9825725b262fd6a3e48be73448fe984548ab3eb080b SHA512 af9a171d5ccded255b57f170576e67155f12fa0f61ab3e379e907975f77afc37e82e22772c6019b2897cffc15b2425faf3ccfda92b1a45b23eda2519debabeb6
+DIST libcroco-0.6.13.tar.xz 487840 BLAKE2B 511212f1849343d55104cc6d17662cacd524bae098bab12d6db58df41710c8dca2c5beb7a37e42feac6d856934a07feb3d11c55dc74ba055e21066f2bdefb260 SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4
 EBUILD libcroco-0.6.12-r1.ebuild 1442 BLAKE2B 9f5c7428459553d93c099cb6ed0c1f6b3e0fe0bdeafec490f0e709f08f50045761748639b4b9df2e58fd4ad78e8bf2e30152b5654b2cc277d3467639b4f556ec SHA512 c25781b12bcc99c38e4a55e4dc03b8c27171e60b84c8095313c3b705446e2c02cdabc0d7206bf0aa459296dfc687f3c7b573513a4cbde71b5f9df088c8cd4846
+EBUILD libcroco-0.6.13.ebuild 1355 BLAKE2B 4713fbda7e3446111c8f54cee2aa25994d009f07da28ff446743515ecae0bde196ba60fa22ee6bca344a456d295b1db0ac61a85712d990bfa4474d5bc40c8dce SHA512 8723c4115e595080c92177b7fb25e11e63064bc604cc51796d8f46cb2e1eda188bbfa43c1f7cafef082f37cbeab11c3573591b513748be5c3e968012c84e3259
 MISC metadata.xml 597 BLAKE2B 93f85899d5ecfde37206061e57a03b1eaa181d9e2c105999621da011bbed2b11efaae603c2dbba0b405917653adc75cf849e92682e798e9514984e5577fee90f SHA512 9161b1cf0d796d0aeb681374b278be7938bc551316d6d7fc4fc1e19bfff4477f6b12bf606df0eb17c57e08ecb257f358f579a232ce6dbd6cc2f838aee4e2b9bf
diff --git a/dev-libs/libcroco/libcroco-0.6.13.ebuild b/dev-libs/libcroco/libcroco-0.6.13.ebuild
new file mode 100644
index 000000000000..648acf75f0eb
--- /dev/null
+++ b/dev-libs/libcroco/libcroco-0.6.13.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="Generic Cascading Style Sheet (CSS) parsing and manipulation toolkit"
+HOMEPAGE="https://git.gnome.org/browse/libcroco/"
+
+LICENSE="LGPL-2"
+SLOT="0.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	if ! use test; then
+		# don't waste time building tests
+		sed 's/^\(SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed failed"
+	fi
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		$([[ ${CHOST} == *-darwin* ]] && echo --disable-Bsymbolic)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/html docs/reference/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+	einstalldocs
+}
diff --git a/dev-libs/libcxml/Manifest b/dev-libs/libcxml/Manifest
index d59eabd24313..29e0074896d6 100644
--- a/dev-libs/libcxml/Manifest
+++ b/dev-libs/libcxml/Manifest
@@ -1,4 +1,4 @@
 AUX libcxml-0.15.5-respect-cxxflags.patch 444 BLAKE2B d09005bc9687c6633d8a3ab0dfd0d0a06304317225c300b6936d89e178413b4b4a560b409baf6f2cf45a64d09330e9434d3073c40897557e5534a8cefb2ce28c SHA512 23b8d1078eb397e03cd9c251ee859e799840c07d73c96cef122aa5031d381fcb82d33b79779720d0d2ac26bf2a7dbc82167752bf15472d010ddfe12d129342ea
 DIST libcxml-0.15.5.tar.bz2 137328 BLAKE2B db8e8f1edfe6d03a1f60f9f62c1c3b33e9c092d0031aed4369b7c0075eb16432d8244a2098e75be6845905451a61e379829a80183acdcf9acf33372c354042ea SHA512 9ecb333bbd3c99c388bb08b28e6cf2cae97e5a5a6df29634f041e2718a5d995dabfd73686fe1494eac9d45198dbb1530fa8d5502a8ed3ca8010db087712cb87d
-EBUILD libcxml-0.15.5.ebuild 803 BLAKE2B 55fa36df1514cd230ce8c2da98caaef76993548bd78842371f90c06225c888841c1b21cd7a52a25e1e868fbe0a19a20ca3e04a7a65f4ccf532c27a2df3df96ac SHA512 7f4998091f1a7af3d9a9f09083b214a3cca49507b238efc0d9c4d61efea6820388012171c3e512a5ec3bbbb29048aebc3349367ec39b5b07441007bb302d89cd
+EBUILD libcxml-0.15.5.ebuild 793 BLAKE2B d2e4c47c977f2623e046e29f67efe27dfffe0171ab3b19ac97f121174259b1f739545bba855065cb25e7c48f0ccdace6d48900a6b1f4a25ae3ab7f24a8b1b5fb SHA512 739cb8302c399241ad81bb7cc683d12c85ff75bc2be76b9ba8a5d7e6c22dff9af14d3763e505a7a0eb9f8aa5f85ae89a78627ce172700ca0d148a1ae8ff2ecfc
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libcxml/libcxml-0.15.5.ebuild b/dev-libs/libcxml/libcxml-0.15.5.ebuild
index edbcfc29fa89..bf7836c220cd 100644
--- a/dev-libs/libcxml/libcxml-0.15.5.ebuild
+++ b/dev-libs/libcxml/libcxml-0.15.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
 PYTHON_REQ_USE="threads(+)"
 inherit python-any-r1 waf-utils
 
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index a7b217760a27..a4175bc7a90f 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -4,6 +4,6 @@ DIST libebml-1.3.6.tar.xz 57764 BLAKE2B 554f9d4d162d02ba05e2b1eecd688a6c25a4c727
 DIST libebml-1.3.7.tar.xz 69460 BLAKE2B 53cb7ab3c553cc533b025bdf1953c1de33108e506900e8df0ecafa5f88bc43b0a54611c69bd169401ddea162a1e669bde0e93dc38255b8ea24d04dd41fae9599 SHA512 ad574a73a1d2c5fbd4581991ff790ef22cfcaf5645295b06dce36235b43d552bbec3b400d3c80550c8020ed3720226fad05348c6034c444da1106439c7fd9fc1
 EBUILD libebml-1.3.4.ebuild 834 BLAKE2B 11fe2d8ebf1fa93a7fd9c866a9bd556d00ce6da0553be6e39b85c61e711a8277eb3f27e212c00609cb092f16e7fb403285ad29623f7e8941a7bc7c96443becd7 SHA512 edc8bf5f0137d8fb44335b0ceb64a66c98d2eb88bde15b93f7350fdc2b80077006c5e31c8ea567b0ef6050f08789a1566ccdeafb8f6ef98e3559d344f85047b4
 EBUILD libebml-1.3.5.ebuild 833 BLAKE2B 63ffb0503ef6995d4317638ddb15d27fc3a29acc173db763fb792ffc240c9678b787f6bf6cc9e50575e47ff682d262163268a80cd3c8ae40cf5ec12dc384e778 SHA512 e4157e6a8d7b5b4c1ed559a474cb9b9511ab7eb76d8238eca97278bf694a37fa00114b0ddd881984886636e2ef65becff655374a4d91b8e66297e91e1b65852e
-EBUILD libebml-1.3.6.ebuild 633 BLAKE2B d1399530eeb8e9ed994e103fc38d67cd958fb52afe180cb92f2126a856ef7725c426fea9cc8fd636c956eadcc601b75e759239703deaefcc0de325e6bed1dd0d SHA512 34cafcc43781eddcde12b9b50507ff7c784b9b906d865cad4221520d36c8c2bb276fa7aab915ba72acca47ced29b6927bf48fcebdcfb3819e2791c1cc34ea654
+EBUILD libebml-1.3.6.ebuild 628 BLAKE2B 8e0a5329ebcb9362eb25b9d4529e9d845f1a2f7b1e536866525d14d2a68765f407e95451e761bbdfe42a6a044bd45ab0c03502976200c628e7ae8bef0f412296 SHA512 c7af5f28fdb110d2992e490a9ffab2f2337aa33e1b286adf0ebe1bda5499b97e08ef1e3a3440993c2b8dbbd7bf974156d2b62c8483077229979bdee2835f64be
 EBUILD libebml-1.3.7.ebuild 635 BLAKE2B 5805ef9b68f9391dd868c94a44d2841283d61488e74a44ca0676d6f6fcf9f04a975cdda45f31c22cfdc428b7b90bc2ef904dee8f2a504afe9f3fee4cbe26a7c3 SHA512 7dc35d4f04ae4b0b9920bc86d765642896559352278ed5e14a3290bfb935f89297498e6a2822a7026325f4b87463aec64cfa04970ded60893dbab6e0d3dd3f77
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.3.6.ebuild b/dev-libs/libebml/libebml-1.3.6.ebuild
index 3d3a4aab7d5e..1b8ed127ad85 100644
--- a/dev-libs/libebml/libebml-1.3.6.ebuild
+++ b/dev-libs/libebml/libebml-1.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 src_configure() {
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index acd703e8c9b4..3c46e12aa836 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -8,5 +8,5 @@ AUX libedit-ncursesprivate.patch 497 BLAKE2B c333a5d914047fd13faab9a9782c18893ed
 DIST libedit-20130712-3.1.tar.gz 483857 BLAKE2B 9120e9ac2f0d20841fea7d3a41fbfe2c1e79392d3b6dcfcd44517ee61d662427ea6cda312d2ec47ac92d61b9292684b8bbd8f92de0832909fadfb1b0cbbb4f81 SHA512 9fb3173a65ea2cd2ffa9af0666aa3e227b7d6be26f3e84f30ea3449b0c80fc5e91b618e939f7047bf885b96689ede93733f7eba614d4fdd1a4baff3f130b432e
 DIST libedit-20170329-3.1.tar.gz 508504 BLAKE2B 83857f2e56c1f3857e981556c4d5bb90580293a1b9b038bd08beaa2b3954ccee0b30ccdd716cca95d1811841ab8ada010084ec5cd9ab8407e996c713d0991cd8 SHA512 597ed2282240be6dc3c4a7bb8b4ade31fe16ebfeb2229e3aec58643a65882653cc91deb300343d1b1cc588959dbf95698122c4005e47dfb947efa3e6b134bb82
 EBUILD libedit-20130712.3.1.ebuild 1261 BLAKE2B 51dd1e5fd520ea9e26ef766c45482f2321cef3e98fd8733d32a07ddf8da31fd7b9eee1bc118304e111566e9ffbdd882a7dadb599836984c3613368e335f199f0 SHA512 94d5067ba06fce95e621c4d8655a38092eca85480f2dab71ba4bc69248f568730544766db6ecce6f702c8ec58b7caf7b10a3202dc44f7ee829e3a14cdd43e6a4
-EBUILD libedit-20170329.3.1.ebuild 1273 BLAKE2B 0615586243e36567e681b4ca8fd0217893d8d8a3353e27d0c6c1a29ef931af8efa6022b4a9a96a992b694e046dc1fec4c96140dd7970f0f74e93c71a96efb5a6 SHA512 9c1f45fa3e49b3e1d9f50ad664bc9b824701926a2ed00395e85f730a2d39d2bb09484b931a5d2add87191bbd3ebb5737a3d277d8084d5939176ae5210ae99c72
+EBUILD libedit-20170329.3.1.ebuild 1271 BLAKE2B 9903f921e5d2e4081df15d1411f8d1746d1803919623358c2e1f2fb1fc92ec2d46bc2ea0fb67b89498f550332ee8ea8ee3d6c97e23cc66defe2cc61365e980cb SHA512 45aaa215a955cf5fc61de6c8eaf33635a899e014897c99aeebbfc173b17950ddccbf130a658025f8442f327cd5b22c53374922aa5583c02bb4eb3bbce0876e7f
 MISC metadata.xml 636 BLAKE2B 22880383d39383e11fad886d88db603fe58db1e52f36528f71db2bdec95c74dd50fe7c76bce52f5f3eea47fe61d1dfd0cb7264cfd9458fd8b5db40d38a1adb86 SHA512 c335a652424f91f1ae79f907870bcd826cee21365b594353b3c52fb7fef51f637e9a65275c11f033b6bd7b6d918733904efc320b547999ee5b88a7b36ccb9389
diff --git a/dev-libs/libedit/libedit-20170329.3.1.ebuild b/dev-libs/libedit/libedit-20170329.3.1.ebuild
index 45c8e3c95091..19cad65d54ad 100644
--- a/dev-libs/libedit/libedit-20170329.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20170329.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://thrysoee.dk/editline/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index decf0ad4f222..aa95e5738def 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,4 @@
 DIST libevdev-1.6.0.tar.xz 411512 BLAKE2B 0e9190fd4c28b36bcf325953aa634c0d8c604cef7f56e46679fc88351536d78b0bddedbbdfffe4164e0039c7d56ef604b143e23de2c4bb9a66653a03d6844fa9 SHA512 73046da447773716c9f0c9f511f3a0a6ababcf92a146eba363014afcbdb465f4c3cd8be0917f2f01561a72f24f20fe8ecd333467437d9d85c03afcb433d05060
-EBUILD libevdev-1.6.0.ebuild 1112 BLAKE2B cb883c0653f7c3bb074d0a9bfb4d7a1e3eb311c64f86b12457f2caa1488d421e98f71401ac86ef2affac9135e58feb9aef080de01ed2d621e8c301fcc3f6e8af SHA512 e6ceeda8fc96790c628e2e868efe5f5cecdc396de3bb6d70bc1e8ff95925c5e7dc733c7924df7f8c2ca671552758f324e860dd8c4c13159069f40d8efb75858d
-EBUILD libevdev-9999.ebuild 1123 BLAKE2B 152eeef5e73696d4fd6dfb6dc5116392e962af5faab2b7a1ff6505e0a6f63c97a9e383dc11ef48aa178806416ac84ada38197791f8ea1889395ec1aef0052038 SHA512 88e8cf51fe94bd54be8955a52f7bed18c5329c08d304f95f37cf197aabf9c076c86d716996b0a4b3fdf31712677b3fbae098b86bd381cc125c190d61daa0c5af
+EBUILD libevdev-1.6.0.ebuild 1108 BLAKE2B 0c193d4337e4d2c4608b56c4bfa1fb6ca8324b979bdb83ff2df1d2b75f120d406a294ffc32c2fe503b7c5a5efb75a6c77421469609a33c9783f662b342e341f0 SHA512 3046e3c9b2144aa12e5133dfe3131d3a6115d8437073c41f21e7c202a3af100732d2f1523544500a0c8964126c89c5679b6eafbe977117fe712b55238bfb9fb8
+EBUILD libevdev-9999.ebuild 1119 BLAKE2B 84c1cd909ea8f81ab025940c58b2969fc6d68be3360bfab21b865f23c1d3c26564fc1de9d1c149184efd9c517e28bcde305bc4713d8d5d1474f1c748d4c25b1c SHA512 9ecbd94c60955824c7100b0427a6417a47301618111787ca6e64d8207ac765b6de2c95994c17f8f6412f95d819b533a794add1582d526cd9e930dacbeaaf2a77
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.6.0.ebuild b/dev-libs/libevdev/libevdev-1.6.0.ebuild
index 7b7765d8f412..f0285f910878 100644
--- a/dev-libs/libevdev/libevdev-1.6.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index f0df420f3775..c32b139bc873 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index eed6ed80a6b2..b7aab1c55d4f 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -2,6 +2,7 @@ DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb35
 DIST libevent-2.1.9_beta.tar.gz 1067050 BLAKE2B d59f424995742e6a57df74420d91c8a1614d7dbb6e3928a3dd666269f7c2f4876d6fedd649e4e947a6db63c15f69c18866bda9997c3bb3571452a8dbf126916a SHA512 672bff332292ec76503bc0ccb9462058e093f1867740fece51f77bb666c77c85e10271730b32b36d6faa9ab2ccee0433879457e201bf94b6bf704dba2c066051
 EBUILD libevent-2.1.8-r1.ebuild 1716 BLAKE2B 54c609bbc0cdeb0bc2e59a650006cdc7a48aae4ea137eb3fc9d51a604eafd1829cce2bece1bd3ceca96eab137129350bf308d64a5009f032f4328ba7e47b9f08 SHA512 30792a15db52a90fbc2624a464993ef489e2369b14f3d465c819d9860aa610537232bf73b1457a6dc5f7c0a28d93323945c6aecd85a441232e533ded311354b6
 EBUILD libevent-2.1.8.ebuild 1705 BLAKE2B d483a5f882b40db3891d48f3e7de7f7b4916c45711e60e83d92249988f6afdece6808c71a7212680548d45f58ed3163cad4bcdbb2ad67d2a8a62df5ea66658ca SHA512 b44f94eb5db73acad177149232465f1dd11eb2bd37fb3680e4ef050ef5429d49080f978046e9a8af7aa203fa0504580f24dae9d51ed7b624e6a6aeca1bde1f3f
+EBUILD libevent-2.1.9999.ebuild 1304 BLAKE2B ca5125cb04834e449294880d988eee53abbb0818c46d46aead9feba8ba5fc92b0bd88c47906e40322b47104b9f964f6ab4dfb03b71fb7249d19e0fa9353aa4a3 SHA512 e39b9eb34693d1fd59c1ffbad2e784c3fb0ee752378c00c0c884837134d03fa8018af27a436a5b95b103f1b109e05a81f629eb06eb51f15719f21e5129907b38
 EBUILD libevent-2.1.9_beta.ebuild 1719 BLAKE2B 2d2c471a992d6fd49269fbdc2094fcf9448d2c5df5c81e340e527cf3519c6798bbbf081d7c9cafb67d69d9e22f002af81214166adf9b4acb098a23cbb13fa3f0 SHA512 3e74a2fde7e26160154c121d3e1b81cb226d4ad10c8341af2b2c404437b962d2c460f370d1ba9a0e214b91a54e7cfcce815c12a69a2873819eb2bf7332c7624d
 EBUILD libevent-9999.ebuild 1241 BLAKE2B b45af1e1260ea97758c8c83df2f300e08866340dffdc23f4db3aaa2d4cd05290445cd50bc43e7022276a5891c6188bc29a3acdbc22a21f96d747aeb67d68001d SHA512 77ba2b774b0d8ac4fbb3da98eb8b838343e78b1aebe884f2222132d55cebe7cf5e8960b0b7648cb91928c6351aee59a218c51b5c76d9c814a9e53c7941705352
 MISC metadata.xml 547 BLAKE2B feca63a3b25db4aa0a078b6135188aa7e4250fa9afb207e14c9b02cad83709abe5dace68f5a34cccc0a2a745424c4c044696d0e6021c4c83bcc2666700a8528d SHA512 556eebbb7d05a8234e9705126549520a8b8d553cf6331f353bf7a5bad343b0ad56292dbdda5bccec827772faf07bf17f0163e4b479530eea0832e31d9f17f73a
diff --git a/dev-libs/libevent/libevent-2.1.9999.ebuild b/dev-libs/libevent/libevent-2.1.9999.ebuild
new file mode 100644
index 000000000000..edf6dbca9001
--- /dev/null
+++ b/dev-libs/libevent/libevent-2.1.9999.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3 multilib-minimal
+
+DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
+EGIT_BRANCH="patches-$(ver_cut 1-2)"
+EGIT_REPO_URI="https://github.com/libevent/libevent"
+HOMEPAGE="
+	http://libevent.org/
+	${EGIT_REPO_URI}
+"
+
+LICENSE="BSD"
+# libevent-2.1.so.6
+SLOT="0/2.1-6"
+KEYWORDS=""
+IUSE="debug libressl +ssl static-libs test +threads"
+RESTRICT="test"
+
+DEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+"
+RDEPEND="
+	${DEPEND}
+	!<=dev-libs/9libs-1.0
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/event2/event-config.h
+)
+DOCS=(
+	ChangeLog{,-1.4,-2.0}
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# fix out-of-source builds
+	mkdir -p test || die
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-samples \
+		$(use_enable debug debug-mode) \
+		$(use_enable debug malloc-replacement) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs static) \
+		$(use_enable test libevent-regress) \
+		$(use_enable threads thread-support)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libevocosm/Manifest b/dev-libs/libevocosm/Manifest
index 7aecd07d78ce..2543967127b2 100644
--- a/dev-libs/libevocosm/Manifest
+++ b/dev-libs/libevocosm/Manifest
@@ -1,4 +1,4 @@
 AUX libevocosm-3.3.1-gcc47.patch 402 BLAKE2B bf6e11eabc9229ff8fe0badb61b01089a46a34abda5d42912caff7e6d494e01a55ab4de06e646a5af73d118314f9b023feeeff00cfd644c4070f2fe4eb7313f5 SHA512 2d4b2f615e17fdbcd8dd481384172755bfc26d98f6b3807d866e33a96f676292c70487b1c3c35b67d7425eec8e86733baad62da51be696c457ee2100fc180bf8
 DIST libevocosm-3.3.1.tar.gz 414392 BLAKE2B 7952cb83a1d5affa4e9b267670cfc889373fbf5c461fdb7022fe1c4af01e2116266f298b4a6ccbfc8102e0bf38fb8411eb6b741e5d72ffefe97b15281a7e44e8 SHA512 ebb4200ac533bdb86051a8a33e5da08d677ae0aa8c2e65a9855e9465b76827c0a72f31e260ee34be62600cd22794a4e47c4471623de8d9fcb4749dcf0a37d946
 EBUILD libevocosm-3.3.1-r1.ebuild 914 BLAKE2B c95cd562a29714dd0ebdabf9fd4849dbc3912d438512c1478b11fb7b4fc2d65e402e8e2f6999eacbc67cd65cad8539492bd0853c2b13bd9e04fd5d84b085cfa1 SHA512 0259110a1dd3a0816fb31f5bfc9c17e10764167241da509128560bb7712b0c024e0ad6155b563a3d50f1a08292a987dd70fb77179807c4abc24f59dd9161a127
-MISC metadata.xml 245 BLAKE2B 61823ae735b381c891f5cae47974d3b1ea6136d6f5f5d449a26dfcdf26472282d760b4ee8a605b8a7b75b9c97443cbc0db309ada118ce186030f276ed7c88963 SHA512 b098db4fb4d9ea116f6246bc6caf0f49e80e236d2fad78d287b638dbd5add7bfaf7feb1ca081ca557b23dde9227ce42fa808f3f6fd8eaba6a7e9cae93342f9c6
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libevocosm/metadata.xml b/dev-libs/libevocosm/metadata.xml
index 41cd682e0ecf..6f49eba8f496 100644
--- a/dev-libs/libevocosm/metadata.xml
+++ b/dev-libs/libevocosm/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cpp@gentoo.org</email>
-	<name>Gentoo C++ Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 802aca541fa8..ee4f68812a92 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,3 +1,5 @@
 DIST libfilezilla-0.15.1.tar.bz2 404746 BLAKE2B 644f4b8949670d5b07f9e7b861d388ce70eae6612e34bf938cb628b65724a527e33c1f039087fd8381c06a15c12cc2b4fc6f616cc5949bf325e2eebf41abdf2d SHA512 d557f7636bfc3958b8558fab3384b0ea84caea594566d39c051f20f02dfd71213369c50df282a3f7d2dd757038bd26e9722214839dab965cb7cde9733d59883a
+DIST libfilezilla-0.16.0.tar.bz2 413535 BLAKE2B ea6ce80e272efea3fcef2fbd1f0ecca1248c314eea49631b4a98d257cfe1ebe505de011c021874ab0158883077d0af61929689ffb2b92528ef50502d84c933a7 SHA512 ea3302ae0c51582d6715fa3dd06d330a2ac820c3229b4dcab4a3470021dba667b6aea1a5b13168d720d7218cc8513e40c97990ed6573d0ea46d76e6ef50c2e6e
 EBUILD libfilezilla-0.15.1.ebuild 892 BLAKE2B e93ea6ffe19681a690f1fc9df8f811b1245c35a6e5cfbf6f553fe88355382c7ff362aeb97a3f323c56faf5a4855c2e582a162bd8ccf961022a776dc23cfe024e SHA512 fb897a916e059235c8daef7eefd6a52a67623a7b7048a5f132cc91190c514209663808d525ed5f0607ad82a8b208238d3d78e57a154aadff0cab9e9b474b93dd
+EBUILD libfilezilla-0.16.0.ebuild 894 BLAKE2B b8e4add077c17fefc6ac06c0430ab72daaa389fa41477b62176512919b91dd20b7d82775d9af0c0ad520f992bdd9402d35db91c7dd570d9ee604ba477281a0b6 SHA512 054e46acaa485b9b2b109fb5a5d9046de22a3ee1db8f585e784d0e8e9a9e37eda4b7b8589f9446acfa216341c5f53328c1cb514954711d3ff11ddadce03558e2
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.16.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.16.0.ebuild
new file mode 100644
index 000000000000..18821af9ca46
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.16.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="dev-libs/nettle:0="
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
diff --git a/dev-libs/libgcrypt-compat/Manifest b/dev-libs/libgcrypt-compat/Manifest
new file mode 100644
index 000000000000..9a17f151cb2d
--- /dev/null
+++ b/dev-libs/libgcrypt-compat/Manifest
@@ -0,0 +1,5 @@
+AUX libgcrypt-1.5.0-uscore.patch 981 BLAKE2B 0f7bae068fa1c04834a0295b902aa479304a8b9f066d984d28a49c59a5c041281d93a7bc73e053f4098461364e87b7a665cb890b4792cdf221f44593c23fbae4 SHA512 716e182684886c905525ab9218b3453fd968ee8f73da83d3ba97ca84a868e18eb1c1c9bb3891a1e4b25f870eb3d762a5e8a415168c9804e9367d8dd12090a601
+AUX libgcrypt-1.5.4-clang-arm.patch 4189 BLAKE2B 39fb88e752a544232c4c48aa8b8df44952e700966f1cbc361664015d075c1d8ef171ae68e9cabd87cab9ce0424243dfbe71271ce2a984d7ad1bdc8c52efd1349 SHA512 86d462340595420a70977d697237a8bb87583750e90c8368ce783ca0fbfed8816c646dd5e40b8e929fbce29917a2b05bb48a0a492d271605958fcb98faf4caa4
+DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9ac3c78141cc888ee978882aee39ac386a1e90588d3840bf0595a519437e92fa53b5f73d8659e193a43cfa374dfb34 SHA512 2c16912de66bc83adfbf8f43a2a9f57e1afcc866b1774ec11a670e2a793a7c5f2029d134c0bda681c9cb95f7dcc166133782c124e520b7fbe246ec10a9e1c06a
+EBUILD libgcrypt-compat-1.5.6.ebuild 1637 BLAKE2B 81b3abe1b1d4ac59672e16a535434cf20ae71fb2b4cb0540466cf797e3b2a0a0b9ccf5b0b51cb0022800abb80e365f95c867ec2d92be89a891fa907a7ebb2e4d SHA512 e5fb4de70dabb43c417cf5ce03412ec7f489846563ca87926199214d483670b10e4ced14e8b90c48fd51e9e150b52683c9c65797b08394c19ae78b9a72fe470a
+MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.5.0-uscore.patch b/dev-libs/libgcrypt-compat/files/libgcrypt-1.5.0-uscore.patch
index 1d4f650b6c7a..1d4f650b6c7a 100644
--- a/dev-libs/libgcrypt/files/libgcrypt-1.5.0-uscore.patch
+++ b/dev-libs/libgcrypt-compat/files/libgcrypt-1.5.0-uscore.patch
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.5.4-clang-arm.patch b/dev-libs/libgcrypt-compat/files/libgcrypt-1.5.4-clang-arm.patch
index ab5d844552af..ab5d844552af 100644
--- a/dev-libs/libgcrypt/files/libgcrypt-1.5.4-clang-arm.patch
+++ b/dev-libs/libgcrypt-compat/files/libgcrypt-1.5.4-clang-arm.patch
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
index fd156e85c490..76e7e0a7adc8 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild
+++ b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
@@ -1,27 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools ltprune multilib-minimal
+inherit autotools multilib-minimal
 
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+MY_PN="${PN%-compat}"
+MY_P="${MY_PN}-${PV}"
 
+DESCRIPTION="Old version of libgcrypt needed by some binaries"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${MY_PN}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1 MIT"
-SLOT="11/11" # subslot = soname major version
+SLOT="11" # soname major version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
 RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
-	!dev-libs/libgcrypt:0/11"
+	!dev-libs/libgcrypt:0/11
+	!dev-libs/libgcrypt:11/11"
+
 DEPEND="${RDEPEND}"
 
+S="${WORKDIR}/${MY_P}"
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-uscore.patch
-	"${FILESDIR}"/${PN}-multilib-syspath.patch
-	"${FILESDIR}"/${PN}-1.5.4-clang-arm.patch
+	"${FILESDIR}"/${MY_PN}-1.5.0-uscore.patch
+	"${FILESDIR}"/${MY_PN}-1.5.4-clang-arm.patch
 )
 
 src_prepare() {
@@ -49,12 +53,6 @@ multilib_src_configure() {
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -r "${ED%/}"/usr/{bin,include,lib*/*.so,share} || die
-}
-
-multilib_src_install_all() {
-	default
-	prune_libtool_files
+	emake -C src DESTDIR="${D}" install-libLTLIBRARIES
+	rm -v "${ED}"/usr/$(get_libdir)/*.{la,so} || die
 }
diff --git a/dev-libs/liboop/metadata.xml b/dev-libs/libgcrypt-compat/metadata.xml
index 6f49eba8f496..54be7ff7e5d6 100644
--- a/dev-libs/liboop/metadata.xml
+++ b/dev-libs/libgcrypt-compat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 6838372ffc6b..b4be9d4737fa 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,11 +1,7 @@
-AUX libgcrypt-1.5.0-uscore.patch 981 BLAKE2B 0f7bae068fa1c04834a0295b902aa479304a8b9f066d984d28a49c59a5c041281d93a7bc73e053f4098461364e87b7a665cb890b4792cdf221f44593c23fbae4 SHA512 716e182684886c905525ab9218b3453fd968ee8f73da83d3ba97ca84a868e18eb1c1c9bb3891a1e4b25f870eb3d762a5e8a415168c9804e9367d8dd12090a601
-AUX libgcrypt-1.5.4-clang-arm.patch 4189 BLAKE2B 39fb88e752a544232c4c48aa8b8df44952e700966f1cbc361664015d075c1d8ef171ae68e9cabd87cab9ce0424243dfbe71271ce2a984d7ad1bdc8c52efd1349 SHA512 86d462340595420a70977d697237a8bb87583750e90c8368ce783ca0fbfed8816c646dd5e40b8e929fbce29917a2b05bb48a0a492d271605958fcb98faf4caa4
 AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8c4b6c621e4f8704c4841fd95d48773f0af850a456c6f80b80deed878be1334f08f8181f97dce64ed9e61f5cb1bae5 SHA512 971814ac34f17464a96fbc110fe995923d873981949a0126e50c206d39499d6146fd00414e837774e6932e4b491cc68c4147278d6216dda630fb876bc8f61791
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
-DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9ac3c78141cc888ee978882aee39ac386a1e90588d3840bf0595a519437e92fa53b5f73d8659e193a43cfa374dfb34 SHA512 2c16912de66bc83adfbf8f43a2a9f57e1afcc866b1774ec11a670e2a793a7c5f2029d134c0bda681c9cb95f7dcc166133782c124e520b7fbe246ec10a9e1c06a
 DIST libgcrypt-1.8.3.tar.bz2 2989166 BLAKE2B 3443883c3e8d005be6cbdc91589b8b287226f26eb59536e1a32512004af739a64a3817ac38fa1132fdfc3424c21ca49c81db93535a23d590a5dc4f4518f3cce1 SHA512 8c873204303f173dd3f49817a81035c1d504b2fc885965c9bc074a6e3fb108ceb6dca366d85e840a40712a6890fc325018ea9b8c1b7b8804c51c44b296cb96a0
 DIST libgcrypt-1.8.4.tar.bz2 2990108 BLAKE2B 97a1f9382adf23cd4ac491a392882f2e712fddd4f0d95a4fafb9cc70aa41ffa7b7b6a371b8368e9c99e3e1849b9d38078abc55703d4d8b25289f3c662e6ba8a1 SHA512 b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1
-EBUILD libgcrypt-1.5.6-r101.ebuild 1668 BLAKE2B 1b8591c2613fd7d281b69718e296724b297b218357d334d79a70e85a2c088ea1dbdc38b3206290dee728e43393c0f8ed9f53b86a2758c9cd07acf2ad8b7c8424 SHA512 1479228533afab05f4e90413b9c5134452c0a041d27cdb05bf2e5e878f883c9a488140dd84d07e772aa52316ed543e29a76a40e0be202a98022f05b541ecd58a
 EBUILD libgcrypt-1.8.3-r1.ebuild 2314 BLAKE2B 6487043c0cdd0129411e11726e29878d99fce2f075d17f043b97640c73ef147184fa832576a5dd57c40b59d2b7f4c2559f7bbb03576eafd9d64dadb9ce17b68c SHA512 1ac41888cea18aa75e5cd3190c89999ce1ec4dcbf4376890c9a8cdabf414fe8022644976d7c75f6ef26a883f7a0863d5363f9979af45f68e5eb539db890a776a
 EBUILD libgcrypt-1.8.3.ebuild 2186 BLAKE2B d1c56ad5f0182fcac6ab2fa237e5205818a0f61a7edea666b1f0f1fc4fe1f95fc6ad4a410262b293fb6e47f3e570d71f552a717887a9efb921bf902bb4f12061 SHA512 8f902c37512a01fcbc83026281e8ce9f5a8dc18d975c180f4f4206c38538dad8192ff15fc3782bcb6475e37c4bfcb4b3a96ab5321e79268a91a623f890aebbae
 EBUILD libgcrypt-1.8.4.ebuild 2314 BLAKE2B 6487043c0cdd0129411e11726e29878d99fce2f075d17f043b97640c73ef147184fa832576a5dd57c40b59d2b7f4c2559f7bbb03576eafd9d64dadb9ce17b68c SHA512 1ac41888cea18aa75e5cd3190c89999ce1ec4dcbf4376890c9a8cdabf414fe8022644976d7c75f6ef26a883f7a0863d5363f9979af45f68e5eb539db890a776a
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 83b1dc75d5f5..28ff4abe1512 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,9 +1,9 @@
 DIST libgit2-glib-0.26.2.tar.xz 421956 BLAKE2B d38698f00d85b484d17078e78ad051a4c068b87df73fcf4d7b852dc6966628580cc4e5b3899a6edd5dc29fb47ef97ebe2c458992701b7642549f3e411d917dc5 SHA512 35fb3ec7a3757212f53cc884760f69725beff8462018b8e716fad389ba57d1acba99ece0fcd148ff40dc63e1fc7e7d566fe84759bd88d3a0ff9fdf970b0a5563
 DIST libgit2-glib-0.26.4.tar.xz 138492 BLAKE2B 725c14076fb940186faac079cff1ea87c456ed41e943ae95a4a674632c1be261ab6d4d5bcb5c0800bbde5d86c1ff3095d59045a2fda1342a1cf5c691a2b424aa SHA512 9eb78f292583862890ca0cd27d7621da2f8f633a76f4679f897ce6cf9e06b64a3cb7b0ddda39d231d21d3faa830fe1a9a9326b4abd420df8356d50a734360b37
-DIST libgit2-glib-0.27.7.tar.xz 137784 BLAKE2B c27511045e81c2bc1dbf0793ae9630358bb13c3fcbb317ccad861e5796772c120895ab6e3dafe7fedc78406d0cd4bd31aee6cb022921ef28bcd45b72f22bdd04 SHA512 33bf9401dd96cc700d0365e51dfa5c81be3930f1ad01d16d878a27efd7e03bb089a23b6db6af500bc20903e6178300ac79fa4e8edfca29e8222aaa2cd3dab63b
 DIST libgit2-glib-0.27.8.tar.xz 137796 BLAKE2B 4dc6d9b435a662acb3fb51bd7349b9c273bad68073ca05d1c27fa59148a39549036e5e8786ef502e1c5758596bf58a80c7153837c6a5956c764d69d71b860531 SHA512 abeb530971edcdc3e813d34ebffbb5d2edfdea527372976e6495f9370a4a7f63c7f34e61bdec02a602a8b5e687960e33f77dc6cbc8f3b65accee7c195b03b593
-EBUILD libgit2-glib-0.26.2.ebuild 1304 BLAKE2B 9a3bedeca6910a8bb1dc73783869b733c8135375748ee3be8ae1695636b7cb0e92f12fbadd701ce08ea438a10d898be30a5d10bbc25ebb3db31d82b32c6d6ecf SHA512 b111e69cd3c5ba40f24b12060c9b3cd5d61a3b425c173e14743c82dcf425b27da9786d52b79cb3c0af94302a29cba058ec70196b752cacad2262bfecdd72ebd3
-EBUILD libgit2-glib-0.26.4.ebuild 1329 BLAKE2B 1c9c368df50d5c65f0605b503255582c14e0ab0f487acaaf7e198d720d8a7510ef1f15449aeb9afb314f2ce3b7fcd57a2f8cdeab0e768a73e977636699ead4cc SHA512 0f58111ed32d83a14ff6f1a6f8eaa8cab306a527a15c26678e92965dc25e56587b3e33d973c1af15c7089b99c23451d06980947a835a129abc3c78988de06526
-EBUILD libgit2-glib-0.27.7.ebuild 1269 BLAKE2B 51c11102e0126e0e993a9255e0ccabeb86fab0d3c19486c30812c349ed8f1126e0c907ced4cd2107c748b65496438d76b3e5c94c7e02d33531345ede5ecbb32d SHA512 6e25faf80bff9f4d1fc5ee60912edf811716b44383454ea075381e92ff70e147055b41af7b94fe2b51339819b16e105aa50bd86314c85be6065d92aa39e3692a
-EBUILD libgit2-glib-0.27.8-r1.ebuild 1266 BLAKE2B 4df6e06fa3b904017f9f7e9059a3cc8ca3b0401677baf2413b8d46f654ad119d43134cdb9adaafa026fc536ae6b4afbdf1f607d11a57e507076755d20bd5cb59 SHA512 622f882d471f63b1375100db72b87dbe4cee5a1642b2397b7e1ad225dfa9550cc5c984547ddc08ed5e84d8a858a8451099483de80bee37c9b77f5032387332ec
+DIST libgit2-glib-0.28.0.1.tar.xz 138928 BLAKE2B 708523bb5a723f59e51501675c046da072bcdf18b3ded94920ce9eb181854780d6b44759531c8e949199a889578515994299facd14d10a07958019f6af0b6aba SHA512 6ae88bb56052461a9531016140edbd8517db8d5c0e5c217b4e8918ffef70b92652e4a95493c4290112068d0b793bff2b894f136b79929924fb7347926e3a8f51
+EBUILD libgit2-glib-0.26.2.ebuild 1297 BLAKE2B 9cae857d1b8eac43814de33f157d257fdc88e7f7bc7ee68a5634904cedc03692db12b7b2c91f48cff91cf84585e9b2ff3a5d8e6525ba080e679924ce26ab5ad0 SHA512 2c4edfe78cdfd7c7a0505c465dfe4011059095d24e0ea152ce7366b86a194bf11c2b761007eae492afb15e288b6726b89b713d0108f8cfacd103e01ee4d810ea
+EBUILD libgit2-glib-0.26.4.ebuild 1322 BLAKE2B 9e2e100561fb42e6ac64ddcece2b694f64169ee9dd455c985a2b948bec77fac3d9ad400d1093545a201bc8f4c7b98aa1dc90a0971ea6fbfeb9314f155790a631 SHA512 06831fd60154a5c14aab34a9280a6dc1e20de1dafa2aaacb39609bdcfff554a89fae3c498075bbff35d0a9298ff448d6089a6f0f9bea7a2ff19aefed1385dae0
+EBUILD libgit2-glib-0.27.8-r1.ebuild 1262 BLAKE2B c4698febceb4823b5c67ade03fce33425c82cc0ae1283b3beebf352b7beb5b0962f7b17db4722f6aef2ecd82a69e833b411cdf1c65a4dc3a0227675777c1ae92 SHA512 9858b1c3edcd9b36f5e091aacf6ee5cf32640c4380821bd4dced070e8424b17c642d34d2d9f70d50ffe05ab8050ef4e633b648ba0a231cc8127f42c2f3fb39c0
+EBUILD libgit2-glib-0.28.0.1.ebuild 1262 BLAKE2B c4698febceb4823b5c67ade03fce33425c82cc0ae1283b3beebf352b7beb5b0962f7b17db4722f6aef2ecd82a69e833b411cdf1c65a4dc3a0227675777c1ae92 SHA512 9858b1c3edcd9b36f5e091aacf6ee5cf32640c4380821bd4dced070e8424b17c642d34d2d9f70d50ffe05ab8050ef4e633b648ba0a231cc8127f42c2f3fb39c0
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
index 0a599c520050..e1643f1af334 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.26.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 python-r1 vala
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
index 28f3698ede9d..21f9ff2f08b6 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.26.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome.org meson python-r1 vala
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.27.8-r1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.27.8-r1.ebuild
index c4cad71cdaf3..ed38c0c65f60 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.27.8-r1.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.27.8-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome.org meson python-r1 vala
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.27.7.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild
index ab9ce3117461..ed38c0c65f60 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.27.7.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome.org meson python-r1 vala
@@ -16,11 +16,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="python +ssh +vala"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-# libgit2-glib is now compatible with SONAME 26 and 27 of libgit2.
+# libgit2-glib is now compatible with SOVERSION 26..28 of libgit2.
 RDEPEND="
 	>=dev-libs/gobject-introspection-0.10.1:=
 	>=dev-libs/glib-2.44.0:2
-	<dev-libs/libgit2-0.28:0=[ssh?]
+	<dev-libs/libgit2-0.29:0=[ssh?]
 	>=dev-libs/libgit2-0.26.0:0
 	python? (
 		${PYTHON_DEPS}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 610a3477ae78..21b75c5f5104 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -2,8 +2,8 @@ AUX libgit2-0.26.8-disable-oom-tests-on-32bit.patch 1775 BLAKE2B 4c3df3edfa76a57
 DIST libgit2-0.26.8.tar.gz 4742478 BLAKE2B 31326987961ed42740f6c0ddce6a80c278175899a62cabd65ce9eef60854553e6a91fd9947ca23945104d4e1b46f9ab0bb1a1a793d8dd87bed792528e5c32839 SHA512 efb9229b2882ac36910d75778d7431bec40f3529f2ad2dd6a950d5580ceb0d4dd798242a422ea6cbb880f515df4dfbb7055a65dd5a8106696d3d458851fca56e
 DIST libgit2-0.27.8.tar.gz 4783928 BLAKE2B 0f0f79a43de3e869d593dafc1b506ee0894143d2daedf2fe56683ad8f2edfd7d87bab784354b9fb1796fa8e08a36b9de88af65c7621a90d537cb585c89118197 SHA512 53ab69a0687afd315029fdbe0ce8192b7e88f7f1ff6bc9c4875718e638cecd64755a9942ad605e6c388c58c6b892b351d54c5405de8e0d5ba90406055a25ffaa
 DIST libgit2-0.28.1.tar.gz 4987204 BLAKE2B bb4f32b0b78a9faed3e5204f40cbda15d032719dfd581948cf175bc17a30356f97f20545e1f64ff6f3cd1dc4ff483af99edb29d7a10c56349ce74976c186886b SHA512 5a1bc5c6af6ad25cb8b2c446e75a774d2a615d4999ec3223d681c7b120d83e7cecd94f1ca549bac0802f5324e27e73cc5a6483ad410636c2f06f098b30b1b647
-EBUILD libgit2-0.26.8.ebuild 2053 BLAKE2B 1de5648ae2d9500af644cb1e8519962a463497f25bed279e6148d14dcc0235b4c388f9c94a53f7c0075896f46ba395ed6030d8a577061284c4ab11fe68a566c9 SHA512 2afea3b4bcd0bcf9602ae226762d4c7de609cf97408ea9ac560646d3c001467578adb6512df0c63eb9ed618606355f7087a041b0c2b12e549ac93dc23d1faa84
-EBUILD libgit2-0.27.8.ebuild 2055 BLAKE2B 1fc9de00757bce342fc97176725cd608244d6c22acb3517249cd6bd6df4aed15737345f42a76dd7ac76dccbe100a858e7bc92a23863f7bdc16ab578a6b03cf8f SHA512 5a40ae4d935ce482df78558d7aff2fec2368ad0286121bfd6b02433a4e5889dd8cc9a521696bfe5b0f753a3c61fa3092d89ad991160fb1d4f039e6d91f67c632
-EBUILD libgit2-0.28.1.ebuild 1689 BLAKE2B 65f1c812181d41fc28b38607bf30d4ae45eb6be38ec7e66ffae2d63479d572c9f4138c10ac83e8821ecb2cefe90f1ff1ea6ab943b5647b60e63ab24297de6022 SHA512 9a7b6cefffbb9cd6a594585519a1732408cc60bceb135c64d4a4d50af2eec147100c3d85fdd737fa5ce39162cb861247bf6f6dbf1c390c9ae1fd510ea7115528
-EBUILD libgit2-9999.ebuild 1954 BLAKE2B fc3f925140f6f282598a08247dc5df33a0089affc49cc4001ccee23c414f256f175fdf490a65109bb673e03f4ec7b0f9c629d3a01aed438689ea56727d6aab9f SHA512 d07f52a7f9097b69d935ce82043e36469bfb0a0b59fa8de00eb83427f03194a8109f92b38762b765bf89f61257c703e90ef103724889e6a4c15192e6fb9cb7e6
+EBUILD libgit2-0.26.8.ebuild 2051 BLAKE2B 4859872a3feb9ca22bd344e39470c0f6b44fcf08e93ed7cc63a39c5ed02640c1e2dbac66c1eda916fd450830e504e8040ee41d43c4a85d293fb71641232febbb SHA512 675efffc1836dfa802ffeac98a218c2e0e4e0afc5d0e5974883cbc616f9e56a07d90a0ee26f838048663627d6d96dd7ff9da97138895681c17b1d93a6c8b9cec
+EBUILD libgit2-0.27.8.ebuild 2053 BLAKE2B 177c2d0f6514cff1b124755061c8be28c01deb4af54283ee56c79057428b36a61fff1a09deae180cef474701803fc8292671cc77537cc8659bb27c89e0cad0a0 SHA512 519816e85e64f933a15ea076dd92f6460225c962b556c379ac4830802920c4e1dcfcff39d7ce6fd3fd12302ef29cf92b0f2572e779934032d61a4a7f0df67658
+EBUILD libgit2-0.28.1.ebuild 1687 BLAKE2B 125a6d27dd61f165f6e5f6c94f1e46944cea35192944088b4b67bb7eb5afc3f9f52d5587ea16599c61424bde6d4cf8a7f1deefd969e59e20cb8ae06aa41f711b SHA512 b2862ca2cde1fb26962f72978a929dec46a098c87bea5560931b769177ab47704fb156ae5969a149f48f377612f3f806a93f1f3f71b6943f52aa16b7a08e65e9
+EBUILD libgit2-9999.ebuild 1664 BLAKE2B ca592e3b60a50ee0ad16da964b1e9df3095e235d78aeec683582b38fd2b70395311778e453e59bbee913c2976e341f5bc947487ed58defc60d78ca63307ebd18 SHA512 ca41454b876cc379a6aac038b00ab48e01cd2fc728ba79e9164e144a1cd5b2fa7f563b9243d0af4c8d7f1538baece44cff31db260b137f265bee8ebc35050aca
 MISC metadata.xml 1049 BLAKE2B 11b39ef834ba3e7ba1e1c5861c329a7ee0c7947952d52b2fc0b0afb7b4357fc101261c70ab263ee592e3404e33d8d87a61db949da9667d683b9fc2dd21343af9 SHA512 893398eebf0a7a90102d85c3cbc37a083db0a676fb99718e0fb3c999765851fb712110aac0c164c1b7b29505e620446c1e1b74fce38c775576f1f36f3ea34867
diff --git a/dev-libs/libgit2/libgit2-0.26.8.ebuild b/dev-libs/libgit2/libgit2-0.26.8.ebuild
index 34bc03ffb55f..89674ff077fc 100644
--- a/dev-libs/libgit2/libgit2-0.26.8.ebuild
+++ b/dev-libs/libgit2/libgit2-0.26.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit cmake-utils python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/dev-libs/libgit2/libgit2-0.27.8.ebuild b/dev-libs/libgit2/libgit2-0.27.8.ebuild
index 3815701da066..a590603f8e44 100644
--- a/dev-libs/libgit2/libgit2-0.27.8.ebuild
+++ b/dev-libs/libgit2/libgit2-0.27.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit cmake-utils python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/dev-libs/libgit2/libgit2-0.28.1.ebuild b/dev-libs/libgit2/libgit2-0.28.1.ebuild
index 5f6041d38921..3b50d8a40c7b 100644
--- a/dev-libs/libgit2/libgit2-0.28.1.ebuild
+++ b/dev-libs/libgit2/libgit2-0.28.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit cmake-utils python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-9999.ebuild
index d10065358a4f..5da98ce6f13c 100644
--- a/dev-libs/libgit2/libgit2-9999.ebuild
+++ b/dev-libs/libgit2/libgit2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit cmake-utils python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
@@ -18,18 +18,15 @@ DESCRIPTION="A linkable library for Git"
 HOMEPAGE="https://libgit2.github.com/"
 
 LICENSE="GPL-2-with-linking-exception"
-SLOT="0/27"
-IUSE="+curl examples gssapi libressl +ssh test +threads trace"
+SLOT="0/28"
+IUSE="examples gssapi libressl +ssh test +threads trace"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	sys-libs/zlib
 	net-libs/http-parser:=
-	curl? (
-		!libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
-		libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
-	)
 	gssapi? ( virtual/krb5 )
 	ssh? ( net-libs/libssh2 )
 "
@@ -38,15 +35,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-src_prepare() {
-	# skip online tests
-	sed -i '/libgit2_clar/s/-ionline/-xonline/' tests/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
@@ -55,7 +43,6 @@ src_configure() {
 		-DUSE_GSSAPI=$(usex gssapi)
 		-DUSE_SSH=$(usex ssh)
 		-DTHREADSAFE=$(usex threads)
-		-DCURL=$(usex curl)
 	)
 	cmake-utils_src_configure
 }
@@ -67,12 +54,13 @@ src_test() {
 		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
 	else
 		local TEST_VERBOSE=1
-		cmake-utils_src_test
+		cmake-utils_src_test -R offline
 	fi
 }
 
 src_install() {
 	cmake-utils_src_install
+	dodoc docs/*.{md,txt}
 
 	if use examples ; then
 		find examples -name '.gitignore' -delete || die
diff --git a/dev-libs/libgnome-games-support/Manifest b/dev-libs/libgnome-games-support/Manifest
index aff971730b25..9952d81890d7 100644
--- a/dev-libs/libgnome-games-support/Manifest
+++ b/dev-libs/libgnome-games-support/Manifest
@@ -1,5 +1,5 @@
 DIST libgnome-games-support-1.2.3.tar.xz 344372 BLAKE2B 7eeac8f11eb009d1fded6cff707d55b83881eb7e4f48728f19010c0e4283e9a9c48b0b688c30141348f63d983b028ffdb35bed2a51fb22daf6467d6b3ffe6e3c SHA512 680b27c37150a627c98b5c38313936082e9fa23be1856e99442b0ce4da5b098378ad3b5fd2f41565c3f43fd54e38fc9e2a2a4a50d82637285aa3cc3827869b62
 DIST libgnome-games-support-1.4.3.tar.xz 345824 BLAKE2B 7969d4470b5c7ba266e3d77071ff7b8b02a1bf407ec74bb0ad1cbe81af7e30e54d3af507f206b07ee1352be4e180dfd62ca6411f07bdbffeb5b18e2f921c7666 SHA512 01a2594d9f95987c99db92c8cc8c212b149619618d15f4128df7eb24d68b64e01f2e77c79b7b07cf81581493ae84215a5d4019ae67585188c04d90827381fc33
 EBUILD libgnome-games-support-1.2.3.ebuild 529 BLAKE2B 9c9a641c9c2f0db4283ccd8c38fa2f2247b723056f24446dbc96b42209b6e75ad5f748ce38b062cdb7290b61fb5f3b82196bcc0a90721b4ce1b8258644f80954 SHA512 90932b2a954d1cab6862c5b7ee310985102ccd2a69fb12b25311c8b909933700e8c261f3cc108252f4fbb18976b8512719bdc056e7f0d6ab8b30b11e1f479a6f
-EBUILD libgnome-games-support-1.4.3.ebuild 528 BLAKE2B 263a61ce259c3a7de9d08447e13cd763c697c061cc2574b7e763660e5da545418520d140b7c852b48aa70223be9d93f8eeb9b86e4fd142766458857f132ae93e SHA512 692cc386183058546c8a33f5c3b930a13148c993b42c70f11f7e38b3ca14e762e405118170a652f09485e5aa2f0a282b4af76b098d90284ab4322a5bd80411ad
+EBUILD libgnome-games-support-1.4.3.ebuild 535 BLAKE2B 610ea0008f44dc855b0c63ce4d340fd226bf5a50921fc73452cebacf49cf84701ef5f4e9815627953a56e98444bb72127edd34ae884cd9519d5d0d260774b66d SHA512 a34d1a22e55b2f42c420bac7333bdfb1793d993d516d7f10931feae40158562b9ef0276ec23b2453337249c1fe4a7732ed65021800e598f7c6fcfbc4d88dd276
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-1.4.3.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.4.3.ebuild
index 94c833c4449b..a11da8121a77 100644
--- a/dev-libs/libgnome-games-support/libgnome-games-support-1.4.3.ebuild
+++ b/dev-libs/libgnome-games-support/libgnome-games-support-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgnome-games-support/"
 
 LICENSE="LGPL-3+"
 SLOT="1/3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 65e619934822..9c771a287311 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,8 +1,11 @@
+AUX libgpg-error-1.36-gawk5-support.patch 4306 BLAKE2B 60bca612d1ce3b69facd0d27daac6275ad1f33ea1a514c762fdd4ff28c55a5e9725c2cd83429e1c2368b42fa6e9850400ffa668a6ce160cdbbc289e421d53c02 SHA512 69cd5219f47193a4b350661fde2d3dcf639ac38dacb6e076ae1d49bd1989562e034f5a238db3fa8af6fb1b80c22d5a6a7fa3f20a2fed95fe756e1a7840a1d886
 DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3cd7c11def7155ef1e7be1d496e0d3a7abf977afa1f618b33ca8bcd0427c0c3b46fce2d0a2b9613378f06780f1aa47c SHA512 51b313c1159074fdbbce84f63bd8afd84b3b58cd608714865b25bed84c1862d050708aa06ac3dab92f1906593df5121161e594c2809653b0fb2c236cae5dcc2f
 DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88abecf87aefb655eb7847546148a6a887caf7f574aae101274da20375b90b32c35d599508711f7b5eac2addfabfe4b8 SHA512 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b
 DIST libgpg-error-1.32.tar.bz2 904382 BLAKE2B 92141af9e00725015ef31152ccfe4db9535a7a6ba0aa6d011f2404bc998d7b0932fdce742a45d271995c838d34342e5197a081a42eb2e5e29c11271a1c11c6f7 SHA512 0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20
+DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
 EBUILD libgpg-error-1.27-r1.ebuild 1287 BLAKE2B d8b77035b21a5d67fb35fa94c7581a1c2229aff20fab7ad47ab4a0bc18490d4331dbdfb81e2114b5f3fdfb4184837067a3afcca141710b1f846d3e40de2f3c98 SHA512 59121052137fb7f122a048bc320076d1d54320a41748aa5647e3d660be4b53d1d89868eb4ae23335b0492ee5b530f912449c45f1e1a5a8567b386fc7f077993a
 EBUILD libgpg-error-1.29.ebuild 1289 BLAKE2B 0d86eb4d6815b150aa7f9514e44368af4a45ab36462e4f8d858552c7b88df9e82ca103d2f742f42e5d93ea5df9721b47f08026ba99eb9fa5c63bf27bfa80059d SHA512 6b22dbb50879e62a76df64f957a23a718177a37f610b793c09c6e08c073fd882e421ecf820a0499e77edaac7cb3095003e1ccb5b62ceddb46fa88513395284ac
 EBUILD libgpg-error-1.32-r1.ebuild 1409 BLAKE2B f0cde481c3f551321a384ed1b322255e5c8ced45edb655d744ede766ade0e930a540d9dad756da5d1107ddb52499fd102b1c4500b02064bb816948bdfe1fe9f5 SHA512 09e05389ff67906dfc1b93d57b4fe556b07ecb5b758b0567f90b5bc0c58ea4ae3aa5aef638fcec7a3baa1a1a7d0925ba1545c03342689f84c79600bbc95426c9
 EBUILD libgpg-error-1.32.ebuild 1300 BLAKE2B f7367cc13a9db8e3e671459d9dea8884633c5f401af615c28670c4902c52e9f461ad4d40b2cee61ba4aaf0b76f205ab55a32b724083a14d3762d469109894f66 SHA512 ae3d6a4c73e9ba6631a1f852278ea3a5827e81271ef90bc8cb991cd7c4b69cdf81df660ac768cd76d3a5b8010bfb7da9c7cef1421dfa1ba01138d2b03a3b0282
+EBUILD libgpg-error-1.36.ebuild 1471 BLAKE2B 0ccad737a1e5090b8eb0a03b1032ff5da63985c8992c13702a0fa7c9fc3c294ab5ebee5c0aea1fc67283c182236cea2a1653a05616a63ca4cacfa36b06bf34d9 SHA512 dee7603c50004fe57764edfa400ec8a281d8eee2523a9d8b6b26e32959d489f16d1422b794b6f329b04cf8bd76988b66e232d492498e6fda0297e3d670d272fb
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch b/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch
new file mode 100644
index 000000000000..17e88164537a
--- /dev/null
+++ b/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch
@@ -0,0 +1,158 @@
+From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Mon, 15 Apr 2019 15:10:44 +0900
+Subject: [PATCH] awk: Prepare for Gawk 5.0.
+
+* src/Makefile.am: Use pkg_namespace (instead of namespace).
+* src/mkerrnos.awk: Likewise.
+* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
+* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
+
+--
+
+In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
+which only allows escaping specific characters.
+
+GnuPG-bug-id: 4459
+Reported-by: Marius Schamschula
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+---
+ lang/cl/mkerrcodes.awk |  2 +-
+ src/Makefile.am        |  2 +-
+ src/mkerrcodes.awk     |  2 +-
+ src/mkerrcodes1.awk    |  2 +-
+ src/mkerrcodes2.awk    |  2 +-
+ src/mkerrnos.awk       |  2 +-
+ src/mkstrtable.awk     | 10 +++++-----
+ 7 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
+index ae29043..9a1fc18 100644
+--- a/lang/cl/mkerrcodes.awk
++++ b/lang/cl/mkerrcodes.awk
+@@ -122,7 +122,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ce1b882..f2590cb 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile
+ 
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+ 	$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+-		-v prefix=GPG_ERR_ -v namespace=errnos_ \
++		-v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
+ 		$(srcdir)/errnos.in >$@
+ 
+ 
+diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
+index 46d436c..e9c857c 100644
+--- a/src/mkerrcodes.awk
++++ b/src/mkerrcodes.awk
+@@ -85,7 +85,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
+index a771a73..4578e29 100644
+--- a/src/mkerrcodes1.awk
++++ b/src/mkerrcodes1.awk
+@@ -81,7 +81,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
+index ea58503..188f7a4 100644
+--- a/src/mkerrcodes2.awk
++++ b/src/mkerrcodes2.awk
+@@ -91,7 +91,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
+index f79df66..15b1aad 100644
+--- a/src/mkerrnos.awk
++++ b/src/mkerrnos.awk
+@@ -83,7 +83,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
+index c9de9c1..285e45f 100644
+--- a/src/mkstrtable.awk
++++ b/src/mkstrtable.awk
+@@ -77,7 +77,7 @@
+ #
+ # The variable prefix can be used to prepend a string to each message.
+ #
+-# The variable namespace can be used to prepend a string to each
++# The variable pkg_namespace can be used to prepend a string to each
+ # variable and macro name.
+ 
+ BEGIN {
+@@ -102,7 +102,7 @@ header {
+       print "/* The purpose of this complex string table is to produce";
+       print "   optimal code with a minimum of relocations.  */";
+       print "";
+-      print "static const char " namespace "msgstr[] = ";
++      print "static const char " pkg_namespace "msgstr[] = ";
+       header = 0;
+     }
+   else
+@@ -110,7 +110,7 @@ header {
+ }
+ 
+ !header {
+-  sub (/\#.+/, "");
++  sub (/#.+/, "");
+   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
+ 
+   if (/^$/)
+@@ -150,7 +150,7 @@ END {
+   else
+     print "  gettext_noop (\"" last_msgstr "\");";
+   print "";
+-  print "static const int " namespace "msgidx[] =";
++  print "static const int " pkg_namespace "msgidx[] =";
+   print "  {";
+   for (i = 0; i < coded_msgs; i++)
+     print "    " pos[i] ",";
+@@ -158,7 +158,7 @@ END {
+   print "  };";
+   print "";
+   print "static GPG_ERR_INLINE int";
+-  print namespace "msgidxof (int code)";
++  print pkg_namespace "msgidxof (int code)";
+   print "{";
+   print "  return (0 ? 0";
+ 
+-- 
+2.21.0
+
diff --git a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
new file mode 100644
index 000000000000..ad179a9e0f90
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="Contains error handling functions used by GnuPG software"
+HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp nls static-libs"
+
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gpg-error-config
+)
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/gpg-error.h
+	/usr/include/gpgrt.h
+)
+
+PATCHES=( "${FILESDIR}/${PN}-1.36-gawk5-support.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(multilib_is_native_abi || echo --disable-languages) \
+		$(use_enable common-lisp languages) \
+		$(use_enable nls) \
+		$(use_enable static-libs static) \
+		--enable-threads \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgpiod/Manifest b/dev-libs/libgpiod/Manifest
index 494948356892..4200edb85652 100644
--- a/dev-libs/libgpiod/Manifest
+++ b/dev-libs/libgpiod/Manifest
@@ -1,3 +1,3 @@
 DIST libgpiod-1.1.1.tar.xz 302672 BLAKE2B 71c624f923118b7c50970beb737f2c813d1470a34f95798f9ce821211e16f15e2a3fd42d0054e25529ddc9846725c0935d915784f22d2509b844a0bac61b66b6 SHA512 a1d902ce8e1c94d5550ade2fb4889ebe28b86523505b92ab907f58c8e6903eaf07ce16278126989462956b879f591b42ddd50fbc4537c1b5af459f23a4dfc12f
-EBUILD libgpiod-1.1.1.ebuild 748 BLAKE2B 6c9c3ce00259782d2245159ec01deefd14cbe86e4fb2fdce7a9c56f4e1606226e3919249e6600f271479e4ce58c65c2f9fe6f7d3aa8fae63ebe487ba597cb4af SHA512 643c411539bb4ef1e5072a22425bdc1a7cc79470798d2f6121bf77d53d6b3e624e5fbbfe7cad2d37696c8a1040a0d6b297d3b4e9234855614bc2133537101b15
+EBUILD libgpiod-1.1.1.ebuild 755 BLAKE2B bfdfa328997d74ebc185549bedc6c8311d05904141a123e1aa7d1e701d10e0cb18d308fb196ef01ad6d2a8db4b82bb196bc1776a16f6135edc94b0975b0eb972 SHA512 9055950c40a6878e36082387dd6ddcd460ad8c0fe14cc258f391d68e555244c74493441ae845a81a6d1c707ea950063478a4408cd8f6be323fa5decfa9bd3b52
 MISC metadata.xml 343 BLAKE2B fc70cc41ae2770c509013c4d1a5d8aaa441b6d52d1259b9e2f5cb2e8928e146f5451e399d1345901e88b1b488095990e8c9f9b296b43b38f91b38a22b3507c90 SHA512 051b47fa59f992bf8347e89d17eecf645d4a20457ac1d9db931982c9efa4a61d777df4e215a790d518ac77b2baa7497862fc724fbd581dccfa404bfd232d749b
diff --git a/dev-libs/libgpiod/libgpiod-1.1.1.ebuild b/dev-libs/libgpiod/libgpiod-1.1.1.ebuild
index c08b952a7278..3435a33062ce 100644
--- a/dev-libs/libgpiod/libgpiod-1.1.1.ebuild
+++ b/dev-libs/libgpiod/libgpiod-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/software/libs/libgpiod/libgpiod-1.1
 LICENSE="LGPL-2.1"
 # Reflects the ABI of libgpiod.so
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="static-libs +tools"
 
 multilib_src_configure() {
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index aa22b33eae4c..b9ca7b1ce564 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,5 +1,5 @@
 AUX libical-3.0.1-pkgconfig-libdir.patch 1228 BLAKE2B 34bae335d1889d0090d02b72a61ea5fc90940210cccb2d09e3ef6a01464579f2fb6bf83b6e9dbcd35950227f0f1c830bbc0b77d1fe3eaa42fd649edfef4f3181 SHA512 556e3deadef8bbb210dbd3bf918aa9cbe0f8a1cfbbf8ecbeeff36a74f134cdebabad96f6ad05f6a1e2afcde669bb145bbea6ab83efa6f7b90b4637f7f761fa49
 AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c1786eb21c4550d12ed3dd86fe587ca26471319e8a695983529f789085a1e4ca0fae4ca48cab97b5376ed858deede SHA512 16367f68d15112b37266a794efe4a19f7c971fafe48b13c85095f15657f9d98796067bce91680986615d95740269f8fe1d03deb674ce2bb952b462de1d2ab1c9
 DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9
-EBUILD libical-3.0.4.ebuild 2043 BLAKE2B 28a9c2f6ac5cafbb580930368709ff755bd6540a904532b8283b202975d71d68d7a704b69478d3c98fbc5e7fdb2e82b3a3a056631efc9d63927f04f27ead572f SHA512 439f5a141105608da6626b8f662620439d5614ed80ddb46713e2dc9e47af996ba540f972ea9d1ac5fa43c73eec8d4e68de1ab0431b98e2f208c63ca213af1b0d
+EBUILD libical-3.0.4.ebuild 2041 BLAKE2B fe5e0e0e7ae78aecdc7b70a4e2228094d3b8995d6b57db0babe80101bbe629eea2cd889da6bcf32c4cc41e6ad5aad2b0764c6cfd6b0f318b64ae97a6a7e75c39 SHA512 533a6f5eaa0f025926d1792ea34eb4030ceb9275edddfd32cacfbfe3779e884fd9f8d6a89d97bd8bf6922b9d8b5d3c50f559a176d00e981550d2b26cfc57f857
 MISC metadata.xml 333 BLAKE2B 48ec5d867610d142260cd1d0154f2762acd3c695935a37ae5e344a828a84ea6907be5cf69b3b19a6886b20ac3df73a8d7cd5c800afdbce0320b2fcfe4e0b62d2 SHA512 ad7a78aff5c325aa5a289cb96a98c55d52c60bb78b6dff207d393157d1dc7e408032453be4da87e9a7e8c6a2ca1f12226e416be2f5d04e4dd908642461eb3b8c
diff --git a/dev-libs/libical/libical-3.0.4.ebuild b/dev-libs/libical/libical-3.0.4.ebuild
index fd77a32def14..737e641277ad 100644
--- a/dev-libs/libical/libical-3.0.4.ebuild
+++ b/dev-libs/libical/libical-3.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit cmake-utils python-any-r1
 
 DESCRIPTION="An implementation of basic iCAL protocols"
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index 3e52919bd7f8..2a018b957cf1 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -3,8 +3,6 @@ AUX libiconv-1.15-no-aix-tweaks.patch 981 BLAKE2B 37d0ce998456bb2c07b249c22e8cd0
 AUX libiconv-1.15-no-gets.patch 796 BLAKE2B 19eeadf7bbfb96c5c7d2037af18d55162d81bba61b2dc022dfc19ce25534fe72eea1b29424f662c199fb6769fdd412a00cb2d5cb0e41af75f435f3ee16d83efc SHA512 39c32470cb802d74ee6f97071e74a4cedc8374cf60b50f470ca318066fe45a71ed89c5c77dc7b3e70f0a3a33ccca7beedf6e96863a431515e957883467325bde
 DIST libiconv-1.14.tar.gz 4984397 BLAKE2B 8697bbff9b929e8a30157f271ba3216aef7b2f0020f5edd273f3cec249069fb23f58ae13cbe3d3bb502c27e97e7cccae66aba23017ab4f6bce11b2ec133ef684 SHA512 b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387
 DIST libiconv-1.15.tar.gz 5264188 BLAKE2B 2384dbf8549fa56e841b15b7e2698b83c0ee171cdff13aef48c60eae0bc4f5e7b2e937bc8d5eddf89fba11412d17bebd77bdda7060c177ce9dc9be00172c0c12 SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a
-EBUILD libiconv-1.14-r1.ebuild 1373 BLAKE2B 629f36e0d54ec3afb2b64d4924b76ee2ccf28b8f0b7c55f657c394af02ff03e7e6335a703c1ad4ac9e2c7bb9e624fcd8f0cf6a43b95aa6b1b8148d621fd4485c SHA512 3cdaf12a9b67cf10de8aaae1b3bbc238b7f3e218d44832b1317cf9b1ded10996fa44b2bba9a7ea5b655b07afced1db3e85c42a5794baacbe91cb96ebc05c7112
-EBUILD libiconv-1.14-r2.ebuild 1503 BLAKE2B 63e874be4500aee2da3d4ebb087f7eef6d706a53a4a34041a5e1bbb0b2402a5b136f6cdfae916449f05d8d9cd42b3c432429f574cc591a8f03305d772560c56f SHA512 1d2d8226fec24e201dbeb7490b2ddbc602e1824ca77b18d058b16e013690e321852060e2e4908b0145dfe159c3f9fc54da416ccbb8a6f3ecbd3c1968aca1d16b
-EBUILD libiconv-1.14.ebuild 974 BLAKE2B f84a1b7666c247ac4a85f0ae05a1dbe5202175023ac9308b7d7af5f3083382af8df7c81d0d6d7c1e0ded4c209eec6a267eaef6092e4ee56b7628ed405e4441e2 SHA512 3d6fa4773eeab09c7c01fc0dc4bc5239556657818d9f77baaf7436c9c6746d044dd3e2131d498f5b436aeb26b997807ddf76efe320ab454a0555d6fc24e6e38b
-EBUILD libiconv-1.15.ebuild 1925 BLAKE2B 04fed0a91f55722d8e253f2558e2abd6f944996c5ef4386c6578507b9e383339bd28043cc98442c7ee02966c18a9ce5b039348bf80ba211b90c505ce3982692e SHA512 8ac083bf616cfe8ecb6aed325e1902b8296dd23f6469cc64d1f3a86efd960c654faad94b3bcbec8af2661ef8b88e52727cd3e6e710bedbc6aace5b7e0a6ddadf
+EBUILD libiconv-1.14-r1.ebuild 1382 BLAKE2B e24d9f39547e75024846685e7e43cedc826ad4a96ab37e2b4c74b146dc5d3f1a8cf38743e57846ba156b9e9d957867496278271edcb8d71b1d3650db61def39a SHA512 30a2b754f92cdb0baaa5caf7c9fb069a556aae69d8ef6f06db9f024c265a31aa1fdc2333deeffba8db465aa27cdf6ce0ffd19fcbb023d2f6701ff4f7eaf3b200
+EBUILD libiconv-1.15.ebuild 1934 BLAKE2B 39f4d790b3fb1bf82b90eb631b40671bcd5f32884a59f8e90176aafff0e80d7350914aa9be17abd8edb21a25a37c5f297a2c73287943ea5d89dd8d76895e98b5 SHA512 6f526985038c201bb7c3fadb03011fbad16f9e13526844a57c786f5b3518c08813648a033116c25874401f3fd1d9f00e4bd1ba48c655125289fced9d6b3bc7ee
 MISC metadata.xml 564 BLAKE2B 465a39f6ee306925d4eb3f616cba7e08604aff5e94024659df611d45ea96245205a6f257175e862ae63e5a6d31fc549e2104d56a3e970157d25cf315dc820ffa SHA512 7c13a258f15e61b3e5fd3e55411466f8830d83ecc25676d491635037be07b1a35b845ec5a06d56c26ecefb8865149e486e939a72111d1a3e46efc26b87d632a6
diff --git a/dev-libs/libiconv/libiconv-1.14-r1.ebuild b/dev-libs/libiconv/libiconv-1.14-r1.ebuild
index 059bc00d97ff..644bfafed5ea 100644
--- a/dev-libs/libiconv/libiconv-1.14-r1.ebuild
+++ b/dev-libs/libiconv/libiconv-1.14-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
 HOMEPAGE="https://www.gnu.org/software/libiconv/"
 SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="LGPL-2+ GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 arm ~mips ppc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+static-libs"
diff --git a/dev-libs/libiconv/libiconv-1.14-r2.ebuild b/dev-libs/libiconv/libiconv-1.14-r2.ebuild
deleted file mode 100644
index 54709b52977d..000000000000
--- a/dev-libs/libiconv/libiconv-1.14-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
-HOMEPAGE="https://www.gnu.org/software/libiconv/"
-SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="static-libs"
-
-DEPEND="!sys-libs/glibc
-	!userland_GNU? ( !sys-apps/man-pages )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-no-gets.patch
-	eapply_user
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Disable NLS support because that creates a circular dependency
-	# between libiconv and gettext
-	ECONF_SOURCE="${S}" \
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}/html" \
-		--disable-nls \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}" -name 'lib*.la' -delete
-
-	# Install in /lib as utils installed in /lib like gnutar
-	# can depend on this
-	gen_usr_ldscript -a iconv charset
-
-	# If we have a GNU userland, we probably have sys-apps/man-pages
-	# installed, which means we want to rename our copies #503162.
-	# The use of USELAND=GNU is kind of a hack though ...
-	if use userland_GNU ; then
-		cd "${ED}"/usr/share/man || die
-		local f
-		for f in man*/*.[0-9] ; do
-			mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
-		done
-	fi
-}
diff --git a/dev-libs/libiconv/libiconv-1.14.ebuild b/dev-libs/libiconv/libiconv-1.14.ebuild
deleted file mode 100644
index fc464c4b6e93..000000000000
--- a/dev-libs/libiconv/libiconv-1.14.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit libtool toolchain-funcs
-
-DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
-HOMEPAGE="https://www.gnu.org/software/libiconv/"
-SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="!sys-libs/glibc
-	!sys-apps/man-pages"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Make sure that libtool support is updated to link "the linux way"
-	# on FreeBSD.
-	elibtoolize
-}
-
-src_configure() {
-	# Disable NLS support because that creates a circular dependency
-	# between libiconv and gettext
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}/html" \
-		--disable-nls \
-		--enable-shared \
-		--enable-static
-}
-
-src_install() {
-	default
-
-	# Install in /lib as utils installed in /lib like gnutar
-	# can depend on this
-	gen_usr_ldscript -a iconv charset
-}
diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild
index c991366b8eff..5d47b69f440f 100644
--- a/dev-libs/libiconv/libiconv-1.15.ebuild
+++ b/dev-libs/libiconv/libiconv-1.15.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
 HOMEPAGE="https://www.gnu.org/software/libiconv/"
 SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="LGPL-2+ GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="prefix static-libs"
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 35c75c304936..c901e9369c13 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,7 @@
-DIST libinput-1.11.3.tar.xz 487408 BLAKE2B 38dc14cf018ca59279e8b6e85fd91f4b29545b4a55ab968cb11d9a8afc8d80c311efc6e57339b9baa9fb270f52cfb0758ff8ea313991867c35f3da47910977ac SHA512 5e18daab6202bcbfddeebc35dac4cabb5f726b5b73f5fc87975b58f3019a54a4b1f506a3200e920638ddddfb978a0b96c23c2e90b081942f86d33c16d4836949
 DIST libinput-1.12.6.tar.xz 518784 BLAKE2B 7462f47be3628f9c66ef5b7c8265b588bd0ca328bafe91932f5341a010ac882648b4e7cfd0db241ae526836172e0829d68d21f8966d2be8b49f4e1c0c40df018 SHA512 02ad90c77a0c8c27fd96ec34e1546c5f0947ced49bad386372c1ef7c41b3b2157c39020f0766f20aaf2ab3c97128567e169279bea21115ced39499dda325d2ef
 DIST libinput-1.13.0.tar.xz 529912 BLAKE2B 830dca7387c6527ebdf41e8b01bf9d8df094ec2309e229e3933b56217d51e3ef0b0c53106d6e4d55946a238d947c17a1d7c0a8f43b63119a6f3aa1063a703d64 SHA512 0e3f53acf90fe142ad677b416d1ee830ad7f7f8a83b80023278ea7d3696ff7af5612379b387b1eb5daae6277a8c30d84c21f0086fe3d8b4b6189f239b1eeb4f8
-EBUILD libinput-1.11.3.ebuild 1479 BLAKE2B 3bf99bc9ac1007e56927e43f42aa98fc3e827be6492fc895f19daeea49417e596c5ce39832531a242d71bffe6c6b6c9b588070d42e4204747bf539d641cf0085 SHA512 09b0ea6ee921080658e96ef91e19bf97f6077b7ebcaa82acf5e7b8a9b42b032d848386a633c5b577287de236b1e7d4055627d8dc06911584f9a78edd18f65f5c
-EBUILD libinput-1.12.6.ebuild 2075 BLAKE2B 7097b88f64918da7053c398d268d1857a328439222443b6cabc9a9815bc6264807ce8ca7d8e600944b5f1537d5bae083a5fdf6fa7604a4b05496e684de5742a9 SHA512 46ce18a95c8c206c906b94455ec657c6fa73eddb579ea677a9f09a39fb2b2b2738f3d495a85f91d82edb86f849e32be064b849db89eff3e1d8774a685c5582fc
-EBUILD libinput-1.13.0.ebuild 2084 BLAKE2B 164a483275c47e36024a962f1b1b25481ef388371b9b2b7fa012a70bcaa75ff78c1e585b37af285c41674b9cc08630dedf6a297122adcec1a01ba9377ce92723 SHA512 e5f33cfede51c2917f078065c9f322446693afeebc76ab054276e203b15ca5ca92e4dae94b3cb555a0b5ba7bf759f1a4649d0810e635b6fca6531b9593b3d0c4
+DIST libinput-1.13.1.tar.xz 529516 BLAKE2B 9eb9952ca2762470ee3e9ac0eab6b11c4b404b2702cd81b9f0720e539124a8f71a032803cf77105bbdce412b3c5d4a7fee4e24b8d3ceae991bd2ee9b3460e373 SHA512 a19deec802e704038df0901c103a82a3370f56e0299f4cc1b6aa84c1832a66fb638e6f9d0fa708b51df6c3b939cdc1271e4ff547c645c566be03dce0bc9ff7e0
+EBUILD libinput-1.12.6.ebuild 2072 BLAKE2B 9119a05dc0fcbe73ed2ff112482484a7accd7c9ad1c313bb39ce80ca02c3cdba9de2dab5eb64e12388d2aebd9e12bb17e732c6b03281a8bde82cd6187306c798 SHA512 35e40369e9e55a1be8429e1b0486c16da1d7a799fe36981e59cfa0c873884900df6ed3bae0f5110434a2081fcba2ec3bef0d5d94037a549d03bf28002f44e341
+EBUILD libinput-1.13.0.ebuild 2082 BLAKE2B 7431e359fba2baf63f3f01014dc256cdfb482bc741c9271397a93641ecf6a7d7a386fe02fc2f8984c389f7e3aa6bcb89158715cb8ceb278885751541b037f764 SHA512 e5bdbc2792aac39bb4065566811b85c70563781b20969843164b7d915cb197e204f21b1fa5c6af1b34d21774ce81ea5001556e522e5133aadf559164054c3df4
+EBUILD libinput-1.13.1.ebuild 2082 BLAKE2B 7431e359fba2baf63f3f01014dc256cdfb482bc741c9271397a93641ecf6a7d7a386fe02fc2f8984c389f7e3aa6bcb89158715cb8ceb278885751541b037f764 SHA512 e5bdbc2792aac39bb4065566811b85c70563781b20969843164b7d915cb197e204f21b1fa5c6af1b34d21774ce81ea5001556e522e5133aadf559164054c3df4
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.12.6.ebuild b/dev-libs/libinput/libinput-1.12.6.ebuild
index 21bd0253ca3b..fd10ed0a4e7d 100644
--- a/dev-libs/libinput/libinput-1.12.6.ebuild
+++ b/dev-libs/libinput/libinput-1.12.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit meson python-any-r1 udev
 
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc input_devices_wacom"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libinput/libinput-1.13.0.ebuild b/dev-libs/libinput/libinput-1.13.0.ebuild
index 5bd8983e0dad..f8e313004d15 100644
--- a/dev-libs/libinput/libinput-1.13.0.ebuild
+++ b/dev-libs/libinput/libinput-1.13.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit meson python-any-r1 udev
 
diff --git a/dev-libs/libinput/libinput-1.11.3.ebuild b/dev-libs/libinput/libinput-1.13.1.ebuild
index 072c1deee40e..f8e313004d15 100644
--- a/dev-libs/libinput/libinput-1.11.3.ebuild
+++ b/dev-libs/libinput/libinput-1.13.1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit meson udev
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit meson python-any-r1 udev
 
 DESCRIPTION="Library to handle input devices in Wayland"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
@@ -10,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc input_devices_wacom"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
@@ -24,8 +26,13 @@ RDEPEND="
 	virtual/udev
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
 		>=app-doc/doxygen-1.8.3
 		>=media-gfx/graphviz-2.38.0
 	)
@@ -34,6 +41,20 @@ DEPEND="${RDEPEND}
 #		>=dev-libs/check-0.9.10
 #		dev-util/valgrind
 #		sys-libs/libunwind )
+BDEPEND="
+	virtual/pkgconfig
+"
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
 
 src_configure() {
 	# gui can be built but will not be installed
@@ -51,7 +72,7 @@ src_install() {
 	meson_src_install
 	if use doc ; then
 		docinto html
-		dodoc -r "${BUILD_DIR}"/html/.
+		dodoc -r "${BUILD_DIR}"/Documentation/.
 	fi
 }
 
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 2fd83d17c775..6ec25cd0b667 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,6 +1,6 @@
 DIST libixion-0.13.0.tar.xz 413756 BLAKE2B 04aef61a1cc691bb159d7e8131e2e47fe2590634adc93f2e5771ed106316eb1c92ee7c4aa05ba753a1751cb5e7c55cba9263515671a26f9bc9983a1cfcacceff SHA512 15784e947164d106e677c59ece53b3cd401d4f9433cc5331a35d3be8332ae4f20a469ca73b30b253433c86da4afde886dfb4ac23e46ed46376a7349e0276c3a0
 DIST libixion-0.14.1.tar.xz 360568 BLAKE2B e4da21f0eff9111272618d1bad87790ed0c4b461478473654f8366b0023c0650b41d355b0737a4fd4ac943e66f919e2f0d6bf04250e597e54a290d4415f3a093 SHA512 e4ae6348833d2178c1dc76916937bcc9d7821dc6570fe13093c441ca22e0301a1ca6a4cf85d9814b83534733dba98f4c4a372791f93bc57173317657675b9ae3
-EBUILD libixion-0.13.0.ebuild 1153 BLAKE2B d0ce72e3f189cd8324977528761a99f454f387167efbba9f6fc0c578ae924904365d147a7f88bb04a5fe35cc0f24188e0381670bd9667d280327728c2e7c5f08 SHA512 15fa6ecc16de6da5fa03bbaab0b9f2c0eb8652331eada59b7d7cdf180669320af4797ff765854b325b1e683441034d6652a271a09fbcf0cc19d2d31e0991f87a
+EBUILD libixion-0.13.0.ebuild 1146 BLAKE2B a9c5a0d611ab91a60cf104a378c9da4c8e60c2ab2395b90eafe2530b7fcbc3883a8bd22ca21a2842774a941e6da4825d6bac186c02823b3e7d7263546ccc5ab7 SHA512 44ab1518052194f4baeae3911a773347fceeda07514b3b4734746470209e126875195dc380b68bbe86700537a4af77b3d13bfcd2e7dbff9b86ed9a8ed60f4f8b
 EBUILD libixion-0.14.1.ebuild 1084 BLAKE2B ff5b6d6c3277231498f8416e8897352f87c2aa9bf728ab9fb2c39d0e713cae0809a21b34c250132e48e7d8b6280159fb2b971b1e1e3d7bd37278a6df6996db47 SHA512 00a1a5b73de958d514d105cc83ce849059388238cca6188fa425802f719c0b03b958c2cf7642dcd03aa54a9c130bfae033dc58acc4d37801c2aeec71bd8413d1
 EBUILD libixion-9999.ebuild 1084 BLAKE2B 31dec65a5e55763ff9b3ba5d775e8553210cecec7e5d302ff49346f8072cd829503ded8ae215089f04cf97d4ebd54ff59be951870d04cfa81579413fd101806c SHA512 4b3f43b37e3c527d9f33ce09a6aed3d472b84fc037f30fd56380eb3b706b5e8913284cfe49d601d9c6790060d9b09d1fa1a68e7a2443972092573da75b586a31
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/libixion-0.13.0.ebuild b/dev-libs/libixion/libixion-0.13.0.ebuild
index 0879412988b2..f092df1e8178 100644
--- a/dev-libs/libixion/libixion-0.13.0.ebuild
+++ b/dev-libs/libixion/libixion-0.13.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 [[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
 inherit python-single-r1 ${GITECLASS}
diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index 4bf66793cc47..8415aa5147cf 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -1,9 +1,7 @@
 DIST liblinear-210.tar.gz 381662 BLAKE2B d64d217f7ba67605821062f66d4e9f130f4f2396dde14cd35532bad11f4af4f34bc231a1e3796ba2d0e14f84830ec05c6358d40018e048f4ae3fa62db2b1d0d7 SHA512 4e4558467f2ebb3dbd640c172b1129c8e5981c231a043abb0398a803252559795604a34992baee50ae6689646050733d3a908d7d76f8b1c94309b859eae7f8c8
-DIST liblinear-211.tar.gz 506507 BLAKE2B 31b7677dfbf9dbb060a28dc19c63db4244e55c4ddc984a8c9ccadc517beabaf8fabef04488366cd7375608412dad3c37d4f09fe27b37b69e69209d32379a9e45 SHA512 005a47b3a8ff27f9890ce10549478be4b041c92d162815fba33dd56db7c014e6958b3e7e161451490c34d88df2161366365bd41b1a48d6a77034edc346a0fc3a
-DIST liblinear-220.tar.gz 517302 BLAKE2B 6aa28c3357f830441ee3cb2e9691d4952e4d4db6592622f6e93be1ed12c8f871e4a9c98abcb35b472a227005bad0cc1e6076678358dc324a7453cbbfb34a0866 SHA512 cde798b7cb221513cf2b8bbe134d6c3dce1ed26c43504d8c09dbed93b82ca47bfd271d4dd3d03384187273906ce140d4ce4418a4a8c21410015ec1631c1042c6
 DIST liblinear-221.tar.gz 520288 BLAKE2B b28c837488f5827ae76f32dc14a1b92027eb5ff123a15c07e9974197eea842c8247420632d259defdba3968383749538c1ed16f6b5c982fad87b3bc52572b485 SHA512 abf21f9030e67886d88a95ad1699e566f8b67bb3bd23253f1f656460911f92a5c3c184fe127390d6100bbf9970cf7a246ef3611b0788907c35a33286228f1753
+DIST liblinear-230.tar.gz 524693 BLAKE2B 02e52f6dc26f6ae19dfe52691e4a86c64ea92c40a50d0fbe8a7bddcf06e1216b8f28462fb2105539dedf15ddb07f39ef7e7f78fa7cfd74eac955246e9ed050e7 SHA512 c8acdd9f5cfcf7ef1ff9b9fac658ff51ac4677801fdb9ce6a210ccca7fb136a7957d0edaf45e83269c1928de1926de0200d669cd94e09371c06821d42ba539bc
 EBUILD liblinear-210-r1.ebuild 1416 BLAKE2B 329845a3366d90bd89c17c714b7dedaa8fac27f462d3c98ec2f4831d51b18d15cda975a2ed6aedf69b08cdfd439ee05a85cb09489c9bbfa102a145b7d78e7226 SHA512 96bf9b251b5ddca7c7c4b717b504ae585f821eba683a7891d4a23fa87ea961456f364bff5656e17e5fa36ea2a8918b10622c3ccc8a528f0262799d22e359b9ae
-EBUILD liblinear-211.ebuild 1434 BLAKE2B 655612d7b792bf82592b86caa56064c87f5b9b2fa323d421c25e442c3462a876445e126c6ed4b378d982cfb4554645f7be8950e7aa9f89e4243a0e9c75c63056 SHA512 bd3b0911b8fe4da36da8411224ffc315600691dc34b02914d06c296dc0853aaa42d8fcccccad25d362967fe796af30b726f42b354b93ef518e28e4f2c1880c74
-EBUILD liblinear-220.ebuild 1445 BLAKE2B a925bf8d337dfd549333ec294b3175c2f1c4e9ad4f3d3dd8961ee5f294f123c4413fad51a03028809f6428d24f24baa0390cc748c498176fa1c932d716b10811 SHA512 8e166b377b67f1d53940accd0c122f600f7fe4945ef7fa0094921082a4db90455edf719e436f11b05cff8909f0508fd0bf29e6fa7bde48a0a5740d9783dcba3a
 EBUILD liblinear-221.ebuild 1447 BLAKE2B 9560996f77a28c1d22eff32a3f0ddb3e4038fe59489dfaacdc052e3f94f22f32081f5f0e708c6e8abbaee621e047fa3df44b07f0dd7464f3668faebd62bc939e SHA512 616f1b29a9fbf1aa784e13f6fab3f4d771f670b77e14c9c39f38a556faf1bc33b387e2b4b4296cab9510fd732a98ec0dd8a7956dde254f8c37adfb840517cba7
+EBUILD liblinear-230.ebuild 1447 BLAKE2B 4416754ff7bd96f5ffc5d46fe1f6d2b287745e39ba2b2f05997d955e8bb2321ae39ae7196b11059ab54714ac141b66840f5257d672eedcc1d25dfd479914c406 SHA512 b2421ffe5a6c2e03cf8245dfe72cf21e9ba28e2086b2967b60751a677ab13d78f85eb707b41e258b2d4b4e924a1aa443af148822a09750cd7d31c57340961432
 MISC metadata.xml 335 BLAKE2B 2a905547b4dbf1ea8870dc8816a63252e142edcba93710b5d2cb57c2b6603c165ea06a3b459f442e1d08653cb9c6530a56bbaa8685c8147a280d917b4cd1f342 SHA512 efd0a36cca5d21c4a5e94388d125870af42ae9091234a44ae53b8ac6ea7e6ad0b637a5629d3c9ceabfebddce71fde8fa94285e5b1c7edefddebb8bab9e99f0bd
diff --git a/dev-libs/liblinear/liblinear-211.ebuild b/dev-libs/liblinear/liblinear-211.ebuild
deleted file mode 100644
index 7176d0f8b119..000000000000
--- a/dev-libs/liblinear/liblinear-211.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A Library for Large Linear Classification"
-HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
-SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="blas"
-
-RDEPEND="
-	blas? ( virtual/blas )
-"
-DEPEND="
-	${RDEPEND}
-	blas? ( virtual/pkgconfig )
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^AR/s|=|?=|g' \
-		-e '/^RANLIB/s|=|?=|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		blas/Makefile || die
-	sed -i \
-		-e 's|make|$(MAKE)|g' \
-		-e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
-		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
-		-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
-		Makefile || die
-	if use blas; then
-		sed -i -e 's:blas/blas.a::g' Makefile || die
-	fi
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS} -fPIC" \
-		CXXFLAGS="${CXXFLAGS} -fPIC" \
-		AR="$(tc-getAR) rcv" \
-		RANLIB="$(tc-getRANLIB)" \
-		LIBS="$(usex blas "$( $(tc-getPKG_CONFIG) --libs blas )" blas/blas.a)" \
-		lib all
-}
-
-src_install() {
-	dolib ${PN}.so.3
-	dosym ${PN}.so.3 /usr/$(get_libdir)/${PN}.so
-
-	newbin predict ${PN}-predict
-	newbin train ${PN}-train
-
-	doheader linear.h
-
-	dodoc README
-}
diff --git a/dev-libs/liblinear/liblinear-220.ebuild b/dev-libs/liblinear/liblinear-230.ebuild
index 5fdad5b9beb7..00881437e2d5 100644
--- a/dev-libs/liblinear/liblinear-220.ebuild
+++ b/dev-libs/liblinear/liblinear-230.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=6
+EAPI="7"
 inherit multilib toolchain-funcs
 
 DESCRIPTION="A Library for Large Linear Classification"
@@ -53,7 +53,7 @@ src_compile() {
 }
 
 src_install() {
-	dolib ${PN}.so.3
+	dolib.so ${PN}.so.3
 	dosym ${PN}.so.3 /usr/$(get_libdir)/${PN}.so
 
 	newbin predict ${PN}-predict
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index 3a7bd241f81e..2999380e2764 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -1,5 +1,5 @@
 DIST liblognorm-2.0.5.tar.gz 667709 BLAKE2B 9f2a774c2378caa460a1f11e21570e719f83e782c5731a35921099b1b31397495ea2a4baebd489d186526eb2d011f2ab30d971713a8083c1ae02168d3f632ce8 SHA512 2b36fabfa8b751127d47f307833414d339ae43bad5b687ce6ac42a961021f9a515703ca0c4808e098ef49be3a943abdbf307f90995a2331c6e266167ef041d00
 DIST liblognorm-2.0.6.tar.gz 666712 BLAKE2B 4c3e46fbd9a3eaf6c429872d30c0fe93f1255dbf3cc14efc82ab94d70ef45c5560c50644e0e23dc63777ddbc405d0f3fb911975d06fd6f6cdee6f7b98ff10b74 SHA512 0b4ee55eb54920dd096fdd6d6dcc2263bc52e74442d86503bfebf26b31492a8c1b67cb3b709ecc8b96cc53252151515719027306b2b6f7ba3404adc5a48cf125
-EBUILD liblognorm-2.0.5.ebuild 1494 BLAKE2B e650f9f6e067624d25834012df2b15c53290d36f49eaba52b020ef37eaf785f1e6c5c1c06dd4b4508535ef0c678fd6f51b0e0fad2d1a47d956dd742b474501c8 SHA512 7a525f0e554b45fe8087d6e9ef4949bedd50d81daf128aff6b0afbeeb64d9dac8d8cdc9e1c668a44b0ef09381067dce436a470f35dd81ccb4666ea7d5545e7a4
-EBUILD liblognorm-2.0.6.ebuild 1491 BLAKE2B 20bca423ad7004e7313fbca385320ac0e3289fb8044f9778fa55e356d6845dc6292d4bbc1f38d1d2d760030e3b1d2a212cbcf50b064f744f6df98f3de1e3cca4 SHA512 b32f281a2caf7b6b9d8df6d956f08eae8f73a76ef0c6c263671067b1e1871ebf57a12a02b79b4733806d7bdec2191043e94b056e163b2ee4ef8655954c522e5d
+EBUILD liblognorm-2.0.5.ebuild 1493 BLAKE2B a70a23c8c0dc92230759c124491511d4fc9ca0f5a2728ce5e734150a282ede7a10ab4eeb2ad574d08af706ab69a3e0c8dc6bf19d29850bdce6745b29775c3c3c SHA512 5bd5de8522dc182dc6aa8e15d64ca8682aad4cad2dbfd063fc7a900fced2775f40c182ffbe9338f1219f522300ff8a3023be538f4d96ea7e42bfe0d45614374e
+EBUILD liblognorm-2.0.6.ebuild 1493 BLAKE2B a70a23c8c0dc92230759c124491511d4fc9ca0f5a2728ce5e734150a282ede7a10ab4eeb2ad574d08af706ab69a3e0c8dc6bf19d29850bdce6745b29775c3c3c SHA512 5bd5de8522dc182dc6aa8e15d64ca8682aad4cad2dbfd063fc7a900fced2775f40c182ffbe9338f1219f522300ff8a3023be538f4d96ea7e42bfe0d45614374e
 MISC metadata.xml 582 BLAKE2B 59408e460cb8208149a93cbe049867d8cc202272aea9cd113a7f282eeb6f57b967abf7379241c8dd987e58f66f1efb36c29809176db34cdb3b2127a5ebe02f0c SHA512 7df1432cf2ddfe55c6a449d0179b771652a051d75fa34b8d3ea42d201bc64b3b18b2410ace68c263f14eb692661846a25cb0220de43abcaef13401e87f1173e2
diff --git a/dev-libs/liblognorm/liblognorm-2.0.5.ebuild b/dev-libs/liblognorm/liblognorm-2.0.5.ebuild
index 635f5f3f9c52..f5361ff95e5d 100644
--- a/dev-libs/liblognorm/liblognorm-2.0.5.ebuild
+++ b/dev-libs/liblognorm/liblognorm-2.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,14 +6,14 @@ EAPI="6"
 inherit autotools
 
 DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
+HOMEPAGE="https://www.liblognorm.com"
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
 
 	inherit git-r3
 else
-	SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
+	SRC_URI="https://www.liblognorm.com/files/download/${P}.tar.gz"
 	KEYWORDS="amd64 arm ~arm64 hppa x86 ~amd64-linux"
 fi
 
diff --git a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
index 52b3e6aa5550..f5361ff95e5d 100644
--- a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
+++ b/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
@@ -6,14 +6,14 @@ EAPI="6"
 inherit autotools
 
 DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
+HOMEPAGE="https://www.liblognorm.com"
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
 
 	inherit git-r3
 else
-	SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
+	SRC_URI="https://www.liblognorm.com/files/download/${P}.tar.gz"
 	KEYWORDS="amd64 arm ~arm64 hppa x86 ~amd64-linux"
 fi
 
diff --git a/dev-libs/liblouis/Manifest b/dev-libs/liblouis/Manifest
index 5c976516184c..21d69e456954 100644
--- a/dev-libs/liblouis/Manifest
+++ b/dev-libs/liblouis/Manifest
@@ -1,3 +1,3 @@
 DIST liblouis-2.5.3.tar.gz 3785311 BLAKE2B 15130dfa6c32b9c12b6ffccf4a8b2185bcc8fe483e8822d4fdd9f1c1cd0c3e8f33325419f75a9eb23e1414743fe01b44041c836a06e4ff040708b95998251854 SHA512 5aa65f3a0b7cef37fe7cd8ccf09df8c40f38d183a88d1be9f1251b40406204e57a8d95716bf1de3569b09b640be613cc3e0bd0e05dc4d544face00bfc8d75ac7
-EBUILD liblouis-2.5.3.ebuild 1418 BLAKE2B beef7c46b9b71fa1a396581e83cc0c8026da09730981b764f622741a31ef25c1f432c2f8442aea66a0e0cbac40d3db430854e367cc0432661d33bc1fd37ec94b SHA512 60dc647ab82f83db96a7b72f636a90cf7c0cf41b9b08511b7584c7fbee3f9ba1708401cbf343563f42ec43c9c0321a3152581087976ca645d8e04f8f2b3a355c
+EBUILD liblouis-2.5.3.ebuild 1411 BLAKE2B 0dbfd0672ad52fa181c8b196133703ca40f5449d165ff98a5d66cd73ff61a06e10c07b315cb367ec178ca369632ef93ad28844d8c29b89102fdfcc98c98c0810 SHA512 58dc1bd56b29c52a85277c00219e9d38fc35232eb95cfab479c53d7089b4f10204de1a82b67cbbb9e350131ca24ba86d02df94d1486796cd559fb2b1b12db0a7
 MISC metadata.xml 351 BLAKE2B 0fa7c957682fe363ddd29442ae153152469cc64ebf9005361c4b82f180c380485adf0b04467b147a441c6656ddcc9e44967fd692ed9f835d70653dbae9b9be1a SHA512 377a2d9ea4bc6007a60fcaf0284bd47af78b6fe2c901916f9cd7d6ab0f7a5225baf7314b47b0c3b00cd162278f910206bd99469bdef0165cd6e19c1eff73714d
diff --git a/dev-libs/liblouis/liblouis-2.5.3.ebuild b/dev-libs/liblouis/liblouis-2.5.3.ebuild
index 07927ad714db..50e3ccaacfec 100644
--- a/dev-libs/liblouis/liblouis-2.5.3.ebuild
+++ b/dev-libs/liblouis/liblouis-2.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE='wide-unicode(+)'
 DISTUTILS_OPTIONAL=1
 inherit distutils-r1
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index 343e49474ab9..dbe61fd0dda6 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,5 +1,3 @@
-DIST libmateweather-1.18.2.tar.xz 3455940 BLAKE2B 15cb57c0202c1117f203bd9550c86d255404984e9163a7f79b8f81a0c436ff6bf9e1945536a15078ad479c9379798966337b6b8851ec84384ccc08c352d06260 SHA512 9b0f9b11f0c9b472a13adc1cfd26076dffd278e0154efa4248f8cc4a999250c88c761985b9a18978a7581e5459232fe2314181ae26a1c7c4fd4c80b536827504
 DIST libmateweather-1.22.0.tar.xz 3386920 BLAKE2B 312bd8cd12a1d51216b9509b2badaccb23779f1c7c314ecf02c9789837fa619d6029e97bf06f9fd320ba590936888d51fe178cffbb7dca87eb167ed4fbf3eabb SHA512 43371fc615dda2b9042633a63ac4c1fb0b1ea43b20c783e443b0f57e10ad8fddedbd593f03bd6c942729f0a9c80484266fe1ef900d128fa4b02f80d6a80ae9bd
-EBUILD libmateweather-1.18.2.ebuild 841 BLAKE2B 89c03dce2df151e8543f7bf98e0adf752121193cfc0880a85934c939bddc09bfa65a280caff3cd1c82fd0bcc8abd7104bf44eef4eb408fa960b34159945fcaac SHA512 62bd8582102a4e79ddf286bd86325107cde4c7219b41e58ed2aa0669b03223f8f5a208c445c9c7e24e6111497bb8f33cce8a117e7309e4a1a16960eb4d5d0331
-EBUILD libmateweather-1.22.0.ebuild 866 BLAKE2B 13d62d2a2f55053d69b5cbd7aab37a5ce706edaba5adbf9b2217a50b2b87a633e520a64f53c7210b95862db4690fb07f188aa1a58886f2e9496f25a161d6b217 SHA512 7b7aa77e59725bbe784fee862b64dbc9e0f4af5d40f287580304b81a62064d5dc34b57cf0771e86b06ca3eb1b4b1771bf452da86ef26b9d03be6ca66b8c091bd
+EBUILD libmateweather-1.22.0.ebuild 864 BLAKE2B ddd1d3cffad117cae2e3072f5dfec1476374228df0caa8b8cb3cb8ab3cf9b147ed73c35fd76e40122ba6d6fda6fd805eee5cb823f3e34c17a03f7a7d30db5009 SHA512 97e891e24b6ea067eaf4b03f6ed132d875ca838243ee92f17d283e0fe3a80a80b4abdd10866edfa0b4dd5fc917fe3b200662edf733445c0c1e22159c97787d6f
 MISC metadata.xml 343 BLAKE2B 2c44370234b1e71de86ca5e1fc09ab633185cd1401071d3487b8d4c582115f92e30ace26aca5d3dfb89b8c4aefade6ae4bf6b93776fa123206e638b83e0df9d7 SHA512 1bc3a926850df9eabb80136639bc47809b0c49bcefc37c990cb7941a3629c7a0b2b4e6b538c5af7dcb2187239792b500185349a1ba6befe5b85f191b73467a2a
diff --git a/dev-libs/libmateweather/libmateweather-1.18.2.ebuild b/dev-libs/libmateweather/libmateweather-1.18.2.ebuild
deleted file mode 100644
index 3d4109ffd671..000000000000
--- a/dev-libs/libmateweather/libmateweather-1.18.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE library to access weather information from online services"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.6:2
-	>=net-libs/libsoup-2.34:2.4
-	>=sys-libs/timezone-data-2010k:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.0:3"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--enable-locations-compression \
-		--disable-all-translations-in-one-xml
-}
diff --git a/dev-libs/libmateweather/libmateweather-1.22.0.ebuild b/dev-libs/libmateweather/libmateweather-1.22.0.ebuild
index b18cfadd7ef9..e3a5753eeca6 100644
--- a/dev-libs/libmateweather/libmateweather-1.22.0.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE library to access weather information from online services"
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index 08a6d4c85d20..b39602909ed9 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,6 +1,4 @@
-DIST libmaxminddb-1.2.1.tar.gz 614448 BLAKE2B 6ab92e0313cf745d8820db7239c5760b9fe8a813a14008e415068a263954d48c99c3d3d771d746959c85a5ff6cec28a0b287b15ced83697c8594761599b99fa9 SHA512 c77e2714c30dbd9d83a755d7e4d24016534510f4cc7213fe9549d610bf79aaeb28f761a9fb769270d9043b1baab537c5a4b3a9994b525d48f395fe94c104b5b3
 DIST libmaxminddb-1.3.2.tar.gz 619009 BLAKE2B 1fa2d528d47e14a75e5096072e6ba8136eb5060ab95cb472ef70907dd519540790f6bbc518371e0d276d6977bb3444dbfd179d526877ca740e56ebf6eb459244 SHA512 906e80531a901091fd9f88075ece5189b0885400216ea994889d9250dd37ead14e00dc14ca2a38eb2100e4814d0eb3a205ba1618606f1375ab0dcc3981097115
-EBUILD libmaxminddb-1.2.1.ebuild 534 BLAKE2B f04f1993e974ddfa3c3d18460b2d1ab47f4eafd75593b1e1d35b039edd7cccf9794dba6557b3fff29156debc92f6b7e2a17c4ac0b621b5adadf34476f3384807 SHA512 c39d9450664921840c4a18ec2a7293607ac1aa668330d5c19ac3fcfd8998522055e83313b03551635f417ff80915f52e5506fea52768236287ea56a2d838573a
-EBUILD libmaxminddb-1.3.2.ebuild 552 BLAKE2B f6dd9403b2cdaf2bc7ad955d40302143eb93f2d28e521aac85d2c983792648b8072504837ae273d9bedf2217282313fe7d03e53d3bef300541793e4eb9ea616c SHA512 c1009ad0410117ac5c42e7d339e342ab4d254bcd680e39ee873e8497bcea52c2fe437eaa424a8e0ae7e4b99be34ee7a9a33b878f53d5e7d7e32227f19ea15a5f
+EBUILD libmaxminddb-1.3.2.ebuild 558 BLAKE2B 45c955b5d811592d173a63e1de01b8e4dc2539fd5fe1ffdb3f508065ece45ee63011a0be7c858805d2d1041bee2b43cd1aa934ccb977d47f5fd5ffef595defb7 SHA512 5f036ef62451899645b197434f80254e0684b3060fdfd6d921522660713fb06e82a26f17c03620c3e2ffeee685ebb5f709dc6cd13e373d47844c0f51f112e126
 EBUILD libmaxminddb-99999.ebuild 534 BLAKE2B 17a96d2066900a4c310b913932bf72ccb410e13ffe150e8044bc9db80bd8af2ad82b9b5d6385b676ba5c723c0219b5001e552ce8a1c52f5529af6d949937aac9 SHA512 74e11c6417593375ae978788fc7b3790d0568229232114e5966505da839f7971ff6b77452a7649f7d430883781f39ab950f9cad4fc255fc84f1b12b8911f55a5
 MISC metadata.xml 365 BLAKE2B 3acd92dfb25bcbae837f784572887ffc5542121a91d6f2077f3410d03ddc3290d8b3485c4aa8d1c97af8f4f85a3dc8a621fc9eb5affacc1e27d41d4760ed53a4 SHA512 4e7a17cbf391683173f573d79f273e92184695e37bc68070c03ef4969e8b0e8a35a34b8b87d6582f365b93683b143f216a5a2365c9fe63a6f36ddd78e2ff8730
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.2.1.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.2.1.ebuild
deleted file mode 100644
index 9d04b57424fa..000000000000
--- a/dev-libs/libmaxminddb/libmaxminddb-1.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="C library for the MaxMind DB file format"
-HOMEPAGE="https://github.com/maxmind/libmaxminddb"
-SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/0.0.7"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="static-libs"
-
-DOCS=( Changes.md )
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-}
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
index 17017ee84aba..1deb5b3020e5 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DOCS=( Changes.md )
diff --git a/dev-libs/libmcal/Manifest b/dev-libs/libmcal/Manifest
deleted file mode 100644
index 4d7bb132b5e6..000000000000
--- a/dev-libs/libmcal/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX libmcal-0.7-flex-2.5.37.patch 406 BLAKE2B 0024e287579e231fb1e4fdeb3a8a0b6850283e38dd692aeb641bc78424d5528dc0fea0c9f2db30c6196222ac4a2ec2a41d5fb044048a70946bbfdb5f30536c5e SHA512 4dae8efd58dc50ad72aa98ab1e4963c8f7dc55c233d16f7b9390e901604d6d1ec6aafd295d92876f62a02abc30286bb430fdf2081f46d0b499248bc945ae09be
-AUX libmcal-0.7-flexfix.patch 527 BLAKE2B ff63ac7503c186d749f740040bf8d3d99dcfd65527a405a8444d1d1827d6ddbfb16b52ef8be1ec5aa3f62c86ed854fce8cb8874ca310aef9bdf5a97b76a1d2b7 SHA512 b505c0a416a950a9bd7189f6fc41200a1e4e5149083452f9af1e02f263a5f7a24e19ab4a3304fa4d95c0096056dbcb8b4ad444e459daa44f136e11acad322411
-AUX libmcal-0.7-fpic.patch 1302 BLAKE2B 0df3e8e405df6371c9c41d1dc7c3b13ddd89609d0e4a8215b0e8bbea33ea19df8a80b2d2c51937f729fa058ea6af5f47f0aff72f024920a2d5471c3ab5289327 SHA512 16a84b63a60a33a0d415ca94364344d356e58ed7ad3bccd21c9591610bdf2977b839fabb4e24f1a370310a4b7c939371720a2938f31b1df73db704501d82def1
-AUX libmcal-0.7-gcc4.patch 1108 BLAKE2B 34d5599c7c45684e63a68401e6c8fc6e32162befba427ddedda82d2a5c8a0a3dddf80ad48cb88bc777f3a7ae8b073bb9b437b65d18387965834def4b68f9ae61 SHA512 17a760d6fba06999fc9a1fc5c7d0c269f84bfa5b9ed66db94e1ed39a2db24ebe66a23ee0066d191ab2484483438b2144e5cd032dad69503117029e07e389a636
-AUX libmcal-0.7-libdir.patch 888 BLAKE2B 1f6cc118f4d666ace783ffae1ad7a2c3c9a54e8386fea68e78d2dcf2fa92f16b690464a56f2eb88f8f49b7ce4e658729d3ac3f96da0781dac79d991128943cda SHA512 81cf2f29ec910237ccfaee08557060a260496055ea039545d60753ac716f5299b1758085bb75b1cf14de46c1ca87c60f8babb56aef9cf68368d092525421a1d4
-AUX libmcal-0.7-r6-fpic.patch 1336 BLAKE2B 8108361a8569ee9b7a230a87e5679f2f86ee3c300ca242fa8029fd93bb77cf87d9ac2ecf5e94a867eec33eaac82eba55b2069ee914f02580df366b8f3094f011 SHA512 71b117daac42fd345e6035bbab133a7c217f7123dd1aa924b8ce59191718638a14a3b57171e8f632960be57f96b09e267595318ab2e3c4b1c2d8862c71a5d3d9
-AUX libmcal-0.7-r6-gcc4.patch 1209 BLAKE2B 0bd70e49eea1ff89bfa5209349780a9f8265e7733af44f54f40193ff4a8dd22b015a3572e9232f91428835664daa99bc9ab665a750b7714b9ae885dd9654b017 SHA512 1f28a681b8d6ad79961570b8f6c5f6676fc666d3efe1fb25cbfea8df7175e7a732f07559d4fa914ff5cebcbabe65ec58bc83d407780cada3ac805a66f09d3ca6
-DIST libmcal-0.7.tar.gz 49039 BLAKE2B 78a2f74f92a6b34489b26eac90de1854b6151d78bea3f9e2b4225de8715e1276013e0574e4de3dc66888507f2e9fd432a11d2890f10193330da68e67e375660e SHA512 9d94d9acb663f9add43000be91c1c59e7d5a2a968b3526a97a37c7965df4b07e1e4efa92533bfd0aa92105a90efb7e062307a07b36ca1f21fdc9ea6928fea2f4
-DIST mcaldrivers-0.9.tar.gz 13445 BLAKE2B 3c10a07e6a5bde671f50abcedeb64b80fc9cfa140d63cab916673192d02fcec9e4c2dc54b09211031e68ae55aa77ab428abef0f84072e41bab3c2e4d94251952 SHA512 1dda4e09c85ac461bff4d812f51aaec600ecd6b337cce5f73c3b2a9a3f9a1685f5fbe915073df5f10b3ba16e1a6a0f8821c59e23b2600acde8a00de3f92960d9
-EBUILD libmcal-0.7-r5.ebuild 1940 BLAKE2B d569ae1d51a336e9b93ef04d657a98db542fe4accbe81529beae7916d5f2f1b8e6ec29728ad6de1aac62f685ec458afe0f875cbe89e58588245ec837ac9f3de1 SHA512 3718d52e50200f412a72c9bc1589326140e001f60f8474ab76df1450ed0d3b1530bd56db03f199ce68adb3dff26f9c81313e02b93ef6e1269e6e68e511e55b4a
-EBUILD libmcal-0.7-r6.ebuild 2117 BLAKE2B 14add8387c103f461f8ec1f33d49649288a61d2d2af62e1d31e292ad16efc8f5c4f5005077d6986680c5735ca7305a91704f2c5943d0b6b2d1e767553b7a750d SHA512 75b387e895966e3dfad63277e155d0a8596b252b4ca8ed103ca659d9cedf3a5ed67dc047847f2438e212888f7cf273d4592caec7fa877e03e6ded03bcfbaec2c
-MISC metadata.xml 327 BLAKE2B 493767ec9590c6ddfb33d5438e22a688c8ef713b91ca85d349c446607c4c94e4006ef182f1602f68e9dd44431b7279b594505d446c110a2957b193decc49f28d SHA512 ac68d82248ec86227d6f4da8f57fbd17f40db921e10269454369e866fab266261e6977a6f1341924edc21e6f0a62cb8c5a23c849003bab949d0890ca63d9140d
diff --git a/dev-libs/libmcal/files/libmcal-0.7-flex-2.5.37.patch b/dev-libs/libmcal/files/libmcal-0.7-flex-2.5.37.patch
deleted file mode 100644
index 8c2e38699876..000000000000
--- a/dev-libs/libmcal/files/libmcal-0.7-flex-2.5.37.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libmcal.orig/icalroutines.h	2003-01-28 18:45:21.000000000 +0100
-+++ libmcal/icalroutines.h	2013-02-04 01:54:27.833995640 +0100
-@@ -48,8 +48,10 @@
- 
- 
- /* ICAL parser. */
-+#ifndef ical_yytext
- extern char	*ical_yytext;
--extern int	ical_yyleng;
-+extern size_t	ical_yyleng;
-+#endif
- int		ical_yylex(void);
- void		ical_usebuf(const char *buf, size_t size);
- void		ical_preprocess(char *buf, size_t *size);
diff --git a/dev-libs/libmcal/files/libmcal-0.7-flexfix.patch b/dev-libs/libmcal/files/libmcal-0.7-flexfix.patch
deleted file mode 100644
index 0088dce4ccc8..000000000000
--- a/dev-libs/libmcal/files/libmcal-0.7-flexfix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- libmcal/icalscanner.lex	2003-01-28 09:45:21.000000000 -0800
-+++ libmcal/icalscanner.lex.new	2006-04-01 22:47:58.515410944 -0800
-@@ -32,13 +32,6 @@
-  */
- 
- #include "icalroutines.h"
--
--void
--ical_usebuf(const char *buf, size_t size)
--{
--	BEGIN(INITIAL);
--	yy_scan_bytes(buf, size);
--}
- %}
- 
- 
-@@ -68,3 +61,12 @@
- {LF}				BEGIN(INITIAL); return ICALTOK_LF;
- .				return ICALTOK_JUNK;
- <<EOF>>				return ICALTOK_EOF;
-+
-+%%
-+
-+void
-+ical_usebuf(const char *buf, size_t size)
-+{
-+	BEGIN(INITIAL);
-+	yy_scan_bytes(buf, size);
-+}
diff --git a/dev-libs/libmcal/files/libmcal-0.7-fpic.patch b/dev-libs/libmcal/files/libmcal-0.7-fpic.patch
deleted file mode 100644
index be003d354a4c..000000000000
--- a/dev-libs/libmcal/files/libmcal-0.7-fpic.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- Makefile.in	2003-11-27 15:46:46.887752568 +0000
-+++ Makefile.in	2003-11-27 16:14:17.325847840 +0000
-@@ -7,7 +7,7 @@
- 
- INCLUDE=@DRIVER_INCDIR@  ${OTHERINCDIR} -I.
- 
--CFLAGS=-O0 -Wall -g ${INCLUDE} ${OTHER_CFLAGS}
-+CFLAGS=-O0 -Wall -g ${OTHER_CFLAGS}
- 
- LIBOBJS=mcal.o datetime.o lex.ical_yy.o icalroutines.o cal_misc.o $(DRIVER_LIBS)
- ALLOBJS=${LIBOBJS} tester.o
-@@ -17,6 +17,9 @@
- LIBCAL=libmcal.a
- LIBCAL_SO=libmcal.so
- 
-+%.o: %.c
-+	gcc $(CFLAGS) -fPIC $(INCLUDE) -c -o $@ $<
-+
- all: libmcal.a libmcal.so
- 
- install: libmcal.a libmcal.so
-@@ -38,7 +41,7 @@
- 
- libmcal.so: $(LIBOBJS)
- 	rm -f $(LIBCAL_SO)
--	gcc $(CFLAGS) -shared -o $(LIBCAL_SO) $(LIBOBJS)
-+	gcc $(CFLAGS) $(INCLUDE) -shared -o $(LIBCAL_SO) $(LIBOBJS)
- 
- lex.ical_yy.c: icalscanner.lex
- 	$(FLEX) $<
---- mstore/Makefile.old	2004-08-08 16:37:13.641537544 +0100
-+++ mstore/Makefile	2004-08-08 16:37:35.473218624 +0100
-@@ -8,6 +8,10 @@
- ALLOBJS=mstore.o
- TARGET=mstore_driver.o
- 
-+%.o: %.c
-+	gcc $(CFLAGS) -fPIC $(INCLUDE) -c -o $@ $<
-+
-+
- all: $(TARGET)
- 
- 
---- icap/Makefile.old	2004-08-08 16:38:58.353618888 +0100
-+++ icap/Makefile	2004-08-08 16:39:18.841504256 +0100
-@@ -7,6 +7,10 @@
- ALLOBJS=icap.o icaproutines.o lex.icap_yy.o
- TARGET=icap_driver.o
- 
-+%.o: %.c
-+	gcc $(CFLAGS) -fPIC $(INCLUDE) -c -o $@ $<
-+
-+
- all: $(TARGET)
- 
- 
diff --git a/dev-libs/libmcal/files/libmcal-0.7-gcc4.patch b/dev-libs/libmcal/files/libmcal-0.7-gcc4.patch
deleted file mode 100644
index d38d0c356dcb..000000000000
--- a/dev-libs/libmcal/files/libmcal-0.7-gcc4.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/icap/icap.c	2003-01-28 18:31:33.000000000 +0100
-+++ b/icap/icap.c	2005-08-12 15:04:36.000000000 +0200
-@@ -159,7 +159,7 @@
- 	if (!reopen) {
- 		if ((stream = calloc(1, sizeof(*stream))) == NULL)
- 			goto fail;
--		if ((DATA = calloc(1, sizeof(*DATA))) == NULL)
-+		if ((stream->data = calloc(1, sizeof(*DATA))) == NULL)
- 			goto fail;
- 
- 		/* Copy host. */
---- a/mstore/mstore.c	2005-08-12 15:30:52.000000000 +0200
-+++ b/mstore/mstore.c	2005-08-12 15:31:38.000000000 +0200
-@@ -308,7 +308,7 @@
- 	if (!reopen) {
- 		if ((stream = calloc(1, sizeof(*stream))) == NULL)
- 			goto fail;
--		if ((DATA = calloc(1, sizeof(*DATA))) == NULL)
-+		if ((stream->data = calloc(1, sizeof(*DATA))) == NULL)
- 			goto fail;
- 	}
- 
-@@ -773,7 +773,7 @@
-         while((event=read_event(calfile))) {
- 	  if (event->id == modified_event->id)
- 	    {
--	    (const CALEVENT*)event = modified_event;         
-+	    event = modified_event;         
- 	  /*is more required here to assign objects, a loop through all the properties*/
- 	    /*    We actually only want to modify any individual property, not the whole thing..
- 		  TODO */
-
diff --git a/dev-libs/libmcal/files/libmcal-0.7-libdir.patch b/dev-libs/libmcal/files/libmcal-0.7-libdir.patch
deleted file mode 100644
index b784993aed01..000000000000
--- a/dev-libs/libmcal/files/libmcal-0.7-libdir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur libmcal.orig/Makefile.in libmcal/Makefile.in
---- libmcal.orig/Makefile.in	2003-01-28 09:45:21.000000000 -0800
-+++ libmcal/Makefile.in	2005-02-06 21:20:58.860199158 -0800
-@@ -20,17 +20,17 @@
- all: libmcal.a libmcal.so
- 
- install: libmcal.a libmcal.so
--	mkdir -p ${DESTDIR}@prefix@/lib/
-+	mkdir -p ${DESTDIR}@libdir@
- 	mkdir -p ${DESTDIR}@prefix@/include/mcal/
--	install -m 755 -o 0 -g 0 libmcal.a libmcal.so ${DESTDIR}@prefix@/lib
-+	install -m 755 -o 0 -g 0 libmcal.a libmcal.so ${DESTDIR}@libdir@
- 	install -m 644 -o 0 -g 0 \
- 	  mcal.h bool.h datetime.h drivers.h cal_misc.h icalroutines.h \
- 	  ${DESTDIR}@prefix@/include/mcal/
- 	touch installed
- 
- install-strip: installed
--	strip ${DESTDIR}@prefix@/lib/libmcal.so
--	strip ${DESTDIR}@prefix@/lib/libmcal.a
-+	strip ${DESTDIR}@libdir@/libmcal.so
-+	strip ${DESTDIR}@libdir@/libmcal.a
- 
- libmcal.a: $(LIBOBJS)
- 	rm -f $(LIBCAL)
diff --git a/dev-libs/libmcal/files/libmcal-0.7-r6-fpic.patch b/dev-libs/libmcal/files/libmcal-0.7-r6-fpic.patch
deleted file mode 100644
index 72a199a3a57e..000000000000
--- a/dev-libs/libmcal/files/libmcal-0.7-r6-fpic.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- Makefile.in	2003-11-27 15:46:46.887752568 +0000
-+++ Makefile.in	2003-11-27 16:14:17.325847840 +0000
-@@ -7,7 +7,7 @@
- 
- INCLUDE=@DRIVER_INCDIR@  ${OTHERINCDIR} -I.
- 
--CFLAGS=-O0 -Wall -g ${INCLUDE} ${OTHER_CFLAGS}
-+CFLAGS=-O0 -Wall -g ${OTHER_CFLAGS}
- 
- LIBOBJS=mcal.o datetime.o lex.ical_yy.o icalroutines.o cal_misc.o $(DRIVER_LIBS)
- ALLOBJS=${LIBOBJS} tester.o
-@@ -17,6 +17,9 @@
- LIBCAL=libmcal.a
- LIBCAL_SO=libmcal.so
- 
-+%.o: %.c
-+	$(CC) $(CFLAGS) -fPIC $(INCLUDE) -c -o $@ $<
-+
- all: libmcal.a libmcal.so
- 
- install: libmcal.a libmcal.so
-@@ -38,7 +41,7 @@
- 
- libmcal.so: $(LIBOBJS)
- 	rm -f $(LIBCAL_SO)
--	gcc $(CFLAGS) -shared -o $(LIBCAL_SO) $(LIBOBJS)
-+	$(CC) -Wl,-soname=$@ $(CFLAGS) $(LDFLAGS) $(INCLUDE) -shared -o $(LIBCAL_SO) $(LIBOBJS)
- 
- lex.ical_yy.c: icalscanner.lex
- 	$(FLEX) $<
---- mstore/Makefile.old	2004-08-08 16:37:13.641537544 +0100
-+++ mstore/Makefile	2004-08-08 16:37:35.473218624 +0100
-@@ -8,6 +8,10 @@
- ALLOBJS=mstore.o
- TARGET=mstore_driver.o
- 
-+%.o: %.c
-+	$(CC) $(CFLAGS) -fPIC $(INCLUDE) -c -o $@ $<
-+
-+
- all: $(TARGET)
- 
- 
---- icap/Makefile.old	2004-08-08 16:38:58.353618888 +0100
-+++ icap/Makefile	2004-08-08 16:39:18.841504256 +0100
-@@ -7,6 +7,10 @@
- ALLOBJS=icap.o icaproutines.o lex.icap_yy.o
- TARGET=icap_driver.o
- 
-+%.o: %.c
-+	$(CC) $(CFLAGS) -fPIC $(INCLUDE) -c -o $@ $<
-+
-+
- all: $(TARGET)
- 
- 
diff --git a/dev-libs/libmcal/files/libmcal-0.7-r6-gcc4.patch b/dev-libs/libmcal/files/libmcal-0.7-r6-gcc4.patch
deleted file mode 100644
index 065a82dc24c3..000000000000
--- a/dev-libs/libmcal/files/libmcal-0.7-r6-gcc4.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urN libmcal-/icap/icap.c icap/icap.c
---- libmcal/icap/icap.c	2003-01-28 18:31:33.000000000 +0100
-+++ icap/icap.c	2005-08-12 15:04:36.000000000 +0200
-@@ -159,7 +159,7 @@
- 	if (!reopen) {
- 		if ((stream = calloc(1, sizeof(*stream))) == NULL)
- 			goto fail;
--		if ((DATA = calloc(1, sizeof(*DATA))) == NULL)
-+		if ((stream->data = calloc(1, sizeof(*DATA))) == NULL)
- 			goto fail;
- 
- 		/* Copy host. */
-diff -urN libmcal/mstore/mstore.c mstore/mstore.c
---- libmcal/mstore/mstore.c	2005-08-12 15:30:52.000000000 +0200
-+++ mstore/mstore.c	2005-08-12 15:31:38.000000000 +0200
-@@ -308,7 +308,7 @@
- 	if (!reopen) {
- 		if ((stream = calloc(1, sizeof(*stream))) == NULL)
- 			goto fail;
--		if ((DATA = calloc(1, sizeof(*DATA))) == NULL)
-+		if ((stream->data = calloc(1, sizeof(*DATA))) == NULL)
- 			goto fail;
- 	}
- 
-@@ -773,7 +773,7 @@
-         while((event=read_event(calfile))) {
- 	  if (event->id == modified_event->id)
- 	    {
--	    (const CALEVENT*)event = modified_event;         
-+	    event = modified_event;         
- 	  /*is more required here to assign objects, a loop through all the properties*/
- 	    /*    We actually only want to modify any individual property, not the whole thing..
- 		  TODO */
-
diff --git a/dev-libs/libmcal/libmcal-0.7-r5.ebuild b/dev-libs/libmcal/libmcal-0.7-r5.ebuild
deleted file mode 100644
index eefc725bebca..000000000000
--- a/dev-libs/libmcal/libmcal-0.7-r5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-DRIVERS="mcaldrivers-0.9"
-SRC_URI_BASE="mirror://sourceforge/libmcal"
-DESCRIPTION="Modular Calendar Access Library"
-HOMEPAGE="http://mcal.chek.com/"
-SRC_URI="${SRC_URI_BASE}/${P}.tar.gz ${SRC_URI_BASE}/${DRIVERS}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="pam"
-
-DEPEND="pam? ( virtual/pam )"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	mv ${S}/../mcal-drivers/* ${S}/
-	einfo "Using /var/spool/calendar instead of /var/calendar"
-	for i in FAQ-MCAL HOW-TO-MCAL mstore/mstore.c mstore/README mstore/Changelog; do
-		sed -e 's|/var/calendar|/var/spool/calendar|g' -i ${i}
-	done
-	cd ${S}
-	epatch "${FILESDIR}"/${P}-fpic.patch
-	epatch "${FILESDIR}"/${P}-libdir.patch
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${P}-flexfix.patch
-}
-
-src_compile() {
-	use pam && CFLAGS="${CFLAGS} -DUSE_PAM -lpam" LDFLAGS="${LDFLAGS} -lpam"
-	einfo "Setting up mstore back-end"
-	cd ${S}/mstore
-	emake CFLAGS="${CFLAGS} -I.." LDFLAGS="${LDFLAGS}" || die
-
-	einfo "Setting up icap back-end"
-	cd ${S}/icap
-	emake CFLAGS="${CFLAGS} -I.." LDFLAGS="${LDFLAGS}" || die
-
-	cd ${S}
-	myconf="--with-mstore --with-icap"
-	econf ${myconf} --libdir=/usr/$(get_libdir) || die
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc CHANGELOG FAQ-MCAL FEATURE-IMPLEMENTATION HOW-TO-MCAL LICENSE README
-	newdoc mstore/README mstore-README
-	newdoc mstore/Changelog mstore-Changelog
-	newdoc icap/Changelog icap-Changelog
-	dohtml FUNCTION-REF.html
-	keepdir /var/spool/calendar
-	fperms 1777 /var/spool/calendar
-}
-
-pkg_postinst() {
-	einfo "You should start adding users to your calendar. ( e.g. htpasswd -c /etc/mpasswd username )"
-	# enforce perms
-	chmod 1777 ${ROOT}/var/spool/calendar
-}
diff --git a/dev-libs/libmcal/libmcal-0.7-r6.ebuild b/dev-libs/libmcal/libmcal-0.7-r6.ebuild
deleted file mode 100644
index 31955f636941..000000000000
--- a/dev-libs/libmcal/libmcal-0.7-r6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib
-
-DRIVERS="mcaldrivers-0.9"
-SRC_URI_BASE="mirror://sourceforge/libmcal"
-DESCRIPTION="Modular Calendar Access Library"
-HOMEPAGE="http://mcal.chek.com/"
-SRC_URI="${SRC_URI_BASE}/${P}.tar.gz ${SRC_URI_BASE}/${DRIVERS}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="pam"
-DOCS="CHANGELOG FAQ-MCAL FEATURE-IMPLEMENTATION HOW-TO-MCAL README"
-
-DEPEND="pam? ( virtual/pam )"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	mv "${S}"/../mcal-drivers/* "${S}"/
-	einfo "Using /var/spool/calendar instead of /var/calendar"
-	for i in FAQ-MCAL HOW-TO-MCAL mstore/mstore.c mstore/README mstore/Changelog; do
-		sed -e 's|/var/calendar|/var/spool/calendar|g' -i ${i} || die
-	done
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.7-r6-fpic.patch
-	epatch "${FILESDIR}"/${PN}-0.7-libdir.patch
-	epatch "${FILESDIR}"/${PN}-0.7-r6-gcc4.patch
-	epatch "${FILESDIR}"/${PN}-0.7-flexfix.patch
-	epatch "${FILESDIR}"/${PN}-0.7-flex-2.5.37.patch
-}
-
-src_configure() {
-	use pam && export CFLAGS="${CFLAGS} -DUSE_PAM -lpam" LDFLAGS="${LDFLAGS} -lpam"
-}
-
-src_compile() {
-	einfo "Setting up mstore back-end"
-	cd "${S}"/mstore
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -I.." LDFLAGS="${LDFLAGS}"
-
-	einfo "Setting up icap back-end"
-	cd "${S}"/icap
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -I.." LDFLAGS="${LDFLAGS}"
-
-	cd "${S}"
-	myconf="--with-mstore --with-icap"
-	# Sorry repoman, this econf cannot be run until the above two compiles are
-	# done.
-	econf ${myconf} --libdir=/usr/$(get_libdir)
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ${DOCS}
-	newdoc mstore/README mstore-README
-	newdoc mstore/Changelog mstore-Changelog
-	newdoc icap/Changelog icap-Changelog
-	dohtml FUNCTION-REF.html
-	keepdir /var/spool/calendar
-	fperms 1777 "${ROOT}"/var/spool/calendar
-}
-
-pkg_postinst() {
-	einfo "You should start adding users to your calendar. ( e.g. htpasswd -c /etc/mpasswd username )"
-}
diff --git a/dev-libs/libmcal/metadata.xml b/dev-libs/libmcal/metadata.xml
deleted file mode 100644
index f0cf5708f1c8..000000000000
--- a/dev-libs/libmcal/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>robbat2@gentoo.org</email>
-		<name>Robin H. Johnson</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">libmcal</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/libmemcached/Manifest b/dev-libs/libmemcached/Manifest
index 59f0eb4540ea..629a15f848cb 100644
--- a/dev-libs/libmemcached/Manifest
+++ b/dev-libs/libmemcached/Manifest
@@ -2,5 +2,5 @@ AUX continuum-1.0.18.patch 3086 BLAKE2B 4f5b004d0910be5a8f8bb9c568a2555c2b3f4ab7
 AUX debug-disable-enable-1.0.18.patch 1458 BLAKE2B ce806c34ab5525f8d493030ad870d9a7fb1b27d18159c6626d37c1540f0cb7aec6a9d45d17423dabebfde8fb68fdb6796cc88ff8fa109c9622958a2eef322ede SHA512 f4d731ce227e91324b88d155daaf35f2228a48e61d8e448c93f9d102c9939fa4c3b2a07b96741d442382cc5498358e9ae0471f766373654b21d849a96a42d813
 AUX libmemcached-1.0.18-gcc7.patch 846 BLAKE2B 6c82a0cec03e6992e975b30a6c2b00bf6630104b107ee1241fc9fc6be11054f3def0b2a3c9606762d193f7c729e3ef31865cdaab6b4294071a14bbb0a0aed212 SHA512 87667843bee44e1388f6088085a5d0c3a3a824f4830861024f5a19ab1747e96a74b8fae5870f848358a66258aeb18c9a6fa3a1d17bd03260b41f389e01e19c49
 DIST libmemcached-1.0.18.tar.gz 1039649 BLAKE2B e55acdc4c0cb2417f01b2980f7f71d9dfd685877361622422ee812f9e066ed2711549d457cf1b4a48a14c778e820b54abfe0c6274812c71fc7961e68167975e9 SHA512 2d95fea63b8b6dc7ded42c3a88a54aad74d5a1d417af1247144dae4a88c3b639a3aabc0c2b66661ff69a7609a314efaaae236e10971af9c428a4bca0a0101585
-EBUILD libmemcached-1.0.18-r3.ebuild 1612 BLAKE2B 63767f89fcd6f674aa8832d6b53b9ff3aa8d2e8344e1d63d253bce5c35fc6e0d624f60a38ed2f740eedc8707e27116119afa79632889d92f03419466f175d5a9 SHA512 a8c3dcbc3e81a893d83ea8a84d571a8ae5610d770517499aca0351de85afa46772e5cf2b125fb00c7eb18b93cffca07e18bf00d74ad9a9d0a1e9e7da4516e321
+EBUILD libmemcached-1.0.18-r3.ebuild 1618 BLAKE2B 7d9377848d3ee3ec1f8f4da04355891e7231d948ae39f7e124245a8e2cad19e7e07cf00fd1183e9adc66f3e5f7dfb5b2e910a6845c9c6bd1eba59bad70fb9f03 SHA512 22ef0f21b669491ec23698626e25f4c5d455a6f1fddc3aad77c136d94ead297cbe7a3b79c5036c08fe6395506a61960ace274dc2f911b517899ee18a99b0eb47
 MISC metadata.xml 826 BLAKE2B a77184515934e8eb06a2f7b42a4e4354c998192d617a1a4a3e0e6fdad88a189cdf809779106e3157f4b9f46675a6ae6961ef5280bdefaa1794b7c146b89fdeef SHA512 5bc0caef489fb8a9c6c038aa2a5620cd43d700104ab77407391eb0961f12392ac8535efd5fbe86c1e6be17cb89d766049fe1394461fa652bcdc1abd64afb9962
diff --git a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
index 42f4a6799195..b47a7317d344 100644
--- a/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
+++ b/dev-libs/libmemcached/libmemcached-1.0.18-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/1.0/${PV}/+download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug hsieh +libevent sasl static-libs"
 
 DEPEND="net-misc/memcached
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index 2e7f27af618b..341241bf0923 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,7 +1,3 @@
-DIST libmirage-3.2.0.tar.bz2 234214 BLAKE2B f2b8c42eed89efaeddb8051160c51814b4df45c1ca7cdb4cef683b86ea73dcd1446c6806588a9df0410da5b3971ce8945f2479022f21177237ee8b0d4b18d2d3 SHA512 15507154441b660f5a58e1101d4e6f9931a7640b90d3de5e387274c72be07f367b54a6be34dd31442bc504459414f611ffc39f86ff6a7381a820d059aef1d6d6
-DIST libmirage-3.2.1.tar.bz2 233650 BLAKE2B 2ac7bc30108c0bfbf27524819a5cb3d24fde1abc70f720bec50d37196386cfb46f7f9876c45437aadd79d6f9f3318afe50449a97ad36a7bcedd0872ef434a687 SHA512 fa22c26562eea600a1056e730bfb4690918b09f61be91319229a87975b0468803fa026e8f06bdeb9551ef5242179a3dec023e0fcd7f0773608ff77c32741dea6
 DIST libmirage-3.2.2.tar.bz2 234131 BLAKE2B e3f2825b9e799447a6201f8d46fbb8cf229a5393c73d85ee8a230225603f5e42cb07af4e984aa8602fcce667b16c2af7e2ef9d27862022327a39d0b7189c1eb1 SHA512 f41a095d7a9a3bb0d00ac2bfb8ad443d8d065f446ca2635041e24a570b72c14a27d3c3b300d5fa941253284c4b05b1913715c1169cd26a80db920df9d27cd535
-EBUILD libmirage-3.2.0.ebuild 1169 BLAKE2B c6da6b1dc32f7458a95d145693f292997aaf19dc503ddf3e000a0f966ba0246a5d5f21dff788c57eb73324edf998e91b09d51b13670f814e5840c65169f2c5e2 SHA512 c51e74c976adf1a63627c9c057ca183f259eacc7c891dde8d489227d30d0cfad397952664311e7e3a61cb837750173922672f78f4ceac4095e9bd929b710cbd9
-EBUILD libmirage-3.2.1.ebuild 1130 BLAKE2B 5881183a18ac94a72a1e1b726fd9a7ba52228429b5a5cc8453eaa0612baf62887dfbd0547f07dc635f0a713553ae370f2ffbb501e3e3e60fee69c5ea385a1289 SHA512 9ffd0463afbd1004a165a7bbfd3f20189dfc398cd0f2609b98bf07736730bd97832af592a322e11dd496bb7d7ebc90570730dce5ba7a97f51602f22ec4a2bd8b
-EBUILD libmirage-3.2.2.ebuild 1130 BLAKE2B 5881183a18ac94a72a1e1b726fd9a7ba52228429b5a5cc8453eaa0612baf62887dfbd0547f07dc635f0a713553ae370f2ffbb501e3e3e60fee69c5ea385a1289 SHA512 9ffd0463afbd1004a165a7bbfd3f20189dfc398cd0f2609b98bf07736730bd97832af592a322e11dd496bb7d7ebc90570730dce5ba7a97f51602f22ec4a2bd8b
+EBUILD libmirage-3.2.2.ebuild 1128 BLAKE2B fbf5a809841d07edef43316e9363c6405d1262c422431f3623b882df6f0972cf1ba43bffaddb608ae865ff8d26728603b08169199e61b40d1d5b2bdb81950977 SHA512 a793624c4915c326d3fc99dee5ce2a103f8f82bd3322ee83ff438413fc0b1b1d7619d40c74b5cc7cedd9a708ad69f405ca5ca1ede848a14bc118a656905702fc
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/dev-libs/libmirage/libmirage-3.2.0.ebuild b/dev-libs/libmirage/libmirage-3.2.0.ebuild
deleted file mode 100644
index 6a8dee5778fe..000000000000
--- a/dev-libs/libmirage/libmirage-3.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="CD and DVD image access library"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/11" # subslot = libmirage soname version
-KEYWORDS="amd64 x86"
-IUSE="doc +introspection"
-
-RDEPEND=">=app-arch/bzip2-1:=
-	>=app-arch/xz-utils-5:=
-	>=dev-libs/glib-2.28:2
-	>=media-libs/libsamplerate-0.1:=
-	>=media-libs/libsndfile-1.0:=
-	sys-libs/zlib:=
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGTKDOC_ENABLED="$(usex doc)"
-		-DINTROSPECTION_ENABLED="$(usex introspection)"
-		-DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	local DOCS=( AUTHORS README )
-	cmake-utils_src_install
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/libmirage/libmirage-3.2.1.ebuild b/dev-libs/libmirage/libmirage-3.2.1.ebuild
deleted file mode 100644
index 59575853b6c2..000000000000
--- a/dev-libs/libmirage/libmirage-3.2.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="CD and DVD image access library"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/11" # subslot = libmirage soname version
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +introspection"
-
-RDEPEND=">=app-arch/bzip2-1:=
-	>=app-arch/xz-utils-5:=
-	>=dev-libs/glib-2.38:2
-	>=media-libs/libsamplerate-0.1:=
-	>=media-libs/libsndfile-1.0:=
-	sys-libs/zlib:=
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGTKDOC_ENABLED="$(usex doc)"
-		-DINTROSPECTION_ENABLED="$(usex introspection)"
-		-DPOST_INSTALL_HOOKS=OFF # avoid sandbox violation, #487304
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	local DOCS=( AUTHORS README )
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/libmirage/libmirage-3.2.2.ebuild b/dev-libs/libmirage/libmirage-3.2.2.ebuild
index 59575853b6c2..27a19f3b1757 100644
--- a/dev-libs/libmirage/libmirage-3.2.2.ebuild
+++ b/dev-libs/libmirage/libmirage-3.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cdemu/${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/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 407ccf73f3dc..18d39981d4bf 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,7 +1,5 @@
-AUX libmspack-0.6_alpha-fix-tests.patch 575 BLAKE2B 35a8342f103926bfff555237cbd432fd679ab61620aeaf654041cfb6c39a18f3be475bf7e0a93c004d7c953d6f2ed66e4528d3b546e9d22b28e1e666c6d9caeb SHA512 8c715e174d3eca76fb33c2a5eccccd4f7c4c7702320d0db9db5dec6038129f508afade126ae791191ffaaf60740a722db7a87fc76f8c00c86912a1e2e2323eda
-AUX libmspack-0.7.1_alpha-fix-parallel-build.patch 954 BLAKE2B 545d90548a32c296d6bcbcd9e880574ba76bbb2d06a0ed41446b1632e8fdcf32c61dbdb6455cf9d9080d49840a1739983f9746614be0f08532c4db70ab16cf0e SHA512 251d7dd86f44f06bea8b1589b860e126e849743c4433703b4420da85737373af4b52c3f55dd8dab94e3bfb4a5e9626eee341f19f1ad649573727b7613170f2ef
 AUX libmspack-0.9.1_alpha-fix-bigendian.patch 444 BLAKE2B bc62193205d7d96b8e2b535236463d0695dfb1a3cc4b2290d172873c11f9d3184550426e10bd1457282531f27a22585365e5b1537f1b9f85eeed4fd31afa5748 SHA512 c2e138e19c7e8b8f90e1dcc35d32f655ccd7a1930eab7a0b49686e9d2be26cefba48bc895ef1ebcb1959c0422e824779f7e31940bbde0c8bfd8a2828c2ad6c3c
 DIST libmspack-0.9.1alpha.tar.gz 494651 BLAKE2B 4543215efbcac9cd2703cd56f2297645463831cc2dfa6b38d87c5f48f39676347bb20739e0e389e021983d910b9be99bfd369fb30d36090f3f72f09532d6bd1d SHA512 4e39c2be8768c5c0b0d0798c9322ff022173f5e05af1636c18541bbc9f58c1ae1af59252d5631340fca601495c5b1e5abed0ad83481387421d2df5efb75cd49a
-EBUILD libmspack-0.9.1_alpha-r1.ebuild 1674 BLAKE2B 64f04908e1dd4405f403929611b7e070b24d3585bd72fc1a615920198bd791c064a07a66489a63f07a81e462e5cbaf96618573db95dbe2e232080c40f4429f0a SHA512 48ef70cfc86fbf174d5a4ec81cf3337a8e593cd0b5146804233a4116bcc83562b212ce89dd77be1eb2abd61fa0890abfd9d24ccad4bf8dd4a922a048020000a9
+EBUILD libmspack-0.9.1_alpha-r1.ebuild 1680 BLAKE2B fc48503df10aeecaca484155caabf708372a69e5709a6eae8e4fa694b407cea658786c102fb0307422db1280d61664d77f20a41fe33930b16fbf9972e1fffeed SHA512 7a40f910584bf23849f8b6c079a06878cd4d8efca11ee8db29abae5da989f5cb13c7ef1b8749a393da36887cf5f7d5ac49db817d77dc37ee88a1229c253ae8be
 EBUILD libmspack-9999.ebuild 1606 BLAKE2B 54a39c3d22d8cfd335eab023702e83e0a3f05c1ec9c96890e4c0f622aab2a88bfd9216678127126ab0ee33965fe51a821d4c32636a5050b68830bda83a2ea828 SHA512 71ad3f2118af448b402b2d674015fa2f92ed7005bf11bd8d951416f7d92d6dfdab285f68a29a23f9fa6fa1d75e8d07109f27e7707b91d067b96ee8870a926ec9
 MISC metadata.xml 251 BLAKE2B f8ea69eed31c6ee4eca7ce37a9ee2b99d4139e42e53a0c93441863f1c2eb1148149038cbef9ec91a4c92971077fd6ba8e6ea995a138f8863c06d8ee57bc4f74c SHA512 14f3538a99bd8d32654ef4630d0cc667d55b36b44701791eb42d98f8e958641188915d86c306d68c7c20a4587e53477a3f9e32aeba2e0ba51c63c903391c4277
diff --git a/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch b/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch
deleted file mode 100644
index 22b0461ae7e4..000000000000
--- a/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/libmspack/test/cabd_test.c b/libmspack/test/cabd_test.c
-index 5e8851c..abed65c 100644
---- a/test/cabd_test.c
-+++ b/test/cabd_test.c
-@@ -186,7 +186,8 @@ void cabd_open_test_05() {
-   for (i = 0; i < (sizeof(str_files)/sizeof(char *)); i++) {
-     cab = cabd->open(cabd, str_files[i]);
-     TEST(cab == NULL);
--    TEST(cabd->last_error(cabd) == MSPACK_ERR_DATAFORMAT);
-+    TEST(cabd->last_error(cabd) == MSPACK_ERR_DATAFORMAT ||
-+         cabd->last_error(cabd) == MSPACK_ERR_READ);
-   }
- 
-   /* lack of data blocks should NOT be a problem for merely reading */
diff --git a/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch b/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch
deleted file mode 100644
index 38935a8d26f4..000000000000
--- a/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 43099fb1bba26792fe98b4157c950db9c333134d Mon Sep 17 00:00:00 2001
-From: Stuart Caie <kyzer@cabextract.org.uk>
-Date: Tue, 16 Oct 2018 11:25:24 +0100
-Subject: [PATCH] Fix parallel builds by adding adding libmschmd.la explicitly
- to test_chmd_test_DEPENDENCIES
-
----
-diff --git a/libmspack/Makefile.am b/libmspack/Makefile.am
-index ba19535..6130bc2 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -89,7 +89,7 @@ test_chmd_order_SOURCES =	test/chmd_order.c test/md5.c test/md5.h \
- test_chmd_order_LDADD =		libmschmd.la
- test_chmd_test_SOURCES =	test/chmd_test.c libmschmd.la
- test_chmd_test_LDADD =		libmschmd.la
--test_chmd_test_DEPENDENCIES = 	test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm
-+test_chmd_test_DEPENDENCIES = 	libmschmd.la test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm
- test_chminfo_SOURCES =		test/chminfo.c libmschmd.la
- test_chminfo_LDADD =		libmschmd.la
- test_kwajd_test_SOURCES =	test/kwajd_test.c libmspack.la
diff --git a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
index 6045f4993d70..95d59ca90db6 100644
--- a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
+++ b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	MY_P="${PN}-9999"
 else
-	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~x64-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 4bd3234e61f1..0a95acd98af6 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -5,6 +5,6 @@ DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e5134
 DIST libnl-3.4.0.tar.gz 933443 BLAKE2B 735da9f800277c48a5deceb78084f510f56f7017b1184e91b2bb45ba61a2e95355e7a3f5d0a74bdaf7ae003393a6c7556d5b201d0d0052dfc66042aa9e137986 SHA512 6336e5c55c79ff2638de9c812cc1842871769236bad7f65c547dec35fafd91988b257fceab144a0cc133c4b29f61172f6552c53aa9fc723bdc783079c2b1851e
 EBUILD libnl-1.1.4-r1.ebuild 1165 BLAKE2B c53d5fc1b86e016bf89cf590a9bb8f65f9abc45d4a994d9f405a63d35415234dd8501c7bbd948ba10074e2c5e48e08426a1484fdebc95ef82c345e2539edd6f7 SHA512 2c28a5244287710b2b69aabcd210cb09304ba487e2fb35872243adf59c46af6281606b18c0a3a6de3544b04ed952640a7452c2b9681b14b5deae33374e8b0601
 EBUILD libnl-1.1.4.ebuild 1141 BLAKE2B 16521e18a8b986a96540245ed54c5737c1ba8d17d3a492fe34b2e504216ba21186d1eaf4685716894f826186a87dd3b4ad82c87d9a4e439cd984fdf0472b4828 SHA512 1c63d4eabb1268b349918acbdc3cbc7d2fabc09a75e4b07793f1e380309404f460bfc3b90c7426377d57be65f5b679a5d20155003ab589497b225dea2f9c281a
-EBUILD libnl-3.4.0.ebuild 2403 BLAKE2B a387a668f1a038addbef80b494d242963ea748e01bf8a3b4c63f605d68c0a1a74d2a54117e8bca8419461a105d8a5851e79c422c57091861987a11ed6e3cddb8 SHA512 c3c0d850a5a0a950222f89efa0d7fe8ca95b130a3d7f97aff6a4f4eae3987aa5af6f5d92ddb21496412975058fae099b3b60de3e7cd814bfcaad96c6b722b6a7
-EBUILD libnl-99999999.ebuild 2196 BLAKE2B aeff1715ffd0c59e7524386f82283e1c41d0aa39548e2f4ebdcfed77624ed64ae975a74bf1796644411c846c32c275b3465f89878cdffe4fa757d54f184136b1 SHA512 65b184e96b140b5e95dc1623175c5b042d8fade476fde6a8f58e462d31e6db4d1fda6d998097f75c6acae0f6ab65fbbce6502a0737e8c051d2358885e5ef54e6
+EBUILD libnl-3.4.0.ebuild 2398 BLAKE2B ef02e305209323b2c0a09d71faeba4301c391725b0df06c8dacac4357cb50c529f3abba6ae7aac95192a3b3d171364ef4905dfef33054290d5cae7468e169090 SHA512 477b4618291b6f88c873892588e416ae57a95446d1e13e089c0349353eaedd0d85b8946ed327e436043a25fb3dcad70eeeae8fdf4ea17f7583f37789e7732d8d
+EBUILD libnl-99999999.ebuild 2191 BLAKE2B c809f82bfa87fb44a6e0447f7f92e9f046027c45ea7780ce0d1c59261f302ad88d83ed4c474e7fde04696ad93b535eeb63f8a794ef5772dd837ee8c478d35a71 SHA512 5714afc5b9651f7de94b9c44723d05c278280b503c7b329ab12c947495ecab7479e34b3e93a001846dd05b3bc89312e5d2b6f69a07697ada101fd5dfd1367920
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-3.4.0.ebuild b/dev-libs/libnl/libnl-3.4.0.ebuild
index bc1a0718a1ba..c72b92ee2ed6 100644
--- a/dev-libs/libnl/libnl-3.4.0.ebuild
+++ b/dev-libs/libnl/libnl-3.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 DISTUTILS_OPTIONAL=1
 inherit distutils-r1 eutils libtool multilib multilib-minimal
 
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index f8aea0b33b55..43eb90b83be5 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-99999999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 DISTUTILS_OPTIONAL=1
 inherit autotools distutils-r1 eutils git-r3 libtool multilib multilib-minimal
 
diff --git a/dev-libs/liboop/Manifest b/dev-libs/liboop/Manifest
deleted file mode 100644
index 6ad95e8c91e8..000000000000
--- a/dev-libs/liboop/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST liboop-1.0.tar.bz2 215477 BLAKE2B 4062696d31e843ccf7a51536f64a435b3ea4c39ce87d599fdaa3126f0146842726eac8b77723f31d9184abc8842da60a4f5d86642a856b432f78cd86dec474be SHA512 157385e61af7a5fb055d775f773dc0c455703f86dd3a100b56421b231e8bd78ab9af4712fcfcd07e9344ac2ac4f3cde28e0d966be72061b3b7d50b456ff7818f
-EBUILD liboop-1.0-r1.ebuild 846 BLAKE2B 3eea1c0f5a0f8425be2c19765b3fa9745d590ecea867b93e67c1682c13a2b5f1b077ce7a2c688b5991d285170665976c47e1639f368530136204550cd22f8a8b SHA512 1e0b11f4f66a3d1c730db582e1ca1b2fd95e70421e8366fca12be09d41dcd6d0ddf626a4bc22052c9ab35757cffd5a3d59590d7a7920d6a3deb56c6e5389ca1f
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/liboop/liboop-1.0-r1.ebuild b/dev-libs/liboop/liboop-1.0-r1.ebuild
deleted file mode 100644
index 5a2652ab1106..000000000000
--- a/dev-libs/liboop/liboop-1.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="low-level event loop management library for POSIX-based operating systems"
-HOMEPAGE="http://liboop.ofb.net/"
-SRC_URI="http://download.ofb.net/liboop/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="adns gnome tcl readline"
-
-DEPEND="
-	adns? ( net-libs/adns )
-	gnome? ( dev-libs/glib:2 )
-	tcl? ( dev-lang/tcl:0 )
-	readline? ( sys-libs/readline:0 )"
-
-src_configure() {
-	export ac_cv_path_PROG_LDCONFIG=true
-	econf \
-		$(use_with adns) \
-		$(use_with gnome) \
-		$(use_with tcl tcltk) \
-		$(use_with readline) \
-		--without-libwww \
-		--disable-static
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index ea2cd89ff2fe..f659cb931831 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,7 +1,7 @@
 AUX liborcus-0.13.4-boost-1.67.patch 1705 BLAKE2B 5c1fb62ff088163d07fceff4e230bee4728bae2bf4cf4f6e9b5cd0e15037560439efaa17a3b1cd4526df57fd0b5747454db54c6b7a382de4ff8afb9d1da87348 SHA512 eeb343ae4ec779e1b5a40ee93d3220d3e18a7bd3b906935d02e0019412a09c3e182a9e9ba67db30aa8f4e7b859a2fafcd68fd2daaa9d6506a004fd8176fc3ab0
 DIST liborcus-0.13.4.tar.xz 1816340 BLAKE2B f8e7251c8688f82604d5ac1212938890e42f23ce45edb09eba9ab26a810e5fd4215a23dd20e86ddf9100db67818fc73fbbee7357642a6390f8f60dc28596be31 SHA512 f00b49c41eb1898c37d8d42e59f9004f46b5f849b9d60ac9c5033232d1e5065ff3de160e79f5a88983bf64f86e283b6d1d406a24e776aa6ff7b8acec324ccd4b
 DIST liborcus-0.14.1.tar.xz 1894680 BLAKE2B 0070baf319bf35275f36f3082141f154404ad43d8143588b35c00b8b536f0c1cf5bf38fd9e997c4be45a454f16de1cc1a25186da40e3ed0606a87e9a6a968053 SHA512 a32dc5a652ce99cff37273c38fb9460e13e7bfb562f40c8d0c79b65c33e340daaeeb2c796308ca700b85bfc13cc8215641563b9e9f6d44b7d61adb8e8a3c950f
-EBUILD liborcus-0.13.4.ebuild 1347 BLAKE2B 23ba03eaaf2d5ad8b3fe2f3cbfeadce09f36998fa6ff3dc04aae341b5abd2c4c403d1d4e37a1c912552d50ac1ce6fe1867a24fb8b6cdce19167714f80cfd3283 SHA512 5b369f8d0a916b4f6fd338d1e75f1d1c978c935822f53adc2f777e3351097b3f4543ebd28bc917368ab36397087a2cd0671d94ba09b5c5f9d68211c6981b3784
+EBUILD liborcus-0.13.4.ebuild 1340 BLAKE2B 097ec463094655c02dbcdfb8889c9888fb83c53cf9abc4a1d8b091f9c93362ccb80911bb4a4d9ab001ab8d746217790babdf3bbc07a3019dbb3d4fcbec806100 SHA512 fb6703efb82d4860ffbe3a6f383ea430e28159a84cad6972d2c26cfdd2d75839c804768c5b5b6ea57b95f6df225511a13b68b222e681656c7ec7c52d3be63592
 EBUILD liborcus-0.14.1.ebuild 1235 BLAKE2B 81bae670ce423ae5da47b52f7a49c4b50c8085a0d84b5c52acfd8decd808b2df71d8a3a087559eb4049204c02815da1233fc4140040bef2908bd7efc3ffd67cf SHA512 7af4857f6b3b04603036dcd560d93531a158d9f9829cf163782e50295777b285c5fd05b819b289a7a7990e3efbb1bd90eaa91f472955dceaafe6884ced18d0ee
 EBUILD liborcus-9999.ebuild 1235 BLAKE2B 81bae670ce423ae5da47b52f7a49c4b50c8085a0d84b5c52acfd8decd808b2df71d8a3a087559eb4049204c02815da1233fc4140040bef2908bd7efc3ffd67cf SHA512 7af4857f6b3b04603036dcd560d93531a158d9f9829cf163782e50295777b285c5fd05b819b289a7a7990e3efbb1bd90eaa91f472955dceaafe6884ced18d0ee
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/liborcus-0.13.4.ebuild b/dev-libs/liborcus/liborcus-0.13.4.ebuild
index 0f26643abf0f..cb8289ad6304 100644
--- a/dev-libs/liborcus/liborcus-0.13.4.ebuild
+++ b/dev-libs/liborcus/liborcus-0.13.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 [[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools"
 inherit python-single-r1 ${GITECLASS}
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index 9d32dc7d6b71..d62fdfdce66a 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -1,5 +1,5 @@
 DIST libowfat-0.31.tar.xz 183684 BLAKE2B 67c60ebba10463f28196e3d9ed5f20fdbe79db8b499b226fb02d4f38833747e5e709054473267a1e139e1bef29222220e7f60cf2f472ac58ca67b52dca2c5661 SHA512 b3ce973d6edc501ddaa6caa84dc3b74e3e31ced92e4f707038858cd36c977863251a7eaeababdad34ffe6b8ad13c9702118464f6f9fd827e05f6fbc5004408b5
 DIST libowfat-0.32.tar.xz 195820 BLAKE2B 6dc19b947867a9b08eece785378be2493fb7185d1cc334de080ab1c288884fe0b670ece6f3785f051c707cc98afc4d843a262b9761fc9cc68fdf1f1ac8df1eb8 SHA512 c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
 EBUILD libowfat-0.31-r1.ebuild 994 BLAKE2B e93ab5d7746de5c071b55a8dee7d2415f64f623aa98c543cdebc0a6007dff1b6eb362197f5143e7ec2f0ff97ff07e46d6298afe255af0a9ad2d2e5db1d626ab0 SHA512 070b2af23d5f88a2295c34674f86af39c68ca88480ca5882f79bc4c9a4b75f3a6f7a99ddc4deb85e4d3d20f8ae7dd04c336aced617eee63417f128378b1d05fc
-EBUILD libowfat-0.32-r1.ebuild 1052 BLAKE2B 7cb4aeaa6ac53a4aef91964d519a64d3196588806b8675f16cfa9835cac7aeb4043e5f40a769873686ce6ac7f832060f6a9202c80e9b6e8d31c324c022a33c02 SHA512 40a3cb4cf15343121e9e040a33bcc26b9d66a9bcddb7c83b29098e97aa26327dc736aa6c1d786b69b84c0e4e19be7ba37546e16024a676d5d1b567844e857d20
+EBUILD libowfat-0.32-r1.ebuild 1059 BLAKE2B 943515922768e29ee842c1c4d7af1ec36d537e376a9e586929c54f980a0e5d06d39d4cba253294ddc46fa68479fc6636d49eb2928733904a08f0bddedeaa0fb1 SHA512 a4921c521398e8c6241b59b3a401be19f43b3cb478801cd9fe410df62c2356957d685a4322bbfb53478ad1e217cc7736a0d624dd479581bdfefe49f5ceb89070
 MISC metadata.xml 430 BLAKE2B 16b95e09cd79b1b22a0b391fbd70b3ef51b08dd5d92449613f21e8e1ac85f16fdb5e0bde3a298aa7b2c740439c909836a3a71dc55022a1322746f2078522ed78 SHA512 83ef95906f9aa9e0a88eb9241dd1245cd6628a24acc06fc99d97028ef9d82e4369fbed5643d88d51ae514dedf70dde032443a1523d335ea0fb1f96cdd9149a79
diff --git a/dev-libs/libowfat/libowfat-0.32-r1.ebuild b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
index 116551cefe17..22437a7a7a79 100644
--- a/dev-libs/libowfat/libowfat-0.32-r1.ebuild
+++ b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.fefe.de/libowfat/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 IUSE="diet"
 
 RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index 514355c81251..eb4fc9beb6d6 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,6 +1,8 @@
+DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676afdd9f3891a3bc66fa006c353b2adad269708cee714985b495ed0b0d691f31964d7099125147ec630f3c63143e8 SHA512 7005dbbab170dff48bee99de67ab9ffbfd2004f4b5150a0a67717aabb30eb93a34495b6d084da5d05162dd8666e8ff4c451d0d153ee4dd5422b59f6f6ca2130c
 DIST libp11-0.4.4.tar.gz 450709 BLAKE2B 4424c8dd8ee1f581c179c36b47bc03269f1c6b38bed2517a1209c8eaf2d8c2ab62da928b4cd20f1355b56dfbecbd2bd695118f7690c3eba2f5c188c6c4b5b169 SHA512 12d1e39981e62d758dc12a39c2ed5b6967a6e8c1db706c491db2c9aa0394fac278fa47dd4c64aa961e3b5ea98c1799b4ef7ef617ac076a414d88a6e29d5f0c4b
 DIST libp11-0.4.7.tar.gz 475538 BLAKE2B 81d36f0795cae00a20be935790441b46257728cc5b1d9eb16d6c5df2609a795a68e12d0dc6b34b0348107fbd8c136d27dbadc42e0bc8970d5e491529e1903091 SHA512 8142b32bee9e6763b506b93be788a4df2b28ae8cb3ad6e11fc53ba3db770d77bdcc0362661c2f906cab1b5afc2828019f3d0f0b9d898414c0d6266201b7e08e6
 DIST libp11-0.4.9.tar.gz 492083 BLAKE2B df84d9303e6e143fbfeaaf2e8d0b57f3c4cd63356b15d629ab210196611ab42e396cf7efa69392ac81dd9fd591aea5580e0b38f545bf9bad9ec4748d08da90d2 SHA512 0c4a76ee7a5d98ec144dac1de8d4f52ad2515e6c578b3ee9705ef861bc06a27477b6ec42cf1d96944844f006992aef449b579b430b2e32d367f29d1a0d82f8ee
+EBUILD libp11-0.4.10.ebuild 789 BLAKE2B 4ed184b076d4282589fb052f03ff6b039b1f0a946934bac84d8b5819ce0aa861b739f7e3ee1b9a73f2a8f90639b67ac9c3bf543fb601d3d29f54ccfb3e5eea9a SHA512 0880015f1f8de491e7ba4b33da66cebfe3e9df488165844d33ba19ed89438a56d3a0f9fbe0185c6a67fe292e2429b23add9d3503088bc153272a3284ee8536aa
 EBUILD libp11-0.4.4.ebuild 782 BLAKE2B e2ea80c9b0a6c514806ecf69da143c3bc0f981cbff1aca891c7ca9ce1a4e36314b26a23166e8a6b0af141fb288244dae23c4e610687af39301403afc6b51f12e SHA512 6dd12ffe649c25f7320f1d5809d7b792fd3efd46725306193ed5fe92b246441e54e662fd9a2ac657c16977dffb146947f4a8a15fab2e1934711a7088ab310604
 EBUILD libp11-0.4.7.ebuild 786 BLAKE2B f44f40db44fd3455989171a60014fca0128b43741123a57c7d7418d626c716431e992809e175f6b8f6e71c2686b214991c5d6f7c793568915a4725418521f3d2 SHA512 9a934922c8731336e4b950ad9543b07e90b303d164bef57d4ff41dc99a2933e008613113a8f302d1e0a1324bc3e0d7a01590208a45428816b7a8bbfc023f92e0
 EBUILD libp11-0.4.9.ebuild 775 BLAKE2B 8605353f5a55c1e0ee467ec751bfcf5307c963f735095a9630201f230308dba02bc10837812f01d6735a912a8b7114987a452ac7980574d0985bfa4e24f6d24b SHA512 0b53c57f47b1f29d239f54f870b98fd010556b41a26d6f6213980dc3d606b5b7156eee3cf89685b361d546fbeb16fa67ec9f9af8db6886af310e7727bc31e802
diff --git a/dev-libs/libp11/libp11-0.4.10.ebuild b/dev-libs/libp11/libp11-0.4.10.ebuild
new file mode 100644
index 000000000000..b0fc86145a31
--- /dev/null
+++ b/dev-libs/libp11/libp11-0.4.10.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Abstraction layer to simplify PKCS#11 API"
+HOMEPAGE="https://github.com/opensc/libp11/wiki"
+SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="libressl bindist doc static-libs"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[bindist=] )
+	libressl? ( >=dev-libs/libressl-2.8:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable doc api-doc)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index cf398823e954..8b77bebab69f 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -4,6 +4,6 @@ DIST pcre-8.41.tar.bz2 1561874 BLAKE2B 2a97a859237994137190da00c30ba7c15e8631b82
 DIST pcre-8.42.tar.bz2 1570171 BLAKE2B f68bac3cf8ff5a81ccba31fd4d8926e05143a25a756e7daba9793467cec9cd8a4766f394f958ffca088b472463a43a31ea77014f2d4505082c1f366a18f30c7a SHA512 b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d
 DIST pcre-8.43.tar.bz2 1576584 BLAKE2B 12c2117fc5d242ada44884df279f7f8b4c680fa1623ddc131c0adca1740ec47614ac6af20fc60b0c516d9d7b66488ba8a4e5efa5fc8a0a70aacb02bb3d38ee53 SHA512 3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7
 EBUILD libpcre-8.41-r1.ebuild 2745 BLAKE2B 0baa729c7510e74daa1ad81a843eef9dd3f86903d11a2e2f8ba1d8346391fd0db78b0b951c57e199c5c52ce98c23ce439d7b08a5bf619279a03ce5f1ad360215 SHA512 119f0340195ed0d78e419501c3ec767ca6f8cca18ba01111a4bfa8e835dbd8051cd2a6bd82a974b836d1a8a60e5c8d969d06b3f0f049a0b81d6e22e9686efef3
-EBUILD libpcre-8.42.ebuild 2565 BLAKE2B 5638029a524f476e415c7f6dddcc39db7a84a2f6d7c41d04bef665b2cacf3daf9d3f902d1b5f61fb27a35384056c0dc9787e83f81c2eaaead7161dc4f71437f2 SHA512 57d780e4f7e8afc704127fa5f656ca6a7fa922efe1e979338c91b0eac9f5bc9faffbd474d369f5e2b511374e931e7db547283494d0c581353ffa3d03bca41b97
+EBUILD libpcre-8.42.ebuild 2564 BLAKE2B e8ab6e27ed2b03c2e95e83633590505722dd289636658aa01d2a5197ebcd52fde8884b01aab0d36b7d42f06472ffc04c350cca17f10ec0683fc0075b21186ab9 SHA512 c9f4516c15ae02b0362df41dfe34bdca66098b7ba70f4d1374e1f6c487e83e06f059c377dda17da05edc12581bb1675e54bda1e8a8bd248e7d1b661e2a4ab614
 EBUILD libpcre-8.43.ebuild 2577 BLAKE2B e1af9bf84f35c40bd76217f0788d76c6a23f578513f19989452f0d75e93682e55163a1af57265b139435c2f7f28042fc78baa9b8708786be0d2dc347ad69b70e SHA512 df2d6c3b0909a089c7d8c980a510817d02167a5f6961c3ebdeee54cbbd92e6d049f70fcfd5909dff9b0dba548e03b099040f2f05f6c81ce2a256d513a9f7afc6
 MISC metadata.xml 1112 BLAKE2B 640e6cc2fe53eaa86b6e6cdd72d45398c880a27d027441447b6162c70fa30fafe818cae8c08614333b866cfb1176feae365996386a72200232a738d99b592b83 SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b
diff --git a/dev-libs/libpcre/libpcre-8.42.ebuild b/dev-libs/libpcre/libpcre-8.42.ebuild
index 9ee1641685dd..5de61cf52e95 100644
--- a/dev-libs/libpcre/libpcre-8.42.ebuild
+++ b/dev-libs/libpcre/libpcre-8.42.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 223722150159..f4edb77e109f 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,8 +1,7 @@
-AUX libpcre2-10.31-cygwin.patch 370 BLAKE2B 3dd868d520c6c4f7f64213ce6854a3d603c6dfd26073eb36238dd04fe7ffb46395ec2002a519269ee28a31e1510251e2d532c46307f0fa2b332cbfe7306b09ed SHA512 7e1eaa3f9a9284c6a21e5971c1c37d8d032da15e7cf98b4b7814e502a3c76221e6939c332ccab0fad5b812c7d9dc55b26532a18a57f6ed715fca3eb79ca95200
 DIST pcre2-10.30.tar.bz2 1583543 BLAKE2B bd9369f3c81bf0d154aaf3d111b934835af25068051f9bcafc0d4b00376011ff7a4acfac127ee10efe6094021163a07a073076d9d769eff68823fd8d1041cd1f SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e
-DIST pcre2-10.31.tar.bz2 1603075 BLAKE2B 3cc101b738320823f5b8ab5d29fcc94d8bc2ecd3fbade148de34eda5371cc4d9c168f9e234f0d581626f3da85988ec8d46f76377b019459d3f6b044998e82426 SHA512 44d7db2513d9415dcdf6541366fea585e016f572f3e4379f6e959a38114b2337851092049ab4a1576ae8f19b9de413edbcfa62f434c77fc8470747ee5413e967
 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.30.ebuild 2324 BLAKE2B 1f25bfa72b1418ebee600d5a278a9882fd70064834e3b53eab8ae968429ad75a832854ae144773d1093700792b6e870357bbe2859e91dc1a58beff1333060b2b SHA512 3d7523986e2999cf9ab0263f2b9089ec4a92ccbe174a4dddef9fac17c6a91ddd27e6db529c2bc62afce5cfd784c00fa63e21b3e82646290be2c4a05f2d4dd522
-EBUILD libpcre2-10.31.ebuild 2391 BLAKE2B 3ad00fbe8ebb65a59c3166cef3a00c1c2e6800a4aed99d7aa5b3371ca10a8f64cb392e5e1724efaded8dc3f7e4908b8dfef60756b81449148c5efa562f9c0e66 SHA512 b31d04fd3e8c65638c2bce57bab9e1a66dd42d6a05d791c02395599867f0abb45eb5ae4a5884019986f555e64514fe6b0481a3a36a29d170559c23b74793a110
-EBUILD libpcre2-10.32.ebuild 2359 BLAKE2B 6c6d62c1b08530e1e2a364f5e62d7f4c3581e9d113865cdd6c6655bfe044e5960bd748f37fb8b546cefe45c2da3e1ee0a074224297774f7ec5ed1f1c3f1f3602 SHA512 c64db13b39127e2e0bb3b757597591a2af28e8c7614df71843623a5fc945d58029cadedbbf18181f8bd63e9ee2ef4ee6613c193731697d8d18bd1d2a092a33cc
+EBUILD libpcre2-10.32.ebuild 2349 BLAKE2B 788d2d01d79b750425099f283ee1fc0bb8545b7269bf36933c99061dc54fd7dbdf2c16b93ef80ad2072957061c4413aaff268598f809fb55875d74e73aa57555 SHA512 807fa4305c6da7e342cd801440f69b5322fd9549bfdc3498b465bda1c724d6e2fa3c183c7cbdcdfbb4a63cfbded74dc9e06355d019b41e6cc89e28b9858f9e0f
+EBUILD libpcre2-10.33.ebuild 2359 BLAKE2B 6c6d62c1b08530e1e2a364f5e62d7f4c3581e9d113865cdd6c6655bfe044e5960bd748f37fb8b546cefe45c2da3e1ee0a074224297774f7ec5ed1f1c3f1f3602 SHA512 c64db13b39127e2e0bb3b757597591a2af28e8c7614df71843623a5fc945d58029cadedbbf18181f8bd63e9ee2ef4ee6613c193731697d8d18bd1d2a092a33cc
 MISC metadata.xml 1228 BLAKE2B da9f4403aa5618f793335621cecafefc6c3a475f7339884fdebe661002cf724e0b27d49270ce4dd4092bf9fe00371c53798988d28376475f630c965e7fbd1c09 SHA512 33c0cbcd3fd188d2c594cda3e8aa100a1528f40af2aad398c6371cf01c639b54d0cca52adf15a123fc036738031729f2950b8409b91b40240211ec7e9fbb80a8
diff --git a/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch b/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch
deleted file mode 100644
index 3f3a33b366ad..000000000000
--- a/dev-libs/libpcre2/files/libpcre2-10.31-cygwin.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.exim.org/show_bug.cgi?id=2152#c14
-https://vcs.pcre.org/pcre2?view=revision&revision=939
-
---- pcre2-10.31/src/pcre2grep.c
-+++ pcre2-10.31/src/pcre2grep.c
-@@ -64,8 +64,8 @@
- #endif
- 
- /* Some cmake's define it still */
--#if defined(__CYGWIN__) && !defined(WIN32)
--#define WIN32
-+#if defined(__CYGWIN__) && defined(WIN32)
-+#undef WIN32
- #endif
- 
- #ifdef WIN32
diff --git a/dev-libs/libpcre2/libpcre2-10.32.ebuild b/dev-libs/libpcre2/libpcre2-10.32.ebuild
index 4d229a789ef8..086f9eb1d349 100644
--- a/dev-libs/libpcre2/libpcre2-10.32.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.32.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpcre2/libpcre2-10.31.ebuild b/dev-libs/libpcre2/libpcre2-10.33.ebuild
index 45e150f0b696..4d229a789ef8 100644
--- a/dev-libs/libpcre2/libpcre2-10.31.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.33.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit flag-o-matic libtool ltprune multilib-minimal toolchain-funcs
+inherit flag-o-matic libtool multilib-minimal toolchain-funcs
 
 DESCRIPTION="Perl-compatible regular expression library"
 HOMEPAGE="http://www.pcre.org/"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
@@ -30,10 +30,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-cygwin.patch #633612
-)
-
 S="${WORKDIR}/${MY_P}"
 
 MULTILIB_CHOST_TOOLS=(
@@ -79,5 +75,5 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index 7c8d29b5ba65..fccdaf4bc275 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,4 +1,4 @@
 AUX libpeas-1.14.0-lua.pc.patch 553 BLAKE2B a86596d6c76e22e3e947709db226a47110f0964ae493d4fd16e506f4666de5fd5214d431a5109ffb0b68a6743bf2aa89aba84b63fabe4e402ac491be01479743 SHA512 ead06352498ff82a4520d4a7ed7b5d03e2d0adcdf2025413851b8385bfdd691c938b456b555d2214ec2dc7b95708f306149d6f1cfa7c5b03ad28a1c90c873349
 DIST libpeas-1.22.0.tar.xz 561332 BLAKE2B 219918f8663cd60c9353f477ef905ce0d1e21bf5b7c09661c4cb3c8adbba3af9f5e93b9de8a1b098dab09b1f4071854a871c8ea1db878bda8fe9e51aa45e5f87 SHA512 9c1da1d4b5688c0f4d0647f3519dbfbed94c8921091057aaef0e41bf5ed3f8faf04a49ce9e4eea3fd7bf4ac4dfa1727d76a5f6dae2a4f52228d4c8c74b420c91
-EBUILD libpeas-1.22.0.ebuild 2212 BLAKE2B 94369c4abc1588f29d6a110b9214b25ccc43f4726c91ebb007f1e72b46716bd7dc99ffc18e4c4586e342ff520b124fdaa7909c83c29b294379f8e4a892fadfda SHA512 8be3b2b79b1c7f6adb3ead0aaedbf190723a4526a453553e975f87d9d9cafc66e8e8ba56e4ff4023a3504bd80c3eea03f2a298aaff143cc63bc42dae870d3e90
+EBUILD libpeas-1.22.0.ebuild 2208 BLAKE2B d7e3a6e08b7d2dbb2f1059dc62c72c2d70f118ad9e2544d29baa2f085303906dc18ee88f56ccd5088716b7cbebf94b1939c4f8057375b6652da576b1e71900de SHA512 ef014b6e5e3343100aee53a99134deef56039876b2d1700a4551e814ec7e5d78b8d162b85b2c08323bd3e32c8f5f501217b50daed156470be759131d1f437a68
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.22.0.ebuild b/dev-libs/libpeas/libpeas-1.22.0.ebuild
index 347976db785f..713d322fb503 100644
--- a/dev-libs/libpeas/libpeas-1.22.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.22.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
 inherit autotools eutils gnome2 multilib python-single-r1 virtualx
 
diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest
index 60114b946f2f..10dde57c8f1c 100644
--- a/dev-libs/libpfm/Manifest
+++ b/dev-libs/libpfm/Manifest
@@ -5,5 +5,5 @@ DIST libpfm-4.8.0.tar.gz 828853 BLAKE2B e6caa0ffa4584dab805ef08ce5318bf73fda906a
 EBUILD libpfm-4.10.1.ebuild 909 BLAKE2B bd990fd7d864946fd37075d3e799b043cd07c46f117887f9c095d8331d2497891e3337ea1329d50c2e161e631cb11281f7f5056a296175c003fa215abe440d4a SHA512 f4a028332023231ab8ca19dc3b28a0f601be52f99022d4f5715ca5c9df037fc38c2f821896c58fe5cfb0b67f5e3e20656e080ed7cdb238903ec41d422630800c
 EBUILD libpfm-4.4.0.ebuild 887 BLAKE2B 6e3b57d6d5bb98aee5f3072020306b329e0e2b8979d8b81d889c81ab1823c9388f8f22034ff5c501fb349266ca53b3c708619d58ace567e1b25435a9578dcf11 SHA512 3db81f6920687de1f1fe33c6eaa3c5129b2ce1c6191c68be789035799099124cd34f49010f019f637fd867cf47c759ae75d7c17ed0abfdfc2674f633d2d217d5
 EBUILD libpfm-4.6.0.ebuild 893 BLAKE2B 17221f8f7813320e8a99bdd01b9e2694ff425ef1496c74668fb04fa315236fce95ff1745df357f46b1d9f959097cd808aa47d99b0de000d5d56c363723005aeb SHA512 60e921666e7a19741cb764126f608944ce197c426e401d11d42f60a4f4950b16b6a8b5d0ac27ad3fd91ce7d0650cdb05f9538e10be770610c66639b3ce097bf0
-EBUILD libpfm-4.8.0.ebuild 898 BLAKE2B b79cdfe8c62e3634ac02c0afa16ba44eac579d4bc3203403dde17ae5a2358d3bc5b770a80236cc96b73126c7ce43a34321657e307418d6b3a1d1ab6f21dba9b7 SHA512 840fde6e1bf8617aea290687304538a981f7b2f8d87b5f005913d8408fd051f1367a5b2ffe7943e7439ff906c15ed98a78cd83a0c4b98c2ba95ac8f96af4cc50
+EBUILD libpfm-4.8.0.ebuild 905 BLAKE2B ff05bc659b6caf37ac53b4052017dd9d454e6db023869dec984ac3cacdd97d4543361f2a055724624318bddc9adc18f7e19b2cdb6db7e7963093ec01c66063b5 SHA512 a12aa728c30342c051f850587c7c5a7052c837a61208d0e483fc116d48a0bd392ddb3848763fa4b9e13f680ed442d245e1ea9ab9a30f6977c298ae634e34ad95
 MISC metadata.xml 293 BLAKE2B 20f01d36bbc220393d8a0e310655f60faac94a4080c46c700c60d713befaa80ab12e8b7791c5737b519c5f3e7d5255d69385f4550c9be7e2e24ce2cd033475e1 SHA512 e604cc185018211df6e9072ac3bff2effaab07189f11ebf5292df2f9e5645d9ca7bcadeeaeeaa8c3bcbef333ff6bc5a65f79caa6414e786826ff91409db05782
diff --git a/dev-libs/libpfm/libpfm-4.8.0.ebuild b/dev-libs/libpfm/libpfm-4.8.0.ebuild
index 3609c441e6da..6bc1cc01205c 100644
--- a/dev-libs/libpfm/libpfm-4.8.0.ebuild
+++ b/dev-libs/libpfm/libpfm-4.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 695c9b959c0f..4ea7e5500ea5 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -6,8 +6,8 @@ DIST libprelude-3.0.0.tar.gz 2900153 BLAKE2B dd03b46a11b673252dc36701e4568c445fe
 DIST libprelude-3.1.0.tar.gz 2949462 BLAKE2B 52764791766c54e2c1baa96231c6578f06219a6d1c48a97ad318fc8445fc64f90a63019654f7350d65ec4e0a336eef66bd449484321c590d1ee4596a6a386724 SHA512 f2878b19b4ba3cc74b0530f8741525ecf1425540d30356d182c4e0a797dbb5f4023792351bd059105dafc6b7818d4caa2e9c8b39be9a7039a89680244fcf1239
 DIST libprelude-4.0.0.tar.gz 2864402 BLAKE2B 2e51eb1af74b63140bc66a358b112a753c1a0fd86d6bb8bb43ccddca4cd396e34566168edca55a626a0b43ba56e676301f3792247c25f64c7a31430af3708311 SHA512 5d88e8f211b09cc3e43dbe299e935d8f11575ae3f1894059793966cd14a8e47177ef8963d45305e1a24f9efc4048520329b31681301a21815909bd38606c2ce7
 DIST libprelude-4.1.0.tar.gz 2852916 BLAKE2B a18babb24795d17d72eb1c0755f4b0330125c8b289af0b52753f6f69b5e820f0f972019b57eaded3abfc45c69bd75c0d120fe29982887e55d75f2c4c8b6486f7 SHA512 073307ca070794b47643e2ef2db4788fa92374735558b466441f0663f420cab45aecc7a1d99bb487ad23ebe602d5668369ffa6ab29fa3b0504356420ab3a7878
-EBUILD libprelude-3.0.0.ebuild 1795 BLAKE2B b515c9cc9e685dfd0584abc38c169ffe232b80817d2568d0643a574cda233262133adec1439a9ec8ded278fc4f37f79e22df9f7b191e079a44bf664abd9fbe04 SHA512 334217f69b8c55b5bcc5e76116a330c77d053d3c4c6f3e0912efc73fef4d8bc299706687977009c8c42abc4795b560cfad5ff1b316f1d1d096344464f920eafb
-EBUILD libprelude-3.1.0-r1.ebuild 1630 BLAKE2B f299532775781f50784ca2430a8c0e5349be44389998abc6db100b667868aeec0ead7d0e6a76fad26823a518b0405e5e557d2925c465b09a19c3b4a074c5cd98 SHA512 415c10afc56e9ae8f841cedf17239e9a337ee01291706b192e0cf429b2a5380afaf703e111fdee179896143afa234bad76f0bd514ce9d2bac921d82bdafca30f
-EBUILD libprelude-4.0.0.ebuild 1843 BLAKE2B ec2155103f408bcdf1f66c367676b1ca310533dad0703f52c26826d7e154b5640937d349b8b2eecd51cede8da682eef0584365005979d70333da982d078c14bf SHA512 4dca9697d94e6c527e27448c3224d9c4673e72132a9be442dae74116135fae487a037289a3540c0808978ae4a80f0a0c6830b39e9b01f0da3497a6b76b48f8eb
-EBUILD libprelude-4.1.0.ebuild 1851 BLAKE2B c82dd12729edd9434fc8c7f059bf6cbcefebb07462a5f1ee45a2bd806c1d00c37b609a42db52bf564b9bbec26c73aff55905c5ef863487a90eac5c64c301522b SHA512 c57ef3e33064872fd2d7530bc4fdac6d2e4c5191146cc98c6999e37de382fd713b69527c8f77441414d232e02651ef116670d00fbc82db8f411a46c40875658b
+EBUILD libprelude-3.0.0.ebuild 1788 BLAKE2B c135c5b3528ed6805cbde9aeebf426cdf0c35a850c3b9a58a8cfcc5f07c39f6aee8d7dd77393f951f572ece49437d97ef1761cbe8b40c236898ca6d094a5a538 SHA512 e8b250f83bcce7d4ca0463eb6004a3d7ac82c99bf497118100eec955bc62ef40fbabbf308e91756a462481fc2f7550ea6c71bda2b12ff09a26bfb08b436dec6b
+EBUILD libprelude-3.1.0-r1.ebuild 1623 BLAKE2B 3c24cf9b7246d2fb0285b0e97c9eb3b40a39dd04024c03ffbca276ab6ab9b37e6e6205196b3e15ccf9ce5b63e31908eacfb565ef9c7ccf3d20bd740a7129596a SHA512 1eefd4d9e6f9f8092e9f4b3341931eb58e874d6022f1f24b4f166c43f5b437d59496772f362fb5b6bf051a84433b59959df1ee594ecc9d74e73aeb3bb552870b
+EBUILD libprelude-4.0.0.ebuild 1838 BLAKE2B b298fcf4173d95a799ae4fec465836f0592745c6df4516b316d92cf02d90851899e33cdf9f8530c02eaaf5bb8cc7ceb79e475c632d69550bdfb0da85006f05d5 SHA512 de3bd2334e7c0cba003fc6f1a297a2870ab9fb0d9ae47bf4607b4e311ed1865c81c83bf7cfefb0fbc78da3a81930eff0b623e387f335ad092877b477d5b40cf8
+EBUILD libprelude-4.1.0.ebuild 1846 BLAKE2B 2c777e1e285d4804121cb3b6e9d08f7128ed154dba97c274d035e5739a4f676a322db4c6a9ac390a17430d41e979153f486f376f52214252c6d0f7d71b1858c3 SHA512 509b976333c3ea2b1e40d66b1e2e6b8fee12f5b176bfa375376d0e643b8cdecd0a72cd60a52dda183cea4a9661c8cbf353fdbab1cb6a23b581a5a4ea85e5ca39
 MISC metadata.xml 871 BLAKE2B bf71e839f29918c8b71d3bd9e45c6afa99391f476ff8c94eb43d9378e754ddafb9cf4aeef69dce4fc2210819b08f62898d7ec4717a9d7f13d04ee3df24e0a734 SHA512 bf4e35e6d51f1797b24c262a6cfd38ef1ce06e80b504afabb2f3f0aa7f069335e96562f3716b819abaa1bcb1f8f88bcb1a72a11047cd87fd4d62d7903b200cec
diff --git a/dev-libs/libprelude/libprelude-3.0.0.ebuild b/dev-libs/libprelude/libprelude-3.0.0.ebuild
index 8a9e5f98a1aa..8c39b4b52446 100644
--- a/dev-libs/libprelude/libprelude-3.0.0.ebuild
+++ b/dev-libs/libprelude/libprelude-3.0.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python{2_7,3_5} )
 
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 
 inherit autotools eutils python-r1 ruby-single
 
diff --git a/dev-libs/libprelude/libprelude-3.1.0-r1.ebuild b/dev-libs/libprelude/libprelude-3.1.0-r1.ebuild
index 5cdc2766edba..3ba688728c3a 100644
--- a/dev-libs/libprelude/libprelude-3.1.0-r1.ebuild
+++ b/dev-libs/libprelude/libprelude-3.1.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python{2_7,3_5} )
 
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 
 inherit autotools python-r1 ruby-single
 
diff --git a/dev-libs/libprelude/libprelude-4.0.0.ebuild b/dev-libs/libprelude/libprelude-4.0.0.ebuild
index 1207e821b0d0..74235ac17716 100644
--- a/dev-libs/libprelude/libprelude-4.0.0.ebuild
+++ b/dev-libs/libprelude/libprelude-4.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 DISTUTILS_OPTIONAL=1
 
diff --git a/dev-libs/libprelude/libprelude-4.1.0.ebuild b/dev-libs/libprelude/libprelude-4.1.0.ebuild
index 975d9e553ea4..121297dc39d5 100644
--- a/dev-libs/libprelude/libprelude-4.1.0.ebuild
+++ b/dev-libs/libprelude/libprelude-4.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 DISTUTILS_OPTIONAL=1
 
diff --git a/dev-libs/libpreludedb/Manifest b/dev-libs/libpreludedb/Manifest
index c72db0184c16..1f6044f60a47 100644
--- a/dev-libs/libpreludedb/Manifest
+++ b/dev-libs/libpreludedb/Manifest
@@ -3,8 +3,8 @@ DIST libpreludedb-3.0.0.tar.gz 1269937 BLAKE2B 6f6bad7b9529b88bd03b224c1ea4066b9
 DIST libpreludedb-3.1.0.tar.gz 1291186 BLAKE2B 90b3b6264f0042b14e54abfc3068071419646076fc6cfa3dd84ba6c14797fb0ea88885edef47b8a5d0dc455468e6daaa8e795b621a4f9001d19d8edc33630a88 SHA512 dcb98eff2521979c2956bdd6f3b661c346c0f6748ef820a75d77c948e426a996de26c7fc6b6c2abddc93277db3820eb2f44b61c87feb86483e720cf9b0e0124c
 DIST libpreludedb-4.0.0.tar.gz 1325812 BLAKE2B 7a506f7cd7b51898e26201f2cc640b1f34227f9cf7c5c6e2385480f1fc0ad854b6d747293ab502b641cc65f1ee9ae4a8f225e6a1d4489bcaa59901c6342f1279 SHA512 13f5dbcfa6af965f2075d60c645ebb19cbd6b18807b26f4f13a7a05f1cf552996f9846e856728a4e1dc621efda693016e82623d4a3cbf74849b3e7114f19faca
 DIST libpreludedb-4.1.0.tar.gz 1333638 BLAKE2B 380a6d4ef8836555510f9f9882b6100417f2567520c421355fb7eec8d2cd7e2f3942c4cb90ea21fa1557327026edd5c1e35e338a79e06a21cfb2bd6813a289c2 SHA512 de1fa5106d7f34edb5a23e726c968de84bb8b10257587b6ee36276ed75ddc54f4f9539aecb7836e114eb3bfa90104dd3b5e097be0c3d12347dcbded94f293dc4
-EBUILD libpreludedb-3.0.0.ebuild 1572 BLAKE2B 6a80c44ac91eb49044fd908e77b458e26203d7c5937e6764f0789e5c5fe048e6c4dcd0e84b8dfdcc331afd9cc03259c91a8dcb4f79b033c51e0d740a8876d8fc SHA512 8b8b5dbf1b1a5aabaab7b1191f79353aa197254b39ae8517f5f9b230ea8b7f946ec29395e7d7b5429bc542aabbb4a7b61ac8a611823f49d6eab356f432e450d6
-EBUILD libpreludedb-3.1.0.ebuild 1496 BLAKE2B 01fd701a2c6c2b14f3f1e75478f1d823d9f4441d183ac8bef243c6a8da44c03c4d6c0a6636cefbdcebf97c7c8e6decf091a45e1decf2e81ca8e8f9f2ef749464 SHA512 86eb7b065814b5a07e5908e57a2952ee82d61441dfd748afcff4d2c052c4353c4aae866e98520de84b76a63ee50e39f3bdb33e224d9456e48fe55f704b6842fa
-EBUILD libpreludedb-4.0.0.ebuild 1741 BLAKE2B 66618e59ac7cd62ccd480dc18ef2014ef04c930679da0af3427c2ea1b4d42a5c22fe6546dc0917895d1e32b88f493dcadc974d2feb72160be62f5f796659783a SHA512 f3f59361adb1907fbef8ca5d88755d4ef85b02ee2a4e1f7712c5bf13b1d2f6dbcfa472eb73e06cc54db86348c482df2a641517752924382a639ff15abb246b68
-EBUILD libpreludedb-4.1.0.ebuild 1749 BLAKE2B 46fc0b5d697fe050650c4f5d3bf90bc1337509b0c26c550b2fc66506ec487c28ddce99d19b524e3b3abd205a2dcdfddf7b0d1657ad6c298904c6ac1473d4ef80 SHA512 2760fb289a962f78a7d21303154e7ca9f672fdd2f3966f80b7c0e2f655846c3c4704ec8f4182c1cf2f183d32fabe2f747aa8c72f9f044dfaaa0bdef215adc24e
+EBUILD libpreludedb-3.0.0.ebuild 1565 BLAKE2B 0970da7819576411410b104491aa6819c7d9799c97b6ee43656de8839c47c02b1fb01bcd433a31fce0a19b18e5fa564e7be586a4eedb65366d97cfc9224f1556 SHA512 70991e5ffe60a8071e308f79861f6ad780eda7bf22d7cc616008de0cb532f24125d24951b33dce15ba57ba61e128c2047923b18fe7025362b864f57841f5054f
+EBUILD libpreludedb-3.1.0.ebuild 1489 BLAKE2B bce9a006c77081255e25d3f2c8e3d5e3e53eb0751578d870a157976caf20a2ad6ca4546c8d2557a42b570b325afcea835488112acff35d09e9b3b234156a0612 SHA512 09bf5c2bc1fa7ced73b179979dac8b05a2750a4e2a92bf3fece21c3d5d350613b0e81b45df409b67045a05be2bd67ce0a02d1de2c4a5a26030a4f8ba0ab596e2
+EBUILD libpreludedb-4.0.0.ebuild 1736 BLAKE2B ab3d192770ca8a37bb5d3a165405c7b1923f29aa5267c9ea8f3481a5291c72b677e0304c4e67a7ddd223bfab2f5a61f852bc0ed4d4fa0aba470e588bec4ffe4f SHA512 9f3f5d15e56ae1cc22e2fb404e8897b1aa5bb402c292cdd68f6c78316df96e7ba338684012d1122cf5b038e28acd9c14c9fdb0df6fa1199965a7f0fd60d9b4b0
+EBUILD libpreludedb-4.1.0.ebuild 1744 BLAKE2B 94b0b1d02edeeb51291d3d8e73d164f66d1238107357bbbb1abf8c33c3a4282c39dfbe12ebe428f110ab43ff96b91202e07f486ece4d5f53ba4938eed64df752 SHA512 af91a741ab6d21e10243ee1464fa7a4a91cffe828ff0e9dc25b452b99e7a7e191552d32ee5a4547c2a0831af063d11e9b672a15251757dbce277e44dc4cab267
 MISC metadata.xml 740 BLAKE2B 4378279b071469fe4b56d29d93bbfa596c007ed9be028c028c0b3cea7b4a4d206b8dfada84f8dbefdc56ec1d355c0a81f8a5f719a3819761ef532a85fbdc2490 SHA512 336a155dddb152697e44246184aaf0cfa928f1a3acd226c3f048aaeca81e96e1c5c7bceaee2bcc5e6ff731b59de1eadb02698e01c3e9443e6d9a37859da8e973
diff --git a/dev-libs/libpreludedb/libpreludedb-3.0.0.ebuild b/dev-libs/libpreludedb/libpreludedb-3.0.0.ebuild
index a42260295921..a42e13bd0878 100644
--- a/dev-libs/libpreludedb/libpreludedb-3.0.0.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-3.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python{2_7,3_5} )
 
 inherit autotools eutils python-r1
 
diff --git a/dev-libs/libpreludedb/libpreludedb-3.1.0.ebuild b/dev-libs/libpreludedb/libpreludedb-3.1.0.ebuild
index 5e0f91c827eb..fdf5055c0559 100644
--- a/dev-libs/libpreludedb/libpreludedb-3.1.0.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-3.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python{2_7,3_5} )
 
 inherit autotools python-r1
 
diff --git a/dev-libs/libpreludedb/libpreludedb-4.0.0.ebuild b/dev-libs/libpreludedb/libpreludedb-4.0.0.ebuild
index 2fb7ad0e091e..b7ded08b2281 100644
--- a/dev-libs/libpreludedb/libpreludedb-4.0.0.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-4.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 USE_RUBY="ruby21 ruby22 ruby23 ruby24"
 DISTUTILS_OPTIONAL=1
 
diff --git a/dev-libs/libpreludedb/libpreludedb-4.1.0.ebuild b/dev-libs/libpreludedb/libpreludedb-4.1.0.ebuild
index ee315b82f581..64f67755a9f9 100644
--- a/dev-libs/libpreludedb/libpreludedb-4.1.0.ebuild
+++ b/dev-libs/libpreludedb/libpreludedb-4.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 DISTUTILS_OPTIONAL=1
 
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 2d2c0c27f11c..5abe4ce59556 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,3 +1,3 @@
 DIST libpwquality-1.4.0.tar.bz2 450384 BLAKE2B 52a6f1c1bf90f6f01fb07667937b9792935729be77042bfc97dee8faa923212fa02410ad4e5c56f778bc9a8d248655f0b738889f5a0e73dc201d62d0c79093d0 SHA512 b8049f8b71bbfd4d345dbd4c4cffd29e9029b0fca4c95527af54d11a3b06e4708236b630df6c66738368298679c96cb3bf26b1b5d95cb3c5f7e1073cab8a98d9
-EBUILD libpwquality-1.4.0.ebuild 2006 BLAKE2B 40dff1885537946b17a60a31c7eabc7704109cbc96cea938a07f1ec560153afaeb5b5540bb1d531066498256d323b9371106e8e14f2162ad2d70e0c4b7dcacee SHA512 933e1a731ca85f7823f7c49f6a60b8b3183f6413dc6cbc0740c6b8bccefd1f98773e8585b2169a64116952f3a3066c6ddd6fafc7fd65cacb919f46077678eee9
+EBUILD libpwquality-1.4.0.ebuild 1999 BLAKE2B 962affa7041ef5491fea281e782bc8ce7baa1b99cfbad80c08be0872070123094b93a7e79ef5b5479ea1c6a74ea2b7f801f1cecf0e2a134384979c86a1f7f891 SHA512 94f5fdf7a2e0ed56ead1af1ba2753b3abfb678c20ad23b0d09a4d14910ec82f6b57113dcd0429f08be8df54db9c646428909575ee4e7e096572e6991c4694575
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/libpwquality/libpwquality-1.4.0.ebuild b/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
index 596d7f476510..a27c196f0607 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit eutils multilib pam python-r1 toolchain-funcs
 
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 664d7252087a..918a6bda0e2f 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,5 +1,7 @@
 DIST librdkafka-0.11.5.tar.gz 1984510 BLAKE2B 55a27482275726233b5c9b39dfac1b9f34235c68600b5720c1a9dec782de6a4d7d084ad71e50857c32a93b39beacc891933e02f45162d0de144ecaadb3640c41 SHA512 4a8dc46ad66f23cff4d4ef2fc8daa7207bfa3e77fd3580b3f141a73b449e60ea5381e97263235b4d0d762df027a8a2cad08637d88162d9605c82d74a1e64b67c
 DIST librdkafka-0.11.6.tar.gz 1994337 BLAKE2B 7b61e6ba02c5ed58c20e604d6765f6a57ff63ab0c61f2a4c64eff55bfb6c854ef089ac9eea9acc6d44b6abdb6d1425ff23e9d4e6037c733bc5719d6b69c74ae0 SHA512 9657dc53220bbff3eb44941cff2f50ab7f71a82f7486d64ea14f67eabd4abe8c67f225a752cc1f0339439a1cc512e99ade6536d087857979cd198c0102015718
+DIST librdkafka-1.0.0.tar.gz 2465603 BLAKE2B 7006dc421ae5c2c991853f4ede9d99e7dd308b49372a7c2c859ecc0e6ee7aa3b6cda9af7a71a5813610630b564bd65c6cf18ecaefd1a1880545838d7758aea88 SHA512 15ac1e4c9042debf8d4df602ccdc5eccae3a37b305be24d724fcaffc3d1d0aafa708fc8e29d6af51f51ed6c7daf74b3041b8b9b0444e6702cd73479c8078859a
 EBUILD librdkafka-0.11.5.ebuild 1249 BLAKE2B e10b7391be22a1b2fa32af02872ffa2e813ae0a387e7a31005900b63c9d2d3ada9cd47ca2e7a155f6178267b3a2b258f7eb9f8c7a2470be8ad61256d7d207a38 SHA512 41f0086bfe66d0a12f2ab448d842119bb3afe4e3008662b0fb0ca5bc99ef36fe81c4c4d0c8de46ff4eeb6594cd4253ef5f0895beb45235f99b195d3b13476953
 EBUILD librdkafka-0.11.6.ebuild 1249 BLAKE2B 038b73de2adf38cf66b95a470c1bf4e82b4d30c50410ba8ddbad3d59cb6ec323dd28da6c9deaa162049cb26c4d38f1456459fb309f01ee7d2b7f7d826825ca99 SHA512 e3d82210e7d6caee61bece6eadf2098144bb7dc7f1fe3c19e6e0ef154e0f36acc2b60017d8fc044f3a63ab7c83a7e1f5c8c732c39817904d31fec3b47d1f20cb
+EBUILD librdkafka-1.0.0.ebuild 1253 BLAKE2B a50b3eb6357710f87257ae6b183cc6e9eb55803712f22ffaacdf75ebb2eefff252df13498e3510dd0acad8b378feaea9aaca57d6c111f427d93000c8e4da6aad SHA512 a81ea699cc281d726a5236273e2aa045693cc02e4251f6647ab56f21ea08a87be0995eb2a99cd2c40de473e1e0d48da62997f43297a9c087aef3e2d463a4e740
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.0.0.ebuild b/dev-libs/librdkafka/librdkafka-1.0.0.ebuild
new file mode 100644
index 000000000000..1ba0f2d7c09a
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-1.0.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs"
+
+RDEPEND="
+	lz4? ( app-arch/lz4:=[static-libs(-)?] )
+	sasl? ( dev-libs/cyrus-sasl:= )
+	ssl? ( dev-libs/openssl:0= )
+	sys-libs/zlib
+"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+	local myeconf=(
+		--no-cache
+		--no-download
+		--disable-debug-symbols
+		$(use_enable lz4)
+		$(use_enable sasl)
+		$(usex static-libs '--enable-static' '')
+		$(use_enable ssl)
+	)
+
+	econf ${myeconf[@]}
+}
+
+src_test() {
+	emake -C tests run_local
+}
+
+src_install() {
+	local DOCS=(
+		README.md
+		CONFIGURATION.md
+		INTRODUCTION.md
+	)
+
+	default
+
+	if ! use static-libs; then
+		find "${ED}"/usr/lib* -name '*.la' -o -name '*.a' -delete || die
+	fi
+}
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 6493ffd77794..75b70d4c8974 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -2,7 +2,7 @@ AUX librelp-1.3.0-dummyclient.py-Py3-compatibility.patch 857 BLAKE2B 7729a27955c
 DIST librelp-1.2.18.tar.gz 506766 BLAKE2B 939bd2279e03a6431fbdfb787aa3d62b3f622ec3248dfc7c0a0a141294c27319081092a624c328374cdba0cbd51659301a77ad41bed27ba13f47601f7a607944 SHA512 7193438238b7019e7a4944d6d900a1fa5a369ff8a6b97a6dca7e82b6637c0f391ec3554eeeaa285881457cb2abe72fa1a893244ec9a36cc9d2e2592d58c5462a
 DIST librelp-1.3.0.tar.gz 514470 BLAKE2B 3e8d844d3cccd4c148036191f376ba49b3851a2c7e95361bb31a1a172ca0813caa96eb3753b2285a2547c85e073de3237a749bc64fc0fead69ab170656dcb200 SHA512 6e60398c68a78f4b4202a697e144f1516ff3bbb32192f745b52c77d107954febf8cb31d2e166efa96c00122f6807860ecd01084f1d3d4005336f2cb75e6461c9
 DIST librelp-1.4.0.tar.gz 519235 BLAKE2B 9c1e52cc9f666e75f261db65f45e3d954afa033cac59f93394c30ba99ed772d71b2882bdbb9bed696e57ed99805d47e57fd5e331cc3bc3850c5f15041a0d70d0 SHA512 92d01a51b4ee3c66d1f65d2e26f214646d72b41a8411ab700fe5f9f30f805ef98dec962526ef95c8d8428bf7398d38f656c919f95a3e49382adc745ef9eb4239
-EBUILD librelp-1.2.18.ebuild 1445 BLAKE2B ac565231d635024c869cf9d2f8ea43b6ffed96a94d0fa1445167c6b8c60facc8987193ccb5a0ac76ae34a019866b84d7bbc4dbf6264f47acb7a3d7d01a35ed4a SHA512 8f6275b915b3c228465d38badb43c2fcbf1928100d7cc3f46e33c0cd17df34d5136315257b28ef8cfff2ee3f1f52168085cce7b9cd4b062d18acf8dbf866ec81
-EBUILD librelp-1.3.0.ebuild 1691 BLAKE2B 04e0943bc0a3e6629df788a4da76bfaf39ab97d3372bf1af13734660fe6d34d7cf234915500bb47eae97d0eee00c63ebdd7061bd9dc4a1ca3e1917a639745b9f SHA512 d6a40ca3e37e155efd1200758738b0290ce8b290fe2fd4d0c909783832e27b8f443a118f7bab5b21868a8539441c70fc75505f6137840d5e1ce53b9124ed35a6
-EBUILD librelp-1.4.0.ebuild 1623 BLAKE2B 73236746ff032ad2108762a9d7f61e102c35d7d95f5efdecb7f474e0847a6f9a78a8e39a18602dda3c43d1cacca41e5c2f6a733b026bdef36656e15ae4c92699 SHA512 76bd6fe1912bef5356fbbd39f0f0f18d2a1443c1743b9e0d57a40cf2189c4d91ebfe22408e12cdd73e95548a5ad09cd19069d57012e04b76347e8a7fb8d3cd6d
+EBUILD librelp-1.2.18.ebuild 1240 BLAKE2B 1e5c2a3c09963f3ccb25da31ba90e2cd0ca2ebfa0de68903656fa9727f3b56f1c44dbbb59d2ecf23e913ba0fbfd42cc821826f72b786bd54da66a06032c00ed0 SHA512 772112ff4a073d526c0054a211e11d295641f7583c84716019d007ba2e33654adc4f639d40be6e54ad4d23b4028aa85c039624138550360b20a0e9fb21ef3752
+EBUILD librelp-1.3.0.ebuild 1484 BLAKE2B b5d30a4c855d15a8bd97c4f7b38eff9260bca1e95d45acbce9872d05541f72299dbfe7037d6648c0e5ba9d9a1b0e9536a6a0b7e6965d987df2470e31e5aadaa5 SHA512 3738e576b78f27e9a247f65ac1f9e0efe5a0872a579e91f901e7c085f07f1835f9cfb34282f0f577e9608cccf4b0decc26cdfbb1cefcd95799562c33f75a37d3
+EBUILD librelp-1.4.0.ebuild 1416 BLAKE2B d5dab6b78144a75436905421f7f75c211569411b837d6960e560c12d55697db1a00aab77f28d66cb1f211a8aac25b792e71aba4883f6efbc8b4ed22d6bdebea7 SHA512 01e885fb4d736790f6ef945e2ef6bb259ceca3d05b91fe6c986e4993dacacc4df49f422befd783996ae7f35ba2ea64b5d3ae3face70824479bfc232e9f373123
 MISC metadata.xml 503 BLAKE2B 987b40e4f9b5e33e1f293023237b7d0cb614ea36113d6d5becb780fddc729a2a2a033cab8e41b64a0465d0f14e220c96787e30b7b133979e36ad86a1273ad0a8 SHA512 31f5e4ece41aab561a70c7b9af6119bce8c3cb7fb6720be754dd925ee656faa75ee953cd3d296d1b8bb5f48368d015ec5d2768d217b349f1689e767424786e3a
diff --git a/dev-libs/librelp/librelp-1.2.18.ebuild b/dev-libs/librelp/librelp-1.2.18.ebuild
index bd8997fcf000..fd69546976e4 100644
--- a/dev-libs/librelp/librelp-1.2.18.ebuild
+++ b/dev-libs/librelp/librelp-1.2.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,26 +16,17 @@ SLOT="0/0.4.0"
 
 KEYWORDS="amd64 arm ~arm64 hppa sparc x86"
 IUSE="debug doc +ssl +gnutls libressl openssl static-libs"
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )
-	gnutls? ( ssl )
-	openssl? ( ssl )
-	libressl? ( openssl )"
+REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
 
-RDEPEND="ssl? (
+RDEPEND="
+	ssl? (
 		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
 		openssl? (
 			!libressl? ( dev-libs/openssl:0= )
 			libressl? ( dev-libs/libressl:0= )
 		)
 	)"
-
-DEPEND="ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
+DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
@@ -70,6 +61,6 @@ src_install() {
 	default
 
 	if ! use static-libs; then
-		find "${ED%/}"/usr/lib* -name '*.la' -delete || die
+		find "${D}" -name '*.la' -delete || die
 	fi
 }
diff --git a/dev-libs/librelp/librelp-1.3.0.ebuild b/dev-libs/librelp/librelp-1.3.0.ebuild
index b764146b9aad..b5359490d5fc 100644
--- a/dev-libs/librelp/librelp-1.3.0.ebuild
+++ b/dev-libs/librelp/librelp-1.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit autotools python-any-r1
 
@@ -17,26 +17,17 @@ SLOT="0/0.4.0"
 
 KEYWORDS="amd64 arm ~arm64 ~hppa ~sparc x86"
 IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )
-	gnutls? ( ssl )
-	openssl? ( ssl )
-	libressl? ( openssl )"
+REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
 
-RDEPEND="ssl? (
+RDEPEND="
+	ssl? (
 		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
 		openssl? (
 			!libressl? ( dev-libs/openssl:0= )
 			libressl? ( dev-libs/libressl:0= )
 		)
 	)"
-
-DEPEND="ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
+DEPEND="${RDEPEND}
 	test? ( ${PYTHON_DEPS} )
 	virtual/pkgconfig"
 
@@ -80,6 +71,6 @@ src_install() {
 	default
 
 	if ! use static-libs; then
-		find "${ED%/}"/usr/lib* -name '*.la' -delete || die
+		find "${D}" -name '*.la' -delete || die
 	fi
 }
diff --git a/dev-libs/librelp/librelp-1.4.0.ebuild b/dev-libs/librelp/librelp-1.4.0.ebuild
index 26d84e37b335..7f2f302f8323 100644
--- a/dev-libs/librelp/librelp-1.4.0.ebuild
+++ b/dev-libs/librelp/librelp-1.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit autotools python-any-r1
 
@@ -17,26 +17,17 @@ SLOT="0/0.5.0"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )
-	gnutls? ( ssl )
-	openssl? ( ssl )
-	libressl? ( openssl )"
+REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
 
-RDEPEND="ssl? (
+RDEPEND="
+	ssl? (
 		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
 		openssl? (
 			!libressl? ( dev-libs/openssl:0= )
 			libressl? ( dev-libs/libressl:0= )
 		)
 	)"
-
-DEPEND="ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
+DEPEND="${RDEPEND}
 	test? ( ${PYTHON_DEPS} )
 	virtual/pkgconfig"
 
@@ -78,6 +69,6 @@ src_install() {
 	default
 
 	if ! use static-libs; then
-		find "${ED%/}"/usr/lib* -name '*.la' -delete || die
+		find "${D}" -name '*.la' -delete || die
 	fi
 }
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index ab9a411a549b..a65772e4eb03 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -7,6 +7,6 @@ DIST libreport-2.0.13.tar.gz 1190147 BLAKE2B fe79d924fbf7bd11cc3fd23956a137fb296
 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 1946 BLAKE2B daab9fe38fc294b9009c72f21d5fcddaf277c98162393bde2316021de7894f27cd548c97e2860586bc9ce0f279d1538d753501ca0f49139c843913ef30716b95 SHA512 8a02d49369fbb8a8cab97d6fc7565ac8c37c520bf5caa5fd7b09c6868b17481d1779120ed5098ba0fd37d7d0d2aca30d8b66445f67750a362c92957ba7697e31
-EBUILD libreport-2.9.5.ebuild 1937 BLAKE2B 421edf2bfde7925bc4ef8bc46df0c70881e2fc4302c3a1af4353424ad2273db74fafffeb5c8022bbfca65b0f6715c0ab477c9ae112296ba52d7144680c0b2f27 SHA512 a54888e680c0ebc85ebc47839da5864c91c7933dc03bed5f349a2c1d88e7fe7a67456e35a0cb66126c9e19968f67ab28f3e5da320eba57b971733f5aec71fa8a
+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/libreport-2.10.0.ebuild b/dev-libs/libreport/libreport-2.10.0.ebuild
index d64adf865abf..d287b1c9a7c9 100644
--- a/dev-libs/libreport/libreport-2.10.0.ebuild
+++ b/dev-libs/libreport/libreport-2.10.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit autotools python-r1 user
 
diff --git a/dev-libs/libreport/libreport-2.9.5.ebuild b/dev-libs/libreport/libreport-2.9.5.ebuild
index 7c31200a613e..5c1ecfad27b4 100644
--- a/dev-libs/libreport/libreport-2.9.5.ebuild
+++ b/dev-libs/libreport/libreport-2.9.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit autotools python-r1 user
 
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 5aaf5975d80c..ed8a15d4d5e6 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,11 +1,9 @@
 AUX libressl-2.6.4-hppa-asm.patch 2236 BLAKE2B 508555aa87f763c7cc39cf1cbd2ae5692d7c33315b08e4527db61a878cb5373e6856669e8185b7c49ab82e3f7c01034c1496c639d3a46d605c39170f3f1ce32d SHA512 b49da63109f4b0d471402c07df927b1aba60f94e263376919206fac9a4dddb9a10c4c0004836b2c00a560eb59dcde71bd6b4aba45d966a3e0b2fba79f7277a3e
 AUX libressl-2.8.3-solaris10.patch 1928 BLAKE2B e12372c1fba9c586e5d8c4ccd7af0c3d888dd42f4456e28091424f8c1f0ec0362f9558957752a30fabb7b06e35929cad8fd582deea58d48da4759ee0aec12b08 SHA512 39ab3dea9af735f2485108aa88e7d951563ffbdeb8a002eb76560617583df58c84d5af83a1e51d0a6f71e9709d1f1f83265b030740f6024e5d45aaf0d98290b5
 DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec3407abc6c1bf8d474c4424161c563667ca1fb26c45dd20a0e895457e9210b7bd0539581472b94d594cc32a68191 SHA512 0601c73bb5c3d149df7eca3566831f1b35713aa16a15788a291922fce0bffa1ba0bc6ea9cac1fcecfd980009f2292b08b2a57d66b517fc1bc8c7364a24dbbd9d
-DIST libressl-2.7.5.tar.gz 3539591 BLAKE2B 0cda7307f01cea21584b3e814a20053ab128016f0b639856eb04b52f91156c74b8fdba485401e099f472ae7d9a35e9be54d169e3ddf743540595c2ffa0f979ff SHA512 00828dd115f6395186ce4c9cadb604612763f67f2ad2236a331062add8115f6494a655cbec237ae069e373ffb915ed4025c993e06456c3da69b279e5f7e2b8d4
 DIST libressl-2.8.3.tar.gz 3366196 BLAKE2B e32c097b31998d68a31266fbbf3624d5ab8ca716f8c53e423bcf09b3a8ab3542c92a99e259ded7b86f99b45cc199cd44791520a609f18c35d150365de5768eec SHA512 3967e08b3dc2277bf77057ea1f11148df7f96a2203cd21cf841902f2a1ec11320384a001d01fa58154d35612f7981bf89d5b1a60a2387713d5657677f76cc682
-DIST libressl-2.9.0.tar.gz 3400383 BLAKE2B 652ac9ff962fd187563f2f6f9ea423d682f743c8443954ad3a8adc810530711482705f0cac1a805e2f85697ed1fed156c80da913dc07c8c13cd6ce78e44b6c4d SHA512 db7fec664bef8d76204ca691c11df236abce3c85b2a51011eec5bd302e273b62fa3cfce0430980915c3f3ce34176d5ef9c187902f0b39d7fc151e69e552b499c
+DIST libressl-2.9.1.tar.gz 3607116 BLAKE2B a4542d7fc97bfd213162fe908e28b27d52329e2b6a5d77e0cb67d1a6732c500ca772d0c5735c9fcd036c477e6ede330305b4675bfcff9f72fd7886a781f30015 SHA512 7051911e566bb093c48a70da72c9981b870e3bf49a167ba6c934eece873084cc41221fbe3cd0c8baba268d0484070df7164e4b937854e716337540a87c214354
 EBUILD libressl-2.6.5.ebuild 1450 BLAKE2B 193d943fb6ceec65937ff2d47d2f1b677b7e643962c277f045371e9029af3ea7f0aecac2498b0bf74f1c4d7fd0160846ae3ab757bdbe24361f3304faa6f740b4 SHA512 42d2263c867c290d42c08379778b13f36eab1e185d8dff69d8970e09766596bc162d494d2ba3ff9491d2cbe781ccced9e1e4813eade213a9d94ddd22e7e3cfa2
-EBUILD libressl-2.7.5.ebuild 1382 BLAKE2B 846118a1f36d1739d1a30eba50b65ef269c75608a236cbe6718074c0202f4db91f456d1c5ba8e2b70359eaab8844e64e1731f519d4d6ce5fbd4ecc7bef88d737 SHA512 6fea592eb88bc81c0f4d1da2f3f358fd93040ffc3f740db1c9f532bcb5dc70122fa390c97fdaf012a90c0a5038fceb21478aa09335f09c4174061163dd4e02a3
-EBUILD libressl-2.8.3.ebuild 1546 BLAKE2B dfde0f350370a78bfb0e24d3c611436967a6ea005d78c8145b3df64530ca8c0380652caf4ca66ccb5d2237c9e00a9a8885b32244135ae77fb9659ebd0822e789 SHA512 345699ed6090234971faa190556ef2a596c025bbe7a6db417b77faff542b915a2c414e1d202e1a4fb504142e367e6581610e90dc2525a69211af615cdddfdd68
-EBUILD libressl-2.9.0.ebuild 1560 BLAKE2B f3c3d706b8120db17f245d7d2b1bdc1693fa5efb5568fc609e52ba872c89fcccef43e8e275813848a77b5502a22386133147a2085d63dc032670e9bba4a5a82c SHA512 a1587d462fc00cb5404577b37e2dcb3011bc5f0a17bf02f5a9483c3101fc8cdcafff95206a63273082ee3fb68da2162e7dcc3129eed94a23e62fed726dc14d96
+EBUILD libressl-2.8.3.ebuild 1545 BLAKE2B dc63614ba49a5d077e4be5fbc830fb3a20e7a34b403560f0b803c3eb7c761610eff701b1e79ee0a495eba310726518638951f66ac5f890f1b881ef5edc9a0d5e SHA512 d342dd4eca89a4db529c823161d49ec9292d7d8d98cfa5a10f18e88b1ebc4ecd4cf935269bbc3ad9a5d44a4cdad40929ea5e31830cb40a516def5de71dd51ee6
+EBUILD libressl-2.9.1.ebuild 1679 BLAKE2B 62ac39e1a95e996b33a84551619b4f642c733f8ce4708dd1a4620dd9ef047303c99fe6d9539b87b88bc18ee0932f6724c389eff27b61d6026328ec1f9f8d813f SHA512 cfc4b9b8fdd259d65905035190f29efb273b6e3a6317619d4d7e86413cca8259fe87fd16c1ed7f4e98e0f7438376fb82a1b912a7672aaffca79765a5eda37d42
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.7.5.ebuild b/dev-libs/libressl/libressl-2.7.5.ebuild
deleted file mode 100644
index 288540105ec7..000000000000
--- a/dev-libs/libressl/libressl-2.7.5.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
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="https://www.libressl.org/"
-SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/45"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+asm static-libs test"
-REQUIRED_USE="test? ( static-libs )"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	touch crypto/Makefile.in
-
-	sed -i \
-		-e '/^[ \t]*CFLAGS=/s#-g ##' \
-		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-		configure || die "fixing CFLAGS failed"
-
-	eapply_user
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable asm) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/dev-libs/libressl/libressl-2.8.3.ebuild b/dev-libs/libressl/libressl-2.8.3.ebuild
index b438e7c15cac..1dd097614e8d 100644
--- a/dev-libs/libressl/libressl-2.8.3.ebuild
+++ b/dev-libs/libressl/libressl-2.8.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/46"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/libressl/libressl-2.9.0.ebuild b/dev-libs/libressl/libressl-2.9.1.ebuild
index 9356bf70659e..b9ba51552c33 100644
--- a/dev-libs/libressl/libressl-2.9.0.ebuild
+++ b/dev-libs/libressl/libressl-2.9.1.ebuild
@@ -34,6 +34,12 @@ src_prepare() {
 		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
 		configure || die "fixing CFLAGS failed"
 
+	if ! use test ; then
+	sed -i \
+		-e '/^[ \t]*SUBDIRS =/s#tests##' \
+		Makefile.in || die "Removing tests failed"
+	fi
+
 	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
 	eapply_user
 
diff --git a/dev-libs/libserialport/Manifest b/dev-libs/libserialport/Manifest
index ca962ff61070..2bdd62f43229 100644
--- a/dev-libs/libserialport/Manifest
+++ b/dev-libs/libserialport/Manifest
@@ -1,6 +1,4 @@
-DIST libserialport-0.1.0.tar.gz 382395 BLAKE2B d257b8a47b4750f023c70bd25cbfaed7a49a46868ae050fd7bab9fd6ba5b7c25c8bffc71cf445ed273c3755b37428ff8a4d2812007f5e535ef390b3fe0af1d5c SHA512 9ec0f33aa0f3c72c47c82cb565ee850968eda04ef5d046551a0ecce2938b7528266aed37022fa1e14698d9f0e969b5b049e86c4a8012e43426379ef02e1d0b3f
 DIST libserialport-0.1.1.tar.gz 405251 BLAKE2B bc52d7b5303c123a28becde1e77451a921c2b6d5284ccfaca298d0535a793297d30e297109382a7266263530ac9a0e0b598ce8d1602e0700b43bda227f29a6b3 SHA512 7d379d1099173841e6d4df04c8c12dc6a4ebdfa0323ef35da6f3dea20db55d4f6ad81c1f6679f5aac7fe83270176428a817daa8627c336505335a07e06350a85
-EBUILD libserialport-0.1.0.ebuild 758 BLAKE2B 5065bbdddfea37b8d67374778a45406026567cd4c9820181a4f860ac98195db6bf6b0f13d7bbf25a3034b4bd0de9a35408f9b63191f59227762f7a624ca14613 SHA512 4650e7a9fbe61a5189047b3e2f139d20e5471f66aff25591fea117032a3de96c48940934f7236f3f39c459b050b1f25e262fb135e959569c8b1fbf3c62cb6501
 EBUILD libserialport-0.1.1.ebuild 708 BLAKE2B f576d6457772bd3bd825193003566c59e483d1cf35f79a72ddbe39feaf280764611c718f41c253f5d3457e05d4daf9214b6e8fac9a563a5ecf78fc7b8b5b1049 SHA512 0b142678347524f2263a68ae522684ecd13d9f96766d4026ee5bf9c8502c2eb63a719f6315f78257916a5850fb3df77f92892aeb1dbe896e3fdbe4afda81b842
 EBUILD libserialport-9999.ebuild 710 BLAKE2B 7e0ac2a0e58bde1a3f864297b9570cc8b1b3ff9ba695b71f1d7cbcceddfe053ebcffe91d6c3ff692942ff83ef07a3ced54637301a402aafb5a6fe859bca6b363 SHA512 c719b809239738a44c61893d9d1e7ba4573a50a39d71669d8707fe8c0267fab670fa2805b0b274cacc4b2176d9e906279c76c683f290786fa0140f7ee08cf28b
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-libs/libserialport/libserialport-0.1.0.ebuild b/dev-libs/libserialport/libserialport-0.1.0.ebuild
deleted file mode 100644
index 7844e2784de5..000000000000
--- a/dev-libs/libserialport/libserialport-0.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Cross platform serial port access library"
-HOMEPAGE="https://sigrok.org/wiki/Libserialport"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="static-libs udev"
-
-RDEPEND="udev? ( virtual/libudev )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with udev libudev)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest
index e03e90f2543b..f8ddab266319 100644
--- a/dev-libs/libtermkey/Manifest
+++ b/dev-libs/libtermkey/Manifest
@@ -3,5 +3,5 @@ DIST libtermkey-0.20.tar.gz 45167 BLAKE2B e51a0c91efce056824ee56918aa6a794096e1f
 DIST libtermkey-0.22.tar.gz 46147 BLAKE2B fddc00a1ae525e5ed8c9c6eaee46fe30a99dbbc76ca988f9f5301b3c5c13a6de4462d6cc612119409a21737176f67ac196109b11fb58f414b25db5b6a49f4982 SHA512 2e8242cd1e6acb8900125dcee9fd47f7554c359363f760b88858c82667e1f3871bdd87358b14c8a133ef3cd2699947a5045477e64cdf7f96d4ead1723e73a219
 EBUILD libtermkey-0.19.ebuild 895 BLAKE2B 1c68afb92e259a7de42d2d3bd48ef26240ef079037de7e2ceaa21e0a7fdcfef3ea47dda13462addab9440298c723e5ad372559f4c3ae805b3e31a08e844c5d6c SHA512 7b7fe1baa9b808c9e6a4da1ea635de605dc6ba958bdc937c29153f2ed1eeb67d0c253b15975a6dcf932340c658807605ae7ab9bd2eeefd6b6b4ce3ce49888553
 EBUILD libtermkey-0.20.ebuild 965 BLAKE2B 1e16f410da62765d9818cd526aa1e2cb5e88f96940d17bbd21c9d90ca7d50787825f0115a633dc4803be5e37d2cf39945c84d559a21dc22ca0ae62f1ff6fcae6 SHA512 a738569e408342f8605d32dbe96fda1f4843a39efe49f998b981b5d4f3d78cacf2e2be5832603704aac66c6a9fe84fc052aaea925196298721d4f69380bf641e
-EBUILD libtermkey-0.22.ebuild 964 BLAKE2B de05f4c668a9a5fbe36960fd3c02f2f35cbdfb7f11f36b1faaebef81baa4e48b395f88ac84070cb8d0d42f1c0a498f6635d66368ec127f78e058e05a7dc7c254 SHA512 6933756799fc47bb1fd0e1e0ec34cdb6e6246bcbbe81ce62bf23e7c02477f12452c5666788c1621540c9871f9c9c1d3c8298d1ae3ec5cff0edbbb12758fe7434
+EBUILD libtermkey-0.22.ebuild 969 BLAKE2B 078e9ce4fab1b490f7d9537448609b7761a1abb93a4ee802e71085a903b5bb9f185fd83d75e374a004cff3510b70475d4123726d4e81ff7bc3d3496f6079435c SHA512 7cc7b3f2da87558b313b52f9d9aca6ec960be077dfa6ccf96f1ce722a1e29f456919df27725c5541bbafc8669cf8e3ce01abfad4d9d3a3f810317cc32cd21957
 MISC metadata.xml 357 BLAKE2B b658c2de2a5bcbf02faff436d83266b842ab4217adb954f71f0543e5be5f791e48c97f4299e6c97e1338b0a2ee3937136062d0b80c1c8cb09deb3cec8d7add13 SHA512 0b48ba4931f32eda8d9c162693389fc65a0e0eac83b8f2f0dda2e58cabcd93a2bbf301c86c12cc0b2d89ed2c19afd82bbc3a54da9ab3e3f8c615aca24290dfbd
diff --git a/dev-libs/libtermkey/libtermkey-0.22.ebuild b/dev-libs/libtermkey/libtermkey-0.22.ebuild
index a90099b95c4d..4177883c0d2a 100644
--- a/dev-libs/libtermkey/libtermkey-0.22.ebuild
+++ b/dev-libs/libtermkey/libtermkey-0.22.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="demos static-libs"
 
 RDEPEND="dev-libs/unibilium:="
diff --git a/dev-libs/libugpio/Manifest b/dev-libs/libugpio/Manifest
index 764196b3c42c..1a07f6996865 100644
--- a/dev-libs/libugpio/Manifest
+++ b/dev-libs/libugpio/Manifest
@@ -1,3 +1,3 @@
 DIST libugpio-0.0.6.tar.bz2 252283 BLAKE2B ebdfae8ef400b3deb95e4313fd0ca2ad7b195945c850ce5c84904373bca2f2c9d446aec45b0500f549ab5319a294fbc2f0c37a6734fab69d8571389a0cb5fb63 SHA512 f40517d34509f9f3b5b26a5cb5523863034d48887ef3f26bd38a38e9aeac73e09ecf71099cd5a036e23fe3db5c8c2ead588c49022a398f2a426bc7148cc64ecd
-EBUILD libugpio-0.0.6.ebuild 609 BLAKE2B 20272348a2f25f609c6f7aa3bf408470b65f91f152d0746a5c7a715fed4ba6effc882d542d06ea735d0dcb60d7a8e448be3c33620fcdd59c904d920cc653f1f5 SHA512 8efb218e54e96da436cd543e5a661440ad51198591f27c648f7beca4d8bfa3d990ce518f5ca2ea12ec1107b8ae54524b8ae01071b54b688bc5b980bcfccd5b52
+EBUILD libugpio-0.0.6.ebuild 606 BLAKE2B 36a78f09459c03d0eaa11f89dfcd4d30ca8f52c88be27859086ea471537b36558608e6d661d6728d0f3f42bf32136ff9360abd09d2ac1ca294ff92672eb67faa SHA512 41c7cf2aec665b833c79e06f292e1ae4c7a79f9b08be6e7eed8ee41baaee24d7513d8af210fdc24914398d1f2adb7613dca47d0baf135cf496c27122056670e1
 MISC metadata.xml 753 BLAKE2B 7480b4a689b0e666a5394f0099d34efffd75465cf320220cd6eb1c046aae16ec10fa2ecb83838ba54de4164cab6e461510c294ff87cb9be8c232e431617b813a SHA512 502a0419fa0f34a7fb9e504e942a6374a64f0d980f4fb67a52615f113bf56f035dbf6b45bd442175076a62bc7d52bddfc96c26ae8dce6cb8ed02d9734b320141
diff --git a/dev-libs/libugpio/libugpio-0.0.6.ebuild b/dev-libs/libugpio/libugpio-0.0.6.ebuild
index f48a044c9827..a560e02309f6 100644
--- a/dev-libs/libugpio/libugpio-0.0.6.ebuild
+++ b/dev-libs/libugpio/libugpio-0.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mhei/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 ~x86"
 
 CONFIG_CHECK="~CONFIG_GPIO_SYSFS"
 
diff --git a/dev-libs/libuninum/Manifest b/dev-libs/libuninum/Manifest
index d816cd6336dc..4dcf983d67c1 100644
--- a/dev-libs/libuninum/Manifest
+++ b/dev-libs/libuninum/Manifest
@@ -1,3 +1,3 @@
 DIST libuninum-2.7.tar.bz2 276712 BLAKE2B 0894c632d7e9081f35d543895809bcc04fde6da674d4e6adc7cdc914f4bbb257a3e683b381e6496a08b65790731f73315d8263970265a351f40fe504f210c883 SHA512 4536a90b9f34fbabd3cc0560c1ff385063151bc381de51e6ca0253d2a42c2290b92329795b1a12ade305c3cb5757b02fe9d92817829977f50da2e34852936274
-EBUILD libuninum-2.7.ebuild 549 BLAKE2B f22f8a8fa23a623ff85bcd5ee9037ba846792680da2bc92b05185c48339368872c40e2feb48f04bfee90d8956c74afdd357a968fff04750593a5f9f0782c5526 SHA512 3c8c87f2f4a19e54c4b1962f11a700373f3d3428af6c140b4d2fe8a487092e294036037e4e54fe3c9076c87a38f0723b42154256c9fbac39ac3937f63f425932
+EBUILD libuninum-2.7.ebuild 548 BLAKE2B e758ef4489d9a596ab918890f4351bd7405bbb5cae90c7358c40adf89345a7226e1f9469fbc189ffedaa713b1725df3c16efdc6fa521f3b0bf78dfbea70cec88 SHA512 1d892a9ffd242004355b8011983eca63e7f32aa714a2d039415d6e68e34d7014bb1e4bb921b3874d8f58f6e8243305049fd575f8b0401a401ed6cc681f74a22c
 MISC metadata.xml 806 BLAKE2B 12ab88f8c41b905d21b49c60e5adf9dd30a6d19486fc00f79a625bf04427a8c9588df25ad58e52a04ac521b4c6bff5e438470afb857ae773a6cc46b3e377753b SHA512 9a02d6a9c4a9424e009a2b54661768955918eb2654661e8ce966c919b4b4bf8bb6adc2be158f89088d4e140b65c4421f17e8ad5fffabf611c8ab12d074048b0c
diff --git a/dev-libs/libuninum/libuninum-2.7.ebuild b/dev-libs/libuninum/libuninum-2.7.ebuild
index 2d661dff563d..5fed049a786f 100644
--- a/dev-libs/libuninum/libuninum-2.7.ebuild
+++ b/dev-libs/libuninum/libuninum-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ DESCRIPTION="A library for converting unicode strings to numbers and vice versa"
 HOMEPAGE="https://billposer.org/Software/libuninum.html"
 SRC_URI="https://billposer.org/Software/Downloads/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2.1"
 SLOT="0"
 
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index 3d39cad4fa2a..d94bc3ffb759 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,3 +1,7 @@
+AUX libutf8proc-2.3.0-no-static.patch 859 BLAKE2B d461d31600b3ff46cdc791f058eb7bf94070579d638948d04c70a026f37334f85fddb691b31b9beaa0d0a8143f376237a017247179ab9067690c3aa4816badfa SHA512 0129963838e450cf0fd89eab811fda59348690ea45ddc132385fba7211f2afa82bb90c91d8532b2f0aef14c54eb26e02b7d39499e2d03e333fc4789279dbf55f
+AUX libutf8proc-2.3.0-tests-nofetch.patch 1219 BLAKE2B 3393e4dc8699b8672f14047334832fab56451aed2be4ae5157ed168b2161d0fc23a4ec5824afc54fc36ce97efba9ad86ecb078d649791237796cb0e4add58561 SHA512 2690738f457b524007a8c463e5b8e5de3c4eb7608c87354f0d5ddd0933af80e1bf20300aa1ebdcc740c5d000a12723401a1903939fdbd610f671feb9ed979e66
 DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ffee97e735a8cb309d5522df1b5ecd5f313a6d0c681209adb066c16ac65573c9c1edaa336b52de1b057a4b74ed6a7e9ca2671 SHA512 eedaafb2fdb3b6bd47da002a48043c26c1cd3c6b96c447a02f2fea19954c1689dcdb5f64b7c662dd8c5de4f971d75b2d69c8483bd29d49675ef47b362ad0c9ad
-EBUILD libutf8proc-2.2.0_p1-r1.ebuild 727 BLAKE2B 77aa365c44a626a4f464de40eda833c278b48158f81391cf13e6ba5d8633e8c67f8d10736cff944246621a9f2b99a974fdf6d03e962602923982538577d623b6 SHA512 114b67a43e61d9c7ba44a6d4150d9c19283376299e8320812c9c1c095b48a0533ffcc6cbf9efc5d5612ec5f49e7db2de08323138caf22a831a9e0e97f48b208c
+DIST libutf8proc-2.3.0.tar.gz 154282 BLAKE2B d9e33cb9e3e587ddcb2c72cb84cb97ed5481a837df788636990f29415beff20dcc80985f2d2354b43f244b6a8122d3bffd9bd1e91c321f22a0ea70015b6ed611 SHA512 3935cd280e14ed570caa89a983b2d56a981e74da9298a1ea26064da78ece288ff48a73306446d3e1d777e6ecd8ea881f7a29169eaae2153cb015daefb8df8656
+EBUILD libutf8proc-2.2.0_p1-r1.ebuild 734 BLAKE2B 178c2fe8fe6699cb413b6bfb9f68b13b2e90abd9bafb402ff43275f2d363fcc9ba10a36c369edb6516b8acfe0c210b640fda5047dbeac89e45a803c41ea5671d SHA512 fa2c3e9e096b7b664a30c62437246e31f2cd8eb62d45c37077e76fb605f67acf0e2b80f848b946b994c85f7d2c33aee28621698a05224af5c07a29550e8fb4ea
+EBUILD libutf8proc-2.3.0.ebuild 1258 BLAKE2B e133fd86e6b2fb30707a15750c4db592716c7fef37626d21c7809dfc1606458dbfbaf81140ca33c0ac950685abbf41a54f5c9bd1112531aa6ac4b9a93b25664c SHA512 b851fd38045521c43834da48dad3e3b5fa2c02ca095676832cbe5f17db6670226422169590bc2f3c9d7c2d6764c50606e3bede2b06aac8fe7296eb8170f08064
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-libs/libutf8proc/files/libutf8proc-2.3.0-no-static.patch b/dev-libs/libutf8proc/files/libutf8proc-2.3.0-no-static.patch
new file mode 100644
index 000000000000..75e9eaac6b53
--- /dev/null
+++ b/dev-libs/libutf8proc/files/libutf8proc-2.3.0-no-static.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile b/Makefile
+index e3310f7..44c8977 100644
+--- a/Makefile
++++ b/Makefile
+@@ -46,7 +46,7 @@ pkgincludedir=$(includedir:$(prefix)/%=%)
+ 
+ .PHONY: all clean data update manifest install
+ 
+-all: libutf8proc.a libutf8proc.$(SHLIB_EXT)
++all: libutf8proc.$(SHLIB_EXT)
+ 
+ clean:
+ 	rm -f utf8proc.o libutf8proc.a libutf8proc.$(SHLIB_VERS_EXT) libutf8proc.$(SHLIB_EXT)
+@@ -104,7 +104,6 @@ install: libutf8proc.a libutf8proc.$(SHLIB_EXT) libutf8proc.$(SHLIB_VERS_EXT) li
+ 	mkdir -m 755 -p $(DESTDIR)$(includedir)
+ 	$(INSTALL) -m 644 utf8proc.h $(DESTDIR)$(includedir)
+ 	mkdir -m 755 -p $(DESTDIR)$(libdir)
+-	$(INSTALL) -m 644 libutf8proc.a $(DESTDIR)$(libdir)
+ 	$(INSTALL) -m 755 libutf8proc.$(SHLIB_VERS_EXT) $(DESTDIR)$(libdir)
+ 	mkdir -m 755 -p $(DESTDIR)$(pkgconfigdir)
+ 	$(INSTALL) -m 644 libutf8proc.pc $(DESTDIR)$(pkgconfigdir)/libutf8proc.pc
diff --git a/dev-libs/libutf8proc/files/libutf8proc-2.3.0-tests-nofetch.patch b/dev-libs/libutf8proc/files/libutf8proc-2.3.0-tests-nofetch.patch
new file mode 100644
index 000000000000..5750b43ad5fc
--- /dev/null
+++ b/dev-libs/libutf8proc/files/libutf8proc-2.3.0-tests-nofetch.patch
@@ -0,0 +1,33 @@
+diff --git a/data/Makefile b/data/Makefile
+index f5d1dd9..60c09e3 100644
+--- a/data/Makefile
++++ b/data/Makefile
+@@ -10,6 +10,7 @@ PERL=perl
+ MAKE=make
+ JULIA=julia
+ CURLFLAGS = --retry 5 --location
++UDATA=/usr/share/unicode-data
+ 
+ .PHONY: clean
+ 
+@@ -25,6 +26,7 @@ CharWidths.txt: charwidths.jl EastAsianWidth.txt
+ UNICODE_VERSION=12.0.0
+ 
+ UnicodeData.txt:
++	cp $(UDATA)/$@ $@
+ 	$(CURL) $(CURLFLAGS) -o $@ -O http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/UnicodeData.txt
+ 
+ EastAsianWidth.txt:
+@@ -43,10 +45,10 @@ CaseFolding.txt:
+ 	$(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/CaseFolding.txt
+ 
+ NormalizationTest.txt:
+-	$(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/NormalizationTest.txt
++	cp $(UDATA)/$@ $@
+ 
+ GraphemeBreakTest.txt:
+-	$(CURL) $(CURLFLAGS) $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/auxiliary/GraphemeBreakTest.txt | $(PERL) -pe 's,÷,/,g;s,×,+,g' > $@
++	cat $(UDATA)/auxiliary/$@ | $(PERL) -pe 's,÷,/,g;s,×,+,g' > $@
+ 
+ emoji-data.txt:
+ 	$(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://unicode.org/Public/emoji/`echo $(UNICODE_VERSION) | cut -d. -f1-2`/emoji-data.txt
diff --git a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
index 71b876c663db..9e5c990c74f5 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-util/netsurf-buildsystem"
diff --git a/dev-libs/libutf8proc/libutf8proc-2.3.0.ebuild b/dev-libs/libutf8proc/libutf8proc-2.3.0.ebuild
new file mode 100644
index 000000000000..3b3b3a532031
--- /dev/null
+++ b/dev-libs/libutf8proc/libutf8proc-2.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${P#lib}"
+DESCRIPTION="mapping tool for UTF-8 strings"
+HOMEPAGE="https://github.com/JuliaStrings/utf8proc"
+SRC_URI="https://github.com/JuliaStrings/utf8proc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+S="${WORKDIR}/${MY_P}"
+
+BDEPEND="test? ( =app-i18n/unicode-data-12.0* )"
+
+PATCHES=(
+	# Don't build or install static libs
+	"${FILESDIR}/${PN}-2.3.0-no-static.patch"
+	# use app-i18n/unicode-data for test data instead of curl
+	"${FILESDIR}/${PN}-2.3.0-tests-nofetch.patch"
+)
+
+src_install() {
+	emake DESTDIR="${D}" prefix=/usr libdir=/usr/$(get_libdir) install
+	# This package used to use netsurf's version as an upstream, which lives in
+	# its own little world. Unlike julia's version, it puts its header file
+	# in libutf8proc/utf8proc.h instead of utf8proc.h. The problem is that
+	# revdeps are *already* patched to ajust to this. As a transitionary
+	# measure until we unpatch revdeps, we add a symlink to utf8proc.h.
+	dodir /usr/include/libutf8proc
+	dosym ../utf8proc.h /usr/include/libutf8proc/utf8proc.h
+}
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 5d7720cab542..1ca26eb8ca50 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -11,6 +11,7 @@ DIST libuv-1.24.1.tar.gz 1204222 BLAKE2B 8f70043702712adc336bee67141e7901036246e
 DIST libuv-1.25.0.tar.gz 1207205 BLAKE2B d524a675c236a6af935fdc95efdaf77a22506a86d309edb3535692fa5a9d8eb06711bf4687274c2d10a65640ad37ef06a2460b14b1f90084ff03b86ce7b0f306 SHA512 d1024f9193e2ad69cc670441b74ff7c63ca7d295e9a7a43c90da6781a39352687465bfe7e852d6e9085c21821bf8d11c10139c7229759fdce567d809c605acfd
 DIST libuv-1.26.0.tar.gz 1209551 BLAKE2B c4acc6716da5a4c01611dbc09bff2451536c3dcdbb17e5ca45fe2da97333d49a358dc8ca5607b8bde0b8bb4bd7a9bac76c3572ff23b6d5c97b337f133124a2d5 SHA512 c38e36d4d700090f48f9d997302968d9fe2382d21695b2d5b30776149f1739f66cd03458937a11309efe326bdad8c12abe8bf0f0e210d30cc2de4d9ab651d1e3
 DIST libuv-1.27.0.tar.gz 1214154 BLAKE2B c7181aa23df4e1a87fcbe22f96f933caaf59851defcfafe1509e09005eeb00930e994d489919084ac14496bcf36a76238ec1d0beb821f046bbfe93c4853ad766 SHA512 42dfb7bee21f3f875ae5e6e4531aff52cff59d4c000f9cee1bde1b12c127beb7adefd6d6a11c6f0180868ee5ef15351a21a36c10b1be0aa7bedc15f0c50f87e0
+DIST libuv-1.28.0.tar.gz 1218769 BLAKE2B 444881479688144b36559a258f998e99e663d856c349086f74a21c3946f8d48d0fd9ed0a7c64c76c18b47edd3df037936fd87c4d47e9ae7c5639bb6e289e026d SHA512 5f49b980b69011897bbb7a00d779fe0e71528d106626bc13fc130cd09afb7c8188007f354cd6320b1eba67f77c938ae3e83f3bd4a3ef5b9ea65a3adf51f66a53
 EBUILD libuv-1.20.0.ebuild 1167 BLAKE2B 822424c522ba27df7624d2b3e1fabb522e15865b8eb8a56127f6565da3d1ae55f519d47ddfe7cb7cecf406626487fba48d77a164a67e9d48be613cc2e36bf93e SHA512 3eb698ab1c3e9d31a90f79293a9484cf7a27e7a7945577bb241b74e6390bc4efee13e43b28de51c38c5fe3b921ca886f0ea8d26c752ea5f0437f5a4d0ab7bfd4
 EBUILD libuv-1.20.3.ebuild 1172 BLAKE2B 37ed5a913146f2009cdd6e46cb374b45a39c9928544ecd4009c52ea76472b37b1cbae576d94fe8ad75793c6a741c784c1a0a5e7e2b63e41c8772e74de772f5d9 SHA512 e7beaf019c181a4c7c28d46d87946ab328c100d6f2a199c535c47c1233facc9c1f02180771894d7bfd875a22b88646c7fc17d8450a12da1c83e96366927a9838
 EBUILD libuv-1.21.0-r1.ebuild 1223 BLAKE2B b722de91966dfb7612e4beec9e266099a83624183ae0d7b647c886e2b03d9b0de6cff5fc0e8c668db39c14adeb0469d38a2708adb7095c59c651bac3995cdda5 SHA512 e9743686b9e24773e37800b8437d58e6d1c3d6ab5fd664586d67b93b98981537ac1b3bdabbfcb13b1bc1b7b7bb0b06f8eab6d9f3b9c075da31c83279c95a86ea
@@ -23,5 +24,6 @@ EBUILD libuv-1.24.1.ebuild 1225 BLAKE2B 7a7e7f855e8fe0ac81771e5cf64dbf9886e4a660
 EBUILD libuv-1.25.0.ebuild 1225 BLAKE2B fe6dbfacdd3562385ccf2f61f5b96464c27bac6bc95f2245f310dc2668f6bcc8d891b582fcad7b5bdd16ac5857172693e2a25f3322068b9835ed87ea45d4e39c SHA512 51a45fef804b877197521000397423721c2f6a5d027c8c27700498389279406c57e6efb2561236ebe443cfc51f8198f73c0d95f2fa2e480b5eda91a22f6e52b8
 EBUILD libuv-1.26.0.ebuild 1225 BLAKE2B fe6dbfacdd3562385ccf2f61f5b96464c27bac6bc95f2245f310dc2668f6bcc8d891b582fcad7b5bdd16ac5857172693e2a25f3322068b9835ed87ea45d4e39c SHA512 51a45fef804b877197521000397423721c2f6a5d027c8c27700498389279406c57e6efb2561236ebe443cfc51f8198f73c0d95f2fa2e480b5eda91a22f6e52b8
 EBUILD libuv-1.27.0.ebuild 1225 BLAKE2B fe6dbfacdd3562385ccf2f61f5b96464c27bac6bc95f2245f310dc2668f6bcc8d891b582fcad7b5bdd16ac5857172693e2a25f3322068b9835ed87ea45d4e39c SHA512 51a45fef804b877197521000397423721c2f6a5d027c8c27700498389279406c57e6efb2561236ebe443cfc51f8198f73c0d95f2fa2e480b5eda91a22f6e52b8
+EBUILD libuv-1.28.0.ebuild 1225 BLAKE2B fe6dbfacdd3562385ccf2f61f5b96464c27bac6bc95f2245f310dc2668f6bcc8d891b582fcad7b5bdd16ac5857172693e2a25f3322068b9835ed87ea45d4e39c SHA512 51a45fef804b877197521000397423721c2f6a5d027c8c27700498389279406c57e6efb2561236ebe443cfc51f8198f73c0d95f2fa2e480b5eda91a22f6e52b8
 EBUILD libuv-9999.ebuild 997 BLAKE2B 1d82e7c3acd3715c580dda78f0aa6db97f217cdcd1dd58ac04963e43dd077cd62c798e2d676a098c69471bed2b4d035a63da335abe427762097de1bfe947e624 SHA512 d1ad9a68ce54465945cb795d28312eae4615e839889f8a7dadfa6ab54e580925c15781d00fadc99edc8d3dc5b54d18351df17b1de096fe97ab06bdae21fd9870
 MISC metadata.xml 1337 BLAKE2B d054e429ce7e3a6b94910693123645ab6dbfefcb8921b37b57ae156aeb5a25a4b100b45fe6714c498a355015dc3cc37c98852a14be651bd3f55259b8ab78e2dd SHA512 dba39812f31549539955d26ab8e281b4a1a372b8b41f29e68f0ae63bc10d18df5eef106936b31a13344cc11705192bafd4b32a0aca1f16e7927244ad049278ca
diff --git a/dev-libs/libuv/libuv-1.28.0.ebuild b/dev-libs/libuv/libuv-1.28.0.ebuild
new file mode 100644
index 000000000000..6fe68c68f88e
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.28.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	# upstream fails to ship a configure script
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index b9a7b75f7e4d..3089c9e8cd75 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -3,5 +3,5 @@ DIST libvterm-0.0_pre20171004.tar.xz 618644 BLAKE2B 07ca64652e09825b5ddf644b962e
 DIST libvterm-0.0_pre20181126.tar.gz 65524 BLAKE2B 00ad4cbc60739aae173e86ae7aa357869f815658c3c13e04808841e5e1e847732046e212153d4e4d49bbddcd5c661cdb7f7f962e6fd0a305a534bbca074a4ca6 SHA512 9f55c9a00807e46c1c6157fc372d3cad575f2574ac8b3abc82acd26ef6425166ac18ee1b7d77a9dfc617b14bc9eb7dc3a364cef5c0bf6c4951dc755d9c6c5ce0
 EBUILD libvterm-0.0_pre20160305.ebuild 763 BLAKE2B 5eba9e60a96c6197e0630c4f324f1fe4803ddc24c5e0a2113fe48e3135e7b3dbbc22f3cd7be57851f37e2484516e044c42a623560580281f3e33e3f4f0e5321f SHA512 b3314341167cd00f0e849e566da865acaf84644f82b0370a87e25b5f1384919b35ede81d65ce3fd30302e294c0beeeae1dec06ad324ea886bf83596cf4ba4644
 EBUILD libvterm-0.0_pre20171004.ebuild 765 BLAKE2B 36262c4dd36157dccd571bf3218573fb802a04e71061676b8f8aec4238bfbd54950e555e234cb5f100461ee196befc584c69b9d5b705a4c8740f109047380e2c SHA512 d6fa75efa138639ade62b6d3ec37e0e1d6a36e8ac5273e7a4c0f12cb4bd29feae154b637c5559e5e5fd7088f2358a2d76e8d2b3c871d2495022568b9d25c7146
-EBUILD libvterm-0.0_pre20181126.ebuild 775 BLAKE2B 09df9db35c58476dca6d33cde26aaa5c5f0e067b70933fe2d5f9ed85ca44915a229a586330ca798aad3abd3be71024a2cc3b899378e2f62cc4b2da2b586c845f SHA512 55a59b3fc7a8f072e8e4b234e06ee9c66f30fd3d0e52e9341805557632e2959bec098cbd65efe7e05c5745607e4f9853c3f944ceba56b2a937efa6e4feea1c4b
+EBUILD libvterm-0.0_pre20181126.ebuild 780 BLAKE2B 974ac0ab87a5b20ea74e4e89c7e95eb4edacab0b31051419382ddc8a824719cbfdc6304671f717743222fe309042e24068e3031180cb2a1b1183b175f2cc8b2e SHA512 42124f47b3762de058b07abec156c8991d84770d1f6f3c123e98b2a6bddef12921d301371ecd3f92742b17f92edab474f62809a2ad430c32871ac0049bbd0a55
 MISC metadata.xml 255 BLAKE2B c3c51ff357cdf3ea565d7f4bf7cb236342061e471b67eacc0a436c26d52532ce7499657a76fc92a845321318a65f9eb877573104341ddae66dc3a554a35f7362 SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167
diff --git a/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild b/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
index c636c41d4ba6..387a458e471e 100644
--- a/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
+++ b/dev-libs/libvterm/libvterm-0.0_pre20181126.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 DEPEND="
 	sys-devel/libtool
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 59c81ca38527..fe8c959b22a1 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -6,6 +6,6 @@ DIST libxml2-2.9.9.tar.gz 5476717 BLAKE2B 00a67c38084f2effd5d68d7d3e68f0c96cf4f5
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.9-r1.ebuild 6790 BLAKE2B 562853a0e03d1fee849af5e0bc46135eeecf70f993afbb0ad14436a37f3e2bf005607ed2e611ec53ec16cbcba8c1182887186c10e32ca1d3c379fe7d740ce732 SHA512 7de83e6a9e712a282b7659dcf53b9a094d972556dfe1a3de8cad3bed637f3c7507dcc923970566ba6d53e96b37c71e7af9bb8c8123bf8442bd9b8028a55e990e
-EBUILD libxml2-2.9.9.ebuild 6533 BLAKE2B c7d5198c45ae47005315b3fa8f7d266e5427d67984e03a458fc4702b36b8e8fb126920b8f117d2b3def425ce14a6946cc94a9388ad3f16b06372e599b61a625a SHA512 0c04c4aea4921da709a4f3f63c63c5e45d3e52a3b1380774e2dba0e1c2a31a7ca8981d1b8be179c4c8784d2bcf3018c44a94a57bf183e896fb5fff21e937686a
+EBUILD libxml2-2.9.9-r1.ebuild 6788 BLAKE2B cafeda4c84faf8efa729f19ef3c736db790332590c14f3f560094fd4bd06df37baaa29e37ad07ecc3709d4b3f8ac6330b483c55cecb93b0883db3b81cad4f349 SHA512 8f17411a1332a1c7501788ccda90b8ecaf3a2fb836d7ca0116189c5975a9fc9caf758f48445c7eb0c86bf22c365737d15222f0f20407921a823c61603a829a16
+EBUILD libxml2-2.9.9.ebuild 6531 BLAKE2B b4b9d5c06f04316bb31aca3aeb1f60a9c0ae045ecc9e04d863c517120c4dbdd580c5bb7d88e85f16cb63b0f8a8d0751c5d9df42bf8fafe6a3af185292149a11a SHA512 63e8a73380c3a1798af17075f9e5ff5821b53b4d3e782dbf51dcca6d604ef8315b3fc3b5f6d3bffbb0336d4418e47e5f4c220d4798cf20042dde8cd766924f7a
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild
index c196e26a2848..33dcd02e5ce4 100644
--- a/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal
diff --git a/dev-libs/libxml2/libxml2-2.9.9.ebuild b/dev-libs/libxml2/libxml2-2.9.9.ebuild
index 424522b36235..577d8feba4a1 100644
--- a/dev-libs/libxml2/libxml2-2.9.9.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 PYTHON_REQ_USE="xml"
 
 inherit libtool flag-o-matic ltprune python-r1 autotools prefix multilib-minimal
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 51c267d8889d..4a0db599635d 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,10 +1,8 @@
 AUX libzia-4.14-ldadd.patch 548 BLAKE2B 655b2d21e8c5a90c7559381ed546df0b661b2cabe9880eb78bcfe7a0d35463f064d078c396c0bd261ad476a131a4f6e16a9eac73a8408faff73d85aec725edf7 SHA512 3b7820de0dbda89ad571b6a98b8fc601c289fcb9981586a63391c9de6ee9eb9b71cd4626434b2c4341fc9155e183c5da6a292cc61327600312e122f99a662dd0
-DIST libzia-4.11.tar.gz 577185 BLAKE2B 80de10d5852742870ff7a7995b743eddf76a966695fd7ad786537ed4ad430b60a88b2f5bcb74fb41ecd01a84f02e126a0bfffa932761cb8bf73bbeb097cca181 SHA512 6d616ca12e1db20c8bbbe0a18b4e1e0ce1b086b38123762c2e4c3f46390ff5772dd27eb9b97b332b20f3430905f6eae0fdce70aca48fd56d5e43043369233964
-DIST libzia-4.13.tar.gz 583226 BLAKE2B 088c199c188fbbee54ed533565d3509a510db5f1d3bafeb1be76cb6b2f38d40244fe768ccfa2ee62aaba856ffa7b890dc6d5ea20ec7e1289cbce609d5a56b476 SHA512 b1dc294812342d8c4cf34b013d26c3e8d56da924ef22991b47bdf5ee18990e006a7cd216e9989a6fb3ffb3cb151fa04d5aff7707a7541ec7125b39a6f17eb80b
 DIST libzia-4.14.tar.gz 597138 BLAKE2B 200e0682c6bc28248646775c5e5a71bad329edf031d0950ad8ab5244e5e925903147467d23eb3a04f9be05cca6b34947692df15620331ffc5357b73f20d363b0 SHA512 c382ef352e80df69daf3d3e4da0c0de5d8037b32182a760f88a1edf7d2b9cc7d5112de942a5a85973ccf82ca1e0771c2e92de7972ff9bec745fdb525419a2365
 DIST libzia-4.15.tar.gz 600728 BLAKE2B 7e359a09c9e440c65fe369a8ff9004883ecbc047cfa4995e671c74662f9658370e0e8f613e626f9480abb9fb6d94e777bde70b44d080d45f4e17b1f982c48237 SHA512 041e21e1506b4cc38a0b9a5fa07037de01d19a390b6ba46159688b2bd7c75c44faf6e84d1ec929a582a2c8038c60f986d6d172636b5e9cb1b2fc5a729ec2225f
-EBUILD libzia-4.11.ebuild 707 BLAKE2B be3320d6589dfd6a561a6809febe80273e8e312da0c01b2d42c853e99b1b47b3fbcc64ea5ae66e5b7212db89fd0516ac46a3aa06d13c1b6c67a243ea22116005 SHA512 8c6a1b708ff15d1e2bcd88d5179079110292e067e7b2901c6d7db4746fb0fa8ee3572ebbbe3b6f48b6844f8ecaeced13f55928f6c11953a5722268f9414efb3c
-EBUILD libzia-4.13.ebuild 709 BLAKE2B 3818ea32c4f00fd2457d1507aa9830efd17c24e15bd38b0bbfcf5ef5d4fbb12ff6bed0ec2252fbe9d8813b27091f24846064479cc359b7baf431205c9970e13a SHA512 f0a1b9b019217baaa60436057eb91c80715e760f9fa9dacd0948a24937b7aafdc653be0f7bf9fedd336ace4c9ca6e6611ed4ff90f2fc68d8ac247902d1cf1035
+DIST libzia-4.16.tar.gz 623606 BLAKE2B 48c5eb65890c87ed48bfaee60a6683f5320c561c8f6bf55268690675e388aefeb52e229c16430b9ff04b8ae29749e52beb71ac7d7f0642f4fa255e1bef85b452 SHA512 cbf0e678abadd670acde1778dcb137a49ad11f8e8d8d8465ebac542deb964e1c138b65ebf61404ea0219e17cdb336585545eee3f63d4e0ac41bffe0010f2c2fb
 EBUILD libzia-4.14.ebuild 784 BLAKE2B 2073c5504b41ee7f4382dc902111d5058eb39cc58c8578b099e1db5d2be5613e331555e0fdc305344f4f1d2e20ef15721c7990264f48e3fbc39d8dadd42c9779 SHA512 9f73df3eee5f7caf277e4b9394ad1b179c11e00c9d7254c9707b85c74944cfd3f7037ccb5419a217df9fcfbe77957c4cee4c2421db4d84196dcae5427b65ee7c
 EBUILD libzia-4.15.ebuild 721 BLAKE2B 1be77624273a7846fde4dc163881aaba00ad0151d65294467b977bd3b90ee4d452213ced91a157764e8e1829f73b6b26d4e0c5d729c727ff89718bd862b1fe8c SHA512 c57c9e58e59cf7961022861b70f0b360bb07af7bba838878545153a0896157d5b67d4424af098ab11293b325c4e5501c6882ff2a7177635b17e6be1695e12158
+EBUILD libzia-4.16.ebuild 721 BLAKE2B 9bcf0c0be20ca59b6b89f08dcdf8bc6a890bb96dfeb5aa191e0fea07fd09f58383d23027888c5523b30e1305f299c9c1266ab9d120413861abdd4b59f84eb8ba SHA512 1cf2d7599df0022e2165282e140ecbb298701441a9e8d34ff4b6a8684e6b8bad079a738c48411b14aadccf093708c8df68dcd0d43ac324cd54b7502e3a8b5762
 MISC metadata.xml 451 BLAKE2B 539464597b5fcacdf3701b1400a6ea8725e46164b768c129d98a0ca37e1edba4c90c619ff7138988cbcf0136201f723327d1fe561179181a30709e2977730255 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773
diff --git a/dev-libs/libzia/libzia-4.11.ebuild b/dev-libs/libzia/libzia-4.11.ebuild
deleted file mode 100644
index 0f89f3df8691..000000000000
--- a/dev-libs/libzia/libzia-4.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="platform abstraction code for tucnak package"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ftdi"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	media-libs/libsdl
-	media-libs/libpng:0
-	ftdi? ( dev-embedded/libftdi:0 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eapply_user
-	sed -i -e "s/docsdir/#docsdir/g" \
-		   -e "s/docs_/#docs_/g" Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ftdi) --with-sdl \
-		--with-png --without-bfd
-}
diff --git a/dev-libs/libzia/libzia-4.13.ebuild b/dev-libs/libzia/libzia-4.16.ebuild
index faa975e860ad..89fcf6a119f7 100644
--- a/dev-libs/libzia/libzia-4.13.ebuild
+++ b/dev-libs/libzia/libzia-4.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,10 +22,12 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+MAKEOPTS+=" -j1"
+
 src_prepare() {
 	eapply_user
 	sed -i -e "s/docsdir/#docsdir/g" \
-		   -e "s/docs_/#docs_/g" Makefile.am || die
+		-e "s/docs_/#docs_/g" Makefile.am || die
 	eautoreconf
 }
 
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 9bf8640e7707..a004bc5ad6fd 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,12 +1,8 @@
-AUX libzip-1.2.0-fts.patch 393 BLAKE2B 1d158551eceda9f4b6f305ae1c1c253ca85de8f47e10b568d267ad2f1a5a271cb43c35a2a929477c9fc2a723b797b0a7cb4fdf1103eeb9c006db06820948ec04 SHA512 ae3fbad5122a6d4089db1bdfaa11882e5e5f5b7f17d13dc24b17c178236167ce364efbe87ef28970ddd5fa262fd8dc48b5a92e091a365ff92e39254319f79a89
-AUX libzip-1.2.0-headers.patch 341 BLAKE2B d4a0227da9e3415f4372f6141071f2e070f0b14256dec7933dea9cdbd1d54830ae886a89a7984dd8c66e8d523e18a9070336b1a42b02426e6678ee97f742cf28 SHA512 25a54a4901e45d78263c35ea788c9ae84760c4e2cbb7e09f0dd33b35eefb47165a1788ab33a7f306d112ffdfa35a3f3ab65c1f50463d5a30ffd265a2be6208f9
 AUX libzip-1.5.1-bzip2.patch 1861 BLAKE2B fdb4734858512718079af900ab96ba1be9664e2d5def086c44a52eba256759dbf733acf097dfec4e76e1f20aecf60dffbf7e7ef21c2e8a51b634c08678ea765c SHA512 af66da5aa509a3dfc47c0d456d7b462361847f68d5abe3aed7d33f52165a7e0fd0eb2d246e05bde1e47669f56cac5a85eb3b5aecaf8a83196e6297ae2175265d
 AUX libzip-1.5.1-options.patch 1297 BLAKE2B d2394b095b59d484269bc29cbbb311c5c58564dbf715c131874fc4b76649bae909c0a1c5509d9b2d085aabb9c54ace50e3ea65fa2494e584e92a6cfef68ca0b6 SHA512 41a1f8f33e485f0e5b63ca899aa4feb3eab121f7a19fa67821de7aeb5499810ae998dada973dda375e247c978ad1e5769c2080d91394ffc1028921712bc42b63
 AUX libzip-1.5.2-mbedtls.patch 707 BLAKE2B 1905d00a6d8185cd5e6223b9ec6e82ffa5bc910522e38dd05546c995d90d5377cd0419666e4b724448cf6d38110faa640191d98b06bbe08610ae947340658f0a SHA512 e8af90b4559df0a6b2c8d0d1b7797833d0f59c4827082cd5dd8459d57ac1557249030510dcdad5f31a84a99cd79e30bb7b9293b1f19303be750faa40be2892cc
-DIST libzip-1.3.0.tar.xz 955876 BLAKE2B 9bb59cb34ed7e85e3161770f0eef7ed1f59fb2f7f648cd201fa5dc6c62339481ad72a71024df443c04ef0c7efe6f00838a3ac316da2ef06c0045ab69ade8f71b SHA512 8e12a23fe62b993ff4592e1b9da152533a363b0603fc1f65e6cbb6121d4260c45f98171effbccb76dec4030b0fcdcd273919755a2496ab462431646ac83bb900
 DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d
 DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643
-EBUILD libzip-1.3.0.ebuild 1035 BLAKE2B ddd93eedf9092234100990f5fa22689819ff1b8d906abd75318b8694816c60bef575788290666ed7d39c028b2c5492e02da42376f43c31ae4255ea58f61032ae SHA512 01795236335f9f2b97f2deda5dc4b2be04efcf58e93c290526e675435b27b530510677e0858b86e3070a299221e94acb394d45095c81b2c8b54fd3174a4ed443
-EBUILD libzip-1.5.1.ebuild 1903 BLAKE2B 7dcbc94b2e7bd9e2f85c44274052b7ebf28655f681900e92b9de05685b269d6e2b94079799c659f0448c478318397001267ec5712e4481a1cea1d3c59790d608 SHA512 78fe6cdf6d2a001c03d86b2384b9839b848f8c14211b38ad0261da03636f0719b841a845acf6cfb6e63b9c867cf45002c1525dfc6a03ecbc4c55763523d6d33e
+EBUILD libzip-1.5.1.ebuild 1902 BLAKE2B b877e4b304f3047f326a9c6d316412615fc7cc10827bf4bc4d9dbf3888e52f3b1ad13f97cf25d1ec7b1067530be1a9e9957870c4aac7aab62c40ee58e396550e SHA512 db79cb9cd92e33bb7500a7cb336018babf86726af2b8ece56da12e75f129eafba021f24de7486ec9cdcffa5d910b6f8650200151188344864b6311aa7e23083b
 EBUILD libzip-1.5.2-r1.ebuild 2287 BLAKE2B cd489ff9474e34b75a1df7ec33757bdaa4d7fb9af8fcf05478457cae249c7a50488274b88504145548d78dcbba787f49b1dd399be85a29bf6d6fbd6df1eea8fd SHA512 7e5b7aea06ecd54984bf54f79ebefc5e03d210580395f1acad093c87fcfc859a746a4757e1f21b2553902cf1945498b60d6cadbc549f48faba796a79ab14ffb2
 MISC metadata.xml 440 BLAKE2B a69b3d641d9262e897f015c91fc0a4aa7a7cecc73889d24b479101674f2de16825844c9ad6c10e42968a22279bdfef71b839f50289aab5457efb0164ae5fd1c3 SHA512 737e1fb7de749b2e38f5642dff624daf6521183fa974f9cc2831580aaa1b8532fdf8725ca3166bde8ef8faa492b8a2298f542fb8bd15d89b1ab983885756282d
diff --git a/dev-libs/libzip/files/libzip-1.2.0-fts.patch b/dev-libs/libzip/files/libzip-1.2.0-fts.patch
deleted file mode 100644
index bd9bf232c0a8..000000000000
--- a/dev-libs/libzip/files/libzip-1.2.0-fts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2016-05-28 10:35:31.000000000 +0100
-+++ b/configure.ac	2017-02-25 23:34:22.309684397 +0100
-@@ -65,6 +65,8 @@
-     AC_DEFINE([HAVE___PROGNAME], [1], [Define if libc defines __progname])
- fi
- 
-+AC_SEARCH_LIBS(fts_open, fts)
-+
- AC_CACHE_CHECK([whether we are building for a Win32 host], [ac_cv_win32_host],
- 	       AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#ifdef _WIN32
-  choke me
diff --git a/dev-libs/libzip/files/libzip-1.2.0-headers.patch b/dev-libs/libzip/files/libzip-1.2.0-headers.patch
deleted file mode 100644
index f1a6d5d0819d..000000000000
--- a/dev-libs/libzip/files/libzip-1.2.0-headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -3,8 +3,7 @@
- 
- lib_LTLIBRARIES = libzip.la
- noinst_HEADERS = zipint.h gladman-fcrypt.h
--include_HEADERS = zip.h
--nodist_libinclude_HEADERS = zipconf.h
-+include_HEADERS = zip.h zipconf.h
- 
- # also update CMakeLists.txt when changing version
- libzip_la_LDFLAGS=-no-undefined -version-info 3:0:1
diff --git a/dev-libs/libzip/libzip-1.3.0.ebuild b/dev-libs/libzip/libzip-1.3.0.ebuild
deleted file mode 100644
index 14b5af8dd184..000000000000
--- a/dev-libs/libzip/libzip-1.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="https://nih.at/libzip/"
-SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0/5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="bzip2 static-libs"
-
-RDEPEND="
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	elibc_musl? ( sys-libs/fts-standalone )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS.md API-CHANGES THANKS )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.0-headers.patch"
-	"${FILESDIR}/${PN}-1.2.0-fts.patch"
-)
-
-src_prepare() {
-	default
-
-	# fails in portage build only
-	sed -i -e "/encryption-nonrandom-aes.*.test/d" regress/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with bzip2)
-}
-
-src_install() {
-	default
-	use static-libs || rm "${ED%/}"/usr/$(get_libdir)/libzip.a || die
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild
index 68002b6f0c2d..c58ae4a73832 100644
--- a/dev-libs/libzip/libzip-1.5.1.ebuild
+++ b/dev-libs/libzip/libzip-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bzip2 doc gnutls libressl ssl static-libs test"
 
 DEPEND="
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 19d42bb56b98..bf430df6efa8 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,4 +1,4 @@
 AUX link-grammar-5.3.9-out-of-source-build.patch 2541 BLAKE2B 6b60a65bb39e628f8c555dce20410872a4dd56d27402e7bc939d49483053cf84199f3f5bab495c16f734b4b6662b467b0369cda4dc852a39568f27b68c0f14da SHA512 340a03c31ed94f53b00622bf7f925d8f47c658ec81843f0139deb5b38074f346ad4d65dc49653cccf1b7b49966c77029ab64e993d113e709e75ebb930448b8f6
 DIST link-grammar-5.3.11.tar.gz 3632617 BLAKE2B 07fe951743096a0d6b906c9b7174b58fcc54b0e2c54805d15731de783888327799fd77f64a2ae7f4e09327feb08d91cb95471e9c0c3c2fe00fca3553f40b1905 SHA512 09671d187deac3b9530dd63eb4497de9c2c9db32d79da06c677bdbccac015adef06813819692a92d15499c7cb347071c58b73c52505af154bdc8a8fcd409ddd2
-EBUILD link-grammar-5.3.11.ebuild 4024 BLAKE2B b829dc3a3fe7beddbbc9be4a723f755e8911a024cc16f0aac8b8d52553f80905b3215422d99e94bf69367de7998bc05087bbb6a0eba1755abcae5be50f30894b SHA512 07e9dea2a62c8f8ffa10b7a5aca0d7b1e9b5943881c153b89cd99802e0998588f833dce05bdb8616fc664a7f1e99a62fb242e126a65955c2d7a11d0a2c5e85b1
+EBUILD link-grammar-5.3.11.ebuild 4017 BLAKE2B 7c1fdd869ed0fbe64866945229e9851e4366d71c41ea10bfc2d788854099b1d5e924f599dfeacb9d33337f518a8650ac841726d53d94541fb795db236b2e67e7 SHA512 17ccb7c93be00003c5a0586dd8df907c112bacaa201e1391e5c2e81b6f3201c3b9dd39ebf74d2e26e35c05e77b1a42de1cff1dbd4e31a40d25b2c360a5610cce
 MISC metadata.xml 963 BLAKE2B ebe0a68ad3a8fee0aa3d112f152e306d691b73e6969bf1fb7026edbdfb814fa1476c2e7d9e8ff9051e5920f9279acea871fab85da58ff8642ec819b5a4fbb57f SHA512 d53e9c7867629e8caf488cef531e258bb2cad3fcbe458e80024b0292fe90148656a77069c45f42e782ba473daafec5cf1fa93e9be00571ceefd21bf59b0ea5a2
diff --git a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild b/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
index 0866e0eac7f3..56368f232027 100644
--- a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit autotools eutils gnome2 java-pkg-opt-2 python-r1
 
diff --git a/dev-libs/locked_sstream/Manifest b/dev-libs/locked_sstream/Manifest
index ab117a84cb49..7021a0573a32 100644
--- a/dev-libs/locked_sstream/Manifest
+++ b/dev-libs/locked_sstream/Manifest
@@ -1,3 +1,3 @@
 DIST locked_sstream-0.0.5.tar.bz2 98277 BLAKE2B 096c215a5b64c51755505be9e45b5ccfff8a08d6a2d301b1501960a1b7f111b245f91d0200f80332109f7ca7045cbca625f0f3ab1d04bc26191e0c13295e5209 SHA512 5d136c2e1ac5b1eabd07a8048715f47881662ce7a3bfdc2460428f34ab51b0474327b2f28ce6ba2f4ac9774478abb20082af8f954ebb1c4653ba24ca82991c32
-EBUILD locked_sstream-0.0.5.ebuild 591 BLAKE2B 231862ce1b35f12f2e1cb563d4335c4665adac604578a55e7044cfa0d011ce1f617e1e2adddb7f5ac69a667a8f717b7284d1bd3d0275ad1626ecc5f7f9a62751 SHA512 a28ee64c9bedf9a7e246df90c6b04744ea0d31be2d874c50998be1cca632a3330b07effefc02e7f8f71eb3b084a90e5070d79dbc74b23b1e748e9128ceb946be
+EBUILD locked_sstream-0.0.5.ebuild 580 BLAKE2B 6c276002a9c7780e8b1de21ade53a444248c43f6f53b76ca36642f83db877689ebd5855de1066ef4556cef12bb0c58bf76700f6957c7af24e454e261ecf832ef SHA512 8d5bb06c66afea38bfa34e9031f7197073feef879e9eb4d5d2fd51c3a7a8a000a143391d20ed85a2c25ad299d12afcfdf5defdecf8abec227de37c85e2c2841c
 MISC metadata.xml 478 BLAKE2B 092f58c58c5811f2805205532fa4def4341e9a461532d894b769321a9389ac08d197e8030675ddb7891a2095839b3584ecc90de041d88bb3cadfaf404dce0c14 SHA512 4baad1194dc2e3eb059a466b2974b28178f41c691cf42ed498e1bf8629ee4c03742f59455dfdf2b4e72af4c75220a7f51b1f60272a3b5c18d6a2b29051073376
diff --git a/dev-libs/locked_sstream/locked_sstream-0.0.5.ebuild b/dev-libs/locked_sstream/locked_sstream-0.0.5.ebuild
index ad4a819e4c51..64efb28d1858 100644
--- a/dev-libs/locked_sstream/locked_sstream-0.0.5.ebuild
+++ b/dev-libs/locked_sstream/locked_sstream-0.0.5.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit python-any-r1 waf-utils
 
 DESCRIPTION="tiny C++ library which wraps std::stringstream in a mutex"
-HOMEPAGE="http://carlh.net/locked_sstream"
-SRC_URI="http://carlh.net/downloads/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://carlh.net/locked_sstream"
+SRC_URI="https://carlh.net/downloads/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index fbbd3ea9c984..7b95c4a2cc84 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -5,4 +5,4 @@ AUX log4cpp-1.1-automake-1.13.patch 242 BLAKE2B 17ac8a6529025edf8f46109906ec2bb2
 AUX log4cpp-1.1-cmath-fix.patch 206 BLAKE2B 7caa58dcb66cc184b1f88a99ea6c6c0d21233c9bbd9b7da6727f735f73c98849c0cc95a3e90913847805ecbc1bd84ee56436d3fed6736259251e1c94363f436f SHA512 926e10166d162863c6c1774ce3a6e523a27ae999df68f9423c2ee94042152078d931eda77b07c323890850918832396a3603c3a9226310af90cd3946a7de7ffe
 DIST log4cpp-1.1.tar.gz 547676 BLAKE2B 3fee8e575b404215d308a0d6c72feef612dcfb9c881c97500937d1a94d1c435108a24ae1ad20f19cedb1613735c22a37354226699fe6cafbf6d23dcd12668271 SHA512 e1a723641c75a0b7f9ad2338134b327cd9a0a1bd67ff76bca726389ad76e8ba0ee5a95abe6f29e05a77980255dc08b0aa5c906395b0a0ad094994c9e450e3ecb
 EBUILD log4cpp-1.1.ebuild 1180 BLAKE2B d2479b287b38fc15721b40067055239de919631624c61f969ae4b7cf42ae493d95e3480ec850eae0f1add7bae2aa421c00faefe4486dc2f16ec29915e7b50e5e SHA512 759252ba0fe75e6654980f45ec40474dcc5105b302545bf299f4918b39570d19e2fe6b57c0f125c7a1a18d1fcee9ffbb8c1bb0fa8e69418b002bd57e17136382
-MISC metadata.xml 326 BLAKE2B 5a3581c83f878d7a0f3c9426a9b66b711087cf6d4234e7e9337108c148ae808100cfb54864d7c7db6ea951109bd8c178dd42f676e14c804e5620e1797e2213ad SHA512 007af73e5317d5cb942a532e2535e1b6a55d3a39300706eff6ac9d9215e017a3334dde7c2608289ccbbfc020bb7cea1ba75c4670d5770d4d63128cae902c81cf
+MISC metadata.xml 244 BLAKE2B c211d7844d07df7225f7396d520699eb92a3d36a24a42153a7e736aa91ec766fef9ba07b120f90fe0ac295a982123259d294cc7a4cda1375c52e5d55a938e41c SHA512 0adb9b66d52e83eef31fe24ba677684835d998f9cf88054128834a3bff80878aabb6b2b8209f1d34f3e91b4d9c615d632d58c86bcb6fba38c85dc33c05d950e1
diff --git a/dev-libs/log4cpp/metadata.xml b/dev-libs/log4cpp/metadata.xml
index b58010a3de5a..dc3d0de5eaa2 100644
--- a/dev-libs/log4cpp/metadata.xml
+++ b/dev-libs/log4cpp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">log4cpp</remote-id>
 	</upstream>
diff --git a/dev-libs/log4cxx/Manifest b/dev-libs/log4cxx/Manifest
index 07c99e5f032c..8fd8a63b51f2 100644
--- a/dev-libs/log4cxx/Manifest
+++ b/dev-libs/log4cxx/Manifest
@@ -4,4 +4,4 @@ AUX log4cxx-0.10.0-missing_includes.patch 1554 BLAKE2B 9eacadeff4a26cf7eb97c9b4a
 AUX log4cxx-0.10.0-unixODBC.patch 2989 BLAKE2B 8314e9777d41186e21bf7af1f2263a0461ec469af0f63ebe2b3a0787f88dcab4800342d3c707c89f271c92e966df3781ed41ace34211d158350b325743242a3f SHA512 8f21778cb797750071a5db025d50ef580c64ff9e634e18fa6b7d90082bf842f4470fe5996cc0dcf2cece6c8c0c4d5e2aa9852ff596d0c5d4ba6a33be8eb3f651
 DIST apache-log4cxx-0.10.0.tar.gz 1667425 BLAKE2B f753e1ddb1f2d7abfca92e60883752acfacc0491aa93cfe0ac26c12b32c1f6406df7be2aa83b65a176671debdaa67a69d68af6cb7901cb626eee572425de40c4 SHA512 1c34d80983db5648bc4582ddcf6b4fdefdc6594c2769f95235f5441cd6d03cf279cc8f365e9a687085b113f79ebac9d7d33a54b6aa3b3b808c0e1a56a15ffa37
 EBUILD log4cxx-0.10.0-r1.ebuild 1517 BLAKE2B cc6f48b3358b284d1d65a480ddd75003cb1be0ef48c1c9c6de088d77f60286cf6923e3bf91c472a96be02a2c415e010695266bf4eb45d6250d57cd2e1b48c7b2 SHA512 8d66d390ab020b5779db11e1f31cacea7a7c9da9b280b7b9e7a6f447144bf39c212c15f9a7e78573f20ed27708d9829d09d20f19d73e5870566cfe62ada2784a
-MISC metadata.xml 339 BLAKE2B fb2eb2d5b1b407bc703702f1f6022ac328d7e6050413993ca8e32947733a5432043b444ba97c24d9b5a7aea005b44b0c4bc0add2fa039aa329a6f39ba45ca77a SHA512 3e9f3f2506d640e264c827eea141b7ad50dd81f8c8386323da1c77db5cf152d76d45aad8103315a0d2ce347999d08df7128ca7d641a20fc39bd5ac608f532516
+MISC metadata.xml 258 BLAKE2B cf93caef61cf1a9150eb415d7449132b91513df5484adbd3865479cbf7b9c9dd51bff52faa129b190a4d56dd81c6285c9a58633dbccd9ca0f82a9ecc79661a80 SHA512 99d78b7a141de786112b116d0f2bcb6aa272e250c7b866b8f447f0aa778157910f0f491b79c36c6ae1a6326ad988c1e6bc9b704d8f9133ac48563c1dbe3f031c
diff --git a/dev-libs/log4cxx/metadata.xml b/dev-libs/log4cxx/metadata.xml
index 28b539fe62c2..9113d9e78cad 100644
--- a/dev-libs/log4cxx/metadata.xml
+++ b/dev-libs/log4cxx/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>cpp@gentoo.org</email>
-  <name>Gentoo C++ Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
   <flag name="smtp">Offer SMTP support via <pkg>net-libs/libesmtp</pkg></flag>
 </use>
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index 1093a76afbf0..7b64705c103e 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -1,4 +1,4 @@
 AUX marisa-0.2.4-python.patch 683 BLAKE2B 5d26607877b3f4614a558d085de11360783d2a448749e7a7fed2ac805e4b6dc5d4b89c29c37fe70a34cc4745789b9ff93b4f398860d8014303a4290bbd1196c5 SHA512 fa718a385cfef196833f5a9aa23c31839505a0101df3d25a73616942845668891f818213b89a36689ec93e678289128add1f6450e15fb995233621faaa76d700
 DIST marisa-0.2.4.tar.gz 502552 BLAKE2B aa8e6ce11c35db41f386d1c5d3ffdf56a940f298e10a7f6b1fa14cb80c27c9c4af1d4d61c58786f96e9598effe26379127c69b8fe72b1ca561a44ee2b9cddc61 SHA512 71aee3ae034d1ce725d986bef43472d61bd64f0af3ccda01bb019cce03f0872629b6a1b305e717056bef06e036372323b2a67e5dc69705d6a74e028b5e2553e4
-EBUILD marisa-0.2.4.ebuild 2308 BLAKE2B 1ded7f2a44a33c54e4c8994409d553d594678d617f8367bebbdcfd5fc8193f7e1467cff6360accfd1147318122528df78c596f0deb0da5b48bb8dc2aeb534d24 SHA512 e0dabeef8c8c8d890fbf46f2a990a6edfc2bbe3624015747ce6113e10bd540209c778d15ecb7f8dc5314acca9912ab13bbfe5b97ac9aa6ec4c6282a2a71f0b75
+EBUILD marisa-0.2.4.ebuild 2301 BLAKE2B 36503a5be3237cbad96a89c94add4914f267abe056f1d589ca2698b2b0acb83c5aabc09eaad94823b29ba6aa155d664e27ee69d5f599068c7785d4559c65d7ee SHA512 3ec8cc3b668c1d50de74d73d1807c4acde5685c5a53d8a3d2c3580631d0ae548fd5a923f8757179e988b7eb473e0be5121e4344bdfcc439efaab6644b1d5c660
 MISC metadata.xml 317 BLAKE2B 16fd28ba01ffdf67af29ea7f6b41be190ecff6ab88706b0cb04b6e9dee5a623087652e666af02cff1c3ed3bd4b42f252adf5fce1b08c2eb9a998e8c112dba922 SHA512 0e782fba322f87cfc0f180f812d0e33630c4295df1f434d497aba1a7f9d922e9674a3c23a821211cbe11d419eee70c25dbabb7508abc7bd56267e9648a1e721c
diff --git a/dev-libs/marisa/marisa-0.2.4.ebuild b/dev-libs/marisa/marisa-0.2.4.ebuild
index 8f2ea0a1c7e2..365ab5407b2a 100644
--- a/dev-libs/marisa/marisa-0.2.4.ebuild
+++ b/dev-libs/marisa/marisa-0.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 eutils
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 7c291970b08f..3ebcf0447be6 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -5,6 +5,8 @@ AUX mongo-c-driver-1.12.0-libressl.patch 637 BLAKE2B df52868ae9253125cc77973de4d
 AUX mongo-c-driver-1.13.0-enable-tests.patch 886 BLAKE2B 9a568e6498ec9ed7b08bcd8e5ae92c8e439bcce6bc04a91f128411efdbeafa64f3258f687963c861aea14c268587972ca679fbcd380098a3eefcc50a0c0a4e24 SHA512 c7f4ca10791c2eae60ea50214c1605d9d4ff48a804511d8dd9b181046f794a61499033ae0f0a8657257ee378dc30976e78984270d7fdc8cb4791b7690c89102f
 AUX mongo-c-driver-1.13.0-no-uninstall.patch 866 BLAKE2B de38a7659be91d293b33c03036c14607bc3f6214a5970d28b8cbc02d77ee32a04f077e082cb7bf9ae126d13d5537a634c29e31230d444cfb72734fc417b0d604 SHA512 ccfca1aafb4b918a14950ccd99ca6b4f4a3d7d0178a726f6c9de7096a5e5ed700953672ae457a43064b61595df4e955774a4836e5d653d6d73b50cd5772f87d9
 AUX mongo-c-driver-1.13.1-drop-failing-test.patch 842 BLAKE2B ce51289a0e16e9c5fdd072081b85bfd7fcc2d5450a5c34f148f8b81a0ab13e7e79f7ffdbfb7f951566f3fd5af28c2f9cd0b491af91d2d8f3a89312189760c056 SHA512 77a0ea5dcc76ce1fd18a15ae910fa1507282f36f47068b357cac3ae63f4a4368da848dd077747080f423e80a34665dd677f083eab6c16d258e75d5c2f99817fa
+AUX mongo-c-driver-1.14.0-enable-tests.patch 849 BLAKE2B ddae62c9f8d6f94f3c8f2bc48921f1825d8cef150026ea4a1047455901c9224c32f3ef2fdf9b426e73f752207fe9fc617c16547e0a2b7c4526350ba76358947c SHA512 4044c9580fb570640f1bd0e53c55a0699b5a22a93b78e2165ca08a0f99c6f09823e012021f86ff0b9ac2e1a2364b15b9eef77740833130ee08b4aed15afdb98d
+AUX mongo-c-driver-1.14.0-no-docs.patch 356 BLAKE2B 801760527a7511a0472d85ba6a6ca00d4b59306f5ec69f0f6b5d89c1858d342a7ec724c7dece3a56ea6506a794c876496e54c498d1d69ec8fb5d7869e68ee94e SHA512 e28f9099f382f7e96ce804c32d30976af4df26f2153c3dd250504b33f522f16ded73563a45f306a9439bf27e723c931df53217cc3735362120e88e4c8f3ce8aa
 DIST mongo-c-driver-0.7.1.tar.gz 108537 BLAKE2B 29d7f6680d700d15d02b3d5deefbdc27b4e0841a2ac30205ed148216d15e95fe487f4cea4decacdf573a4ce78248cfd12cba72b9dbf90065e127fa7fb56cad27 SHA512 5c6996dc47ecbe4d77971e3aa983a877e7de736bf358c467808eceba8b1a5eea342376249cdc682a034fc7ec39290d234527cec3c3732686f184281a72aec724
 DIST mongo-c-driver-0.8.1.tar.gz 124053 BLAKE2B 1c6b0d3998c6497c39fc2f6597021e84571c717e5d6f288d79d3862e7f15f131604648595ca0e12200352a7fbf40652803afd0f60a80eac657b9853a1de51173 SHA512 7b61ac4b1b154ee1f518eddb2bbc0cdafe0da8786eed4475e5703c2a735ec5a09efde59f5bfa45fb226cbce24d8c0ba0de403d8fc3e561c0e48507dfb07962b1
 DIST mongo-c-driver-0.98.2.tar.gz 5342760 BLAKE2B 399fb03464234c87dcb66647c5383c505e654238e72e86794fdbc56716590ea6637aa7bfb0d25c0fb6aae8fce6055741753ac33125cb1b475c7bfe1e198a0a1e SHA512 6e3abc31b1e0e02d3bb864882444a95aa01ec4a85ee77abdc52675a730790be7f1924f3c6ea36405ff0f2066e332302ca567bbfa35ba7b918bce81fb409600eb
@@ -15,6 +17,7 @@ DIST mongo-c-driver-1.11.0.tar.gz 5681593 BLAKE2B 43f70943cc7f1a9f6285c71136b128
 DIST mongo-c-driver-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54c9ddb14cfc68ccf7ccb1995808f4c4c372806e85e1c8bb8b8541bb8b8b5236fd06d7605b78a4bbcee6560642bec SHA512 e4688da8a94fc499893b6001fc444b97fc05c89672fd9700bf30c6af7f1bbb02b1a658aa74470e0e5d5e72bc28a5753aa7dcda14dba7e75fbce0b4bb94b7373f
 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.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
@@ -29,6 +32,7 @@ EBUILD mongo-c-driver-1.11.0.ebuild 2296 BLAKE2B 58e82ebbbab0773a1a261f25de8bffc
 EBUILD mongo-c-driver-1.12.0.ebuild 2343 BLAKE2B e711508f266ed482c496fce0f593e62ef692522565dd36472591b97a7b3b8f5e27e6c7fed0b5f29401a14f9cb5aafc0959289f481c7ee1f09634a274f7b107fd SHA512 a54a2343caf467d59f7b5460e8c1865dd6f44f327542d535a5eaac7ad6a3bd59c2e30466dd584c7f6165ce195ba35b5e655a7c8349fbdb8b01deb5af3229efa1
 EBUILD mongo-c-driver-1.13.0-r1.ebuild 2431 BLAKE2B ca1cb9c45b3e7b5a78763afbdd0e4105d6eb1d2c60e647081923fcf5c460b9b56568ee2e47dbcf743cf5d15870091546981bb7f68c5903da46c40849d948cae7 SHA512 8cb7d48ee5d1f1a7bf66042dc87ebe685db83b96b8ffa107d72b1faa5b9266b139810e3cb9cbbd3dbb1d3b752b87bb8dd810f43a5ac02dee5c16af6f9784c7c7
 EBUILD mongo-c-driver-1.13.1.ebuild 2466 BLAKE2B 8f5e8d47c5e0b69876f6701986d70c3db75b6e4d28a817f3e880aa630eef6e1eb8307bf91bd98fc170aaee702aec9e8961058d83cae0d009457213bc1088fcc7 SHA512 2c2cc1f028ddcd1b93227a8022ecd47655aa43088ba8e4f5d782a31cd5122752be80d6904d85353c92cde040fae6f5333ca91e1fe678a3ed1bdec4b7aeee024f
+EBUILD mongo-c-driver-1.14.0.ebuild 2535 BLAKE2B 39a56e6dcac4bacd8c18d4c78d7186833533ffe9e998576a38edddeffc88b27a18707b93694fdfccece8029a26431eb5b3d82eb059d14dcacced898e536d5d6e SHA512 c47c698ae7e76969a8cc5c778a0a5b121628a6fb625a7cc90e114a6943872d3520cac0e8cecb5a7066226d140711b40077ebd098de30b6052687a18f97a1eb31
 EBUILD mongo-c-driver-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/files/mongo-c-driver-1.14.0-enable-tests.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-enable-tests.patch
new file mode 100644
index 000000000000..76202b5e387a
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-enable-tests.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c0e01a8..3371dae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -163,7 +163,6 @@ if (ENABLE_BSON STREQUAL SYSTEM)
+       message ("--   libbson include path \"${BSON_INCLUDE_DIRS}\"")
+       message ("--   libbson libraries \"${BSON_LIBRARIES}\"")
+       message ("--   disabling test-libmongoc since using system libbson")
+-      SET (ENABLE_TESTS OFF)
+ 
+       if (ENABLE_STATIC MATCHES "ON|AUTO")
+          find_package (libbson-static-1.0
+diff --git a/src/libbson/tests/test-bson.c b/src/libbson/tests/test-bson.c
+index 95356fa..9f9aea3 100644
+--- a/src/libbson/tests/test-bson.c
++++ b/src/libbson/tests/test-bson.c
+@@ -17,7 +17,7 @@
+ 
+ #include <bson/bson.h>
+ #include <bson/bcon.h>
+-#include <bson/bson-private.h>
++#include "bson/bson-private.h"
+ #include <fcntl.h>
+ #include <time.h>
+ 
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-no-docs.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-no-docs.patch
new file mode 100644
index 000000000000..d33fba105ab0
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-no-docs.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3371dae..a6edf0f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -380,10 +380,6 @@ if (ENABLE_MONGOC)
+ 
+ endif ()
+ 
+-install (FILES COPYING NEWS README.rst THIRD_PARTY_NOTICES
+-   DESTINATION ${CMAKE_INSTALL_DATADIR}/mongo-c-driver
+-)
+-
+ if (ENABLE_UNINSTALL)
+    if (WIN32)
+       if (ENABLE_MONGOC)
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.14.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.14.0.ebuild
new file mode 100644
index 000000000000..eaea5a9fc5ac
--- /dev/null
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.14.0.ebuild
@@ -0,0 +1,93 @@
+# 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:=
+	>=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 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.13.1-drop-failing-test.patch" # one test fails
+	"${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
+	)
+
+	cmake-utils_src_configure
+}
+
+# FEATURES="test" 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/msgpack/Manifest b/dev-libs/msgpack/Manifest
index 6ac1690e5737..81d8a1fda88f 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -3,6 +3,6 @@ AUX msgpack-1.0.0-static.patch 1324 BLAKE2B eb133b5bd2a344b5029dc1ed6a6ec1654e6f
 AUX msgpack-1.1.0-gcc6.patch 900 BLAKE2B 770cce3486efe6b402a5d8a54c317cc31e603a34ece09bc10182e12d8970e34f06d03b94e744be5607ba9b09c5ae9873e0ead71eae87c761344bd041bbb4ecaf SHA512 be88e6f2119ded151af8334315c40027967603240158f0a1ab0aadbfdd0e8a04df13aecc9ed26135d6684a0f40f627727635c032722108bb4a63a68d8eed789b
 DIST msgpack-1.1.0.tar.gz 493551 BLAKE2B 3ee162fcba5ae61c7c69945a567ac4d39526e7941f42cc2ed55bc5885b823af84eea212c4e75e8e8583e8ea8a5e12f75e969409193c5e7273430e2e02d33a02c SHA512 6823fab090c2146f871a45736c29b8f81434f0d72c597ebea2e947e4a9a17554e163bc88fbbc3dd0805b2ef0df029b10ca30c09dfbd1111252b9861a1e373901
 DIST msgpack-3.1.1.tar.gz 495858 BLAKE2B a99b7edb2a6de80e018d5c4084ea199518e34045a6293c622c8690147ae353abdb63856eb031962a02ce20903d4443ec2b01a3c033e756c339f8674ff801d4c3 SHA512 cc634ef38b3844bf994159024441fe72d99055c42b0a4d81245b0629fd1f3147587eb36537cfb85e4cae2edc1dc23d7fa400022efa5a10dca295f9a6acd38346
-EBUILD msgpack-1.1.0.ebuild 1033 BLAKE2B e41916d1f6989bc7c51034b13014b7082ec7e211ddfd2f8a04954ae4b6d401b79280cca54c7571412e28a487339f7ace68b05fc7aca15f0c8ecd8359a67e6ee6 SHA512 2184c7b7c056ea3dcce1c7502b9824066ffdcac16abed62b80edcff6af977c9694e0b3c652cd1abe08bc87f7e767e7e4cc9660370ce7f1f0d1a8e2b699b3dcb8
+EBUILD msgpack-1.1.0.ebuild 1038 BLAKE2B a5b595b557661b2f40b0f71d7281edaedafda8b1e7fa7364e65c2944cb7088cf4bc459cd982e337e3a5f5437552f250deb67036d0f08fdb8c95542af22eae7f2 SHA512 f8a2cd1e834721bd20fbd37460cec314b23f7ac0d9b506f1a77efe7bbcedb62cfee0fa59308d10272906eb9c36a6aeb43abf5c030f0b05ad6626c283ed8a00e3
 EBUILD msgpack-3.1.1.ebuild 1700 BLAKE2B 77629aa7b803c62713ec0291f6501628432ea52800aadeffea6443f0466abb372703842a2cac930a69233f241c61ad0a3f6152ea8bdd108f3f8da7f2150eb309 SHA512 5d5c958915bd61df6d8177af5f0ec5b3f708688c98c9b95381248a14efb86805efb1eb58f705439e5662aefc67d67ab248d31addd3822a7582011d1733d3d26e
 MISC metadata.xml 409 BLAKE2B 7656515e9cbf76555dd77ba3350bfc3720d685f061aa2a4c9ef793c7d0eb0dcf327bd707f00a01b0d2be706ec79d62778cf7266998457a62f4291ccb1a5de194 SHA512 f56436ccd3ab6d2d5cf453e4eaeb8e3b79cd8d89a73c1c0ff17c2a47b1802641b20e41d75a12ea161f0a47e0236c84425a02cf8bb16e4b9d5b406fba4d2f1ec1
diff --git a/dev-libs/msgpack/msgpack-1.1.0.ebuild b/dev-libs/msgpack/msgpack-1.1.0.ebuild
index 5b8c66b8a343..027734b5670d 100644
--- a/dev-libs/msgpack/msgpack-1.1.0.ebuild
+++ b/dev-libs/msgpack/msgpack-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 98ca437a9303..a2cc2fe851d6 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,5 +1,6 @@
+AUX nettle-3.4.1-build.patch 1598 BLAKE2B ce10cb8a59bf8e2d1dea57ceff5bb2fcf2da1320034672abed770fcce54466704a6b3820a135d04d2d52881cb0d701bdd252d388bcc1ddd80b508fb3828cd237 SHA512 6b95ec112471895d3fb7c7c2c82517d113c0da604285f19b4d14ef3e4bfda6b5d32b869b97a0510c8a9f8c5828c410d99d67bba09f57a14115a6a7ed0d677b3a
 DIST nettle-3.4.1.tar.gz 1947053 BLAKE2B 354318c46c28aeaaca611abe70298024ec12ff70aed53c741e43c1b5373361e5cffb03df7b8e86ef103a3b7770b2b4fe39fbca00b128f2b7ec810b3a4d9fd0fd SHA512 26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f
 DIST nettle-3.4.tar.gz 1935069 BLAKE2B b73c88236c8233360607a6ed65cd4f6d19bfbbf683b46149326ce3440bf0a42b8add69de5c64145720163b1095fdab3cb8bf410c2ef727d0ea4fb58391ff0f14 SHA512 3bea3aabd2c99cc42d084a94fd6b0b5dbdb24cd6c7020271a6ee87a81a904b21b21756f590cb1afdf2e85fd1cb59e5c3651c5c4032e30204e7ea6f8801d1ea3b
-EBUILD nettle-3.4.1.ebuild 1724 BLAKE2B 12696133164dded38062000b046515123be47630bb736226aa6fc62036eb6ca1d5794e85247a57d7276fcbb043124b4b17565919466d35568722220d1e65ea2c SHA512 f1bbb3f52729bf6793c9cdd7d2dd19d145ed1f5410bf395d3c9d487b694d9c0aba8d9e6df79d67ff4d84971e1730325df1a177f91f770a76813bc446c4583e33
+EBUILD nettle-3.4.1.ebuild 1780 BLAKE2B 752989f3fea0065cc8d639b7e4efad7de8dd9c0cb12429aa3bf76a6c1a75a24f2bbc64b348b68a24a5b63b1690cb2b87d6e9e8c5617702a330a679e116a24d03 SHA512 4c1b5c661e55903540ee6394831b9dbf1c90e413a70eabfc22fa597df24c2acd29eadbddceac3ac9dc801a681e1f42efd9d857e59f3dbb0776d5ae4854af1d89
 EBUILD nettle-3.4.ebuild 1725 BLAKE2B 71eb0b92783f817ab7eeb4c0a29445e65a56b9cb6cc07a7269c3401c34f605bb49589aa999c4e2a35330b4b4dc4a324cd2c860bfcf0164a79118330b40a1160b SHA512 dcfd2513e10dc106274500d3531b1b629ded8ac9c85d37ee5c150a32f2507fc1045d269b394d91b508a991525f271637048937a4ddf9a58613b35dbbfddb32f4
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/nettle/files/nettle-3.4.1-build.patch b/dev-libs/nettle/files/nettle-3.4.1-build.patch
new file mode 100644
index 000000000000..4351dfeb5bcb
--- /dev/null
+++ b/dev-libs/nettle/files/nettle-3.4.1-build.patch
@@ -0,0 +1,53 @@
+From f5a3a224bf00bef5669366d2ae23c2b2b13b8016 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
+Date: Wed, 26 Dec 2018 11:04:31 +0100
+Subject: [PATCH] Fix accidental use of C99 for loop.
+
+* rsa-sign-tr.c (sec_equal): Fix accidental use of C99 for loop.
+Reported by Andreas Gustafsson.
+* testsuite/rsa-sec-decrypt-test.c (test_main): Likewise.
+---
+ ChangeLog                        | 6 ++++++
+ rsa-sign-tr.c                    | 3 ++-
+ testsuite/rsa-sec-decrypt-test.c | 3 ++-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/rsa-sign-tr.c b/rsa-sign-tr.c
+index 59c9bd07..f824c4ca 100644
+--- a/rsa-sign-tr.c
++++ b/rsa-sign-tr.c
+@@ -239,8 +239,9 @@ static int
+ sec_equal(const mp_limb_t *a, const mp_limb_t *b, size_t limbs)
+ {
+   volatile mp_limb_t z = 0;
++  size_t i;
+ 
+-  for (size_t i = 0; i < limbs; i++)
++  for (i = 0; i < limbs; i++)
+     {
+       z |= (a[i] ^ b[i]);
+     }
+diff --git a/testsuite/rsa-sec-decrypt-test.c b/testsuite/rsa-sec-decrypt-test.c
+index 64f0b13c..fb0ed3a1 100644
+--- a/testsuite/rsa-sec-decrypt-test.c
++++ b/testsuite/rsa-sec-decrypt-test.c
+@@ -68,6 +68,7 @@ test_main(void)
+   unsigned n_size = 1024;
+   mpz_t gibberish;
+   mpz_t garbage;
++  size_t size;
+ 
+   rsa_private_key_init(&key);
+   rsa_public_key_init(&pub);
+@@ -78,7 +79,7 @@ test_main(void)
+ 
+   memset(verifybad, 'A', PAYLOAD_SIZE);
+ 
+-  for (size_t size = 1; size < 51; size++)
++  for (size = 1; size < 51; size++)
+     {
+       ASSERT (rsa_generate_keypair(&pub, &key, &random_ctx,
+ 			           (nettle_random_func *) knuth_lfib_random,
+-- 
+2.18.1
+
diff --git a/dev-libs/nettle/nettle-3.4.1.ebuild b/dev-libs/nettle/nettle-3.4.1.ebuild
index a039517fcb34..0c477712dd3b 100644
--- a/dev-libs/nettle/nettle-3.4.1.ebuild
+++ b/dev-libs/nettle/nettle-3.4.1.ebuild
@@ -11,10 +11,10 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
 
-DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[${MULTILIB_USEDEP}] )"
+DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[static-libs=,${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
 MULTILIB_WRAPPED_HEADERS=(
@@ -25,6 +25,10 @@ MULTILIB_WRAPPED_HEADERS=(
 DOCS=()
 HTML_DOCS=()
 
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
 pkg_setup() {
 	use doc && DOCS+=(
 		nettle.pdf
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 34c7022daef9..af06d91b1505 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -7,5 +7,5 @@ DIST newt-0.52.18.tar.gz 180425 BLAKE2B 96c10d6eb63b62a51cd75f3cc34671954abd8e0c
 DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f346fb7bf71de6fc5a59ee3d9d43bb4ad3bdfab7535d4d2eddeed62f72cea1861ac537f2bd7a62e7f76069c692 SHA512 0c10c373c6a5299a85fc38f32d3590fff3b26c4be40e6c85ed73c20724ef2fb094bf37a8c3b1b80a4bcdfc14fe59254d4419c391245c298a4e16788954b88236
 EBUILD newt-0.52.15.ebuild 2009 BLAKE2B 60893c4f48b7e26939b65cca8f47047fb4d13558b363fc2ce7be362b77c9c3a2bbb0a833b15c3bd3a44e93a75f6bc3e8bcd2529aefd78e28c5ffc1b9dff2cf01 SHA512 342cc64da9f59c34785897b768e48687dc700e9f66c4bbf9ec0ddff1ef53eafd7cfd90971df67d2cf1c668712f793a75583ee61ae07d4dae5fbb44c2fa5c1d4f
 EBUILD newt-0.52.18.ebuild 1946 BLAKE2B c94b8d8ea555381f8a5561a983de9dedbba63eb36c76bfb7550351947f044ef4df7b3bb7316e213adda862a235ea816a5450fe1ec06a28f6f7e7689786327465 SHA512 8914e08dce91d768dead676763eccbe41ba6cea208d28348e80bf0b5e7bc5f1cb70f54c382f14642726ad64d2512edd661af18172e37577c2fb1176a76da5a30
-EBUILD newt-0.52.20.ebuild 2027 BLAKE2B 2315559eaced516b0a32a25b1be8b4a0f1fd1fd529f9e4d136daf22f297ccea61fdcf227ede01d3b1424c6607212ce2c846959cbe09f5c6b33b8deec314dae45 SHA512 cebf7015bb84540574900df81e235c667f0d49436e884126975e46d1b82bc4832e9b8c6cd094b7f33853ebf513df566305a1d152c2ca0bec9c16ecdbdd5cdb66
+EBUILD newt-0.52.20.ebuild 2023 BLAKE2B aacda586a62bd92bcce19f3fb5fee0e9e05e63e71271ea7d8a281e6cf0121eb039a69851d283be8db82d1ea063e30fbce9b9ffcd9a3e571378a858eccc82f445 SHA512 4e76bac8a02b000c06bf9d522b209e3746899750b30627287a6297f840ec382e108bb25f51c50ebec56040b5fcb8f3e9eed4e76a7eb04e4bd7c69aa4cebd9267
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/newt-0.52.20.ebuild b/dev-libs/newt/newt-0.52.20.ebuild
index 3f8f6f75f4b6..b0fad196dbb6 100644
--- a/dev-libs/newt/newt-0.52.20.ebuild
+++ b/dev-libs/newt/newt-0.52.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit python-r1 multilib autotools toolchain-funcs
 
diff --git a/dev-libs/nmeap/Manifest b/dev-libs/nmeap/Manifest
index 2a3021bea6f2..5256ba106399 100644
--- a/dev-libs/nmeap/Manifest
+++ b/dev-libs/nmeap/Manifest
@@ -1,5 +1,5 @@
 AUX nmeap-0.3-fix-unitialized-variable.patch 275 BLAKE2B ad143d8be7c773eceb10413d2ac7c06474ac4a565da9afa09c6b2e3d2c16de8b9ac905a996420dfd5239a5eb3d060bfb2306241fff13805a05a1af5691f65e06 SHA512 cc8626e1b6e71c45550f9bb1de83c1f3aba41dbd05da904d29825179107bb79df88a19eb96955aa9f9a811cea25d46f58a0f6a94c534f8ed872b84ce01b01e59
 DIST nmeap-0.3.tar.gz 29380 BLAKE2B d4828a1a3d8a66ae529e40c034bf180da9657c2a3dec1ab09f32a9062430952a568612d2071acb887c6f1afdb19de82cb4b6d1788c6e9c2e1e859d9914209b3a SHA512 064a7fe27a192b4abe1393f8f343c8956bd9dd1d0de1441ca96597ab1f155001905b9b0b35d47b61e1f68891b820c602c024e4c74fb809719108711c5b1df815
-EBUILD nmeap-0.3-r1.ebuild 1220 BLAKE2B 1673b7e758cddf1540fc71db39bd7de9bcfa857dfc51d545b2517010739be5493efa35b8648aea636ae7407e4684fbb64b276cf7f2ea5f8489f58ffaecae939f SHA512 8a5c0a54a1c7179cc7aa60f414bb1a5d8ff8ec6828531cef21529d1b078dae0afd3021de59bf048d3af0b6f6dbf32f4304ee1da8a6734774e38aa7c6ff4e9a19
+EBUILD nmeap-0.3-r1.ebuild 1218 BLAKE2B ae47aef10b7e5601d9a050b075a1d1cd3c82459c7645082560a7a02c38e36b57fe4a836bdc266861fe49b8a1afe178c0d5d64610ba7d584c30288a48ccd7b42c SHA512 083970b6c50177b2af5868e03c65f760df8666a34b5ffaa90e57e479d60a74a52830b6b70bffdc2fe120618b937f361d7b3f34778757089a18ae8b113188825d
 EBUILD nmeap-0.3.ebuild 1149 BLAKE2B 3e683597319ce27d6fbe39cda8f0be7deacd9f02461f6a7308d3d1a0be444b7a37167acca1bac775531f7e281a80b1979031342493100d725407e9b8cff3cf8e SHA512 5a27f848c74690332169d0b935e24f4e69bae52a6b3f3acd24534b5e408497a44c1d9e7301f39ce2ffec7efe638050d8cc3b3c6a16c09ff49a8e0a3c434c8e17
 MISC metadata.xml 713 BLAKE2B dd782c425806e40afa0f98bc8d54b90fbcb47f830f79f6258418de215617ba86059a666354db7947dc91f114516a14652f236658f78baacee8c9f5b59e58a5b8 SHA512 994674b694ac64762ec12af6dd76c6ca1c3a9062bb3d0d35dbd1d8203385820dbdf792bb344dac7a021d2ebd29550de114021491c3da1d0287602550027b3a5f
diff --git a/dev-libs/nmeap/nmeap-0.3-r1.ebuild b/dev-libs/nmeap/nmeap-0.3-r1.ebuild
index 61aa260e3f1a..45e2d1cca2ca 100644
--- a/dev-libs/nmeap/nmeap-0.3-r1.ebuild
+++ b/dev-libs/nmeap/nmeap-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index c2ec0b7c02e2..41f22213b52e 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -7,4 +7,4 @@ DIST ntl-9.6.4.tar.gz 915256 BLAKE2B 78d8415bb1fe858881f997383ca9adcc8af2499251f
 EBUILD ntl-10.5.0.ebuild 1445 BLAKE2B 522b14c8b09cdd96ad0a9a9ae7440df24d19484c25b434cdbdd70d65e95459dbb9182c2258afcccbcc454625e1700276bdb389367951cc58b196b7b633de5906 SHA512 03d0f3b39d728b86c372d95d55d36dc3bf7c2c7f4a21f856d9dfb1f5162fd42f232465b737c47b9cf3c7f3d4903f5c893a226063449e07b977d55b1202c0b3ba
 EBUILD ntl-9.3.0.ebuild 1778 BLAKE2B a11c61d452ae6643df2c3081baa389d92be3256eea634a4e0fdc50a4d1f3cef3843dfa12e780851e90b66756fce174edcf08a92ecf5bce6c98c0738106ee5e59 SHA512 4f7d415cdf3e94655983fe1795af856ef01a0f953a7b9b8eae9d10be0b691d0b49036cebf45afcad8e4ae097681912af6728e7e455ba0d306fd0a5c323515022
 EBUILD ntl-9.6.4.ebuild 1706 BLAKE2B 104e8b1887568681ee7cc67b17b18078fdcc5d05b266e5de2213a135df730f42ba9085ddd2ae5e2d6b8c3daf3bf8841fb698a0d13a48ae7c7c666333a220a93a SHA512 1aa1887d2665aaf3294b87404febbf941118be291a5111a92bbfce88ca163683661b396db358d2cacfed7ec63a72090ff96cc59b5723edd8bc56b1441fc0c857
-MISC metadata.xml 662 BLAKE2B c9ec72da996f6467ec456420af20dbd37e66e8884108d387a715da0578f939321c075ef95237e9d5c7a9ce1d5bbc555d2f48acba6bc2ff8e3ff8efea9cd1479b SHA512 d7501231f63b33bdf70ffbd0e218e91b394b2cac9c71fb361dd011839ce45c2b03705ad10274b4a78f935adc7383502191aee5616fa9f3e13720949767599893
+MISC metadata.xml 552 BLAKE2B 86ae637ba8e3735d4bc3fa5c31d044a0fad0cf62706e73b232af2ffafa8bd90c90d07e672cabe4a14a555fa314bd8d82f4a533f07ac08adfa6144296d42f320e SHA512 001c3010e5ac7e00b79a6415c91313b90afc64be532b71bbb909a88deb956f3c9aa053f1affbba42eab7c1ffd0de5948076ad7fcbe290865d22988a207ecd25e
diff --git a/dev-libs/ntl/metadata.xml b/dev-libs/ntl/metadata.xml
index 46f676c3223b..ab65f6e343e5 100644
--- a/dev-libs/ntl/metadata.xml
+++ b/dev-libs/ntl/metadata.xml
@@ -5,10 +5,6 @@
 		<email>sci-mathematics@gentoo.org</email>
 		<name>Gentoo Mathematics Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
 	<longdescription lang="en">
 		NTL is a high-performance, portable C++ library providing data
 		structures and algorithms for manipulating signed, arbitrary length
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index d5a55ad38f60..a2ed8368b0c8 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -3,5 +3,5 @@ DIST onig-6.9.0.tar.gz 869809 BLAKE2B a60b0f99e3a6cda81f09a4dd1af98d0ca98b912709
 DIST onig-6.9.1.tar.gz 870525 BLAKE2B 8427b92670545e66deba35dfde0cb0ce346629a188c4adaa3025d0acaa81d2ffd86111be17419ea67b2d5f3fb4387aab0d8d20d70fb2f518ccc0ca165b66207d SHA512 5454c161d2d45f2c992513a695ff586ffa99e44a27d7ac5498370e200adb664bb02f2d8cd7d73e61d467f626d1a9b41d9e6e3051e1ea1a021624f94f7d52975f
 EBUILD oniguruma-6.8.2.ebuild 970 BLAKE2B 5925f193741dfb7f8da7be4389c6bddfc8bb618d537edd2ac9e2477287f18e9997fdf282872b30f846cf92aec1c30fcd1aeb4c6e58cdacb069acf6220ed01602 SHA512 37c46f50bfd281fd331e9f799b7f9957aee3fba71824f69b6e2bb3d7b078125c53976a0c6651956034f47c6dca8a2885939b1334a6719a8d9d44e0265b2b97d2
 EBUILD oniguruma-6.9.0.ebuild 967 BLAKE2B d33b2347afacdf230928fb427f582970b105eb5cbd893079172f9e9f9fa17f6e4ae31c03df4e967626ee573413f2668e3429b522285e00dcd1f72c3151664be0 SHA512 b0b2ca4be822fa8cd223291371e019ab023538c0dabf1300eb662e4d252a6ff05648200c1621e748965a80df80db46ec0e93d94e9d6925385c33c550ca9fa657
-EBUILD oniguruma-6.9.1.ebuild 968 BLAKE2B 62b881e4e069689cef1b955856b1f26aec154221897348e0e9c6c0f005ad426b82f977e2197f936350423aac462b5ab6bf6050bdd9054892995f885cef8d093a SHA512 922f43243aa5eaf3f7d4d3b8677e9fbbe2db369f17cca7a0f22bc91e798590aba53e692832ae1d66f7f7231d7331f892a0c4a4f7ded8334a0cd1161160f956ac
+EBUILD oniguruma-6.9.1.ebuild 967 BLAKE2B d33b2347afacdf230928fb427f582970b105eb5cbd893079172f9e9f9fa17f6e4ae31c03df4e967626ee573413f2668e3429b522285e00dcd1f72c3151664be0 SHA512 b0b2ca4be822fa8cd223291371e019ab023538c0dabf1300eb662e4d252a6ff05648200c1621e748965a80df80db46ec0e93d94e9d6925385c33c550ca9fa657
 MISC metadata.xml 799 BLAKE2B 862b6b8ec3f6707fa10fd2cb79858481e9537a542632c26828b52ea7afc099c315e3cdac59fc3c55aa384288735e653104a3fe7abd165482d1c443ea128b24a3 SHA512 62bb6686582652a9215a0548d3400e0f864e86040625dc608eea9d644937738b6fcb9c060034a85d27b31797068c05dcf78b18d8b411c3f8b3ef96e2cec99d2c
diff --git a/dev-libs/oniguruma/oniguruma-6.9.1.ebuild b/dev-libs/oniguruma/oniguruma-6.9.1.ebuild
index 0f5e6b85ec1e..83ded610f130 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 0b37498bbc11..3bf2c46ae684 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -4,5 +4,5 @@ AUX opensc-0.19.0-p11test_common.h.patch 2969 BLAKE2B dd5e309fdaa847da43fa811f3c
 DIST opensc-0.18.0.tar.gz 2037073 BLAKE2B f2b339d1f9c616f6f706acb3c55289deb5b1749a8b5561142c69db4ed1c7dee554ce1f8d820e6e69bb9e462ca460379badf3017ed35fa6cd395702c995326c3e SHA512 dc90cff3e0e639c14bfb11d1d0455964d24d08aa27728592ab0d8b487a1ffee1ca71cb9bbf5d0f101b2ebd85cf9478988f686d45effa72315e6ffc843d398768
 DIST opensc-0.19.0.tar.gz 2080320 BLAKE2B c07df317f26562107680ed586e9a1ea83252c10a7dd227cffe51de709d9c888874963f6835a68f83f212d83f264b0231ea7428ed8d3ecce74cb9265d8191040a SHA512 90659133fb593cbf82ed6502e3858f34119bff051e3090489b7622659dcb1c26d389a4715892aa60a5606bc0ce115bd6c504521abfb965de9ad46441e4ed2b8e
 EBUILD opensc-0.18.0.ebuild 1499 BLAKE2B 6908def240f76d09456dc5b3e937d660fc566284a1477973a5ce474833f9e3dc4c851fbf53ebf6b58f608681b93d37e7cb083ff476bbd04eab4445d5771169a1 SHA512 7f4797929355f08bb430b28f6e1cbda6be61d4ca3ba2af0003be67b18809c01d995133868632650debde80541c7f76e06e1f7e514c22fe7a059f3f2d134efa5b
-EBUILD opensc-0.19.0-r2.ebuild 1657 BLAKE2B bb055802875c7edd591530865c7c4ae758e4dfa821f2247005f06cbe4fb8dda4fa2ad570852190b51a8a1bf2fed3651486aa1a7dd5ce1719c946d9b1413ea3ff SHA512 f87536806841cc5e9a261fed82a837ad986642b3e8a30c32ce8a592fcc4b80c1d5e03748aa0e777fbc3e3ebde1569cabfc03772e836f4c88c97a636c4648385a
+EBUILD opensc-0.19.0-r2.ebuild 1651 BLAKE2B 44ecb8aca32165e08c53fdf7ed7f63a53969856dd73f2b3426e05f01cc220d3c7f8c71c8c12057d49ce42a0a6abff9bbcb50799e93a2f32e44f1beed29ff2660 SHA512 fe56f3ce2114695ee7143097595a72b3f009aeb6d84a5d8e465f4d7f703d801bd5f515f84e0db3808ec83a8730bd3c23c400cbf134ae545e7dbb290db9fc0144
 MISC metadata.xml 1214 BLAKE2B 5d2a0bb352a11969d1f959c4d19171f3f274461f4dedc2558bb89d8ad114dc3796a49e04a35773340de2b321f4be86ea389f1b9733126785d0991771b254a891 SHA512 f37c2a234cfaa304bb41e17147e6970960fd909da2ab2bd924b61be20175d0b6351be98551451c95dcf8e5a77edd4c8c546d93b2bd04012ae667fbddb372e33e
diff --git a/dev-libs/opensc/opensc-0.19.0-r2.ebuild b/dev-libs/opensc/opensc-0.19.0-r2.ebuild
index 70d56a99baa9..71bd59ef5eda 100644
--- a/dev-libs/opensc/opensc-0.19.0-r2.ebuild
+++ b/dev-libs/opensc/opensc-0.19.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )
diff --git a/dev-libs/pcre++/Manifest b/dev-libs/pcre++/Manifest
index 6e8c59d4f168..eca839a048b3 100644
--- a/dev-libs/pcre++/Manifest
+++ b/dev-libs/pcre++/Manifest
@@ -1,4 +1,4 @@
 DIST pcre++-0.9.5-patches.tar.bz2 3733 BLAKE2B b915f094498ba34d875515ab5e16db71d4e1a17c15b08332e761cc7ff2113d16afe6f12d8321194c7ef6dac960349b6ebb281eb8ddd25f239767a70db143a970 SHA512 ddfb13575f7950c7298ddce5fd603c8f34c1e901c8fef71f7591d0c4a49dc36cf5204240dbb23078346a4497f69b541374633e9f3f17b045fc58ba3ccd0f8019
 DIST pcre++-0.9.5.tar.gz 381589 BLAKE2B 573a8d43556e1d925cf21928d773f66086adb2a60db72865bb463fbe4810c5bc17e2a2c5c2a713c2bf2d512ae5255a81707536bbace65e9b467697e7776d0243 SHA512 509080e31483ea82f13873423b48adfcf78ff8d4b5480fb8d46f6bb4a596a0480e4ae32da9e5518b1a6e98679b4e1a523cc9d6f8d8373dcec6f73d18479712e5
 EBUILD pcre++-0.9.5-r1.ebuild 1130 BLAKE2B 73e75942ac7c219e6dd788ffa2b99d9010f008c25bebacc097cbc4b199ff22025bc2f61ac53eae278e4cbef498a4905203f8b5816878fc725596436d3516f6ca SHA512 6de974b97b556972c052e37c21567a7d0f6066b0efd12ea7467fed6e8269e0ab2998bdf21dab6c12fbddb90e25faa750798aca0ec5a7c137db2ae5135dc12363
-MISC metadata.xml 245 BLAKE2B 61823ae735b381c891f5cae47974d3b1ea6136d6f5f5d449a26dfcdf26472282d760b4ee8a605b8a7b75b9c97443cbc0db309ada118ce186030f276ed7c88963 SHA512 b098db4fb4d9ea116f6246bc6caf0f49e80e236d2fad78d287b638dbd5add7bfaf7feb1ca081ca557b23dde9227ce42fa808f3f6fd8eaba6a7e9cae93342f9c6
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/pcre++/metadata.xml b/dev-libs/pcre++/metadata.xml
index 41cd682e0ecf..6f49eba8f496 100644
--- a/dev-libs/pcre++/metadata.xml
+++ b/dev-libs/pcre++/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cpp@gentoo.org</email>
-	<name>Gentoo C++ Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index b70a8a34c36d..1bcf59e3b812 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -3,5 +3,5 @@ AUX pigpiod.confd 188 BLAKE2B ce3d491b4e333492d42ed84d9f6728631263eb57ff54c56f44
 AUX pigpiod.initd 215 BLAKE2B d7797cc0d1d388fd21831e33cbadd031e2cb974e26367596dd4c9ba054fbdd4b04200d0ff61dfe797520d2e0745420a5d973b44a41e15713800a7828f097cec1 SHA512 e1db38677a248c3dbc33aae6809eb8df1dd6253f60ca852d98d8d6d428d23d7a8a31a031da3b786b7105d90f0cc52687bfbfe320e5c6cbf0fbf02b5ad5c6e606
 AUX pigpiod.systemd 121 BLAKE2B acb298046861f0dc0ee65505e2fa4c62cdfee3e628044d07881891f630e70507d27f253e1735457d56b6f7d9e8602c5a1597765c808f8cacaff96ce0efb52df9 SHA512 bb67874841fc629f5987dc41115ac6cfdd477264d5022bac06bcb3762394818a27f4f6357d537408c2cbcb81959e60ab894fd7e5c45f9a138a45f6da7208ef61
 DIST pigpio-67.tar.gz 369268 BLAKE2B a9d59369f5eed4b733e0e5c0e85013a132e55ff63a2393d79a3fb52d1fcb2513559d4dfeea84c4842d6281936b6e116bd81cd63e4542bbcffaf813ee356ee0d1 SHA512 9792f8402ee0dd204f4a975ab0513099a1fe3d398a28b766f412c08d7908e8e307de4cc92b2a2519b6484f15a043bd40008b7707486015c08bda5f97b1e7e00b
-EBUILD pigpio-67.ebuild 1086 BLAKE2B 1dfcd59eb127c6fac67cb005ef7dc7ce637fdf06d1285eba5f089028ba1f2916bd16fdd1119c3b1dcfd8f0e1867a1ec882c88ba52b0ac82ce0f4c46da143f4b6 SHA512 2c018591944747f819f6098095150fe678d8b31de39e617afc30569e6ea1938b3849239fe458dc22a0229032b4ad1412a0501946599a2a0e0d5e9d4391930421
+EBUILD pigpio-67.ebuild 1081 BLAKE2B 4858dffb1e3a65013b5a8473051c7f378d42fade37e6d9abfdffc4220aa6c3c3d754dcdc46a450d93e33b554ac694df934059c3535566ed16328ff384bcfc845 SHA512 e6050e91ee48e6d088fb53e8063c9ddf0f6d79c3d4f2041604b9e48cf137ba41dbe4898869ba62d7cd23fa23a6d007f29749136bca9dec511fac501d291c9ca0
 MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
diff --git a/dev-libs/pigpio/pigpio-67.ebuild b/dev-libs/pigpio/pigpio-67.ebuild
index 1975d0a2cf3a..e10bc7791689 100644
--- a/dev-libs/pigpio/pigpio-67.ebuild
+++ b/dev-libs/pigpio/pigpio-67.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit distutils-r1 systemd toolchain-funcs
 
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index cd052bc7aebd..9e73e6ac773f 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -7,5 +7,5 @@ DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3
 EBUILD poco-1.4.6_p4-r1.ebuild 3448 BLAKE2B 8f15cfcb7f3ab49d75bf3dab8990dd48766391f0c20819efed6ec965b463a594ca0b2ec60030d224436deb9b1a1cb03298ad33c72f6e8b94fed28321a634140a SHA512 b3ef11fedf1a849d83f87b90fcf3be6d9a5d85b2981ceedda5eb699657bdaf150bc45e1451563e76f26f2b7a3e7fe82d9fe5d8790607fa9ef38dc70ce78e0815
 EBUILD poco-1.4.6_p4.ebuild 3384 BLAKE2B 82795ed8256b63859142d760d1c4999ab504be036d00bd2338058318bb7e864372c333822c3b3ede153aa4f4608a22e62d2c797269a10846ee120304fba1a9a2 SHA512 9365431a50298aadfa1d91d3d859dbddd8b3a028aacb4eeb4d01564d063a91d198da08bdb6e8f886b7dbe1ab4f9285fe5e5a334a471bb136b908cf89c4e3bc64
 EBUILD poco-1.9.0-r1.ebuild 3722 BLAKE2B 723574fb374480e40b3edde419aa2a0da210505b5b005606da5305792e258db125c635ddc4761654824327b28f6f45dec0187eb3405541f38d5906ca7a4eb66c SHA512 64778f824f6d6410f01fc644d1129f3bf551bf74dc4d7fe1ecde0eadf88a8877e0bff0432113c37163659358bebcd8e811b6e273a6c0b7e15031af08791a17bc
-EBUILD poco-1.9.0-r2.ebuild 3715 BLAKE2B 634523173c8bf922a3dc48a9de972b0af949d044c923e4eaa2675274546f70e2080323264579f63d4ca57c437e820443f3e3d9d07df6ed5045acd2b21cbcda03 SHA512 7d2373e8c179e079bea3f194ca7f7e74bafa31dba4e4c960c7fb0720a754ebd05accc2cba0b7bb9f72653ce1d556ee1ef3f02021d4a303fd6c8859f0c2666a89
-MISC metadata.xml 2515 BLAKE2B e85987607f2d7d0fc4f957b797a9bd7406dd6224a4fa73bd054c31206e4ef1cdbe8b300d00efb4249ed0b21bb1c991340b746a3db3deea0c79c07dc7aae34458 SHA512 3f4ec81bc65b14a82b599d47ae2a2b80f58f35bf1138b469f2341e2262f9ed13c2ef286f0b5f4354d14a58fd50676a77f373adad86e056c45a427d8b784bd592
+EBUILD poco-1.9.0-r2.ebuild 3714 BLAKE2B 9296a7fe398efcd6298bb8c90ddfce995b359b722f1ff15226ee22ccfcf59f5014b7233bcfd5d1572615161806cfa1e61d07bcb28e2be6b1141ce7febcb2c9d2 SHA512 0b63019468b49b8861bd1263d6172c004511cfd0f15139fca8fd6eb0e54aa8eb865d1ac224d66d146619ce103bae672874f591083a1189669cafc1364425b2f8
+MISC metadata.xml 2433 BLAKE2B b3c6b5beada86b353bef110aa1bffcfb863accc1c0fa1f42aa947c528c4eb54a52a68bb1c21e27ee3b969ff8cae234702df5089ed77ed2fbafdd51e119fae1d9 SHA512 7e118ec7574d9d86f05dee1cfa828da3e54ded0b9c79e11074d85f5613966afc875a0234c45d5c6dbbd015d07899909c28df28ef2ff9ffd4f2acbf5e55bb623b
diff --git a/dev-libs/poco/metadata.xml b/dev-libs/poco/metadata.xml
index f7a05b32b68d..56b0f650afc8 100644
--- a/dev-libs/poco/metadata.xml
+++ b/dev-libs/poco/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 POCO, the C++ Portable Components, is a collection of open source
 C++ class libraries that simplify and accelerate the development of
diff --git a/dev-libs/poco/poco-1.9.0-r2.ebuild b/dev-libs/poco/poco-1.9.0-r2.ebuild
index e2ade79bc880..dabc308f3bb4 100644
--- a/dev-libs/poco/poco-1.9.0-r2.ebuild
+++ b/dev-libs/poco/poco-1.9.0-r2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://pocoproject.org/"
 SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P}.tar.gz"
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 arm ~x86"
 
 IUSE="7z cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl mariadb +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip"
 REQUIRED_USE="
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index cf3c7c256b35..32f1f0fd6fa9 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,25 +1,16 @@
 AUX 70protobuf-gentoo.el 170 BLAKE2B 6d9a92bd3310ca09d18dd762bc0bbd4b0b36184c17f95c80c02183c457fe4ff1142ca1e3207e5a77c078fe5f768cb3e85abc712abc1f4c85774ca1ebf178059b SHA512 ed73cd6b1bf6c0019e4da73c3a480b0f917e949dfad2696336e805263c81610b2a8a0514840e389db0f0e78252cf053d754c5e07731dc5e9c93c9e88f0b2923c
 AUX proto.vim 49 BLAKE2B 9b6d31105811a8f8cbcf76328172fda5b66b33351bb16573ed1ed08d4c553af2805962a6d6609fbdad4a2644bf9cecd1e771a557f138111ad2c0be959b497ee9 SHA512 65c1f49887c17973d1dfce07fa86d04c5079d2382826eaeb22e128570717f181c53d22ba50905252021f7e476a90ecd29f9d18799c1ccea64b01f4638323538e
-AUX protobuf-3.4.0-disable_no-warning-test.patch 900 BLAKE2B 6187eeba1912f1bc6732d944eba4617ab99946efa429b3a96bb3b984af7ef45098885ce6bcdada1bb8995aee4a61cde404175459975242acf263a57d2d74c7fc SHA512 6d0687d17b626493e7e57dcb3e34095c9a450ecb8e538e9ad7cab69bdaf19ba52fbf5d70187c773bee0ee28496850e5ab0f56dcd571797e62434d865bd8761c2
-AUX protobuf-3.4.0-protoc_input_output_files.patch 9645 BLAKE2B 56911d89826684d39e9590a7577e10b036794f42bfa899896ba8311002632ea511057280c2676c1755ade71c8b698693b27fdd08cf4866d6673dc6cbcc17ffa2 SHA512 52894a8886386c5d9db45d78b777d7874b2bee3bf66315b27dcdd5d0ccb387fc25a47f547cbaca6630aae120ea78dc052ae5cdadb2219adbcc3b52612a5cd1ae
-AUX protobuf-3.4.0-system_libraries.patch 5788 BLAKE2B e82517985065f53793ba5f4914317a6c2dbd7bd2c1e3bdb0796c85c402f4ec7e9d6645c1ccb7f73bf0b559d44db14ace9657c059c07948c3baf11c4b450bb572 SHA512 f8b54087e755ab6ae07630e99ca542b5690429ed7c9801c04219b016fd361b39a01d9e4d594f5c5820a0ec90f02f7ef4aeaf864e1ea2b770078a198daf928db3
-AUX protobuf-3.5.0-atomic_operations.patch 812 BLAKE2B f55d364fa5b7ee405d7cb9b08e6ce1a3446a9604a39002f915bdaca2cd527bc7c173aefd898f473b1666eff55c1473db9699b4dc3c992ab3bdc8ae18855cb1b1 SHA512 c7ed996f106bd9632c9979c2e5665759c18c46f64f05bf5b8b9efc5c896b6a072375a657df7f5372b8089aad38791f768765ac1118c2aeed1785f040aea310ee
 AUX protobuf-3.6.0-disable_no-warning-test.patch 965 BLAKE2B 6ec0b1fc9d9d0be4f6dc9bc023d65b6b04c98d624ca4d1926cff0554d774d7cffd8d3597383acff1b7aca1a92dff4dd8368d5d86f1612aace16ede836f025af5 SHA512 82e601a26e51903e6b193c50960024240aecd3ddeeba8b29f437c550ad0bd277573ea4f83bcd70b2a4187c7df2b25af2790de22fb6f009640c403a9502d703be
 AUX protobuf-3.6.0-protoc_input_output_files.patch 9632 BLAKE2B 6466f6f6cf08e7a9a89ced8281790593fa9ea85e029d59ff20bba8c9add16bbb039a44d1839516bb109b9a2b269773640b43e6137fb9ccf5f100ef4109ad2b8d SHA512 8ac3c42684869e1b45d0d1ec70912610eaaa6962bc14d9a89b1244f424af7d638b4905b6dbd7445cd5f54bc4520fc1fbae88c66d9f4a9169db879abd1fba2faf
 AUX protobuf-3.6.0-system_libraries.patch 6323 BLAKE2B 0fb8e389a58b76c592b592782900b48bb6c68e85fc159d4b9a59a43ab5a116916f7d9ef15cca392e5751f015a887f855631abb124b4d4109d51f6ba401059549 SHA512 ab58b9aa9d1398a15346d6e85611ad826f8e52744aa137ca4f138348b4738afc7c6cd27129f925f5142edac7e272d56da880a83b216b2ce264804d6967997728
 AUX protobuf-3.6.1-libatomic_linking.patch 1753 BLAKE2B 50f8ac92dfada973ebcd187fa508a46ddd5d4e034e2eade2a3fcbb35ffab771578b241fa9a5343b46e91c90c4507e1d3a75a1bebc3426dbb1694c0fbb8cc03bf SHA512 c8bcb885dcf7d2871136a6410750aad69a61450b5a4bc80df56246a5875e1e9895d2d63e9e9e6deda3c4e516cd07344b92619457ef41f4f2ff0710c774957466
-DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
-DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
-DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
-DIST protobuf-3.6.1.1.tar.gz 4489116 BLAKE2B 4ed5da3dcb56245b3ce2f979142d5e77837e8e1fbc2f0af27be48664b8b7dfa2ec44382cf75678d226dd665c289f81d95bf04c5f2795fcdd759aa8ec630dba1f SHA512 df59ed966047471d7296883a4500d657eee5e7d8713dd7e44f3f2e0b8c4400e85cb511b316f2fa8518620f1074fd0cad8ee9538c063ac371d6b59358de81ee88
-DIST protobuf-3.6.1.2.tar.gz 4490331 BLAKE2B be5fac5a38369b21941c3c615a97cf35d05a24ee03536b6ea6c1c797a82a0a7f8ecc3630b62af7728f063c850c4faac8ae670171a18bacd44e2a2fb38b2e6fce SHA512 557ffb1216f663df94a16cd8e51e20acf42378913d656f56402c6653cb58ce6a83f77a6050bd846460c7dcac59bb41ad03ac003b0b06250df6a97fd17f8a2c7c
+AUX protobuf-3.7.0-disable_no-warning-test.patch 965 BLAKE2B 25bd6deb1ed863826b6e940af58b8cfdae6259ef49172cdbc9bdd9625098401680329e07c53c50f1f777b496415face4c69cf4dacc908fabeb0e10d268f96800 SHA512 195edc8144ef7bc53c00d3327c56b3e6e389ea9a79f5059d15e1d1d78ca5ccdbd0567f32a0226047eb9e93eea1dc6cb36fc210833cf99415a698d4cfbaba23e8
+AUX protobuf-3.7.0-protoc_input_output_files.patch 9901 BLAKE2B ea663e63bee282e33066c03b1e73222eccc7cc20afea62ebe9745f67fcbee44a41ec750f1db7a822c65a62fcf1b454a3ade625ad56ec0241f499c7314f8575b3 SHA512 bbe6562afc1bbdb9cd641cc25a00092ac53734c194a32d21a974084af01f0836c515f6e00e730c307491b5ffa31b872154c50e67cfe16f0caecbc707d8d87527
+AUX protobuf-3.7.1-system_libraries.patch 6352 BLAKE2B a5c09076c28aefd951847da75dc280c05f7da9c408ea3c1da9b2f08a2ce92a6cd57e684dc0b516b31283619399c96d288bdf3a44e126a45113fd695af4122a51 SHA512 0633a1ad4dfb5be879e11abe4ed769e9d6c08a505f45c6d302f80a4706b0234e0e11d90d77356f09a640657eed353c48e0ce4ba0816cda84c3ab3f21c8252245
+AUX protobuf-3.8.0-protoc_input_output_files.patch 10351 BLAKE2B a584aa7ba199888bbaf2cd5842cff21c0b2cf76727443842d981455de1c812863de45c4f1b4958259f4100211bd4087523618bee138c9a10043c195e2e1d2040 SHA512 639accc5b1b6bc664775392c27718444a7aef3e82565e6794d93404ca7d6afab7dc00e8f76008d893bc7da9217e7568c3a704c693ac83039c481e4c611ac46f3
 DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963 SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e
-DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
-EBUILD protobuf-3.5.1.1.ebuild 2621 BLAKE2B f5d279625735d30a1025c414b20f60dd0385c7d8449fde3e45e6540fc1dcc90614c7e5d3c22c26ef89e7c0374f112ea84a5702ef679d01448923bfccb3364133 SHA512 fe1689582cbd86d2cb31bf85e44a1968524350b7fe62d2f97b20ec368e3046d567c746c26d7d773cba6f1d498f2527ad59dbb749e738458912e90b8b44d7e070
-EBUILD protobuf-3.5.2.ebuild 2490 BLAKE2B ce32a12becfa87d89686be239ba8231aae5cd3b7ac2392b88985d4f9474378e5409274be69e139bbcdf9a5bd7f6ccab5e3c39dc1240e7b5cd3aff9851520aa31 SHA512 b1269cc5d0bbf8e5bb5b6e9410b0ea2d4c4c1c9d50203edb5b3e73b2d40c636f50ca180f67a9eb0f90e2f583f1a6480a141e176bb924669de5d0f43332a1cd60
-EBUILD protobuf-3.6.0.1.ebuild 2491 BLAKE2B 00444b7406baff1560defc88f3e3cde102cd24db454684fb2a919141fae3ba9000486b062f9a8128e0627930794af0f825555526d5a822363d944f2d064c7c52 SHA512 98ebec7694e6a0a47fa98b52371f74ca538f00ae649973e82eed51e4a3600e44c385a028dc3156c0a6c2232a305e317a95b389249090ebba6c77f77375ce49c1
-EBUILD protobuf-3.6.1.1.ebuild 2643 BLAKE2B 1a310c148f1b997319700f1f264337ffb4af2d201c509ce5a834767aece1255707f6d167dc5ac56f0c158c288ce7b7ccf717e2ae34bd727c9d2c2bdeea4dedb3 SHA512 d63065c8833053e8c9702fda577249a0dcd9491b2dd8d9165e90f44a1b6d812f693262cc0c996bfb18ba0f4b7be643825627347ffc19c7bdfc7baff698be1723
-EBUILD protobuf-3.6.1.2.ebuild 2643 BLAKE2B 1a310c148f1b997319700f1f264337ffb4af2d201c509ce5a834767aece1255707f6d167dc5ac56f0c158c288ce7b7ccf717e2ae34bd727c9d2c2bdeea4dedb3 SHA512 d63065c8833053e8c9702fda577249a0dcd9491b2dd8d9165e90f44a1b6d812f693262cc0c996bfb18ba0f4b7be643825627347ffc19c7bdfc7baff698be1723
+DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
 EBUILD protobuf-3.6.1.3.ebuild 2632 BLAKE2B a56bc323756a435869076bb5e85d7aec0c777b1709dde5ba78c40cceac648802366710d00508296928cb8b7f8b3fe9f089a38c4bea32d3b877902970cb6a9c82 SHA512 afec4771997a723c61c223465fa7b18d4d8c66676dcc606a1e2d7ca06dc45f7b16c2fc12c816a08507e09c6b98d0271154310125849356e72ddc7b28b9d84a3c
-EBUILD protobuf-3.6.1.ebuild 2537 BLAKE2B 690379408bdd2f3f2c4385d1d0edb3a5ecc7a782fe25ad2ef477201d06a803ea9bfb7ba2529d0ae3e4f820ef98783b4655c5f2eba1571d2e8cc5dedbe4bb188c SHA512 f827ab7dc346f9fb5f70a10fa38840a8483d6a30d16f8c4bf1803585eed430e0064a8733f9a269cd350934356b826cfd90bee489d61599b957555ff3d563b972
+EBUILD protobuf-3.7.1.ebuild 2813 BLAKE2B db579630b53b54753cdc46ad648bddec60aab59a04008b75eac5019627c10c2bec53b2db6b3518f4eb0c5bdd4484a0735c157f358f5e3532b61183bf908410a4 SHA512 354ccd689b4d6cca0a19e1b079e86614a32c6f864613d20708a11965e56ba589a2df21617e77a24b862c6d9110a0fa7a2b670daea92192ecc376d2ca4576e23f
+EBUILD protobuf-9999.ebuild 2690 BLAKE2B ad5800f08fb9261e1d4e6c6807e482fd942ac0f8a612ab9fdc81e4709945814c41fe767c217a2fbb6ddb618436f53d7bc13d23305b8038d83cb9dd61bca27524 SHA512 2de41fc7ed7d12115211136a898f97f0f233c20217aa407b811f128389937ed5b30432a3cbe8ec50c900e3255e333d91172b517fe2668ee121fa6c418e6a0c97
 MISC metadata.xml 543 BLAKE2B 43724e6d32707c62de4e1daffe50ba943c66286f6fe2357ec7171dad9feb7407049c26da517442957d61c11229617bd639d60bf070e7eedab8c871956cb3577a SHA512 f5a65ed219ff9f36c9d7bfdfe3bfe080ce0920e72f31f69820cc16822a04cdb38ec3c5d6b776b3c6cfde0bfc74c474558d048b706ac89e9405376e88504b8983
diff --git a/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch b/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch
deleted file mode 100644
index 9582431d41f6..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.5.0-atomic_operations.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/protocolbuffers/protobuf/issues/3937
-https://github.com/protocolbuffers/protobuf/pull/3955
-https://github.com/protocolbuffers/protobuf/commit/642e1ac635f2563b4a14c255374f02645ae85dac
-
---- /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
-+++ /src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
-@@ -146,6 +146,14 @@
-   return __atomic_load_n(ptr, __ATOMIC_RELAXED);
- }
- 
-+inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
-+                                       Atomic64 old_value,
-+                                       Atomic64 new_value) {
-+  __atomic_compare_exchange_n(ptr, &old_value, new_value, false,
-+                              __ATOMIC_RELEASE, __ATOMIC_ACQUIRE);
-+  return old_value;
-+}
-+
- #endif // defined(__LP64__)
- 
- }  // namespace internal
diff --git a/dev-libs/protobuf/files/protobuf-3.4.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.7.0-disable_no-warning-test.patch
index 373dc7935a89..eadde9c04dc7 100644
--- a/dev-libs/protobuf/files/protobuf-3.4.0-disable_no-warning-test.patch
+++ b/dev-libs/protobuf/files/protobuf-3.7.0-disable_no-warning-test.patch
@@ -2,16 +2,16 @@ Disable no-warning-test which is compiled with -Werror option and whose only pur
 
 --- /src/Makefile.am
 +++ /src/Makefile.am
-@@ -750,7 +750,7 @@
- 
+@@ -709,7 +709,7 @@
+ GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
  check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
                   protobuf-lite-test test_plugin protobuf-lite-arena-test \
 -                 no-warning-test $(GZCHECKPROGRAMS)
 +                 $(GZCHECKPROGRAMS)
  protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-                       ../gmock/gtest/lib/libgtest.la              \
-                       ../gmock/lib/libgmock.la                    \
-@@ -931,4 +931,4 @@
+                       $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
+                       $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
+@@ -893,4 +893,4 @@
  
  TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
          google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)     \
diff --git a/dev-libs/protobuf/files/protobuf-3.4.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.7.0-protoc_input_output_files.patch
index 75c4dc28ee4a..54daa6de4ed2 100644
--- a/dev-libs/protobuf/files/protobuf-3.4.0-protoc_input_output_files.patch
+++ b/dev-libs/protobuf/files/protobuf-3.7.0-protoc_input_output_files.patch
@@ -2,7 +2,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
 
 --- /src/google/protobuf/compiler/command_line_interface.cc
 +++ /src/google/protobuf/compiler/command_line_interface.cc
-@@ -942,6 +942,28 @@
+@@ -951,6 +951,28 @@
    }
  
    if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
@@ -31,7 +31,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
      if (codec_type_.empty()) {
        // HACK:  Define an EmptyMessage type to use for decoding.
        DescriptorPool pool;
-@@ -950,13 +972,20 @@
+@@ -959,13 +981,20 @@
        file.add_message_type()->set_name("EmptyMessage");
        GOOGLE_CHECK(pool.BuildFile(file) != NULL);
        codec_type_ = "EmptyMessage";
@@ -58,7 +58,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
      }
    }
  
-@@ -994,6 +1023,11 @@
+@@ -1003,6 +1032,11 @@
    for (int i = 0; i < proto_path_.size(); i++) {
      source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
    }
@@ -69,8 +69,8 @@ https://github.com/protocolbuffers/protobuf/pull/235
 +  }
  
    // Map input files to virtual paths if possible.
-   if (!MakeInputsBeProtoPathRelative(source_tree)) {
-@@ -1561,6 +1595,12 @@
+   if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
+@@ -1622,6 +1656,12 @@
  
      codec_type_ = value;
  
@@ -83,7 +83,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
    } else if (name == "--error_format") {
      if (value == "gcc") {
        error_format_ = ERROR_FORMAT_GCC;
-@@ -1684,18 +1724,29 @@
+@@ -1749,18 +1789,31 @@
  "  --version                   Show version info and exit.\n"
  "  -h, --help                  Show this text and exit.\n"
  "  --encode=MESSAGE_TYPE       Read a text-format message of the given type\n"
@@ -93,7 +93,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
 -"  --decode=MESSAGE_TYPE       Read a binary message of the given type from\n"
 -"                              standard input and write it in text format\n"
 -"                              to standard output.  The message type must\n"
-+"                              an write it in binary.  The message type must\n"
++"                              and write it in binary.  The message type must\n"
  "                              be defined in PROTO_FILES or their imports.\n"
 -"  --decode_raw                Read an arbitrary protocol message from\n"
 -"                              standard input and write the raw tag/value\n"
@@ -103,27 +103,29 @@ https://github.com/protocolbuffers/protobuf/pull/235
 +"                              command line flags.\n"
 +"  --decode=MESSAGE_TYPE       Read a binary message of the given type and\n"
 +"                              write it in text format.  The message type\n"
-+"                              must be defined in PROTO_FILES or their\n"
-+"                              imports. The input/output protobuf files are\n"
-+"                              specified using the --protobuf_in and \n"
-+"                              --protobuf_out command line flags.\n"
++"                              must be defined in PROTO_FILES or their imports.\n"
++"                              The input/output protobuf files are specified\n"
++"                              using the --protobuf_in and --protobuf_out\n"
++"                              command line flags.\n"
 +"  --decode_raw                Read an arbitrary protocol message and write\n"
 +"                              the raw tag/value pairs in text format.  No\n"
  "                              PROTO_FILES should be given when using this\n"
 -"                              flag.\n"
-+"                              flag. The input/output protobuf files are\n"
-+"                              specified using the --protobuf_in and \n"
++"                              flag.  The input/output protobuf files are\n"
++"                              specified using the --protobuf_in and\n"
 +"                              --protobuf_out command line flags.\n"
-+"  --protobuf_in               Absolute path to the protobuf file to read to\n"
-+"                              encode/decode.  If omitted, file will be read\n"
-+"                              from STDIN.\n"
-+"  --protobuf_out              Absolute path to the protobuf file to write to\n"
-+"                              after encode/decode operation.  If omitted,\n"
-+"                              output is written to STDOUT.\n"
++"  --protobuf_in=FILE          Absolute path to the protobuf file from which\n"
++"                              input of encoding/decoding operation will be\n"
++"                              read.  If omitted, input will be read from\n"
++"                              standard input.\n"
++"  --protobuf_out=FILE         Absolute path to the protobuf file to which\n"
++"                              output of encoding/decoding operation will be\n"
++"                              written.  If omitted, output will be written to\n"
++"                              standard output.\n"
  "  --descriptor_set_in=FILES   Specifies a delimited list of FILES\n"
  "                              each containing a FileDescriptorSet (a\n"
  "                              protocol buffer defined in descriptor.proto).\n"
-@@ -1957,7 +2008,9 @@
+@@ -2039,7 +2092,9 @@
    return true;
  }
  
@@ -134,8 +136,8 @@ https://github.com/protocolbuffers/protobuf/pull/235
    // Look up the type.
    const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
    if (type == NULL) {
-@@ -1969,15 +2022,15 @@
-   google::protobuf::scoped_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
+@@ -2051,15 +2106,15 @@
+   std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
  
    if (mode_ == MODE_ENCODE) {
 -    SetFdToTextMode(STDIN_FILENO);
@@ -158,8 +160,8 @@ https://github.com/protocolbuffers/protobuf/pull/235
      // Input is text.
 --- /src/google/protobuf/compiler/command_line_interface.h
 +++ /src/google/protobuf/compiler/command_line_interface.h
-@@ -269,7 +269,9 @@
-       GeneratorContext* generator_context, string* error);
+@@ -285,7 +285,9 @@
+       GeneratorContext* generator_context, std::string* error);
  
    // Implements --encode and --decode.
 -  bool EncodeOrDecode(const DescriptorPool* pool);
@@ -169,20 +171,20 @@ https://github.com/protocolbuffers/protobuf/pull/235
  
    // Implements the --descriptor_set_out option.
    bool WriteDescriptorSet(
-@@ -402,6 +404,13 @@
+@@ -418,6 +420,13 @@
    // parsed FileDescriptorSets to be used for loading protos.  Otherwise, empty.
-   std::vector<string> descriptor_set_in_names_;
+   std::vector<std::string> descriptor_set_in_names_;
  
 +  // When using --encode / --decode / --decode_raw absolute path to the output
 +  // file. (Empty string indicates write to STDOUT).
-+  string protobuf_out_path_;
++  std::string protobuf_out_path_;
 +  // When using --encode / --decode / --decode_raw, absolute path to the input
 +  // file. (Empty string indicates read from STDIN).
-+  string protobuf_in_path_;
++  std::string protobuf_in_path_;
 +
    // If --descriptor_set_out was given, this is the filename to which the
    // FileDescriptorSet should be written.  Otherwise, empty.
-   string descriptor_set_out_name_;
+   std::string descriptor_set_out_name_;
 --- /src/google/protobuf/compiler/command_line_interface_unittest.cc
 +++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
 @@ -95,7 +95,7 @@
@@ -194,7 +196,7 @@ https://github.com/protocolbuffers/protobuf/pull/235
    // command is automatically split on spaces, and the string "$tmpdir"
    // is replaced with TestTempDir().
    void Run(const string& command);
-@@ -2308,6 +2308,17 @@
+@@ -2367,6 +2367,17 @@
      EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_));
    }
  
@@ -212,20 +214,21 @@ https://github.com/protocolbuffers/protobuf/pull/235
   private:
    void WriteUnittestProtoDescriptorSet() {
      unittest_proto_descriptor_set_filename_ =
-@@ -2398,6 +2409,18 @@
-       "google/protobuf/no_such_file.proto: No such file or directory\n");
+@@ -2463,6 +2474,19 @@
+       "net/proto2/internal/no_such_file.proto: No such file or directory\n");
  }
  
 +TEST_P(EncodeDecodeTest, RedirectInputOutput) {
 +  string out_file = TestTempDir() + "/golden_message_out.pbf";
-+  string cmd = "";
-+  cmd += "google/protobuf/unittest.proto ";
-+  cmd += "--encode=protobuf_unittest.TestAllTypes ";
-+  cmd += "--protobuf_in=" + TestSourceDir() +
-+         "/google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt ";
-+  cmd += "--protobuf_out=" + out_file;
-+  EXPECT_TRUE(Run(cmd));
-+  ExpectBinaryFilesMatch(out_file, TestSourceDir() + "/google/protobuf/testdata/golden_message_oneof_implemented");
++  EXPECT_TRUE(
++      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
++          " --encode=protobuf_unittest.TestAllTypes" +
++          " --protobuf_in=" + TestUtil::GetTestDataPath(
++              "net/proto2/internal/"
++              "testdata/text_format_unittest_data_oneof_implemented.txt") +
++          " --protobuf_out=" + out_file));
++  ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath(
++      "net/proto2/internal/testdata/golden_message_oneof_implemented"));
 +}
 +
  INSTANTIATE_TEST_CASE_P(FileDescriptorSetSource,
diff --git a/dev-libs/protobuf/files/protobuf-3.4.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.7.1-system_libraries.patch
index 424ad5ff58c3..3ae92e2b87a5 100644
--- a/dev-libs/protobuf/files/protobuf-3.4.0-system_libraries.patch
+++ b/dev-libs/protobuf/files/protobuf-3.7.1-system_libraries.patch
@@ -1,12 +1,8 @@
 --- /Makefile.am
 +++ /Makefile.am
-@@ -8,31 +8,12 @@
- # the right time.
- SUBDIRS = . src
- 
--# Always include gmock in distributions.
--DIST_SUBDIRS = $(subdirs) src conformance benchmarks
-+DIST_SUBDIRS = src conformance benchmarks
+@@ -11,28 +11,10 @@
+ # Always include third_party directories in distributions.
+ DIST_SUBDIRS = src conformance benchmarks third_party/googletest
  
 -# Build gmock before we build protobuf tests.  We don't add gmock to SUBDIRS
 -# because then "make check" would also build and run all of gmock's own tests,
@@ -15,8 +11,8 @@
 -# the installed version of gmock if there is one.
  check-local:
 -	@echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
--	@cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
--	@cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
+-	@cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
+-	@cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
  
 -# We would like to clean gmock when "make clean" is invoked.  But we have to
 -# be careful because clean-local is also invoked during "make distclean", but
@@ -25,9 +21,9 @@
 -# cd to the directory again and "make clean" it will fail.  So, check that the
 -# Makefile exists before recursing.
  clean-local:
--	@if test -e gmock/Makefile; then \
--	  echo "Making clean in gmock"; \
--	  cd gmock && $(MAKE) $(AM_MAKEFLAGS) clean; \
+-	@if test -e third_party/googletest/Makefile; then \
+-	  echo "Making clean in googletest"; \
+-	  cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \
 -	fi; \
 -	if test -e conformance/Makefile; then \
 +	@if test -e conformance/Makefile; then \
@@ -36,81 +32,89 @@
  	fi; \
 --- /configure.ac
 +++ /configure.ac
-@@ -200,12 +200,5 @@
- 
- AX_CXX_COMPILE_STDCXX([11], [noext], [optional])
+@@ -218,12 +218,5 @@
+ esac
+ AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])
  
 -# HACK:  Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
 -#   since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
 -#   too.
 -export CFLAGS
 -export CXXFLAGS
--AC_CONFIG_SUBDIRS([gmock])
+-AC_CONFIG_SUBDIRS([third_party/googletest])
 -
  AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
  AC_OUTPUT
 --- /src/Makefile.am
 +++ /src/Makefile.am
-@@ -752,11 +752,7 @@
+@@ -703,19 +703,11 @@
+   google/protobuf/testing/file.cc                              \
+   google/protobuf/testing/file.h
+ 
+-GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest
+-GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock
+-GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
+-GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
+ check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
                   protobuf-lite-test test_plugin protobuf-lite-arena-test \
-                  no-warning-test $(GZCHECKPROGRAMS)
+                  $(GZCHECKPROGRAMS)
  protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
--                      ../gmock/gtest/lib/libgtest.la              \
--                      ../gmock/lib/libgmock.la                    \
--                      ../gmock/lib/libgmock_main.la
--protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \
--                         -I$(srcdir)/../gmock/include
+-                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
+-                         -I$(GOOGLEMOCK_SRC_DIR)/include
 +                      -lgtest -lgmock -lgmock_main
  # Disable optimization for tests unless the user explicitly asked for it,
  # since test_util.cc takes forever to compile with optimization (with GCC).
  # See configure.ac for more info.
-@@ -843,12 +839,8 @@
+@@ -804,12 +796,8 @@
  # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
  protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
                        libprotoc.la                                   \
--                      ../gmock/gtest/lib/libgtest.la                 \
--                      ../gmock/lib/libgmock.la                       \
--                      ../gmock/lib/libgmock_main.la
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include       \
--                                         -I$(srcdir)/../gmock/gtest/include \
+-                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
+-                                         -I$(GOOGLETEST_SRC_DIR)/include \
 -                                         -DPROTOBUF_TEST_NO_DESCRIPTORS
 +                      -lgtest -lgmock -lgmock_main
 +protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
  protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lazy_descriptor_test_SOURCES =                        \
    google/protobuf/compiler/cpp/cpp_unittest.cc                 \
-@@ -868,11 +860,7 @@
+@@ -830,11 +818,7 @@
  # full runtime and we want to make sure this test builds without full
  # runtime.
- protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
--                           ../gmock/gtest/lib/libgtest.la      \
--                           ../gmock/lib/libgmock.la            \
--                           ../gmock/lib/libgmock_main.la
--protobuf_lite_test_CPPFLAGS= -I$(srcdir)/../gmock/include \
--                             -I$(srcdir)/../gmock/gtest/include
+ protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
+-                           $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+-                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+-                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \
+-                             -I$(GOOGLETEST_SRC_DIR)/include
 +                           -lgtest -lgmock -lgmock_main
  protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lite_test_SOURCES =                                           \
    google/protobuf/lite_unittest.cc                                     \
-@@ -883,11 +871,7 @@
+@@ -846,11 +830,7 @@
  # gtest when building the test internally our memory sanitizer doesn't detect
  # memory leaks (don't know why).
  protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
--                      ../gmock/gtest/lib/libgtest.la                 \
--                      ../gmock/lib/libgmock.la                       \
--                      ../gmock/lib/libgmock_main.la
--protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include       \
--                                    -I$(srcdir)/../gmock/gtest/include
+-                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
+-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include  \
+-                                    -I$(GOOGLETEST_SRC_DIR)/include
 +                      -lgtest -lgmock -lgmock_main
  protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
  protobuf_lite_arena_test_SOURCES =       \
    google/protobuf/lite_arena_unittest.cc \
-@@ -896,8 +880,7 @@
+@@ -860,8 +840,7 @@
  
  # Test plugin binary.
  test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
--                    ../gmock/gtest/lib/libgtest.la
--test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include
+-                    $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
+-test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
 +                    -lgtest
  test_plugin_SOURCES =                                          \
    google/protobuf/compiler/mock_code_generator.cc              \
diff --git a/dev-libs/protobuf/files/protobuf-3.8.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.8.0-protoc_input_output_files.patch
new file mode 100644
index 000000000000..a60bd74f39a1
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.8.0-protoc_input_output_files.patch
@@ -0,0 +1,262 @@
+https://github.com/protocolbuffers/protobuf/pull/235
+
+--- /src/google/protobuf/compiler/command_line_interface.cc
++++ /src/google/protobuf/compiler/command_line_interface.cc
+@@ -949,6 +949,28 @@
+   }
+ 
+   if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
++    bool success = false;
++    int in_fd = STDIN_FILENO;
++    int out_fd = STDOUT_FILENO;
++
++    if (!protobuf_in_path_.empty()) {
++      in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
++      if (in_fd == -1) {
++        std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl;
++        return 1;
++      }
++    }
++    if (!protobuf_out_path_.empty()) {
++      out_fd = open(protobuf_out_path_.c_str(),
++                    O_WRONLY | O_CREAT | O_TRUNC,
++                    0644);
++      if (out_fd == -1) {
++        std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl;
++        close(in_fd);
++        return 1;
++      }
++    }
++
+     if (codec_type_.empty()) {
+       // HACK:  Define an EmptyMessage type to use for decoding.
+       DescriptorPool pool;
+@@ -957,13 +979,20 @@
+       file.add_message_type()->set_name("EmptyMessage");
+       GOOGLE_CHECK(pool.BuildFile(file) != NULL);
+       codec_type_ = "EmptyMessage";
+-      if (!EncodeOrDecode(&pool)) {
+-        return 1;
+-      }
++      success = EncodeOrDecode(&pool, in_fd, out_fd);
+     } else {
+-      if (!EncodeOrDecode(descriptor_pool.get())) {
+-        return 1;
+-      }
++      success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
++    }
++
++    if (in_fd != STDIN_FILENO) {
++      close(in_fd);
++    }
++    if (out_fd != STDOUT_FILENO) {
++      close(out_fd);
++    }
++
++    if (!success) {
++      return 1;
+     }
+   }
+ 
+@@ -1001,6 +1030,11 @@
+   for (int i = 0; i < proto_path_.size(); i++) {
+     source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
+   }
++  if (mode_ == MODE_COMPILE &&
++      (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
++    std::cerr << "--protobuf_in and --protobuf_out are only valid with "
++         << "decode operations. Ignoring.";
++  }
+ 
+   // Map input files to virtual paths if possible.
+   if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
+@@ -1627,6 +1661,12 @@
+ 
+     codec_type_ = value;
+ 
++  } else if (name == "--protobuf_in") {
++    protobuf_in_path_ = value;
++
++  } else if (name == "--protobuf_out") {
++    protobuf_out_path_ = value;
++
+   } else if (name == "--error_format") {
+     if (value == "gcc") {
+       error_format_ = ERROR_FORMAT_GCC;
+@@ -1763,29 +1803,50 @@
+          "  -h, --help                  Show this text and exit.\n"
+          "  --encode=MESSAGE_TYPE       Read a text-format message of the "
+          "given type\n"
+-         "                              from standard input and write it in "
+-         "binary\n"
+-         "                              to standard output.  The message type "
+-         "must\n"
++         "                              and write it in binary.  The message "
++         "type must\n"
+          "                              be defined in PROTO_FILES or their "
+          "imports.\n"
++         "                              The input/output protobuf files are "
++         "specified\n"
++         "                              using the --protobuf_in and "
++         "--protobuf_out\n"
++         "                              command line flags.\n"
+          "  --decode=MESSAGE_TYPE       Read a binary message of the given "
+-         "type from\n"
+-         "                              standard input and write it in text "
+-         "format\n"
+-         "                              to standard output.  The message type "
+-         "must\n"
+-         "                              be defined in PROTO_FILES or their "
+-         "imports.\n"
++         "type and\n"
++         "                              write it in text format.  The message "
++         "type\n"
++         "                              must be defined in PROTO_FILES or "
++         "their imports.\n"
++         "                              The input/output protobuf files are "
++         "specified\n"
++         "                              using the --protobuf_in and "
++         "--protobuf_out\n"
++         "                              command line flags.\n"
+          "  --decode_raw                Read an arbitrary protocol message "
+-         "from\n"
+-         "                              standard input and write the raw "
+-         "tag/value\n"
+-         "                              pairs in text format to standard "
+-         "output.  No\n"
++         "and write\n"
++         "                              the raw tag/value pairs in text format."
++         "  No\n"
+          "                              PROTO_FILES should be given when using "
+          "this\n"
+-         "                              flag.\n"
++         "                              flag.  The input/output protobuf files "
++         "are\n"
++         "                              specified using the --protobuf_in and\n"
++         "                              --protobuf_out command line flags.\n"
++         "  --protobuf_in=FILE          Absolute path to the protobuf file "
++         "from which\n"
++         "                              input of encoding/decoding operation "
++         "will be\n"
++         "                              read.  If omitted, input will be read "
++         "from\n"
++         "                              standard input.\n"
++         "  --protobuf_out=FILE         Absolute path to the protobuf file "
++         "to which\n"
++         "                              output of encoding/decoding operation "
++         "will be\n"
++         "                              written.  If omitted, output will be "
++         "written to\n"
++         "                              standard output.\n"
+          "  --descriptor_set_in=FILES   Specifies a delimited list of FILES\n"
+          "                              each containing a FileDescriptorSet "
+          "(a\n"
+@@ -2101,7 +2162,9 @@
+   return true;
+ }
+ 
+-bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
++bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool,
++                                          int in_fd,
++                                          int out_fd) {
+   // Look up the type.
+   const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
+   if (type == NULL) {
+@@ -2113,15 +2176,15 @@
+   std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
+ 
+   if (mode_ == MODE_ENCODE) {
+-    SetFdToTextMode(STDIN_FILENO);
+-    SetFdToBinaryMode(STDOUT_FILENO);
++    SetFdToTextMode(in_fd);
++    SetFdToBinaryMode(out_fd);
+   } else {
+-    SetFdToBinaryMode(STDIN_FILENO);
+-    SetFdToTextMode(STDOUT_FILENO);
++    SetFdToBinaryMode(in_fd);
++    SetFdToTextMode(out_fd);
+   }
+ 
+-  io::FileInputStream in(STDIN_FILENO);
+-  io::FileOutputStream out(STDOUT_FILENO);
++  io::FileInputStream in(in_fd);
++  io::FileOutputStream out(out_fd);
+ 
+   if (mode_ == MODE_ENCODE) {
+     // Input is text.
+--- /src/google/protobuf/compiler/command_line_interface.h
++++ /src/google/protobuf/compiler/command_line_interface.h
+@@ -286,7 +286,9 @@
+       GeneratorContext* generator_context, std::string* error);
+ 
+   // Implements --encode and --decode.
+-  bool EncodeOrDecode(const DescriptorPool* pool);
++  bool EncodeOrDecode(const DescriptorPool* pool,
++                      int in_fd,
++                      int out_fd);
+ 
+   // Implements the --descriptor_set_out option.
+   bool WriteDescriptorSet(
+@@ -418,6 +420,13 @@
+   // parsed FileDescriptorSets to be used for loading protos.  Otherwise, empty.
+   std::vector<std::string> descriptor_set_in_names_;
+ 
++  // When using --encode / --decode / --decode_raw absolute path to the output
++  // file. (Empty string indicates write to STDOUT).
++  std::string protobuf_out_path_;
++  // When using --encode / --decode / --decode_raw, absolute path to the input
++  // file. (Empty string indicates read from STDIN).
++  std::string protobuf_in_path_;
++
+   // If --descriptor_set_out was given, this is the filename to which the
+   // FileDescriptorSet should be written.  Otherwise, empty.
+   std::string descriptor_set_out_name_;
+--- /src/google/protobuf/compiler/command_line_interface_unittest.cc
++++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
+@@ -95,7 +95,7 @@
+   virtual void SetUp();
+   virtual void TearDown();
+ 
+-  // Runs the CommandLineInterface with the given command line.  The
++  // Run the CommandLineInterface with the given command line.  The
+   // command is automatically split on spaces, and the string "$tmpdir"
+   // is replaced with TestTempDir().
+   void Run(const std::string& command);
+@@ -2337,6 +2337,17 @@
+     EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_));
+   }
+ 
++  void ExpectBinaryFilesMatch(const string &expected_file,
++                              const string &actual_file) {
++    string expected_output, actual_output;
++    ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output));
++    ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output));
++
++    // Don't use EXPECT_EQ because we don't want to print raw binary data to
++    // stdout on failure.
++    EXPECT_TRUE(expected_output == actual_output);
++  }
++
+  private:
+   void WriteUnittestProtoDescriptorSet() {
+     unittest_proto_descriptor_set_filename_ =
+@@ -2431,6 +2442,19 @@
+       "net/proto2/internal/no_such_file.proto: No such file or directory\n");
+ }
+ 
++TEST_P(EncodeDecodeTest, RedirectInputOutput) {
++  string out_file = TestTempDir() + "/golden_message_out.pbf";
++  EXPECT_TRUE(
++      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
++          " --encode=protobuf_unittest.TestAllTypes" +
++          " --protobuf_in=" + TestUtil::GetTestDataPath(
++              "net/proto2/internal/"
++              "testdata/text_format_unittest_data_oneof_implemented.txt") +
++          " --protobuf_out=" + out_file));
++  ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath(
++      "net/proto2/internal/testdata/golden_message_oneof_implemented"));
++}
++
+ INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest,
+                          testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
+ }  // anonymous namespace
diff --git a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
deleted file mode 100644
index b64b56a4da19..000000000000
--- a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/15"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="emacs examples static-libs test zlib"
-
-RDEPEND="emacs? ( virtual/emacs )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.4.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.4.0-protoc_input_output_files.patch"
-	"${FILESDIR}/${PN}-3.5.0-atomic_operations.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# The build system wants `protoc` when building, so we need a copy that
-		# runs on the host. This is more hermetic than relying on the version
-		# installed in the host being the exact same version.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs[@]}"
-		myeconfargs+=(--with-protoc="${PWD}"/src/protoc)
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.5.2.ebuild b/dev-libs/protobuf/protobuf-3.5.2.ebuild
deleted file mode 100644
index 0ed30529f285..000000000000
--- a/dev-libs/protobuf/protobuf-3.5.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/15"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="emacs examples static-libs test zlib"
-
-RDEPEND="emacs? ( virtual/emacs )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.4.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.4.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.4.0-protoc_input_output_files.patch"
-	"${FILESDIR}/${PN}-3.5.0-atomic_operations.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.6.0.1.ebuild b/dev-libs/protobuf/protobuf-3.6.0.1.ebuild
deleted file mode 100644
index fc490f98194c..000000000000
--- a/dev-libs/protobuf/protobuf-3.6.0.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="emacs examples static-libs test zlib"
-
-RDEPEND="emacs? ( virtual/emacs )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.6.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${D}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.6.1.ebuild b/dev-libs/protobuf/protobuf-3.6.1.ebuild
deleted file mode 100644
index c8c5f7d7e2f3..000000000000
--- a/dev-libs/protobuf/protobuf-3.6.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="emacs examples static-libs test zlib"
-
-RDEPEND="emacs? ( virtual/emacs )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.6.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch"
-	"${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${D}" -name "*.la" -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.6.1.1.ebuild b/dev-libs/protobuf/protobuf-3.7.1.ebuild
index 1d00ee9032f4..f28a36c024b2 100644
--- a/dev-libs/protobuf/protobuf-3.6.1.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.7.1.ebuild
@@ -1,16 +1,27 @@
-# Copyright 2008-2018 Gentoo Authors
+# Copyright 2008-2019 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
 
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
 HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
 
 LICENSE="BSD"
-SLOT="0/17"
+SLOT="0/18"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
@@ -22,10 +33,9 @@ RDEPEND="emacs? ( virtual/emacs )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.6.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch"
-	"${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch"
+	"${FILESDIR}/${PN}-3.7.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.7.1-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.7.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
diff --git a/dev-libs/protobuf/protobuf-3.6.1.2.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index 1d00ee9032f4..ab63263883b6 100644
--- a/dev-libs/protobuf/protobuf-3.6.1.2.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -1,17 +1,28 @@
-# Copyright 2008-2018 Gentoo Authors
+# Copyright 2008-2019 Arfrever Frehtes Taifersar Arahesis and others
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
 
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
 HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
 
 LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0/18"
+KEYWORDS=""
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
@@ -22,10 +33,9 @@ RDEPEND="emacs? ( virtual/emacs )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.6.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.6.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.6.0-protoc_input_output_files.patch"
-	"${FILESDIR}/${PN}-3.6.1-libatomic_linking.patch"
+	"${FILESDIR}/${PN}-3.7.0-disable_no-warning-test.patch"
+	"${FILESDIR}/${PN}-3.7.1-system_libraries.patch"
+	"${FILESDIR}/${PN}-3.8.0-protoc_input_output_files.patch"
 )
 
 DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
diff --git a/dev-libs/quantlib/Manifest b/dev-libs/quantlib/Manifest
index e34977e41bda..6b8b5c73bf24 100644
--- a/dev-libs/quantlib/Manifest
+++ b/dev-libs/quantlib/Manifest
@@ -1,6 +1,4 @@
 AUX 50quantlib-gentoo.el 163 BLAKE2B 1bdbe9c975eae1442ea582b436d620dad2d9240bd97330f9c887ed6d87cef38ac63cf098f3c645a41c1584dee35a6db215a9912cb1d67748215b94496e4bac02 SHA512 8c6738225465bf938900f0fadebc22a52a9a02fe28926d87b9b3d84539332f5ce51f706a8d4182b46e8a38e3c4ddd053b621c96af13a956b5233123947e3d00c
-DIST QuantLib-1.6.tar.gz 8714267 BLAKE2B f59b1250ea653d6b999945a3f19632fb071656eb6f7f90c6483db2f0f2104169ab0c8155c1205b16c002a78da73ff7a7b25f948a0adeca679e9e5cf127e09212 SHA512 c38cc894873a36942c022c1d70eb7b0c5f2e9208ee9e949a656aef02fb9fe95436955b560b61188ea5a374f4b7674b46629178779e066135396f291788d772c4
 DIST QuantLib-1.7.1.tar.gz 8715844 BLAKE2B 0193f1b6d73d66b148840671b7321e926a81a3eec2d1ded3a3398e9531c71cdb12454e059960b7707c9383bedddd136ab92e2550bdda265c54b0cf26d904b972 SHA512 8ba4fdb219b2886b448dbc6370ce6acec9f919a6baf7e8275a76ba13e0bf2d08cbb88cd5a3e450bcf379c17bd0492a9259483089de65e24b95d708f259bc30a7
-EBUILD quantlib-1.6.ebuild 2063 BLAKE2B ff069c4bd27654770c31368a856b3f05b261911929d870debf730eb4259c3d1b480c261407feb4aea2b8437892b89bcc49a8a90f3c74a6a58feefdb04d13a12b SHA512 b3e0d282d9a26c0cb1a312558e9a4030ed172e8d8c4aa64906bb399987d968667c33fad8e061d1b93b3df93e2bcced73b218928629d1804fb4582ec981c53bee
 EBUILD quantlib-1.7.1.ebuild 1998 BLAKE2B 74368a55eb7977880f53f4cc7155f0af470594ea7991d5c1c65b74f7a552a13c4ab0b818a2a88d920bec46249a6d60257ef70b64b074ed3dfd88c2eb1e2d23f8 SHA512 a662ff237a2a8a51a15bd32590f005f6bbd69efb994cf2476ef1523366441255f45ebc614c3dd510419014deabbb6f7329caff59ce09f92914ed6db62588a76b
-MISC metadata.xml 466 BLAKE2B af934000deb4acbfa8f92abda155c961c191b48037c8464a52fb112cdc756540bf0878620b74c961c40a43ecabe47094b6e2df41d05b10ef5f9c5b9fead7c335 SHA512 39ebfd2000ff1d374311a274aae5b36831558cc20522687efb86d4d91737f9a5323d2d7b7d2d64501a38b5da97def4e42d0dc3beb7c5f2f30593b6363d414b27
+MISC metadata.xml 384 BLAKE2B 12806f43bc039788079e60be6e58a9d6893fdb132ed506c3f67bf7a8afb4dc2a5004833766356d766eb07c4a0b09c1065ebfe9a1970e7fb2a35c5f1a130250a5 SHA512 33178f4687b755d393b444b826ee2b7b8cafe4910e8c682621876fe8bf667e07b4c8be5be26b3451ad2e69a3f2721820d3f036eaaedc44037faf368f3ceaa560
diff --git a/dev-libs/quantlib/metadata.xml b/dev-libs/quantlib/metadata.xml
index d50e3d02723b..7099f55d0871 100644
--- a/dev-libs/quantlib/metadata.xml
+++ b/dev-libs/quantlib/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 QuantLib (http://quantlib.org/) is a C++ library for financial
 quantitative analysts and developers.
diff --git a/dev-libs/quantlib/quantlib-1.6.ebuild b/dev-libs/quantlib/quantlib-1.6.ebuild
deleted file mode 100644
index 193731dc5a99..000000000000
--- a/dev-libs/quantlib/quantlib-1.6.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp-common eutils toolchain-funcs
-
-MY_P="QuantLib-${PV}"
-
-DESCRIPTION="A comprehensive software framework for quantitative finance"
-HOMEPAGE="https://quantlib.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc emacs examples openmp static-libs"
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[dot] )
-	emacs? ( virtual/emacs )"
-
-DOCS="*.txt"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-pkg_setup() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	# NOTE: Too fragile for single .pdf or .ps document
-	local prog
-	for prog in DVIPS LATEX MAKEINDEX PDFLATEX; do
-		export ac_cv_path_${prog}=no
-	done
-
-	use doc || export ac_cv_path_DOXYGEN=no
-	use emacs || export ac_cv_prog_EMACS=no
-
-	# NOTE: --enable-examples will only change noinst_PROGRAMS to bin_PROGRAMS
-	econf \
-		$(use_enable debug error-functions) \
-		$(use_enable debug error-lines) \
-		$(use_enable debug tracing) \
-		$(use_enable openmp) \
-		$(use_enable static-libs static) \
-		--enable-examples \
-		--with-lispdir="${SITELISP}/${PN}"
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		pushd Docs >/dev/null
-		emake docs-html
-		popd >/dev/null
-	fi
-}
-
-src_install(){
-	default
-	prune_libtool_files
-
-	if use doc; then
-		find Docs \( -name '.time-stamp*' -o -name '*.doxy' -o -name 'Makefile*' \) -delete || die
-		insinto "/usr/share/doc/${PF}"
-		doins -r Docs
-	fi
-
-	if use examples; then
-		find Examples -name '.libs' -exec rm -rf {} + || die
-		find Examples \( -name '*vc*proj*' -o -name '*.dev' -o -name 'Makefile*' -o -name '*.o' \) -delete || die
-		insinto "/usr/share/doc/${PF}"
-		doins -r Examples
-	fi
-
-	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 2228cadf6b3f..e07014279b21 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -8,5 +8,5 @@ EBUILD re2-0.2016.05.01.ebuild 1202 BLAKE2B 0594d59305793044b9fed2d0570a6c68c538
 EBUILD re2-0.2016.11.01-r1.ebuild 1305 BLAKE2B 8bc950fb1337eeb4f811b3a3a7435b28dce8ec9dad238095a2b19457eced7585ddf64e32844e7970e50b87f3fb913f5dcc9d7529094055e4e1a299ed75950c75 SHA512 a5ef7207e94fc73bcbc4fdd809fa3ed580c9ec0880e073124986a4bdbca7e726be0c122fe7b6f384db8a0ca654645c9fadfb16e3f035e78a1c74e6bca80850c9
 EBUILD re2-0.2017.03.01.ebuild 1305 BLAKE2B 8de6b4e1d07af2677a77755753ff474d818373c0be13008c326972de4cb02b949eb923b1c0353dc0130753d563f6deef1fc54104d32bbcc2c16f676c3afa27ad SHA512 bda266f9e96eec73858ad9c7e0f91f327c216e3d6044bd07abf58dfdf822313e6e7f7b9129b852e0b1ca4ae2bc8ad9c4a38e89e200bac433efd180fc2e7abf60
 EBUILD re2-0.2018.04.01.ebuild 1306 BLAKE2B dcfd4db7dfd17f0ffbab32c96f605ff815933859635e6296570a5783d03b02b221f560ccce8582e2635614f29c379f34e2b375480c06e0d14fe114aa43a15d2b SHA512 c4af6a5638e487c3ce981649ef8ccb30dbf4cf59cd21f06dfef2af8ac0bfa69eb13d11bb9b64b9d575adf15d84fd57163a37dc439abb15086924aad6b54a821d
-EBUILD re2-0.2018.10.01.ebuild 1347 BLAKE2B c85cab9916da7b0b44e3adc11e4b56b89cff568b934b04432763087bf9b0bbb5d858c33d4b5a0fea9b8186020426cb27d4afe59e7cc29b58f47a0c39985d0ee2 SHA512 3b0c73a60d6d4e026542f611f81b570da82edff4c68b68328e9739d1bf54bd95602519f850439bbed547f991542209530429df17d4f59c54d443458a2465e36d
+EBUILD re2-0.2018.10.01.ebuild 1346 BLAKE2B b5078682c1e7244796aa2f9e1bc63a2af8e6627d110cfd8846c129881998d93daa66d830d7d3553e725ada19c5508e21b6e7f0a8fd0d658d3e397ca642dbf623 SHA512 30de1552eb499ac0c1f25b4f06feb319d1eaf64868e3b782265868b5e7ce670df688138a99331590dcedde9f3843cfccfd1b4a1eb8831d59057791f314ad3d4d
 MISC metadata.xml 337 BLAKE2B a584c0de18fba97bedbfc3589eb7e35d2f9f794946f8161c50e807e6ed8dc90631b9aecf3f20b6e04bc27b4b5f92e9044221a50a92f8ed61052794392a0f68e8 SHA512 5dbef91cae8363700badc73e352829c4e4e8265bdb96104136c3759d1731148b7260840b4319116ceac00aa9ba17de6eafa2cf9684878b7e9f032469b6f2fec0
diff --git a/dev-libs/re2/re2-0.2018.10.01.ebuild b/dev-libs/re2/re2-0.2018.10.01.ebuild
index 68a4655f113b..a7536bfa74f4 100644
--- a/dev-libs/re2/re2-0.2018.10.01.ebuild
+++ b/dev-libs/re2/re2-0.2018.10.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="gentoo-2017-03-01"
 SLOT="0/${SONAME}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="icu"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index 569cc6c54c2e..af513acd6829 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,4 +1,4 @@
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
 EBUILD redland-1.0.17-r1.ebuild 2464 BLAKE2B bed3fcba31401116c045a440fb1aab2196c25ad3070eaf0a11683087fea07d0e6998c612c034c6bfefeff5adbc12b87c69ef207585fbff9f2880aaf775ddf249 SHA512 f2975cf0c971b53381f5a7fbd54292812a2bdc8e96982069ede430de93b174c27f2404b26209aa45ebf6c15d1ee545cf78fa03f241f34a3e8b01b49fd25e9258
-EBUILD redland-1.0.17-r2.ebuild 2507 BLAKE2B fd990448f863d5a93238aeb9e0f4eaddee083cf43b6c9e4df796c7e69239c9f138fad905f7b91fd1702aee500ba7bb3482628794baf15345c4b36069e223e763 SHA512 559c5a8fb783645de1fa6a9c878d639c33975a2faa503eb790fbba8502b5fdec2eebba3ca05ba876b940d27d003e9c31afcc77d83ad5d0bc814212d4d2f66dfa
+EBUILD redland-1.0.17-r2.ebuild 2503 BLAKE2B 632ba83485255d92bf644f3533687b0065f9d12f2f7e9df4fa3836148e4d219e5de47a826e63e81c0541c69ff7e31fce3995f07923e7dbfd9813723409a85d08 SHA512 9d9fc7d9a3b505c6036527d32be27daa9b59e1db7e6d32ea2aecdaecc15ebacbabb463948c5e4bd1788ca110e441e68c7b1eefc8c2297fcc69edd68e5d233e78
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r2.ebuild
index e80533ce8157..19a0a142d345 100644
--- a/dev-libs/redland/redland-1.0.17-r2.ebuild
+++ b/dev-libs/redland/redland-1.0.17-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.librdf.org/source/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
 
 RDEPEND="dev-libs/libltdl:0
diff --git a/dev-libs/rlog/Manifest b/dev-libs/rlog/Manifest
index 34b866dc6bbc..94a39d7153b1 100644
--- a/dev-libs/rlog/Manifest
+++ b/dev-libs/rlog/Manifest
@@ -2,4 +2,4 @@ AUX rlog-1.3.7-gcc-4.3.patch 203 BLAKE2B 805bae9fa8ab6f9d069056cd8c0c2df96f5b509
 AUX rlog-1.4-fix-build-system.patch 1283 BLAKE2B 2e7d38de9be902224dd82ade699ed9aedb56cdbf9ea272373e74d541c126c4edf2a5814cd078e4309887c8f732c3731ed035bf3018ebfbee55adc3f74328198d SHA512 e956ae108f61d8e71379d0b2722e670d52d9954713725629309f91176f419b9a188578e4e3381992ad4bbf577fb2b747d8680ad01b5e92864f4c6be721095b4f
 DIST rlog-1.4.tar.gz 640641 BLAKE2B ff17c9cefb20045a95d69954dd6d1756a342a5a97b640e8a286db98e5e55d1cb05da48a5df7ba1ad4b5f23678cfefd677cbf6f9f45ab647373858a2ddf25881e SHA512 a0af9afd6c5329ec4269a7778c3236b9e0b438cba65ed0a6f9cd7e802d196b7908eed5ab663f52905869cacffc7f1964b20ab2a53b37dbe65f1c8a9226cc423e
 EBUILD rlog-1.4.ebuild 578 BLAKE2B 2468285a3a8bcc744e48b78f9553c814dd0f20471c604ed84f338d82af57e904521335cf74f6288baa6a3eca7923cfc0ab7c3a47ff8f66986acdc3846dd6c208 SHA512 8854dea14986aa02096672f162ebb653fc486b2af2369e2a47ebff5674ae6f360ec2d5c4131dc8f7202221fc0f372a9589bb64c3a866fb3cf46bbbbfa77b588d
-MISC metadata.xml 323 BLAKE2B 24c50af72b0366021e5909c8c82cd536a8cff3ff1ec24e5120810782bec14088b0a2c60f46ecc819a08e009a98b38c58f89c4c1b2886604e8583f3c3eb23a943 SHA512 5a15daf1a6599a6b93b64475aa4dec483281d4d1622fb24bfab2a27c4806846027a16bffb910d0881621879a6209d8d00c816b37a0397983d1d1e951fa32a006
+MISC metadata.xml 241 BLAKE2B d2fb5a8dd2362e8f7e35773ec2cba521024c9c707ee575cd4f88175ea7a485e4b3ba15c849292276fde6616067a03e13513e1aef73a0dc1e9d92c01b80ea4178 SHA512 619305d12905676e8b9becfcda5d3f843c14c89060fe6a2260aa4563cc98e9966ef48e4a896625274abbfb47c146c69f9c98b83e0c5cf1010e718c30440a837f
diff --git a/dev-libs/rlog/metadata.xml b/dev-libs/rlog/metadata.xml
index 1f03a0d1e051..0aea6477ceb4 100644
--- a/dev-libs/rlog/metadata.xml
+++ b/dev-libs/rlog/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">rlog</remote-id>
 	</upstream>
diff --git a/dev-libs/satyr/Manifest b/dev-libs/satyr/Manifest
index 16ee197a9e5d..b23717bb1ed6 100644
--- a/dev-libs/satyr/Manifest
+++ b/dev-libs/satyr/Manifest
@@ -1,5 +1,5 @@
 DIST satyr-0.26.tar.gz 434820 BLAKE2B 4463c69e6ac2eb8237f599bfeed308265a906c6e3efa154b14eb6ee7acdc65580da9baf5ecb99e4efa4f8c00f7656ff2a747e607f2293b12a513ed680986fe08 SHA512 45dfc42e05e93fa0417c8c5d6811097cabaa0f4dcfb79df13d3840d789cfd41c84382ae84882ca120b1a3120987123a306656324cf39f306046a5d30547db656
 DIST satyr-0.27.tar.gz 435341 BLAKE2B ade40bc6a1c48e6fc0af7913ff94ed044c63fdb63b8d86ba010bebcfd2098831bc6c7361d116851aee88f49c640d1457dd8953becad60b6ff6dc32deec6c7942 SHA512 7b01cf16489644fbfbe2150477279a94c6fa9b3310edebc84b83bab58d1058df0be478ab6bf4c6910b4168122721dde10d573711abb983b0eb5ccda09cb80710
-EBUILD satyr-0.26.ebuild 1004 BLAKE2B b5d3f80e47de950bfe174b8a2740edb7c06b39bbbcfa654f67d953fec8be553179c639f1457c12482033a6dc4059e53f04511a9d24ad6d3cb0d50af95b60ad02 SHA512 9bea552420ef0dbc15e86873c89b44c4b92d42387504f737cb786f8677791a0c61475fbb54e1b02c38ea2f2d6a905a70527c47f215dd9e9285f1d9ae456d80c4
-EBUILD satyr-0.27.ebuild 1006 BLAKE2B 1d09128f62dab8399f78e6144e6c890b6ca726b2bbc846942af2a6133326c772e093f3d0838319dcf4045b7fc4b3d3c41308f89c157e4365f56a0c1049dfeafc SHA512 036069f7095ac9b7363f6507c12eff56fb58f81702faf512ada23604d1ad3213cd7fa6f04e107f1a55a2bac86a91baea6f0f8fb59c21e19d87b3a82869772410
+EBUILD satyr-0.26.ebuild 1002 BLAKE2B b0c1a8d0834bf9afb5c75e6579d487006cdde99bc48c3fd28acd6baa962777d188550d752c6043a1cc402e42d7d2843124a5b5852746fae62c645f633d1312e4 SHA512 1940705374030503aacdf29dfad75b6052bb2357fcf808fbd8556a8e92a0b1567cd897fc8e91f6d5c4187bde67baa78263e2f3c0d54c81dae66b8b0fa8cfb949
+EBUILD satyr-0.27.ebuild 1004 BLAKE2B 511d1d574d4be5b9588a88468a2d45d9bf529d67f14f06fe259cd7ce65a7155db76051d9d8e3225d4616022f97875043f1973e6af4d4cc8eb647472a47b29f44 SHA512 ec3782a89ff3775d0cebe78c5d529f9eabd3fb5da90a6a3c69da3424dfe61f250ad218023f0d469335c5f8ca6b0ad439aa28f5463e2c25065c4e1347e6579cea
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/satyr/satyr-0.26.ebuild b/dev-libs/satyr/satyr-0.26.ebuild
index a00468b24ad7..064dde807ba2 100644
--- a/dev-libs/satyr/satyr-0.26.ebuild
+++ b/dev-libs/satyr/satyr-0.26.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit autotools python-r1 toolchain-funcs
 
diff --git a/dev-libs/satyr/satyr-0.27.ebuild b/dev-libs/satyr/satyr-0.27.ebuild
index 2ff1248e54fc..0a2c9047857c 100644
--- a/dev-libs/satyr/satyr-0.27.ebuild
+++ b/dev-libs/satyr/satyr-0.27.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit autotools python-r1 toolchain-funcs
 
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index cba48ac08216..91ff0eb305bf 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,3 +1,3 @@
 DIST serd-0.28.0.tar.bz2 371592 BLAKE2B 143e858b5947cd52d01341ec7ff5fb36f98aefceda4e748b2a999c2e6d2c972b2f5d30053d8538f04f236597da93a595d0fabbfa4c667397e27d4c897458d1ee SHA512 b25cc70af17ff821812ab2a70c2812c1713ff811a0f18fb5d5c54f3b67e0c68293aabedfacd687afe6b7acdfd81602ef81764d7e11bc0d933de738bc6d4fce3e
-EBUILD serd-0.28.0-r1.ebuild 1127 BLAKE2B 30d3c463e0102d0056313ccfa5a18ddc19366159a77329757b67bc6915bd5d2ca5effa7317bf35e10c65d0f074040a45ccaff47b202ea18d3d124f150adf9311 SHA512 6253cc5247398bfa13a6e8aa6ac922174ce7201bb31a0923f3a3a869e0b8a6b1782e9c3af4a3382fff019fd1ece718e8e4f94242781777948975459ba40d8ec9
+EBUILD serd-0.28.0-r1.ebuild 1123 BLAKE2B cdc884e5acd464322ddf4d5640dab58d812abc06fde01ca8e489a78a4f189dd9622871053f80930bce9060bf01846adbd69c74434907875a194453a17381d53b SHA512 72880352428cb4df6bb15a970474d60402b2dd17cf953d84c0221f7210527fdadb31774beccb3e4e16bdc6faacf34ea2bb247428fd24772e3ff010f6309b0be7
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.28.0-r1.ebuild b/dev-libs/serd/serd-0.28.0-r1.ebuild
index 9dce73434882..716194bf0d93 100644
--- a/dev-libs/serd/serd-0.28.0-r1.ebuild
+++ b/dev-libs/serd/serd-0.28.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
diff --git a/dev-libs/shhopt/Manifest b/dev-libs/shhopt/Manifest
index 414bab9f61c8..915d17006517 100644
--- a/dev-libs/shhopt/Manifest
+++ b/dev-libs/shhopt/Manifest
@@ -1,4 +1,4 @@
 AUX shhopt-1.1.7-build.patch 1884 BLAKE2B 1854a892ddc14d7202efbb4ebf20778a10ae1c490a40b28157e313c711fb946a925f61a71cc2f3919f6f55718636d05486e79e89f730575528bc3b0d2894fa34 SHA512 79eca8ada571f2f514d540a4c52fdf9503764f67422173bff160ed3ca04b0578c0a88a147234ffaad7a5ba94ab7d265785277062b25438abb888c92fab99d4a8
 DIST shhopt-1.1.7.tar.gz 9923 BLAKE2B 4f9fb23a67c03caf6c56227729a681eac3ee9c78e16f56d6fedd2b1cdbe56471150d9e91ecf84945348078d03102aa7e7cc98b4cf11dda6f5da79d1edc48b96d SHA512 bd985d50e87808b5c6993496ba3e7c255d47895d90e108f03fd72bb273e786730898048af3b30ca29cb5dbd058f2ea178ca73b6362211c50aa0eb75f743b5ec8
-EBUILD shhopt-1.1.7-r3.ebuild 660 BLAKE2B de4f5af326bb86c2352d29849af49a15d2bd1235a449fed9ca54aa28238ed6badec20b8208cc2ecd8eff3d9353b67b949b3008b9bdc01740cf84e33bbf7085f7 SHA512 e1bca2629ab3542401f9f20c59f72ff36f7e3b834bb895f1ae648cdc2c3d0b41486fb053a270832639d0645f12c7f7ff3cc04b1aa6c5b10c9fd211ef31535d5b
+EBUILD shhopt-1.1.7-r3.ebuild 662 BLAKE2B 65f8672454fc417d5a421dd742b11e4fd1a45959456b1139dda9f0c0ba9fbc9669e5b02b09d89cdac5146768ae4f16d952b233094475423229426a5632ec1789 SHA512 f2833566926e3b1ff808f0b10785d900a83b44afc1f457a7204b0aa9308281ab62a15f906c4e57217029ddda1547330c71f4221203e17b451d830be21fe7cbe7
 MISC metadata.xml 341 BLAKE2B 738802ec66db2e5052eb57b90dd0076cca1afbdca62fa325f920f0ec6f4ff4b78f886402783ad6f97c7b10e4e2ec10bbaf1bf2bc8823bd48d048c35141a6cb77 SHA512 276ee6e17baeb1981c1c912b4f281d7eb71b171492d00d5ce522c3d6defbba4eef3dd87b43d4ec02eda21cfe148f2b0dcbe04d7dbd9a42918168844b563427f4
diff --git a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
index 998b6d692917..1d63a8b89ea7 100644
--- a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
+++ b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="library for parsing command line options"
-HOMEPAGE="http://shh.thathost.com/pub-unix/"
-SRC_URI="http://shh.thathost.com/pub-unix/files/${P}.tar.gz"
+HOMEPAGE="https://shh.thathost.com/pub-unix/"
+SRC_URI="https://shh.thathost.com/pub-unix/files/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
diff --git a/dev-libs/socketstream/Manifest b/dev-libs/socketstream/Manifest
index a2b7a6962b95..4d9e27da92e8 100644
--- a/dev-libs/socketstream/Manifest
+++ b/dev-libs/socketstream/Manifest
@@ -2,4 +2,4 @@ AUX 0.7.0-missing_includes.patch 396 BLAKE2B 9e9412c4c6926cecfb2cde1f74baf0ea781
 AUX socketstream-0.7.0-gcc47.patch 263 BLAKE2B 0104caa8685cf70a56b4f78baaba54e6af7b703e6f505932781a80b1152d3d8d482cc8a8af376c6c6214152b4b62049b4022ecc1e4a79cf5211c6e4ebd404027 SHA512 2bf8ca41e0d755e4834a139e3c59788a018f3d43590e52f398676e5086827909cb0edee96548a8ecf90a2621cfd04e7ea2490d68944896e6a6abfefc428ac0c6
 DIST socketstream-0.7.0.tar.gz 464806 BLAKE2B a27cd848dad6a3570fad5eb74886106e0e50f5a62e84751e558e17ae6b7b0c4a3d6d257d473e4b64f7b233e6621ce44df24dcde5d11a7cf60f2de18d7110a352 SHA512 61eae3e5df80329e5b81f8d4d3148d16b9ee278b8898ed59e058ea960bd82cfa0d9a01f5ac9ea18ddbabac9d2d3347c49bde870cc74c16a7deb46f99bf443fe9
 EBUILD socketstream-0.7.0-r1.ebuild 1026 BLAKE2B 7d2c943ca6f9ad4312dc1ab0ba68c39811f42b4b620df49e1a7de426b7d832f598dc1e6ab91e00e230aaf94ecdbaa68e29faacf75f0334f38b9d3701f235e232 SHA512 367652f8c7f58666cff26d7fa974bf0dd1e1d1001cae388998b5e3f1a89f3e4d916afcf82e3f4cfc9ec2ae4fbcb5012bebf755944b55541da7da60b6f951532b
-MISC metadata.xml 331 BLAKE2B 6cb243a206a4ea864b8f37fd38cae9d4b3b68c8e25ebe1ca0d3d72e64161f81ab87868374f51ae792b3e4213025b9b56b9a2cce07662848bd100bbc5a9d22de5 SHA512 9ee052189ef6c1f1b3257502f46b1e40edefdfb2ab545b8c5effb7a8baaa4178b61e483855c06816f96614a0a39af908ce0ef8e7d23c1b281c784f0f9ba78cba
+MISC metadata.xml 249 BLAKE2B d4af425e717982e9a6ac4be4ea8b400c4073f67a7df6177b18a4886fe90a2c93a710bc45877be7da63b767dc292b34d081645ec1a3bb1118bf0c89d83e889e1a SHA512 46f197b755974d1a0ce78f2220d6f63ea4b2a9a9f019a9866a86d6cccecae435f3853a8bbe70bc2f16efd5123a60c784439cf16c45aa1989a57c5c10f0477760
diff --git a/dev-libs/socketstream/metadata.xml b/dev-libs/socketstream/metadata.xml
index 8c3a60f20d4f..663da9bcbe4d 100644
--- a/dev-libs/socketstream/metadata.xml
+++ b/dev-libs/socketstream/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">socketstream</remote-id>
 	</upstream>
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 9e204a8a4ebd..657a0294c108 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,3 +1,3 @@
 DIST sord-0.16.0.tar.bz2 316331 BLAKE2B 27702600e48e14c75be18cc2b83705cdea1eed7158223ee685821ae80b18b61f5db82f804ee6a32236143cf8287ee875c3b3354edc6ccd1d4f25eaa3a04c785b SHA512 e18c6de62f2cbffedd4c200f6452f4fd37f719aed764ccc1b77c8da04a0f3394d47e8b57e19eefd6d600770926f505fdfa5da91564bbff5f4ead49f1adaba249
-EBUILD sord-0.16.0-r1.ebuild 1129 BLAKE2B 50e44a079b74d80edcb04e4d77d23935ed3c203add738be90c8809a2ba91a74b5b1410c938dbc161247f925b6e0c9d2314e52ff9b33c48bd91832c8d5886e61a SHA512 eec6a4be9b48038718489127141aed511e07da94bdb7d0ed1fc9ed2d01332d04d86332f4458dcacf7e2ca2ded0a81ff0a4852821d6e646e1ad439d198510ac49
+EBUILD sord-0.16.0-r1.ebuild 1125 BLAKE2B 1d9ceef0ddb0a470d528943c6d135de64d516bd6e727c4005c3fca44d32578cce8deb339f12f592fddff90f621831a9890af3bb4a5f59cfef67b7ba044ae645e SHA512 ee35c6fb723232babbdeef2adc8f3243d85c652a301e4a0cc312af0325de0fb36ac4e84bfbe8c6203aa9a0fcab74e688bb9b9b5a99c63694791707f5e43ef12d
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.0-r1.ebuild b/dev-libs/sord/sord-0.16.0-r1.ebuild
index bbd7ff4c4cbf..6e8b08b93d41 100644
--- a/dev-libs/sord/sord-0.16.0-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
diff --git a/dev-libs/spsdeclib/Manifest b/dev-libs/spsdeclib/Manifest
index e7143a5664cf..d4f6c644a7d1 100644
--- a/dev-libs/spsdeclib/Manifest
+++ b/dev-libs/spsdeclib/Manifest
@@ -1,4 +1,4 @@
 AUX add_symlink.patch 804 BLAKE2B 2b0eec3a3a9008b887cd4af8f2900631fa347890cd37ced2930fbbe21b05cf213e6b088d2798173ae6c89a75467db0e6111e3e3e738d37eca7fbc884725b66ee SHA512 ca370e101057851e214009ef6880afa4a96711407d28e3ce34592317200c7da623996c7fcf7c31aefe55ffd6b649ab5ff970fc0134435114234f4436919b93ad
 DIST spsdeclib_5.1_source.zip 282236 BLAKE2B 6f37a3f0791baf9ca7a6bb3532be4cd7bcf90cdc2fc51def4d5daf4419c6b8c08aef87275555f359394e37e5ab6cf34d1e4903bea542ff99f7dc317238dd52b7 SHA512 26db037096c7c98c1af800577ce298c6b572541f665b512e80c6268818075d3c46d296b282268bd27a73a34f4063607ae8dd9d6d7a9301c441eb9cfce780f439
-EBUILD spsdeclib-5.1-r1.ebuild 1189 BLAKE2B 77d87f09fc6c259018139f23c64ad02d738e9b677ac0e7ee4f77f6dc34b95aeca13faee82703a8e8936fd4f1ffa386d506507b5e7ba7cb1f7d64453a11a96fa3 SHA512 d833fe947a78438856640fe25b8a266996020b2037d12e47a7e5a69e961a20cecef4f3019eaba072737e18edf79ebdde1a33f37b509ce228876439befb132b19
+EBUILD spsdeclib-5.1-r1.ebuild 1188 BLAKE2B f7678d22d3d4f7fd2caca5aee1a227ce31d4c45f8604e569b006a94084c3ec0c7e1de4a8ae923511506adea968aba16719f1b639d14a71851879ed2d216675b8 SHA512 40265a833ca431f9ad9679889840968870a426607f376a0a353ac36a04c8dea9457a640f49d4c05fc050de03fc03deda2aeb562d984fa5a1d80f004f341516b1
 MISC metadata.xml 564 BLAKE2B 12f28c6acaf31c25b52acaf1bd5853216ffb6f0924c9f815e814c56b50aa657603ef0f3e0e89daf072e463feb34c135d59c7351174bdf3a4b347215937311ce1 SHA512 42781e4e7c15a066141221c92421c174dbc748de3ef94cd419d23c0c9ff85cadb90295543d126362ca8e346ba5171ec3a527a46f6018d0b16beda68c7b432b45
diff --git a/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild b/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild
index 013853297f05..344c3f15737b 100644
--- a/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild
+++ b/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ DESCRIPTION="Kryoflux SPS Decoder Library"
 HOMEPAGE="https://www.kryoflux.com/"
 SRC_URI="https://www.kryoflux.com/download/${PN}_${PV}_source.zip"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Kryoflux-MAME"
 SLOT="0"
 
diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index e6fb79d0273c..cd89399dc466 100644
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -2,5 +2,5 @@ AUX stfl-0.21-python.patch 1936 BLAKE2B fc0a8f02eaa30b900652304e34f383a6587769f4
 AUX stfl-0.22-ruby-sharedlib.patch 735 BLAKE2B 6b2b9e835f57f62ff1e1ff871103bc0b1106329916fc1be75eb22e550c9ff8abd007bbc201c66e15ce16a4697c0bbe0850b56ff41f666dd7006028432b1f77e5 SHA512 73a1b7aa7147100ab2f06264303c0a30463deb8bd0ce9e4111737393d07c4fb06174c5022c1dae8c7fd2688d1b544a4ab8c8ee5495f46e2bbc33ce89a7e46de7
 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 2936 BLAKE2B 7077d11cc2b9825d65aec4cab7dc331ed2d4683dbb1e70a197544e7e25c89562a5659d3c9851a585c7712917c4c80c0855270ba5c127fd044bf5c83ee4b88917 SHA512 88cd3c1042c427103249d928ec4aa7f992909ef23e6da9342e47b45740742a6cf4c69bd77c045ccec1abcff1e693d7cfebda4fce203bc5006647292c274632db
+EBUILD stfl-0.24.ebuild 2929 BLAKE2B 1763330001db9f888bd0255bde7732a39124383b6365f134cf22278d6c59b5534a5ad5f0ec6d92e78f0c3a596456838d92dbf1f085a9f7edc1074edb3320d3c4 SHA512 7f31eca16ec6373901784af07f3f3251bd336ec725d55e90be016e6ea4bd9f8aeb4c1ade5ea7053fdd721d330ec1fb15ba58343a18bb7cd4fe943cca9345e04d
 MISC metadata.xml 914 BLAKE2B 723117eb04ce97ded544a44d56808ef7ac0e54efd5447543e5faeb65cd361b77b066a7058a91b5fd488fe6c58a6f5f5082837e99fb2a25a8ec8f901b427353c5 SHA512 4cc4e6aa78baa99eaf0224743934011b8fe542566847533368eae86afefa61ba14909eb333c8d7f36801f84afafe2e7f54d8f3aca56516d8c6c034d42b640936
diff --git a/dev-libs/stfl/stfl-0.24.ebuild b/dev-libs/stfl/stfl-0.24.ebuild
index 87e3ee820f41..18f86be116d5 100644
--- a/dev-libs/stfl/stfl-0.24.ebuild
+++ b/dev-libs/stfl/stfl-0.24.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 GENTOO_DEPEND_ON_PERL=no
 inherit eutils multilib perl-module python-r1 toolchain-funcs
 
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index b68ec779206c..65a507ab2a04 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,4 +1,3 @@
-AUX 3.26.2-optional-introspection.patch 1302 BLAKE2B 8563a7d5206765c47757d160ce67c6e8c86c6761364089e602df7158c53f16501b02e9ce3267d4443a30d5784e42c50821358d9ac9be63eb2e706acb61e85144 SHA512 a863084b2db4d9c3c6e25ad45485e59e6039512c03b302b86f37e4f756061449f710a97b7555450b25dcbf86ee13e3c6dcfc5e99c03d0be0e711e50f58d978f0
 AUX totem-pl-parser-3.10.8-gmime-automagic.patch 3454 BLAKE2B fe16c0c78e73ebd735ff619074462d455087c7436d9dcba862771f0aa10df9400960733e1c829fa240af6bc43cea50957dbd5034e95c26bc5c076715b71b1cb7 SHA512 0cb2b632ec79711ced87a8b8df13011defeb2117a3242d28129f53bc3c845a18d929a2697edc99e08b69410d7933ab065a65257fce62c12a8bd72f19bb4d5d6d
 DIST totem-pl-parser-3.10.8.tar.xz 1618992 BLAKE2B ab7dc3010afb9a2112f19991ee74c43436962a66fa233162b2d2c6743e5727762102f6f0bfed2a30750c0d4e3cf0fbfdb7fdab8568b0cb827e49d0f99a938c41 SHA512 1692fe6d183838bdfb9125ae2bf9fbf74762333a7ebb6becc755bfdbfb8d2ea1ae257f42aab7b7a1ab419aee2b35902176a731f26736a62015806d1423adae70
 DIST totem-pl-parser-3.26.3.tar.xz 1314216 BLAKE2B 24b1c7e111456b454022ba7262a1e1483420dbd97b6ec99c0e2631acbb8057134b51ff991d2619e6bda57da6c133e211f949915b0fd62d497905fcd58738b43d SHA512 f059fd9447627268ce5029ed48551b0a2b6c30ba28c50a360d37808ad63fa8423824eef29c7f4d7a752f24861d4c7a7139f321fa2e19085085446e7ed15130cd
diff --git a/dev-libs/totem-pl-parser/files/3.26.2-optional-introspection.patch b/dev-libs/totem-pl-parser/files/3.26.2-optional-introspection.patch
deleted file mode 100644
index f258b20b73da..000000000000
--- a/dev-libs/totem-pl-parser/files/3.26.2-optional-introspection.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e097a4608cafac147546db658a4a37f8a23715ca Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 17 Jan 2019 01:16:40 +0200
-Subject: [PATCH] build: make introspection optional, not based on
- cross-compiling
-
-This is how most other projects do it - cross-compiling that hits trouble
-can just disable it then.
-
-diff --git a/meson_options.txt b/meson_options.txt
-index 9c32a5f..58e9f8c 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -6,3 +6,5 @@ option('enable-libgcrypt', type: 'combo', choices : ['yes', 'no', 'auto'], value
-   description : 'Enable libgcrypt support.')
- option('enable-gtk-doc', type: 'boolean', value: 'false',
-   description : 'Generate the API reference (depends on GTK-Doc)')
-+option('enable-introspection', type: 'boolean', value: 'true',
-+  description : 'Generate gobject-introspection bindings')
-diff --git a/plparse/meson.build b/plparse/meson.build
-index bdfde9d..ad4e344 100644
---- a/plparse/meson.build
-+++ b/plparse/meson.build
-@@ -121,7 +121,7 @@ if have_quvi
- endif
- 
- # Introspection
--if not meson.is_cross_build()
-+if get_option('enable-introspection')
-   gnome.generate_gir(plparser_lib,
-                      sources: plparser_public_headers + plparser_sources + [
-                        totem_pl_parser_marshalers[1],
--- 
-2.17.0
-
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index fd9aa4c4c16a..1f6a139f2d21 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -1,4 +1,4 @@
 AUX 0.8.0-pkgcfg.patch 420 BLAKE2B 6b04ff4db2abc5dffdbca50bcbbe20974fdaa24ab25875f2538eca5af42921a729550e7ea5188225d3d73661e9ba05b96ff345fb4d931130ba4255b14c3944d2 SHA512 a6e4713aa0f9619abe256e9e1ea7c5bc8cbeb9ed173dd856972af70612ac435206e2b294ca5947e93223c17de875ba2620bf57949332b19ecff9965e2ee1a9e6
 DIST tre-0.8.0.tar.bz2 380714 BLAKE2B b2af6e805e9e19fd69debf2f881ddfb591317f69db4e29a04e1899eb69100b8ac7744f86fa438530509ca2ee8aa1d346d416c6391f13247cd9398f4c59c2ed85 SHA512 db7465993e0d25eee8e52f974427b8a040234cf0f017769eb94ee88bc6261821336aad7f762bfa82db7e2212d8449bc221592586f061c528a59a550773cbc263
-EBUILD tre-0.8.0-r1.ebuild 1417 BLAKE2B 3116aa7c2529daa19d049b5c2d2f07ad9092e1183f0665f14b15f27bba5cd925123cdf945d06ad617a0b96b1157e71d456deb655c60401c0ab1a443c026fc747 SHA512 dcd95d238b9974bde331f1974ec4cb389355d6859126091138b833497847b0edcfa829a15afbb2d67b69a17379af0ed7440221695754d24ceab6b1a6143651d4
+EBUILD tre-0.8.0-r1.ebuild 1421 BLAKE2B e04c58ac6c94338f38509f3d3d8e55b0df00d1c50d50020d0de76dd19ef1cc28809048bcd73ab1f14a5e6f7c5c404cc665839dcb1023436913f0c435f71ead3e SHA512 356f7d008b8f8102ed62b91d82ff906ec0cc476f00040e08c0395e97c883373cf88f78774965db5147241006e6762f5292de3afc06feed7861b1abcbcb08a31e
 MISC metadata.xml 353 BLAKE2B 0346462595f8f9a38758ce0817e787b87b35b329aef65d2921214d32bd9313023f006ee2ab31084a03a2f8a8ecf1d556dd11f190ac2467ebcd061bc144b977e4 SHA512 907b341e747fb9d7ba7b76f300d373284a21a59e3d649275c4a53ac681177f94e9d0d9f56b15365008262b2aba91236d9ac5623387313c7b74b65b2b70871d3b
diff --git a/dev-libs/tre/tre-0.8.0-r1.ebuild b/dev-libs/tre/tre-0.8.0-r1.ebuild
index 462846e4dc05..5404f1bb506a 100644
--- a/dev-libs/tre/tre-0.8.0-r1.ebuild
+++ b/dev-libs/tre/tre-0.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://laurikari.net/tre/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/dev-libs/tvmet/Manifest b/dev-libs/tvmet/Manifest
index 3c7a05501a74..f4ca80297720 100644
--- a/dev-libs/tvmet/Manifest
+++ b/dev-libs/tvmet/Manifest
@@ -1,4 +1,4 @@
 AUX tvmet-1.7.2-respect-cxxflags.patch 1112 BLAKE2B c4d7208d0f2ba6db58ff5d77ec84000c071553b844300443ce96bca10b4db369d5fc297871d9322f1be88398daeeadb805815b2e65fdd5a450aac8c08d6e82d4 SHA512 3ef1ee581d4aec3398c1013b0f10d41d7afe31892996456788e352af8b058d524e4c2126b4e496c7104f971c0f88943b3a4d136ae9efbe57ea19e51832d00ea9
 DIST tvmet-1.7.2.tar.bz2 532599 BLAKE2B 27c3c37c579ab7bd2fc8153a74389c303df9465b75ef7c9f9d553bd307b5441c1dc6764021cc47d0b108ac317f380db612048404acc7626e33d5479050d9cbba SHA512 0e57d2ec68566d02c09c3d8b35662b3737e6f074271e5e90c1354956636d2ada74859bb867d63684edaa93d7ab6a470a3141d02a04164101ff9d8d14f3d6c5fb
 EBUILD tvmet-1.7.2-r2.ebuild 1122 BLAKE2B 2ae98a5fd63505dcfb9cde12746f63cdb35ce4e2d60c9dc57fcc03b1d3f165807348eb1978a5eba87cf13fe1eed974e703df5c6de9dc329f9c8b09b36aab0432 SHA512 b61e94ae46ff5e72a849eac0649b0329669d9518f28063e364c97235eb3dc30a9a0ca79f1a7b240b99125389dbbbbe28fc0f6980319d976feac7830c477f0447
-MISC metadata.xml 324 BLAKE2B 0c31b6d6c54ba992caa5f5571f988e46576af1c146c59291a5c3451b31024ea7ad3a66a958872e4383b058a7bb864a9654f691e0a44d78f9dc4201cceae9a45a SHA512 357ea263eeaf4fba7be7cab1ee10cbe5ecb6b4c0e23eb6e62c39a9ff2f4ca0712a22818a958b4f39b7bd29d1ea8d1600d4043774763c7d3a0e5b9ca5278392d9
+MISC metadata.xml 242 BLAKE2B b2f1aa27e63431b25e02985d8da8f1dd90b5224ac8ce4a6a2c450120040e0330892e06456d689b079df5de7f7612e25607feadf581bcabcae8fa24f6b8a1cec5 SHA512 be67932e1a51ecec6ca5b24333af20574bfbf46bb3f294c51641cdee21cb894fc2b20411168a7dc750bf0772ae86667b8af860b201d68bcb814e7a9e848a5fa7
diff --git a/dev-libs/tvmet/metadata.xml b/dev-libs/tvmet/metadata.xml
index 5c58b2ad9f4e..2c8f0b133ff6 100644
--- a/dev-libs/tvmet/metadata.xml
+++ b/dev-libs/tvmet/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">tvmet</remote-id>
 	</upstream>
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
index 63d9e65f551b..e6770dbeaf12 100644
--- a/dev-libs/unibilium/Manifest
+++ b/dev-libs/unibilium/Manifest
@@ -5,5 +5,5 @@ DIST unibilium-2.0.0.tar.gz 112570 BLAKE2B 95c24c53e11590faabf3d4b8484c344be0b2a
 EBUILD unibilium-1.1.4.ebuild 672 BLAKE2B dfd5dbea39d0f3b49faf9a81b5d6659af1c10d0d8fb50e1dfd81c99b81340bcdbf08259174d486c5ab539400e2c207955e6710bad83f284108e10432f9fcbb4e SHA512 286bf13e85c9c719caf3c004ff2a6a9f5e96533c4a6496af7365bacf303872bd77d1c687912e07a29c4e4123dc98d6c0cda6c0678ab224b6edf0614bdcff169b
 EBUILD unibilium-1.2.0.ebuild 777 BLAKE2B edfb4a3eff49280a9d192482dbec092c2245b7ba5c78b1bbb314116a8b9dd03c886fef53ba3820f8a845c7af79f025dbecb658b4ad214609c214df54cf9ebec3 SHA512 9861c12d38def779606ef9b1c3bcf06c6c266dcedfc11b6107ec4596c91c5b13abdebad0af3cd1c82bd502cb5d7cbd9a7a188c8fe57fdb5e3c4dd06b84f4fedb
 EBUILD unibilium-1.2.1.ebuild 774 BLAKE2B cd7373f901fd4994bbf761389a8a04be3ee90d07b6a7e0fa634e46e2e1e031744a723c68b6511d1726218ef1715bac696a9242ab182974f579b0f389a1f043d2 SHA512 7865158eb602aaf3fde2f29b38b8f3f6b38c77033e442c84eff4d4136c15075eeb40c613b93303c405d33e9057c4c49453ceadaba2a83d8a077aded42a52ee50
-EBUILD unibilium-2.0.0.ebuild 778 BLAKE2B 56ea13af0d7e25b606a9d0d21e233877946d637e7fa643b04f0bb1280c8eb087b969883c3671958745d8c06902965e5ef3a539f0822556a663907e5a019d2a8b SHA512 15d7d1475173051e0c340ddb0e332c4e86898d3ea2966135b02a009e1fdd1d69fb448d438bf1d471bed8e57d53ffa492a1e17d3838325f13ad67416cfba04084
+EBUILD unibilium-2.0.0.ebuild 780 BLAKE2B 13992b910a52c532ac929de154be3ea54817681242873a6275cecbae05dd40f04d8de26ae6936795126b2aee35c6da8c47aca14f9235f04a3d4572bbcc8063e5 SHA512 831a5aa2863407847201a360c55b424c783ab629c6d1c9c19a6a79aa4fa5fee86a65f7b2f0eb5eca237530fd0384ab7036a27049d8dd42ba4cbde4f4bde0ce1d
 MISC metadata.xml 339 BLAKE2B 36a1748f4030bc835201a0001ddf70b7ee4f1a73703c40a98650df0ef8b7e48e8acf3bb2272232ce528e2794310908214f1f9d9ac3ed75cf5bfadac1bd1cf19f SHA512 27c4da145b68654f559c956b5414a877ff9ca54a794390e690e1c11596dfda61d4d2ebfc3f891593f40c42f4070dd802ae7c73a9ece69e4c9ce0c1f76873644a
diff --git a/dev-libs/unibilium/unibilium-2.0.0.ebuild b/dev-libs/unibilium/unibilium-2.0.0.ebuild
index 6f3f4873c3c1..9c76937c3ddd 100644
--- a/dev-libs/unibilium/unibilium-2.0.0.ebuild
+++ b/dev-libs/unibilium/unibilium-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mauke/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+ MIT"
 SLOT="0/4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 2690636a8928..c4e4c1f4fb54 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,9 +1,9 @@
-DIST userspace-rcu-0.10.0.tar.bz2 483899 BLAKE2B 76f7da8290a702c7ab4ce37743be6514df6f0b8a69fc68a7ae65ae32a8d63192efcebe2fbf995d13b60b5e593d1818d6fb201ef914d0390e0209020590370a56 SHA512 e3e458510f97709431caf848b007465110057d6fba7b9e39162fbc8857fa18299e884f0e484302aa8a79ab6e6a941921db9a4adabd863c151c1b547b7276eab8
 DIST userspace-rcu-0.10.1.tar.bz2 503347 BLAKE2B 32e75d5d94b15fdcb28397aa64c871f708a925bef0cfcc90553de7694a85e1562bb2256b0c8d8726b910363d12b3a67f963f5c0213141ea2a4ad8d2bcd23bf7b SHA512 2bb042e1cf8888eab664ea6e88b94646c995bea61c89d49dcf4e844d144329303c600d73e29e0f05c935ad8278857cc08fb5b4b9f7f0c2f120c46b458b51a211
+DIST userspace-rcu-0.10.2.tar.bz2 503833 BLAKE2B 17e2102e096903f301d1a08d606cf98e28a413ef26a3dc8fa6f400ba74aa14aabdef5e28d4fed5fb01cee33b0bd5de9fb0682523aaa50c6053fd3471711a02e7 SHA512 47413b4a593d19185ee3d455e5744042c060cb50008dac25e9135c5cd2250ef5129a419258b18c665c8c794ad3b09234fdd70a106c72d8fc64631172b13d0e22
 DIST userspace-rcu-0.9.1.tar.bz2 468197 BLAKE2B ac2ae4ea788feef5463571e1a0d5dac35a5d6e298f628e0b0b2acea68d01e52a513cd5d1b58886d8b42d07455823fdfb91c1548caffb969cb9fe8c6b4d17adc7 SHA512 958234d72319decef07093c13b067e398c1b285ac714ab1dda89c2ad2ba0627d053e0cdabb07d480e399ebd60215445002876bd99f2829ca1e5582ada639f730
 DIST userspace-rcu-0.9.2.tar.bz2 468871 BLAKE2B f8a13b9683e8c32942a3d675ca94715de82b40b1a39be8161e1ea6009373f2ea6ae57b2e9ba4068544db2c9064457aaa8e83bad5e4af600bede248bf0780d11f SHA512 36264119d68569565a7b1222c4b0ca90128d121f032b388f27204ceaa9c964901f35be25584e1553b1a7613aad01d11766983ae245860df09444eb2f8ac913fc
-EBUILD userspace-rcu-0.10.0.ebuild 663 BLAKE2B 2d1ad36229c78b15bf3e9c738a383aa39c201329bf814e7e29d4726cd9828c6e9575e3af4ac02b5f54db3ba703a1f0aa46b90eb88028709299ed13bcb0285889 SHA512 2e945347710ff7f1459e33def817e4c4ce4e640bcb8f94726559534ce5f14aa45752bc6e169fdaeeefb491751743b30f744cd56dbc4a56fcaf1bff1c0227619d
-EBUILD userspace-rcu-0.10.1.ebuild 676 BLAKE2B 241781c4d2e7aebe4ea2915f44cd6690078ba021492de3d8e5a6c3b6697292d9cc4bf85a1f8410fabc5b913f6e7857d7820a099a4b5422f61b0ad3eead63a4e0 SHA512 b2fe79ade8a3c57f0d0e98e9eba4e0bf5831ac016d0392ca59e64da0a1851236550e257e6d8ebeae1806125ea137578265eefd4de709d3dcda64243f9f40ef73
+EBUILD userspace-rcu-0.10.1.ebuild 675 BLAKE2B 5826840a0ea8f9e7810250b1ff4477f1eef13bfba348b87029c1bc78c121d350136b12f2b6de94bbe3d79638ddf5bea771390e5f783b7904bf129351f57917c9 SHA512 979f6ece22df85bb6595254c16c1ee13bdc7e9a572ae3d3956f0f5e205f3eae337e36310a3997b9d9bf1347df5586fb3166051430d806192d735e3e324f02f39
+EBUILD userspace-rcu-0.10.2.ebuild 680 BLAKE2B ca66236cdaecd7e9c20db5072beeebf2ccdd52032afa1fb7a419b5f6cb78d623ef40b046fa8330c8462b5dc0a88bd14e0c16684fc8229b8a3f48da7aa46f96d7 SHA512 0a5226e9a687c172a29d9de92e9884cd276e7ec4081a785f1f65148d6a6d3615c12bbf9475bfa1d92dc913d842b241ac0e89c21845803370d966b81bc2aca2d9
 EBUILD userspace-rcu-0.9.1.ebuild 743 BLAKE2B 634a896a5850dde9ffc378c4e327037541851c39956027c5d9a2185f5deb598f9a11f264df25606f1d9f20f367243bea5e4ab295cf69e15db022cefa765b7a00 SHA512 11eab0b0257b0e057b76109a788627eda55c003c0de3d897028af8696b909e5030dd2c63ed169e215f9fbdcd5860bffedca5f44887ef804e5e74e1fbaad6e6ed
 EBUILD userspace-rcu-0.9.2.ebuild 749 BLAKE2B b7782ed9c88695473c2bb23dd9025eca95aa54eec2109fb4f2574f39b985b86ac1c53f5728a0b224b628717556427ffcb78325cc07f6e2f079d2fe05da514827 SHA512 61c3e1d51f225d39c5e521016605c01a4cf6188344af5a71785dc71f0a6cf4c1108139e38f32a093898c76f547decc794c19dfe70367461445abbb5816b7a6ae
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
index 2ef1d16b9453..66c0d5ee4d5c 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="static-libs regression-test test"
 
 DEPEND="test? ( sys-process/time )"
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.10.0.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.10.2.ebuild
index 2571e2531e4a..edacb2837be2 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.10.0.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs regression-test test"
 
 DEPEND="test? ( sys-process/time )"
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index eeeebd5279d7..5f7d68b56c20 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,7 +1,11 @@
 DIST vala-0.36.15.tar.xz 2880300 BLAKE2B ea83bde6396f3be1c96038d63ae30b18fa070a6f7a06b75569bfed9d7792c898201a1f24d000f5b6415bb890cf975758341a97f22db74da02fcbeb3f283e546f SHA512 1c8f888832b2dd4248737a5a27f00f42d8bab2fe0a0790a7df5c426f4e3e1d0919ed0f6f6fd905be758ed477ba840e18f608e67811389c811ba65710094abe61
 DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8
+DIST vala-0.40.15.tar.xz 3406020 BLAKE2B aaa2967a140fae94b4609f4b54f2e37c71fe79453cb3ea30568ee018d2227d1c45061440ad632bcfc53650fbe4dba2f062d8095f95936623a49efb5e97f2c2bb SHA512 abb918b00afab7a85586f9bd26b78be87e19b725752cbb77dd428da2e6241b1f3d4aaa70e3e6daf6f373562d02f1ff8016e6c9107e2bf088d9b84334adecdda2
 DIST vala-0.42.6.tar.xz 3354840 BLAKE2B 0cc5c91967cbadda8c12143d4de6ebffa60c7031bc314338e7ca1e036866b460bf78e28b7f7737bee8243198ffa655c99b3e743d639c5d2b5ed93f210fc692bc SHA512 664fa303d6b2b037254bc6e19d79b7894444f5c38fb7b1fcb73f37512dc97bc01c8ddbb23563093e271c562a9fb49c96fcc9019889a57a95a4e8e162c8619f2f
+DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca
 EBUILD vala-common-0.36.15.ebuild 2517 BLAKE2B c39aa1eaadca30724db5ffc17c26a2df6f932b3aec82273c0cf8dff0ea7407ba6673d403f33040d4c8b361385a71be0e2c39c02b119b67b3f93801b2f8be890a SHA512 5acbad84f92b78270ce6dca6474bfdaa5b9df36f23eac4f16f715ceb75933b45783178d9b4a63a546255e0e899090954f6b9fed7d3b31ee33c42584c7658faca
-EBUILD vala-common-0.40.14.ebuild 2522 BLAKE2B a1b6a02272789a43fff04efc2ee692d69fc71cdf945354fa0b08cb3e39d04794804ae694e9203681d34ca1b09ea18ea02610ccfe5b11fe22576e3424b5072e5d SHA512 8b7a09689e6f3813a013dcfa35b98a8ae0baec143116dc4ee7796fb56980e96057721b55a3610513b5cab8bdd5dc5be1c791ba43b6610bb019fb16b1d0460a86
+EBUILD vala-common-0.40.14.ebuild 2517 BLAKE2B c39aa1eaadca30724db5ffc17c26a2df6f932b3aec82273c0cf8dff0ea7407ba6673d403f33040d4c8b361385a71be0e2c39c02b119b67b3f93801b2f8be890a SHA512 5acbad84f92b78270ce6dca6474bfdaa5b9df36f23eac4f16f715ceb75933b45783178d9b4a63a546255e0e899090954f6b9fed7d3b31ee33c42584c7658faca
+EBUILD vala-common-0.40.15.ebuild 2528 BLAKE2B 8395b76376fc6b562a52b7df938e23363d328746225b800f46872a591e6049f00d0a8909d0eac0405b17c18b50266631523b1b28494721e3adfb834824114d52 SHA512 3720a01307c23ac617508450c627064f22685542cf4fc28979ab3784a2069c832f4f34b1e9c58557a0c1fd160c42141e8007c4d116f98f45c7208e892a8013e4
 EBUILD vala-common-0.42.6.ebuild 2528 BLAKE2B 8395b76376fc6b562a52b7df938e23363d328746225b800f46872a591e6049f00d0a8909d0eac0405b17c18b50266631523b1b28494721e3adfb834824114d52 SHA512 3720a01307c23ac617508450c627064f22685542cf4fc28979ab3784a2069c832f4f34b1e9c58557a0c1fd160c42141e8007c4d116f98f45c7208e892a8013e4
+EBUILD vala-common-0.42.7.ebuild 2528 BLAKE2B 8395b76376fc6b562a52b7df938e23363d328746225b800f46872a591e6049f00d0a8909d0eac0405b17c18b50266631523b1b28494721e3adfb834824114d52 SHA512 3720a01307c23ac617508450c627064f22685542cf4fc28979ab3784a2069c832f4f34b1e9c58557a0c1fd160c42141e8007c4d116f98f45c7208e892a8013e4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.40.14.ebuild b/dev-libs/vala-common/vala-common-0.40.14.ebuild
index 7d1d8d71e51f..8b0eff8060dc 100644
--- a/dev-libs/vala-common/vala-common-0.40.14.ebuild
+++ b/dev-libs/vala-common/vala-common-0.40.14.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/vala-common/vala-common-0.40.15.ebuild b/dev-libs/vala-common/vala-common-0.40.15.ebuild
new file mode 100644
index 000000000000..29fd6de8fd02
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.40.15.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+# Previously ${PN} was part of dev-lang/vala
+RDEPEND="
+	!<dev-lang/vala-0.10.4-r2
+	!<dev-lang/vala-0.12.1-r1:0.12
+	!<dev-lang/vala-0.14.2-r2:0.14
+	!<dev-lang/vala-0.16.1-r2:0.16
+	!<dev-lang/vala-0.17.5:0.18
+"
+DEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins vala.m4 vapigen/vapigen.m4
+	insinto /usr/share/vala
+	doins vapigen/Makefile.vapigen
+}
+
+pkg_postinst() {
+	# Hack to prevent alternatives_auto_makesym in previously installed
+	# dev-lang/vala's pkg_postrm from overwriting vala-common's files
+	if has_version '<dev-lang/vala-0.10.4-r2:0.10' && [[ -f "${EROOT}usr/share/aclocal/vala-0-10.m4" ]]; then
+		ebegin "Removing old vala-0.10 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-10.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.12.1-r1:0.12' && [[ -f "${EROOT}usr/share/aclocal/vala-0-12.m4" ]]; then
+		ebegin "Removing old vala-0.12 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.14.2-r2:0.14' && [[ -f "${EROOT}usr/share/aclocal/vala-0-14.m4" ]]; then
+		ebegin "Removing old vala-0.14 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.16.1-r2:0.16' && [[ -f "${EROOT}usr/share/aclocal/vala-0-16.m4" ]]; then
+		ebegin "Removing old vala-0.16 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
+		eend $?
+		if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
+			ebegin "Removing old vala-0.16 makefile template"
+			rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null
+			eend $?
+		fi
+	fi
+	if has_version '<dev-lang/vala-0.17.5:0.18' && [[ -f "${EROOT}usr/share/aclocal/vala-0-18.m4" ]]; then
+		ebegin "Removing old vala-0.18 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
+		eend $?
+		if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
+			ebegin "Removing old vala-0.18 makefile template"
+			rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null
+			eend $?
+		fi
+	fi
+}
diff --git a/dev-libs/vala-common/vala-common-0.42.7.ebuild b/dev-libs/vala-common/vala-common-0.42.7.ebuild
new file mode 100644
index 000000000000..29fd6de8fd02
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.42.7.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+# Previously ${PN} was part of dev-lang/vala
+RDEPEND="
+	!<dev-lang/vala-0.10.4-r2
+	!<dev-lang/vala-0.12.1-r1:0.12
+	!<dev-lang/vala-0.14.2-r2:0.14
+	!<dev-lang/vala-0.16.1-r2:0.16
+	!<dev-lang/vala-0.17.5:0.18
+"
+DEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins vala.m4 vapigen/vapigen.m4
+	insinto /usr/share/vala
+	doins vapigen/Makefile.vapigen
+}
+
+pkg_postinst() {
+	# Hack to prevent alternatives_auto_makesym in previously installed
+	# dev-lang/vala's pkg_postrm from overwriting vala-common's files
+	if has_version '<dev-lang/vala-0.10.4-r2:0.10' && [[ -f "${EROOT}usr/share/aclocal/vala-0-10.m4" ]]; then
+		ebegin "Removing old vala-0.10 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-10.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.12.1-r1:0.12' && [[ -f "${EROOT}usr/share/aclocal/vala-0-12.m4" ]]; then
+		ebegin "Removing old vala-0.12 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.14.2-r2:0.14' && [[ -f "${EROOT}usr/share/aclocal/vala-0-14.m4" ]]; then
+		ebegin "Removing old vala-0.14 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
+		eend $?
+	fi
+	if has_version '<dev-lang/vala-0.16.1-r2:0.16' && [[ -f "${EROOT}usr/share/aclocal/vala-0-16.m4" ]]; then
+		ebegin "Removing old vala-0.16 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-14.m4" &> /dev/null
+		eend $?
+		if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
+			ebegin "Removing old vala-0.16 makefile template"
+			rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null
+			eend $?
+		fi
+	fi
+	if has_version '<dev-lang/vala-0.17.5:0.18' && [[ -f "${EROOT}usr/share/aclocal/vala-0-18.m4" ]]; then
+		ebegin "Removing old vala-0.18 macros"
+		rm "${EROOT}usr/share/aclocal/vala-0-12.m4" &> /dev/null
+		eend $?
+		if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
+			ebegin "Removing old vala-0.18 makefile template"
+			rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null
+			eend $?
+		fi
+	fi
+}
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index 364a4541ba97..7c06ff4d4bcd 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,5 +1,5 @@
 DIST volume_key-0.3.11.tar.xz 484936 BLAKE2B f7bde79d290617a82de60a2105b6374dd03c2203804e3748336c8d09fbf749bf47157cf5e6b856477475d0074f3e4475dc85e0765308d60b9c6d0525685f73ea SHA512 b9da00578b31c96231ebde55fd91c9aafbd663e541c560460fb6c3305e1a0e1fb3115a95682dc4713027d084e14ffa39d638653384a18d69f5dc892fc4855a97
 DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
-EBUILD volume_key-0.3.11.ebuild 842 BLAKE2B 2767dfec0f660455477bf80adcbff6275ffbf49fb3d085ae42a1d2c05f957ce66e8296384cb7053343100cf5b97955eecf16ce653b649f53fdc365707fdf6ac8 SHA512 e13a7f0f9fcd4c13c85c560d023b0ac337e9eea56bdc9dd73031be54e3257df0a625397f18c96dc2cc7b980c974533311a917f585eb915742627ef1954435249
+EBUILD volume_key-0.3.11.ebuild 841 BLAKE2B 1d346d305756d41a99d5a02af2a0c213d29455e988a5d01b038ccd3fab4b3e04756a73126e8ab5345ef0fd63e7f31aac11073f48f204ff10bc883222adfbabc2 SHA512 68ee8a58b36bac2ae5bd4ebba7483f3effa95167f094247b0e14dd27ec5e4185b1335531a90e41b44e9586d10bb01850ec4c3f97a451430352a68235d9e9286d
 EBUILD volume_key-0.3.12.ebuild 906 BLAKE2B d47cb3308f7d4347caade6a40cb8b57bfe73875babbe71fe5e0a8503d00a173281d8ff40c4b0d20fc4b43fccc1c237a717db64a83682d96e817457ffce128ed7 SHA512 29e77e6a082ae75d0d8e875913c3fd0e784f1b1d7f3666a55cec4f73da5459e4992b9e9c88611d3ac712f58f88492199eaea4682d866d79c205fabd804512b88
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/volume_key-0.3.11.ebuild b/dev-libs/volume_key/volume_key-0.3.11.ebuild
index 92af05b9da2e..e5fbce850dfa 100644
--- a/dev-libs/volume_key/volume_key-0.3.11.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/wayland/Manifest b/dev-libs/wayland/Manifest
index bb14d2b5fdba..bd8adfb27a06 100644
--- a/dev-libs/wayland/Manifest
+++ b/dev-libs/wayland/Manifest
@@ -1,6 +1,4 @@
-DIST wayland-1.16.0.tar.xz 435216 BLAKE2B 862cc8ca9da060f9b8345aa0a62a4af76a31562246b75d2679bcf30cc894cc94ec28f97951f766b6e5297b2e113cd8b08e5682dacbfc79544c0085995693ec55 SHA512 64eca2b1c0bc7913508a5499dae87e2723c712d8024acbb4c77c3c4a6c20de78c10704ae9827fd034116ca540a547aeec28c5a1e3bd382b23f85231424b0f49c
 DIST wayland-1.17.0.tar.xz 437680 BLAKE2B 2f4eb54c5ded90453b4e2812f7b5086aa211196ec9f7333d316cdb829269d55db570ccb45a67ee07a039633245e630ab54da6403ff4754d59366f3c13fb87549 SHA512 c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946
-EBUILD wayland-1.16.0.ebuild 1794 BLAKE2B 3da847adc8540be30afd9b0d3e3d5dd70c4f2093f3d26c704bbd14845ea52269a139d874a4ff849b68a64a2b782466493f6c258ef5ea5eaabcf52b4a1c7b0521 SHA512 fa6ca62067b6f1555288b77b7833c44e31ab32beb3e1e25d9cd117e3397e2b46a7dd67a5f645baef0f08313e554334d48bf6b399dfac007d4cdf54677e57848b
-EBUILD wayland-1.17.0.ebuild 1762 BLAKE2B 0d2095e219140a146b77577335a5115082a4aa9fea73ef8f888465b003c728e8ef489183a732dc63cf136d5f8f6da904b1fe256bf360ccc76a6239f5fff70137 SHA512 1ed70b02e14978141de7013b9b1750699555cef55b36840857f9e1956a49d85e3769ea70940f1929915bde9170209094795989e6fe3720a3df74a683887b3974
+EBUILD wayland-1.17.0.ebuild 1751 BLAKE2B edb2345394d9fd735c7f7b37c15fba9b724984d145bd44bbb9d45b0e670ed9b73ca9687a899977153f1ac027902e4aa0befad1377772e199ce2fc4b605659a4d SHA512 939fe57aae3ce03f24fff4b7ea3a04ccd59122466b44fdac5e258eaded90d2dbf2303d20b1b0c8ee6a23cf043bf163005b6ed258aae01d3c7baa06e615e76f75
 EBUILD wayland-9999.ebuild 1762 BLAKE2B 0d2095e219140a146b77577335a5115082a4aa9fea73ef8f888465b003c728e8ef489183a732dc63cf136d5f8f6da904b1fe256bf360ccc76a6239f5fff70137 SHA512 1ed70b02e14978141de7013b9b1750699555cef55b36840857f9e1956a49d85e3769ea70940f1929915bde9170209094795989e6fe3720a3df74a683887b3974
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/wayland/wayland-1.16.0.ebuild b/dev-libs/wayland/wayland-1.16.0.ebuild
deleted file mode 100644
index 943993af5478..000000000000
--- a/dev-libs/wayland/wayland-1.16.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit autotools libtool multilib-minimal toolchain-funcs $GIT_ECLASS
-
-DESCRIPTION="Wayland protocol libraries"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	dev-libs/libxml2:=
-	!<media-libs/mesa-18.1.1-r1"
-DEPEND="${RDEPEND}
-	doc? (
-		>=app-doc/doxygen-1.6[dot]
-		app-text/xmlto
-		>=media-gfx/graphviz-2.26.0
-		sys-apps/grep[pcre]
-	)
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ $PV = 9999* ]] && eautoreconf || elibtoolize
-}
-
-multilib_src_configure() {
-	local myconf
-	if tc-is-cross-compiler ; then
-		myconf+=' --with-host-scanner '
-	fi
-
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		$(multilib_native_use_enable doc documentation) \
-		$(multilib_native_enable dtd-validation) \
-		${myconf}
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	einstalldocs
-}
-
-src_test() {
-	# We set it on purpose to only a short subdir name, as socket paths are
-	# created in there, which are 108 byte limited. With this it hopefully
-	# barely fits to the limit with /var/tmp/portage/$CAT/$PF/temp/xdr
-	export XDG_RUNTIME_DIR="${T}"/xdr
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	multilib-minimal_src_test
-}
diff --git a/dev-libs/wayland/wayland-1.17.0.ebuild b/dev-libs/wayland/wayland-1.17.0.ebuild
index 56fdba5f507b..caf421c61858 100644
--- a/dev-libs/wayland/wayland-1.17.0.ebuild
+++ b/dev-libs/wayland/wayland-1.17.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 inherit autotools libtool multilib-minimal toolchain-funcs
 
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 9b38c1ea3b4c..f91ac2b501a4 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,7 +1,7 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
-DIST weston-5.0.0.tar.xz 1467496 BLAKE2B 514bc4c4f09dc8bc5b068c66cf14b86687bee1e691f7dfcb251a5ae7fe02389b48626ed02c97eff9334b43e227ea8b83beef48c53a83b4691f59a65af53ad61d SHA512 b6f97eca014ea47f3de0c5ddd89712f896cd66423d0eb499e1d88d35aab616cef1e735ebb8e0cefd8b60085314b6ec3d56b39d7c4776188bb56d58efc84a52cf
+DIST weston-6.0.0.tar.xz 1517032 BLAKE2B 598c525598f877715320d8b468618595d1f7b10ed56aa82c3535b05c369216d1a938d32354e3a8cc9077a0d910d0dbfdcf504fb687c73942d8ad92b13a124bd2 SHA512 127ab64b689f202acca4d9461e4decfd42357e4bbb63493af257b3b20b693a8ab4207b3c6b97663cefeed200505aad5f32b6a064db2e53fa1e201877613b394f
 EBUILD weston-3.0.0.ebuild 3498 BLAKE2B 066de40c7595bd86c63143e8dcc1b56991b09b23755530247f38ac2a35ceb94f16329e46ded39f0e9d4135fac47e9127477afc124c119f48d220c09022ac0bb8 SHA512 e3ef428c5f03621f8860463c69d7a124e7f16f6e92523d9e309dcb623b75f9c41c73268a54579e1c3849e1100aad534f289fd0e3465dfcd9d02b846695ac5237
-EBUILD weston-5.0.0.ebuild 3423 BLAKE2B dad9ab891253ea596eb78e99eb25bb87defa8aa89ba29ae1daf83ec5b807461c01929f87d019020ae8a5f139d4b2b908702860f8d26d759b2887b18abaf75a00 SHA512 8bdd160aecc69a91a08c8c53dd1eaa8e6db3639a70ccfa92131ecc8e7444ab98a59c2961c33c4dba5857bed306ee54bf848575473e03ecda4c42580ef5f0b03b
-EBUILD weston-9999.ebuild 3312 BLAKE2B 8680274dded64a0830a29901a3ab8aff0a27c0bc23d28dc50ad1636c52e194416847d5f8cc70429e5fffdd47081936641494f48ae04ae69a893e495520f75cdb SHA512 9e883a62db0128c539d1a995da00c98b69dfe6eba801e64a0574264a68ecb4444da690523c1fe176146b7977de8a9b867b9e3fe6f8dafb338031b7a9e2afbea3
-MISC metadata.xml 1360 BLAKE2B 0ce06161e748f11ded0baf006473ef73c5fc1f5f63a6554821c8389c65747463808738648b7508c416e6db48f35f290ef8b9e212b91992224dae146ad65cae47 SHA512 d4b17a918dac982654ed9a46e84d6d27b99426a693a23cb93f1b10dd73d7a8cf5bc6d5176a732400c6c1047449ea1a9c3bfb26803ea7247ff0e76c430d676cd1
+EBUILD weston-6.0.0.ebuild 3543 BLAKE2B 1e7bdf2b6d5056153d3602a3bfcb928d384f2ed7056976bee50cdbb286a1c99f0e8ed86b5ea038566189ef463e2d2075f733bcfa3cd4885cf9a39eff3096a188 SHA512 4fd1905c335608e78577b1d591cd8d6fba746622d8e1fc1a55c47533b65402b65b9727f0fa536bfead814b990230b084d4284ef194d045c609c0b9a007398982
+EBUILD weston-9999.ebuild 3441 BLAKE2B 62f4dfc7282bec3ab49f9b0b63c34ba63b8dbfaefee8a810c34fb7ccb1643aa8619170165eeb5726f33313c36592289342aa44265c6a0470ce3d5d2b8b8e2f71 SHA512 ae3112486214afc8f197d17769136db5fbc825589e17ce18855c554c2e056ff4133e159fb209df554852a71c9fa11594551b47d5c063c3a4c28d5b7cfbf3753e
+MISC metadata.xml 1476 BLAKE2B cc010d7358f64a0fc6eb9b886410a84fb80cf7c097231032e10efce10d827a74e238547b78325aa3b0c9a580a8d6dfcdbbe5f857c3e78939e20d5d14933250ee SHA512 1c89115a2e7e3f612159e642a898c2351718aeb90cd446f6f619c4002d5231c76b9f288a20f393110ddca4ce57b45c70e40a49646dab47111b1d45fdf2e8810e
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index c976a4437cfc..c98075bd2fed 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -7,9 +7,11 @@
 </maintainer>
 <use>
 	<flag name="colord">Allow setting color managment</flag>
+	<flag name="desktop">Enable the desktop shell</flag>
 	<flag name="drm">Enable drm compositor support</flag>
 	<flag name="editor">Install wayland-editor example application</flag>
 	<flag name="fbdev">Enable fbdev compositor support</flag>
+	<flag name="fullscreen">Enable fullscreen/kiosk shell</flag>
 	<flag name="gles2">Use GLESv2 cairo instead of full GL</flag>
 	<flag name="headless">Headless backend and a noop renderer, mainly for testing purposes</flag>
 	<flag name="ivi">Enable the IVI shell</flag>
diff --git a/dev-libs/weston/weston-5.0.0.ebuild b/dev-libs/weston/weston-5.0.0.ebuild
deleted file mode 100644
index 221535a3bedf..000000000000
--- a/dev-libs/weston/weston-5.0.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-inherit autotools readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS=""
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
-
-REQUIRED_USE="
-	drm? ( gles2 )
-	screen-sharing? ( rdp )
-	systemd? ( dbus )
-	test? ( headless xwayland )
-	wayland-compositor? ( gles2 )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.12.0
-	>=dev-libs/wayland-protocols-1.13
-	lcms? ( media-libs/lcms:2 )
-	media-libs/libpng:0=
-	webp? ( media-libs/libwebp:0= )
-	jpeg? ( virtual/jpeg:0= )
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.68
-	>=x11-libs/libxkbcommon-0.5.0
-	>=x11-libs/pixman-0.25.2
-	x11-misc/xkeyboard-config
-	fbdev? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	colord? ( >=x11-misc/colord-0.1.27 )
-	dbus? ( >=sys-apps/dbus-1.6 )
-	drm? (
-		>=media-libs/mesa-17.1[gbm]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	gles2? (
-		media-libs/mesa[gles2,wayland]
-	)
-	rdp? ( >=net-misc/freerdp-1.1.0:= )
-	systemd? (
-		sys-auth/pambase[systemd]
-		>=sys-apps/systemd-209[pam]
-	)
-	launch? ( sys-auth/pambase )
-	X? (
-		>=x11-libs/libxcb-1.9
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xorg-server[wayland]
-		x11-libs/cairo[xcb]
-		>=x11-libs/libxcb-1.9
-		x11-libs/libXcursor
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	if [[ ${PV} = 9999* ]]; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-src_configure() {
-	local myconf=()
-
-	if use examples || use test; then
-		myconf+=( --enable-simple-clients )
-	else
-		myconf+=( --disable-simple-clients )
-	fi
-
-	econf \
-		$(use_enable examples demo-clients-install) \
-		$(use_enable fbdev fbdev-compositor) \
-		$(use_enable dbus) \
-		$(use_enable drm drm-compositor) \
-		$(use_enable headless headless-compositor) \
-		$(use_enable ivi ivi-shell) \
-		$(use_enable lcms) \
-		$(use_enable rdp rdp-compositor) \
-		$(use_enable wayland-compositor) \
-		$(use_enable X x11-compositor) \
-		$(use_enable launch weston-launch) \
-		$(use_enable colord) \
-		$(use_enable gles2 egl) \
-		$(use_enable resize-optimization) \
-		$(use_enable screen-sharing) \
-		$(use_enable suid setuid-install) \
-		$(use_enable systemd systemd-login) \
-		$(use_enable systemd systemd-notify) \
-		$(use_enable xwayland) \
-		$(use_enable xwayland xwayland-test) \
-		$(use_with jpeg) \
-		$(use_with webp) \
-		--with-cairo=image \
-		--disable-junit-xml \
-		--disable-simple-dmabuf-drm-client \
-		--disable-simple-dmabuf-v4l-client \
-		--disable-simple-egl-clients \
-		--disable-vaapi-recorder \
-		"${myconf[@]}"
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	cd "${BUILD_DIR}" || die
-	emake check
-}
-
-src_install() {
-	default
-
-	readme.gentoo_create_doc
-}
diff --git a/dev-libs/weston/weston-6.0.0.ebuild b/dev-libs/weston/weston-6.0.0.ebuild
new file mode 100644
index 000000000000..e919840d917e
--- /dev/null
+++ b/dev-libs/weston/weston-6.0.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
+
+if [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+	KEYWORDS=""
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
+
+REQUIRED_USE="
+	drm? ( gles2 )
+	screen-sharing? ( rdp )
+	test? ( desktop headless xwayland )
+	wayland-compositor? ( gles2 )
+	|| ( drm fbdev headless rdp wayland-compositor X )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-0.8.0
+	>=dev-libs/wayland-1.17.0
+	>=dev-libs/wayland-protocols-1.17
+	lcms? ( media-libs/lcms:2 )
+	media-libs/libpng:0=
+	webp? ( media-libs/libwebp:0= )
+	jpeg? ( virtual/jpeg:0= )
+	>=x11-libs/cairo-1.11.3
+	>=x11-libs/libdrm-2.4.68
+	>=x11-libs/libxkbcommon-0.5.0
+	>=x11-libs/pixman-0.25.2
+	x11-misc/xkeyboard-config
+	fbdev? (
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	colord? ( >=x11-misc/colord-0.1.27 )
+	drm? (
+		>=media-libs/mesa-17.1[gbm]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	gles2? (
+		media-libs/mesa[gles2,wayland]
+	)
+	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
+	remoting? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	systemd? (
+		sys-auth/pambase[systemd]
+		>=sys-apps/dbus-1.6
+		>=sys-apps/systemd-209[pam]
+	)
+	launch? ( sys-auth/pambase )
+	X? (
+		>=x11-libs/libxcb-1.9
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-base/xorg-server[wayland]
+		x11-libs/cairo[xcb]
+		>=x11-libs/libxcb-1.9
+		x11-libs/libXcursor
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use drm backend-drm)
+		-Dbackend-drm-screencast-vaapi=false
+		$(meson_use headless backend-headless)
+		$(meson_use rdp backend-rdp)
+		$(meson_use screen-sharing screenshare)
+		$(meson_use wayland-compositor backend-wayland)
+		$(meson_use X backend-x11)
+		$(meson_use fbdev backend-fbdev)
+		-Dbackend-default=auto
+		$(meson_use gles2 renderer-gl)
+		$(meson_use launch weston-launch)
+		$(meson_use xwayland)
+		$(meson_use systemd)
+		$(meson_use remoting)
+		$(meson_use desktop shell-desktop)
+		$(meson_use fullscreen shell-fullscreen)
+		$(meson_use ivi shell-ivi)
+		$(meson_use lcms color-management-lcms)
+		$(meson_use colord color-management-colord)
+		$(meson_use systemd launcher-logind)
+		$(meson_use jpeg image-jpeg)
+		$(meson_use webp image-webp)
+		-Dtools=debug,info,terminal
+		-Dsimple-dmabuf-drm=auto
+		$(meson_use examples demo-clients)
+		$(usex examples -Dsimple-clients=damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
+		$(meson_use resize-optimization resize-pool)
+		-Dtest-junit-xml=false
+		"${myconf[@]}"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	xdg_environment_reset
+
+	# devices test usually fails.
+	cd "${BUILD_DIR}" || die
+	meson test $(meson test --list | grep -Fxv devices) || die
+}
+
+src_install() {
+	meson_src_install
+	if use launch && use suid; then
+		chmod u+s "${ED}"/usr/bin/weston-launch || die
+	fi
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index b06805e2e15d..519399706138 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	EXPERIMENTAL="true"
 fi
 
-inherit meson readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
+inherit meson readme.gentoo-r1 toolchain-funcs xdg-utils $GIT_ECLASS
 
 DESCRIPTION="Wayland reference compositor"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
@@ -25,13 +25,14 @@ fi
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="colord +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
 
 REQUIRED_USE="
 	drm? ( gles2 )
 	screen-sharing? ( rdp )
-	test? ( headless xwayland )
+	test? ( desktop headless xwayland )
 	wayland-compositor? ( gles2 )
+	|| ( drm fbdev headless rdp wayland-compositor X )
 "
 
 RDEPEND="
@@ -61,7 +62,7 @@ RDEPEND="
 	gles2? (
 		media-libs/mesa[gles2,wayland]
 	)
-	rdp? ( >=net-misc/freerdp-1.1.0:= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
 	remoting? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -83,7 +84,8 @@ RDEPEND="
 		x11-libs/libXcursor
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
 
@@ -94,14 +96,17 @@ src_configure() {
 		$(meson_use headless backend-headless)
 		$(meson_use rdp backend-rdp)
 		$(meson_use screen-sharing screenshare)
+		$(meson_use wayland-compositor backend-wayland)
 		$(meson_use X backend-x11)
 		$(meson_use fbdev backend-fbdev)
+		-Dbackend-default=auto
 		$(meson_use gles2 renderer-gl)
 		$(meson_use launch weston-launch)
 		$(meson_use xwayland)
 		$(meson_use systemd)
 		$(meson_use remoting)
-		$(meson_use wayland-compositor shell-desktop)
+		$(meson_use desktop shell-desktop)
+		$(meson_use fullscreen shell-fullscreen)
 		$(meson_use ivi shell-ivi)
 		$(meson_use lcms color-management-lcms)
 		$(meson_use colord color-management-colord)
@@ -111,7 +116,7 @@ src_configure() {
 		-Dtools=debug,info,terminal
 		-Dsimple-dmabuf-drm=auto
 		$(meson_use examples demo-clients)
-		$(usex examples -Dsimple-clients=damage,img,egl,shm,touch "")
+		$(usex examples -Dsimple-clients=damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
 		$(meson_use resize-optimization resize-pool)
 		-Dtest-junit-xml=false
 		"${myconf[@]}"
@@ -120,10 +125,7 @@ src_configure() {
 }
 
 src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-	cd "${BUILD_DIR}" || die
+	xdg_environment_reset
 	meson_src_test
 }
 
diff --git a/dev-libs/xalan-c/Manifest b/dev-libs/xalan-c/Manifest
index a99a3679fad8..946d5614a3dc 100644
--- a/dev-libs/xalan-c/Manifest
+++ b/dev-libs/xalan-c/Manifest
@@ -3,4 +3,4 @@ AUX 1.11.0_pre797991-bugfixes.patch 1652 BLAKE2B 5d015161a921db987fe5c66134686a8
 AUX 1.11.0_pre797991-parallel-build.patch 2714 BLAKE2B ac0b0184fec7dff9b6d1b36e2b1272b4d0636a103c45e0c16ef141072f431a08bf6852e48ef8031566f01819298102580aa4f9fa509342fddf0297c8465dc031 SHA512 1b21006f19266f1c285f6a730cc3aefc714d2da77b0bce5519a1ed2434cd465ec89b5638320aacf19ec88a2bc974ad3777e2c6179cf137d9d92a75fc4d2c6699
 DIST Xalan-C_r1153059-src.tar.gz 1573651 BLAKE2B 5e684b80bc962776c1e0102a97023ee3a9b9357b6fc05e02687971d5d879b01a5dc426fd6ab2af68a7ad6ec48a799d70fd912a4e3a30d8e3a22a954d84d21f59 SHA512 2382c1343ae97d0196d84053139758d3b3b7574bcd835b754e34acdc6ab708a58fc23d2f27d41870c768c78a1de7be1bb6031cc78d205b6024f1ad7cd6fca653
 EBUILD xalan-c-1.11.0_pre1153059.ebuild 2346 BLAKE2B 93171b40c421413e8b5ce2656e08fcaaa5ade224ffd4902fbc61b16106819dceac23749c683d71b8cb8b6b00ecdacc4ec98eeb49bd0543fe8b0b9f89161f091f SHA512 cea55607e6c31c142826b47cdc5e5da17ef0cc7751791358184e81c6c6c2be4395f8477b61398eb067eb1c44a4b1921d719e28137161999c0f15fb8b7bc91c29
-MISC metadata.xml 245 BLAKE2B 61823ae735b381c891f5cae47974d3b1ea6136d6f5f5d449a26dfcdf26472282d760b4ee8a605b8a7b75b9c97443cbc0db309ada118ce186030f276ed7c88963 SHA512 b098db4fb4d9ea116f6246bc6caf0f49e80e236d2fad78d287b638dbd5add7bfaf7feb1ca081ca557b23dde9227ce42fa808f3f6fd8eaba6a7e9cae93342f9c6
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/xalan-c/metadata.xml b/dev-libs/xalan-c/metadata.xml
index 41cd682e0ecf..6f49eba8f496 100644
--- a/dev-libs/xalan-c/metadata.xml
+++ b/dev-libs/xalan-c/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cpp@gentoo.org</email>
-	<name>Gentoo C++ Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 1d13fa3a6147..d3498bfe5ff5 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -6,10 +6,10 @@ DIST xapian-bindings-1.4.7.tar.xz 1121700 BLAKE2B f8492113b76aba322c975aa2b957a6
 DIST xapian-bindings-1.4.8.tar.xz 1123812 BLAKE2B 5aa496ff3cfe06a40fa8db6a04cdc9041f4a0d9f12c7a61565f10c7d360490a7c8a7c745d91c9eda45b9d9bc58bd6a2bbae02aa9dd7ff1949ac59f7e09b090df SHA512 f979c32b096ecdc7a71b2bd032c6d0e7131f3d304e47e44005989ca79ea1f940c39626c60a8e52ff3cdb2cb380aa5ddf82a99bae08e06629c0bd47d8e0bfa7cc
 DIST xapian-bindings-1.4.9.tar.xz 1123628 BLAKE2B 918748bb99b826485127b16511ae2fe6e7965102738308fc675eca3018c8a7131fd65f54cc396912367c4c6f43c7c28b1ba07591567fe3ae646c3e1480439d0d SHA512 cddc6cedfd571d565619ade0a4c9bfee8d688ca3d06d77368c8d673d3c9d1296b652122836debc84a4d54724c2bf0639a009396bf587ed4b8901a6bfe508851d
 EBUILD xapian-bindings-1.2.25.ebuild 5543 BLAKE2B bc376e81fe32e1f746c5b917133ed66bb825e1a55bf3423cff3271e5aa7f3459a0afc3fef865486655412245e5c6156ffc98d5875b77e596a3b4bddb57be79ba SHA512 be4114e06d5f88f34bfc84ba6ba47723196f2c1160bf5e3d519875f1616fa0382873cf16f42bd423d625a5f80c5b888329c33089fe4bac740bff73d324192501
-EBUILD xapian-bindings-1.4.10.ebuild 6534 BLAKE2B e1468aee423fc1c0284ad421bf430b62d2457bebae9a5b8c159dc44b1779e06ff7afc0cfeea5518c29dfd690b5fa14ca7c4e1311342712c84d40307fd764e441 SHA512 8a50548190bb01223290c35de4dc9f5ae3273c8373f2d9dfc1a788bece537380792dd53d3734a20b43c2bc700618400c1d9ffb36346c0f1c7b721ac8e29fcbc0
-EBUILD xapian-bindings-1.4.11.ebuild 6534 BLAKE2B e1468aee423fc1c0284ad421bf430b62d2457bebae9a5b8c159dc44b1779e06ff7afc0cfeea5518c29dfd690b5fa14ca7c4e1311342712c84d40307fd764e441 SHA512 8a50548190bb01223290c35de4dc9f5ae3273c8373f2d9dfc1a788bece537380792dd53d3734a20b43c2bc700618400c1d9ffb36346c0f1c7b721ac8e29fcbc0
-EBUILD xapian-bindings-1.4.5.ebuild 6492 BLAKE2B 7f64c5cba86f1ca2870b8df4a23bef48dea2ccb33a74478fd244005e75d28d868788fa9e1407988d29f504fa6073785ceea849bccf608432204d01f5ca242629 SHA512 bf33d6e312125fa75b42562d062f19e180302ac112d2347e6e5c77ba151b6375fe7e35e370952077264062cd998f604f811aa5414d445f80a9b514d6388621fa
-EBUILD xapian-bindings-1.4.7.ebuild 6494 BLAKE2B 2c78c2b3bcedabadb4cbf0993ee613fe0ec39d526b50b7b3b53bf2a73d31a70a0af29917954ba61f2acee56e3d2335a42df5d43c936d0067e3fea007a81647ce SHA512 3c02f969c0d02b697eddc4aa80cc3bbd5fd5bcf69eac44e10fbb1225bcb1edd477b8e476c9d1bcb2b0f8458696c6f060abe58f610ef550a2880eb22c0c2f358d
-EBUILD xapian-bindings-1.4.8.ebuild 6499 BLAKE2B bb41c2156fc1248676bb623264a4abe5a88d0acf721f27dd24ecfcb032c2be8615bf5a7e39c54889d038cd42dc3fa313cf36967b8100d9aec711fd61ee21e0ac SHA512 2a4e37fbe178bc8308eca40503cf751bc1dd67ff8c894bb4b4558ad266e9e28475157974952b5bd5e1fc8c84ca06c880d1876d7bf8f058e46c122b249ac25aeb
-EBUILD xapian-bindings-1.4.9.ebuild 6499 BLAKE2B 40c3583cb74d329d3a1f889a13faf9fec389b6fbdb3929905217b18779c5732d9cbf400ef5ced605ee300e42c98c07cd8f436c7aaecad706a5ad4e999c086b67 SHA512 472974e000b4870272c5552dea2c45ceb5d2e1ff85f69e6bf8c57a9296430e88f119a19e435df12dc668f18a1692aa4b628d8c5c1f1052a5f5090b5ce1ccd3cd
+EBUILD xapian-bindings-1.4.10.ebuild 6530 BLAKE2B dfb2288801273cb4ac8285dcdb39cebf1b2a84d47a806fba8c18f501c06c7d6e33b6975dae450bd5351762b2f3bffa5e89789ee3e71cd21e3b3f8d53c491afbd SHA512 8b8b016850a88a709423c77057d129eab31cf045f6259438c5637e10d39b3a83fd9a90eb6916dff476a7df5688e8ebdc1b55036cedab0263e2b8dc4ff59b326e
+EBUILD xapian-bindings-1.4.11.ebuild 6530 BLAKE2B 04b955a778b74fc12a7c31dc229f2f45161b4ed2d779428c79c69a61c5f0c6d1409e6a1cde173941ab818a6d392e5e809efcddf40ff4907dc6d65e41a1988611 SHA512 1f7aba8edc1786225f955521fd71a1af4449b57ab5dcdce03157df7ee660658472458c96972812a5cd2ee014fadd170d382e5d537ddf7ac6ff1edac9898780f8
+EBUILD xapian-bindings-1.4.5.ebuild 6488 BLAKE2B f12e316e847e7cbd2e95316d55bfc0e8a8604a0fee28fb0bf3a1468ca2e94e2ae529b115ffa1fcc8faa2eec39ae73316e176b7bde25a4f876d1264bb03f58b52 SHA512 d14997a9becb16d57b45f043f0c3603f07c1ea35d2a2dfca93cb14912e1cd1c1323440ede8a8d8d72fc4daa272828e198a11e0f4c75bf579104c7ef595f4968b
+EBUILD xapian-bindings-1.4.7.ebuild 6490 BLAKE2B 2fddcc803abdd5092272a67887e863ec651076e93dedc94ad1075f4f1c9bf6471fb786de8d06885c37efa70ab98b10b3a4aa9b6c15435b049e0b4f4d9ed0316d SHA512 ef1e8db2e00d06e9bdd7495f8a422863a202a6ed361bbbe0f2edda7c2fc370a66367a739a430e083555901fa47cef6384de94de237a4147e240cc06b07951f94
+EBUILD xapian-bindings-1.4.8.ebuild 6495 BLAKE2B 0da32466feb397bb7b88dab127600df150fe96c02d1dafce69fda5b287456e6d28dde1d1def67dfb8a4369b26d4c39f6718d1ce9e4772b6ea1139d0e3b89b54c SHA512 e620099b698789fa2e5cc301cc04c48a0ddc753c69c345fc302e399ca1a7f111babefa0217495230dc366628fd74cc6d50bd14bcc1fb3d6f363108dfec6d603e
+EBUILD xapian-bindings-1.4.9.ebuild 6495 BLAKE2B 6689900fcc102a87026c7caadbfa0236f0dc09f05358c476f00811794162f893fe443a7a28f78cf5932a25a2a10dcf37ad59a8ba9071d1cd67da5750ec89f914 SHA512 3741ecbe510f47f1bb4c9ebec438bad96249400c4070048cb023236495f6ebad1f9c3b75880e9f7160ff72d6b3add66cbcd8bfab6c9a71d4875e6caf7212111a
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.10.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.10.ebuild
index 2420ca3c9f51..0629208df2d6 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.10.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php7-1 php7-2 php7-3"
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.11.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.11.ebuild
index 2420ca3c9f51..48b34ec9dbb2 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.11.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php7-1 php7-2 php7-3"
@@ -12,7 +12,7 @@ PHP_EXT_NAME="xapian"
 PHP_EXT_INI="yes"
 PHP_EXT_OPTIONAL_USE="php"
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 RUBY_OPTIONAL="yes"
 
 inherit java-pkg-opt-2 mono-env multibuild php-ext-source-r3 python-r1 ruby-ng toolchain-funcs
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
index d43c5849231c..8141fcf2bb37 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php5-6 php7-1 php7-2"
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
index 65f839635990..5692eb147729 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php5-6 php7-1 php7-2"
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.8.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.8.ebuild
index 7d27c84b709c..33b359d1d018 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.8.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php5-6 php7-1 php7-2"
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.9.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.9.ebuild
index 50b7c1033b1b..c2edfe896fc9 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.9.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
 USE_PHP="php5-6 php7-1 php7-2"
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 8b5aafd82af6..5d403e94c2d9 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -8,4 +8,4 @@ EBUILD xerces-c-3.1.4-r1.ebuild 2824 BLAKE2B 07765e9c4ab0af4f1eac7b3630faee0b5c4
 EBUILD xerces-c-3.2.2-r1.ebuild 2957 BLAKE2B 6c13acde94caac5ad81bac9ca33f326d8bd9c51b1fa7ed459788583068c581fd87b90169a6b76f5247931d6952b39916126fad0a8d2cf089d0950e0a7d340302 SHA512 a0f212c7c2348f125730fa69d23727cefe9731b5d5bd88b12bab41e7308d0d1c39deaabaaef99334b40aa0c6d0d225b70b65663937ff145dd6168f3fc61bca90
 EBUILD xerces-c-3.2.2.ebuild 2759 BLAKE2B 6bb440b553a8e3766b5aabd52cbd4da8ead25c04d4c0ed77d9131dac911eb1e3156bab6be73cc20a951224c65d87e4320d0bce0327ca634ab90a1a5de2169ff8 SHA512 0784c58a373d2ae567de3a6b6582199c893f89ef5bb584a90876ada3cce88d0fc4d761b2a516ee47d815d9be23c73eb455a9189fa41bff1ffe6f425ece83b805
 EBUILD xerces-c-9999.ebuild 2868 BLAKE2B bd1be084d8090c1538260577ab8e89ec8aaf9abbf83c5c8fdaa046e2e44daf0acc996deafc832ad2635043cce5642a5b350223a58a7bb34e0bd4321a1e7893a1 SHA512 d1261c22979dffe67756acfac50fe395d98b56836f246e40acce0aeba1d0b79a8c5fc5d7cb54eff355f848d40aebd9fa36b3829ab00928193739a7823e7672d4
-MISC metadata.xml 849 BLAKE2B 4d7f00d4864bd2b347723a029ff58cc7c9f84867ebcc45392a94b2d063cdbde84a4290e2302d9fbdabf98c7cf3a3edb04a18ce60d6c5bd9c474a492f5acc4b2f SHA512 e1aaa46f73a6cc929dc87530053ab0f15d632a1998d3ac13991ac94610d578deeeb8e4e786bbe42512c7231d99701c9bf59047cffba0bb48044e80f96f36663b
+MISC metadata.xml 768 BLAKE2B fabc57ee82dc82444461b1ec25ebda2af68a8eb00c6f44cc24de70daf96fd245acafc04d1bb75ffbb780e1b0877d7862a119264b81402df2e9c2f20ff252a166 SHA512 e447b67df2d7e7c3fb7cddc1dfeaf7c4da734ba71b1b0138abf63f8d0c5c42d0f2dd8cf6a281d4a88da32f4c073d81fab91f3fbca92d50d6bc9855a64814784f
diff --git a/dev-libs/xerces-c/metadata.xml b/dev-libs/xerces-c/metadata.xml
index 14a0b7619ff6..e56c7723c484 100644
--- a/dev-libs/xerces-c/metadata.xml
+++ b/dev-libs/xerces-c/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>cpp@gentoo.org</email>
-  <name>Gentoo C++ Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>xerces-c is a C++ library specializing in XML parsing. It is released by the Apache Foundation</longdescription>
 <use>
   <flag name="iconv">Use iconv (<pkg>virtual/libiconv</pkg>) as message loader
diff --git a/dev-libs/xml-security-c/Manifest b/dev-libs/xml-security-c/Manifest
index cc3b8d07c87d..d62ad5ed58fd 100644
--- a/dev-libs/xml-security-c/Manifest
+++ b/dev-libs/xml-security-c/Manifest
@@ -1,9 +1,4 @@
-AUX xml-security-c-1.6.1-nss-compilation-fix.patch 498 BLAKE2B f6469e552ad6cb300556e80c52c881c64123fb34dbce83fe4d77eb2c48de0f20ac4605edc4d2f2712f991b2b55ffdee9f7d91409cbc5dadf7960b2c5c978692a SHA512 cef34103931356f68a250a89f195e4ad0e67a116c6d0de2ab07407f607d70bec0c1e8d57d9eefa47c8bee7f5750668963409a4d740cead239b7ad16665515bb2
-AUX xml-security-c-1.7.3-fix-c++14.patch 1182 BLAKE2B f534183150d2015b42563bd20ba6a39afbad8469d0af6d6746cc36608911e6fa06f8340611760df7e4c3aea8e1ba8d2ef656aaa0712e5453caedca401361fcf9 SHA512 b1a0154b1a973e8ae4f4687c319694b2b6d22dc20385c2e74e27bf00a1887734075da27e10a48d3204d72d35baa55aaba1965984b75512097a0cc38b192211a1
 AUX xml-security-c-2.0.2-libressl.patch 2224 BLAKE2B 076555d874526180d9842599cbb788819e6b8508d1c11dd20a63ad681e4a2d256b8d3b0d80cfcf6d23741cb735bdc5845a72226bd56526ba24e24f5155374b5f SHA512 f248594d5fadd960d6437b5c17ad12db5455dc1ee3b30849f0c394fbf4ac8e85b3a575a833e0878ca5c6fb2a264878b86e3656a21f3038a105c1162253ce446e
-DIST xml-security-c-1.7.3.tar.gz 909320 BLAKE2B 5fa9f3ae53b93104c191b76f8ae4f9dad69c690d409ae3f13864cf011bbbca740c5378c0718abb496811c9814b5a7f237042af22e697bfa2e5044668ff3fbd2d SHA512 ea46709d6706edf345e19132d9998774e50dc7b5947a7b4a55e3627998f5ac66f976fdff0a5015ef3cee73c03c04f3c4cf993efd397082491c2000c6548b89d2
 DIST xml-security-c-2.0.2.tar.gz 904933 BLAKE2B 8e336dd7539778411755a8d45398daa530a2f602a0d57faa29301d1f0b29ab0a61c3f47ead42b740337ea75a28e03f471ae6735d5cd66d31f56d3d5fe3405b1b SHA512 bebadee2daf27181f5bcc955a909397976e8fd2e67f5e546f5adbede0ca790647cbec9181b0b609da59d525ff3baa9f899af2a3d815bc7a2f3a57bd8b30c011b
-EBUILD xml-security-c-1.7.3.ebuild 963 BLAKE2B 7a2ff075d5996cb995df3e3da595adf636ff4b1a92b73c56e2ae6794b0f1de964a2c5d80738bff05daf80f6758c5fe86e104432f7c9de441d8521ad18d63ca9c SHA512 25370e42290a4d3787af196930b106030ec66d5ffef0277bcfe1afa08b8b853ea929a17e021a1c51ca1c69df38c74c0ca1fff17eee75a0a09e0a3c4658136ba1
-EBUILD xml-security-c-2.0.2-r1.ebuild 907 BLAKE2B 932b2c45d8e9bf2438baa48b75cc148355029bbd86433fee61b507dc114215539d73349dc4fc373ebce7b4ba7b85672e32d0d5d38789775527aa73ac1b1650ec SHA512 e67202e3f24ce6c3c00b932ed08edb41188592a98cd3cd98d169f172e0541787f266deb0fa0da2688caad9b7661cdeb8dafff79cc7611ad523eee81d3d17dbb0
-EBUILD xml-security-c-2.0.2.ebuild 860 BLAKE2B f0187d21d4bd9b23938d81cc9ea64abcb73d1952938fbd11d6da030cbd346d0771a0995dd0c07e4204b788b97b708432a7fe78b5f036346bff27a0cb99271eb1 SHA512 15718df9237da73c333e533b5be5ec3e87d625b830f0ff0c037ce1152abb3b8c2e47a315d33d1a529446a6f48c75d17321f0cf0b254d1c6a3786e17bd99d1eab
-MISC metadata.xml 483 BLAKE2B 184149c1f04282005aa8172c19edca6db6ae769d0ea042261180af79734e08554e325a1bf29f01bb27506dc4a3d5161ccb03395cc6f06c929f6d3f43e171643f SHA512 307df4870d40181dfa0fb62b5791a457ae5c1c4b5f752bcfcd3d6224a3f437ebbc17dad8892b8728ef8be152f2a463814404143e0caf92489c6221c1bf216ef2
+EBUILD xml-security-c-2.0.2-r1.ebuild 908 BLAKE2B 405c8036ab3a993ca471b1ecbaf48bd7fb94344853d2e1d0a6037945323fee76943c2c1b02512025340e9b08afdc8ad17bd2c04c90b00fe3192e89044318ac8f SHA512 aacf14edef1e76d2290ec4dc62cc6bae053cb5b94d290bb83c67fb8508f8e4e4ff1a811ca1434ec058db99bacc4483bb8c20e7039c2aefd853f2939f3fc82699
+MISC metadata.xml 401 BLAKE2B e1464fa11f2fbc8193158e81a988622d0f92d70a243a817cc8be3dacfddf75550f930743cdfef5d062978811285ef7f51685f4e0dc916458ab7be326d933ec55 SHA512 07f6591298a410fa90c6b830f7ce19dba7c17b1d57e6e1d94e3c399299885da07106abee7ff57dd49854b27b6b7186c038fac6a454b4bb0f36e06fc9c4a32789
diff --git a/dev-libs/xml-security-c/files/xml-security-c-1.6.1-nss-compilation-fix.patch b/dev-libs/xml-security-c/files/xml-security-c-1.6.1-nss-compilation-fix.patch
deleted file mode 100644
index 1635d6b80339..000000000000
--- a/dev-libs/xml-security-c/files/xml-security-c-1.6.1-nss-compilation-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/xsec/tools/xtest/xtest.cpp b/xsec/tools/xtest/xtest.cpp
-index ec40cb2..9cd389e 100644
---- a/xsec/tools/xtest/xtest.cpp
-+++ b/xsec/tools/xtest/xtest.cpp
-@@ -2566,7 +2566,7 @@ int main(int argc, char **argv) {
- 		}
- #endif
- #if defined(XSEC_HAVE_NSS)
--		else if (stricmp(argv[paramCount], "--nss") == 0 || stricmp(argv[paramCount], "-n") == 0) {
-+		else if (_stricmp(argv[paramCount], "--nss") == 0 || _stricmp(argv[paramCount], "-n") == 0) {
- 			g_useNSS = true;
- 			paramCount++;
- 		}
diff --git a/dev-libs/xml-security-c/files/xml-security-c-1.7.3-fix-c++14.patch b/dev-libs/xml-security-c/files/xml-security-c-1.7.3-fix-c++14.patch
deleted file mode 100644
index 40783bf21b29..000000000000
--- a/dev-libs/xml-security-c/files/xml-security-c-1.7.3-fix-c++14.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix building with C++14, which errors out due to bool -> T* conversions
-See also: https://bugs.gentoo.org/show_bug.cgi?id=594234
-
---- a/xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp
-+++ b/xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp
-@@ -151,7 +151,7 @@
- 							 SymmetricKeyMode mode = MODE_CBC,
- 							 const unsigned char * iv = NULL,
-                              const unsigned char* tag = NULL,
--                             unsigned int taglen = NULL);
-+                             unsigned int taglen = 0);
- 
- 	/**
- 	 * \brief Continue an decrypt operation using this key.
---- a/xsec/enc/XSECCryptoSymmetricKey.hpp
-+++ b/xsec/enc/XSECCryptoSymmetricKey.hpp
-@@ -185,7 +185,7 @@
- 							 SymmetricKeyMode mode = MODE_CBC,
- 							 const unsigned char* iv = NULL,
-                              const unsigned char* tag = NULL,
--                             unsigned int taglen = NULL) = 0;
-+                             unsigned int taglen = 0) = 0;
- 
- 	/**
- 	 * \brief Continue a decrypt operation using this key.
---- a/xsec/tools/checksig/InteropResolver.cpp
-+++ b/xsec/tools/checksig/InteropResolver.cpp
-@@ -645,7 +645,7 @@
- 
- 	}
- 
--	return false;
-+	return NULL;
- 
- }
- 
diff --git a/dev-libs/xml-security-c/metadata.xml b/dev-libs/xml-security-c/metadata.xml
index 507ea2f59d11..76ed43fb1227 100644
--- a/dev-libs/xml-security-c/metadata.xml
+++ b/dev-libs/xml-security-c/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="xalan">Enable support for XSLT and XPath parsing 
 			by <pkg>dev-libs/xalan-c</pkg></flag>
diff --git a/dev-libs/xml-security-c/xml-security-c-1.7.3.ebuild b/dev-libs/xml-security-c/xml-security-c-1.7.3.ebuild
deleted file mode 100644
index 19b14771f99b..000000000000
--- a/dev-libs/xml-security-c/xml-security-c-1.7.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Apache C++ XML security libraries"
-HOMEPAGE="http://santuario.apache.org/"
-SRC_URI="mirror://apache/santuario/c-library/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug examples libressl nss static-libs xalan"
-
-RDEPEND=">=dev-libs/xerces-c-3.1
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	nss? ( dev-libs/nss )
-	xalan? ( dev-libs/xalan-c )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( CHANGELOG.txt NOTICE.txt )
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.1-nss-compilation-fix.patch"
-	"${FILESDIR}/${PN}-1.7.3-fix-c++14.patch"
-)
-
-src_configure() {
-	econf \
-		--with-openssl \
-		$(use_enable static-libs static) \
-		$(use_enable debug) \
-		$(use_with xalan) \
-		$(use_with nss)
-}
-
-src_install() {
-	default
-	if use examples ; then
-		docinto examples
-		dodoc xsec/samples/*.cpp
-	fi
-}
diff --git a/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild b/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild
index afd103f43067..278e534140b8 100644
--- a/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild
+++ b/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Apache C++ XML security libraries"
-HOMEPAGE="http://santuario.apache.org/"
+HOMEPAGE="https://santuario.apache.org/"
 SRC_URI="mirror://apache/santuario/c-library/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/xml-security-c/xml-security-c-2.0.2.ebuild b/dev-libs/xml-security-c/xml-security-c-2.0.2.ebuild
deleted file mode 100644
index ea768c10d665..000000000000
--- a/dev-libs/xml-security-c/xml-security-c-2.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Apache C++ XML security libraries"
-HOMEPAGE="http://santuario.apache.org/"
-SRC_URI="mirror://apache/santuario/c-library/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug examples libressl nss static-libs xalan"
-
-RDEPEND=">=dev-libs/xerces-c-3.2
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	nss? ( dev-libs/nss )
-	xalan? ( dev-libs/xalan-c )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( CHANGELOG.txt NOTICE.txt )
-
-src_configure() {
-	econf \
-		--with-openssl \
-		$(use_enable static-libs static) \
-		$(use_enable debug) \
-		$(use_with xalan) \
-		$(use_with nss)
-}
-
-src_install() {
-	default
-	if use examples ; then
-		docinto examples
-		dodoc xsec/samples/*.cpp
-	fi
-}
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index fe23256d031c..c4d500787327 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,6 +1,9 @@
 AUX xmlsec-1.2.27-gnutls.patch 1638 BLAKE2B 0368f307fbadbc9f90b130e339abe7d1f5774207eff4853f5415986d9d97ed85027f9679d74b76705ab53931060be52586a053c191b9be9954e6594092e0922a SHA512 e5c6398ff234f69d72531e1997dee28b1f0fc10f7ee67d2b70036760ac2e3c0bfa4c3caca29ab05feeafe402ef8e87f95b3c96e7c9fac9df90e74bae3199fc13
+AUX xmlsec-1.2.28-test.patch 2418 BLAKE2B e5cf92fd7f72be16d95fe67da99c96fc8e1bc8e7dadbfdbf5970ff7c148aa95868c2a4db8a03e86a2b67dd54c6bb71f0409bc4e075ad2b7148da1f489e672dee SHA512 48e72e197a23d4a0f3c7679dad438b1d9e140f2c9a311959748d432c543e4f48d32a52a4f65bd971d0263038cf6fde4a753e0eb2616ac6d5db092279cdc08b46
 DIST xmlsec1-1.2.26.tar.gz 1922183 BLAKE2B 8cb8557a7d24df756655a7dfa45091445adc89cb67169a7620d9d1116f3fb3d982ea45199a53475e29300478c07e8e1168cec79cf9c3b5ff1dd6c840123b982b SHA512 1e3dc3c8c192eefee7b055787bef52ce3bcfafa786224f68af065aa45f4d7da93232da973359b3135615c5981ad4df7c124047d3934e552ab78439472685a7a4
 DIST xmlsec1-1.2.27.tar.gz 2013651 BLAKE2B fa46a25e3aaef432134d1c98a0e7bf0aba83f2ef6d1aff3774d6d37c5f6f392d1c2c11a0fe433ee910c39b56400c96b74ab061577948622b14a1116fa1ec2947 SHA512 01f7231d7d7ac8037aecc1f922acc572cbfe0903abf5bd5879d836438c36684e23402b803d20806fff6b1cdc5ad9af114d1341b10b336f71c0bce28b4716f920
-EBUILD xmlsec-1.2.26.ebuild 1551 BLAKE2B 332cf6b782a3ff702657933a8b7c43da5f4dcbdd44ef61c042dd2d75432bdb71b29134a47da618e4063cb855ff18010ff136b7856540568bd25b0df4b3aee35e SHA512 8e40917ce5326f5e511406f9bda9f7693475eba4ab05656a83060f506b069d29e01b97cf8b01d063417980a40b4c087bf16dfe9a6147352da3b38860591224f9
+DIST xmlsec1-1.2.28.tar.gz 1995599 BLAKE2B 5d90646d9a72024856da2638adb6d0d00d5142f8d3eaa5b12a993e2e6ae78ad49aab69822ebe331191bf1fc5b98431b85e113545aec84e2bb7d5c5add9028df0 SHA512 17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480
+EBUILD xmlsec-1.2.26.ebuild 1551 BLAKE2B f10ce32f0ba423c1e07e66edf9c20d4b516ee88daa9cf7e1c60aa2909b05db67e244dfe721a67ca1bac2f59a65cfb37eca88cff696f491c3e56357273c3b9b54 SHA512 d57d7e4dc58657e1affeebcefdb4315e5f531e32e6a633dac185898e9e45ab510a8fcb1b7974ee9e7c2ab8febaf2acadf8d8af32b2fa099f16fb6063f25eb19d
 EBUILD xmlsec-1.2.27-r1.ebuild 1568 BLAKE2B a0c648ce6a85c11f598e8b4515946bdca93fab9cd4a8a257f5b32011a86bd9f484d0bb568a545ef244401c36977b42052fa75b7e02018bca2a9f3cb75acb5e68 SHA512 3450a47f9ca8539356b699a5a669ce63b39b4f44e1e473ff67319e056061db03291a727013f1bde0bd066940f0f52f52ecef2fe046bd582f018608c8d1e628c2
+EBUILD xmlsec-1.2.28.ebuild 1376 BLAKE2B 6be12c2bf8f0f3582d9927940396a850b33710dcb910d1941a2da9d3cffb1e043cc1f8822581a9142245c4e878aa43ceddd4e788d2131cfb02774d7ba7dfa75c SHA512 e7b8c939c7f472bdb8e4276c4a86c1e06571527abfdb8e365813aa0c1a336daeb649548f5a9276e7b0ee3aedc7ffcaa05e98e6ae839b977b88b0b7422d2a5c3c
 MISC metadata.xml 487 BLAKE2B 0e191be30487c618789a7eaf8c2ca9ba0e801649213674adc85e76a5402853055d384efb9d6b534099683de4b2935dafa613ac029fd810125993d039cf9caec8 SHA512 1be5c6aa74ba9542e7b4b85adb8dd743fbeb72b4fee345996ee1b5bc662d9455d910f00ca37b16e644f53039a346ef44afc5e49abba19c5f8d4d00cbdf37d660
diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch b/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch
new file mode 100644
index 000000000000..ae80e1fa5f36
--- /dev/null
+++ b/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch
@@ -0,0 +1,51 @@
+From 3d5c9e38d9576aea252ba186dd2913c57a7a8dd8 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Tue, 16 Apr 2019 23:07:08 +0300
+Subject: [PATCH] tests: workout test --X509-skip-strict-checks
+
+Apply --X509-skip-strict-checks parameter to verify commands.
+
+[PORT]
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+diff --git a/tests/testrun.sh b/tests/testrun.sh
+index ea65802b..9950d4fb 100755
+--- a/tests/testrun.sh
++++ b/tests/testrun.sh
+@@ -59,7 +59,7 @@ if [ "z$XMLSEC_DEFAULT_CRYPTO" != "z" ] ; then
+ elif [ "z$crypto" != "z" ] ; then
+     xmlsec_params="$xmlsec_params --crypto $crypto"
+ fi
+-xmlsec_params="$xmlsec_params --X509-skip-strict-checks --crypto-config $crypto_config"
++xmlsec_params="$xmlsec_params --crypto-config $crypto_config"
+ 
+ #
+ # Setup keys config
+@@ -308,8 +308,9 @@ execDSigTest() {
+     # run tests
+     if [ -n "$params1" ] ; then
+         printf "    Verify existing signature                            "
+-        echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml" >> $curlogfile
+-        $VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile
++        params1="$(echo $params1 | sed 's/--X509-skip-strict-checks//')"
++        echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml" >> $curlogfile
++        $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile
+         printRes $expected_res $?
+         if [ $? != 0 ]; then
+             failures=`expr $failures + 1`
+@@ -328,8 +328,9 @@ execDSigTest() {
+ 
+     if [ -n "$params3" -a -z "$PERF_TEST" ] ; then
+         printf "    Verify new signature                                 "
+-        echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile" >> $curlogfile
+-        $VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile
++        params3="$(echo $params3 | sed 's/--X509-skip-strict-checks//')"
++        echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile" >> $curlogfile
++        $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile
+         printRes $res_success $?
+         if [ $? != 0 ]; then
+             failures=`expr $failures + 1`
+-- 
+2.21.0
+
diff --git a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
index f8f0ce257d51..16f8db947c10 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-libs/xmlsec/xmlsec-1.2.28.ebuild b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
new file mode 100644
index 000000000000..50ec11983a80
--- /dev/null
+++ b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
+HOMEPAGE="https://www.aleksey.com/xmlsec"
+SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
+REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
+	gnutls? ( gcrypt )"
+
+RDEPEND=">=dev-libs/libxml2-2.7.4:=
+	>=dev-libs/libxslt-1.0.20:=
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= )
+	gnutls? ( >=net-libs/gnutls-2.8.0:= )
+	nss? (
+		>=dev-libs/nspr-4.4.1:=
+		>=dev-libs/nss-3.9:=
+	)
+	openssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	test? (
+		nss? (
+			>=dev-libs/nss-3.9[utils]
+		)
+	)"
+
+S="${WORKDIR}/${PN}1-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-test.patch"
+)
+
+src_configure() {
+	econf \
+		$(use_enable doc docs) \
+		$(use_enable static-libs static) \
+		$(use_with gcrypt) \
+		$(use_with gnutls) \
+		$(use_with nss nspr) \
+		$(use_with nss) \
+		$(use_with openssl) \
+		--enable-mans \
+		--enable-pkgconfig
+}
+
+src_test() {
+	emake TMPFOLDER="${T}" check
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/xmlwrapp/Manifest b/dev-libs/xmlwrapp/Manifest
index 21a5e325c091..98f3aa1d6926 100644
--- a/dev-libs/xmlwrapp/Manifest
+++ b/dev-libs/xmlwrapp/Manifest
@@ -1,3 +1,3 @@
 DIST xmlwrapp-0.8.1.tar.gz 1470707 BLAKE2B 213923b5e74f79a6d966ded4b9c9dfb5e6906bc44dd5d79099ee146f852233675d59f33908ee4a2c844332e1b3f7b064770ddcdcd2cea0745bdac6e1329ec3de SHA512 f6415c7cbbe209f7ee148eff4ee5aca4f210b2ab420dbc89b2cdbca1f270097c362ecb456b0cc72cbebc8688fbc66ee3a94c1019d80e7211a9ebe44ddbd535eb
 EBUILD xmlwrapp-0.8.1.ebuild 1225 BLAKE2B 3be2e1162a50143aa2b2011cedbad361bbf413368b1e023881e8f06b5f39fe661b5693534e79924c3e33ae55462a828d7c0f5d336e463ad04c3364cf664a5803 SHA512 6992478f7ebf0fb04fc8724e96cfc231fa51046c10f4eae6910a61238a7a9e2b73f6f7ce4a7b4b999d0bb085b764f1c32ec41aae8416f923203ea36d1be4707b
-MISC metadata.xml 447 BLAKE2B 9ed79c4b6d20ad64a578e294021028b2469e9eb9ee4e93f528a572f418c93c13c2e1ad5594907dccb4470e22725860f24938fa78565f799ec2ef80810ef8cada SHA512 42783cd8d7990ae0aa06c28087c78f59b83940e6e871cf4146cf1212e4503f9cc11fd67720d8a7d7245e85cf727435304460b79a43adf4a1cbf46e5f593510f4
+MISC metadata.xml 365 BLAKE2B 49ff90af92159680c3ada3c35b8258b756137a7e05c1bfb2108e697874e4102755cfd55605dda1c8f4a00b039ba1333305033bf3729cc6bb4e96f16572735eb9 SHA512 1ec257aeec9800258e0d4ccd22aafdc0c062d2bf85f1f1f978a3fb185b82c6e867fa71d278ad26ab9e22e7151e7a63287d81801227e6263618b3377df9945f61
diff --git a/dev-libs/xmlwrapp/metadata.xml b/dev-libs/xmlwrapp/metadata.xml
index 9804c2c6e9a2..3bed55d09fbf 100644
--- a/dev-libs/xmlwrapp/metadata.xml
+++ b/dev-libs/xmlwrapp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/vslavik/xmlwrapp/issues</bugs-to>
 		<remote-id type="github">vslavik/xmlwrapp</remote-id>
diff --git a/dev-libs/xplc/Manifest b/dev-libs/xplc/Manifest
index 9117d5e2fb3d..072a5cfa3882 100644
--- a/dev-libs/xplc/Manifest
+++ b/dev-libs/xplc/Manifest
@@ -1,4 +1,4 @@
 AUX xplc-0.3.13-as-needed.patch 561 BLAKE2B 585e22f03e0958581763d2f8d34731732b6008896690902e14393d14d3fbe89ad6d11ba39793eb44692d5ed818ea6df1c8bf6e32219def24d342ce4b9935fc30 SHA512 105fd3d6a2452ceace8c2de20f6ba16141e232126f9947c95b5ca6ba25a5a71f86eb40502ab895c1d78421cdb5888086f9e2bffc052ed800ad0a07a7db2c26ca
 DIST xplc-0.3.13.tar.gz 175431 BLAKE2B fb013a3e1a3c75b9de0ee8af43fce161811e5b99e5386a1ea5d0a19c36db3ec70d1cbad5d0848bb76857ecf37ee5b3006315a4663b1eb463b1915a8958ababbd SHA512 6969ed16c282589ddc285678e1c02016810f83c4c0fea373d8b7a72c97474e6cc21ca3f8f7a7a6aae814037dfae51c3a41bd39f13a67445552b6a7c1b698195d
 EBUILD xplc-0.3.13-r1.ebuild 1098 BLAKE2B b51dd5a7abd2ad038cbd1c4e1c037f4981c9612cb03c1e23aaadc4e36f9a42908233e246dfa28e1dd969f3b05feecc9f46d165e660ba7778a6bc46bcdafc9a7f SHA512 9769d4c9353d2914f94e94b9deee43495a8dfdc4a8b54e8d945c8914a01d6d5ec77112d9e4adf12fd96060900558647cc70d422beb61f1f95b78636cb03b5e7f
-MISC metadata.xml 413 BLAKE2B a01f1a22ed52b7e8e5ebd9f740e29413ab9da40a6a4ff6f5208df3b434296f3af7e4cfa68b01702b1c66bee5fb96004b2f77d48547e90b5d6c899e65d30e6fb7 SHA512 be0418b73ff322800a5908e278e31f27fdf77d986615885fe2b0b92ac2b23fa8a392736cf72bf91ff9c697bc89f2874a09ed4d9eb0127d3965a48272e516eac8
+MISC metadata.xml 331 BLAKE2B 2927fd0e6a80b933c0e904d8e3a409d71bd6cb01c58ce2c845dcb9794cf7f5d27c2ab35f6b91df1228ce33ccdd9138513883e396cc1ad267de6304d270c7952c SHA512 8925223a2eec9ef58a1e7f018e40e982e76f507c1fe30605a72e8042fde736ffeedd18ce9f56e6b9967d0de8d45c18dc4f289c3eb4daafab55faa556709202a0
diff --git a/dev-libs/xplc/metadata.xml b/dev-libs/xplc/metadata.xml
index 0a477f0bc1fb..6f5064e23b85 100644
--- a/dev-libs/xplc/metadata.xml
+++ b/dev-libs/xplc/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>cross platform lightweight components library for C++</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">xplc</remote-id>
diff --git a/dev-libs/xqilla/Manifest b/dev-libs/xqilla/Manifest
index b66a7cd6eca2..0d54325b7700 100644
--- a/dev-libs/xqilla/Manifest
+++ b/dev-libs/xqilla/Manifest
@@ -1,4 +1,4 @@
 AUX 2.2.4-respect-ldflags-no-rpath.patch 561 BLAKE2B 120d733034c7bc75c0256aee0ef4b9e6fa8586a617c3cefe28486b20b107a13027c724a1ec8fde8c789978add1d1504f42ebe173c8de9993ea9c09f47633da8f SHA512 0637f0cae147c2cc90c29c392ee15d4a417efb759c35344e8fff53af670fbee22c273c27a9268eafad20b5042def7741bb4d9e6f3a8adc275cc72b9f2ec46961
 DIST XQilla-2.3.3.tar.gz 16170903 BLAKE2B fb88f507e77a248009a4eabb74e923849e55e4d3e716e95e0c25fc115aa9f72994b0e6dd1332529531bc59c34773e6a58ab1cd4459f19109da2dc8a348261ea2 SHA512 5a27416eaf1d7120c42dbd5c737e112954d4e3782de5ff4c77e29f1bcd1a5712cdc5a76f707d9c3323526a361e46df98d8ee1ca87c760d389d85598a8265054f
 EBUILD xqilla-2.3.3.ebuild 1535 BLAKE2B a3f7685f91206905fadfe5e7de1e2fd786331fca57a14aad699fe0f5016b3c660c3f7e1856da1c9634dc482ad8d084d3ea52cd40b1ec074eb719313911f31e21 SHA512 c177c423ad858135e1ccdd3d038b2f9adf9a7b713daa3a0eddba00534f4e9f28b7c0a32167ac8bd6f48c241bde7328a2d70db43fbfdc7bfde531703301b41b86
-MISC metadata.xml 524 BLAKE2B fc26b7b18e80c6d0baba1a686bb58fa496e35f24a1eadb742cc36e7d7250eb08bf059d731d87daccebc22bc6d28cc21be04f02c458c1639a4849ff1ee44ad56a SHA512 44524db6364ea57d9bcb7e7296bb441e8c526975f229c815fbb44fdfde5163a9713aaf825b1e9e48d7d1e37e6a8478834a1b67de2c8dfe2d86e83f5d026b211d
+MISC metadata.xml 442 BLAKE2B d3879cb9825d926b2b335a0924f8bb84c90667a46cc3139fa3bbced9134942ecf4881d850175dcf5288c991b0b64bad83bc840b4a539a6f28e85fd6db7274655 SHA512 efbbebb54857a854e910110f956de6b4bb6404cb3723dc949714c2496f63e891841b484ecb5de89393398ce0715ffd7a2b0d759fa66fe5c7e4274850b380b962
diff --git a/dev-libs/xqilla/metadata.xml b/dev-libs/xqilla/metadata.xml
index 369eb4264df2..e4ae2c3e7f5c 100644
--- a/dev-libs/xqilla/metadata.xml
+++ b/dev-libs/xqilla/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="faxpp">Use <pkg>dev-libs/faxpp</pkg> instead of Xerces-C for
 			certain tasks</flag>
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index a11c4423b03f..9405dffee3df 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,3 +1,3 @@
 DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8a3d6c936ab27d3b339dbca3fa88e8ddc4fc9878501d6875622edd2ba50f465b4c361f1eb42d8f7a8f8a6fbd SHA512 085643b52e091ac0eedd54c4459220b3643d825ca71a11e952d00ea2041c570ff57d8553d0378f34e038ca9ee3b40d2048ed02d44d5aff1fbfcbf5e642487ba0
-EBUILD xxhash-0.6.5.ebuild 859 BLAKE2B 57fdb9b6582de383c904f8b991015e8c5130cebf5e81f9dbb4ccb2af9386d66298977c637fb3b7f8609c9f1daae8008c23462a099f57787241931222c2e08221 SHA512 e232fe6bbc5dbe1160269de79a472c4a0c0b7ccd09a1038d6d99210abbbccb52a85ca5eac2203f8b7164218ea13d4774a50dc1a1d3ab33950dc7672fca67be6b
+EBUILD xxhash-0.6.5.ebuild 866 BLAKE2B e74ebb6ca149fbb5a21d27be21919a11716ba1da1552d8524c6e3d09601edb4876cdb27a7ed5726f903c309124dfb0ca8a39c883046a5bef9d6cb6916edab65e SHA512 fef64fa69b75cc2e5e599edc5bccf37d38e111912271e0e84d41bd8a537ab72a43d86f6dfa511e10e9259b031388794d9750ff6110a11654932e25a1a3ae7306
 MISC metadata.xml 392 BLAKE2B 6a06ef26d04abe71ca14dda2435abf49b8f1adffbca5b0af6947b73e48bb6696b216bc6da4b5cdcf9eb61ead18154af6e51679b1be350d063eaccad5a5c86303 SHA512 96be044c0faa5d67ebe60b1d1c11ce876ad3e031d605846d6623a51cf0f57615db3855dda4ff129190bc12b137c9c05395464efb150ad57da4804b852ee6802e
diff --git a/dev-libs/xxhash/xxhash-0.6.5.ebuild b/dev-libs/xxhash/xxhash-0.6.5.ebuild
index 41222a340a13..7674c73b5cb2 100644
--- a/dev-libs/xxhash/xxhash-0.6.5.ebuild
+++ b/dev-libs/xxhash/xxhash-0.6.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index 26819f315dd2..70e32d0ce9d5 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -1,6 +1,6 @@
 AUX yajl-2.1.0-pkg-config.patch 2299 BLAKE2B 1de5b3d183b692b8be1fe37d0f05e97141b82dcfce7770e9b4e27ed2443b8506efb8a6cff2bbc5ebac640ba87819833d0e6eb5d8cd8139a973861904afbea648 SHA512 0cc7f685b80280af209c8b3d9443711174a0439dc59f3e81dbd1f78b8aecca3eb29b2c8b88d94b8a4200a1248fb03948a1e51206373af49a55fb2eb32e9d7dde
 AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d
 DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985
-EBUILD yajl-2.1.0-r1.ebuild 930 BLAKE2B 0a7882f77bf56732226ac8187954c2733a33c1438d39e76d1d26c7c9b3e713bcb6706190350f3b8409e8c53957c42556c2888b6687f0f99e0aca30fc567b98fa SHA512 5f6462f1b1a53e558f25c1e91d3e0b6dd624d33f5a83f01742212f6ceae3a6940ba74f84b5857be1f5480ec152141aaeda6cbef5152b5d3b353e774725d09b8d
+EBUILD yajl-2.1.0-r1.ebuild 929 BLAKE2B 3056d21fbf420a21a5fe3e8ba091b5d1509c5c270dd559faf6ba189c1770f5eae18adb40efc9c67bdc5f662eb94594e593943ec5c9938eb90370007f394bdd70 SHA512 ddf6476d025c541b62e831540a97c16a89706a51c61b1207afdfe52bd04c1175360e67351433158237cb17156e41446a81702e50ede4078a2bb67f08618deb61
 EBUILD yajl-2.1.0-r2.ebuild 974 BLAKE2B d4a6ce6abbc3c5c77380c38fe63aacab05dbb9c5f0a5a3d02d886a54060ad228b1a838db4827b5398d009fb60fc0c3b232fec8c311d1c9b6c170f99f8b2c96a6 SHA512 8d51be22de264e3646cda6175f05b42cac76c59e6bea91b1c10f4a3d0a398a59bfa044bca43a651467738cc52ae9a36466acc5f403cc9db50ee335b47073c251
 MISC metadata.xml 336 BLAKE2B cfff08a4c7fbc2990928356c47d5110c6e6de6278ec3a45ac89f7dc1ae5f247a12214c41c884e622d264142b3f487fb82ff0457e15a0d39080e7680ad72d790e SHA512 c01c9b3ba695bb76ef55ede76c3e4b2e6843b27d4148aca7c290ac909aa8800541f0b85c043c5a74e518e4e84a0d3c6907cc4f93bbe8d0addfaaa40ede3a347d
diff --git a/dev-libs/yajl/yajl-2.1.0-r1.ebuild b/dev-libs/yajl/yajl-2.1.0-r1.ebuild
index a07a6e1bf4b7..0404291809c5 100644
--- a/dev-libs/yajl/yajl-2.1.0-r1.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 PATCHES=( "${FILESDIR}"/${P}-uclibc.patch )
diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest
index ac6bb0d53312..7802d0345762 100644
--- a/dev-libs/zthread/Manifest
+++ b/dev-libs/zthread/Manifest
@@ -3,8 +3,6 @@ AUX zthread-2.3.2-clang.patch 581 BLAKE2B 70c3005548e8380ca69ac698c4894f70815ca8
 AUX zthread-2.3.2-gcc47.patch 704 BLAKE2B 14031fe0230ba0abff034b894ddfe0e7c4178c65dbef4a2a74f9de164d3ac0d314912210a42a25beedaad098d34d8b03a59a51a7dde4567bf58562fe04743a3a SHA512 2c90bcb07a7063380b1f9f405467cf3d256ae0265d88886483612e7b11ded40a9dc810a9f11a36f2a40e62e30f98c36344b0f002b351980745d0562c1ca81a6b
 AUX zthread-2.3.2-m4-quote.patch 554 BLAKE2B b6c4293796b385d60f8011b3ee1c0436bfec773f40742159dc31eb4c07dd08c5bc0c474664712c6ef5e9a3b5a284dc17866f7f25591c67881f788a6ce7d7d2b4 SHA512 0f1b82ed3955174b16927e36a7dfc549d7cb6243f3a0cd2699a2f3c53fad5cd554140401d59dafd6f5ee4ce4fb689407ccf96ae9d5b9dc4a72a83157583b3381
 AUX zthread-2.3.2-no-fpermissive-r1.diff 2008 BLAKE2B 027c065581a86f6603dd0ff42bfa1446adf3faf514cde7ff5aaa8065fbb8a36779c2d237ffaef74d2af451cef38db5ff7c4520d043feddaeec2e26dc6252b001 SHA512 f5df932dc2a4a20c757ba0781891d53f5c4ad81b904107af0aff84759efd73ff200e9ec890e6e63679a66fc33b74f49ef88937bfb29a2bf666c443c68b6023d9
-AUX zthread-2.3.2-no-fpermissive.diff 2010 BLAKE2B 5456735110eaccfb46c3a7e4fefdfcaeb5e3d55ee84afba0ec349be36e95e790365916e9fb284e89e92495057e0bfe658ec80bee0b7052c72ac401ca0e9fbd76 SHA512 95f89cad5f531bb5374ae1e300080977defb69bf304221188204f3cbfbf4e23a1445cbe4174e279453a005ab410925b0111ce56ffac4aaf8656b50483a9f1a8d
 DIST ZThread-2.3.2.tar.gz 412527 BLAKE2B f8b176a35ca2df21460825f4cf9406a0e0fdd0a320eca2ffa323c47f025fa76e087bc30e3f6f2dc061cd79b0346c023f736f5fa2d1b0829eef718197c4e50e67 SHA512 e17e12746d16f32f6f1dc8ec041795f3c05a541c015b9579252599b51de9f97dc780946e6e83b41ca78d1af892455e6f00169a089f6e1a7c3196d6a4f49a7f7b
-EBUILD zthread-2.3.2-r3.ebuild 1461 BLAKE2B 0214ebdb48a5357b85caf9faa9c1a2b2a2abfa0f943164b08d6f71380f3d6e1a3b6686d5b7be6648bc1787d622817103a095fd50845dd84493f3fccbadf1ec4c SHA512 0001e221cf7368c9f6ec9174a6792f53e4bd7174244e4eaaaa6d81cd95a260afaef647a58fccaa60e0be20aa3ccdc2a9d30cfe8483f0e40e6ffd5f7de06378b0
 EBUILD zthread-2.3.2-r4.ebuild 1400 BLAKE2B 187cbe7dc8eeb306ed49ce764867c3fe340d0096f75c7e63213ac69e5336c001fe2ee6bc3260bd284c68ca0e81d4f543d3ea144ad1286c955f0ac485ee1bceda SHA512 dbad90c961fd55ae16a068c0bd433f201ec6eee145e9e8b6c2086cb1f38c35601bd8cc9be4e88aa231a61109f0ee09739c3ac80ea63d28bd3d3721985fa4fde5
-MISC metadata.xml 326 BLAKE2B 3fa1401644229e1eea16291af9d0953263662408b1319b38c4fb10047009b592db544e67c5467cfb8428c33f8a2594fd94f88a1289bd6e9c2b92310ef46d06e8 SHA512 b01487803f5222c80e0bec2b0acf7bc85a30c7314642ae8e178274b4872a17986ca88ef324700a732b1afb573b74eee64c2e1bf95c08e8fddeee5910969f2230
+MISC metadata.xml 244 BLAKE2B b4a4377cc4333cef7ecdd3e448ef2af4ad16f7bb26913b89e4f3d7dfc97df2d7ddeb39bcd532f015e29e8632f0a993d39561a2b256eb0fbf67bd477c7ec5326b SHA512 6c52d0a4a5ec7d266bbb8a74a87c40d4b6c1fd34abc7c6e5e4026c8708160c6527d81e32fc6a395ebab9f2f8f74dbd1518e8ae244e8d0b674614898568718bff
diff --git a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff b/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff
deleted file mode 100644
index 21fad7c52c8e..000000000000
--- a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff
+++ /dev/null
@@ -1,94 +0,0 @@
---- include/zthread/Guard.h.orig	2008-07-22 14:46:28.000000000 +0200
-+++ include/zthread/Guard.h	2008-07-22 14:51:41.000000000 +0200
-@@ -491,7 +491,7 @@
-     
-   try {
-     
--    if(!isDisabled())
-+    if(!LockHolder<LockType>::isDisabled())
-       LockingPolicy::destroyScope(*this);
-     
-   } catch (...) { /* ignore */ }  
---- src/MutexImpl.h.orig	2008-07-22 14:54:40.000000000 +0200
-+++ src/MutexImpl.h	2008-07-22 15:03:30.000000000 +0200
-@@ -153,7 +153,7 @@
- 
-       _owner = self;
- 
--      ownerAcquired(self);
-+      MutexImpl<List,Behavior>::ownerAcquired(self);
-       
-     }
- 
-@@ -164,7 +164,7 @@
-       _waiters.insert(self);
-       m.acquire();
- 
--      waiterArrived(self);
-+      MutexImpl<List, Behavior>::waiterArrived(self);
- 
-       {        
-       
-@@ -173,7 +173,7 @@
-       
-       }
- 
--      waiterDeparted(self);
-+      MutexImpl<List, Behavior>::waiterDeparted(self);
- 
-       m.release();
-         
-@@ -192,7 +192,7 @@
-           assert(_owner == 0);
-           _owner = self;    
- 
--          ownerAcquired(self);
-+          MutexImpl<List, Behavior>::ownerAcquired(self);
- 
-           break;
-         
-@@ -236,7 +236,7 @@
- 
-       _owner = self;
- 
--      ownerAcquired(self);
-+      MutexImpl<List, Behavior>::ownerAcquired(self);
-       
-     }
- 
-@@ -253,7 +253,7 @@
-       
-         m.acquire();
- 
--        waiterArrived(self);
-+        MutexImpl<List, Behavior>:: waiterArrived(self);
-       
-         {
-         
-@@ -262,7 +262,7 @@
-         
-         }
- 
--        waiterDeparted(self);
-+	MutexImpl<List, Behavior>::waiterDeparted(self);
-       
-         m.release();
-         
-@@ -284,7 +284,7 @@
-           assert(0 == _owner);
-           _owner = self;
- 
--          ownerAcquired(self);
-+	MutexImpl<List, Behavior>::ownerAcquired(self);
-         
-           break;
-         
-@@ -326,7 +326,7 @@
- 
-     _owner = 0;
- 
--    ownerReleased(impl);
-+    MutexImpl<List, Behavior>::ownerReleased(impl);
-   
-     // Try to find a waiter with a backoff & retry scheme
-     for(;;) {
diff --git a/dev-libs/zthread/metadata.xml b/dev-libs/zthread/metadata.xml
index 9512460c6411..3020b4780d3a 100644
--- a/dev-libs/zthread/metadata.xml
+++ b/dev-libs/zthread/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">zthread</remote-id>
 	</upstream>
diff --git a/dev-libs/zthread/zthread-2.3.2-r3.ebuild b/dev-libs/zthread/zthread-2.3.2-r3.ebuild
deleted file mode 100644
index c45773dbced4..000000000000
--- a/dev-libs/zthread/zthread-2.3.2-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils autotools
-
-MY_P="ZThread-${PV}"
-
-DESCRIPTION="platform-independent multi-threading and synchronization library for C++"
-HOMEPAGE="http://zthread.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~mips ppc sparc x86"
-IUSE="debug doc kernel_linux static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die
-	epatch \
-		"${FILESDIR}"/${P}-no-fpermissive.diff \
-		"${FILESDIR}"/${P}-m4-quote.patch \
-		"${FILESDIR}"/${P}-automake-r2.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467778
-
-	AT_M4DIR="share" eautoreconf
-}
-
-src_configure() {
-	local myconf
-	# Autoconf does not support --disable-debug properly.
-	use debug && myconf="--enable-debug"
-
-	econf \
-		$(use_enable kernel_linux atomic-linux) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		doxygen doc/zthread.doxygen || die
-		sed -i -e 's|href="html/|href="|' doc/documentation.html || die
-		cp doc/documentation.html doc/html/index.html || die
-		cp doc/{zthread.css,bugs.js} doc/html/ || die
-	fi
-}
-
-src_install() {
-	default
-
-	use doc && dohtml doc/html/*
-
-	prune_libtool_files
-}