gentoo resync : 03.03.2019

143 files changed, 1204 insertions, 3081 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 5f661e795fa3..e2ef2088e972 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 09f12cb81001..ddf49149119c 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -8,7 +8,7 @@ AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4a
 DIST apr-1.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
-EBUILD apr-1.5.2.ebuild 4077 BLAKE2B f9bdb8503c2101780f101db394a12040118f8f91a6ebc7a3d08899eff715d4065291b07fb9b662edc586807305edfa64ed2b0983efbdb074cb8733a91acc4e09 SHA512 4d5b178bff085c61704037f87d00b28fd51b588928d870a61670e2b171891316ac29584b2afaac38d0237a301d156eb0ebc316010f1695e5b8a8f268a68b1b3d
-EBUILD apr-1.6.3-r3.ebuild 4399 BLAKE2B 8646209fbbf771c4344a24a19c85e4db85e6ed3f0cba15adb44ccb05d0b72a3993b78ac2424bf2b3caeca962b981d2bd131306192a55e6fd040dff91addd60d0 SHA512 116a9e292e31bb98b925b0db929bc33c2f250c17a7b7c1fa2f079f1146ff7427408f4bb8640e2b8531f5ab3deb312d6b04277739bfbe41247403589a32851840
+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.5.ebuild 4344 BLAKE2B 9ce9356d89d4433ceb9f987f8f13d152d0bdec5d9f3e733c71ae2ede16deacf29e6cc9a84fcd7c5773edbcc3f3963c03248b1c14ad5ede26ec393a858b338503 SHA512 9d18249bda4c4bd1d10de424bfea14b5a2b998279745010aa937be31519a8e7407434f53537af6616e48b97915d604bc4312c21eb3b715c99fc1d3c3cc4ed3f5
 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
index 32175989515a..a3288dfe3f6d 100644
--- a/dev-libs/apr/apr-1.5.2.ebuild
+++ b/dev-libs/apr/apr-1.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/apr/apr-1.6.3-r3.ebuild b/dev-libs/apr/apr-1.6.3-r3.ebuild
index f086e372b334..78beeba65ab8 100644
--- a/dev-libs/apr/apr-1.6.3-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index 4def9f1a76f0..410625c58516 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -4,6 +4,5 @@ AUX beecrypt-4.2.1-cast-uchar.patch 8230 BLAKE2B ee94bf2e741e2c250ac4dbd6dbc7b2f
 AUX beecrypt-4.2.1-gcc-4.7.patch 262 BLAKE2B a99fa0e61728bd38510622a1770c3ecad156654dd79a2e380a0aaf48cd895d1308964a4dbc0ebcbbed978f78c066e4e480e193eeeb9b0e941828301256b0cabb SHA512 908d688ae29f23a3f67cb1ddf8d2f5277853abbf6fe291e371fa8595b8c6c5e4293c1c15b80171270639b9d4f092b4602bbd5144448c4f19ff958d5522edbc77
 AUX beecrypt-4.2.1-icu-61.patch 1348 BLAKE2B 7412a407e6da0349913733590c1fe650af65863eaf5112f89be8f834dd60629bfe8ff05852016ba710f4ccd16c2db5341a7120cd570669ea21d9560cf361873b SHA512 f84a078f8263eb8613a3114875926d4a12c0e2e5bb6dde823849686ae2e7ae1e27fc0b7d8dc9467322b815a09b63f91658b65250cd64809d14a8f85661205349
 DIST beecrypt-4.2.1.tar.gz 882758 BLAKE2B 7ca25613cf95df8657c762d932618979783ea2ddfbaecdf066701d61a5f9ac76bd474a51eb65e140c83ef01880477cb7104e3d67c2fc078ae7b710637d18bb53 SHA512 59995d53c024efe6344a21ac0d6d55fbe652488a4a22cc6719f9fc3851d56697fa8738937d48aa1e6f9ebe749de61ac3c79a5f0cea793872213c3bdf922e71bc
-EBUILD beecrypt-4.2.1-r5.ebuild 2258 BLAKE2B fd98acad8db1f298fa58171e1ac39258497e20f0538eb0e316eda0f2d953a344ffb9eb5acd83970be32f9530b2f04dd65b5cafd09a1f9d5862705fa14734dae7 SHA512 fefca8cac89bac9f8e422cf42dd2911cf5f9ccd880ac50670bc26849124a29d24bb4277aa6d56bfcf7411ce5445095d91592e083e8a72276b4ff7e2a36583b0c
-EBUILD beecrypt-4.2.1-r6.ebuild 2462 BLAKE2B 576dbe93d44c76fa6a92f74eb74f70cbb67677333ee5ee766a3b529c89f651a60acef588f2f5e0b8d70b8640319d66771c2750d796eb816d044d0395d25d8028 SHA512 a96427ea033c8c8fc3ac9fa911ca7b397c1fd260273ad43ba069ed116f7f6b59bdcefdc0790ceb9de28066b868d19e287b66be01fd2cbb7d6cc9a932d2547ba7
+EBUILD beecrypt-4.2.1-r6.ebuild 2461 BLAKE2B 7b07278fdfe857b985444736945f7f51d87c138692c17aedb5c46ccc530033416ca02b34cdaf2ac04ef7822c6c24fc8e0fcd09e07a19e9ceea8d9b3ee100f639 SHA512 f51e8b939bf184abe54ba0bbcc377d14921485fd32d99302ce6b2435c1f18208b398f934e84f0fe93e27143a733ddc9a1ccb00ffbfa225ccb49ef6cc1ec4d783
 MISC metadata.xml 245 BLAKE2B a937157650e974ab296da9c19930deffad940d0c256541ea0338121f36fde942eb41529c5f3f39d37fdd3fe6e30eb8e9b987a0cb5c2b7736ff837c2e332ddf95 SHA512 7da531ddd382748b46b2be3d6324c0f654e772ca0d1b87884a5de0ae1f4cf8a6e32d9cd0e4b87b7fd632aa176f873d7e315adbb974c367b4539045fdeffde98b
diff --git a/dev-libs/beecrypt/beecrypt-4.2.1-r5.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1-r5.ebuild
deleted file mode 100644
index 438103184410..000000000000
--- a/dev-libs/beecrypt/beecrypt-4.2.1-r5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1
-
-DESCRIPTION="General-purpose cryptography library"
-HOMEPAGE="https://sourceforge.net/projects/beecrypt/"
-SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+threads java cxx python static-libs doc"
-REQUIRED_USE="cxx? ( threads )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="!<app-arch/rpm-4.2.1
-	cxx? ( >=dev-libs/icu-6.1:= )
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.4 )
-	doc? ( app-doc/doxygen
-		virtual/latex-base
-		dev-texlive/texlive-fontsextra
-	)"
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.4 )"
-
-DOCS=( BUGS README BENCHMARKS NEWS )
-PATCHES=(
-	"${FILESDIR}"/${P}-build-system.patch
-	"${FILESDIR}"/${P}-gcc-4.7.patch
-
-	# Fixes bug 596904
-	"${FILESDIR}"/${P}-c++11-allow-throw-in-destructors.patch
-	"${FILESDIR}"/${P}-cast-uchar.patch #618676
-
-	"${FILESDIR}"/${P}-icu-61.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# ICU needs char16_t support now
-	# bug 649548
-	append-cxxflags -std=c++14
-
-	# cplusplus needs threads support
-	ac_cv_java_include=$(use java && java-pkg_get-jni-cflags) \
-	econf \
-		--disable-expert-mode \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(use_with python python "${PYTHON}") \
-		$(use_with cxx cplusplus) \
-		$(use_with java)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		pushd include/beecrypt >/dev/null || die
-		doxygen || die "doxygen failed"
-		popd >/dev/null || die
-		HTML_DOCS=( docs/html/*.{css,html,js,png} )
-	fi
-}
-
-src_test() {
-	export BEECRYPT_CONF_FILE="${T}/beecrypt-test.conf"
-	echo "provider.1=${S}/c++/provider/.libs/base.so" > "${BEECRYPT_CONF_FILE}" || die
-	emake check bench
-}
-
-src_install() {
-	default
-
-	if use python; then
-		rm -f "${D%/}$(python_get_sitedir)"/_bc.*a || die
-	fi
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild
index 52211c5e48c3..6d5604389d3e 100644
--- a/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.2.1-r6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+threads java cxx python static-libs doc"
 REQUIRED_USE="cxx? ( threads )
 	python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index fe932a13b7d7..a3146e3bba5a 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -1,8 +1,14 @@
 AUX boehm-gc-7.2e-automake-1.13.patch 372 BLAKE2B 5e385b21e4868cee8928d5137c7eb6a5f9acfd20883ea116bc2fe974a35ea4d62866573dc414beec72439d8a1e128b9a4d3e9d9b358c79ebab7ed0f0ec3c3f2b SHA512 19efd52b91b985b31e190b77e5370fb510ad582a54868bb1a7fe54ae57e0625df113ad059a6d636a10f314624137704af8e193460b55c8ba422b9255aadae020
 DIST gc-7.2e.tar.gz 1291186 BLAKE2B 8c320aac2d9deb8fcca2e93622aa122f96c4152d2b18bd284be32d5a041f357beaf8f3142548685fe167642070471862d04c0e6c3ba1c99bc9c05e63d6854005 SHA512 80d1d50e38714b4f198743cd8cd5ab80a35cfbb7f5f9d66c89f40319604e989125870f010d4499876978594a5823d7b61213224a68da8664b9e4f8e14076c999
 DIST gc-7.4.2.tar.gz 1082597 BLAKE2B 5ca30e786a995941fdf2d803d201e7263bdd7d9974a71f672ff259c75ee36dc5d499a614334e570100ddbcb25fd06176f48429b64bad95fb218c35ba584ad4c6 SHA512 2e21516addf268780641ee55c0cb3ecc2d96fa963faffee5beadcade9c6bf1ee49ee1a75b076b5d49ddde7c839fb94f4c3623ca8412d14c2a5bf6ca30d424a72
+DIST gc-7.6.10.tar.gz 1143650 BLAKE2B 5dce84de2e842c98dc552b4a6fc28311e241f419a792523be2e5cb0f7d5b34a57608f8c40e1d85cf06fb3f9c6212855438a0d20c23e2b2d9ba37485d91d78a3e SHA512 6952ff38ed39203c8ff9aae516d81cf5210f3f17fac030325ba58b89c266d2d6ffa281b996c481b9d821638a0334da68f00c15dc4774759ff1f7b57b4678f08f
 DIST gc-7.6.4.tar.gz 1120784 BLAKE2B e7cad27d2144fd37aebad44093e1a0814fe9a1cc887701e485681cdd01f3ea4477150697d535d0873a1255abff0765084119096c7ed61d3caeda439cf2a7644f SHA512 2c85be3e24b85732b3dc6f08fe98cf1a82b6fb2a22ec73090f80920721c737ef92cee8f0cd7ea7228d686005d164e7da54ce3907c3a1ba5eefa43355a472085e
+DIST gc-8.0.2.tar.gz 1159207 BLAKE2B f3dfcecbc9ba59c2abac868278eb6fdca4bda46a5303393a8fb63717f01bc19fa007b6530a536c32600db30f3a45d8d5558fe72adefecd9b97075dfadb3eddc2 SHA512 b1401abb2e82b143b9a2a9013f5b2efa4015b256e7ea8ef2c897ef3c0d2d41fc893413bf6a49efc1845018e8ab823adb485fb3358eb47715982259ace9ffd7c6
+DIST gc-8.0.4.tar.gz 1160528 BLAKE2B ec42378c964fc573e53f6f58aa22fa63a0b421c91b81336acfeb2e2afdb5c89514edace3a9500699e13ff1cadc4205ea245af4f0dfa5e439ed9b78cabf6058f7 SHA512 57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e
 EBUILD boehm-gc-7.2e.ebuild 1333 BLAKE2B 398be6ccb9df21a385df0bc45f0502db6e2f09849543d8b91c76451fc59ceaa0d6e7c430689163b9696bf2fa92aef1eae2c555083d5cfa76f0824a428a71b315 SHA512 e0fee4afc7b0f8b00df366d2856c3355e4832ebd1952f3ad3e23231dc7f34dc5471ced41624593690edc39b47a06274ca82c5dc90efc6181b50fa6a2e94b11b3
 EBUILD boehm-gc-7.4.2.ebuild 1248 BLAKE2B dfc41bb8278e4dc25ce02f6ee6c48d741119043762409acfe37ca3a3475bf0d38f88b3cbdb58143d7f8a7036c4e3cd591b83fbfdf107d14dc5fbad6dd47d0b4b SHA512 68df71e5393048b52929dd73a60cf8cb5b980dfddf854aaa842c78d2d8a077f6c8fb235ab507f38c0f1c8045342492834433dd77264450114d7439b4457cc806
+EBUILD boehm-gc-7.6.10.ebuild 1382 BLAKE2B 3de675fa3d346ca7ea2c94ab32e1b7f09fc28a5632365e159e6081785c95e3fe302c1a54d2be3b4ada0ed4ce81080c331cbd52b40afb3b422bb4690a9cc35628 SHA512 1ded4ce2941cd04c7f06991803c6402435d43f587bb5c7e98ee6da0642115284d2b859636e0f6d65d12225bf84e21ad905046bd2c8a89bd9e6e70d01ec89c124
 EBUILD boehm-gc-7.6.4.ebuild 1371 BLAKE2B 6639a3da75dcd877ca4d0396619bc5256040b3e3fb9f2b38dec22bb72bb4f51687cc5722cac8b564632459fda7e69f44417f15ddc22e0c03eb14a5ed0a0bbc0c SHA512 940f6d91db5904b846f4e10108c472d9402ebe383ba76ba74b025336f1eca867c7361bfa8127588ad612494cc1c79b74b52b8972bd8fa78e2109f17d17ef0f0a
+EBUILD boehm-gc-8.0.2.ebuild 1380 BLAKE2B 74f6b8a142175c187959d6041b930fce4e96461677312de1cdb418d6983093da979eaed7c0fef6d9d3e9dba8952168348706b866a064e18cb000e892783552aa SHA512 8e56b92e1d1654ae1f7b74dfaf6feb975adf6e07ad8a07bdf3b61d7ed55b24312e7dfeab6e18edfdb34a511e90885942138ad48c934cc02fffb3bc0403cf19e7
+EBUILD boehm-gc-8.0.4.ebuild 1380 BLAKE2B 086e302a653b7475859506194b5b4922e4b7436fb1167c92a91d2500a30863121c3559bb2c45425072b7a306f78f379d262cafe10ddacff2bf90da4b6c536d30 SHA512 5f561aa2a7263bb73368035726e71dfb642fd089eb114a83eebff263c3a899fcd13d9ef7a2f1d418eb203d39275bb15bdf9589f7994766ec042832d36baffa36
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/boehm-gc/boehm-gc-7.6.10.ebuild b/dev-libs/boehm-gc/boehm-gc-7.6.10.ebuild
new file mode 100644
index 000000000000..6ec93331183b
--- /dev/null
+++ b/dev-libs/boehm-gc/boehm-gc-7.6.10.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib-minimal libtool
+
+MY_P="gc-${PV}"
+
+DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
+HOMEPAGE="http://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/"
+SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="boehm-gc"
+# SONAME: libgc.so.1 libgccpp.so.1
+# We've been using subslot 0 for these instead of "1.1".
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cxx static-libs +threads"
+
+DEPEND="
+	>=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	elibtoolize #594754
+}
+
+multilib_src_configure() {
+	local config=(
+		--disable-docs
+		--with-libatomic-ops
+		$(use_enable cxx cplusplus)
+		$(use_enable static-libs static)
+		$(use threads || echo --disable-threads)
+	)
+
+	ECONF_SOURCE=${S} econf "${config[@]}"
+}
+
+multilib_src_install_all() {
+	local HTML_DOCS=( doc/*.html )
+	einstalldocs
+	dodoc doc/README{.environment,.linux,.macros}
+
+	# package provides .pc files
+	find "${ED}" -name '*.la' -delete || die
+
+	newman doc/gc.man GC_malloc.1
+}
diff --git a/dev-libs/boehm-gc/boehm-gc-8.0.2.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.2.ebuild
new file mode 100644
index 000000000000..4a0a28955f20
--- /dev/null
+++ b/dev-libs/boehm-gc/boehm-gc-8.0.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib-minimal libtool
+
+MY_P="gc-${PV}"
+
+DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
+HOMEPAGE="http://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/"
+SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="boehm-gc"
+# SONAME: libgc.so.1 libgccpp.so.1
+# We've been using subslot 0 for these instead of "1.1".
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cxx static-libs +threads"
+
+DEPEND="
+	>=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	elibtoolize #594754
+}
+
+multilib_src_configure() {
+	local config=(
+		--disable-docs
+		--with-libatomic-ops
+		$(use_enable cxx cplusplus)
+		$(use_enable static-libs static)
+		$(use threads || echo --disable-threads)
+	)
+
+	ECONF_SOURCE=${S} econf "${config[@]}"
+}
+
+multilib_src_install_all() {
+	local HTML_DOCS=( doc/*.md )
+	einstalldocs
+	dodoc doc/README{.environment,.linux,.macros}
+
+	# package provides .pc files
+	find "${ED}" -name '*.la' -delete || die
+
+	newman doc/gc.man GC_malloc.1
+}
diff --git a/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
new file mode 100644
index 000000000000..6b792912a801
--- /dev/null
+++ b/dev-libs/boehm-gc/boehm-gc-8.0.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal libtool
+
+MY_P="gc-${PV}"
+
+DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
+HOMEPAGE="http://www.hboehm.info/gc/ https://github.com/ivmai/bdwgc/"
+SRC_URI="https://github.com/ivmai/bdwgc/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="boehm-gc"
+# SONAME: libgc.so.1 libgccpp.so.1
+# We've been using subslot 0 for these instead of "1.1".
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cxx static-libs +threads"
+
+DEPEND="
+	>=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	elibtoolize #594754
+}
+
+multilib_src_configure() {
+	local config=(
+		--disable-docs
+		--with-libatomic-ops
+		$(use_enable cxx cplusplus)
+		$(use_enable static-libs static)
+		$(use threads || echo --disable-threads)
+	)
+
+	ECONF_SOURCE=${S} econf "${config[@]}"
+}
+
+multilib_src_install_all() {
+	local HTML_DOCS=( doc/*.md )
+	einstalldocs
+	dodoc doc/README{.environment,.linux,.macros}
+
+	# package provides .pc files
+	find "${ED}" -name '*.la' -delete || die
+
+	newman doc/gc.man GC_malloc.1
+}
diff --git a/dev-libs/chmlib/Manifest b/dev-libs/chmlib/Manifest
index 791007603204..3c1afe71090b 100644
--- a/dev-libs/chmlib/Manifest
+++ b/dev-libs/chmlib/Manifest
@@ -1,5 +1,5 @@
 AUX chmlib-0.39-stdtypes.patch 624 BLAKE2B 29de38c9de0faf7b924c0220a6ef77d338755fa57b87a120db99866b85cf7b8b4bdcacb2d5ba301eeecc6ed167384aceedf059f232a933ee920ff3ad8b9e1388 SHA512 123c28fb581c59f7aba886a0ef9ccdc31586411ad23a716759738075fa9006b2bb170f371c2e272dd21816fed3e426ab4259f16fd2ea9220c4eb005a9edf8194
 AUX chmlib-0.40-headers.patch 361 BLAKE2B 182336c3e3ac3c30226c4860315ecae2d6fec900a84e49b4f7daaa84ecf7ef1e249d46fb059978afa43ed00bffef6eb915ac19b1f78eff98714d9e633f642b5d SHA512 985cdee377e53f7df8d3d53aa305069fa138388397494094498415ec1b026bcb5e2e218ac91ed8977c930840a73f371124b0f7bdadbc1b79a65384b333a4b8d0
 DIST chmlib-0.40.tar.bz2 252036 BLAKE2B 69216120f7efcc7bfaa30faa46d9f2e2490923a6b42a766fe39838bda2b3b033ea39cb0c05eeab85a66b5a69f9297a6a412c375a2d790a463c7f6338610432fc SHA512 3a3e151cf455b19e9e7c163a1d1e5ac52e8196f0b98f77932c72af58f3517824b9244667a18279ae754ccea784f6d6ab0c47465e74e3768ce98bb7dca0ca16e3
-EBUILD chmlib-0.40-r1.ebuild 669 BLAKE2B 8804aa8b64200cfeb05054774cf51c9131a4a09cdf34a19efd90de35cde20cbee1b5609f7073a48285a4d30d3d379f6a742a89efebda938fb606f505c4ab5951 SHA512 5c372f8308f04e2d697778e6132d66156409e9eb1da8ad505cb97365d4c27dde453f35fde7a479fde1a204362eff6816e1f3f5aa60497cedf122113a9eee14bc
+EBUILD chmlib-0.40-r1.ebuild 673 BLAKE2B 1bfc4aaef7e8e194be12f6f39f101eaadf04551c8022ce0351dccbf4d493af9d772a84cc91533179867d36d0f1c8562dadfda1774ff7f99287b31a973801386e SHA512 79f74ad99a764877e166fac9d4034aaae0eb2f8fc549599814d88ceb666477ad748f977363901de16ad471915171a308ae5867f3b4c449cf090701f4ad8aa8a9
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-libs/chmlib/chmlib-0.40-r1.ebuild b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
index f1e56dc52863..35950dbe8c05 100644
--- a/dev-libs/chmlib/chmlib-0.40-r1.ebuild
+++ b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.jedrea.com/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 x86"
 IUSE="+examples static-libs"
 
 PATCHES=(
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index 84e680f4a9f8..2a47a07194c7 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -1,6 +1,6 @@
 AUX dietlibc-0.34_pre20140729-dyn-lib.patch 580 BLAKE2B 0f4364bbeae48a42c77314975ba202bcd79f88fa02ee820be4b94896c2217f7eee22b36d6a196b63183d2ad80994c9f3095da9fdc917f2dece2ca9a7e2430cba SHA512 7dfcad992f97c3923402dde1c55c8249c5fd4c88b3291fff15d41010036eec83656b009968f0af67daa94de43d4ef4f0f476ba42dd41a17217edd5f9f4f576cc
 DIST dietlibc-0.34.tar.xz 662732 BLAKE2B ac709f19f98c298ee424f8320cbc7bca997156323e64d3a219251146b4257185f27519262914d3df044638ecfcf06e1e3680d8af226704dca65d6e4be20b3dc4 SHA512 2b38528c0ccf50e426f587b6448fed997fab1147eecc9e1af2f3fb3efe3d8f3997656d8e66e7cf1045ceb1f602cef43456c62ba83ff494f9c9816721bdb4d6c6
 DIST dietlibc-0.34_pre20140729.tar.bz2 670195 BLAKE2B 9479c97c09b0c8c7e5d85536afd962613e9f5fbcb1aff3ef9b2aace19d246b2d0b637f00c3abee0a2c06f170263e85ffba94247171afc47e40c8ab0e95fe5191 SHA512 a0bb5465f7fc985fd074dfcc4039003ec26b6b5fde5f2ccc53322067bd1a6459e742c9debeffda0b5146e287baa8e49f74f4a8ffafdf1daacacec4768d13db36
-EBUILD dietlibc-0.34.ebuild 1947 BLAKE2B 10ecc9832de3feb37ebfee2021d17dd30428f6aaa23f65b61cadac1ff89b8768770f81e69fa52ef80323b6ad2719b4495f63d2cf40d9beab1a3ef7d9d0442da4 SHA512 925ad454ea7ad1530f77355af878957afef90e63545ea560fbfc6397f8933c0f3b437ba2cf658024b46843368c5d7b3a893e2c8ae478f1ad69e0003e0c8ad8bf
+EBUILD dietlibc-0.34.ebuild 1568 BLAKE2B c85a4f1aad13730921275d95c4ea028a43952be3d41df5e66cd6f13b4edfcef220bfa6744b66e3429a3b1e4043a93335ad7cbd3ad7c1a40ed1f9093e9f9d8577 SHA512 7aa0b9f58a6ea45c213fe1cca09830325cc2ff66d467bddcf1e11787a85e0ffac2253705cb5381e79926e0290552ac65eedc886d14aea2f02442db9b585d2481
 EBUILD dietlibc-0.34_pre20140729-r1.ebuild 1696 BLAKE2B 27b3d38a08153c4fe971f1b5a7c0f5d6efa0b375d70d091495b15d03f9b3339b23367b62260b2fd64108ab44ce349ecb6411d48663483473cddf6f75889130b2 SHA512 b1f73f641a5972b96b4a527247715aa608485f3fb05613b92e70eb1e5f5f7de9b64a91fcaeebc74625f33a56294335c79240d48f65287986dcc96ebb203812bd
 MISC metadata.xml 416 BLAKE2B 1484805b8b75b745a2cb7409aeab9f5d934f3c6f92cae880c650a34e0d05e4e97a889a9390a9c0a25da93458f8f74349006737307dfe86382d5b07cfc9fb9be4 SHA512 7d39c127ffecbfc46fc6987189f2d28e92b35effbd71d4aadc465ac5fe1e47d088574700b26bb0bc27f1fd17b3487de85317f34a87393597f99b38a9be3c0c0d
diff --git a/dev-libs/dietlibc/dietlibc-0.34.ebuild b/dev-libs/dietlibc/dietlibc-0.34.ebuild
index 4a35f612fa6d..856d3468195f 100644
--- a/dev-libs/dietlibc/dietlibc-0.34.ebuild
+++ b/dev-libs/dietlibc/dietlibc-0.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,24 +13,11 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND=""
+DEPEND=">=sys-devel/binutils-2.31.1-r4"
 RDEPEND=""
 
 DIETHOME="/usr/diet"
 
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if $(tc-getLD) --version | grep -q "2.31.1"; then
-			ewarn "${PN} does not work with unpatched binutils-2.31.1,"
-			ewarn "see \"${S}/FAQ\""
-			ewarn "and https://bugs.gentoo.org/672126 for details."
-			ewarn "In the meanwhile you can install another binutils version"
-			ewarn "and use binutils-config to switch version."
-			sleep 10
-		fi
-	fi
-}
-
 src_prepare() {
 	default
 
@@ -56,7 +43,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake -j1 prefix="${EPREFIX}"${DIETHOME} \
+	emake prefix="${EPREFIX}"${DIETHOME} \
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		STRIP=":"
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index e0596fc720d3..3c89637d17a2 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,5 +1,5 @@
 DIST double-conversion-3.0.0.tar.gz 7019526 BLAKE2B 631973dadefa8bbf7e4acffd44968dfbf6b7dbeeb045fbbe0df7824a890991f510131647a52646fcd2b069b8b886a7b66a82434b829bdcb58bd8f503fecc7d18 SHA512 5057af6e72f2aaace56ebdd9a0ddfa34318cbdfeabec5c361b60e6c92f160c8999c046c50f8c6f8d590eb8e97aa70bb6e97ba8148f0dc95dbc42f204fcdc1abf
 DIST double-conversion-3.0.3.tar.gz 7019705 BLAKE2B 65d7729b55dbb9fd0cf31b258738f3e9f3350b4ecf0204d3d2d23de24cb24651788e844aa1a10d6ec452ca6484c43ed1d218d434fc18be7bb1f15bf8ba97102a SHA512 3a8e956da485195753508c90cd6fa3d9fde42103291a8e65a0d95488faa02e98dddff21935625519c0ce49d8911d66d0773ddf6012264094f3edd851b461f62b
 EBUILD double-conversion-3.0.0.ebuild 617 BLAKE2B eeeab151a1432c666abf6e5c4340a838d4961b857b7e7ff54f41e39b05915333cb02e18aa53ed38fbcc4894a15d3fdb54ecad429f6c21142e551f8cf08f72cab SHA512 35369bd050c61dbd0ca29f12e360ea81a9320646aeba2763455cedbd746959fcb868eedeb334e2557af717a73350cc5508aac61f3ce910b594ba91210c035ce4
-EBUILD double-conversion-3.0.3.ebuild 1352 BLAKE2B d5068ea87d4066e2834c84f278e03bd197aa75895db2f31a61b8b585d48774f6385fed7b4e3ec5c185e5d73d394ab92a37e088e2f283f84661ac7bd41ea1c529 SHA512 7014b6c4371c5b46d1801df278f7ed82c36bb923ba402c64c5af9a2c71940757e2027fcacfb6e545f8ef488be2461194917ddd8b15a04d9e7e63916ba167f1ad
+EBUILD double-conversion-3.0.3.ebuild 1347 BLAKE2B e3df68ce7ddc7daba1fe01b701f5ca0c6c8f23a2bd76b69d526dfafca7d13344c793c9918c0ce365d2729e6c551dda44807c6965b5b0fca9157df06e6050af42 SHA512 d7db31b4975a4e8b9f44c136dba5dab3dbafd6d70a8e8ae3b57fd68bc696de66224f6bea93f829af8547d56cf0bde5040bd351134c77492a4b5f2659f281f2df
 MISC metadata.xml 606 BLAKE2B 6c92fbf6c8247fdaa5f1cdf29f58b91b8374d8b8b4785a408145584030dfd06ba939999626575ea97bd7fcd65c2774f4e0bee6844a00e0f1c28d89f8e117d79f SHA512 0d6b6503f8ac11ede082ac8a1ec267620d5e6cbdb151ebd20cd775e9b832e396c434e6ef6e843d13ceedb9cea7dae002e93564d823161f4ff845053699c3312a
diff --git a/dev-libs/double-conversion/double-conversion-3.0.3.ebuild b/dev-libs/double-conversion/double-conversion-3.0.3.ebuild
index b6d4355862fe..f0254d59ed3d 100644
--- a/dev-libs/double-conversion/double-conversion-3.0.3.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 
 pkg_setup() {
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index ecf6b2ffdb77..6a4915bc226a 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -4,8 +4,10 @@ AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b1
 DIST elfutils-0.170.tar.bz2 8358001 BLAKE2B 03ea3ba7d3feaac43065312c475f4a3cd9083a6c56c9982fa00c0ed02b28440f6a37bbeca4be18db13749647ea1c8a6f00dae7efcb1c70235110e60ad7d56d06 SHA512 aca0b5e271138eaf86e36505ffb101181207b151e833e6cd7c18986ac50678542a5ecd2250f8dd6923ca497142f197c8b08fd225e4130b16b6203c24013d6d28
 DIST elfutils-0.173.tar.bz2 8684782 BLAKE2B c5905bb864059bdfb2699a0681a0ec576b6b8da444b0641e8184f58735084588910930bcca14583db6be75b24a0e374413911ded5ba2ca893798404fbe7374eb SHA512 7f38e4ce2098b685f15030bf01f0a66a74aa32fbfcead0304c1d0e0a929b348a72f99e685cd4605465f4337393382112f64b8847e6c2f7cc1a57a4fd03d03eb3
 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.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
 MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac
diff --git a/dev-libs/elfutils/elfutils-0.176.ebuild b/dev-libs/elfutils/elfutils-0.176.ebuild
new file mode 100644
index 000000000000..4c75e71b437a
--- /dev/null
+++ b/dev-libs/elfutils/elfutils-0.176.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
+HOMEPAGE="http://elfutils.org/"
+SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	!dev-libs/libelf"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=sys-devel/flex-2.5.4a
+	sys-devel/m4"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.118-PaX-support.patch
+	"${FILESDIR}"/${PN}-0.175-disable-biarch-test-PR24158.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use static-libs; then
+		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
+	fi
+	# https://sourceware.org/PR23914
+	sed -i 's:-Werror::' */Makefile.in || die
+}
+
+src_configure() {
+	use test && append-flags -g #407135
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		$(use_enable threads thread-safety) \
+		--program-prefix="eu-" \
+		--with-zlib \
+		$(use_with bzip2 bzlib) \
+		$(use_with lzma)
+}
+
+multilib_src_test() {
+	env	LD_LIBRARY_PATH="${BUILD_DIR}/libelf:${BUILD_DIR}/libebl:${BUILD_DIR}/libdw:${BUILD_DIR}/libasm" \
+		LC_ALL="C" \
+		emake check VERBOSE=1
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc NOTES
+	# These build quick, and are needed for most tests, so don't
+	# disable their building when the USE flag is disabled.
+	if ! use utils; then
+		rm -rf "${ED}"/usr/bin || die
+	fi
+}
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 544864f724de..4a88ecc2c987 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,4 +1,5 @@
+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 2423 BLAKE2B 1f58106f9395204dc114c7f0773d18ea4b7a2c2d2eebe51ddc8cc079af8d6dd9bdf62baa6bb4d2af971dfce092921d268fd26827afc155e91aa10f9f4b543d26 SHA512 0467bd85c89c02609f15bb88db1989bbdb284bb6efaf1c6b013e9b57564bbdefef95414ada4778d4d5776ee689e24cb74d4dbcfddba0963714801586b63f805b
-EBUILD folks-0.11.4.ebuild 2287 BLAKE2B bc94e9869374962d0e233884b34251316a4a3c7751755112c6438721d682924b9c9a208aeaac69162e3834dab3f7ce844f38cc8d965628ca152ba551e294a7b1 SHA512 5a73ee4bcc651d16162a10729df1ed5b333a7a9d33293276285d133ceb3c2b867059451aca89518b7038d5d7c2a0fd19599474a3e0610d06e5f8d6ffadba7aed
+EBUILD folks-0.11.4-r1.ebuild 2480 BLAKE2B 8f775b05f7cd02a8d8470969052f3b685fdf6a349de6c81414e963e8f4c365f211ddf68fc655e77ae063591afa5acd13cbaa3bb3fae9e4483ab72cfdacc93809 SHA512 814df8c8b00c5b724e9763c8369c2df52486fc5b751895d4e5e2a9651a357e30ab0b3b7ace666700166b104586f2e8cbf7e87b1338db5581c04c834979a059c7
+EBUILD folks-0.11.4.ebuild 2315 BLAKE2B 62bf6fdc24e0b1702084e9a9b559f281a93b4b36e619b877b6f2d42149e1e83514a72339ba1a0f2b8ba858fdd95c0df1a55e89068a60e6a4665be47cbea59de1 SHA512 d8038166bd0970f3fe22df78479906c3d332da58d695e1b1238bf6f964cc939e3f03c6a40e09483f40aa4a7fbbd80e91614e70318f4b37a5e8de486f55184be1
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch b/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch
new file mode 100644
index 000000000000..21b0e44ab968
--- /dev/null
+++ b/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch
@@ -0,0 +1,32 @@
+From 6a5c9e7e8daf4e1361709a75719c17c8c28a6c4b Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Fri, 23 Mar 2018 17:55:11 +0100
+Subject: [PATCH] inspect: Adapt to binding change of
+ Signal.add_emission_hook() in vala 0.41
+
+https://git.gnome.org/browse/vala/commit/?id=1d4db9f276c2593f072313864c743c6dd16acf35
+
+Reviewed-by: Philip Withnall <withnall@endlessm.com>
+---
+ tools/inspect/signal-manager.vala | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tools/inspect/signal-manager.vala b/tools/inspect/signal-manager.vala
+index 4d1b6480..7c5b17a0 100644
+--- a/tools/inspect/signal-manager.vala
++++ b/tools/inspect/signal-manager.vala
+@@ -430,7 +430,11 @@ public class Folks.Inspect.SignalManager : Object
+         return false;
+ 
+       ulong hook_id = Signal.add_emission_hook (signal_id,
++#if VALA_0_42
++          detail_quark, this.emission_hook_cb);
++#else
+           detail_quark, this.emission_hook_cb, null);
++#endif
+ 
+       /* Store the hook ID so we can list or remove it later */
+       HashMap<uint, ulong> hook_ids =
+-- 
+2.18.1
+
diff --git a/dev-libs/folks/folks-0.11.4-r1.ebuild b/dev-libs/folks/folks-0.11.4-r1.ebuild
index 821d24168b25..9b5eebac778a 100644
--- a/dev-libs/folks/folks-0.11.4-r1.ebuild
+++ b/dev-libs/folks/folks-0.11.4-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
@@ -56,6 +56,10 @@ DEPEND="${COMMON_DEPEND}
 			>=dev-libs/glib-2.40:2 ) )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-vala-0.42-compat.patch
+)
+
 src_prepare() {
 	# Force re-generation of introspection files, otherwise it does not match installed libs
 	find -name "*.vala" -exec touch {} \; || die
diff --git a/dev-libs/folks/folks-0.11.4.ebuild b/dev-libs/folks/folks-0.11.4.ebuild
index 0eb6f1710ee3..ce7878547564 100644
--- a/dev-libs/folks/folks-0.11.4.ebuild
+++ b/dev-libs/folks/folks-0.11.4.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
+VALA_MAX_API_VERSION="0.40"
 
 inherit gnome2 vala virtualx
 
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index 445eb55e8956..7d7c7a34d5e1 100644
--- a/dev-libs/fstrm/Manifest
+++ b/dev-libs/fstrm/Manifest
@@ -1,5 +1,3 @@
-DIST fstrm-0.2.0.tar.gz 434627 BLAKE2B df3d3994adf0f7f2ee734dbd4e20fa4fd5ec8856b8127b172412dfd091f2640e3c2df3d5a65063a8f24c6a1ea83ecbf13f826e5e533c9b9d9d67488ea8e2bc1a SHA512 4425c3aa57f7c87dfa2a5cc6e3c9b7f8e293086c2092b57b5d227b13dba3ec23cb8460abbfaf153b2f3a27c6a613e31e7a805948cbc5d567707880f353453f42
 DIST fstrm-0.3.0.tar.gz 185153 BLAKE2B 1e1e16792288255c1d963f2831b6f362d08a343cb58ae7ae8e24c5d9a70d870b238c399b9f2cb30da939dbfbf5faa49a61609725036113e579f2c7d63a36e599 SHA512 4134da0ed8579cb6784a419bba76b3be7487ec67b6fad65e0e662b40e668389010381176794d15da9c96339292f0faedc143f87b7ef3815b69bbc8b165af5c4d
-EBUILD fstrm-0.2.0-r1.ebuild 660 BLAKE2B ff68979e48965fdf68accfd789018844571ab94bbbb4149217b5d8dc0559132761de84986861a859b033afe3c1a752068240bfcc3dbe0e5e10b0ef2756a871fe SHA512 240ef2fe6a8c900bdf5f9cd8d6e157b62ee2f37e186d1349f5f5773d2ec1c964993ace19b05466914fd39f250c9c0c26936e82342a406dfcd2f27d39630d6dde
-EBUILD fstrm-0.3.0.ebuild 811 BLAKE2B 12787d238bb86611a2543b3ab48eb8fb68c8d48155a29169340d1775df0acab8df16f5a815b3881f48afcc2a685e3e6b38426658b02d9a95a9976a69f5236110 SHA512 0b8aebb87adc8cb4debdb7fdb980cfbe26a15cb09b0e8272b8ab4c0f3306858f574da8a4cf7ad834dfbfef5e7c1bedb487c266e1a9915603d1b721c4dc0fe45e
+EBUILD fstrm-0.3.0.ebuild 810 BLAKE2B eae8d7cf0ebdb1e324b573bef75e5c60d6cb49de27e1285ec7a2f57ce629e61ec5feb284720ca51dc851fc191f1fa6734f27385edc07afed6ae4a4cc9b43880c SHA512 7a2ce508dff46cbf08f1f2b501a619fb0b3322cf015794279fc75cfdb1cfecc12e4e8b9666e6950578f57d8c495064eb60a55dacbf254e99b99d8fea5a26c36f
 MISC metadata.xml 321 BLAKE2B 4513b4f120d44149f4419f74664e9f345f365c4f6f3938f9c751021ce00a2bee3c1f655b2c47113eded5f743dbc8c8968f7e3fba76ff71189e4026777700724a SHA512 a2bd9cbe2b311f26fa6bb62aa783fa8577f0e07d6e284370c787386e08b6aaf98d4f5bf655f69283d864b0e7a7fe847c75142ac67ff12dd93596f9ddddcbb065
diff --git a/dev-libs/fstrm/fstrm-0.2.0-r1.ebuild b/dev-libs/fstrm/fstrm-0.2.0-r1.ebuild
deleted file mode 100644
index 1dbd918d64a6..000000000000
--- a/dev-libs/fstrm/fstrm-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib
-
-DESCRIPTION="Frame Streams implementation in C"
-HOMEPAGE="https://github.com/farsightsec/fstrm"
-SRC_URI="https://github.com/farsightsec/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 x86"
-IUSE="static-libs utils"
-
-RDEPEND="utils? ( dev-libs/libevent[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable utils programs)
-	)
-	autotools-multilib_src_configure
-}
diff --git a/dev-libs/fstrm/fstrm-0.3.0.ebuild b/dev-libs/fstrm/fstrm-0.3.0.ebuild
index eb51a48573a7..3b1342d07467 100644
--- a/dev-libs/fstrm/fstrm-0.3.0.ebuild
+++ b/dev-libs/fstrm/fstrm-0.3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/farsightsec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="static-libs utils"
 
 RDEPEND="utils? ( dev-libs/libevent[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 46acbd891c8e..09ee2c214708 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -4,7 +4,9 @@ AUX gjs-1.43.3-disable-unittest-2.patch 1119 BLAKE2B 8ab995513b63faee201f84ec45f
 DIST gjs-1.46.0.tar.xz 490812 BLAKE2B d7b71d6c611404d9313cdd19959e2a0cb7f035bbd2528db77ccb0030e685019b756216bfbc64885b3641c14cab2f29110492c87047c3ceb1a627765857b19a95 SHA512 14af40668e95d269ac87556c75cf45680c41bc8246f04c46726d34bd80e9344045c0a510567f156c2c25c1f10dd474dc38bd50581d1b2e5abe0daa0cf570e2bc
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 DIST gjs-1.50.4.tar.xz 612260 BLAKE2B c5731dd9f0703a3c6fa8e407fdba888629f7f0ad197ad60a433bc9eb315a6f633e9f192cf3ef51d17dd3529f66dc4c291f302e5dd57873e6f274047af46c2647 SHA512 d95aed6ec8001ccc5f70abad8e2c6dcee8d62f54500f19f5acb25096b398b03a932afeb226d27c0bd6c5c57d9685403f7b77b06ee7b861648402a9137446fcbb
+DIST gjs-1.52.5.tar.xz 627796 BLAKE2B c6e6af2572b627ac81794dec1c8101476d5c7a441e879c73bbf394775a0d508ea34b3e78deb5976f0010d7d026f6186196e12ff1ad9a1fa614e1543b6be048bd SHA512 55fdf22d23185c2b108264918dfaf4b4b7a9ba342210aafb0293b81401f7db5b2d35757caefb66b435c124a6314b9daf578dd066272c9ccb8fe5c4d05d18ebcc
 EBUILD gjs-1.46.0.ebuild 1558 BLAKE2B 035abf83ae724d27a06ee1973ccd28afc29bedea4e5720fe5b3758bfda79e5c33718dce56fe938698ee58b7c48b1737767b1facfcea6fa6be97b093b92c7c70a SHA512 f6fb1dafb934f9b5296195e8a651dc410b061d0a1cba8b066547043c50090e1c101fde253d08312a0f0b98658f624e3513b4d9fdeddd99ad8893749e23ca43a6
 EBUILD gjs-1.48.7.ebuild 1549 BLAKE2B 8ee4cfb9bc4717075eb05cb5c8cb3434c927a90c780c9db4cc38b083864407284e490909dab2713c0dc8fa1ef0691bcfb733981ace846e78547012e46b978c45 SHA512 e957ed75af0c4d2fa6408a1c9e468fb32b104ce12cf061749f19673ce3103bef89630e54d9049c4b283f8fd6eb9178e9181de107382dea6d0644b5eeee78a9fd
 EBUILD gjs-1.50.4.ebuild 1426 BLAKE2B 7e0935809f042ae3078234aec4958a916f6d0d72fb02a2618f7e83e55b98aed3c74463314c6061f006170225350f854771ba2b7e5689bcabf14273880560c662 SHA512 b3c1c9390ba0be0958e4eb5eb811bfd97999894f6520b1aafa6e8f8aa2db2685c31bb2955c1cd224d9439d188a76c33a1c9687628211534326bb96ccf8b236ff
+EBUILD gjs-1.52.5.ebuild 1448 BLAKE2B 2fb9899df411fced2fd44ada5027ae11eef1719aec9525c75df07ee22cd6b17b8ab9b595dade0554a0ad6ce902f8de259ecb131f0fb45b2147c386265b51cd1d SHA512 e1258046eb45fbca71a360d25b255873a233e2917156d8b5899ac44b843e24726e60ef1c725090e9ce7dc70754e203579bee9d77a4e391c8620fbd693b6656f5
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/gjs-1.52.5.ebuild b/dev-libs/gjs/gjs-1.52.5.ebuild
new file mode 100644
index 000000000000..4a706d4682fe
--- /dev/null
+++ b/dev-libs/gjs/gjs-1.52.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 pax-utils virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.52.1
+	>=dev-libs/gobject-introspection-1.53.4:=
+
+	sys-libs/readline:0=
+	dev-lang/spidermonkey:52
+	virtual/libffi:=
+	cairo? ( x11-libs/cairo[X] )
+	gtk? ( >=x11-libs/gtk+-3.20:3 )
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+src_configure() {
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+	# XXX: Do NOT enable coverage, completely useless for portage installs
+	gnome2_src_configure \
+		--disable-systemtap \
+		--disable-dtrace \
+		--enable-profiler \
+		--disable-code-coverage \
+		$(use_with cairo cairo) \
+		$(use_with gtk) \
+		$(use_with test dbus-tests) \
+		$(use_with test xvfb-tests)
+}
+
+src_install() {
+	# installation sometimes fails in parallel, bug #???
+	gnome2_src_install -j1
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins "${S}"/examples/*
+	fi
+
+	# Required for gjs-console to run correctly on PaX systems
+	pax-mark mr "${ED}/usr/bin/gjs-console"
+}
diff --git a/dev-libs/hidapi/Manifest b/dev-libs/hidapi/Manifest
index 91bb65ecb509..87b818124030 100644
--- a/dev-libs/hidapi/Manifest
+++ b/dev-libs/hidapi/Manifest
@@ -1,3 +1,3 @@
 DIST hidapi-0.8.0_rc1_p20140719.tgz 103079 BLAKE2B f40a4c17cb8c5eed41f4eea84fac46a879ec2057f28212aa43c8fd718ceea68d760785cb4f4e2ea3bcd2a4345b65d75d0d278b93697ec61963be9270684a15cb SHA512 204934a707da4e67b834823650b0cfd9be7b413972071129cc5aeeb93465834dde2f5ee23283c55d35b56e3aed8b7ad5fe947399839081f4d895fb65c8cd3e3d
-EBUILD hidapi-0.8.0_rc1_p20140719.ebuild 1918 BLAKE2B 0826282d68d25e30586c315329b4dd43e8dbf2c2d0da5f01101d363b4cc41594440c0881b34a9cd7278ad82feefc6bfb8b85cc8d6c16e37995bed816dabf9319 SHA512 e3a4c5bc1767491641b6249f2552790f6e27aeb8309c3435ee29fbcfdfef483c2b550c54fd2e6d1ee24ecff0e10f10813e78606fb11e9ea75367511bddeaec3b
+EBUILD hidapi-0.8.0_rc1_p20140719.ebuild 1922 BLAKE2B cfb5253c90e030afc8745a066aaf9eea7c1e9aa2b4e9e911dc08879908e5e5df65a316ff0e0586f651a2717d28b58754e0276258be06ea35dea17c81bc55881b SHA512 6cc7fc6b70935f90df6acdb35c1e69e0e1e9fb624c75bf6ff939dc2ee13c3416b946c06c872a969e37f4c90ebcbd7ef1a6b9dd19416a590a9f96395f61a07036
 MISC metadata.xml 659 BLAKE2B cb156ee4a06d9725266e45fca2f085b74d6cf09e8f97a99a59961b2977f44669720ff15213ad84bcba95dd62df0f876d3a2fc75eb4e006e86a1baddd44c5d0c2 SHA512 36bae2c3d3cb19327990c2df04a591d77ee8a8d5f0b269b636902156e2e8315e00fbad6f1f8fac9776598b42423f4ab626ee8b576b897ad5b92ef7d2f3081e58
diff --git a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild b/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild
index 9cefcad3a4c8..7ff87779c0e7 100644
--- a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild
+++ b/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/signal11/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}
 
 LICENSE="|| ( BSD GPL-3 HIDAPI )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="doc fox static-libs"
 
 RDEPEND="virtual/libusb:1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index 0689e8ed98ae..2f7362b3055b 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,5 +1,7 @@
 DIST hyperscan-4.6.0.tar.gz 1557704 BLAKE2B 978b6b3aa83962602df9d3cd5eaf433d15875694fbb34868f594fb930260d57e52f2ac6183ca588096de42ac54a4a68c420b4e7fb2a2c4c50e1e078254e6785e SHA512 17bddc0f8085615df633f5d050e21a448bda781512990a1efe59286002114322372d59d165a113dfe5548f77102576208e1c667454ab40e46c0a96208a4fdd57
 DIST hyperscan-4.7.0.tar.gz 1738159 BLAKE2B 88bcfab979b0eb6177404e65cc1124d6fc9f4615346823fd6d5156794134e344d0141be41aeb4d850620947f53471cc8b78ed4833efaa7c075ec3c88d8670ee7 SHA512 ec32cecc98165ab590cefe37c31aa9cbad813aedd6bec72760574a8ece2a8aefecc229b1d76a2e90c54a51302d1db70620278dbb96d47091ebf846e9f8c4ff08
+DIST hyperscan-5.1.0.tar.gz 1810559 BLAKE2B 0946b3afe00cdce51b82852515ffe674729854d762854c252ba90fc73cbdc23205fe75f8e6c4e976efb31bf10950076b5790bd9692768dabcbd642d53e739c32 SHA512 5e6d11429e61dc061dd31e6b311a8c1dbfcd03af6e24d97b95eb2cef24dcd33d593064e5faa7c22807d785a8921bc410a69a43c4e5b3d7b4774f37c4a12a025d
 EBUILD hyperscan-4.6.0.ebuild 700 BLAKE2B 67adb438a7222f1adb85833ba79bddb1f0a6d620bc4a563d9e3d9a785557c71e8a2d08c820fd4615db91077a184d6b17a98cd169344e484d243c3069f2a4a74b SHA512 e5045e9f7811709c3011d833807338f24927c78982d4d8d8cd4c0c33d639664fd346b6290792db25407ad33dedd2d7d61e19776ff86e020a0146f44293699738
 EBUILD hyperscan-4.7.0.ebuild 700 BLAKE2B 7e1c8d32087a735d6f14198eada91352f6cde0bb44ec755345fe46d02d7fdabdc615e33987523e4cab6d87d522588344f65d895f5dab56c30907ae8ad03dc58c SHA512 828897769cb5550563a9bb30c20b45e17dafe25fd22143ea06ed3b8d7111e40ef16069fc04cf56a8b7e3c6c6140ae2447381e166808d54d9c083d3ea6fcdd28f
+EBUILD hyperscan-5.1.0.ebuild 765 BLAKE2B 594f11c997bd8c315a83892eed563405e4a2b25f7f35a8e1e6bced0fec43fff73356a70d0a6aa6b80bce1e1441672217b8a8c435a2f9f8121a0bc7c53f37465a SHA512 b2f17bee988fd0a726be9b97263b0ec53b4cfef990ab8290bb22b4043d26828bf4d328e253e4f4c0b3d9e4cd7024f1f0f5975fc2c42dcfe77fe7c3bb3f08cca0
 MISC metadata.xml 444 BLAKE2B 135788c6bce69014c87cd2e80660f5ab8563afb0e2bddf281245d64e9787318b8b4cfa743d0d2648b40f40ce909dfe5a8677fe00114311c4d8ea88b037ff9afd SHA512 8b3dd40cc7b43125b2a7297c991143d74a5d3cbb70e0d5608ede859987cd27cae0a27b92c46419746d56a0f88252e6cb75ad6111ac25e920ba4e46acc8caa423
diff --git a/dev-libs/hyperscan/hyperscan-5.1.0.ebuild b/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
new file mode 100644
index 000000000000..ce2fc792b977
--- /dev/null
+++ b/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-r1
+
+DESCRIPTION="High-performance regular expression matching library"
+HOMEPAGE="https://01.org/hyperscan"
+
+SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_ssse3 static-libs"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-util/ragel
+	>=dev-libs/boost-1.57:=
+	net-libs/libpcap"
+
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="cpu_flags_x86_ssse3"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
+		-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/ilbc-rfc3951/Manifest b/dev-libs/ilbc-rfc3951/Manifest
index 5faae63b0b76..bbbdc225f021 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 666 BLAKE2B c6a8cf908304ae0c44f7bad75f24ebef57e878e85bac9091d967fac6ce3ce17e5a3534c4f627aa838bebb7046666141bcd480a9efc50286aea450406a2709057 SHA512 31e45c667ee63bae34822d323bdf86101da8655ba66ee0b6cdc5645ee35a0725a4617cbe3cfa3afc3f2641ae7def65363df6bd33bd5bf0351c3da840f9afd5a5
+EBUILD ilbc-rfc3951-0-r1.ebuild 670 BLAKE2B cb57e1a58732f8f341755bf2d667add3c5a942c465f20daa4b077ff2d92abfb5d8c1282601f1e4eef226cc5dd5450d71798272c49059b83e476f5eecac30468a SHA512 85e63e02f68ac45865aef96ea48bf8a9fb5c96972dc66063f6cc84600b25868d973512c8969356c1500bdd2ea886e9a552a20eecfe0a0b13176abe55122aa858
 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 e9440fd6ed8c..09b36c8a2380 100644
--- a/dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild
+++ b/dev-libs/ilbc-rfc3951/ilbc-rfc3951-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=0
@@ -12,7 +12,7 @@ SRC_URI="http://simon.morlat.free.fr/download/1.1.x/source/ilbc-rfc3951.tar.gz"
 # relicensed under 3-clause BSD license, bug 390797
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${PN}"
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index dd3983d4c6ae..31ed09e04da9 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,4 +1,3 @@
-AUX libatomic_ops-7.6.4-gcc7.patch 1669 BLAKE2B b37d7940e2a793fcda7f20d509e326fd002260294ae90726a7c23262e97d2f27cf985ce3f2a7e0038441b1d6e2fa39202d800d774d44b8dd69662acc8a35aa7b SHA512 a7e2efa8feb5c8e9f4468f6a74a4191c1e95112a5f646dd9635e76790899504242f94500a1599fa72b781159166b61c39e88da6c01e7febab91afad6f099bcf8
 DIST libatomic_ops-7.6.6.tar.gz 498187 BLAKE2B 343ebda3a37aef6541efae9e646778cf8b1ea74e722979de4336d6819007f3fb37121d53c7e789f69fe6411c05ca2557a18d10db47c68e95e59c92c991bf9fa7 SHA512 ea6e4e2f8f369f5af18435a6ab8ee18c28832c367d24875cccc5e743761109036894260b4296feec5e269a74934df24a90f0fc4868937e1f36605fca082fbde8
 DIST libatomic_ops-7.6.8.tar.gz 503550 BLAKE2B ce8e8757cd20fc5d8e5b62fae0a619f3866e496f552e04c1cca6c63a6d954bf256927fe1fe62192cb24b9f7a9fd1727e108098b09d0f22e0987983ccce035274 SHA512 bc448fadcf8e2936fa933a5872d5550ecdff04b0df27120d3182dcbb2147a6594ec6bfc5b214e21b37ffa1b5100c1c56d301ba9cae7df26cee5e6b999dcda14c
 EBUILD libatomic_ops-7.6.6.ebuild 731 BLAKE2B 38802fab9bde60ad696c1212d51bee17287b47fb1af0219f8a897a241ab9d3c48e73a3503d4b939b811488f9db8e76df4c349380c32b9e5016539c0680a9ce3b SHA512 02090cb3d33b1cc769d99c42f18953585bd266278d7f946d8a8e93607bd1fe0aa3597300a3d639aef3824be04ca8dc489f0bd47ea2a2ce36ca91f1f9e438e5e5
diff --git a/dev-libs/libatomic_ops/files/libatomic_ops-7.6.4-gcc7.patch b/dev-libs/libatomic_ops/files/libatomic_ops-7.6.4-gcc7.patch
deleted file mode 100644
index 66cabfa55821..000000000000
--- a/dev-libs/libatomic_ops/files/libatomic_ops-7.6.4-gcc7.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Upstream commit: https://github.com/ivmai/libatomic_ops/commit/759fa976432e4f09b4a436774fff7119da050042
-
-From 759fa976432e4f09b4a436774fff7119da050042 Mon Sep 17 00:00:00 2001
-From: Ivan Maidanski <ivmai@mail.ru>
-Date: Thu, 29 Mar 2018 01:42:38 +0300
-Subject: [PATCH] Fix 'undefined reference to __atomic_load/store/cas_16' error
- (gcc-7/x64)
-
-Issue #34 (libatomic_ops).
-
-* src/atomic_ops/sysdeps/gcc/x86.h [!AO_DISABLE_GCC_ATOMICS
-&& !__APPLE_CC__ && !__clang__ && AO_GNUC_PREREQ(7, 0)
-&& !AO_PREFER_BUILTIN_ATOMICS && !AO_THREAD_SANITIZER
-&& !__MINGW32__] (AO_SKIPATOMIC_double_compare_and_swap_ANY,
-AO_SKIPATOMIC_DOUBLE_LOAD_STORE_ANY): Define macro; add comment.
----
- src/atomic_ops/sysdeps/gcc/x86.h | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/atomic_ops/sysdeps/gcc/x86.h b/src/atomic_ops/sysdeps/gcc/x86.h
-index d7c06c5..b4ca39f 100644
---- a/src/atomic_ops/sysdeps/gcc/x86.h
-+++ b/src/atomic_ops/sysdeps/gcc/x86.h
-@@ -67,7 +67,15 @@
- #       define AO_SKIPATOMIC_DOUBLE_LOAD_STORE_ANY
- #     endif
- #   endif /* __x86_64__ */
--# endif /* __clang__ */
-+
-+# elif AO_GNUC_PREREQ(7, 0) && !defined(AO_PREFER_BUILTIN_ATOMICS) \
-+       && !defined(AO_THREAD_SANITIZER) && !defined(__MINGW32__)
-+    /* gcc-7.x/x64 (gcc-7.2, at least) requires -latomic flag in case   */
-+    /* of double-word atomic operations use (but not in case of TSan).  */
-+    /* TODO: Revise it for the future gcc-7 releases. */
-+#   define AO_SKIPATOMIC_double_compare_and_swap_ANY
-+#   define AO_SKIPATOMIC_DOUBLE_LOAD_STORE_ANY
-+# endif /* __GNUC__ && !__clang__ */
- 
- # ifdef AO_SKIPATOMIC_DOUBLE_LOAD_STORE_ANY
- #   define AO_SKIPATOMIC_double_load
diff --git a/dev-libs/libcxml/Manifest b/dev-libs/libcxml/Manifest
index 28d7f681ccd6..9272e768cf90 100644
--- a/dev-libs/libcxml/Manifest
+++ b/dev-libs/libcxml/Manifest
@@ -1,4 +1,3 @@
-AUX libcxml-0.15.1-respect-cxxflags.patch 360 BLAKE2B 1c5ca2699e8a91318d86840aa13c8829100b98443be1650996160704514627dcc974eb87848e0ba5f670319437e11fd22098487ed455193d202494019d578145 SHA512 4f5f908b54371f978d83857236a65e82ed5caf3af6811d20cc6bee715a90c3f74a4a16ff3be6349384a01f07bad2a6508c60b8b33c19f6273b2e873634e19fd8
 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 804 BLAKE2B 6b1695a937aeb219dcba2b036e0a0ca965c07d90d02651324c9b16804a2b584b581384c3ae9c3126ab57002f2eb7f69c13d70153a933789131e25137a829291e SHA512 1a93e6c7e61ca568039b95fd20fbaa151be2fedcbfcde2c0711741e9d1fc8932d3680549ea81f4a868f9779dc4f8002974e8250ab72f0772d77c68fd3b3c8923
diff --git a/dev-libs/libcxml/files/libcxml-0.15.1-respect-cxxflags.patch b/dev-libs/libcxml/files/libcxml-0.15.1-respect-cxxflags.patch
deleted file mode 100644
index 409dc37410c1..000000000000
--- a/dev-libs/libcxml/files/libcxml-0.15.1-respect-cxxflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libcxml-0.15.1/wscript
-+++ libcxml-0.15.1/wscript
-@@ -12,7 +12,7 @@
- 
- def configure(conf):
-     conf.load('compiler_cxx')
--    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-O2'])
-+    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra'])
- 
-     conf.env.TARGET_WINDOWS = conf.options.target_windows
-     conf.env.STATIC = conf.options.static
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 2f4bee710a21..f89c426d7069 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,5 +1,8 @@
+AUX 3.28.3-meson-tweaks.patch 3016 BLAKE2B 37c976859e35023f5d9742553199aa2bff79241b20af7ce2b6cddf460f42895c7bb4a7a69c51f11f2364c70111cf576b338765d242b09603618332d1d9fea6d5 SHA512 e8d058ac9616e64ca4db3a015fe6498d4f8bc087d5235eb84bf40b91ecf523932568a9d4f0eb17dad56e835e8657badc75458ce2687d896d83240a719d004646
 DIST libgweather-3.24.1.tar.xz 3350680 BLAKE2B 9265cb3c280446d5f380f62b60efb5578a7a401e3291d12e3824d8e7eacc582761226b0aaebb0439318bd48b9ad5429a1b6d89eb0220a82650c43be8aa337e2d SHA512 564464d7a18a8e0320871ea418b1163163941c950c5acea5ee65a087e44c4d81e019e2e3e4cb6751989f823cbb7c5691713d3dcef72aeaf6ff264e61b6f7b4b4
 DIST libgweather-3.26.2.tar.xz 3409528 BLAKE2B 1c5cdc7125aac8df95e97db8fa1d63bcb06865e70691621bc3a1c0ece2e602862cef9a2a5daa2ebbc5fa7eaefa32bf89507f1eef8fa4eeff294d43132e83fab4 SHA512 75b936f93814005b4317dcb51777036f589f343526428d9a74de96aac1badd4fe81c117184e2bff84a7a3078d6f2a2000e7b63f1e1d80f839b3513cc470fb25b
+DIST libgweather-3.28.3.tar.xz 2711240 BLAKE2B 9e55c32485401fa31e5ca5a824f239c373e41c2ef3a1d4442ba4512f102edadaa3452bdc4f4a445ea34e5e24cda23fbf6e1363da5bd49f70018b387f7450cf15 SHA512 7eb98f15b624090ba0959f4ee47c1a2317504a381829cebb949f4104ea9b5c2847a98f95de60a35c5bf1094e500041c53e1afdb265dd2f237bc49db8acbfd6f2
 EBUILD libgweather-3.24.1.ebuild 1322 BLAKE2B 105efe6d6f95643f2b98f5bc5ddc0ad9ddbd95ada17e085830e1617ae84ca8518584fb001c9d149c6fc9597965248a8502c92dc9b4cc78deb54f89076747746b SHA512 5c6bcafce98f58aaa43954eab525215f1b60df96b8b35ee72eb4fe794fcae3e8fd13cfe9524bbfb93e2fb8112f65418417b02b0a9ca715db71a2be37e0912252
 EBUILD libgweather-3.26.2.ebuild 1324 BLAKE2B 3dd629227ddea275fc27c2dd90049e29b6c23289a8c5b18036c07506a4adde288dc89ce393c6d57f0417f4f38da820c8650fae56350a771bfcc7d98437890348 SHA512 d932b1409e199220dbbd947813792ba707bec218cc4347f58ed31814d3cd715e0a1aded278a93bbe2add82470dd7b7bc72bbe292c9d0be0c808a7fd141bd939c
+EBUILD libgweather-3.28.3.ebuild 1569 BLAKE2B 693849e3d04ea4001974cedb4771ee913df170cf837284a4285081466f4ef73bb2e9d67758c2f91062fb45639ec8917091704b58016c235e1c94ea1c37701f36 SHA512 bcc77e4d9c060a722af772b7c86410365fb9f1f4ca556812c3a74c7250f1bdda93158473ca298e23559672b9a7211c66fb14a3cff6cd7c02e34a3c58c15450ba
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/files/3.28.3-meson-tweaks.patch b/dev-libs/libgweather/files/3.28.3-meson-tweaks.patch
new file mode 100644
index 000000000000..83880e0398a0
--- /dev/null
+++ b/dev-libs/libgweather/files/3.28.3-meson-tweaks.patch
@@ -0,0 +1,107 @@
+From b7df88319847f3155bd0e2ea994cf66c01fc1732 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 23 Feb 2019 12:21:01 +0200
+Subject: [PATCH] build: Provide introspection option and don't build manual
+ tests
+
+---
+ libgweather/meson.build | 21 ++++++++++++++-------
+ meson.build             |  4 ++++
+ meson_options.txt       |  2 ++
+ 3 files changed, 20 insertions(+), 7 deletions(-)
+
+diff --git a/libgweather/meson.build b/libgweather/meson.build
+index 4d907b9..9ede9d0 100644
+--- a/libgweather/meson.build
++++ b/libgweather/meson.build
+@@ -65,6 +65,15 @@ lib_libgweather = shared_library('gweather-3',
+   install: true,
+ )
+ 
++libgweather_dep = declare_dependency(
++  sources: [gweather_enum_types[1]],
++  dependencies: deps_libgweather,
++  link_with: lib_libgweather,
++  include_directories: root_inc,
++)
++
++if get_option('introspection')
++
+ gweather_gir = gnome.generate_gir(lib_libgweather,
+   sources: introspection_sources,
+   dependencies: deps_libgweather,
+@@ -79,13 +88,6 @@ gweather_gir = gnome.generate_gir(lib_libgweather,
+   install: true,
+ )
+ 
+-libgweather_dep = declare_dependency(
+-  sources: [gweather_enum_types[1], gweather_gir],
+-  dependencies: deps_libgweather,
+-  link_with: lib_libgweather,
+-  include_directories: root_inc,
+-)
+-
+ if enable_vala
+   gnome.generate_vapi('gweather-3.0',
+     sources: gweather_gir[0],
+@@ -94,9 +96,11 @@ if enable_vala
+     install: true
+   )
+ endif
++endif
+ 
+ test_cargs = ['-DTEST_SRCDIR="@0@/"'.format(meson.current_source_dir())]
+ 
++if false
+ executable('test_locations',
+   ['test_locations.c'],
+   c_args: test_cargs,
+@@ -107,6 +111,7 @@ executable('test_locations_utc',
+   c_args: test_cargs,
+   dependencies: libgweather_dep,
+   install: false)
++endif
+ 
+ exe = executable('test_libgweather',
+   ['test_libgweather.c'],
+@@ -115,6 +120,7 @@ exe = executable('test_libgweather',
+   install: false)
+ test('test_named_timezones', exe)
+ 
++if false
+ executable('test_metar',
+   ['test_metar.c', gweather_c_sources],
+   c_args: test_cargs,
+@@ -125,3 +131,4 @@ executable('test_sun_moon',
+   c_args: test_cargs,
+   dependencies: libgweather_dep,
+   install: false)
++endif
+diff --git a/meson.build b/meson.build
+index 5b30864..2e9fa08 100644
+--- a/meson.build
++++ b/meson.build
+@@ -108,6 +108,10 @@ else
+   enable_vala = enable_vala != 'false'
+ endif
+ 
++if enable_vala and not get_option('introspection')
++  error('Vala bindings require introspection support')
++endif
++
+ root_inc = include_directories('.')
+ 
+ subdir('libgweather')
+diff --git a/meson_options.txt b/meson_options.txt
+index 19b2c6a..bf4c517 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -8,3 +8,5 @@ option('enable_vala', type: 'combo', choices : ['true', 'false', 'auto'], value
+        description: 'Install vala bindings')
+ option('gtk_doc', type: 'boolean', value: false,
+        description: 'Whether to generate the API reference')
++option('introspection', type: 'boolean', value: true,
++       description: 'generate GObject Introspection data')
+-- 
+2.17.0
+
diff --git a/dev-libs/libgweather/libgweather-3.28.3.ebuild b/dev-libs/libgweather/libgweather-3.28.3.ebuild
new file mode 100644
index 000000000000..16dcb34600d0
--- /dev/null
+++ b/dev-libs/libgweather/libgweather-3.28.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Location and timezone database and weather-lookup library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
+
+LICENSE="GPL-2+"
+SLOT="2/3-15" # subslot = 3-(libgweather-3 soname suffix)
+
+IUSE="glade gtk-doc +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.35.1:2
+	>=x11-libs/gtk+-3.13.5:3[introspection?]
+	>=net-libs/libsoup-2.44:2.4
+	>=dev-libs/libxml2-2.6.0:2
+	sci-geosciences/geocode-glib
+	>=sys-libs/timezone-data-2010k
+
+	glade? ( >=dev-util/glade-3.16:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.11
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically
+)
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use glade glade_catalog)
+		$(meson_use vala enable_vala)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index ec04173e7fc1..2eb91a671078 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -5,5 +5,5 @@ DIST libinput-1.12.6.tar.xz 518784 BLAKE2B 7462f47be3628f9c66ef5b7c8265b588bd0ca
 EBUILD libinput-1.11.3.ebuild 1430 BLAKE2B 6be00d5d69e9e6c4fde5c59a3856ce50e95798809863ead833404e8f49be8a3c85801b13ad1e9ca802642f627d8435132cf9257fa4965898720628da0c0e0908 SHA512 20cc0c87ed32c22e5c7e2b9b1420eeb82e064ac1e59535e3af02bfdc84640ab84c09f0c18dc82ce9a399bd48a3ff5cde1785354869a7f459af63c1abe1986c68
 EBUILD libinput-1.12.1.ebuild 1460 BLAKE2B 066dfe5ee976f24475f2572d040c685b2a429cc27d22d2199bcaaa0e92886a9e76b2dc489457e5657f8b4ac6a0e61af75cd7041af96647bc1dd911d5c84e3585 SHA512 3bd9c1fb51fee929bcf85349996e679b202d2e064bcb88926a4d0cda0453f82c7ec9f8bd0ba0e4870781fc936a36da034b91e23223ad3f9764b4781468bf8b19
 EBUILD libinput-1.12.5.ebuild 2035 BLAKE2B 0befaa539fd44efec19a1a9aefe0762633974120c288087c0a6b7ad553ca7dc0409a83ad729494012853c424f7855eced3d6d34c3b9e5d13fb43f8da5875628e SHA512 722b84a7ebfab778425eb87b5a08c8c6fa02679cee22a0d1355cb20137bc87061412630dbd7f564be40665737c8703f190162d32bc0138cc43eedee4a2a7c471
-EBUILD libinput-1.12.6.ebuild 2029 BLAKE2B c193e15ee316e4d0bfb1d4b4ac562d66747490f0b3484f5d10a458ca2987c80ea4780a46aea14538ad5362bf170b93aa8d5e9147f590210f270641468caa67e7 SHA512 75c5823074fb850e10828573d40c0bd3bb6610109e6c998780c426fed4fcf5e67abdc7c3acfe324fa234b104f1279f295bbfbb0d22ad81574f5bccfb2181bf7c
+EBUILD libinput-1.12.6.ebuild 2027 BLAKE2B f14750ca311f8b8cac7a088551821cdc762245f6a6ad4a69b15ce44e9b9611afd1f81dd15569305404a45bfc6666a1a42419a47b4b58f04f4c896e2eae0db352 SHA512 2344c507aba2017fa8603448704912db8e2488766124aed74c87fec727904e6166f89ddc0d8d985f342cc19bffc78fc8bd046f9951d33ef4fe3067c217076125
 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 d9976d9a0742..9e25ddaf3dec 100644
--- a/dev-libs/libinput/libinput-1.12.6.ebuild
+++ b/dev-libs/libinput/libinput-1.12.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~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/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index 0be891076e71..82a83d8417d5 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,5 +1,5 @@
 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 528 BLAKE2B 27cadd7c4012b049e7c4ffe15561f054f7274fa9ddf6343457c9480af02cb584ddc1245ca00d0eee2ecd8734f9e7725db7015533db70aac4b594d9c893ddd374 SHA512 8e251d236b38e83172dcf04c3d18b0841131ed40282e3426f28a5ea6e3533d9c4a6f74e6e69e3ea4357e844788246b03a3e3ed1a724c1a5466caf899274b8b5b
-EBUILD libmaxminddb-1.3.2.ebuild 540 BLAKE2B 73542768c732d7b68cf3066c27f214d0d7445db964fe8cb5e1f116b9589edf5288c1865f290092e69964989dc33c13a0b4831ba9f224856ee42533e2363836fc SHA512 f5ba49ea4a9d0247f9764c67b91224c5f775f768dc02759c510be68742fcc1ac1324f99b5fddaf7502c788414d8067b69eb86931d157a49b5b817a95fa3da81f
+EBUILD libmaxminddb-1.2.1.ebuild 534 BLAKE2B f04f1993e974ddfa3c3d18460b2d1ab47f4eafd75593b1e1d35b039edd7cccf9794dba6557b3fff29156debc92f6b7e2a17c4ac0b621b5adadf34476f3384807 SHA512 c39d9450664921840c4a18ec2a7293607ac1aa668330d5c19ac3fcfd8998522055e83313b03551635f417ff80915f52e5506fea52768236287ea56a2d838573a
+EBUILD libmaxminddb-1.3.2.ebuild 546 BLAKE2B f346895a3ab9d1d584cfff869ca384e856524430694d49b46022549921ba0264927566ae2d69615230b5c5088865e3c0fbc29bd3f82d9a5783198278a3473a04 SHA512 c078a4643730ae60d3839225e220fec966be1fdd1218577f584865d744cac29195c220709674a89d66ca67b7df2034e5b439ab4588a4d83daff376f1afd5f5ff
 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
index ca2f1e5693a8..9d04b57424fa 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.2.1.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DOCS=( Changes.md )
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
index e1fb2c68e579..a2fb05ff0375 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static-libs"
 
 DOCS=( Changes.md )
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 0b7244146260..76f3eefb56a2 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -2,6 +2,8 @@ AUX libpcre-8.41-fix-stack-size-detection.patch 569 BLAKE2B 68f685ccd9ebe0a256f8
 AUX libpcre-8.41-sljit_mips-label-statement-fix.patch 584 BLAKE2B 6523a93f78730f1689ddb79631e31e134d6de844dfc4b3e63a15aea4f0737773ff0a8e4fbf3e9e80ea920d1da751ba2165a7b3b459dfbe0d8673c9a9da95f63c SHA512 38f133a539f4e09886084e0ff2d30bf69ceb600095f87f32eae42f8f03ada9c1aae0a1eff6763d473f0edfcef047a0c573859d0ada503419a7d663140a92fbb9
 DIST pcre-8.41.tar.bz2 1561874 BLAKE2B 2a97a859237994137190da00c30ba7c15e8631b82b7f200858cf722f1fdd0405d36c24bb716eb099d8107f2f829a85fd7d3497f36cdac51769636989331e7a79 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551
 DIST pcre-8.42.tar.bz2 1570171 BLAKE2B f68bac3cf8ff5a81ccba31fd4d8926e05143a25a756e7daba9793467cec9cd8a4766f394f958ffca088b472463a43a31ea77014f2d4505082c1f366a18f30c7a SHA512 b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d
+DIST pcre-8.43.tar.bz2 1576584 BLAKE2B 12c2117fc5d242ada44884df279f7f8b4c680fa1623ddc131c0adca1740ec47614ac6af20fc60b0c516d9d7b66488ba8a4e5efa5fc8a0a70aacb02bb3d38ee53 SHA512 3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7
 EBUILD libpcre-8.41-r1.ebuild 2745 BLAKE2B 0baa729c7510e74daa1ad81a843eef9dd3f86903d11a2e2f8ba1d8346391fd0db78b0b951c57e199c5c52ce98c23ce439d7b08a5bf619279a03ce5f1ad360215 SHA512 119f0340195ed0d78e419501c3ec767ca6f8cca18ba01111a4bfa8e835dbd8051cd2a6bd82a974b836d1a8a60e5c8d969d06b3f0f049a0b81d6e22e9686efef3
-EBUILD libpcre-8.42.ebuild 2580 BLAKE2B 45a3377eb78ddcff54ee4e04614cba5339c5d4aaea39ac54a8203dd568feaf63e3619024864736d0db8b651c26363aa0a828c131967a1e8ffc3b8ff904755f40 SHA512 1e4a4e86954faa2b615f9e992f5345ab40f2ba54f7469f3cd4d41d41558c8a99eaf1d0d1d1f87d59d23a3a8c2ffcfa614236503807790d4fb18baa245e5a1183
+EBUILD libpcre-8.42.ebuild 2568 BLAKE2B 77c68f58f0939554989bcc3977b064de64d29f85f439bed7fdb9d12aeb381bc77ab1b5ef58abde36b3488ca28be9dbe235dfa2d6f7ef564c64c72b15f55391c9 SHA512 1cc48223d889ff571501e919b156468e0036ea3cfbbc05cfd20aff965d9c8a7befbe72e0a47f6e445d9efbe09f56a187723ac918ce57eba204e31791bc1b667f
+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 6ef489f6de48..334c42896216 100644
--- a/dev-libs/libpcre/libpcre-8.42.ebuild
+++ b/dev-libs/libpcre/libpcre-8.42.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
@@ -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/libpcre/libpcre-8.43.ebuild b/dev-libs/libpcre/libpcre-8.43.ebuild
new file mode 100644
index 000000000000..3d85bbdb3c33
--- /dev/null
+++ b/dev-libs/libpcre/libpcre-8.43.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib libtool flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="http://www.pcre.org/"
+MY_P="pcre-${PV/_rc/-RC}"
+if [[ ${PV} != *_rc* ]] ; then
+	# Only the final releases are available here.
+	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
+else
+	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
+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"
+IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
+REQUIRED_USE="readline? ( !libedit )
+	libedit? ( !readline )"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.41-fix-stack-size-detection.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT)
+		$(multilib_native_use_enable bzip2 pcregrep-libbz2)
+		$(use_enable cxx cpp)
+		$(use_enable jit)
+		$(use_enable jit pcregrep-jit)
+		$(use_enable pcre16)
+		$(use_enable pcre32)
+		$(multilib_native_use_enable libedit pcretest-libedit)
+		$(multilib_native_use_enable readline pcretest-libreadline)
+		$(use_enable static-libs static)
+		$(use_enable unicode utf)
+		$(use_enable unicode unicode-properties)
+		$(multilib_native_use_enable zlib pcregrep-libz)
+		--enable-pcre8
+		--enable-shared
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+	gen_usr_ldscript -a pcre
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libpcre.so.0
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libpcre.so.0
+}
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 1267b2db085f..223722150159 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -4,5 +4,5 @@ DIST pcre2-10.31.tar.bz2 1603075 BLAKE2B 3cc101b738320823f5b8ab5d29fcc94d8bc2ecd
 DIST pcre2-10.32.tar.bz2 1641814 BLAKE2B fdd512312547ae90b36b6c9eb86b6fcfea9b03fcfd9766063c901819c6bf7536e1f3da89bd69ae62309069bc07c705e96e81f4a36355bf934c566f343e3104e4 SHA512 3d712e7d6afbaef227952680ded69fadbdec0b1abdfcac17cf071415c3c93edd152d6d268dec80570aedf24f82ba954f74f5f9e62c9b9991be75080a3d6ab5fe
 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 2350 BLAKE2B 489e0918cfa5fd599c79d97678aad073a742ab3bacfe87a4a29a3429a3e4317343fc0333bb8643da8376a3042c01e34ec93d4e0dbd3868d00737278e423faa36 SHA512 272344eae55a901f6ffd5e93398dce2d4c5f967f8b51fbb22999ab9b5f7c30c54fc7ce408c9de34d93341524ce181604d1c6fa51b223604230b0dc4a1803709f
+EBUILD libpcre2-10.32.ebuild 2359 BLAKE2B 6c6d62c1b08530e1e2a364f5e62d7f4c3581e9d113865cdd6c6655bfe044e5960bd748f37fb8b546cefe45c2da3e1ee0a074224297774f7ec5ed1f1c3f1f3602 SHA512 c64db13b39127e2e0bb3b757597591a2af28e8c7614df71843623a5fc945d58029cadedbbf18181f8bd63e9ee2ef4ee6613c193731697d8d18bd1d2a092a33cc
 MISC metadata.xml 1228 BLAKE2B da9f4403aa5618f793335621cecafefc6c3a475f7339884fdebe661002cf724e0b27d49270ce4dd4092bf9fe00371c53798988d28376475f630c965e7fbd1c09 SHA512 33c0cbcd3fd188d2c594cda3e8aa100a1528f40af2aad398c6371cf01c639b54d0cca52adf15a123fc036738031729f2950b8409b91b40240211ec7e9fbb80a8
diff --git a/dev-libs/libpcre2/libpcre2-10.32.ebuild b/dev-libs/libpcre2/libpcre2-10.32.ebuild
index 642cd4e24e1f..4d229a789ef8 100644
--- a/dev-libs/libpcre2/libpcre2-10.32.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.32.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
@@ -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 )"
 
diff --git a/dev-libs/libreport/Manifest b/dev-libs/libreport/Manifest
index f3f76b17fa4a..ab9a411a549b 100644
--- a/dev-libs/libreport/Manifest
+++ b/dev-libs/libreport/Manifest
@@ -4,7 +4,9 @@ AUX libreport-2.0.13-json-c-0.11-pc.patch 1780 BLAKE2B bce31a7535097d11d26a36afb
 AUX libreport-2.0.13-json-c-0.11.patch 1145 BLAKE2B 2e4bd653b4c378875ffe846f8cfb84f6feabb9e571079fee873c064a092a97a89b4cc7a82e53c57a34a8a9b7510ddac24f907f4dc92cbc3cb6563247dbbad46a SHA512 fd07c360d599d71fddb6766860203052fb390cde6cb795779e75a2d2a826affd6f03c6977eb99237caffdc41ac9f0e1c600a9414f72629ff5fc2102c70d8ca67
 AUX libreport-2.0.7-uploader_event-syntax.patch 610 BLAKE2B 5bdd1835310125c3adddef9e338928505e204668ef5448d4991fb67cb9742740dd802caf67d3be3616bcc17c1022f48a4f3d1db9989e171ba30054985b53d0a6 SHA512 b0ae2617a013fd8cb3475e5a51073677f2ea965a57169c760e542474351293e70f70e678a66beeb3b3fa163589aaf7f79f0883fa55ff524e62b5fcd3ae919bf0
 DIST libreport-2.0.13.tar.gz 1190147 BLAKE2B fe79d924fbf7bd11cc3fd23956a137fb296baf9c40f12f3ecfefe68c82281f62299887511a096196b4fdcdc9245ab268592dace4e728c2c34af47581e52f5132 SHA512 cfe963db8091b245f8ceb7d8501466f4f9464c28d298faeafc9f6e57deafdfdc6501d468bf5ffd83703adb67bc1e05e06c56b5c0e0028bb2e0134788ddbb2181
+DIST libreport-2.10.0.tar.gz 2278084 BLAKE2B 95ac1fbf32e6e021e9553b35b10f9e46b7ea2e9cc6f21e53eb39a32a5261f7a6e49b2172381fdea30341fcc4311928691e68749a8bb5c41a4bf709151935687a SHA512 978ea442d82b75abf80b2075f540cb05c5577387a9221f2070c9695c4546d36169738d223f5e903d0b774b7e1566a6111c55a6bb51a0822ad1676095f067c45b
 DIST libreport-2.9.5.tar.gz 2271742 BLAKE2B e74d694c0012e984aab8044e99fee8e12a197c0a2edb933e78f045260043d40557509056b1093bc13cbe983976d5525cde1f7596a942760df10c857e99d6b56e SHA512 f207710d88f39870d08e3a5fdfa3e1d5a808625bd36b1dcce363cefd39e582bad6be6dc4224db5e1df4404734c3dd69c437c377303fe978ae21b608fceb833ce
 EBUILD libreport-2.0.13-r1.ebuild 2141 BLAKE2B b49f76f03adeaefd952003d1e7bb561b10d7af1b7b399748f0209cd33ea9a40f49e3861e95500a781eaa940735b6d387cb6d168411672d234173e15edd4b8979 SHA512 c0666dd82fcec73ef563886376a6d1449e505239308417e8145e2ce5b394dcc9b4811e9cc3f166a61898b6c7877831b66a1c0d8ef8c76d39e4b5024a54ac4ce7
+EBUILD libreport-2.10.0.ebuild 1946 BLAKE2B daab9fe38fc294b9009c72f21d5fcddaf277c98162393bde2316021de7894f27cd548c97e2860586bc9ce0f279d1538d753501ca0f49139c843913ef30716b95 SHA512 8a02d49369fbb8a8cab97d6fc7565ac8c37c520bf5caa5fd7b09c6868b17481d1779120ed5098ba0fd37d7d0d2aca30d8b66445f67750a362c92957ba7697e31
 EBUILD libreport-2.9.5.ebuild 1937 BLAKE2B 421edf2bfde7925bc4ef8bc46df0c70881e2fc4302c3a1af4353424ad2273db74fafffeb5c8022bbfca65b0f6715c0ab477c9ae112296ba52d7144680c0b2f27 SHA512 a54888e680c0ebc85ebc47839da5864c91c7933dc03bed5f349a2c1d88e7fe7a67456e35a0cb66126c9e19968f67ab28f3e5da320eba57b971733f5aec71fa8a
 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
new file mode 100644
index 000000000000..d64adf865abf
--- /dev/null
+++ b/dev-libs/libreport/libreport-2.10.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit autotools python-r1 user
+
+DESCRIPTION="Generic library for reporting software bugs"
+HOMEPAGE="https://github.com/abrt/libreport"
+SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+gtk python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-admin/augeas
+	>=dev-libs/glib-2.43.4:2
+	dev-libs/satyr:0=
+	dev-libs/json-c:=
+	dev-libs/libtar
+	dev-libs/libxml2:2
+	dev-libs/newt:=
+	dev-libs/xmlrpc-c:=
+	net-libs/libproxy:=
+	net-misc/curl:=[ssl]
+	sys-apps/dbus
+	sys-apps/systemd
+	gtk? ( >=x11-libs/gtk+-3.3.12:3 )
+	python? ( ${PYTHON_DEPS} )
+	x11-misc/xdg-utils
+"
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/intltool-0.3.50
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+# Tests require python-meh, which is highly redhat-specific.
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup abrt
+	enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+	default
+	./gen-version || die # Needed to be run before autoreconf
+	eautoreconf
+	use python && python_copy_sources
+}
+
+src_configure() {
+	local myargs=(
+		--localstatedir="${EPREFIX}/var"
+		--without-bugzilla
+		# Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
+		--without-python2
+		$(usex python "--with-python3" "--without-python3")
+	)
+	if use python; then
+		python_foreach_impl run_in_build_dir \
+			econf "${myargs[@]}"
+	else
+		econf "${myargs[@]}"
+	fi
+}
+
+src_compile() {
+	use python && python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	use python && python_foreach_impl run_in_build_dir default
+	# Need to set correct ownership for use by app-admin/abrt
+	diropts -o abrt -g abrt
+	keepdir /var/spool/abrt
+
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 79dcb749fc64..09f1fd538617 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -5,6 +5,6 @@ DIST libressl-2.8.3.tar.gz 3366196 BLAKE2B e32c097b31998d68a31266fbbf3624d5ab8ca
 DIST libressl-2.9.0.tar.gz 3400383 BLAKE2B 652ac9ff962fd187563f2f6f9ea423d682f743c8443954ad3a8adc810530711482705f0cac1a805e2f85697ed1fed156c80da913dc07c8c13cd6ce78e44b6c4d SHA512 db7fec664bef8d76204ca691c11df236abce3c85b2a51011eec5bd302e273b62fa3cfce0430980915c3f3ce34176d5ef9c187902f0b39d7fc151e69e552b499c
 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 1379 BLAKE2B 45d0552d858338a5c8690f279e22dcc8f6465971eadf96a592baede32f59b4fecbb2b29e4b0f124bd198c2e5303666c233a9507798d3eb7cb9ceda94fe9548cf SHA512 158a11281f39c5f8e349ffeb294875b5a1d2ad1fd13f437d6d5532739796da95b859896571994815428c2c7c4a49956744d4ba26fb3becfdd26baaf6d2529b4d
+EBUILD libressl-2.8.3.ebuild 1375 BLAKE2B 1406952441df245de1e1a92e41ea74dd40ac63af4f848365ef750e25c84eeb952a4d2d178c57cf3dab6d78b072b98a8be2b23fc29390f66492fcd346acb25e20 SHA512 df35be89fece68518de552ae4039786e1e2e0bca4afa4becc7bf46d6a47a98f745b387f06ae246c4026f1a909cd31eeda301762e392075107c30d9481a87ca4d
 EBUILD libressl-2.9.0.ebuild 1382 BLAKE2B f9b3a74005957746a5b24795be9ab865512bd755296ea0d2b33c831994fa53c650396f1415353f637fc1683d4dc3f9549f8d947a7c2a604cac6a4cd9026432c3 SHA512 16355826a261f76803894d0eb8da4bbaa217f21c4c2b3e8153150c6783ace510458d6d529c3ff0aa3ee2e7d8e740389ac2ff151f3a8dfaac26980c83a25bab0c
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.8.3.ebuild b/dev-libs/libressl/libressl-2.8.3.ebuild
index 09540cb92f52..9b82d21707b2 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="+asm static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index 652a12a0bd43..b89fd8ee45d0 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,6 +1,6 @@
 DIST libsass-3.4.7.tar.gz 319824 BLAKE2B ca3e7091816474e318fb1eaefa01e5e361a66715b6267500a93f80dfc8b34bdc595e6ddc4b1872e4399093468d4ac06a9760685d8941d92f18e1834df7715b04 SHA512 5d743d4345b11e9e5315aa858637d3388d2b464150a46bc8a712e1e5d1b3df9c1e6b4dcac26f91827f1c38db24a5a084d04c0962a428f2994f42ad66a25b35a8
 DIST libsass-3.5.2.tar.gz 326773 BLAKE2B 65d2dd82872ef76a45597104cc2a531786c0cd33f8e61172b0c973c8262fbddced3b988e143f27b3b7cac2f9d17c481cf58201bfb432aa2656763319ac072b51 SHA512 a06f0047358eeacf5fff9ab44e833ac285e4a971829610b56ae7ed00128b4bee9fe33630c299e61337cf975caf0bc3067242c3af4db1f8aaf3898d3e63920f67
 EBUILD libsass-3.4.7.ebuild 1096 BLAKE2B e9eb6a53d6155feb93703d991b63b41d45e14e9d8bc556a99639bc05aa02b630efa163dbb8def6328c997c8a987c03a9bab68ff24131e33d541f3f58c0358d47 SHA512 740bc1eba61b1fd5f8faf5fce4520836f63fd1b17220948c48674fa579007b2c8d3e6e389a21b923c1dc94fef295a154161b11f1fbc84cc4198edfd730bf6190
-EBUILD libsass-3.5.2.ebuild 1107 BLAKE2B 567156e42c2e3046d3ef3ddc973641ffb102b9b896eb286292f4ed66b5c4ee5ae2c2dcca82e7bd89b12051d05f9088ed03f15422c98d7c7f8b59d13ab4211a60 SHA512 e0e1deb79199a47081993dad93f46995b3302349aa934ad907302bc8f367b9647aafe4ab6116143d8b63bb72ba2b80695f032abdbc3f6195dc82e190aa3fc6b5
+EBUILD libsass-3.5.2.ebuild 1119 BLAKE2B cf6145088e8a11d9e8224fad8cac4205ae218dee52b30a260b60b1de213d34225b75fa5cd8d2bd9aee0e3e31005b2a689dcb86d3bf8cc127ab6cabce25330138 SHA512 468716041d189c58b84239e54a7cf4244bda880fff87ade70ab6cdf70fc75b7f0f87c48d0a1d42b9daa76a3ea1d2997dcdf3a5c661e2f8d7511549b650a8564e
 EBUILD libsass-9999.ebuild 1098 BLAKE2B 9bfaff1b30ff11fa8cb8c2082a2e91a61d8be9df2cb290444203b8d56111e63a914e439526ffa99a0ae21ec229ac4f7d672c2e58e2baafb2bb80edb947c0be64 SHA512 48833dfaf5b5c815d7922a93a988a15ea59b5d38d6f6cfb063109b89be479d617df8c8d9ff7394ece9901970c5f569efa59c80a6a3adfe6ecf4baffdcb803b32
 MISC metadata.xml 631 BLAKE2B 186d066c5e07a86e3b9878c3beb4453b1f708ddc456863fd43992955a6557df1151c92a5119614ea619b7e0aaad32248982170e5de514551c2cf6a4273ad4235 SHA512 b48a370653c205fd753b4a4d23346c58304c78ae9fe2ef4b63316bdeb29d641e5f4e1e2917d96ac05e59be7bef5663713b55ca8ff225bd8fee029da018789ddb
diff --git a/dev-libs/libsass/libsass-3.5.2.ebuild b/dev-libs/libsass/libsass-3.5.2.ebuild
index b8c2af85094a..b7b573c1c746 100644
--- a/dev-libs/libsass/libsass-3.5.2.ebuild
+++ b/dev-libs/libsass/libsass-3.5.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]]; then
 	KEYWORDS=
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 96473b102695..43e469d73b88 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -5,5 +5,5 @@ DIST libsigc++-2.10.0.tar.xz 3794612 BLAKE2B 205cd8cedbe25d04108df888c392fe6a148
 DIST libsigc++-2.10.1.tar.xz 4062388 BLAKE2B 3bd988acae78b7d463c966fa5c8da68b35d8a0b0bf4762811b7a9fdf82357b29aaa48d64e19f4cb6bd0f42ee70ad77a64a4905d1ad609dbe11ca8ff7596527c6 SHA512 e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2
 EBUILD libsigc++-1.2.7.ebuild 953 BLAKE2B bbded60c997517150857e66d1d1bce9123666391c0328862ef3da2abb75519ef06585ff4209803277352e49c5059606975ec963b564a075229d4fe7243d92dc1 SHA512 8fd16c8a79761172d2674ba2935d07d13d16c20db687a00e53241a2f5d7b1c9f7b61510968960e02be85a6f5e52aa622cc0d09af19c2ba19a274e997596850b2
 EBUILD libsigc++-2.10.0.ebuild 1656 BLAKE2B 06f822384e9c2fcbf52fe91a783ca9266d4ea7f728d9c9c14db04bea4a8b69cd1d863f719f4031028d30b074563b5cc401eeee2fd3693e33497e9b3449910e79 SHA512 f28e3fc55596383da213da6941015162cb7b2983d40990b030673fe6aecae01ab88b842e1b75cfccb70d235134cbfb8da6db626b22822bed277c5f2f4e7bcbc6
-EBUILD libsigc++-2.10.1.ebuild 1511 BLAKE2B 6ca77524435d8e35f74c6c7933bf2472497353295648f859ab126c6f638a0a0ed40f30f602d509a4e8a98f9d8636830af35e0f1b5f20892532ee880643a151d8 SHA512 74174e52121f0f6fe6be74cc7b52e94724a95dd03b9d1603d318e8898bcd680b38c608e4b5ee99329c8dc786fb8ae7fa4748ada459dd59256501861756891cd6
+EBUILD libsigc++-2.10.1.ebuild 1509 BLAKE2B a5f34af84bc26a1c40d0d5762e5351e784626b58ae18414db603591e35e541b20ee3b9e62102b4e134786170724f199680a05a29dac50fea5d3460ffb2efac51 SHA512 88b973a4ebb97dea119b0dbf312dbe0850eae7f7dcd80aa35e94e168602f8f237845f8e6cd0aa01c906e93774a3ab241d14214f4f4380c669aae8d6585643525
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
index fd085ffc0eb6..1b4f4f97fddc 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://libsigc.sourceforge.net/"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 776011dd01a8..cd297202160c 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -11,5 +11,5 @@ DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862f
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.9.8-r1.ebuild 6929 BLAKE2B 118f631199ac16882386289926e79ff92f01efda5f43d50a7e3ea1e3f63c11d0e8914d99962478870377f11815b4a6c536ff729d7890613aab993ac382e0003f SHA512 a7ba10378ba62ad7070abc0f3ef4cafdb1b92599f15ddee89b63dda4d9bb34f00851cae0a638b6bcb90b8ff8436902d37a92325b50048718d53b8caff3b16a2f
 EBUILD libxml2-2.9.8.ebuild 6533 BLAKE2B d3221db79de340179ff899f16848e2c2f4d472d7b5836d4251bfcc1abadb10705a8cdf711c15ce057869367b0b9581bfd5ec242029403d369906c8f41909f839 SHA512 4724cba5b6c9ab9db540c96ec7a87811695b272c339b0e4e2cc9248f548948b953372d7be025d5374d1979c522b3b532ffdced7a7e88fcf532d59ecb4c584ef6
-EBUILD libxml2-2.9.9.ebuild 6541 BLAKE2B fa7fe218f32a492bf221e4553ddde3ba366d31fa6fdf76271291bab32131679c9d983ee69bdc1f1a8d7229454a30c19a371bde77ecfc7bb1d23e96da99bf89ca SHA512 8974ef6ba82738b0c96b89f1e4ceebed0c6c9f1ef6c98a7df66b46dfbd1ad3053201b9c11670138acd974fcd35acc475252882c1fd65ba44478646db8fcf323f
+EBUILD libxml2-2.9.9.ebuild 6533 BLAKE2B c7d5198c45ae47005315b3fa8f7d266e5427d67984e03a458fc4702b36b8e8fb126920b8f117d2b3def425ce14a6946cc94a9388ad3f16b06372e599b61a625a SHA512 0c04c4aea4921da709a4f3f63c63c5e45d3e52a3b1380774e2dba0e1c2a31a7ca8981d1b8be179c4c8784d2bcf3018c44a94a57bf183e896fb5fff21e937686a
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.9.ebuild b/dev-libs/libxml2/libxml2-2.9.9.ebuild
index cfda0db42f5a..424522b36235 100644
--- a/dev-libs/libxml2/libxml2-2.9.9.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 769d60b1ffe2..5ab59959c9cd 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,5 +1,5 @@
 DIST libxmlb-0.1.5.tar.gz 82894 BLAKE2B 37918d06938ff2a33efbcca712c1424767e88e0a0471a6458f41d97a5004fc3c93be67e3a47f031186fe157ccc610de5101e254dca8a0e9fb2d908c4f466e418 SHA512 c396ff647b6c0d86c8a1cfa5926699c0d16e0d62ae29afc542bcf4a148d7c1daa9239636222dae04c1236553d09257c7440ac383efb8912bfa9ccd761f3b59bb
 DIST libxmlb-0.1.6.tar.gz 83399 BLAKE2B d4c1bb0d95863107bf71225317beb99cabf04e650087e08da10a14cdca2925566fad022123a86966cc8499fa30c89e47fbf7c521bb89b1d74d8636b0ae82926d SHA512 da9e36e97fa4335f21eefa74147676105924a760464647322a3f0a29ac13c815d692eac81b0ae5d47340eeb654989a7ddd2b83f686e5f222a48f749786a047bd
 EBUILD libxmlb-0.1.5.ebuild 891 BLAKE2B 59caaa4e69c05ed265fb19d2ebe1476c615fa0358c2da1c8a138e35cca84cf2f6579a4c9d1da57e9ad8c8595d8282e5e947571c68a2b939726b11c8dca2ba35a SHA512 f7ca17456bad539fd71a3be24fd3fc3f30fe2562a2fa41dfa38a1191249bb02832a042500c4a38b0f69c60e33f0af639a454bec6875ed628910f014c89bb1d37
-EBUILD libxmlb-0.1.6.ebuild 891 BLAKE2B 34f27e93fffe28465bdb955703e192f3337eafbd5fe6cbe3260afdd035406a642c116b208ba309f45449b61f6eab99d948d8210ef3880e17ec4f890eafb388f9 SHA512 6636fad0789ea13c0a1476a65fa204bdceec6b7967f811533afd11a9ae04b628ffd50bfcd91408913f8981a96a5fee559ad2eb5f4829d2a1ee61dcce76435a1a
+EBUILD libxmlb-0.1.6.ebuild 903 BLAKE2B daf92bc66015754f493d281f8746bcf7274621e84b51be1f7fcf9c643909054003b09e8c49a0ca57c63837b2b18994e51fc891ff34c6a9ecc06baa161244976f SHA512 24c96335ca8cccb1f3d1b008a8da01f59c90baec5227515a921c34a63c11b07d94ab9814e50c9044d1bfabdf035e2957ee6350b71fe3010af3b9d725593e8868
 MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.1.6.ebuild b/dev-libs/libxmlb/libxmlb-0.1.6.ebuild
index b56b6d247192..487a34f0da43 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.6.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc introspection stemmer test"
 
 RDEPEND="
diff --git a/dev-libs/mmtf-cpp/Manifest b/dev-libs/mmtf-cpp/Manifest
new file mode 100644
index 000000000000..02b85cd6f969
--- /dev/null
+++ b/dev-libs/mmtf-cpp/Manifest
@@ -0,0 +1,3 @@
+DIST mmtf-cpp-1.0.0.tar.gz 59363 BLAKE2B afcb03ce1f83e10348b148bd6218e5e10ab3e425b0f8105d292f9e265800ea6ca4562dc11fa4453df05d8a698576fba9dfe982aa91a8dcc1983480c0c52dbcf7 SHA512 0e502ae76e31689d440bff2fbc90fdab7ff62d5369e26f7ab2836966a30bda72625d6d5da33bc0770cf471a1549a02f7478ea16a01dd6be2809568d8daecb073
+EBUILD mmtf-cpp-1.0.0.ebuild 488 BLAKE2B 90715c22a9397a09f5bd1560cb8c8798a5aca61f170d16e6145978da9e7a6b62a436574831081d88d38d12c95646f3b281c16760b5f754fb0b07e830f628ae98 SHA512 f75008057df506661efa2d00e7734864137122c0ad70b9713ec268116baee2720cb6ae2c98c1da07c0418e807b18b0148334ace23bed239ec27327387b413089
+MISC metadata.xml 440 BLAKE2B 32f6bef1477efbfdb143b3082d1807c02a95a57cef7493fd5fa37536e1da36b1a9c51f0fba05c2a9e5182495984ed7acb522d88cb1481085e5a3bfe6a0f194b4 SHA512 edc4ea584e68df3c0b3131d2e119bd594d8f81f0d3126aa036250c70984e0f12f9c73b85190765985eeed381c89c95f74b7a9efb296aaca1fcee3472298c8f67
diff --git a/dev-libs/mmtf-cpp/metadata.xml b/dev-libs/mmtf-cpp/metadata.xml
new file mode 100644
index 000000000000..a213d5dda834
--- /dev/null
+++ b/dev-libs/mmtf-cpp/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>alexxy@gentoo.org</email>
+		<name>Alexey Shvetsov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rcsb/mmtf-cpp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/mmtf-cpp/mmtf-cpp-1.0.0.ebuild b/dev-libs/mmtf-cpp/mmtf-cpp-1.0.0.ebuild
new file mode 100644
index 000000000000..18b4c860d755
--- /dev/null
+++ b/dev-libs/mmtf-cpp/mmtf-cpp-1.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="The pure C++ implementation of the MMTF API, decoder and encoder"
+HOMEPAGE="https://github.com/rcsb/mmtf-cpp"
+SRC_URI="https://github.com/rcsb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-libs/msgpack"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index fc27e9bc91a3..7c291970b08f 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -19,18 +19,18 @@ DIST mongo-c-driver-1.3.5.tar.gz 5860804 BLAKE2B a55de56d285638f21caff06446e3c0c
 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
 DIST mongo-c-driver-1.9.3.tar.gz 7716783 BLAKE2B 9f5fc8cddbc1c4cf1f85016027e49d4c3bf2ebe50b1df45eda8569d48b88e174fe2c73e76f7afd4f3a36b74c5d02b826f55c610b8c4df273d8ebd4047e823edc SHA512 2c3f915c4f367f5614a904741b4b480896dd521b7039158b2f421d0d7579a45862d5099cd26b6d14cb088f9db49019538aca553c5cf72d9706ec9ab6516ff40a
-EBUILD mongo-c-driver-0.7.1-r1.ebuild 1265 BLAKE2B 8dd36363056eccf480098c353f77eb89c66e2be3e38568e97a6a92b0adef6c3887324df07fcbf10a81784e2508e2249a7131c6eb288ece61b6691c341a43a476 SHA512 eb9f7c198354e5daf80cccfc3cae0640dbeb5b748bd5e4bd9f9c94400ff56df7616c389234063c362a2dbe89d0bf8908593df06b68d4fb6bce4d350f795ccc94
-EBUILD mongo-c-driver-0.8.1-r1.ebuild 1204 BLAKE2B 1dcdd5945923fde34f50fba03998f88096e598e1f1cde394eab22a74ba1d537531e5365317383609dac5baa5932fde85ca5d426e03cc649b6ec6e2e5370474e2 SHA512 c66b8e7d836d5ca9845bbbb73ca643a74d2568c70ec9b08912b4b55bbfb08ed581579373f2c2443713ced62b72620b7462bfdc1cf7a9fda009f288d82305fcda
-EBUILD mongo-c-driver-0.98.2.ebuild 1818 BLAKE2B b42ebcdfb950ae5040b1d07e77624094768a2188b1e27b4bff2cb375a56deadf6995ccfcb3ca4dda5baaaf18c60828ffacfa3f3af1ebd937d33a66c179f4c563 SHA512 c6d2dc9d599f299cda55cd49e5722b48427b5255ddf40ddeee947e89a950fe8421ac7516b54d7a99a372d06a8379aca9a70c8ccb1c6f2da6a76528293057d3f4
-EBUILD mongo-c-driver-1.1.10.ebuild 1929 BLAKE2B a887abdec4b88b564c0ce1ea543bc9365a0f3bae6277bc2c31d77206054309af9cee440f924bdb7e45a9ae055093d201e5070d7d5291d20952e3b50e17ac2c11 SHA512 1f30065fc31742ad8a7c5f11b2ad69ac880deb79f0c32f834d584f8dfb00bf41e21416cc8d7fd7f6cf5e9198dda7eb94bec3ff51b53661bd6ae123b77e859c53
-EBUILD mongo-c-driver-1.1.2-r1.ebuild 1926 BLAKE2B 9d924e541fd57a5b87f406f898b05f8238786c46ce5119ed34652a82daa4bcf2e2b4cf80f6d79649cd818eab5e3fdb3d45f55de4457b5cc06ae6f28aee651ca5 SHA512 54a10290f998d2e8c634c2819e491cf108f92978e508ac08fe6eddc43bbacffd50c0620297d94e576885d58633e5f908c91806776c5f7dffa5890a9f3cf4ca5a
-EBUILD mongo-c-driver-1.10.3.ebuild 2191 BLAKE2B 43dba477bba4672c2846b940e30f87a1db9d22b20f2f8b333b73ca0903236fc10da2f5a2a022121b06d09f0037418eca3aad1f54ddc13e2813e9c64c8a4b665e SHA512 cc8ddbdfd8dcbb8ac48315ac880e7c36036c42ab87357661a1ba50caa375590371550415c4f4b4a934a65556549c5208fdaa565dd9b4fda143c26a650af82633
-EBUILD mongo-c-driver-1.11.0.ebuild 2293 BLAKE2B edd5b631add3c2f7813c82be5938141edc54ae59634b8c2ef8980f3b553551b340e01837006e88d9f30a2c0ab7c5f8865e3817ac126ed251b88386167594a59b SHA512 58baa8d3f4f66ab6cae3d4b27c9dab1fa0435b4d7f94169d32563c0f9e7bbdb479244e7ae09a8106a810e774bdbe975ae4a49fd4c5a166795a38a01f5283dc68
-EBUILD mongo-c-driver-1.12.0.ebuild 2340 BLAKE2B a9ac25791b3c66a7b9192bbe4ac3ec0274d191fdc4d0994bc223afa144d2159e83190c0f13d52454a8aabde00e4331fdb7cfcf54ae697afca1c967c5f195f8b6 SHA512 b0288069c8776c6d5ddc5953526dfe44911e0f88d4e6b0274577d9133370ada1c7679912fe53a24021b4d7b5f549f784560a73e6910e45a351787bee1bc6557e
-EBUILD mongo-c-driver-1.13.0-r1.ebuild 2425 BLAKE2B 2642c29314499b9d7ce9ace8e2e6e9f77027291c27165cabef037b75b67e7d39d22510d732067225e739bab14ea5f5bb9d46f414ce15b7542b281480b2710f81 SHA512 f24ad85612207b398b33f16e8b0847eadb1be134c7b8a578c0024ad9741f75703238abdef2143bc1247fa3da98571d14842a6c71d64ca28df4da7ba054d82965
-EBUILD mongo-c-driver-1.13.1.ebuild 2460 BLAKE2B 5580dc2a2830d54b61178506bad90b64e5394288835f981ec0f90e93b8a921dde8a403f1c901b2316bc81e2e2b1d6fb1da493e2ee7f1a101a7de536a8e2035b1 SHA512 4aed11c176045f0a8c6a3b2a6f50dce596646ec5c530c4a929f26678d7bc4b6ec14e0fb29c53e960397b3edd1db3c4982e2bbf56a17ef6fc46ef6defd6f76a66
-EBUILD mongo-c-driver-1.3.5.ebuild 2149 BLAKE2B 773a2fb9a1e5365d77f9bb0351524331e319bc740623ead4bd779706565c2dba71b20f31752e31313fe75eafc052165b638d6596d46d5a475793274f0175a855 SHA512 86d0292f1d2a4bed46a7b0ef7d68d2f1bb1b18aef3bf60210054d59a020603f8c89a130d835284bad3c4cbb62703bbbd408ec125f386b199ad4868a7787c7fcd
-EBUILD mongo-c-driver-1.6.2.ebuild 2089 BLAKE2B 0e49a73628df5df2ba90627ae42cb553aa4c593fe7b4b68f5b06ac74149549e395658cd075510f5876072f39386e6c5da8fd060d42cbdd4f816271514203913e SHA512 df452c236e0c8db8aa5404ada5a33689b892a10628c83cdd09e8db58a527ce8073de62a6e8747a231787ffc2089ecd5ff4a8fdfdba51e0b64ca3ee2618cc900a
-EBUILD mongo-c-driver-1.8.2.ebuild 2150 BLAKE2B 1ff46d08933c2d525b4dd60cfbd1ba4c3e8183cea11923f3b851b9fe1e0b25bdaf1d08e70f68a3dde383ff4ee7ca9127ea0cb7d0ac011c4aac2f42f46dd4a6f8 SHA512 55338086d4a8c91527f62758b153031751385b975eec7b8dc35a0d07132eb8120b4d0ccf8cdce419f4623ddb8b7deea62556dd7c9c41ad8a01abf04bad6869a9
-EBUILD mongo-c-driver-1.9.3.ebuild 2153 BLAKE2B d6abb8f98f741dc893ad46c50b8ff92f7f151b83ac402bb07c5a3335f648c04eafa26e85f4f9dceaa3bd2a89e96df4d673f755135fd1e31cd03a203ba4643193 SHA512 75657ac140fc3aeac90342be78a18e999f62813a5ac0dd6de782c1ab603e7b602c2d6351650563d95113d9d936413178650bcdeac66d6774255708a6e4d025d7
+EBUILD mongo-c-driver-0.7.1-r1.ebuild 1268 BLAKE2B fb31f03aaadd1ae781d0a61724de4d2a829f2502084e7ff0a58c01ca459b5eb6ec36d0e1b615e078bc569c0e1caf820011c5cf730a91e4680a37e05407396aeb SHA512 374908c70bab6fd56b24de7762ccead366a06354b5c0ec7f0d47126bb74b040d8f8628927fa295f3e3b2b7fbf4abd6783d71ea02885648818804c7d677983a64
+EBUILD mongo-c-driver-0.8.1-r1.ebuild 1207 BLAKE2B 30cc1e8458715268163499488bed324e0aeb525941c7a19b8b06799aa21af93e17209afeb5485624511eb12c88cd145808f475925b4374b978f2a28099bfdb12 SHA512 00ac5c82565e5cd2ebc3442acf5a32160119e4c64229647982087b564b3d1866f8e3ab96d3136c351180603b039f0450e79c406c7c0c37e0f50388fb79effdde
+EBUILD mongo-c-driver-0.98.2.ebuild 1824 BLAKE2B 99d9288936eb903dbd2cc1da9e53705155d3c61f341091bb29c6378449b6723a8ec0b40ba5fc0515078b4dcb8e5e05a7bc75c6375a71ec99d32a952e266d80bc SHA512 68c687bf962ab771dea6744a8ca42fde228c56f731647f0f51367c097384956cb197c148941e75910a672ba9ec8aad29bccae9fe47ae271a20a10fb63a3e8329
+EBUILD mongo-c-driver-1.1.10.ebuild 1935 BLAKE2B d3330c54bc9a5bd7c577689cbd13e6a798eab413c4a4854216e4a1e70737c640d1c2e7e1e8c9d236adeea361c013666525cf4d207abad431a817f7e0e5626340 SHA512 09b3c7ed91d2cb00003f4a82b419f9b7be24ba9cc872aa3c2fa60c0981809f898070651bd38ef386416c4ad7e826e8644845ac85195d9c8d1965ba738f931958
+EBUILD mongo-c-driver-1.1.2-r1.ebuild 1932 BLAKE2B d38adcd13b644648cbbe35b289abff6be2ffa5fa387554ebb5dbd11f36043cc45c4e8ef6ce8fd70d0bb4de75cc9ed67961d7c53f1ec9d3210d66a53dfea250ed SHA512 f2987ee6a57582ae24ac3391e64b54f9eb6588fe2e667524f2d57f774c1b6624cd51ee5ec1380bb9de102f700b113d396d771f2e214a56052c9d0956d1a2c19e
+EBUILD mongo-c-driver-1.10.3.ebuild 2194 BLAKE2B 1b645037e88c559fbcb8e601f6b130837c8518c7877366c8461257cd5cf134f85981dfa0b84319cc8b0e2b3ab116b87844cec0b55421f4bc6754c96de0076dea SHA512 c0018403f359d7cfe8bedc6f75a5a1bd7963a7aa7b83be3252264a83778304184d22e50214d0790c60cb25bf1572c8db4b0e016534d8c0f24b8374f69115787a
+EBUILD mongo-c-driver-1.11.0.ebuild 2296 BLAKE2B 58e82ebbbab0773a1a261f25de8bffca05bf0df6f0ce2df46df9e6729ffae59d75a5194759dddf0e77771a56c5a6b1ef284aadd1a7cc8eb73743413677e6fdc0 SHA512 80e4d8c5b0a153776564ed9049e5ac295caf431529acf1614f5d3bd65cfb8adfb4bb0f585b81652bcd43eea06f61eddf73df3742826b1be485a995a95ca2f99f
+EBUILD mongo-c-driver-1.12.0.ebuild 2343 BLAKE2B e711508f266ed482c496fce0f593e62ef692522565dd36472591b97a7b3b8f5e27e6c7fed0b5f29401a14f9cb5aafc0959289f481c7ee1f09634a274f7b107fd SHA512 a54a2343caf467d59f7b5460e8c1865dd6f44f327542d535a5eaac7ad6a3bd59c2e30466dd584c7f6165ce195ba35b5e655a7c8349fbdb8b01deb5af3229efa1
+EBUILD mongo-c-driver-1.13.0-r1.ebuild 2431 BLAKE2B ca1cb9c45b3e7b5a78763afbdd0e4105d6eb1d2c60e647081923fcf5c460b9b56568ee2e47dbcf743cf5d15870091546981bb7f68c5903da46c40849d948cae7 SHA512 8cb7d48ee5d1f1a7bf66042dc87ebe685db83b96b8ffa107d72b1faa5b9266b139810e3cb9cbbd3dbb1d3b752b87bb8dd810f43a5ac02dee5c16af6f9784c7c7
+EBUILD mongo-c-driver-1.13.1.ebuild 2466 BLAKE2B 8f5e8d47c5e0b69876f6701986d70c3db75b6e4d28a817f3e880aa630eef6e1eb8307bf91bd98fc170aaee702aec9e8961058d83cae0d009457213bc1088fcc7 SHA512 2c2cc1f028ddcd1b93227a8022ecd47655aa43088ba8e4f5d782a31cd5122752be80d6904d85353c92cde040fae6f5333ca91e1fe678a3ed1bdec4b7aeee024f
+EBUILD mongo-c-driver-1.3.5.ebuild 2155 BLAKE2B 45fe20fe538367ac6005a6029fe2607be500aacc9558cf24bc16931bb6eaf5629f8b7d6611ff745876707d04a30776604b09a73b7d09d2dbe8ed8c9f7347aa04 SHA512 a80ee2ed4231f6da38f4cc812258efbc768e4ad3c0b2632aa8fab30a25361dad4ed4a9ec98c4ffab05ff0976e0b85a5c1080439ce8899bfec42c5ebef8ec59ff
+EBUILD mongo-c-driver-1.6.2.ebuild 2095 BLAKE2B 25dc744ab32604d799ed4af21a2495ae146920b93ba8e8cbd318e2b912c94903514631c592e493593e7b5b2e629b77aeec2cc44bc718a6a794a3921a9f581a9e SHA512 f75d4ff29770a6ca306a8414d29f23b90d3dbd56e9a897d51baf6eabb9be19fdf247eb0804989d1052079a01f55b52086921fe24152ab45ac53ca5f492c0efc7
+EBUILD mongo-c-driver-1.8.2.ebuild 2153 BLAKE2B 404dd02861d6acad7d2622254759e817e3d993a540cada00576752fc688120532cc07e9ed934da403337bc829baaebd6de0eb1b2d50b73bf7305eabb33c17c5b SHA512 172a89e04ea99583b7587949dde56b1a79ed7d5db00897ada797fefb6d8e8a94338ea4e4b00ad2792275a241468158e055832a783f018f9281023e0f37e76619
+EBUILD mongo-c-driver-1.9.3.ebuild 2156 BLAKE2B d1914470e4f400405e5f71dfd87da5c5398ab300fdc96deaa613339bb9bb57704a35aa64d02b061466bc7556207c83075e5d5db51f5cdfab16316695dd0820f7 SHA512 94868f5dd9f0aa99bcc9a098173e2fd1f044965da48daa286dc5dfce69cb791d8de7c411c0ad506e09c55225cc67b05da3e569884ef7fe324b237255735b0b63
 MISC metadata.xml 334 BLAKE2B 7e10c3396a8bf28586240a95cc10a42de507d995b9f67dcf3b016cd586a973ce7478fe3974188dfb215123c8ca7188479d0d5be46ebcbb6b7790472f4e6ce225 SHA512 80ff1ae78c264618a7d5253d80ea5f4d1a15a568d5215d03dbe3062a591ec1c99d6625feff3b7baabe314bb284b5e5340c873b8846d05fd932f8cbc78df00d34
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-0.7.1-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-0.7.1-r1.ebuild
index a9d4a7907801..3530dfaeb047 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-0.7.1-r1.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-0.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/${PN}/tarball/v${PV/_/} -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86"
+KEYWORDS="amd64 ~hppa ppc ~s390 x86"
 IUSE="doc static-libs"
 
 # tests fails to build
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-0.8.1-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-0.8.1-r1.ebuild
index 495c4072b100..846ae840b0f7 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-0.8.1-r1.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-0.8.1-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="5"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/${PN}/tarball/v${PV/_/} -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="amd64 ~hppa ~ppc ~s390 x86"
 IUSE="doc static-libs"
 
 # tests fails to build
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-0.98.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-0.98.2.ebuild
index c5f0ca6a8576..73a6478fd07c 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-0.98.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-0.98.2.ebuild
@@ -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="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~s390 ~x86"
 IUSE="debug examples libressl sasl ssl static-libs test"
 
 RDEPEND=">=dev-libs/libbson-0.98.0
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.10.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.10.ebuild
index 2af17a8e308f..e7ca688a3cd1 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.10.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.10.ebuild
@@ -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="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~s390 ~x86"
 IUSE="debug examples libressl sasl ssl static-libs test"
 
 RDEPEND=">=dev-libs/libbson-1.1.10
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
index aa9e3818623a..46adaf6e0c40 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.1.2-r1.ebuild
@@ -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="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~s390 ~x86"
 IUSE="debug examples libressl sasl ssl static-libs test"
 
 RDEPEND=">=dev-libs/libbson-1.0
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild
index e2009f3e717e..e9641be05a99 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild
@@ -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://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~s390 ~x86"
 IUSE="debug examples libressl sasl ssl static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild
index aaa06162f886..9555f7a1f3cb 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.11.0.ebuild
@@ -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://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~s390 ~x86"
 IUSE="debug examples libressl sasl ssl static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild
index 06783997aca2..8b1af6b106f7 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.12.0.ebuild
@@ -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://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~s390 ~x86"
 IUSE="debug examples libressl sasl ssl static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0-r1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0-r1.ebuild
index 33fa57718039..78ede21f8526 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0-r1.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="amd64 ~hppa ~s390 x86"
 IUSE="debug examples icu libressl sasl ssl static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild
index 7e327de1bdc9..9c37da616632 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.13.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~s390 ~x86"
 IUSE="debug examples icu libressl sasl ssl static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.3.5.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.3.5.ebuild
index 90f322d03b42..e48c6b583445 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.3.5.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.3.5.ebuild
@@ -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="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~s390 ~x86"
 IUSE="debug examples libressl sasl ssl static-libs test"
 
 RDEPEND=">=dev-libs/libbson-1.3.5
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
index 841127cf7d9e..b637d1e84498 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
@@ -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/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~s390 ~x86"
 IUSE="debug examples libressl sasl ssl static-libs test"
 
 RDEPEND=">=dev-libs/libbson-1.6.2
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
index d034808158e7..beb5282faaf3 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
@@ -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="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 hppa x86"
+KEYWORDS="amd64 hppa ~s390 x86"
 IUSE="debug examples libressl sasl ssl static-libs test"
 
 RDEPEND="app-arch/snappy:=
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild
index 8c5b2194c35f..825f4a506112 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild
@@ -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="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~s390 ~x86"
 IUSE="debug examples libressl sasl ssl static-libs test"
 
 RDEPEND="app-arch/snappy:=
diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index 4c2a89a7c12e..ee0e3c36e182 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,8 +1,3 @@
-AUX respect-users-flags.patch 762 BLAKE2B ccce0e60b4f3edc18b5fb58215f6f0cd677a91db470a48e67a996f1ce6ba622f2cddb8e84e7ee756c3cab9da167b3fba6cc4e46be874d06887028bb778c07004 SHA512 31cae98c5802e2802df7e6a90275b28a14c1c0c453e456a40ddfb66ce418c34eae8a32eafb3579d4dc7622670f12381232e2ac1eedd1a0509198e691c18e0349
-DIST mxml-2.10.tar.gz 265398 BLAKE2B eb3edec5615d727dec9285e2b74f4c877e8332be8f8183483e85a91d92ca1f48e5fc6d06afa3650c133c9762998abfdc8e846a9961ce55251d0c5bbcba0a970f SHA512 c3838611979c4228df476166e4e987fc1ff8f9b8bd30139066b475dcd99e25be81ecc5171235bc80b1c2291c9d78c9ceae9a1dfc928272a983740d6a67372f5c
-DIST mxml-2.11.tar.gz 9164003 BLAKE2B d124b7d779e7ea9609a91b823fe7f6b45ab4049e79eb72729ca2ffec93a83479d5fed1ef21efc76881a11de58be71b1f3de79fc3e4f07c26f35d3f68e25c017b SHA512 046421f91eea16f0ca99fbf611891c367ea9c3c54d04080d08acf108d7749ad9bbf2f4b3ef234a5130f00f77618196e2c5a245f32230daf645c1f775e961d378
 DIST mxml-2.12.tar.gz 9112072 BLAKE2B 29e63abdd567c76209ca41adf608bd752863cdb2911d5bda482a2c6ac50ccdae2179941a3899d7e58480bab8903fee8a6c431619072d2861acd01f18d0eeb9e5 SHA512 49233a0087f3ef73a01ef71bb79511af36bb72027e3d9f6df919385e9ff0b03a489a3ccc590941bc4af1f558f82b2ed9bf8ff641863300a7791ce6dddfd56e77
-EBUILD mxml-2.10.ebuild 1284 BLAKE2B 9f29bdc742076d837d79c979298c8ca50c760c6680333ec7abb31e8be92429b0c4434c1169ad0c2a2886aeafd6efae4ff9abff26c6ec1be1d1f5470efee96b73 SHA512 2dbf597eec60cb1226b374335b9ee372d82f5823aec2e973c30f300b12449f8798bce538b2623db367e9d264e2de8823abcda3192171b762c65267efa18f4230
-EBUILD mxml-2.11.ebuild 980 BLAKE2B f0ef58bc339a064dee07e6d2ccade2932d48cbec80c2e61d5a53ef04dc972734986a16f9e549a05d511b23d5c0125d16c1d03a846d7cc4e11022aba523a3fc99 SHA512 40d366403f141c5c83b59303767bf4c248440080bc3fc7121dc9196998dc1c8585220792aeb1cba7b4d6dfa151b97cd82a83df3dcf6f53d2ff1a04cb6a513717
-EBUILD mxml-2.12.ebuild 1400 BLAKE2B 9f02e7fac97797b1866e3ecc1a2a332eebbc66ebfaee303ab5761a040b74d1c1a5b8acdc9d748fb226f5d215454a978cf9b2cc347302f700827ce2a7b3cfdd60 SHA512 cfe87d131c9c045465b42ae196db9c71358bbd46a14e181d0f4c68acf7bc2ccf452ea4c7853d043db1ae26e1031613e8c0a26c5069956307ca778f2c30fc61d0
+EBUILD mxml-2.12.ebuild 1399 BLAKE2B 45f9336f240800aedee82bc14eae8aec5981235d577f72075a77885836fa0a7532d0970c4e58047081f22cbeccaf5752f1242e19195c04c73e6612c7df438b0f SHA512 c9b7c017c4d7b069e377ab2905c1aa5e444754d9cac89b4486c13dfbe8d702d8a5e4a8e209450701a98ea39694232408dff59603ea3370964905611e8f38575b
 MISC metadata.xml 1498 BLAKE2B b0ff99450cec828ef5614c2b3819d02cc97e402b60ce7b9bca20962166c47a9e3053e2457eb7b29210886aa7b0297e97340b55cf74a0aabc20ecb4c451d576c6 SHA512 5ead3d76daa42879139a96cceb0a12a84a23df8372a8e2e9e9d1e38ede0266b480ca404f03047f4e66ed7d989171d37333051e2a111dfa0900b9cbba703b22d6
diff --git a/dev-libs/mxml/files/respect-users-flags.patch b/dev-libs/mxml/files/respect-users-flags.patch
deleted file mode 100644
index 90e49cf2198e..000000000000
--- a/dev-libs/mxml/files/respect-users-flags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/configure.ac	2017-10-28 18:23:11.000000000 +0200
-+++ b/configure.ac	2018-07-13 23:29:39.710622168 +0200
-@@ -255,7 +255,7 @@
- 	CFLAGS="-Wall -D_GNU_SOURCE $CFLAGS"
- 
- 	if test "x$OPTIM" = x; then
--		OPTIM="-Os -g"
-+		OPTIM=""
- 	fi
- 
- 	if test "x$use_ansi" = xyes; then
---- a/Makefile.in	2017-10-28 18:23:11.000000000 +0200
-+++ b/Makefile.in	2018-07-13 23:27:51.101622582 +0200
-@@ -67,7 +67,6 @@
- # Rules...
- #
- 
--.SILENT:
- .SUFFIXES:	.c .man .o
- .c.o:
- 	echo Compiling $<
-@@ -271,7 +270,7 @@
- 
- libmxml.so.1.6:	$(LIBOBJS)
- 	echo Creating $@...
--	$(DSO) $(DSOFLAGS) -o libmxml.so.1.6 $(LIBOBJS)
-+	$(DSO) $(DSOFLAGS) $(LDFLAGS) -o libmxml.so.1.6 $(LIBOBJS)
- 	$(RM) libmxml.so libmxml.so.1
- 	$(LN) libmxml.so.1.6 libmxml.so
- 	$(LN) libmxml.so.1.6 libmxml.so.1
diff --git a/dev-libs/mxml/mxml-2.10.ebuild b/dev-libs/mxml/mxml-2.10.ebuild
deleted file mode 100644
index 2406db40c704..000000000000
--- a/dev-libs/mxml/mxml-2.10.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Small XML parsing library to read XML and XML-like data files"
-HOMEPAGE="http://www.minixml.org/"
-SRC_URI="http://www.msweet.org/files/project3/${P}.tar.gz"
-
-LICENSE="Mini-XML"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
-IUSE="threads static-libs"
-
-DEPEND="virtual/pkgconfig"
-RDEPEND=""
-
-src_prepare() {
-	default
-	sed -e "s:755 -s:755:" \
-		-e "/^TARGETS/s: testmxml::" \
-		-e 's:$(DSO) $(DSOFLAGS) -o libmxml.so.1.5 $(LIBOBJS):$(DSO) $(DSOFLAGS) $(LDFLAGS) -o libmxml.so.1.5 $(LIBOBJS):' \
-			-i Makefile.in || die
-	sed -i -e 's:OPTIM="-Os -g":OPTIM="":' configure.ac || die
-	rm configure || die
-	#eautoreconf
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--libdir="/usr/$(get_libdir)" \
-		--with-docdir="/usr/share/doc/${PF}/html" \
-		$(use_enable threads)
-}
-
-src_compile() {
-	emake libmxml.so.1.5 mxmldoc doc/mxml.man
-}
-
-src_install() {
-	emake DSTROOT="${ED}" install
-
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/libmxml.a || die
-	fi
-
-	dodoc ANNOUNCEMENT CHANGES README
-	rm "${ED}/usr/share/doc/${PF}/html/"{CHANGES,COPYING,README} || die
-}
-
-src_test() {
-	emake testmxml
-}
diff --git a/dev-libs/mxml/mxml-2.11.ebuild b/dev-libs/mxml/mxml-2.11.ebuild
deleted file mode 100644
index 6a58f55a52bd..000000000000
--- a/dev-libs/mxml/mxml-2.11.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
-HOMEPAGE="https://github.com/michaelrsweet/mxml
-	https://www.msweet.org/mxml/"
-SRC_URI="https://github.com/michaelrsweet/mxml/releases/download/v${PV}/${P}.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-LICENSE="Mini-XML"
-SLOT="0"
-IUSE="static-libs test threads"
-
-DEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}"
-
-PATCHES=( "${FILESDIR}"/respect-users-flags.patch )
-
-src_prepare() {
-	default
-
-	eautoconf
-}
-
-src_configure() {
-	local myeconfopts=(
-		$(use_enable threads)
-	)
-
-	econf "${myeconfopts[@]}"
-}
-
-src_compile() {
-	emake libmxml.so.1.6 doc/mxml.man mxmldoc
-}
-
-src_test() {
-	emake testmxml
-}
-
-src_install() {
-	emake DSTROOT="${ED}" install
-
-	if ! use static-libs; then
-		rm "${ED%/}"/usr/$(get_libdir)/libmxml.a || die
-	fi
-}
diff --git a/dev-libs/mxml/mxml-2.12.ebuild b/dev-libs/mxml/mxml-2.12.ebuild
index d9b49ee68499..1944085d2527 100644
--- a/dev-libs/mxml/mxml-2.12.ebuild
+++ b/dev-libs/mxml/mxml-2.12.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/michaelrsweet/mxml
 	https://www.msweet.org/mxml/"
 SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
 LICENSE="Mini-XML"
 SLOT="0"
 IUSE="static-libs threads"
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index afd3dc9fb8c7..7e128cdd486e 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 978 BLAKE2B 4a07a3eb8d1d61f09126c71b431e3dad423febc29dcd8434a345931c17469e4530214c8dbc0e96fb8980955606daf4db84be0fdf17a08b78ce1842e7b627f357 SHA512 94fc81c18f9c908b6fc743f7df96f2702e708be2a2dec1eb9d8baba527f5d6e6db2444c57120fd898fe88974b34e71bd66a438a1ecb95bc9ff3f9d138c7f96d3
+EBUILD oniguruma-6.9.1.ebuild 971 BLAKE2B 5fc530a540c1d262fed4465a7adbad19c8b3bcb5a26e2d0fbff8b4328d8cf0f5aa9262b2aae4ff4d6697d2cb2985a8957f9b11952139f025a9a80ddbfca9d7db SHA512 1f021715fe0bc6bee214bfedf7ccdd713a01a8bec620811e435ae64415ca44066449d43211d704eae2c3901402752510b1464f9062708d891ca1a6700c6c4eed
 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 c37d24a66105..aa19f4b6e8ab 100644
--- a/dev-libs/oniguruma/oniguruma-6.9.1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2018 Gentoo Authors
+# Copyright 2003-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -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/openssl/Manifest b/dev-libs/openssl/Manifest
index c99ab5fa009c..4b957780b4fc 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -7,20 +7,17 @@ AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162
 AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2b8dbb9a7ea63a816d3a5de544fbffd8b4216d7a95bd44e718c7a83dd8b8b5ad85caed4205eab5de566b0b7e5054fc1 SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c
 AUX openssl-1.0.2p-hobble-ecc.patch 10875 BLAKE2B fc8240a074f8cc354c5ae584b76b3fc895170e026767d2d99d8bd5e5028614c861dd2b3c7b955c223883062f9a057ee302ae0deecfbbed00ddc53ae8a4d50919 SHA512 29f64bacac4f61071db6caf9d92131633d2dff56d899171888cc4c8432790930ff0912cea90ad03ca59b13ca0357f812d2f0a3f42567e2bd72c260f49b2b59aa
 AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828
-AUX openssl-1.1.1a-fix-a-minor-nit-in-hkdflabel-size.patch 1072 BLAKE2B cb1cc03561193fbf8686b48d544d9dbf4674ca8b514e6ff5a569001667cd4d02331acf1b8c2bbc2d85232e43e0898470369d69dab3f70580825f5a10000d7058 SHA512 3ae6ae44e9dba31e2aedecc6be635e627e81367abd7f537deca90919506e2004379b7f954a0df1187a03e21509052d232daf2c657d68b1e7e3000b94e48903b5
-AUX openssl-1.1.1a-fix-cert-with-rsa-instead-of-rsaEncryption.patch 3928 BLAKE2B e91a7fd153622e92acab16cdcb19d933398a685afe8d7bbf53090986bd263afd64c9ea23c57dee0022423ca4b8e08f8121791b4e1f6f00e47cf7f2440ac93228 SHA512 c7e59cccece9a60658bdad4efed193c69d14f8b2a9a515845b24adf9ceeba3039c8fef9aa474f33688a4ff3395a4013de5ea4a56bd4787b59a66ed4d388bfcec
-AUX openssl-1.1.1a-fix-some-SSL_export_keying_material-issues.patch 19341 BLAKE2B b8d36862f26f17efda5025ca7e0d12d4438f431235f66419a621eb6ee62bbe4b4bc6719d2aeaf249c37f53e98bba30177990f1f1120b6728597e99129711845b SHA512 61ac466583fbf324abdf73332580fd2a4e5d86d30f51d1363aaacf5305af8d7fe0cb40ba6fdeaa94c388bb2f37c2e489b17e05473258e7f69957f31d8a25261f
-AUX openssl-1.1.1a-fix-wrong-return-value-in-ssl3_ctx_ctrl.patch 957 BLAKE2B 9b059003d4b77c7d1479841d003c61ac51aaed6096877fc1e787659c11cd9bd0d2375154666477151bbf0dd707ded874c9341d9ede191ab2efc137acc6ba36b0 SHA512 e78cd97444b85a879af428efd7203ac8ada44b5d5c915b3b842b4c97574056e1678f1030521299f3ffa18d589b7e0494a3a3114c2f9c57d2763590d60aac9d56
-AUX openssl-1.1.1a-make-sure-build_SYS_str_reasons_preserves_errno.patch 2181 BLAKE2B 28b1185b5502cbfaf7ae1a74d02389bcf5a651a5c20ad7c0f109d06a4512e34db333bc8e9457ebbc6f7d90b54b885f6473e9440f34d8cd96d6b6bedd1b61705d SHA512 b24347811c8723c6bf5ab2c0a15bb18a57b4a54889fcd5feda8bc7bce3b54368ddcbb2b10b0052a6f4f460e34054bdfda2c49f88109f66ed2eac0780560c284f
-AUX openssl-1.1.1a-preserve-errno-on-dlopen.patch 1639 BLAKE2B 9c900dfd975a3446931ca4c7e34030eb8c3be2ce8f11c737cda627f3be2443ba8c31ffe73cc1c60a64d267aeb5c9023cfd62913fab96f0077c045828a870ee15 SHA512 a0bd5656890626d836ce8c9a09fba8b631504e13eb8844e56a493804bdf129cbba010a1b3905b8493960eb7441d531810f732663b61d6e61f79bee3df311d0c4
-AUX openssl-1.1.1a-preserve-system-error-number-in-a-few-more-places.patch 1665 BLAKE2B 12c117f85fdd7e27c5af5be8a87627d0adde280be49a64fe4548e7b204f78568ff7e40ced76156d48f72a847034724f3191b669a81b30d3f62d35ffd026a1317 SHA512 67c095262ffe1a8d570510ebe4ae84adbd1db1d5b5b9c29ebfb8bc10174a32cdb6f43a123eade7cde03a9fd301a289d98636b5793887c866c07342cfc5ba4911
-AUX openssl-1.1.1a-revert-reduce-stack-usage-in-tls13_hkdf_expand.patch 2171 BLAKE2B 6d1491a337eee20608f08f9a2338d84d1f7ba091feab614cb3c2660e6bca9df7c4b3d71eb6850a50f9a26003763241307c9bdfc8c91babe022a7d177f14951fa SHA512 c7667572a7171380b987ed4befd8012d130cab091b843b8260e1b7f4c880492ce8dd83cc1d4eec9b3dde348f1b8a7c04e9290dcb8c4e2190de54f8bd57f2c440
+AUX openssl-1.1.1b-ec-curves-patch.patch 6841 BLAKE2B f62865ec0cdf246b2b145466b775dbba086ddc4e7066358956e8a5de8a3070634ef2186ff84df2a277d92eea2c3e78ba34a96119db21617e559f3ce77c131727 SHA512 1eb6419b7db282d37b2c84f4425952db833677c67728ac6070b64c08cb5fcac4b32a1fa880d8a6bb2151fbe5afc7920d6ccbb9b8bd43a610e907c5cfafb74f94
 DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2q.tar.gz 5345604 BLAKE2B c03dd92de1cc8941a7f3e4d9f2fe6f8e4ea89eccc58743d7690491fc22cc54a9783311699b008aeb4a0d37cd3172154e67623c8ada6fc8dde57e80a5cd3c5fc1 SHA512 403e6cad42db3ba860c3fa4fa81c1b7b02f0b873259e5c19a7fc8e42de0854602555f1b1ca74f4e3a7737a4cbd3aac063061e628ec86534586500819fae7fec0
 DIST openssl-1.0.2q_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
 DIST openssl-1.0.2q_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
 DIST openssl-1.0.2q_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
+DIST openssl-1.0.2r.tar.gz 5348369 BLAKE2B 9f9c2d2fe6eaf9acacab29b394a318f30c38e831a5f9c193b2da660f9d04acbf407d8b752274783765416c0f5ba557c24ee293ad7fb7d727771db289e6acc901 SHA512 6eb2211f3ad56d7573ac26f388338592c37e5faaf5e2d44c0fa9062c12186e56a324f135d1c956a89b55fcce047e6428bec2756658d103e7275e08b46f741235
+DIST openssl-1.0.2r_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15
+DIST openssl-1.0.2r_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19
+DIST openssl-1.0.2r_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e
 DIST openssl-1.1.0-build_d2ede125556ac99aa0faa7744c703af3f559094e.patch 3001 BLAKE2B 8f0ac4be6409b4ec50bec171697da2aebe2688e8ae06bd0dfac8b0c74661d38ebeb0a12bde0ef941b213eee9b85965262213b140636060285dcfb02a3bd14961 SHA512 ec6710e9669ac19e4c6f1286c89a383e7d276a773a2740037f98a8f2dbf18305614e7d30d9ed530923a0e7d10a3776fea2ca77229adc25df13ecad55589a3673
 DIST openssl-1.1.0-ec-curves_d2ede125556ac99aa0faa7744c703af3f559094e.patch 5311 BLAKE2B e9ec985adf6f13eb04412158a05da7cbe10be7d64bce73b899152ea379336ece7b7069089ef46993ac301ef850fd46fd0352898e249b2ea9fff5baf20896e5b5 SHA512 c38c4b05195f2b323a07efd8d17335ba2a168a16a59d7941da36568081f1c043da8d2216b7084b0617963635ded9bafeee736ecddbfa251cf0a02e4cba64cdc8
 DIST openssl-1.1.0j.tar.gz 5411919 BLAKE2B 0fbd936f38d30b64bea717a67cd59704c5ce44ee19f377a820f89ba66b9e0a7509cf39e0fb00c104ae6440a6bd811e388239b458ffe685d8601235bab2afb2f1 SHA512 e7d30951ebb3cbcb6d59e3eb40f64f5a84634b7f5c380a588d378973f1c415395e3ab71a9aaff6478a89ec6efcc88f17f1882c99c25dcd18165f1435a51e5768
@@ -28,14 +25,14 @@ DIST openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_ec_curve.c 18401 BL
 DIST openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_ectest.c 30688 BLAKE2B 6673ef0fd139af82d830794179b19b9e06be25fac4a13b8bdfa5fd5dad25f594ce8eab118aab9ec2aab25001e1de127c03f8e1a04f4f3ef4c464b7fb1811ed4a SHA512 240fc72916caf4a8b0af774ce307abfe9a93a762eba6fae760cec79d619fe3db0d6919fc92a8951cb031f73958237700b45f590aa7f9f2890762cccda1f1e74b
 DIST openssl-1.1.0j_d2ede125556ac99aa0faa7744c703af3f559094e_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
 DIST openssl-1.1.1-ec-curves.patch 7265 BLAKE2B 04725d226c430132cf54afbfaa30a82f8f8bbfd3608823d1d0cd42c3c13f417e90762759da3134d7b0c4373e531925db337b681340f2f284cb2f16a4caef22e3 SHA512 de4d0f1635740c57217836a476c420141c0d34a5f90cbf7957aed7a80e7ac9ca036de2d8448e6bf4c122999e308730575899f61cea6e51ab6825dd04890d75a1
-DIST openssl-1.1.1a.tar.gz 8350547 BLAKE2B 71dae2f44ade3e31983599a491b5efe5da63bbe4f32a2336a8022b282f844a9d898f3b1c3fa825a5973cb16898e8e87fcd73d68e9b602b58f500c3f3e047b199 SHA512 1523985ba90f38aa91aa6c2d57652f4e243cb2a095ce6336bf34b39b5a9b5b876804299a6825c758b65990e57948da532cca761aa12b10958c97478d04dd6d34
-DIST openssl-1.1.1a_ec_curve.c 17938 BLAKE2B d5cbde40dcd8608087aed6ffa9feb040ffadecf0c46b7f3978cc468a9503f0a5ad0a426ea6f8db56f49a64474a508bebdf946e01ebf09adc727675f3b180bcdc SHA512 ec470f6514cb9a4f680b8cbbe02e2bbe71639b288f3429d976726047901d9c50377dfb2737f32429da2fb0e52fd67878a86debb54520e307ee196d97b5c66415
-DIST openssl-1.1.1a_ectest.c 35091 BLAKE2B a9602255ab529751c2af2419206ce113f03f93b7b776691ea2ec550f26ddbecd241844bb81dc86988fdbb1c0a587318f82ce4faecba1a6142a19cf08d40fb2c5 SHA512 7813d9b6b7ab62119a7f2dd5431c17c5839f4c320ac7071b0714c9b8528bda5fda779dbb263328dca6ee8446e9fa09c663da659c9a82832a65cf53d1cd8a4cef
-DIST openssl-1.1.1a_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
+DIST openssl-1.1.1b.tar.gz 8213737 BLAKE2B 7ad9da9548052e2a033a684038f97c420cfffd57994604bcb3fa12640796c8c0aea3d24fb05648ee4940fbec40b81462e81c353da5a41a2575c0585d9718eae8 SHA512 b54025fbb4fe264466f3b0d762aad4be45bd23cd48bdb26d901d4c41a40bfd776177e02230995ab181a695435039dbad313f4b9a563239a70807a2e19ecf045d
+DIST openssl-1.1.1b_ec_curve.c 17938 BLAKE2B d5cbde40dcd8608087aed6ffa9feb040ffadecf0c46b7f3978cc468a9503f0a5ad0a426ea6f8db56f49a64474a508bebdf946e01ebf09adc727675f3b180bcdc SHA512 ec470f6514cb9a4f680b8cbbe02e2bbe71639b288f3429d976726047901d9c50377dfb2737f32429da2fb0e52fd67878a86debb54520e307ee196d97b5c66415
+DIST openssl-1.1.1b_ectest.c 35091 BLAKE2B a9602255ab529751c2af2419206ce113f03f93b7b776691ea2ec550f26ddbecd241844bb81dc86988fdbb1c0a587318f82ce4faecba1a6142a19cf08d40fb2c5 SHA512 7813d9b6b7ab62119a7f2dd5431c17c5839f4c320ac7071b0714c9b8528bda5fda779dbb263328dca6ee8446e9fa09c663da659c9a82832a65cf53d1cd8a4cef
+DIST openssl-1.1.1b_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826
 EBUILD openssl-0.9.8z_p8-r1.ebuild 4937 BLAKE2B 4d8c960161f15f38dbcef1ba1529906d81ad1b8574c90b7e09f3b2a8f2fcfdda1d69d9c4259a7f616246fe34b5794ea08f5ef8f5cb1ecb4117784062587a1fa7 SHA512 2693d1d1cf167e0e0031d5b7b3ac2f850290ea2fa8513c8fe2f5b8c52fd5efd4296b574533165e24ddd315e271dad6e7f5b00afdf8d036864e27af62fae30e43
-EBUILD openssl-1.0.2q-r200.ebuild 7981 BLAKE2B b8b41046e8754f64427bd1da2557d654939e8b16f5be96be731e56c26c23a338807641858712ddc589001e5f7cd20c167dfb6e459b1c1086c7cdfb9d3bc253b1 SHA512 530f96ce8e8543cad92138abc6695b0546819d9eaff26d08ebcbf9fd6b1075e777f395af174087016530bd4ed29f067fbb1c6bbd7647354cb87f6ec600811728
 EBUILD openssl-1.0.2q.ebuild 10254 BLAKE2B e543d26a7a1f9848e7ddca3bbfea3eed4a656e3b6dbb9d8c770f25472a2d584a2e513c2f8978af5a8efab9d33ee8616f7b1a20f02d3a05c5beec1e1da15d0dd8 SHA512 21e54c2937acac8ab2a4514ae7f824ada21183bd0eef11b5b1f7bedf1eb423bd2d98de6efe5c6b8263c88dc98437a2632733ce60c46d220f127a2715300e76bf
+EBUILD openssl-1.0.2r-r200.ebuild 7981 BLAKE2B b8b41046e8754f64427bd1da2557d654939e8b16f5be96be731e56c26c23a338807641858712ddc589001e5f7cd20c167dfb6e459b1c1086c7cdfb9d3bc253b1 SHA512 530f96ce8e8543cad92138abc6695b0546819d9eaff26d08ebcbf9fd6b1075e777f395af174087016530bd4ed29f067fbb1c6bbd7647354cb87f6ec600811728
+EBUILD openssl-1.0.2r.ebuild 10267 BLAKE2B 68ae9a7d9386c6255d59c5623cd41ab5b4ca94d55311ed27ba552c36ada8184f4ad96516cc9e1491372d948e1e251b77f46282dee2919aa4d8ba6366f25e709e SHA512 1ced7d4cf3b70d68accd0b626e6c283ed64b2229c703eb7a817010e3b1e568541ff26900e53e5c8ed8fc48114456915aa45919fc720d02793f08c599fd963e64
 EBUILD openssl-1.1.0j.ebuild 9991 BLAKE2B 8df26c653ad304e724c59eb12882e535a9c03b00814f727d28bba62e0948480378b5c3d2fa1a8f59bb889e89c0abba0db14f60b2a306757bd32b8d6e9e8d1194 SHA512 5efe70f82141870a996785e7bce29a11671d8c1e4e0dec26b5ca737fe07fbac298c9ab4b0ef19c74593d82a030ddca31ec9e1961af1b8252ceb08e206e8edb12
-EBUILD openssl-1.1.1a-r1.ebuild 9831 BLAKE2B 3579028bac72fb81ffe175ab75532d0459e1b2b00e636d331498c7b3144ead73fb862a537cd3028b2c774320cec86a6ec6d734da42315664ea81876b836185c9 SHA512 e1e8169c37dfabef28378c053ee9f0fff45eefce1e19b5e8abaa507ee80496a2f31511296a2c9bdc50a3de7d8719752f26457238ae4b86fb777956259d3e11a1
-EBUILD openssl-1.1.1a.ebuild 9280 BLAKE2B 47a9ef1e05899f295bc2ce197821ce19ffbfaed7924be4131d07a6ae285dd339c9ce673b380163bf53b2a13e9e41d97ff4001482ea67754af77f481bd756ffee SHA512 4d1f897d5755ef451b17aa37c57df0c60bf4e5180029990debf060cab9f656100c74f110d6faa1e629b65c4d945e1da72488de1054df9e9133734e6d3626b108
+EBUILD openssl-1.1.1b-r1.ebuild 9546 BLAKE2B 6afff3ef187eea813c6c06379d7b2034b21467413d642b4c2fadd364528cba738d5c3f618674918bf2c05ed519001966e78c9994bef367be2f3c58462ad9d733 SHA512 2e996d2d3d1456389dd09a7b519e78ee5bbb6388b0c38c9b2db21351d85cef1bfa1849d0debc022ff2e2744dce8fde0061da37431cdcab212abfa90224654531
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.1.1a-fix-a-minor-nit-in-hkdflabel-size.patch b/dev-libs/openssl/files/openssl-1.1.1a-fix-a-minor-nit-in-hkdflabel-size.patch
deleted file mode 100644
index 8014be130ab7..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.1a-fix-a-minor-nit-in-hkdflabel-size.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3be71a31a1dda204bb95462a92cf7f247e64b939 Mon Sep 17 00:00:00 2001
-From: Bernd Edlinger <bernd.edlinger@hotmail.de>
-Date: Sun, 16 Dec 2018 12:43:59 +0100
-Subject: [PATCH] Fix a minor nit in the hkdflabel size
-
-Reviewed-by: Paul Dale <paul.dale@oracle.com>
-Reviewed-by: Matt Caswell <matt@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/7913)
-
-(cherry picked from commit 0b4233f5a4a181a6dcb7c511cd2663e500e659a4)
----
- ssl/tls13_enc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c
-index c3021d18aa9..e36b7d3a066 100644
---- a/ssl/tls13_enc.c
-+++ b/ssl/tls13_enc.c
-@@ -41,7 +41,7 @@ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret,
-      * + bytes for the hash itself
-      */
-     unsigned char hkdflabel[sizeof(uint16_t) + sizeof(uint8_t) +
--                            + sizeof(label_prefix) + TLS13_MAX_LABEL_LEN
-+                            + (sizeof(label_prefix) - 1) + TLS13_MAX_LABEL_LEN
-                             + 1 + EVP_MAX_MD_SIZE];
-     WPACKET pkt;
- 
diff --git a/dev-libs/openssl/files/openssl-1.1.1a-fix-cert-with-rsa-instead-of-rsaEncryption.patch b/dev-libs/openssl/files/openssl-1.1.1a-fix-cert-with-rsa-instead-of-rsaEncryption.patch
deleted file mode 100644
index 8f249e22a1d2..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.1a-fix-cert-with-rsa-instead-of-rsaEncryption.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From c25ae0fff78cb3cb784ef79167329d5cd55b62de Mon Sep 17 00:00:00 2001
-From: Bernd Edlinger <bernd.edlinger@hotmail.de>
-Date: Thu, 27 Dec 2018 22:18:21 +0100
-Subject: [PATCH] Fix cert with rsa instead of rsaEncryption as public key
- algorithm
-
-Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
-(Merged from https://github.com/openssl/openssl/pull/7962)
-
-(cherry picked from commit 1f483a69bce11c940309edc437eee6e32294d5f2)
----
- crypto/rsa/rsa_ameth.c        |  9 ++++++---
- test/certs/root-cert-rsa2.pem | 18 ++++++++++++++++++
- test/recipes/25-test_verify.t |  4 +++-
- 3 files changed, 27 insertions(+), 4 deletions(-)
- create mode 100644 test/certs/root-cert-rsa2.pem
-
-diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c
-index a6595aec054..75debb3e0a9 100644
---- a/crypto/rsa/rsa_ameth.c
-+++ b/crypto/rsa/rsa_ameth.c
-@@ -34,7 +34,7 @@ static int rsa_param_encode(const EVP_PKEY *pkey,
- 
-     *pstr = NULL;
-     /* If RSA it's just NULL type */
--    if (pkey->ameth->pkey_id == EVP_PKEY_RSA) {
-+    if (pkey->ameth->pkey_id != EVP_PKEY_RSA_PSS) {
-         *pstrtype = V_ASN1_NULL;
-         return 1;
-     }
-@@ -58,7 +58,7 @@ static int rsa_param_decode(RSA *rsa, const X509_ALGOR *alg)
-     int algptype;
- 
-     X509_ALGOR_get0(&algoid, &algptype, &algp, alg);
--    if (OBJ_obj2nid(algoid) == EVP_PKEY_RSA)
-+    if (OBJ_obj2nid(algoid) != EVP_PKEY_RSA_PSS)
-         return 1;
-     if (algptype == V_ASN1_UNDEF)
-         return 1;
-@@ -109,7 +109,10 @@ static int rsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
-         RSA_free(rsa);
-         return 0;
-     }
--    EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, rsa);
-+    if (!EVP_PKEY_assign(pkey, pkey->ameth->pkey_id, rsa)) {
-+        RSA_free(rsa);
-+        return 0;
-+    }
-     return 1;
- }
- 
-diff --git a/test/certs/root-cert-rsa2.pem b/test/certs/root-cert-rsa2.pem
-new file mode 100644
-index 00000000000..b817fdf3e5d
---- /dev/null
-+++ b/test/certs/root-cert-rsa2.pem
-@@ -0,0 +1,18 @@
-+-----BEGIN CERTIFICATE-----
-+MIIC7DCCAdSgAwIBAgIBATANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdSb290
-+IENBMCAXDTE2MDExNTA4MTk0OVoYDzIxMTYwMTE2MDgxOTQ5WjASMRAwDgYDVQQD
-+DAdSb290IENBMIIBHTAIBgRVCAEBBQADggEPADCCAQoCggEBAOHmAPUGvKBGOHkP
-+Px5xGRNtAt8rm3Zr/KywIe3WkQhCO6VjNexSW6CiSsXWAJQDl1o9uWco0n3jIVyk
-+7cY8jY6E0Z1Uwz3ZdKKWdmdx+cYaUHez/XjuW+DjjIkjwpoi7D7UN54HzcArVREX
-+OjRCHGkNOhiw7RWUXsb9nofGHOeUGpLAXwXBc0PlA94JkckkztiOi34u4DFI0YYq
-+alUmeugLNk6XseCkydpcaUsDgAhWg6Mfsiq4wUz+xbFN1MABqu2+ziW97mmt9gfN
-+biuhiVT1aOuYCe3JYGbLM2JKA7Bo1g6rX8E1VX79Ru6669y2oqPthX9337VoIkN+
-+ZiQjr8UCAwEAAaNQME4wHQYDVR0OBBYEFI71Ja8em2uEPXyAmslTnE1y96NSMB8G
-+A1UdIwQYMBaAFI71Ja8em2uEPXyAmslTnE1y96NSMAwGA1UdEwQFMAMBAf8wDQYJ
-+KoZIhvcNAQELBQADggEBAJ0OIdog3uQ1pmsjv1Qtf1w4If1geOn5uK0EOj2wYBHt
-+NxlFn7l8d9+51QMZFO+RlQJ0s3Webyo1ReuaL2dMn2LGJhWMoSBAwrMALAENU3lv
-+8jioRbfO2OamsdpJpKxQUyUJYudNe+BoKNX/ry3rxezmsFsRr9nDMiJZpmBCXiMm
-+mFFJOJkG0CheexBbMkua4kyStIOwO4rb5bSHszVso/9ucdGHBSC7oRcJXoWSDjBx
-+PdQPPBK5g4yqL8Lz26ehgsmhRKL9k32eVyjDKcIzgpmgcPTfTqNbd1KHQJKx4ssb
-+7nEpGKHalSo5Oq5L9s9qYrUv37kwBY4OpJFtmGaodoI=
-+-----END CERTIFICATE-----
-diff --git a/test/recipes/25-test_verify.t b/test/recipes/25-test_verify.t
-index 6c3deab7c67..b80a1cde3ed 100644
---- a/test/recipes/25-test_verify.t
-+++ b/test/recipes/25-test_verify.t
-@@ -27,7 +27,7 @@ sub verify {
-     run(app([@args]));
- }
- 
--plan tests => 134;
-+plan tests => 135;
- 
- # Canonical success
- ok(verify("ee-cert", "sslserver", ["root-cert"], ["ca-cert"]),
-@@ -361,6 +361,8 @@ ok(verify("some-names2", "sslserver", ["many-constraints"], ["many-constraints"]
-     "Not too many names and constraints to check (2)");
- ok(verify("some-names2", "sslserver", ["many-constraints"], ["many-constraints"], ),
-     "Not too many names and constraints to check (3)");
-+ok(verify("root-cert-rsa2", "sslserver", ["root-cert-rsa2"], [], "-check_ss_sig"),
-+    "Public Key Algorithm rsa instead of rsaEncryption");
- 
- SKIP: {
-     skip "Ed25519 is not supported by this OpenSSL build", 1
diff --git a/dev-libs/openssl/files/openssl-1.1.1a-fix-some-SSL_export_keying_material-issues.patch b/dev-libs/openssl/files/openssl-1.1.1a-fix-some-SSL_export_keying_material-issues.patch
deleted file mode 100644
index 2db64d83e45c..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.1a-fix-some-SSL_export_keying_material-issues.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 0fb2815b873304d145ed00283454fc9f3bd35e6b Mon Sep 17 00:00:00 2001
-From: Matt Caswell <matt@openssl.org>
-Date: Tue, 4 Dec 2018 08:37:04 +0000
-Subject: [PATCH] Fix some SSL_export_keying_material() issues
-
-Fix some issues in tls13_hkdf_expand() which impact the above function
-for TLSv1.3. In particular test that we can use the maximum label length
-in TLSv1.3.
-
-Reviewed-by: Tim Hudson <tjh@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/7755)
----
- doc/man3/SSL_export_keying_material.pod |  3 +-
- ssl/ssl_locl.h                          |  2 +-
- ssl/statem/extensions.c                 |  2 +-
- ssl/statem/statem_clnt.c                |  2 +-
- ssl/statem/statem_srvr.c                |  2 +-
- ssl/tls13_enc.c                         | 73 +++++++++++++++++--------
- test/sslapitest.c                       | 48 ++++++++++++----
- test/tls13secretstest.c                 |  2 +-
- 8 files changed, 92 insertions(+), 42 deletions(-)
-
-diff --git a/doc/man3/SSL_export_keying_material.pod b/doc/man3/SSL_export_keying_material.pod
-index abebf911fc3..4c81a60ffbb 100644
---- a/doc/man3/SSL_export_keying_material.pod
-+++ b/doc/man3/SSL_export_keying_material.pod
-@@ -59,7 +59,8 @@ B<label> and should be B<llen> bytes long. Typically this will be a value from
- the IANA Exporter Label Registry
- (L<https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#exporter-labels>).
- Alternatively labels beginning with "EXPERIMENTAL" are permitted by the standard
--to be used without registration.
-+to be used without registration. TLSv1.3 imposes a maximum label length of
-+249 bytes.
- 
- Note that this function is only defined for TLSv1.0 and above, and DTLSv1.0 and
- above. Attempting to use it in SSLv3 will result in an error.
-diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
-index 70e5a1740f9..307131de93a 100644
---- a/ssl/ssl_locl.h
-+++ b/ssl/ssl_locl.h
-@@ -2461,7 +2461,7 @@ __owur int tls13_hkdf_expand(SSL *s, const EVP_MD *md,
-                              const unsigned char *secret,
-                              const unsigned char *label, size_t labellen,
-                              const unsigned char *data, size_t datalen,
--                             unsigned char *out, size_t outlen);
-+                             unsigned char *out, size_t outlen, int fatal);
- __owur int tls13_derive_key(SSL *s, const EVP_MD *md,
-                             const unsigned char *secret, unsigned char *key,
-                             size_t keylen);
-diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
-index 63e61c6184a..716d6d23e08 100644
---- a/ssl/statem/extensions.c
-+++ b/ssl/statem/extensions.c
-@@ -1506,7 +1506,7 @@ int tls_psk_do_binder(SSL *s, const EVP_MD *md, const unsigned char *msgstart,
- 
-     /* Generate the binder key */
-     if (!tls13_hkdf_expand(s, md, early_secret, label, labelsize, hash,
--                           hashsize, binderkey, hashsize)) {
-+                           hashsize, binderkey, hashsize, 1)) {
-         /* SSLfatal() already called */
-         goto err;
-     }
-diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
-index 5a8f1163dfa..a0e495d8e83 100644
---- a/ssl/statem/statem_clnt.c
-+++ b/ssl/statem/statem_clnt.c
-@@ -2740,7 +2740,7 @@ MSG_PROCESS_RETURN tls_process_new_session_ticket(SSL *s, PACKET *pkt)
-                                PACKET_data(&nonce),
-                                PACKET_remaining(&nonce),
-                                s->session->master_key,
--                               hashlen)) {
-+                               hashlen, 1)) {
-             /* SSLfatal() already called */
-             goto err;
-         }
-diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
-index e7c11c4bea4..a8e862ced55 100644
---- a/ssl/statem/statem_srvr.c
-+++ b/ssl/statem/statem_srvr.c
-@@ -4099,7 +4099,7 @@ int tls_construct_new_session_ticket(SSL *s, WPACKET *pkt)
-                                tick_nonce,
-                                TICKET_NONCE_SIZE,
-                                s->session->master_key,
--                               hashlen)) {
-+                               hashlen, 1)) {
-             /* SSLfatal() already called */
-             goto err;
-         }
-diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c
-index f7ab0fa4704..c3021d18aa9 100644
---- a/ssl/tls13_enc.c
-+++ b/ssl/tls13_enc.c
-@@ -13,7 +13,7 @@
- #include <openssl/evp.h>
- #include <openssl/kdf.h>
- 
--#define TLS13_MAX_LABEL_LEN     246
-+#define TLS13_MAX_LABEL_LEN     249
- 
- /* Always filled with zeros */
- static const unsigned char default_zeros[EVP_MAX_MD_SIZE];
-@@ -22,30 +22,47 @@ static const unsigned char default_zeros[EVP_MAX_MD_SIZE];
-  * Given a |secret|; a |label| of length |labellen|; and |data| of length
-  * |datalen| (e.g. typically a hash of the handshake messages), derive a new
-  * secret |outlen| bytes long and store it in the location pointed to be |out|.
-- * The |data| value may be zero length. Returns 1 on success  0 on failure.
-+ * The |data| value may be zero length. Any errors will be treated as fatal if
-+ * |fatal| is set. Returns 1 on success  0 on failure.
-  */
- int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret,
-                              const unsigned char *label, size_t labellen,
-                              const unsigned char *data, size_t datalen,
--                             unsigned char *out, size_t outlen)
-+                             unsigned char *out, size_t outlen, int fatal)
- {
--    const unsigned char label_prefix[] = "tls13 ";
-+    static const unsigned char label_prefix[] = "tls13 ";
-     EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL);
-     int ret;
-     size_t hkdflabellen;
-     size_t hashlen;
-     /*
--     * 2 bytes for length of whole HkdfLabel + 1 byte for length of combined
--     * prefix and label + bytes for the label itself + bytes for the hash
-+     * 2 bytes for length of derived secret + 1 byte for length of combined
-+     * prefix and label + bytes for the label itself + 1 byte length of hash
-+     * + bytes for the hash itself
-      */
-     unsigned char hkdflabel[sizeof(uint16_t) + sizeof(uint8_t) +
-                             + sizeof(label_prefix) + TLS13_MAX_LABEL_LEN
--                            + EVP_MAX_MD_SIZE];
-+                            + 1 + EVP_MAX_MD_SIZE];
-     WPACKET pkt;
- 
-     if (pctx == NULL)
-         return 0;
- 
-+    if (labellen > TLS13_MAX_LABEL_LEN) {
-+        if (fatal) {
-+            SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS13_HKDF_EXPAND,
-+                     ERR_R_INTERNAL_ERROR);
-+        } else {
-+            /*
-+             * Probably we have been called from SSL_export_keying_material(),
-+             * or SSL_export_keying_material_early().
-+             */
-+            SSLerr(SSL_F_TLS13_HKDF_EXPAND, SSL_R_TLS_ILLEGAL_EXPORTER_LABEL);
-+        }
-+        EVP_PKEY_CTX_free(pctx);
-+        return 0;
-+    }
-+
-     hashlen = EVP_MD_size(md);
- 
-     if (!WPACKET_init_static_len(&pkt, hkdflabel, sizeof(hkdflabel), 0)
-@@ -59,8 +76,11 @@ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret,
-             || !WPACKET_finish(&pkt)) {
-         EVP_PKEY_CTX_free(pctx);
-         WPACKET_cleanup(&pkt);
--        SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS13_HKDF_EXPAND,
--                 ERR_R_INTERNAL_ERROR);
-+        if (fatal)
-+            SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS13_HKDF_EXPAND,
-+                     ERR_R_INTERNAL_ERROR);
-+        else
-+            SSLerr(SSL_F_TLS13_HKDF_EXPAND, ERR_R_INTERNAL_ERROR);
-         return 0;
-     }
- 
-@@ -74,9 +94,13 @@ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret,
- 
-     EVP_PKEY_CTX_free(pctx);
- 
--    if (ret != 0)
--        SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS13_HKDF_EXPAND,
--                 ERR_R_INTERNAL_ERROR);
-+    if (ret != 0) {
-+        if (fatal)
-+            SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS13_HKDF_EXPAND,
-+                     ERR_R_INTERNAL_ERROR);
-+        else
-+            SSLerr(SSL_F_TLS13_HKDF_EXPAND, ERR_R_INTERNAL_ERROR);
-+    }
- 
-     return ret == 0;
- }
-@@ -91,7 +115,7 @@ int tls13_derive_key(SSL *s, const EVP_MD *md, const unsigned char *secret,
-     static const unsigned char keylabel[] = "key";
- 
-     return tls13_hkdf_expand(s, md, secret, keylabel, sizeof(keylabel) - 1,
--                             NULL, 0, key, keylen);
-+                             NULL, 0, key, keylen, 1);
- }
- 
- /*
-@@ -104,7 +128,7 @@ int tls13_derive_iv(SSL *s, const EVP_MD *md, const unsigned char *secret,
-     static const unsigned char ivlabel[] = "iv";
- 
-     return tls13_hkdf_expand(s, md, secret, ivlabel, sizeof(ivlabel) - 1,
--                             NULL, 0, iv, ivlen);
-+                             NULL, 0, iv, ivlen, 1);
- }
- 
- int tls13_derive_finishedkey(SSL *s, const EVP_MD *md,
-@@ -114,7 +138,7 @@ int tls13_derive_finishedkey(SSL *s, const EVP_MD *md,
-     static const unsigned char finishedlabel[] = "finished";
- 
-     return tls13_hkdf_expand(s, md, secret, finishedlabel,
--                             sizeof(finishedlabel) - 1, NULL, 0, fin, finlen);
-+                             sizeof(finishedlabel) - 1, NULL, 0, fin, finlen, 1);
- }
- 
- /*
-@@ -177,7 +201,7 @@ int tls13_generate_secret(SSL *s, const EVP_MD *md,
-         if (!tls13_hkdf_expand(s, md, prevsecret,
-                                (unsigned char *)derived_secret_label,
-                                sizeof(derived_secret_label) - 1, hash, mdlen,
--                               preextractsec, mdlen)) {
-+                               preextractsec, mdlen, 1)) {
-             /* SSLfatal() already called */
-             EVP_PKEY_CTX_free(pctx);
-             return 0;
-@@ -337,7 +361,7 @@ static int derive_secret_key_and_iv(SSL *s, int sending, const EVP_MD *md,
-     hashlen = (size_t)hashleni;
- 
-     if (!tls13_hkdf_expand(s, md, insecret, label, labellen, hash, hashlen,
--                           secret, hashlen)) {
-+                           secret, hashlen, 1)) {
-         /* SSLfatal() already called */
-         goto err;
-     }
-@@ -517,7 +541,8 @@ int tls13_change_cipher_state(SSL *s, int which)
-                                    early_exporter_master_secret,
-                                    sizeof(early_exporter_master_secret) - 1,
-                                    hashval, hashlen,
--                                   s->early_exporter_master_secret, hashlen)) {
-+                                   s->early_exporter_master_secret, hashlen,
-+                                   1)) {
-                 SSLfatal(s, SSL_AD_INTERNAL_ERROR,
-                          SSL_F_TLS13_CHANGE_CIPHER_STATE, ERR_R_INTERNAL_ERROR);
-                 goto err;
-@@ -604,7 +629,7 @@ int tls13_change_cipher_state(SSL *s, int which)
-                                resumption_master_secret,
-                                sizeof(resumption_master_secret) - 1,
-                                hashval, hashlen, s->resumption_master_secret,
--                               hashlen)) {
-+                               hashlen, 1)) {
-             /* SSLfatal() already called */
-             goto err;
-         }
-@@ -624,7 +649,7 @@ int tls13_change_cipher_state(SSL *s, int which)
-                                exporter_master_secret,
-                                sizeof(exporter_master_secret) - 1,
-                                hash, hashlen, s->exporter_master_secret,
--                               hashlen)) {
-+                               hashlen, 1)) {
-             /* SSLfatal() already called */
-             goto err;
-         }
-@@ -738,10 +763,10 @@ int tls13_export_keying_material(SSL *s, unsigned char *out, size_t olen,
-             || EVP_DigestFinal_ex(ctx, data, &datalen) <= 0
-             || !tls13_hkdf_expand(s, md, s->exporter_master_secret,
-                                   (const unsigned char *)label, llen,
--                                  data, datalen, exportsecret, hashsize)
-+                                  data, datalen, exportsecret, hashsize, 0)
-             || !tls13_hkdf_expand(s, md, exportsecret, exporterlabel,
-                                   sizeof(exporterlabel) - 1, hash, hashsize,
--                                  out, olen))
-+                                  out, olen, 0))
-         goto err;
- 
-     ret = 1;
-@@ -797,10 +822,10 @@ int tls13_export_keying_material_early(SSL *s, unsigned char *out, size_t olen,
-             || EVP_DigestFinal_ex(ctx, data, &datalen) <= 0
-             || !tls13_hkdf_expand(s, md, s->early_exporter_master_secret,
-                                   (const unsigned char *)label, llen,
--                                  data, datalen, exportsecret, hashsize)
-+                                  data, datalen, exportsecret, hashsize, 0)
-             || !tls13_hkdf_expand(s, md, exportsecret, exporterlabel,
-                                   sizeof(exporterlabel) - 1, hash, hashsize,
--                                  out, olen))
-+                                  out, olen, 0))
-         goto err;
- 
-     ret = 1;
-diff --git a/test/sslapitest.c b/test/sslapitest.c
-index 108d57e4781..a4bbb4fead4 100644
---- a/test/sslapitest.c
-+++ b/test/sslapitest.c
-@@ -4028,20 +4028,25 @@ static int test_serverinfo(int tst)
-  * no test vectors so all we do is test that both sides of the communication
-  * produce the same results for different protocol versions.
-  */
-+#define SMALL_LABEL_LEN 10
-+#define LONG_LABEL_LEN  249
- static int test_export_key_mat(int tst)
- {
-     int testresult = 0;
-     SSL_CTX *cctx = NULL, *sctx = NULL, *sctx2 = NULL;
-     SSL *clientssl = NULL, *serverssl = NULL;
--    const char label[] = "test label";
-+    const char label[LONG_LABEL_LEN + 1] = "test label";
-     const unsigned char context[] = "context";
-     const unsigned char *emptycontext = NULL;
-     unsigned char ckeymat1[80], ckeymat2[80], ckeymat3[80];
-     unsigned char skeymat1[80], skeymat2[80], skeymat3[80];
-+    size_t labellen;
-     const int protocols[] = {
-         TLS1_VERSION,
-         TLS1_1_VERSION,
-         TLS1_2_VERSION,
-+        TLS1_3_VERSION,
-+        TLS1_3_VERSION,
-         TLS1_3_VERSION
-     };
- 
-@@ -4058,7 +4063,7 @@ static int test_export_key_mat(int tst)
-         return 1;
- #endif
- #ifdef OPENSSL_NO_TLS1_3
--    if (tst == 3)
-+    if (tst >= 3)
-         return 1;
- #endif
-     if (!TEST_true(create_ssl_ctx_pair(TLS_server_method(), TLS_client_method(),
-@@ -4076,33 +4081,52 @@ static int test_export_key_mat(int tst)
-                                                 SSL_ERROR_NONE)))
-         goto end;
- 
-+    if (tst == 5) {
-+        /*
-+         * TLSv1.3 imposes a maximum label len of 249 bytes. Check we fail if we
-+         * go over that.
-+         */
-+        if (!TEST_int_le(SSL_export_keying_material(clientssl, ckeymat1,
-+                                                    sizeof(ckeymat1), label,
-+                                                    LONG_LABEL_LEN + 1, context,
-+                                                    sizeof(context) - 1, 1), 0))
-+            goto end;
-+
-+        testresult = 1;
-+        goto end;
-+    } else if (tst == 4) {
-+        labellen = LONG_LABEL_LEN;
-+    } else {
-+        labellen = SMALL_LABEL_LEN;
-+    }
-+
-     if (!TEST_int_eq(SSL_export_keying_material(clientssl, ckeymat1,
-                                                 sizeof(ckeymat1), label,
--                                                sizeof(label) - 1, context,
-+                                                labellen, context,
-                                                 sizeof(context) - 1, 1), 1)
-             || !TEST_int_eq(SSL_export_keying_material(clientssl, ckeymat2,
-                                                        sizeof(ckeymat2), label,
--                                                       sizeof(label) - 1,
-+                                                       labellen,
-                                                        emptycontext,
-                                                        0, 1), 1)
-             || !TEST_int_eq(SSL_export_keying_material(clientssl, ckeymat3,
-                                                        sizeof(ckeymat3), label,
--                                                       sizeof(label) - 1,
-+                                                       labellen,
-                                                        NULL, 0, 0), 1)
-             || !TEST_int_eq(SSL_export_keying_material(serverssl, skeymat1,
-                                                        sizeof(skeymat1), label,
--                                                       sizeof(label) - 1,
-+                                                       labellen,
-                                                        context,
-                                                        sizeof(context) -1, 1),
-                             1)
-             || !TEST_int_eq(SSL_export_keying_material(serverssl, skeymat2,
-                                                        sizeof(skeymat2), label,
--                                                       sizeof(label) - 1,
-+                                                       labellen,
-                                                        emptycontext,
-                                                        0, 1), 1)
-             || !TEST_int_eq(SSL_export_keying_material(serverssl, skeymat3,
-                                                        sizeof(skeymat3), label,
--                                                       sizeof(label) - 1,
-+                                                       labellen,
-                                                        NULL, 0, 0), 1)
-                /*
-                 * Check that both sides created the same key material with the
-@@ -4131,10 +4155,10 @@ static int test_export_key_mat(int tst)
-      * Check that an empty context and no context produce different results in
-      * protocols less than TLSv1.3. In TLSv1.3 they should be the same.
-      */
--    if ((tst != 3 && !TEST_mem_ne(ckeymat2, sizeof(ckeymat2), ckeymat3,
-+    if ((tst < 3 && !TEST_mem_ne(ckeymat2, sizeof(ckeymat2), ckeymat3,
-                                   sizeof(ckeymat3)))
--            || (tst ==3 && !TEST_mem_eq(ckeymat2, sizeof(ckeymat2), ckeymat3,
--                                        sizeof(ckeymat3))))
-+            || (tst >= 3 && !TEST_mem_eq(ckeymat2, sizeof(ckeymat2), ckeymat3,
-+                                         sizeof(ckeymat3))))
-         goto end;
- 
-     testresult = 1;
-@@ -5909,7 +5933,7 @@ int setup_tests(void)
-     ADD_ALL_TESTS(test_custom_exts, 3);
- #endif
-     ADD_ALL_TESTS(test_serverinfo, 8);
--    ADD_ALL_TESTS(test_export_key_mat, 4);
-+    ADD_ALL_TESTS(test_export_key_mat, 6);
- #ifndef OPENSSL_NO_TLS1_3
-     ADD_ALL_TESTS(test_export_key_mat_early, 3);
- #endif
-diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c
-index 319df17bab0..de318df02b4 100644
---- a/test/tls13secretstest.c
-+++ b/test/tls13secretstest.c
-@@ -226,7 +226,7 @@ static int test_secret(SSL *s, unsigned char *prk,
-     }
- 
-     if (!tls13_hkdf_expand(s, md, prk, label, labellen, hash, hashsize,
--                           gensecret, hashsize)) {
-+                           gensecret, hashsize, 1)) {
-         TEST_error("Secret generation failed");
-         return 0;
-     }
diff --git a/dev-libs/openssl/files/openssl-1.1.1a-fix-wrong-return-value-in-ssl3_ctx_ctrl.patch b/dev-libs/openssl/files/openssl-1.1.1a-fix-wrong-return-value-in-ssl3_ctx_ctrl.patch
deleted file mode 100644
index c2f8bb638b3a..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.1a-fix-wrong-return-value-in-ssl3_ctx_ctrl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3ccccb91ae1c07a4310778b3d7ba74ff4ff787f0 Mon Sep 17 00:00:00 2001
-From: Paul Yang <yang.yang@baishancloud.com>
-Date: Wed, 21 Nov 2018 13:16:27 +0800
-Subject: [PATCH] Fix wrong return value in ssl3_ctx_ctrl
-
-This fixes issue #7677
-
-Reviewed-by: Matt Caswell <matt@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/7678)
----
- ssl/s3_lib.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
-index 866ca4dfa9b..99ae48199c2 100644
---- a/ssl/s3_lib.c
-+++ b/ssl/s3_lib.c
-@@ -3781,7 +3781,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
-                                   EVP_PKEY_security_bits(pkdh), 0, pkdh)) {
-                 SSLerr(SSL_F_SSL3_CTX_CTRL, SSL_R_DH_KEY_TOO_SMALL);
-                 EVP_PKEY_free(pkdh);
--                return 1;
-+                return 0;
-             }
-             EVP_PKEY_free(ctx->cert->dh_tmp);
-             ctx->cert->dh_tmp = pkdh;
diff --git a/dev-libs/openssl/files/openssl-1.1.1a-make-sure-build_SYS_str_reasons_preserves_errno.patch b/dev-libs/openssl/files/openssl-1.1.1a-make-sure-build_SYS_str_reasons_preserves_errno.patch
deleted file mode 100644
index cfa84c73a5bf..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.1a-make-sure-build_SYS_str_reasons_preserves_errno.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 99992ad22019e752c7b103a45f860a48b6bc0972 Mon Sep 17 00:00:00 2001
-From: Matt Caswell <matt@openssl.org>
-Date: Wed, 21 Nov 2018 11:44:42 +0000
-Subject: [PATCH] Make sure build_SYS_str_reasons() preserves errno
-
-This function can end up being called during ERR_get_error() if we are
-initialising. ERR_get_error() must preserve errno since it gets called via
-SSL_get_error(). If that function returns SSL_ERROR_SYSCALL then you are
-supposed to inspect errno.
-
-Reviewed-by: Richard Levitte <levitte@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/7680)
-
-(cherry picked from commit 71b1ceffc4c795f5db21861dd1016fbe23a53a53)
----
-
-diff --git a/crypto/err/err.c b/crypto/err/err.c
-index 03cbd73..2eeeab2 100644
---- a/crypto/err/err.c
-+++ b/crypto/err/err.c
-@@ -19,6 +19,7 @@
- #include <openssl/bio.h>
- #include <openssl/opensslconf.h>
- #include "internal/thread_once.h"
-+#include "e_os.h"
- 
- static int err_load_strings(const ERR_STRING_DATA *str);
- 
-@@ -201,6 +202,7 @@ static void build_SYS_str_reasons(void)
-     static char strerror_tab[NUM_SYS_STR_REASONS][LEN_SYS_STR_REASON];
-     static int init = 1;
-     int i;
-+    int saveerrno = get_last_sys_error();
- 
-     CRYPTO_THREAD_write_lock(err_string_lock);
-     if (!init) {
-@@ -229,6 +231,8 @@ static void build_SYS_str_reasons(void)
-     init = 0;
- 
-     CRYPTO_THREAD_unlock(err_string_lock);
-+    /* openssl_strerror_r could change errno, but we want to preserve it */
-+    set_sys_error(saveerrno);
-     err_load_strings(SYS_str_reasons);
- }
- #endif
-diff --git a/e_os.h b/e_os.h
-index 5340593..8e6efa9 100644
---- a/e_os.h
-+++ b/e_os.h
-@@ -49,6 +49,7 @@
- 
- # define get_last_sys_error()    errno
- # define clear_sys_error()       errno=0
-+# define set_sys_error(e)        errno=(e)
- 
- /********************************************************************
-  The Microsoft section
-@@ -66,8 +67,10 @@
- # ifdef WIN32
- #  undef get_last_sys_error
- #  undef clear_sys_error
-+#  undef set_sys_error
- #  define get_last_sys_error()    GetLastError()
- #  define clear_sys_error()       SetLastError(0)
-+#  define set_sys_error(e)        SetLastError(e)
- #  if !defined(WINNT)
- #   define WIN_CONSOLE_BUG
- #  endif
diff --git a/dev-libs/openssl/files/openssl-1.1.1a-preserve-errno-on-dlopen.patch b/dev-libs/openssl/files/openssl-1.1.1a-preserve-errno-on-dlopen.patch
deleted file mode 100644
index ed8f2dd96be0..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.1a-preserve-errno-on-dlopen.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From ef97becf522fc4e2e9d98e6ae7bcb26651883d9a Mon Sep 17 00:00:00 2001
-From: Matt Caswell <matt@openssl.org>
-Date: Wed, 21 Nov 2018 11:57:04 +0000
-Subject: [PATCH] Preserve errno on dlopen
-
-For the same reasons as in the previous commit we must preserve errno
-across dlopen calls. Some implementations (e.g. solaris) do not preserve
-errno even on a successful dlopen call.
-
-Fixes #6953
-
-Reviewed-by: Richard Levitte <levitte@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/7680)
-
-(cherry picked from commit 3cb4e7dc1cf92022f62b9bbdd59695885a1265ff)
----
- crypto/dso/dso_dlfcn.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
-index ad8899c289a..4240f5f5e30 100644
---- a/crypto/dso/dso_dlfcn.c
-+++ b/crypto/dso/dso_dlfcn.c
-@@ -17,6 +17,7 @@
- #endif
- 
- #include "dso_locl.h"
-+#include "e_os.h"
- 
- #ifdef DSO_DLFCN
- 
-@@ -99,6 +100,7 @@ static int dlfcn_load(DSO *dso)
-     /* See applicable comments in dso_dl.c */
-     char *filename = DSO_convert_filename(dso, NULL);
-     int flags = DLOPEN_FLAG;
-+    int saveerrno = get_last_sys_error();
- 
-     if (filename == NULL) {
-         DSOerr(DSO_F_DLFCN_LOAD, DSO_R_NO_FILENAME);
-@@ -118,6 +120,11 @@ static int dlfcn_load(DSO *dso)
-         ERR_add_error_data(4, "filename(", filename, "): ", dlerror());
-         goto err;
-     }
-+    /*
-+     * Some dlopen() implementations (e.g. solaris) do no preserve errno, even
-+     * on a successful call.
-+     */
-+    set_sys_error(saveerrno);
-     if (!sk_void_push(dso->meth_data, (char *)ptr)) {
-         DSOerr(DSO_F_DLFCN_LOAD, DSO_R_STACK_ERROR);
-         goto err;
diff --git a/dev-libs/openssl/files/openssl-1.1.1a-preserve-system-error-number-in-a-few-more-places.patch b/dev-libs/openssl/files/openssl-1.1.1a-preserve-system-error-number-in-a-few-more-places.patch
deleted file mode 100644
index 84c43a3c3e04..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.1a-preserve-system-error-number-in-a-few-more-places.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 145419423e1a74ae54cdbd3aed8bb15cbd53c7cc Mon Sep 17 00:00:00 2001
-From: Richard Levitte <levitte@openssl.org>
-Date: Fri, 14 Dec 2018 19:33:55 +0100
-Subject: [PATCH] ERR: preserve system error number in a few more places
-
-It turns out that intialization may change the error number, so we
-need to preserve the system error number in functions where
-initialization is called for.
-These are ERR_get_state() and err_shelve_state()
-
-Fixes #7897
-
-Reviewed-by: Matt Caswell <matt@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/7902)
-
-(cherry picked from commit 91c5473035aaf2c0d86e4039c2a29a5b70541905)
----
- crypto/err/err.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/crypto/err/err.c b/crypto/err/err.c
-index 5cfb02d821b..aef2543d60b 100644
---- a/crypto/err/err.c
-+++ b/crypto/err/err.c
-@@ -697,6 +697,7 @@ DEFINE_RUN_ONCE_STATIC(err_do_init)
- ERR_STATE *ERR_get_state(void)
- {
-     ERR_STATE *state;
-+    int saveerrno = get_last_sys_error();
- 
-     if (!OPENSSL_init_crypto(OPENSSL_INIT_BASE_ONLY, NULL))
-         return NULL;
-@@ -728,6 +729,7 @@ ERR_STATE *ERR_get_state(void)
-         OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
-     }
- 
-+    set_sys_error(saveerrno);
-     return state;
- }
- 
-@@ -737,6 +739,8 @@ ERR_STATE *ERR_get_state(void)
-  */
- int err_shelve_state(void **state)
- {
-+    int saveerrno = get_last_sys_error();
-+
-     if (!OPENSSL_init_crypto(OPENSSL_INIT_BASE_ONLY, NULL))
-         return 0;
- 
-@@ -747,6 +751,7 @@ int err_shelve_state(void **state)
-     if (!CRYPTO_THREAD_set_local(&err_thread_local, (ERR_STATE*)-1))
-         return 0;
- 
-+    set_sys_error(saveerrno);
-     return 1;
- }
- 
diff --git a/dev-libs/openssl/files/openssl-1.1.1a-revert-reduce-stack-usage-in-tls13_hkdf_expand.patch b/dev-libs/openssl/files/openssl-1.1.1a-revert-reduce-stack-usage-in-tls13_hkdf_expand.patch
deleted file mode 100644
index 5ea4fb97bfce..000000000000
--- a/dev-libs/openssl/files/openssl-1.1.1a-revert-reduce-stack-usage-in-tls13_hkdf_expand.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From ed371b8cbac0d0349667558c061c1ae380cf75eb Mon Sep 17 00:00:00 2001
-From: Matt Caswell <matt@openssl.org>
-Date: Mon, 3 Dec 2018 18:14:57 +0000
-Subject: [PATCH] Revert "Reduce stack usage in tls13_hkdf_expand"
-
-This reverts commit ec0c5f5693e39c5a013f81e6dd9dfd09ec65162d.
-
-SSL_export_keying_material() may use longer label lengths.
-
-Fixes #7712
-
-Reviewed-by: Tim Hudson <tjh@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/7755)
----
- ssl/tls13_enc.c | 16 ++++------------
- 1 file changed, 4 insertions(+), 12 deletions(-)
-
-diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c
-index b6825d20c2d..f7ab0fa4704 100644
---- a/ssl/tls13_enc.c
-+++ b/ssl/tls13_enc.c
-@@ -13,14 +13,7 @@
- #include <openssl/evp.h>
- #include <openssl/kdf.h>
- 
--/*
-- * RFC 8446, 7.1 Key Schedule, says:
-- * Note: With common hash functions, any label longer than 12 characters
-- * requires an additional iteration of the hash function to compute.
-- * The labels in this specification have all been chosen to fit within
-- * this limit.
-- */
--#define TLS13_MAX_LABEL_LEN     12
-+#define TLS13_MAX_LABEL_LEN     246
- 
- /* Always filled with zeros */
- static const unsigned char default_zeros[EVP_MAX_MD_SIZE];
-@@ -36,15 +29,14 @@ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret,
-                              const unsigned char *data, size_t datalen,
-                              unsigned char *out, size_t outlen)
- {
--    static const unsigned char label_prefix[] = "tls13 ";
-+    const unsigned char label_prefix[] = "tls13 ";
-     EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL);
-     int ret;
-     size_t hkdflabellen;
-     size_t hashlen;
-     /*
--     * 2 bytes for length of derived secret + 1 byte for length of combined
--     * prefix and label + bytes for the label itself + 1 byte length of hash
--     * + bytes for the hash itself
-+     * 2 bytes for length of whole HkdfLabel + 1 byte for length of combined
-+     * prefix and label + bytes for the label itself + bytes for the hash
-      */
-     unsigned char hkdflabel[sizeof(uint16_t) + sizeof(uint8_t) +
-                             + sizeof(label_prefix) + TLS13_MAX_LABEL_LEN
diff --git a/dev-libs/openssl/files/openssl-1.1.1b-ec-curves-patch.patch b/dev-libs/openssl/files/openssl-1.1.1b-ec-curves-patch.patch
new file mode 100644
index 000000000000..c1f53c838230
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1b-ec-curves-patch.patch
@@ -0,0 +1,207 @@
+Based on openssl-1.1.1-ec-curves.patch.
+
+Updated for OpenSSL change b6d41ff73392df5af9c931c902ae4cd75c5b61ea.
+
+--- a/apps/speed.c
++++ b/apps/speed.c
+@@ -489,82 +489,28 @@ static const OPT_PAIR rsa_choices[] = {
+ static double rsa_results[RSA_NUM][2];  /* 2 ops: sign then verify */
+ #endif /* OPENSSL_NO_RSA */
+ 
+-#define R_EC_P160    0
+-#define R_EC_P192    1
+-#define R_EC_P224    2
+-#define R_EC_P256    3
+-#define R_EC_P384    4
+-#define R_EC_P521    5
+-#define R_EC_K163    6
+-#define R_EC_K233    7
+-#define R_EC_K283    8
+-#define R_EC_K409    9
+-#define R_EC_K571    10
+-#define R_EC_B163    11
+-#define R_EC_B233    12
+-#define R_EC_B283    13
+-#define R_EC_B409    14
+-#define R_EC_B571    15
+-#define R_EC_BRP256R1  16
+-#define R_EC_BRP256T1  17
+-#define R_EC_BRP384R1  18
+-#define R_EC_BRP384T1  19
+-#define R_EC_BRP512R1  20
+-#define R_EC_BRP512T1  21
+-#define R_EC_X25519  22
+-#define R_EC_X448    23
++#define R_EC_P224    0
++#define R_EC_P256    1
++#define R_EC_P384    2
++#define R_EC_P521    3
++#define R_EC_X25519  4
++#define R_EC_X448    5
+ #ifndef OPENSSL_NO_EC
+ static OPT_PAIR ecdsa_choices[] = {
+-    {"ecdsap160", R_EC_P160},
+-    {"ecdsap192", R_EC_P192},
+     {"ecdsap224", R_EC_P224},
+     {"ecdsap256", R_EC_P256},
+     {"ecdsap384", R_EC_P384},
+     {"ecdsap521", R_EC_P521},
+-    {"ecdsak163", R_EC_K163},
+-    {"ecdsak233", R_EC_K233},
+-    {"ecdsak283", R_EC_K283},
+-    {"ecdsak409", R_EC_K409},
+-    {"ecdsak571", R_EC_K571},
+-    {"ecdsab163", R_EC_B163},
+-    {"ecdsab233", R_EC_B233},
+-    {"ecdsab283", R_EC_B283},
+-    {"ecdsab409", R_EC_B409},
+-    {"ecdsab571", R_EC_B571},
+-    {"ecdsabrp256r1", R_EC_BRP256R1},
+-    {"ecdsabrp256t1", R_EC_BRP256T1},
+-    {"ecdsabrp384r1", R_EC_BRP384R1},
+-    {"ecdsabrp384t1", R_EC_BRP384T1},
+-    {"ecdsabrp512r1", R_EC_BRP512R1},
+-    {"ecdsabrp512t1", R_EC_BRP512T1}
+ };
+ # define ECDSA_NUM       OSSL_NELEM(ecdsa_choices)
+ 
+ static double ecdsa_results[ECDSA_NUM][2];    /* 2 ops: sign then verify */
+ 
+ static const OPT_PAIR ecdh_choices[] = {
+-    {"ecdhp160", R_EC_P160},
+-    {"ecdhp192", R_EC_P192},
+     {"ecdhp224", R_EC_P224},
+     {"ecdhp256", R_EC_P256},
+     {"ecdhp384", R_EC_P384},
+     {"ecdhp521", R_EC_P521},
+-    {"ecdhk163", R_EC_K163},
+-    {"ecdhk233", R_EC_K233},
+-    {"ecdhk283", R_EC_K283},
+-    {"ecdhk409", R_EC_K409},
+-    {"ecdhk571", R_EC_K571},
+-    {"ecdhb163", R_EC_B163},
+-    {"ecdhb233", R_EC_B233},
+-    {"ecdhb283", R_EC_B283},
+-    {"ecdhb409", R_EC_B409},
+-    {"ecdhb571", R_EC_B571},
+-    {"ecdhbrp256r1", R_EC_BRP256R1},
+-    {"ecdhbrp256t1", R_EC_BRP256T1},
+-    {"ecdhbrp384r1", R_EC_BRP384R1},
+-    {"ecdhbrp384t1", R_EC_BRP384T1},
+-    {"ecdhbrp512r1", R_EC_BRP512R1},
+-    {"ecdhbrp512t1", R_EC_BRP512T1},
+     {"ecdhx25519", R_EC_X25519},
+     {"ecdhx448", R_EC_X448}
+ };
+@@ -1495,29 +1441,10 @@ int speed_main(int argc, char **argv)
+         unsigned int bits;
+     } test_curves[] = {
+         /* Prime Curves */
+-        {"secp160r1", NID_secp160r1, 160},
+-        {"nistp192", NID_X9_62_prime192v1, 192},
+         {"nistp224", NID_secp224r1, 224},
+         {"nistp256", NID_X9_62_prime256v1, 256},
+         {"nistp384", NID_secp384r1, 384},
+         {"nistp521", NID_secp521r1, 521},
+-        /* Binary Curves */
+-        {"nistk163", NID_sect163k1, 163},
+-        {"nistk233", NID_sect233k1, 233},
+-        {"nistk283", NID_sect283k1, 283},
+-        {"nistk409", NID_sect409k1, 409},
+-        {"nistk571", NID_sect571k1, 571},
+-        {"nistb163", NID_sect163r2, 163},
+-        {"nistb233", NID_sect233r1, 233},
+-        {"nistb283", NID_sect283r1, 283},
+-        {"nistb409", NID_sect409r1, 409},
+-        {"nistb571", NID_sect571r1, 571},
+-        {"brainpoolP256r1", NID_brainpoolP256r1, 256},
+-        {"brainpoolP256t1", NID_brainpoolP256t1, 256},
+-        {"brainpoolP384r1", NID_brainpoolP384r1, 384},
+-        {"brainpoolP384t1", NID_brainpoolP384t1, 384},
+-        {"brainpoolP512r1", NID_brainpoolP512r1, 512},
+-        {"brainpoolP512t1", NID_brainpoolP512t1, 512},
+         /* Other and ECDH only ones */
+         {"X25519", NID_X25519, 253},
+         {"X448", NID_X448, 448}
+@@ -2017,9 +1944,9 @@ int speed_main(int argc, char **argv)
+ #  endif
+ 
+ #  ifndef OPENSSL_NO_EC
+-    ecdsa_c[R_EC_P160][0] = count / 1000;
+-    ecdsa_c[R_EC_P160][1] = count / 1000 / 2;
+-    for (i = R_EC_P192; i <= R_EC_P521; i++) {
++    ecdsa_c[R_EC_P224][0] = count / 1000;
++    ecdsa_c[R_EC_P224][1] = count / 1000 / 2;
++    for (i = R_EC_P256; i <= R_EC_P521; i++) {
+         ecdsa_c[i][0] = ecdsa_c[i - 1][0] / 2;
+         ecdsa_c[i][1] = ecdsa_c[i - 1][1] / 2;
+         if (ecdsa_doit[i] <= 1 && ecdsa_c[i][0] == 0)
+@@ -2031,6 +1958,7 @@ int speed_main(int argc, char **argv)
+             }
+         }
+     }
++#if 0
+     ecdsa_c[R_EC_K163][0] = count / 1000;
+     ecdsa_c[R_EC_K163][1] = count / 1000 / 2;
+     for (i = R_EC_K233; i <= R_EC_K571; i++) {
+@@ -2059,9 +1987,9 @@ int speed_main(int argc, char **argv)
+             }
+         }
+     }
+-
+-    ecdh_c[R_EC_P160][0] = count / 1000;
+-    for (i = R_EC_P192; i <= R_EC_P521; i++) {
++#endif
++    ecdh_c[R_EC_P224][0] = count / 1000;
++    for (i = R_EC_P256; i <= R_EC_P521; i++) {
+         ecdh_c[i][0] = ecdh_c[i - 1][0] / 2;
+         if (ecdh_doit[i] <= 1 && ecdh_c[i][0] == 0)
+             ecdh_doit[i] = 0;
+@@ -2071,6 +1999,7 @@ int speed_main(int argc, char **argv)
+             }
+         }
+     }
++#if 0
+     ecdh_c[R_EC_K163][0] = count / 1000;
+     for (i = R_EC_K233; i <= R_EC_K571; i++) {
+         ecdh_c[i][0] = ecdh_c[i - 1][0] / 2;
+@@ -2116,6 +2045,7 @@ int speed_main(int argc, char **argv)
+             }
+         }
+     }
++#endif
+     /* default iteration count for the last two EC Curves */
+     ecdh_c[R_EC_X25519][0] = count / 1800;
+     ecdh_c[R_EC_X448][0] = count / 7200;
+--- a/crypto/ec/ecp_smpl.c
++++ b/crypto/ec/ecp_smpl.c
+@@ -145,6 +145,11 @@ int ec_GFp_simple_group_set_curve(EC_GROUP *group,
+         return 0;
+     }
+ 
++    if (BN_num_bits(p) < 224) {
++        ECerr(EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE, EC_R_UNSUPPORTED_FIELD);
++        return 0;
++    }
++
+     if (ctx == NULL) {
+         ctx = new_ctx = BN_CTX_new();
+         if (ctx == NULL)
+--- a/test/ecdsatest.c
++++ b/test/ecdsatest.c
+@@ -176,6 +176,7 @@ static int x9_62_tests(void)
+     if (!change_rand())
+         goto x962_err;
+ 
++#if 0
+     if (!TEST_true(x9_62_test_internal(NID_X9_62_prime192v1,
+                  "3342403536405981729393488334694600415596881826869351677613",
+                  "5735822328888155254683894997897571951568553642892029982342")))
+@@ -186,6 +187,7 @@ static int x9_62_tests(void)
+                  "3238135532097973577080787768312505059318910517550078427819"
+                              "78505179448783")))
+         goto x962_err;
++#endif
+ 
+ # ifndef OPENSSL_NO_EC2M
+     if (!TEST_true(x9_62_test_internal(NID_X9_62_c2tnb191v1,
diff --git a/dev-libs/openssl/openssl-1.0.2q-r200.ebuild b/dev-libs/openssl/openssl-1.0.2r-r200.ebuild
index 44b9547d141e..44b9547d141e 100644
--- a/dev-libs/openssl/openssl-1.0.2q-r200.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2r-r200.ebuild
diff --git a/dev-libs/openssl/openssl-1.1.1a-r1.ebuild b/dev-libs/openssl/openssl-1.0.2r.ebuild
index 0ad3e058c0c9..27fcb6ba6831 100644
--- a/dev-libs/openssl/openssl-1.1.1a-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2r.ebuild
@@ -3,22 +3,33 @@
 
 EAPI="6"
 
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
 
+# openssl-1.0.2-patches-1.6 contain additional CVE patches
+# which got fixed with this release.
+# Please use 1.7 version number when rolling a new tarball!
+PATCH_SET="openssl-1.0.2-patches-1.5"
 MY_P=${P/_/-}
 DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
 HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
+SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
+	!vanilla? (
+		mirror://gentoo/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~chutzpah/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
+	)"
 
 LICENSE="openssl"
-SLOT="0/1.1" # .so version of libssl/libcrypto
-[[ "${PV}" = *_pre* ]] || \
+SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
-IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
 RDEPEND=">=app-misc/c_rehash-1.7-r1
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+	gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
 	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
@@ -28,29 +39,20 @@ DEPEND="${RDEPEND}
 	)"
 PDEPEND="app-misc/ca-certificates"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-make-sure-build_SYS_str_reasons_preserves_errno.patch
-	"${FILESDIR}"/${P}-preserve-errno-on-dlopen.patch
-	"${FILESDIR}"/${P}-fix-wrong-return-value-in-ssl3_ctx_ctrl.patch
-	"${FILESDIR}"/${P}-revert-reduce-stack-usage-in-tls13_hkdf_expand.patch
-	"${FILESDIR}"/${P}-fix-some-SSL_export_keying_material-issues.patch
-	"${FILESDIR}"/${P}-preserve-system-error-number-in-a-few-more-places.patch
-	"${FILESDIR}"/${P}-fix-a-minor-nit-in-hkdflabel-size.patch
-	"${FILESDIR}"/${P}-fix-cert-with-rsa-instead-of-rsaEncryption.patch
-)
-
 # This does not copy the entire Fedora patchset, but JUST the parts that
 # are needed to make it safe to use EC with RESTRICT=bindist.
 # See openssl.spec for the matching numbering of SourceNNN, PatchNNN
 SOURCE1=hobble-openssl
 SOURCE12=ec_curve.c
 SOURCE13=ectest.c
-PATCH37=openssl-1.1.1-ec-curves.patch
+# These are ported instead
+#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC
+#PATCH37=openssl-1.1.0-ec-curves.patch
 FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/'
-FEDORA_GIT_BRANCH='f29'
+FEDORA_GIT_BRANCH='f25'
 FEDORA_SRC_URI=()
-FEDORA_SOURCE=( ${SOURCE1} ${SOURCE12} ${SOURCE13} )
-FEDORA_PATCH=( ${PATCH37} )
+FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 )
+FEDORA_PATCH=( $PATCH1 $PATCH37 )
 for i in "${FEDORA_SOURCE[@]}" ; do
 	FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" )
 done
@@ -74,14 +76,15 @@ src_prepare() {
 		# .spec %prep
 		bash "${WORKDIR}"/"${SOURCE1}" || die
 		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/test/ || die
+		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1
 		for i in "${FEDORA_PATCH[@]}" ; do
 			eapply "${DISTDIR}"/"${i}"
 		done
+		eapply "${FILESDIR}"/openssl-1.0.2p-hobble-ecc.patch
 		# Also see the configure parts below:
 		# enable-ec \
 		# $(use_ssl !bindist ec2m) \
-
+		# $(use_ssl !bindist srp) \
 	fi
 
 	# keep this in sync with app-misc/c_rehash
@@ -92,25 +95,31 @@ src_prepare() {
 	rm -f Makefile
 
 	if ! use vanilla ; then
-		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
-			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
-		fi
+		eapply "${WORKDIR}"/patch/*.patch
 	fi
 
-	eapply_user #332661
+	eapply_user
 
+	# disable fips in the build
 	# make sure the man pages are suffixed #302165
 	# don't bother building man pages if they're disabled
-	# Make DOCDIR Gentoo compliant
 	sed -i \
+		-e '/DIRS/s: fips : :g' \
 		-e '/^MANSUFFIX/s:=.*:=ssl:' \
 		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
 		-e $(has noman FEATURES \
 			&& echo '/^install:/s:install_docs::' \
 			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
+		Makefile.org \
 		|| die
+	# show the actual commands in the log
+	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
+
+	# since we're forcing $(CC) as makedep anyway, just fix
+	# the conditional as always-on
+	# helps clang (#417795), and versioned gcc (#499818)
+	# this breaks build with 1.0.2p, not sure if it is needed anymore
+	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
 
 	# quiet out unknown driver argument warnings since openssl
 	# doesn't have well-split CFLAGS and we're making it even worse
@@ -125,16 +134,7 @@ src_prepare() {
 	append-flags $(test-flags-CC -Wa,--noexecstack)
 	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
 
-	# Prefixify Configure shebang (#141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX%/}&," \
-		-i Configure || die
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
+	sed -i '1s,^:$,#!'${EPREFIX%/}'/usr/bin/perl,' Configure #141906
 	# The config script does stupid stuff to prompt the user.  Kill it.
 	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
 	./config --test-sanity || die "I AM NOT SANE"
@@ -172,15 +172,18 @@ multilib_src_configure() {
 	#	fi
 	#fi
 
+	# https://github.com/openssl/openssl/issues/2286
+	if use ia64 ; then
+		replace-flags -g3 -g2
+		replace-flags -ggdb3 -ggdb2
+	fi
+
 	local sslout=$(./gentoo.config)
 	einfo "Use configuration ${sslout:-(openssl knows best)}"
 	local config="Configure"
 	[[ -z ${sslout} ]] && config="config"
 
-	# Fedora hobbled-EC needs 'no-ec2m'
-	# 'srp' was restricted until early 2017 as well.
-	# "disable-deprecated" option breaks too many consumers.
-	# Don't set it without thorough revdeps testing.
+	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
 	echoit \
 	./${config} \
 		${sslout} \
@@ -188,17 +191,19 @@ multilib_src_configure() {
 		enable-camellia \
 		enable-ec \
 		$(use_ssl !bindist ec2m) \
-		enable-srp \
-		$(use elibc_musl && echo "no-async") \
+		$(use_ssl !bindist srp) \
 		${ec_nistp_64_gcc_128} \
 		enable-idea \
 		enable-mdc2 \
 		enable-rc5 \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl sslv3 ssl3-method) \
+		enable-tlsext \
 		$(use_ssl asm) \
+		$(use_ssl gmp gmp -lgmp) \
+		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
 		$(use_ssl rfc3779) \
 		$(use_ssl sctp) \
+		$(use_ssl sslv2 ssl2) \
+		$(use_ssl sslv3 ssl3) \
 		$(use_ssl tls-heartbeat heartbeats) \
 		$(use_ssl zlib) \
 		--prefix="${EPREFIX%/}"/usr \
@@ -208,27 +213,28 @@ multilib_src_configure() {
 		|| die
 
 	# Clean out hardcoded flags that openssl uses
-	# Fix quoting for sed
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
+	local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAG=::' \
 		-e 's:-fomit-frame-pointer ::g' \
 		-e 's:-O[0-9] ::g' \
 		-e 's:-march=[-a-z0-9]* ::g' \
 		-e 's:-mcpu=[-a-z0-9]* ::g' \
 		-e 's:-m[a-z0-9]* ::g' \
-		-e 's:\\:\\\\:g' \
 	)
 	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
+		-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
+		-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
 		Makefile || die
 }
 
 multilib_src_compile() {
 	# depend is needed to use $confopts; it also doesn't matter
 	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
+	emake -j1 V=1 depend
 	emake all
+	# rehash is needed to prep the certs/ dir; do this
+	# separately to avoid parallel build issues.
+	emake rehash
 }
 
 multilib_src_test() {
@@ -242,7 +248,7 @@ multilib_src_install() {
 		mkdir "${ED%/}"/usr || die
 	fi
 
-	emake DESTDIR="${D%/}" install
+	emake INSTALL_PREFIX="${D%/}" install
 }
 
 multilib_src_install_all() {
@@ -250,20 +256,25 @@ multilib_src_install_all() {
 	# we provide a shell version via app-misc/c_rehash
 	rm "${ED%/}"/usr/bin/c_rehash || die
 
-	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
+	einstalldocs
+
+	use rfc3779 && dodoc engines/ccgost/README.gost
 
 	# This is crappy in that the static archives are still built even
 	# when USE=static-libs.  But this is due to a failing in the openssl
 	# build system: the static archives are built as PIC all the time.
 	# Only way around this would be to manually configure+compile openssl
 	# twice; once with shared lib support enabled and once without.
-	use static-libs || rm -f "${ED%/}"/usr/lib*/lib*.a
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
 
 	# create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
+	dodir ${SSL_CNF_DIR}/certs
+	cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
+	rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
 
 	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED%/}"/usr/share/man || die
+	cd "${ED}"/usr/share/man
 	local m d s
 	for m in $(find . -type f | xargs grep -L '#include') ; do
 		d=${m%/*} ; d=${d#./} ; m=${m##*/}
@@ -278,7 +289,6 @@ multilib_src_install_all() {
 		for s in $(find -L ${d} -type l) ; do
 			s=${s##*/}
 			rm -f ${d}/${s}
-			# We don't want to "|| die" here
 			ln -s ssl-${m} ${d}/ssl-${s}
 			ln -s ssl-${s} ${d}/openssl-${s}
 		done
@@ -286,7 +296,7 @@ multilib_src_install_all() {
 	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
 
 	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED%/}"/etc/sandbox.d/10openssl
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
 
 	diropts -m0700
 	keepdir ${SSL_CNF_DIR}/private
diff --git a/dev-libs/openssl/openssl-1.1.1a.ebuild b/dev-libs/openssl/openssl-1.1.1b-r1.ebuild
index 5b5bb76c6b75..5e05c9dcab04 100644
--- a/dev-libs/openssl/openssl-1.1.1a.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1b-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"
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
 	)"
 PDEPEND="app-misc/ca-certificates"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+)
+
 # This does not copy the entire Fedora patchset, but JUST the parts that
 # are needed to make it safe to use EC with RESTRICT=bindist.
 # See openssl.spec for the matching numbering of SourceNNN, PatchNNN
@@ -60,12 +64,18 @@ src_prepare() {
 		for i in "${FEDORA_SOURCE[@]}" ; do
 			cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die
 		done
+
 		# .spec %prep
 		bash "${WORKDIR}"/"${SOURCE1}" || die
 		cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die
 		cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/test/ || die
 		for i in "${FEDORA_PATCH[@]}" ; do
-			eapply "${DISTDIR}"/"${i}"
+			if [[ "${i}" == "${PATCH37}" ]] ; then
+				# apply our own for OpenSSL 1.1.1b adjusted version of this patch
+				eapply "${FILESDIR}"/openssl-1.1.1b-ec-curves-patch.patch
+			else
+				eapply "${DISTDIR}"/"${i}"
+			fi
 		done
 		# Also see the configure parts below:
 		# enable-ec \
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 17c2747ce1b3..cf3c7c256b35 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -20,6 +20,6 @@ EBUILD protobuf-3.5.2.ebuild 2490 BLAKE2B ce32a12becfa87d89686be239ba8231aae5cd3
 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
-EBUILD protobuf-3.6.1.3.ebuild 2643 BLAKE2B 1a310c148f1b997319700f1f264337ffb4af2d201c509ce5a834767aece1255707f6d167dc5ac56f0c158c288ce7b7ccf717e2ae34bd727c9d2c2bdeea4dedb3 SHA512 d63065c8833053e8c9702fda577249a0dcd9491b2dd8d9165e90f44a1b6d812f693262cc0c996bfb18ba0f4b7be643825627347ffc19c7bdfc7baff698be1723
+EBUILD protobuf-3.6.1.3.ebuild 2632 BLAKE2B a56bc323756a435869076bb5e85d7aec0c777b1709dde5ba78c40cceac648802366710d00508296928cb8b7f8b3fe9f089a38c4bea32d3b877902970cb6a9c82 SHA512 afec4771997a723c61c223465fa7b18d4d8c66676dcc606a1e2d7ca06dc45f7b16c2fc12c816a08507e09c6b98d0271154310125849356e72ddc7b28b9d84a3c
 EBUILD protobuf-3.6.1.ebuild 2537 BLAKE2B 690379408bdd2f3f2c4385d1d0edb3a5ecc7a782fe25ad2ef477201d06a803ea9bfb7ba2529d0ae3e4f820ef98783b4655c5f2eba1571d2e8cc5dedbe4bb188c SHA512 f827ab7dc346f9fb5f70a10fa38840a8483d6a30d16f8c4bf1803585eed430e0064a8733f9a269cd350934356b826cfd90bee489d61599b957555ff3d563b972
 MISC metadata.xml 543 BLAKE2B 43724e6d32707c62de4e1daffe50ba943c66286f6fe2357ec7171dad9feb7407049c26da517442957d61c11229617bd639d60bf070e7eedab8c871956cb3577a SHA512 f5a65ed219ff9f36c9d7bfdfe3bfe080ce0920e72f31f69820cc16822a04cdb38ec3c5d6b776b3c6cfde0bfc74c474558d048b706ac89e9405376e88504b8983
diff --git a/dev-libs/protobuf/protobuf-3.6.1.3.ebuild b/dev-libs/protobuf/protobuf-3.6.1.3.ebuild
index 1d00ee9032f4..d498903c8c4f 100644
--- a/dev-libs/protobuf/protobuf-3.6.1.3.ebuild
+++ b/dev-libs/protobuf/protobuf-3.6.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2018 Gentoo Authors
+# Copyright 2008-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/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.
 
 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"
+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 )"
 
diff --git a/dev-libs/sway/Manifest b/dev-libs/sway/Manifest
deleted file mode 100644
index 46d3dbca5242..000000000000
--- a/dev-libs/sway/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST sway-1.0_rc1.tar.gz 5461910 BLAKE2B a9b3a14dfbb40a616b58fce896f0088dfc722e942129e12e7dae3f2121cb84ffcd565902ee49712275e01d6b6a344642d85d8cf394a35b151725dcc94d19b40d SHA512 6532bae679774fcdb1bcc3044740ff5c56f5f6a007a08e910f4d9ee43ac0488be7666a87106b493923432f975088c90ff47369fa1a01c5e1cb67d3a1f9b74bce
-DIST sway-1.0_rc2.tar.gz 5462530 BLAKE2B 95868df3d03a61be33e04602d6891a2827cd1b5eab08644f74e04c3cbae39e686ee046be5ae9762595774fd22190e2460e246b564db92c50509ad61a16bb0835 SHA512 78c93f2326952d9e56ebf38f5d6b646934230b1bf5fac50cf35f16b2c1753ffa31dd9ec874a05025ed0d1d828b9a8643c78e739abbcfba55301255b3d0ed4a3e
-DIST sway-1.0_rc3.tar.gz 5463453 BLAKE2B 2db52506e6f07f92ab02c48e0cc1b08bad55f355989226f07ed43392f3bfdc088cdd9183b76e349eb83eff331e5236456c1189208619748a9d78ed5ea8de7652 SHA512 95966bfc7431345a6c4c12bf4aa11980f56acc70fc902aa489bb88368bc5412953780ebaa9eae27908dbabf0ed96881ce3bf00cd51879815631b463801ce11cf
-EBUILD sway-1.0_rc1-r1.ebuild 3019 BLAKE2B 4cdcf8fec26f9239093ddc4fefd7883190146f0ca0d0a618d6442a23ee4a0187c05f6a84a55a6defe9dc37a546c61b8e4c6e5fb017b12a159700921e254ea83e SHA512 c1e77282fe4b644f06a0805b2971e88e567c01726b165569ddb8318eb86e0111c1bcbdd7db72aefc51783aa20e59ca8418bc74bc26e6bc1884118d9ceb4b5fbf
-EBUILD sway-1.0_rc2.ebuild 2942 BLAKE2B 045ac141e67d0872e13c2d17d5ad4cefbaff1bcfce81896eb3117e1a05b52c8ec1a27546b5d969370db4891214680431eefea043cca2ba9c154ef6cd40e55511 SHA512 4577e6e6f9c4046bb892dfc1956f9cfb66445576167bda49e23918b1aa5987074409a0a996dd40bdb3fea043801b4233cfbc5b8261cea6d6dd39a691b9147dce
-EBUILD sway-1.0_rc3.ebuild 2942 BLAKE2B 045ac141e67d0872e13c2d17d5ad4cefbaff1bcfce81896eb3117e1a05b52c8ec1a27546b5d969370db4891214680431eefea043cca2ba9c154ef6cd40e55511 SHA512 4577e6e6f9c4046bb892dfc1956f9cfb66445576167bda49e23918b1aa5987074409a0a996dd40bdb3fea043801b4233cfbc5b8261cea6d6dd39a691b9147dce
-EBUILD sway-9999.ebuild 2942 BLAKE2B 045ac141e67d0872e13c2d17d5ad4cefbaff1bcfce81896eb3117e1a05b52c8ec1a27546b5d969370db4891214680431eefea043cca2ba9c154ef6cd40e55511 SHA512 4577e6e6f9c4046bb892dfc1956f9cfb66445576167bda49e23918b1aa5987074409a0a996dd40bdb3fea043801b4233cfbc5b8261cea6d6dd39a691b9147dce
-MISC metadata.xml 2486 BLAKE2B 2d34da83a8d8726b91189d27a400e705a1b0259a1ca577a85e7c21784274a08a0adccc134cd523e193f8635b26dcb1802e37bfa1831f58c922285341b1eadd5e SHA512 9d382307136a126a614a8361828cb018865243b1a8c2a4dd08fbd484afc53320abf6d64dd82dd93a47d8de284552f1857c028c6c72db06199152e1458b636ec0
diff --git a/dev-libs/sway/metadata.xml b/dev-libs/sway/metadata.xml
deleted file mode 100644
index e73eacb7359f..000000000000
--- a/dev-libs/sway/metadata.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bman@gentoo.org</email>
-		<name>Aaron Bauman</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>hilobakho@gmail.com</email>
-		<name>Mykyta Holubakha</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>speedjack95@gmail.com</email>
-		<name>Niccolò Scatena</name>
-	</maintainer>
-	<longdescription lang="en">
-		"SirCmpwn's Wayland window manager" is an i3-compatible window manager
-		for Wayland.
-
-		sway was created to fill the need of an i3-like window manager for
-		Wayland. The upstream i3 developers have no intention of porting i3 to
-		Wayland, and projects proposed by others ended up as vaporware. Many
-		thanks to the i3 folks for providing such a great piece of software, so
-		good that your users would rather write an entirely new window manager
-		from scratch that behaved *exactly* like i3 rather than switch to
-		something else.
-	</longdescription>
-	<use>
-		<flag name="elogind">Enable support for rootless session via elogind</flag>
-		<flag name="fish-completion">Enable fish completion support</flag>
-		<flag name="man">Build and install man pages</flag>
-		<flag name="swaybar">Install 'swaybar': sway's status bar component</flag>
-		<flag name="swaybg">Install 'swaybg': allows to set a desktop background image</flag>
-		<flag name="swayidle">Install 'swayidle': idle manager to run commands when user is inactive</flag>
-		<flag name="swaylock">Install 'swaylock': sway's screen locker</flag>
-		<flag name="swaymsg">Install 'swaymsg': tool for communicating with a running sway instance</flag>
-		<flag name="swaynag">Install 'swaynag': shows a message with buttons</flag>
-		<flag name="tray">Enable support for StatusNotifierItem tray specification</flag>
-		<flag name="wallpapers">Install sway's default wallpaper image</flag>
-		<flag name="X">Enable support for X11 applications (XWayland)</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">swaywm/sway</remote-id>
-		<maintainer status="active">
-			<email>sir@cmpwn.com</email>
-			<name>Drew DeVault</name>
-		</maintainer>
-		<bugs-to>https://github.com/swaywm/sway/issues</bugs-to>
-		<doc>https://github.com/swaywm/sway/wiki</doc>
-		<changelog>https://github.com/swaywm/sway/releases</changelog>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/sway/sway-1.0_rc1-r1.ebuild b/dev-libs/sway/sway-1.0_rc1-r1.ebuild
deleted file mode 100644
index 47262ad9b430..000000000000
--- a/dev-libs/sway/sway-1.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils meson
-
-DESCRIPTION="i3-compatible Wayland window manager"
-HOMEPAGE="https://swaywm.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	MY_PV=${PV/_rc/-rc}
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion"
-REQUIRED_USE="?? ( elogind systemd )
-	tray? ( || ( elogind systemd ) )"
-
-DEPEND="
-	>=dev-libs/json-c-0.13:0=
-	>=dev-libs/libinput-1.6.0:0=
-	dev-libs/libpcre
-	dev-libs/wayland
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-libs/pixman
-	elogind? ( >=sys-auth/elogind-239 )
-	swaybar? ( x11-libs/gdk-pixbuf:2 )
-	swaybg? ( x11-libs/gdk-pixbuf:2 )
-	swayidle? ( dev-libs/swayidle )
-	swaylock? ( dev-libs/swaylock )
-	systemd? ( >=sys-apps/systemd-239 )
-	X? ( x11-libs/libxcb:0= )
-"
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+="~dev-libs/wlroots-9999[elogind=,systemd=,X=]"
-else
-	DEPEND+=">=dev-libs/wlroots-0.3[elogind=,systemd=,X=]"
-fi
-RDEPEND="
-	x11-misc/xkeyboard-config
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	virtual/pkgconfig
-	man? ( >=app-text/scdoc-1.8.1 )
-"
-
-src_prepare() {
-	default
-
-	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
-	use swaybg || sed -e "s/subdir('swaybg')//g" -i meson.build || die
-	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
-	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		-Dtray=$(usex tray enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
-		$(meson_use wallpapers default-wallpaper)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
-		"-Dbash-completions=true"
-		"-Dwerror=false"
-	)
-
-	if use swaybar || use swaybg; then
-		emesonargs+=("-Dgdk-pixbuf=enabled")
-	else
-		emesonargs+=("-Dgdk-pixbuf=disabled")
-	fi
-
-	if [[ ${PV} != 9999 ]]; then
-		emesonargs+=("-Dsway-version=${MY_PV}")
-	fi
-
-	meson_src_configure
-}
-
-pkg_preinst() {
-	if ! use systemd && ! use elogind; then
-		fowners root:0 /usr/bin/sway
-		fperms 4511 /usr/bin/sway
-	fi
-}
-
-pkg_postinst() {
-	if ! use systemd && ! use elogind; then
-		elog ""
-		elog "If you use ConsoleKit2, remember to launch sway using:"
-		elog "exec ck-launch-session sway"
-		elog ""
-		elog "If your system does not set the XDG_RUNTIME_DIR environment"
-		elog "variable, you must set it manually to run Sway. See wiki"
-		elog "for details: https://wiki.gentoo.org/wiki/Sway"
-	fi
-}
diff --git a/dev-libs/sway/sway-1.0_rc2.ebuild b/dev-libs/sway/sway-1.0_rc2.ebuild
deleted file mode 100644
index f1d3935e2f12..000000000000
--- a/dev-libs/sway/sway-1.0_rc2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils meson
-
-DESCRIPTION="i3-compatible Wayland window manager"
-HOMEPAGE="https://swaywm.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	MY_PV=${PV/_rc/-rc}
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion"
-REQUIRED_USE="?? ( elogind systemd )
-	tray? ( || ( elogind systemd ) )"
-
-DEPEND="
-	>=dev-libs/json-c-0.13:0=
-	>=dev-libs/libinput-1.6.0:0=
-	dev-libs/libpcre
-	dev-libs/wayland
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-libs/pixman
-	elogind? ( >=sys-auth/elogind-239 )
-	swaybar? ( x11-libs/gdk-pixbuf:2 )
-	swaybg? ( x11-libs/gdk-pixbuf:2 )
-	swayidle? ( dev-libs/swayidle )
-	swaylock? ( dev-libs/swaylock )
-	systemd? ( >=sys-apps/systemd-239 )
-	X? ( x11-libs/libxcb:0= )
-"
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+="~dev-libs/wlroots-9999[elogind=,systemd=,X=]"
-else
-	DEPEND+=">=dev-libs/wlroots-0.3[elogind=,systemd=,X=]"
-fi
-RDEPEND="
-	x11-misc/xkeyboard-config
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	virtual/pkgconfig
-	man? ( >=app-text/scdoc-1.8.1 )
-"
-
-src_prepare() {
-	default
-
-	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
-	use swaybg || sed -e "s/subdir('swaybg')//g" -i meson.build || die
-	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
-	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		-Dtray=$(usex tray enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
-		$(meson_use wallpapers default-wallpaper)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
-		"-Dbash-completions=true"
-		"-Dwerror=false"
-	)
-
-	if use swaybar || use swaybg; then
-		emesonargs+=("-Dgdk-pixbuf=enabled")
-	else
-		emesonargs+=("-Dgdk-pixbuf=disabled")
-	fi
-
-	meson_src_configure
-}
-
-pkg_preinst() {
-	if ! use systemd && ! use elogind; then
-		fowners root:0 /usr/bin/sway
-		fperms 4511 /usr/bin/sway
-	fi
-}
-
-pkg_postinst() {
-	if ! use systemd && ! use elogind; then
-		elog ""
-		elog "If you use ConsoleKit2, remember to launch sway using:"
-		elog "exec ck-launch-session sway"
-		elog ""
-		elog "If your system does not set the XDG_RUNTIME_DIR environment"
-		elog "variable, you must set it manually to run Sway. See wiki"
-		elog "for details: https://wiki.gentoo.org/wiki/Sway"
-	fi
-}
diff --git a/dev-libs/sway/sway-1.0_rc3.ebuild b/dev-libs/sway/sway-1.0_rc3.ebuild
deleted file mode 100644
index f1d3935e2f12..000000000000
--- a/dev-libs/sway/sway-1.0_rc3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils meson
-
-DESCRIPTION="i3-compatible Wayland window manager"
-HOMEPAGE="https://swaywm.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	MY_PV=${PV/_rc/-rc}
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion"
-REQUIRED_USE="?? ( elogind systemd )
-	tray? ( || ( elogind systemd ) )"
-
-DEPEND="
-	>=dev-libs/json-c-0.13:0=
-	>=dev-libs/libinput-1.6.0:0=
-	dev-libs/libpcre
-	dev-libs/wayland
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-libs/pixman
-	elogind? ( >=sys-auth/elogind-239 )
-	swaybar? ( x11-libs/gdk-pixbuf:2 )
-	swaybg? ( x11-libs/gdk-pixbuf:2 )
-	swayidle? ( dev-libs/swayidle )
-	swaylock? ( dev-libs/swaylock )
-	systemd? ( >=sys-apps/systemd-239 )
-	X? ( x11-libs/libxcb:0= )
-"
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+="~dev-libs/wlroots-9999[elogind=,systemd=,X=]"
-else
-	DEPEND+=">=dev-libs/wlroots-0.3[elogind=,systemd=,X=]"
-fi
-RDEPEND="
-	x11-misc/xkeyboard-config
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	virtual/pkgconfig
-	man? ( >=app-text/scdoc-1.8.1 )
-"
-
-src_prepare() {
-	default
-
-	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
-	use swaybg || sed -e "s/subdir('swaybg')//g" -i meson.build || die
-	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
-	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		-Dtray=$(usex tray enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
-		$(meson_use wallpapers default-wallpaper)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
-		"-Dbash-completions=true"
-		"-Dwerror=false"
-	)
-
-	if use swaybar || use swaybg; then
-		emesonargs+=("-Dgdk-pixbuf=enabled")
-	else
-		emesonargs+=("-Dgdk-pixbuf=disabled")
-	fi
-
-	meson_src_configure
-}
-
-pkg_preinst() {
-	if ! use systemd && ! use elogind; then
-		fowners root:0 /usr/bin/sway
-		fperms 4511 /usr/bin/sway
-	fi
-}
-
-pkg_postinst() {
-	if ! use systemd && ! use elogind; then
-		elog ""
-		elog "If you use ConsoleKit2, remember to launch sway using:"
-		elog "exec ck-launch-session sway"
-		elog ""
-		elog "If your system does not set the XDG_RUNTIME_DIR environment"
-		elog "variable, you must set it manually to run Sway. See wiki"
-		elog "for details: https://wiki.gentoo.org/wiki/Sway"
-	fi
-}
diff --git a/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild
deleted file mode 100644
index f1d3935e2f12..000000000000
--- a/dev-libs/sway/sway-9999.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils meson
-
-DESCRIPTION="i3-compatible Wayland window manager"
-HOMEPAGE="https://swaywm.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	MY_PV=${PV/_rc/-rc}
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion"
-REQUIRED_USE="?? ( elogind systemd )
-	tray? ( || ( elogind systemd ) )"
-
-DEPEND="
-	>=dev-libs/json-c-0.13:0=
-	>=dev-libs/libinput-1.6.0:0=
-	dev-libs/libpcre
-	dev-libs/wayland
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-libs/pixman
-	elogind? ( >=sys-auth/elogind-239 )
-	swaybar? ( x11-libs/gdk-pixbuf:2 )
-	swaybg? ( x11-libs/gdk-pixbuf:2 )
-	swayidle? ( dev-libs/swayidle )
-	swaylock? ( dev-libs/swaylock )
-	systemd? ( >=sys-apps/systemd-239 )
-	X? ( x11-libs/libxcb:0= )
-"
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+="~dev-libs/wlroots-9999[elogind=,systemd=,X=]"
-else
-	DEPEND+=">=dev-libs/wlroots-0.3[elogind=,systemd=,X=]"
-fi
-RDEPEND="
-	x11-misc/xkeyboard-config
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	virtual/pkgconfig
-	man? ( >=app-text/scdoc-1.8.1 )
-"
-
-src_prepare() {
-	default
-
-	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
-	use swaybg || sed -e "s/subdir('swaybg')//g" -i meson.build || die
-	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
-	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		-Dtray=$(usex tray enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
-		$(meson_use wallpapers default-wallpaper)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
-		"-Dbash-completions=true"
-		"-Dwerror=false"
-	)
-
-	if use swaybar || use swaybg; then
-		emesonargs+=("-Dgdk-pixbuf=enabled")
-	else
-		emesonargs+=("-Dgdk-pixbuf=disabled")
-	fi
-
-	meson_src_configure
-}
-
-pkg_preinst() {
-	if ! use systemd && ! use elogind; then
-		fowners root:0 /usr/bin/sway
-		fperms 4511 /usr/bin/sway
-	fi
-}
-
-pkg_postinst() {
-	if ! use systemd && ! use elogind; then
-		elog ""
-		elog "If you use ConsoleKit2, remember to launch sway using:"
-		elog "exec ck-launch-session sway"
-		elog ""
-		elog "If your system does not set the XDG_RUNTIME_DIR environment"
-		elog "variable, you must set it manually to run Sway. See wiki"
-		elog "for details: https://wiki.gentoo.org/wiki/Sway"
-	fi
-}
diff --git a/dev-libs/swayidle/Manifest b/dev-libs/swayidle/Manifest
deleted file mode 100644
index 661625280a87..000000000000
--- a/dev-libs/swayidle/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST swayidle-1.2.tar.gz 9136 BLAKE2B e88eec89007deed59df30f3f89111352b8a1ed464141783cb25b0d0a484e8ea4cfd611f1bd80d9420368d7912979eb0536a6aa583d24504d32bac797a898dba5 SHA512 2539e80a45163bb3e76f7b41f6fd6a1d73d194b7e466f63178b5087d05470fceafba38a26d592a534a01b992a2c0cf0f8fb83805cdf41ee956fea5136cc8fe89
-EBUILD swayidle-1.2.ebuild 1327 BLAKE2B 3aab6275887fdeca3a9b48d652d2e021480754b5f7af8e8e51b4975f9af5f6cca4b95c3227584da4175ad5e88dada571d599f52752630cdc412aed209423baab SHA512 3abfe48096c94afda3c9559b8310b423fc58b9be4062e2b8542abca7c28ab3dba7afbaec3517e05b695130a1c52856e3001bfe0ecf2da9f6aa204b40f5b57f14
-EBUILD swayidle-9999.ebuild 1327 BLAKE2B 3aab6275887fdeca3a9b48d652d2e021480754b5f7af8e8e51b4975f9af5f6cca4b95c3227584da4175ad5e88dada571d599f52752630cdc412aed209423baab SHA512 3abfe48096c94afda3c9559b8310b423fc58b9be4062e2b8542abca7c28ab3dba7afbaec3517e05b695130a1c52856e3001bfe0ecf2da9f6aa204b40f5b57f14
-MISC metadata.xml 1067 BLAKE2B 059ead0c34aebcaa6f8ebd10db8b9b0aaf2df66f84a6ae10d16f3a32d680426aa4733c0788dfe61532bb90d3b92f4bb451e7fd1be822c6866205575fd3c4861a SHA512 99a60f4bcfb76aa7d2a6d4d2a7a6879d9f0ac17f0be3e37d59bef4a4b158b9e685dd5932a02e650b96756dc7f6cba2aac9b1eee95c6d56f4429c23e32a101ad4
diff --git a/dev-libs/swayidle/metadata.xml b/dev-libs/swayidle/metadata.xml
deleted file mode 100644
index 880f87d424ec..000000000000
--- a/dev-libs/swayidle/metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>speedjack95@gmail.com</email>
-		<name>Niccolò Scatena</name>
-	</maintainer>
-	<longdescription lang="en">
-		Sway's idle management daemon, compatible with any Wayland compositor
-		which implements the KDE idle protocol.
-	</longdescription>
-	<use>
-		<flag name="elogind">Enable support for rootless session via elogind</flag>
-		<flag name="fish-completion">Enable fish completion support</flag>
-		<flag name="man">Build and install man pages</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">swaywm/swayidle</remote-id>
-		<maintainer status="active">
-			<email>sir@cmpwn.com</email>
-			<name>Drew DeVault</name>
-		</maintainer>
-		<bugs-to>https://github.com/swaywm/swayidle/issues</bugs-to>
-		<changelog>https://github.com/swaywm/swayidle/releases</changelog>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/swayidle/swayidle-1.2.ebuild b/dev-libs/swayidle/swayidle-1.2.ebuild
deleted file mode 100644
index 774758c9815e..000000000000
--- a/dev-libs/swayidle/swayidle-1.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Idle management daemon for Wayland"
-HOMEPAGE="https://github.com/swaywm/swayidle"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind fish-completion +man systemd zsh-completion"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	dev-libs/wayland
-	elogind? ( >=sys-auth/elogind-237[policykit] )
-	systemd? ( >=sys-apps/systemd-237[policykit] )
-"
-RDEPEND="
-	${DEPEND}
-	!<=dev-libs/sway-1.0_beta1
-	!~dev-libs/sway-1.0_beta2[swayidle]
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	virtual/pkgconfig
-	man? ( app-text/scdoc )
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
-		"-Dbash-completions=true"
-		"-Dwerror=false"
-	)
-	if use systemd; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
-	elif use elogind; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
-	else
-		emesonargs+=("-Dlogind=disabled")
-	fi
-
-	meson_src_configure
-}
diff --git a/dev-libs/swayidle/swayidle-9999.ebuild b/dev-libs/swayidle/swayidle-9999.ebuild
deleted file mode 100644
index 774758c9815e..000000000000
--- a/dev-libs/swayidle/swayidle-9999.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Idle management daemon for Wayland"
-HOMEPAGE="https://github.com/swaywm/swayidle"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind fish-completion +man systemd zsh-completion"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	dev-libs/wayland
-	elogind? ( >=sys-auth/elogind-237[policykit] )
-	systemd? ( >=sys-apps/systemd-237[policykit] )
-"
-RDEPEND="
-	${DEPEND}
-	!<=dev-libs/sway-1.0_beta1
-	!~dev-libs/sway-1.0_beta2[swayidle]
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	virtual/pkgconfig
-	man? ( app-text/scdoc )
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
-		"-Dbash-completions=true"
-		"-Dwerror=false"
-	)
-	if use systemd; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
-	elif use elogind; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
-	else
-		emesonargs+=("-Dlogind=disabled")
-	fi
-
-	meson_src_configure
-}
diff --git a/dev-libs/swaylock/Manifest b/dev-libs/swaylock/Manifest
deleted file mode 100644
index 269bd3cbec91..000000000000
--- a/dev-libs/swaylock/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST swaylock-1.3.tar.gz 32848 BLAKE2B 81ed50839bcb0139e7fc2081bd37e738f3e6ef23e96a5108d1acf56cc3425285f7382576a54201f1bf188883b1da06492074c091877af13832c0140e4e6099fd SHA512 723d758d76f076f3f1539ea0d651f6ad2562659c72eef7e895d7827a0be21db663652fe4ce2609065aff45ff20230879599868cff327ab52b896330ca04d78c4
-EBUILD swaylock-1.3.ebuild 1294 BLAKE2B 7de04b1552c17a2e19a501beacd2e5a990e25057773ea27ecb1af0aeae5a28f3d2754afadf1a76ef3fa4d22e8e5883ac2b0d84f7ca3d91a6532ad86348a66322 SHA512 7e374c8a78f58e4aa0ba38d5aa21596a879162478aec4dc57c9aa131399652091f77972f63b68bdc2faaf08f0ae64fcd36d0ef8b45ab3bf91cb4d495d92f8578
-EBUILD swaylock-9999.ebuild 1294 BLAKE2B 7de04b1552c17a2e19a501beacd2e5a990e25057773ea27ecb1af0aeae5a28f3d2754afadf1a76ef3fa4d22e8e5883ac2b0d84f7ca3d91a6532ad86348a66322 SHA512 7e374c8a78f58e4aa0ba38d5aa21596a879162478aec4dc57c9aa131399652091f77972f63b68bdc2faaf08f0ae64fcd36d0ef8b45ab3bf91cb4d495d92f8578
-MISC metadata.xml 1292 BLAKE2B 9f376dc92ce4d49acf4ad1d79c1b24465d9944e48fce54f23e2e8a076a2d65282ec9fc963246e8e8a85d85b7f9258a17724221e2c63453ed2d1cd98b95853759 SHA512 d53e022caa435f7904f8b9f86c18cf33b9663cf48a8d3d34d6779e2ed4625beafcd30f34d5ecc224f45349846e8716b7587c9ce711216ce7326e27424675c595
diff --git a/dev-libs/swaylock/metadata.xml b/dev-libs/swaylock/metadata.xml
deleted file mode 100644
index 26cfed9c82aa..000000000000
--- a/dev-libs/swaylock/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>speedjack95@gmail.com</email>
-		<name>Niccolò Scatena</name>
-	</maintainer>
-	<longdescription lang="en">
-		Swaylock is a screen locking utility for Wayland compositors. It is
-		compatible with any Wayland compositor which implements the following
-		Wayland protocols: wlr-layer-shell, wlr-input-inhibitor, xdg-output,
-		xdg-shell.
-
-		Swaylock is the official screen locker for <pkg>dev-libs/sway</pkg>.
-	</longdescription>
-	<use>
-		<flag name="fish-completion">Enable fish completion support</flag>
-		<flag name="gdk-pixbuf">Enable additional image format support via the <pkg>x11-libs/gdk-pixbuf</pkg> library</flag>
-		<flag name="man">Build and install man pages</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">swaywm/swaylock</remote-id>
-		<maintainer status="active">
-			<email>sir@cmpwn.com</email>
-			<name>Drew DeVault</name>
-		</maintainer>
-		<bugs-to>https://github.com/swaywm/swaylock/issues</bugs-to>
-		<changelog>https://github.com/swaywm/swaylock/releases</changelog>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/swaylock/swaylock-1.3.ebuild b/dev-libs/swaylock/swaylock-1.3.ebuild
deleted file mode 100644
index 85539fb9095e..000000000000
--- a/dev-libs/swaylock/swaylock-1.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps meson
-
-DESCRIPTION="Screen locker for Wayland"
-HOMEPAGE="https://github.com/swaywm/swaylock"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="fish-completion +gdk-pixbuf +man +pam zsh-completion"
-
-DEPEND="
-	dev-libs/wayland
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
-	pam? ( virtual/pam )
-"
-RDEPEND="
-	${DEPEND}
-	!<=dev-libs/sway-1.0_beta2[swaylock]
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	virtual/pkgconfig
-	man? ( app-text/scdoc )
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		-Dpam=$(usex pam enabled disabled)
-		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
-		"-Dbash-completions=true"
-		"-Dwerror=false"
-	)
-	if [[ ${PV} != 9999 ]]; then
-		emesonargs+=("-Dswaylock-version=${PV}")
-	fi
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	if ! use pam; then
-		fcaps cap_sys_admin usr/bin/swaylock
-	fi
-}
diff --git a/dev-libs/swaylock/swaylock-9999.ebuild b/dev-libs/swaylock/swaylock-9999.ebuild
deleted file mode 100644
index 85539fb9095e..000000000000
--- a/dev-libs/swaylock/swaylock-9999.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps meson
-
-DESCRIPTION="Screen locker for Wayland"
-HOMEPAGE="https://github.com/swaywm/swaylock"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="fish-completion +gdk-pixbuf +man +pam zsh-completion"
-
-DEPEND="
-	dev-libs/wayland
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
-	pam? ( virtual/pam )
-"
-RDEPEND="
-	${DEPEND}
-	!<=dev-libs/sway-1.0_beta2[swaylock]
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	virtual/pkgconfig
-	man? ( app-text/scdoc )
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		-Dpam=$(usex pam enabled disabled)
-		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
-		"-Dbash-completions=true"
-		"-Dwerror=false"
-	)
-	if [[ ${PV} != 9999 ]]; then
-		emesonargs+=("-Dswaylock-version=${PV}")
-	fi
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	if ! use pam; then
-		fcaps cap_sys_admin usr/bin/swaylock
-	fi
-}
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index d73828b93570..1684cd3aba25 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -1,8 +1,4 @@
 AUX uthash-2.0.2-cflags.patch 250 BLAKE2B fc632cc23ffb5ddc89e3d91ea753f0a8f2803890203c7227a01b694603842490027e411e304e3db3960b0920f53f1390010f570bffa38d94a449864cbec938eb SHA512 d87dfbc7be1df49d5c6f06c413800693491f2bc4d0b4b0bddff5f1519a7de4d4ab95d3642e15273d6ddca6a19a9d511859ec999aebf81c8739bab4a7caaebfc3
-DIST uthash-1.9.7.tar.bz2 373059 BLAKE2B 59e24e42a935e44da840ef7a204b43c19bc837b6a5c87ed464143b67608021661603af4f76d143ac5454082f4e391bccc2fd5b443cf23527ca6ef9b530751de0 SHA512 8c02f9ac846a6bfd7292724a3683ae360ff37bba8e3ca98fca106da84976cac9c61766069989ee2c633b20bf82b64658400687a7cfbccab5e98e5fb6cb2e5caa
-DIST uthash-1.9.9.tar.gz 225620 BLAKE2B 4c23cc11c54ac2c8af96522455126a5fdfb1f533078f3f8259b33376d9e08ee6a347edc16951a732ab5c1100e302f81b6f7c7477da1ab0d36b794ce5a3400583 SHA512 40b888529db6baba7bdb0a11c3f782719c40470f6b8e4d75ed480c4c465606e990abf65786156a93f4e2f9c8805cbc098550cc3c62e33b7345fa5bf6d146a8c4
 DIST uthash-2.0.2.tar.gz 191173 BLAKE2B a4a2ddb19fcc9af1105bc07deb8ccbe9c3f04518b609f7cfd16f0a05ec3e16ffb25fb5f0a5f258413f9f52facaa26adf4ea0683415416c12ab36bf11883976ae SHA512 0c2e686eb5a1d6a03a6fa1d42e803fca4e9b60b2d965c635a5a33d487c8d115f1f8155ff99a0e1874b69f6b66c04ea7d8866472a39abe5d1a23ae73f6fa956d7
-EBUILD uthash-1.9.7.ebuild 673 BLAKE2B b0ccbafc68e7a3bd4cd20f18aec6979068f789a830e578c99a4e80c1a7a9988da8b34ebf7141e61377df693ce7c5044f4d958a4e0069a99bb29fd3ecf4191220 SHA512 c8fd82b22f09ab684a8c594e968f1ee95086bbfcfa52b2d07b902a3f7ab8e77f082f5e90e28996c983874e59a8176a39640f6b4de4f802a35eb923d9c0a39518
-EBUILD uthash-1.9.9.ebuild 707 BLAKE2B 99347104c2e53f8e4c6b969508749d3e9ad58243faf5ef49332f7e7b351876b082f4b6562fdd6e8b3271f6accc372776169cd1ed9ac8c4fe56c2be4cf62d48e2 SHA512 47a6d8963b4f1eb2b9716f42c10fcf9f71afb5c1ed92796e920365add71601a63433c33866f8c0ab142ae15e026b199e468c3e5379687dc6b0d4579827fe6eca
-EBUILD uthash-2.0.2.ebuild 631 BLAKE2B eb440dbd0f03d8ee7cd03dfd07490d86fb06850416e231a474b612fe633def9a7c69395b317318cedbc4bf500d34eb4015addb253a05fb785a738df842642203 SHA512 7337f3530027577fef00ef24458c931d47d2b0fbfa7be5420bc9b9822a482430b7bfef5321aeffb6bcd7d3a50ab2d80ec5d79ecaa04afd04f5d2399956c72774
+EBUILD uthash-2.0.2.ebuild 630 BLAKE2B b50b7ecddefaeb260db7ea4b13dbdbf1b27e452391884227dfd21dfaa94d6b72050343cb75713a78bd4a969e986ebc28ebb20c3294231573d4e51c4b3301b1ea SHA512 3018148d04673e7200c560546bafee8077a67bed5ed1b100d8d5054e6113004fd2ebb69e67f7745382a8e7ace9e0f488614586ef8eddc3ca788760f01c72dd59
 MISC metadata.xml 255 BLAKE2B ab14729a41f74f763ae36bef2284978ccc3d74ac40ed604ff797c16ea13029db8add12376bdc72c944356971a31e17a0f8fba2f08a822cf2f69de7792ace0423 SHA512 e251c1de46006091df4d8a908a540cf1251d4e3b0f4f8c3710221e25d9d822a66d9486b3972fb06cfcfeb1f488c351b38b0aa7fab54433f70d63de7ca9dcf479
diff --git a/dev-libs/uthash/uthash-1.9.7.ebuild b/dev-libs/uthash/uthash-1.9.7.ebuild
deleted file mode 100644
index 84b1558ab1c8..000000000000
--- a/dev-libs/uthash/uthash-1.9.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="An easy-to-use hash implementation for C programmers"
-HOMEPAGE="http://uthash.sourceforge.net"
-SRC_URI="mirror://sourceforge/uthash/${P}.tar.bz2"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 sparc x86"
-IUSE="test"
-
-DEPEND="test? ( dev-lang/perl )"
-RDEPEND=""
-
-src_test() {
-	cd tests
-	sed -i "/CFLAGS/s/-O3/${CFLAGS}/" Makefile || die "sed cflags failed"
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	insinto /usr/include
-	doins src/*.h || die "doins failed"
-
-	dodoc doc/txt/{ChangeLog,userguide,ut*}.txt
-}
diff --git a/dev-libs/uthash/uthash-1.9.9.ebuild b/dev-libs/uthash/uthash-1.9.9.ebuild
deleted file mode 100644
index b0fb02ea111b..000000000000
--- a/dev-libs/uthash/uthash-1.9.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-DESCRIPTION="An easy-to-use hash implementation for C programmers"
-HOMEPAGE="http://troydhanson.github.io/uthash/index.html"
-SRC_URI="https://github.com/troydhanson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-DEPEND="sys-apps/sed
-	test? ( dev-lang/perl )"
-RDEPEND=""
-
-src_test() {
-	cd tests || die
-	sed -i "/CFLAGS/s/-O3/${CFLAGS}/" Makefile || die
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	insinto /usr/include
-	doins src/*.h
-
-	dodoc doc/{ChangeLog,todo,userguide,ut*}.txt
-}
diff --git a/dev-libs/uthash/uthash-2.0.2.ebuild b/dev-libs/uthash/uthash-2.0.2.ebuild
index e118b02d7fcb..f0cf8cb9ad68 100644
--- a/dev-libs/uthash/uthash-2.0.2.ebuild
+++ b/dev-libs/uthash/uthash-2.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troydhanson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 sparc x86"
 IUSE="test"
 
 DEPEND="test? ( dev-lang/perl )"
diff --git a/dev-libs/wl-clipboard/Manifest b/dev-libs/wl-clipboard/Manifest
deleted file mode 100644
index 8bd43dd7e55f..000000000000
--- a/dev-libs/wl-clipboard/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST wl-clipboard-1.0.0.tar.gz 25442 BLAKE2B 02e2e99287e1376f26f73a546654e66ddb9d0a85caf457e4a023f0a02cb4d7a9cb3c8ab5840982bf014afb9fc3601722dd4c2fc4239b74a05d309a0a16d20299 SHA512 328c18a9eb2ccfc788e7ab785077ab8d663c75f2ce8f6f434799575fc76ccc89238faf930948bced216d22bee0adfc810af5e84ffc63bc82c4e1d02da4286296
-EBUILD wl-clipboard-1.0.0.ebuild 522 BLAKE2B 0ae35fafd52edd80d4ca0773680d75f3025dd5fa7c21fbeb48daeed2d8d7a783a402b1446e3dc13e76aa3ba953873ec7eead59084fd76096f7d5a12a3c57eb99 SHA512 6ba9f30e8e85028621776fb5fa0ff69090854d1f8e8fb1ad60a526562e90e567533b7da83b599ed7b56f25366e2f7a63e464376249d7660dfd12a17aa9bcf420
-EBUILD wl-clipboard-9999.ebuild 522 BLAKE2B 0ae35fafd52edd80d4ca0773680d75f3025dd5fa7c21fbeb48daeed2d8d7a783a402b1446e3dc13e76aa3ba953873ec7eead59084fd76096f7d5a12a3c57eb99 SHA512 6ba9f30e8e85028621776fb5fa0ff69090854d1f8e8fb1ad60a526562e90e567533b7da83b599ed7b56f25366e2f7a63e464376249d7660dfd12a17aa9bcf420
-MISC metadata.xml 467 BLAKE2B c0262280459dbebc32dfd41583bc0ad9704ea6af0a5a4fb446074f2fea417abc7f4e6e98fdf04348a187ca630235302042ac6b15fc85d5c18c2637882996c687 SHA512 3561bb191a3d0b62c6844a23d29de38897b9e6ecb62934d73dc04bcc70dbb45e2ea6ce2b2b14a54a61f0f17fcc2428cbdb868c58dbb9426eea75c1a7851ec901
diff --git a/dev-libs/wl-clipboard/metadata.xml b/dev-libs/wl-clipboard/metadata.xml
deleted file mode 100644
index 1c9838f357ee..000000000000
--- a/dev-libs/wl-clipboard/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>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<longdescription lang="en">
-		Two command-line Wayland clipboard utilities, wl-copy and wl-paste, that let you easily copy data between the clipboard and Unix pipes, sockets, files and so on.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-libs/wl-clipboard/wl-clipboard-1.0.0.ebuild b/dev-libs/wl-clipboard/wl-clipboard-1.0.0.ebuild
deleted file mode 100644
index d7fcf5337472..000000000000
--- a/dev-libs/wl-clipboard/wl-clipboard-1.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Wayland clipboard utilities"
-HOMEPAGE="https://github.com/bugaevc/wl-clipboard"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bugaevc/${PN}.git"
-else
-	SRC_URI="https://github.com/bugaevc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-libs/wayland"
-RDEPEND="${DEPEND}"
-BDEPEND=""
diff --git a/dev-libs/wl-clipboard/wl-clipboard-9999.ebuild b/dev-libs/wl-clipboard/wl-clipboard-9999.ebuild
deleted file mode 100644
index d7fcf5337472..000000000000
--- a/dev-libs/wl-clipboard/wl-clipboard-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Wayland clipboard utilities"
-HOMEPAGE="https://github.com/bugaevc/wl-clipboard"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bugaevc/${PN}.git"
-else
-	SRC_URI="https://github.com/bugaevc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-libs/wayland"
-RDEPEND="${DEPEND}"
-BDEPEND=""
diff --git a/dev-libs/wlroots/Manifest b/dev-libs/wlroots/Manifest
deleted file mode 100644
index 856802476a2b..000000000000
--- a/dev-libs/wlroots/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST wlroots-0.2.tar.gz 437638 BLAKE2B dd7ca737ba2dfc00e30c83e973616cefb77fccb793161794361422a2fcbdf7299aacea8d794b910fdf06c9a191a89f7f1530d312545d08d126a729be41eeb424 SHA512 b7727b29ed7e5188d5fa6099687f8e6f48b6b3f17f7a6e136956ad6b607054595de3779118bffd4b9730115eaca2f00c2d30d52f4915b2753a749432ec0c3f2a
-DIST wlroots-0.3.tar.gz 473490 BLAKE2B 552bcc5d8bb847dbac5caaddeac830a4de25b4cc80abb6c8b8e610b5e40cc20ff50a145fdfb6bb5f0aa53d218400777ca7a5982c74eb01bd973109b2f8fd7938 SHA512 ccec1426e6ac86fa63f82763d123162fca5be25fb37bbb44a5de651a7764f5325ef21cbe2cf698cb315f0de4719a6bac8eb0ceeffe2111de7c9f4b59e019aaaa
-EBUILD wlroots-0.2.ebuild 2556 BLAKE2B 5081d65b136626ea245b9b847eec1ec7d2c4e2566467f78394f93e889e22ed9abb63267233fd42faa2ec8763e9870a693050547cd7e7d495eb512434172958d7 SHA512 a8960892a10d12e007d9a010f98ad935b109c10433fa3510dd88c38f51519077d33076e35b6890121b7c1eb06c81f22a1c1dfd628cc85f8bac089c0f825f3efe
-EBUILD wlroots-0.3.ebuild 2556 BLAKE2B 00e108c5beda97a66f08ca08e57761a89763b1a1767239c12734eb937156fad57917fe777a10fc9f19e12a2d1ad593520768f97885a7633d04f2234f48352a42 SHA512 ebc9b1bc9473120b10ddf7a94db75209788601b41b8d88d375b75022778a477fc4970979bed478359a95119e703f14b9d896a261f6b9e753f3254d8372e8972d
-EBUILD wlroots-9999.ebuild 2556 BLAKE2B 00e108c5beda97a66f08ca08e57761a89763b1a1767239c12734eb937156fad57917fe777a10fc9f19e12a2d1ad593520768f97885a7633d04f2234f48352a42 SHA512 ebc9b1bc9473120b10ddf7a94db75209788601b41b8d88d375b75022778a477fc4970979bed478359a95119e703f14b9d896a261f6b9e753f3254d8372e8972d
-MISC metadata.xml 1682 BLAKE2B 5713fb5006f1c178ba401ff4831ff991ec1e2270bf7d7961a0727a8934cf9262654fa12b9e13cd14803a8ace50c04dcdcdd37ff6162239fb22c30c84970b1f7a SHA512 88263936158e8d423f79ac9932286674e0b7e6e50f0279cefc07fa3961cda5c65874b14029553ce8b93dd22a7715ca40b1db32d239498d144fc6c901000e5018
diff --git a/dev-libs/wlroots/metadata.xml b/dev-libs/wlroots/metadata.xml
deleted file mode 100644
index 5fb5999bdba5..000000000000
--- a/dev-libs/wlroots/metadata.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bman@gentoo.org</email>
-		<name>Aaron Bauman</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>speedjack95@gmail.com</email>
-		<name>Niccolò Scatena</name>
-	</maintainer>
-	<longdescription lang="en">
-		Pluggable, composable, unopinionated modules for building a Wayland
-		compositor.
-
-		wlroots implements a huge variety of Wayland compositor features and
-		implements them right. By using wlroots, you get high performance,
-		excellent hardware compatibility, broad support for many wayland
-		interfaces, and comfortable development tools.
-
-		wlroots is developed under the direction of the <pkg>dev-libs/sway</pkg> project.
-	</longdescription>
-	<use>
-		<flag name="elogind">Enable support for rootless session via elogind</flag>
-		<flag name="icccm">Use xcb-icccm (from <pkg>x11-libs/xcb-util-wm</pkg>) util library for improved Xwayland introspection</flag>
-		<flag name="rootston">Build the rootston example compositor</flag>
-		<flag name="x11-backend">Enable support for handling input/output devices through <pkg>x11-libs/libxcb</pkg></flag>
-		<flag name="X">Enable support for X11 applications (XWayland)</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">swaywm/wlroots</remote-id>
-		<maintainer status="active">
-			<email>sir@cmpwn.com</email>
-			<name>Drew DeVault</name>
-		</maintainer>
-		<bugs-to>https://github.com/swaywm/wlroots/issues</bugs-to>
-		<doc>https://github.com/swaywm/wlroots/wiki</doc>
-		<changelog>https://github.com/swaywm/wlroots/releases</changelog>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/wlroots/wlroots-0.2.ebuild b/dev-libs/wlroots/wlroots-0.2.ebuild
deleted file mode 100644
index a3427d6c6fc3..000000000000
--- a/dev-libs/wlroots/wlroots-0.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps meson
-
-DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
-HOMEPAGE="https://github.com/swaywm/wlroots"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind icccm rootston systemd x11-backend X"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	>=dev-libs/libinput-1.7.0:0=
-	>=dev-libs/wayland-1.16.0
-	media-libs/mesa[egl,gles2,gbm]
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libxkbcommon
-	x11-libs/pixman
-	elogind? ( >=sys-auth/elogind-237 )
-	icccm? ( x11-libs/xcb-util-wm )
-	systemd? ( >=sys-apps/systemd-237 )
-	x11-backend? ( x11-libs/libxcb:0= )
-	X? (
-		x11-base/xorg-server[wayland]
-		x11-libs/libxcb:0=
-		x11-libs/xcb-util-image
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.15
-	virtual/pkgconfig
-"
-
-FILECAPS=( cap_sys_admin usr/bin/rootston )
-
-src_configure() {
-	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
-	local emesonargs=(
-		"-Dxcb-errors=disabled"
-		-Dlibcap=$(usex filecaps enabled disabled)
-		-Dxcb-icccm=$(usex icccm enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
-		-Dx11-backend=$(usex x11-backend enabled disabled)
-		$(meson_use rootston)
-		"-Dexamples=false"
-		"-Dwerror=false"
-	)
-	if use systemd; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
-	elif use elogind; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
-	else
-		emesonargs+=("-Dlogind=disabled")
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	if use rootston; then
-		dobin "${BUILD_DIR}"/rootston/rootston
-		newdoc rootston/rootston.ini.example rootston.ini
-	fi
-
-	meson_src_install
-}
-
-pkg_postinst() {
-	elog "You must be in the input group to allow your compositor"
-	elog "to access input devices via libinput."
-	if use rootston; then
-		elog ""
-		elog "You should copy (and decompress) the example configuration file"
-		elog "from ${EROOT:-${ROOT}}/usr/share/doc/${PF}/rootston.ini"
-		elog "to the working directory from where you launch rootston"
-		elog "(or pass the '-C path-to-config' option to rootston)."
-		if ! use systemd && ! use elogind; then
-			elog ""
-			elog "If you use ConsoleKit2, remember to launch rootston using:"
-			elog "exec ck-launch-session rootston"
-
-			fcaps_pkg_postinst
-		fi
-	fi
-}
diff --git a/dev-libs/wlroots/wlroots-0.3.ebuild b/dev-libs/wlroots/wlroots-0.3.ebuild
deleted file mode 100644
index c96b1fcfc3fe..000000000000
--- a/dev-libs/wlroots/wlroots-0.3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps meson
-
-DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
-HOMEPAGE="https://github.com/swaywm/wlroots"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind icccm rootston systemd x11-backend X"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	>=dev-libs/libinput-1.7.0:0=
-	>=dev-libs/wayland-1.16.0
-	media-libs/mesa[egl,gles2,gbm]
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libxkbcommon
-	x11-libs/pixman
-	elogind? ( >=sys-auth/elogind-237 )
-	icccm? ( x11-libs/xcb-util-wm )
-	systemd? ( >=sys-apps/systemd-237 )
-	x11-backend? ( x11-libs/libxcb:0= )
-	X? (
-		x11-base/xorg-server[wayland]
-		x11-libs/libxcb:0=
-		x11-libs/xcb-util-image
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.16
-	virtual/pkgconfig
-"
-
-FILECAPS=( cap_sys_admin usr/bin/rootston )
-
-src_configure() {
-	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
-	local emesonargs=(
-		"-Dxcb-errors=disabled"
-		-Dlibcap=$(usex filecaps enabled disabled)
-		-Dxcb-icccm=$(usex icccm enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
-		-Dx11-backend=$(usex x11-backend enabled disabled)
-		$(meson_use rootston)
-		"-Dexamples=false"
-		"-Dwerror=false"
-	)
-	if use systemd; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
-	elif use elogind; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
-	else
-		emesonargs+=("-Dlogind=disabled")
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	if use rootston; then
-		dobin "${BUILD_DIR}"/rootston/rootston
-		newdoc rootston/rootston.ini.example rootston.ini
-	fi
-
-	meson_src_install
-}
-
-pkg_postinst() {
-	elog "You must be in the input group to allow your compositor"
-	elog "to access input devices via libinput."
-	if use rootston; then
-		elog ""
-		elog "You should copy (and decompress) the example configuration file"
-		elog "from ${EROOT:-${ROOT}}/usr/share/doc/${PF}/rootston.ini"
-		elog "to the working directory from where you launch rootston"
-		elog "(or pass the '-C path-to-config' option to rootston)."
-		if ! use systemd && ! use elogind; then
-			elog ""
-			elog "If you use ConsoleKit2, remember to launch rootston using:"
-			elog "exec ck-launch-session rootston"
-
-			fcaps_pkg_postinst
-		fi
-	fi
-}
diff --git a/dev-libs/wlroots/wlroots-9999.ebuild b/dev-libs/wlroots/wlroots-9999.ebuild
deleted file mode 100644
index c96b1fcfc3fe..000000000000
--- a/dev-libs/wlroots/wlroots-9999.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps meson
-
-DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
-HOMEPAGE="https://github.com/swaywm/wlroots"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind icccm rootston systemd x11-backend X"
-REQUIRED_USE="?? ( elogind systemd )"
-
-DEPEND="
-	>=dev-libs/libinput-1.7.0:0=
-	>=dev-libs/wayland-1.16.0
-	media-libs/mesa[egl,gles2,gbm]
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libxkbcommon
-	x11-libs/pixman
-	elogind? ( >=sys-auth/elogind-237 )
-	icccm? ( x11-libs/xcb-util-wm )
-	systemd? ( >=sys-apps/systemd-237 )
-	x11-backend? ( x11-libs/libxcb:0= )
-	X? (
-		x11-base/xorg-server[wayland]
-		x11-libs/libxcb:0=
-		x11-libs/xcb-util-image
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.16
-	virtual/pkgconfig
-"
-
-FILECAPS=( cap_sys_admin usr/bin/rootston )
-
-src_configure() {
-	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
-	local emesonargs=(
-		"-Dxcb-errors=disabled"
-		-Dlibcap=$(usex filecaps enabled disabled)
-		-Dxcb-icccm=$(usex icccm enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
-		-Dx11-backend=$(usex x11-backend enabled disabled)
-		$(meson_use rootston)
-		"-Dexamples=false"
-		"-Dwerror=false"
-	)
-	if use systemd; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
-	elif use elogind; then
-		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
-	else
-		emesonargs+=("-Dlogind=disabled")
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	if use rootston; then
-		dobin "${BUILD_DIR}"/rootston/rootston
-		newdoc rootston/rootston.ini.example rootston.ini
-	fi
-
-	meson_src_install
-}
-
-pkg_postinst() {
-	elog "You must be in the input group to allow your compositor"
-	elog "to access input devices via libinput."
-	if use rootston; then
-		elog ""
-		elog "You should copy (and decompress) the example configuration file"
-		elog "from ${EROOT:-${ROOT}}/usr/share/doc/${PF}/rootston.ini"
-		elog "to the working directory from where you launch rootston"
-		elog "(or pass the '-C path-to-config' option to rootston)."
-		if ! use systemd && ! use elogind; then
-			elog ""
-			elog "If you use ConsoleKit2, remember to launch rootston using:"
-			elog "exec ck-launch-session rootston"
-
-			fcaps_pkg_postinst
-		fi
-	fi
-}
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index be81f832a6b1..f013daf5708b 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,18 +1,14 @@
 AUX xapian-bindings-1.3.6-allow-ruby-2.0.patch 477 BLAKE2B 84cb1c5b1b2a2c811f3a1b88d596969c78a019b335682383826fa2fb47378d61cb257334492e9120de3d555c4668f29fe7fd5b6830d1b838b3a5b33c8ea2a057 SHA512 ed9d5a5542054cb9a239d1adfb6e88bfeb9a4931545b9b60208f9a9a8658822329005fae6707fcaebb08e16ece3a8dc44eb23e0f8dd045bce16aa7b008243198
-DIST xapian-bindings-1.2.24.tar.xz 886148 BLAKE2B b3ed571022f24754b21e64479b7d835820463894f75b02d310288b18e2708a0c9ac6aae332ebc70ce81c312fbf0996608b5b7b287f8ab7946e7eec9820dbe9b3 SHA512 aaedac02ec9fb192ef8b45b07bef5584bc60aff7068c2e3fa0008430ed8296a653780cad04176431d81fe014802df333a3090469dce63204923eead15e6bbaef
 DIST xapian-bindings-1.2.25.tar.xz 1711860 BLAKE2B 66367dbc503333c4f59da8bb5bd4885fe9678aace45365573bac8e0e8e2c712795af2021ff52de9eeabb91f65a2f0447d1963424b1ae6558be95b737d1279e98 SHA512 5d27b2ae2722409ea99a1b9e6bf3f5c61ed9195b67121c090f1533340d3b11c546014985d0989a0725b60a07b392b9705bce054495f423bd3a7c99835aa336c7
-DIST xapian-bindings-1.4.4.tar.xz 1117140 BLAKE2B 2240ecbe136443e9beea8871731a720a7382f0b59533ecb50983ff3cf8142500aaf762e4d1282be26de9f7e862c1071e21fa3cd67c50203d7bbc687fb202fb6d SHA512 006e771b3ea654130b4f76f1a1caee576fd5a3fa6317ca44f1e5483671e8c83073ecbde4f3fc7f84c75590eec53acb59701af4cf9bcd72355ed9d53924492b53
+DIST xapian-bindings-1.4.10.tar.xz 1125168 BLAKE2B cb864021362098243993560724a66964532cd4ff47ce7a746876f1102113d136676b0feb70fa6515a9c9b31627e5363c76f4d65d9928b21822f05fe41b92401c SHA512 e993c33820f7606e17ee6ff5a13bdcb91beceec6a8443298ff06a3160052e96caff3aca30908c68a8a695429ec51189a86404b69c5525e5770741637cc63bbc1
 DIST xapian-bindings-1.4.5.tar.xz 1118884 BLAKE2B 507b06f0121e5a56224250bfe7b19795eb9fd2fba977d12022d054e7b832fd70af70085ad576dab41efcde261f9ecd48179646f1ea67aaa266fb6272358eb69a SHA512 e39ece495e25077990db3d06554306567c52c6f45ad55a65005cb97e18086ee18947e41d0d612157b891b61e015881385bcb082a03aa0c6452565e90d09e8275
-DIST xapian-bindings-1.4.6.tar.xz 1121532 BLAKE2B ecac35f9510fadb39f260c1ebd03220ebe01131e4a5fcc2842778adccdf9bf3e3ae6161dd66dc75774bfb1643f1dccc99a3bbb99894e49dbbdd65f838f827a4d SHA512 e1d8d4c79ef8eb1b890be955b14eca7e9c7aafc6051cf9080d67948455f82ed68ab518343f532cde2a1c9e07d94b3aae8b8f5130db158c6badc9b6d118ceb733
 DIST xapian-bindings-1.4.7.tar.xz 1121700 BLAKE2B f8492113b76aba322c975aa2b957a627a32e5209d8b79f435dc85c899cf14619af6165265e624e2ba8806f3c91dd35d71d98c4a47f5d6f4fba1b7fb83700c0d0 SHA512 c904cd3abf19d68495b0487ea77265fdc92a3cd8b1c2437b89034efd349ce41198bbc4abca49f259f71a1ba0fd269b2cf9b6dd4c1607678a73cbed4de9c5a1d5
 DIST xapian-bindings-1.4.8.tar.xz 1123812 BLAKE2B 5aa496ff3cfe06a40fa8db6a04cdc9041f4a0d9f12c7a61565f10c7d360490a7c8a7c745d91c9eda45b9d9bc58bd6a2bbae02aa9dd7ff1949ac59f7e09b090df SHA512 f979c32b096ecdc7a71b2bd032c6d0e7131f3d304e47e44005989ca79ea1f940c39626c60a8e52ff3cdb2cb380aa5ddf82a99bae08e06629c0bd47d8e0bfa7cc
 DIST xapian-bindings-1.4.9.tar.xz 1123628 BLAKE2B 918748bb99b826485127b16511ae2fe6e7965102738308fc675eca3018c8a7131fd65f54cc396912367c4c6f43c7c28b1ba07591567fe3ae646c3e1480439d0d SHA512 cddc6cedfd571d565619ade0a4c9bfee8d688ca3d06d77368c8d673d3c9d1296b652122836debc84a4d54724c2bf0639a009396bf587ed4b8901a6bfe508851d
-EBUILD xapian-bindings-1.2.24.ebuild 5543 BLAKE2B 77c5f97e4c056eb60674e59a94736fd1276569ac8e7bb89bbb42d9360ffa36ad94065a0b378a9eae21568333dbb3ffbc80877ec69bdf8a98bcbd884b55f07cc7 SHA512 b219ee45083693768bb086e1cb4e4ed2da83786dfa8786210d26bf3b50e0d42efcd2a5b73a90ce1144fd36d666d2c61e20380a13614ff3ddb69e1af09f62179e
 EBUILD xapian-bindings-1.2.25.ebuild 5543 BLAKE2B bc376e81fe32e1f746c5b917133ed66bb825e1a55bf3423cff3271e5aa7f3459a0afc3fef865486655412245e5c6156ffc98d5875b77e596a3b4bddb57be79ba SHA512 be4114e06d5f88f34bfc84ba6ba47723196f2c1160bf5e3d519875f1616fa0382873cf16f42bd423d625a5f80c5b888329c33089fe4bac740bff73d324192501
-EBUILD xapian-bindings-1.4.4.ebuild 3522 BLAKE2B 1dcaa9c2383685db410e9d7421cc55990598444c3360b698ece2d9ce051cf11d28966ec93d08f599e6036154fb5fb7a07855cf5b7dc6319f140a90d6d989312e SHA512 f57942ee1c7b2ffdb42799df989fc3634f3bdde4b61f9e423d7c5e343645cf28eb67b99694a6b82695f371f52c2b235e9e3dff7d07112dda1267a80dbcacadf1
-EBUILD xapian-bindings-1.4.5.ebuild 6502 BLAKE2B a19fd69e1d7366ddd9da3ea04a9052d0cba77115599815ff40b9cd22c30a38c9802e1f6a22b328fd9d06925dbdc5ba1ebd383eb8495236312dc5f9221ea31729 SHA512 7c25358e53d2e57b16068b260df9d6b3929586c6d8ff2288d9a68fb8e1f2b9054d3b50843d3bb275bd137efd696074c15c7181b57697e06f706ea51e2c9813f6
-EBUILD xapian-bindings-1.4.6.ebuild 6509 BLAKE2B 01fbe871700b6d4d7f7f5a93c971c1ec4463dff5a2a7165e7e1b603b5f02fb2b09e3a1286ac0f22b65ed8e7ef6794f5ae692abc8aab59541a9e0537ba67e96e8 SHA512 5ca05c47b2f9344c698b2825c28a378a0c15ea2cb44adc4f4de0a227ae1240dee21b2272d3d3db187e05a4facaa5c1ac877ccdf4448ac2b262a01c336a3ce603
-EBUILD xapian-bindings-1.4.7.ebuild 6501 BLAKE2B e136abf452c99443466e7dcbecd5134370c3994108c642cde88fa540f5267e9d4a61bdec4f5c1dfb5d43dba6d3ff63da0edd755195e02b46b8b46eead74b8252 SHA512 90bb9de80e584abb653564dca8a58ef6310300a326c1201b3cd49d16f5489dfe291d187d272193e9c9fc8685430598d836d1db8e9561a2ac318bd25a3167e389
-EBUILD xapian-bindings-1.4.8.ebuild 6506 BLAKE2B b694b49a182513a041891384e190b2322ee9fe00a7d67714d63ef24379c6eeb8b3c051d410c8fd17f083686ccc206d61f4eac85ef87233c48272ea14f5bd5d81 SHA512 c8e3b5fe54651c9825badcad0093f83d6e9f819f335a42f5aa686aa58e29c6ff2493bb38bb9b8a7ccc6436f044139ecb8718f7cbc96035d3fea47df7bcf8aa96
-EBUILD xapian-bindings-1.4.9.ebuild 6506 BLAKE2B 2e054e8eb103a8d05439594f9c3df88700f928434a5463f1eaad828f8ffbe43e4cc138932f359c2b6505ea5539c4cc3be9ee92b45a6a87f751308617666750e2 SHA512 162575906ac0a348a0dcbc419bbfe5af6bdf1666b94ecfcca01206db2b38d0e24f184abde3f5d6f0e71d37420387eba33bae31dd59930e4cae56ef8eec2d1b89
+EBUILD xapian-bindings-1.4.10.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
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.24.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.24.ebuild
deleted file mode 100644
index 6d733e8d95b8..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.24.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-USE_PHP="php5-6"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-#mono violates sandbox, we disable it until we figure this out
-#inherit java-pkg-opt-2 mono-env php-ext-source-r2 python
-inherit java-pkg-opt-2 php-ext-source-r2 python-r1 toolchain-funcs
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
-#IUSE="java lua mono perl php python ruby tcl"
-#REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
-IUSE="java lua perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua perl php python ruby tcl ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMONDEPEND="dev-libs/xapian:0/1.2.22
-	lua? ( dev-lang/lua:0 )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:= )
-	tcl? ( >=dev-lang/tcl-8.1:0= )"
-#	mono? ( >=dev-lang/mono-1.0.8 )
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.3 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.3 )"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-	if use java; then
-		sed \
-			-e 's/$(JAVAC)/$(JAVAC) $(JAVACFLAGS)/' \
-			-i java{/,/org/xapian/errors/,/org/xapian/}Makefile.in || die "sed failed"
-	fi
-
-	if use python; then
-		sed \
-			-e 's:\(^pkgpylib_DATA = xapian/__init__.py\).*:\1:' \
-			-e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian.so|' \
-			-i python/Makefile.in || die "sed failed"
-	fi
-}
-
-src_configure() {
-	if use java; then
-		CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-	fi
-
-	if use perl; then
-		export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-		export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-	fi
-
-	if use lua; then
-		export LUA_LIB="$($(tc-getPKG_CONFIG) --variable=INSTALL_CMOD lua)"
-	fi
-
-	econf \
-		$(use_with java) \
-		$(use_with lua) \
-		$(use_with perl) \
-		$(use_with php) \
-		$(use_with python) \
-		$(use_with ruby) \
-		$(use_with tcl)
-#		$(use_with mono csharp) \
-
-	# PHP and Python bindings are built/tested/installed manually.
-	sed -e "/SUBDIRS =/s/ php//" -i Makefile || die "sed Makefile"
-	sed -e "/SUBDIRS =/s/ python//" -i Makefile || die "sed Makefile"
-}
-
-src_compile() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			cp -r php php-${php_slot}
-			emake -C php-${php_slot} \
-				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
-				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
-				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
-				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)"
-		done
-	fi
-
-	if use python; then
-		python_copy_sources
-#		building() {
-#			emake -C python \
-#				PYTHON="$(PYTHON)" \
-#				PYTHON_INC="$(python_get_includedir)" \
-#				PYTHON_LIB="$(python_get_libdir)" \
-#				PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
-#				pkgpylibdir="$(python_get_sitedir)/xapian"
-#		}
-		building() {
-			emake -C python \
-				PYTHON_INC="$(python_get_includedir)" \
-				pkgpylibdir="$(python_get_sitedir)/xapian"
-				VERBOSE="1"
-		}
-		python_foreach_impl building
-	fi
-}
-
-src_test() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			emake -C php-${php_slot} \
-				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
-				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
-				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
-				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" \
-				check
-		done
-	fi
-
-	if use python; then
-		testing() {
-			emake -C python \
-				PYTHON_INC="$(python_get_includedir)" \
-				pkgpylibdir="$(python_get_sitedir)/xapian" \
-				VERBOSE="1" \
-				check
-		}
-		python_foreach_impl testing
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	if use java; then
-		java-pkg_dojar java/built/xapian_jni.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
-		rm "${D}/${S}/java/built/libxapian_jni.so"
-		rmdir -p "${D}/${S}/java/built"
-		rmdir -p "${D}/${S}/java/native"
-	fi
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			emake DESTDIR="${D}" -C php-${php_slot} \
-				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
-				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
-				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
-				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" \
-				install
-		done
-
-		php-ext-source-r2_createinifiles
-	fi
-
-	if use python; then
-		installation() {
-			emake -C python \
-				DESTDIR="${D}" \
-				PYTHON_INC="$(python_get_includedir)" \
-				pkgpylibdir="$(python_get_sitedir)/xapian" \
-				VERBOSE="1" \
-				install
-		}
-		python_foreach_impl installation
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}"
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.6.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.10.ebuild
index 863e7f5c4340..2420ca3c9f51 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.6.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,7 +6,7 @@ EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
+USE_PHP="php7-1 php7-2 php7-3"
 
 PHP_EXT_NAME="xapian"
 PHP_EXT_INI="yes"
@@ -29,9 +29,10 @@ REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	ruby? ( || ( $(ruby_get_use_targets) ) )"
 
-COMMONDEPEND=">=dev-libs/xapian-1.4.6:0/30
+COMMONDEPEND=">=dev-libs/xapian-1.4.9:0/30
 	lua? ( dev-lang/lua:= )
 	perl? ( dev-lang/perl:= )
+	php? ( dev-lang/php:=[-threads] )
 	python? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		${PYTHON_DEPS}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.4.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.4.ebuild
deleted file mode 100644
index b03aeae6e541..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.4.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="threads(+)"
-
-USE_PHP="php5-6"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-inherit distutils-r1 libtool java-pkg-opt-2 mono-env php-ext-source-r2 toolchain-funcs
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
-
-COMMONDEPEND="dev-libs/xapian:0/30
-	lua? ( dev-lang/lua:= )
-	perl? ( dev-lang/perl:= )
-	python? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	ruby? ( dev-lang/ruby:= )
-	tcl? ( dev-lang/tcl:= )
-	mono? ( dev-lang/mono )"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.6 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	use java && java-pkg-opt-2_src_prepare
-
-	# http://trac.xapian.org/ticket/702
-	export XAPIAN_CONFIG="/usr/bin/xapian-config"
-
-	# Accept ruby 2.0 - patch configure directly to avoid autoreconf
-	epatch "${FILESDIR}"/${PN}-1.3.6-allow-ruby-2.0.patch
-
-	if use python; then
-		python_copy_sources
-	fi
-}
-
-src_configure() {
-	local conf=(
-		--disable-documentation
-		--without-csharp
-		--without-python
-		--without-python3
-	)
-
-	if use java; then
-		export CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-		conf+=( --with-java )
-	fi
-
-	if use perl; then
-		export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-		export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-		conf+=( --with-perl )
-	fi
-
-	if use lua; then
-		export LUA_LIB="$($(tc-getPKG_CONFIG) --variable=INSTALL_CMOD lua)"
-		conf+=( --with-lua )
-	fi
-
-	if use php; then
-		if has_version "=dev-lang/php-7*"; then
-			conf+=( --with-php7 )
-		else
-			conf+=( --with-php )
-		fi
-	fi
-
-	use ruby && conf+=( --with-ruby )
-	use tcl  && conf+=( --with-tcl )
-	use mono && conf+=( --with-csharp )
-
-	econf ${conf[@]}
-
-	python_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-ruby
-			--without-tcl
-		)
-		if python_is_python3; then
-			myconf+=( --with-python3 )
-		else
-			myconf+=( --with-python )
-		fi
-
-		# Avoid sandbox failures when compiling modules
-		addpredict "$(python_get_sitedir)"
-
-		econf "${myconf[@]}"
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-}
-
-src_compile() {
-	default
-	if use python; then
-		unset PYTHONDONTWRITEBYTECODE
-		python_foreach_impl run_in_build_dir emake
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use java; then
-		java-pkg_dojar java/built/xapian_jni.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso java/.libs/libxapian_jni.so
-		rm -rf "${D}var" || die "could not remove java cruft!"
-	fi
-
-	use php && php-ext-source-r2_createinifiles
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}" || die
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
index 2877acc8e0b6..d43c5849231c 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.5.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.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,7 +6,7 @@ EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
+USE_PHP="php5-6 php7-1 php7-2"
 
 PHP_EXT_NAME="xapian"
 PHP_EXT_INI="yes"
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 342635710d6d..65f839635990 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,7 +6,7 @@ EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
+USE_PHP="php5-6 php7-1 php7-2"
 
 PHP_EXT_NAME="xapian"
 PHP_EXT_INI="yes"
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 88203e937fa1..7d27c84b709c 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.8.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.8.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"
@@ -6,7 +6,7 @@ EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
+USE_PHP="php5-6 php7-1 php7-2"
 
 PHP_EXT_NAME="xapian"
 PHP_EXT_INI="yes"
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 c0db86d58c50..50b7c1033b1b 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.9.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.9.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"
@@ -6,7 +6,7 @@ EAPI="6"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="threads(+)"
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
+USE_PHP="php5-6 php7-1 php7-2"
 
 PHP_EXT_NAME="xapian"
 PHP_EXT_INI="yes"
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 590d29418da5..394e0a8734b1 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,16 +1,14 @@
 DIST xapian-core-1.2.24.tar.xz 3210192 BLAKE2B 062f0c15ce87fb64b0eec5e5e54b76c443d0581feab44791bce6925f0f77385b423218dc7006d7e095cc9764fffc73a74a067923c44f51816d94b731d001f903 SHA512 1f8ae5848f94b5f0bee03024f12ae8c336b6d85e58f7b36e885fe604f9fb962c0525e1f44e6cfcd183e811226c61b23f0f2fcc35c7d2e63544b19347a0f96c80
 DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe
-DIST xapian-core-1.4.4.tar.xz 2807952 BLAKE2B 92f30c063dca4bd7806c1ab025d6b75564acc3a33a129bdc2cbf496518897addb2b63bd772b648a7a199041ea7b90534fb5c4692e94e1e3ef0a7f20301e28e8e SHA512 dc88bab1d82c68b29d51c2113319ddb5d16840f3544b9d5fcc7a3671f97d58f16ddff58b865ad3521ea778cbaacf73fe7346bb514a1275f1f739283a4128d001
+DIST xapian-core-1.4.10.tar.xz 2973780 BLAKE2B 6ef86a4c02e6721f434e33ea27a37ddac9cee62f0c9eed8c6334cadb62dd544be66405dd359dd944cf1ab12742c10e786b7300c4987e33ce33da9d9df4e428d4 SHA512 fa716d6f8c04edb297d99dad4d7835f7874837ab3c39d7017e43708cde6992c596e579418be17b79772e002bd23b94169812523a1abd9519b1dd3df474f027d9
 DIST xapian-core-1.4.5.tar.xz 2810612 BLAKE2B 7784e69e3ca064751d829173949fcde65661c2c2070fdc8392cf2b6d40874a3e5b1265e61f25dd39b33e179b3fe3842b67f33a55523c3a18e9b65528e6a23a1e SHA512 cff97a856a406583ca81164ddb704a0eeae7d8d6f94ce3b3f53d5208d657423e87dd06bdc7acb5e5904765bce1cefbc98365cde315c1d46f7b18cfba7b022ae6
-DIST xapian-core-1.4.6.tar.xz 2839964 BLAKE2B ab35e3098d8cf99656539968171073683811dc9a98b7d26e389c0cb1e8d1b70f9007e0ba61defe496713cb0f304a0fed7afa253174e900c0756084ab40721573 SHA512 f08168eba26a24ea00c2219d2cdfac1d904b51162fdd98d437564786375245e00010986a7d6e9c8c7548ae19aab80434b5cb0051252f902b40db2976b1008fe2
 DIST xapian-core-1.4.7.tar.xz 2874172 BLAKE2B 917a35ca717ed4437f4a617ce0b6ac07d5936e07aac6bfa9d6878c12ed0c38e7ca994ad943b6dc7a5cd2fe131a445c5a7859f2286c2201dd048020569ce1a0bf SHA512 9e77a78bd63036966ebb9bbed91e36fef17b37c9465c8d4b7dc8041f0e24b040e6520de645babfeeade952771d145176a204328718cfa8bc2291bb6fdbe840d2
 DIST xapian-core-1.4.8.tar.xz 2880432 BLAKE2B 8468a33614d8c7617755cfe4cc79e72ab42612a79be9fb684525e268efe80c42ce902a60a44dc5548c70b719d752e15927ce24b4ab457905022ae806bffb1f11 SHA512 9ed1f34ec1bf53a4dc628ebb8d080af79a4ac6a315bf1ae52441f0ac3a63e5478ed02887382116b28157b926e685fdc730489426edce560aa4bba27cb7295e48
 DIST xapian-core-1.4.9.tar.xz 2880024 BLAKE2B 25272128fbbd7cb23dab92c87be03fee8dae5b742f26a66b9c51c649a7826639e52124f5f0748d3c12cce81a7875ed217931ddbe2b04303a08709c4a773a617f SHA512 1af23815ff9358d6407723d1a7d3dc00df8f45f4808ccaa4c57f38197763fdc2d62cb7b080fab737408db42ced85707021eac881d80767248ea22aff8a2e4aa3
 EBUILD xapian-1.2.24.ebuild 1556 BLAKE2B 640a8b36ebde9e7ba51ba28d5da9f99a5a6f0f150d8bbda4ef643a942359125b56d222d09755c4fb87fa420a64740a782eee78231d8b35b4389c5213040d5cc8 SHA512 d2a9ee33d454d8d0a67e2ed98c0dd3b7733fbe3b1a25b78b408fbfeab6570943e1a94a556c9eb57b000ff32a2a19d0a861e9018a198f20eb0e53e72c0fe5b314
 EBUILD xapian-1.2.25.ebuild 1825 BLAKE2B a02e05c9fa4cc3ad0fefd2feb2dfc24a6f2be4dda3cec34b5af474435702bd89ebddd1bc3d22c7e531d833e6f90be158f0b25f76f417821271b4c8ac647f2839 SHA512 ff3fd69f399c3521ee25c745d11454b2e6b1a5bca5ff828bfa71f70c72199b2150e6c1d8fc2cedae62203c73c9e52f3aabfee5107042f26e0eb707b47a745c8e
-EBUILD xapian-1.4.4.ebuild 1911 BLAKE2B c41444f3a2e7bb7365d56d960b411ed1fec08cd5c3ceac87b92ddc157d72e23b876f57f30ca2adf89c597949f9ed4cd5eb2099176c9bccd99dca34e7074f74af SHA512 06bc64d5ccb5ef6559ffd285d36952009db2511a7e34ffc43cfc13580e75cf1c9aa2c14ffb069dd25381f08276e9a57cea10f36a6e7a9a09138cea36090856cd
+EBUILD xapian-1.4.10.ebuild 1892 BLAKE2B 13d15baded9f8246e822e8505b84a5040c2dc9ebe850cce9813cc194d00e3ccec98bee74f2dc8227c3c55477cb2d26aa278936bc49933ca790ae3b1106b756c8 SHA512 9b8f75942e12af0ac514f568d6021f3b5b0e3913712e24ae104c2f9d9807e8a1ade91d8c3f7d53eca1c8224a9c2bbedeb87b4ce8f666a0bbb6bf9f3feaba7756
 EBUILD xapian-1.4.5.ebuild 1912 BLAKE2B c259fbd9eaa377a7be7cac43d9c50b4d60555cd16b8869efa42df5d4122574e0288c61e58614d5ab890fd514c6a1641d302c037bd404b643a0aab27df9da6446 SHA512 08c76112cfbf22c5be648af2496c312586e0238cc5056221ec544e834b40f77c9faf93cb35d8887f8537603de8fe4f1756b6475d9d420858f0fdc9b37939b3cd
-EBUILD xapian-1.4.6.ebuild 1920 BLAKE2B fe80a4843a268ac96c1c9111ea609dd13b075a0b4c3940a18610a139687bd6bf87b1963416ee4ab723a99b1b8f2fe1db1087d86fdece595052987485cd7a90f2 SHA512 eeba9a1598d776d13150d627b48155edcce82ee8c40408373a8de8ee2f1add0db5fa6536f19867b3d83800d208d66f559c64e548fe11ffff3cc18f7c352423f8
 EBUILD xapian-1.4.7.ebuild 1914 BLAKE2B 70a2b93aa714d6d1f47e403b95b06e15a4fb9f6ecdaf1a5e118518a9bef7bd7ef945db2b92bc17ef92820421af847ac20bdc743e51ea999ee0d156900e86e7c4 SHA512 6a07f7a1a46fdb28cd037c90a2910449c9fb6a5db262fccd4b19009ae3d391a56ba8bacb39bb839a2d14908222348178517430a065c532c2e7a9da4df2861a96
 EBUILD xapian-1.4.8.ebuild 1920 BLAKE2B fe80a4843a268ac96c1c9111ea609dd13b075a0b4c3940a18610a139687bd6bf87b1963416ee4ab723a99b1b8f2fe1db1087d86fdece595052987485cd7a90f2 SHA512 eeba9a1598d776d13150d627b48155edcce82ee8c40408373a8de8ee2f1add0db5fa6536f19867b3d83800d208d66f559c64e548fe11ffff3cc18f7c352423f8
 EBUILD xapian-1.4.9.ebuild 1920 BLAKE2B fe80a4843a268ac96c1c9111ea609dd13b075a0b4c3940a18610a139687bd6bf87b1963416ee4ab723a99b1b8f2fe1db1087d86fdece595052987485cd7a90f2 SHA512 eeba9a1598d776d13150d627b48155edcce82ee8c40408373a8de8ee2f1add0db5fa6536f19867b3d83800d208d66f559c64e548fe11ffff3cc18f7c352423f8
diff --git a/dev-libs/xapian/xapian-1.4.6.ebuild b/dev-libs/xapian/xapian-1.4.10.ebuild
index e76f3f7d2225..ef53864e2d91 100644
--- a/dev-libs/xapian/xapian-1.4.6.ebuild
+++ b/dev-libs/xapian/xapian-1.4.10.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit eutils multilib-minimal
 
@@ -69,8 +69,6 @@ multilib_src_install_all() {
 	use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
 
 	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	prune_libtool_files --all
 }
 
 multilib_src_test() {
diff --git a/dev-libs/xapian/xapian-1.4.4.ebuild b/dev-libs/xapian/xapian-1.4.4.ebuild
deleted file mode 100644
index b9da678788a0..000000000000
--- a/dev-libs/xapian/xapian-1.4.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils multilib-minimal
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-solaris"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +glass +chert +inmemory"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="inmemory? ( chert )"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myconf=""
-
-	if use cpu_flags_x86_sse2; then
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			myconf="${myconf} --enable-sse=sse"
-		else
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use glass || myconf="${myconf} --disable-backend-glass"
-	use chert || myconf="${myconf} --disable-backend-chert"
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-
-	myconf="${myconf} --enable-backend-remote --program-suffix="
-
-	ECONF_SOURCE=${S} econf $myconf
-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/xapian/postingsource.h
-	/usr/include/xapian/attributes.h
-	/usr/include/xapian/valuesetmatchdecider.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/types.h
-	/usr/include/xapian/positioniterator.h
-	/usr/include/xapian/registry.h
-)
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	# bug #573466
-	ln -sf "${D}usr/bin/xapian-config" "${D}usr/bin/xapian-config-1.3"
-
-	use doc || rm -rf "${D}usr/share/doc/xapian-core-${PV}"
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	prune_libtool_files --all
-}
-
-multilib_src_test() {
-	emake check VALGRIND=
-}
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index afc2d834b410..8b5aafd82af6 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -5,7 +5,7 @@ AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aa
 DIST xerces-c-3.1.4.tar.gz 6992545 BLAKE2B 463e721843632b13f4b5c845f14cf9ab4f093085558858b435ae5a3122951ab590f9e56f43add1aeaf7dc244814710be804ab0331a1d1e8073919ad9d3b61068 SHA512 8afd775bac0345a2714b77a1ae2cfb8ae67f0239ec7370de7d89612dec64d2e1df48612c875fe239ab6f2eb31914c2d3914617e6b34a1bae0bbb14e4dbc787b5
 DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
 EBUILD xerces-c-3.1.4-r1.ebuild 2824 BLAKE2B 07765e9c4ab0af4f1eac7b3630faee0b5c4eedf4d48e3934e69ef24554ec2fcb5bd354404e1ad4c99c5260519002c2bba6d994303a9eec80938a30c7141140c6 SHA512 0bc0fd5c0b5bf2346700ba8435fe3fd48f08494166494d1ff5c36a0f348f563ba972100a7095583ff5f4569262d515a15ea6fa5e83468572179215d1f99aa5b7
-EBUILD xerces-c-3.2.2-r1.ebuild 2959 BLAKE2B 79a26e863623d246fe92a398cadd7008da7a4b6ddb987b4f0dbbe5ace547c09264bc9e05aea9bd1a6f11788947cea16759487c40d4aac15ea9b9b60c1a91cde4 SHA512 57b41221a6857bcf61496a6c14998a81f447ab87cb1d60e0a933353476ba5e132db26afdd645a252f05f583c032a5040f8617a9e0320d46bcc6bff52b3b64d4c
+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
diff --git a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
index cd9703988cf3..51313f2856e5 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
-	KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 LICENSE="Apache-2.0"