gentoo resync : 10.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
commit: 71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree: 9f1f0dee23e13658e52f49437befe78427148c51 /dev-libs
parent: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
168 files changed, 1303 insertions, 1405 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index e59f3e9734f3..6fcb9373fa57 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest
index 1367bcceb3e5..7d42055dbf03 100644
--- a/dev-libs/angelscript/Manifest
+++ b/dev-libs/angelscript/Manifest
@@ -1,3 +1,3 @@
 DIST angelscript_2.34.0.zip 2020026 BLAKE2B f002c67d812cc6453d1e93ffba4aaa4c300926996b74f8d596642625e251ccd14b97473f8f0ff595e3233a3ebc7654c94420ae761eaa0b67439e18472f8df977 SHA512 c26dba452ab52c300da9c95fde8398acf4840cbc0e653ededf978d4a3e942cfe5b77292c74c49dc0279250a27cfd324c696c49d139a97c844b2a1eead9aae2f4
-EBUILD angelscript-2.34.0.ebuild 988 BLAKE2B 92d955c60d04d0485fd4951059715511366249a8ce320bd9f28d05cd1f2e836ac5d585d06a2bc9c51e51ba38851bc3df991f079c5c0b94342fc6cdbe0f7b2e9c SHA512 128b82aededbc1948d7d5f462d545bda6112e7daf9062d858fdc64684431365986546074ac769ec94b482df1f135d514ce16e5cad653f3a21da8b5312c34c99d
+EBUILD angelscript-2.34.0.ebuild 986 BLAKE2B bfde272cb9aa10ffbc709b24a81fe3bb60ffa71d3bc5bf2b47bea9a112e1e16b7c02ec097efc2658323506e41d18f9dceeea5971ef23436fb97460d780b7df66 SHA512 823aaef33e68b2cdb77a37510f5106245bd4a5d8af0f7d8a8a4e3331be62c64c17ac10c2940f77baabfa4f2e9cc0082d10ff960e26c9f0052cba9d9918dd63e2
 MISC metadata.xml 406 BLAKE2B 0c09c377443b9bd89ac3d6b59c77bb306835e1640cfc58715a71cbe0dfbff13ed08c9e4b429a5a968c2738638dfdb87bba93293b6a09a92b7ab04c38a9786f06 SHA512 a9d0b8fdf4cc34c08dfc521920e54c42cd23e6ce65981a9ab895cae55be6e51bcdfce6fe5889c1daf812094cddfc44bb20c5439ba5d668b6a45d74fd9db3e891
diff --git a/dev-libs/angelscript/angelscript-2.34.0.ebuild b/dev-libs/angelscript/angelscript-2.34.0.ebuild
index d2bea73121f6..d1eedac8af5f 100644
--- a/dev-libs/angelscript/angelscript-2.34.0.ebuild
+++ b/dev-libs/angelscript/angelscript-2.34.0.ebuild
@@ -33,7 +33,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake -C ${PN}/projects/gnuc \
-		  DESTDIR="${D%/}" \
+		  DESTDIR="${D}" \
 		  PREFIX="${EPREFIX}"/usr \
 		  LIBDIR_DEST='$(PREFIX)'/$(get_libdir) \
 		  install_header install_shared \
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index b12cf21e8759..2e471e6e6444 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,5 +1,5 @@
 AUX apr-util-1.5.3-sysroot.patch 1234 BLAKE2B 58e66e338ae936b7c206eda88a97f99785a88d79c32245c4c028f00b98a33d3f29764f66646e486d828d8cc655cbe59813236b7c5ca7060643771e4ab9b915c6 SHA512 44ee2a9cf61587f05d43976d40023f6313b310c3eeb37299840445e3faec7f0352367875f515b21d3b1fcdc8c082d8584a21cf8187deb1f6f69187c14f84f0b7
 AUX apr-util-1.6.1-fix-gdbm-error-handling.patch 2272 BLAKE2B ca68b87d6f19614cfb18e1df4fe0122fbf08167de7781fb58ae0219f766c1795109ee050b2900daf63e597a455c647f5da274e90aa0e4a436e8c87c19f962c45 SHA512 9f246ff853407fe59d135481c9afff6b3ef26c753c41b52134dde44df269e25c1f3249980994a000b24417f30692bf62a044d450a47af259cdfb76fbb6b70b8d
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
-EBUILD apr-util-1.6.1-r3.ebuild 3728 BLAKE2B a13823bef14bfe8cd4b742a92a5f09e80c542cfcc3eb1812a7961f7737c56480826822f5dfcef1a95ae403e80fee84215511bdbfea85dba5a8cb492d1fa940d5 SHA512 963849842b33c972188ddcbfe1b68a24d3e94dc68855f82cc0ed5ca86a55bbac9f9c104a3412c7bb32ff6604fd6a538755dcc5b6718ebb559820fd2846085c82
+EBUILD apr-util-1.6.1-r3.ebuild 3722 BLAKE2B c9bd62f2b868a55cc198534fc7584dbc333360cb1b1c79a9f03cf302f1095458e64ba61bea2ceabd3b8766db2a1ac0d4ae1499b5fa6e782fa73c3a9345b1f055 SHA512 69676a13b2d8fbcb3c743da213bcd456f0729c977dbfedac106eb60f6402795592cf33b6097f5f290059e3ebda7f05f8ef418debf354b1fbaf67cb4af26c525f
 MISC metadata.xml 515 BLAKE2B d300be91135a6a7dcc55a61b484b5dd1785663b9f3b51d621dcacffd9ec5747b69bb227f60dce1bf30a57fe93629de3c82fa7138a5f056e4f349ce6909453020 SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
index 69df78180409..98432bf891bd 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r3.ebuild
@@ -126,8 +126,8 @@ src_install() {
 	default
 
 	find "${ED}" -name "*.la" -delete || die
-	if [[ -d "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
-		find "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
+	if [[ -d "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
+		find "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
 	fi
 	if ! use static-libs ; then
 		find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die
@@ -140,5 +140,5 @@ src_install() {
 
 	# This file is only used on AIX systems, which Gentoo is not,
 	# and causes collisions between the SLOTs, so remove it.
-	rm "${ED%/}/usr/$(get_libdir)/aprutil.exp" || die
+	rm "${ED}/usr/$(get_libdir)/aprutil.exp" || die
 }
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 0c23be3f5364..3d9a16b1312e 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,5 +1,5 @@
 DIST atk-2.32.0.tar.xz 292088 BLAKE2B 15f093db60cc54d1a5a18dc78cb9d64fa73e18dadb724fe5143956199f4ff1aa4ea9daf0796b14f228a1d91f1d44e88749c67fe5a6a84bd001916d78be4680f9 SHA512 8cd2a3ee006f21835f3e564f2e1de4ae61bd9529b4c0b4f2e3ece88e905e2dd36b67affb089f41582806a1397576602a526a4b8698303708894f20af97ecac22
 DIST atk-2.34.1.tar.xz 293140 BLAKE2B 8ae280583867460734ca001eb01963eefcc519eb09658e2e793cd1a07831e8e5ade20a4d38bb5925a1103da206d9d6283a2b1892c671f12090b3eefac04b34e1 SHA512 a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e
-EBUILD atk-2.32.0.ebuild 1165 BLAKE2B 8d362252a919c1ee58b1ef4de8ea221748423c8d906edca309e2220d1e6dea3ace016567d4c2813beb19c22899b9705f02cdccf0bae5bd2037b55d2dc808f3a5 SHA512 604e5f0807b1685c57cd1a8b88a411a3d9a1ea18bc6d3cc96c3a7e9cb88727e7a08d672ddd32983d1be518e71f2e0dec649dae539da0915c2404484964c802c4
+EBUILD atk-2.32.0.ebuild 1166 BLAKE2B 30f34739e560dc220942e28d3ee68e08c6b94f59568c7db2681ccc709bd6a67340b2969ae6dd268c5c0946a7f24fbc7530e6d3e6b9108f12283aa743d820834a SHA512 ea294a119069f4ea358e0868733f81d6280e77281ba6257655a8a5eb598412650fad0b08ad31df1d8358f1e492a3bfddc866236ae0f132af1db1c0a3193a2c9d
 EBUILD atk-2.34.1.ebuild 1175 BLAKE2B 212f9032adf2df7804cde272f7d512a8668907b0086d0dae909c6c1026abc10099100536548dca08ac029b2395a64714ed08bb6c046aa38e5b0a3f0e23fcf019 SHA512 ed002c44722328bb6a36883177dd24d0c47acc568173c16884ecb9ff5e6ee7883d81d8701aaaefe667d359354abc0928decfcada3b2d268de68249bb2d5f9ae7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.32.0.ebuild b/dev-libs/atk/atk-2.32.0.ebuild
index 26dcc8d80083..969ff91be7ea 100644
--- a/dev-libs/atk/atk-2.32.0.ebuild
+++ b/dev-libs/atk/atk-2.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index fcaa8ef461e6..ff14ae255c0b 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -7,5 +7,5 @@ AUX beignet-1.3.2_llvm7.patch 4805 BLAKE2B df959c8e482e1810b2257419088a4cd283bfe
 AUX llvm-terminfo.patch 788 BLAKE2B cb652c28aac1cca566cb801b9e7f2b6ea8a9ff9457896a50b3323b41a009e039085d2d4aeff14d9d8cf35fca3e4a23bacb3078451c4981b6f806cec4146aec83 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312
 AUX no-debian-multiarch.patch 1652 BLAKE2B 4d112429412a7ada957228aa8e6beb145fbaf04065d6f816b0f13513631211894c57e9999157db5f22d7044f231be65396040efe450d090e3774bd24c9c93482 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a
-EBUILD beignet-1.3.2-r3.ebuild 2868 BLAKE2B b32d8bd2015fe45936f7cc2cbcdd204ce9d5aad0d1b9b4b445ded59d371d5ab89957faa67a6153a77626dd4b99320b6eb8808045f47587fd32fe2d17a783150d SHA512 c58ebd5b0f2df3a59d4ac695d5b98ab4722c0029cc47a87e58149d81676ad5bbac1e7d6f79ab68a630bf67cb883fa6ad2c654164c1888543b67b0dc6dadcdbe6
+EBUILD beignet-1.3.2-r3.ebuild 2862 BLAKE2B e7928e36ed35fe344b7f7965dc82165dabed40d0a7dce24c98f82586bfa209e1e679923eed44a94e67871a6bc12c3b57823b41728de71f34faf7482a10291718 SHA512 2742396e33f4b494ef89d967be8f580d157ca16ef516382e7a6f5442c33f4cc4e6ceb93a07582c7ee1fbded6be3e033f3bdf7df364d63695db10ed221830d901
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2-r3.ebuild b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
index 439ab63df2ed..874dd1cc3193 100644
--- a/dev-libs/beignet/beignet-1.3.2-r3.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 CMAKE_BUILD_TYPE="Release"
 
 inherit python-any-r1 cmake-multilib flag-o-matic llvm
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 6b8e196812ba..d02e30476119 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -4,8 +4,6 @@ AUX boost-1.71.0-disable_icu_rpath.patch 1077 BLAKE2B c4549b7a706cd934392bdafb44
 AUX boost-1.72.0-boost-mpi-python.patch 1703 BLAKE2B b797f66c07bcec021e0a9a169cfddf8572828cd94114ff0dc40e9f08f9e5041f5cef3a8d0400cf5cc447bb75cf9e1c1c4d500930d154f34920b3501eb991eccb SHA512 61e9ef28b40f4226f09f235d59bd2d1ad571530b78c3fb50fd1f2bc47c185cc7cbd72b469fddcd6795a8578f3ba0b6abf12d8f175806e7b0d29cdd6223c145aa
 AUX boost-1.72.0-missing-serialization-split_member-include.patch 992 BLAKE2B 103b669670ff1365837c4590bbba6ec112ef8f185115a60cd853cead370c514517950e6105a4f39c030d8c0931352c44eb7d03c6790ab88c6978acfa02e3a142 SHA512 b2d9e870545c8509abda1110e8de3807cec72373fd5539edabf83825b9fd893562835e7557ea74c309a02e245e9cf80e567b39bf08a5e98c9d3124cd8b10e064
 AUX boost-1.72.0-revert-cease-dependence-on-range.patch 1687 BLAKE2B 9419cf7b50359c17f6226e0706e64a4637d835172a742807349536fb87731912929148810e5abb33c6005583bf6077283c2e6c453a911ea7922266f616b60ea4 SHA512 9b53d2fe2dddd592e43db03c26fadd6c07d4c45a980ae4c775b7a914346a3914f6e0c3ef42dad5e2ea4568afb86c9967e09444ff609cfba1e1d39f4980b22ad6
-DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
-EBUILD boost-1.71.0.ebuild 10427 BLAKE2B 92b7f3998fe938569464c358281e5d837132aa194e12a435bde2f0f46252f2b2b8aa2f0e625c549aa5d1df6bceae25ed242a5f1635729ccf1d9bc6c621e8310b SHA512 9c6158a116ccc12901dd05660877ca58b5c751227288e66d62991737d9efca220c7849bf8b98a1b8315a59825625ae5656593aca7c0f103f3bb81f74f86b73e4
-EBUILD boost-1.72.0-r1.ebuild 11305 BLAKE2B 34b28199a59a1cee1e9ec7c254e4c67e1a687de7be41df6e7cf34abce03ca49cdbf241fe2e84c9687e98b34a265cfc92c4eb586423f2510a8778d8c173365f11 SHA512 408834724f5ce4ab9ae1a10f14665345436fc525662162cfdb352aeefa2e56e79ea47532a7649a8f04be323d505025a902eb0ae1fee8e2f834def5ee7e03f36f
+EBUILD boost-1.72.0-r1.ebuild 11303 BLAKE2B 4e1e166d3fd4439b6520b29689cd3232327d59f4daf6211f239807e9701b3b9c55b92ebc82b145f8a61adc8d03529a3e5eadb4a4849d69dd07440697d7e10e88 SHA512 e814ea69e3507d074cd6608f0c71e1e69c830c2e45b094a94d1ea2e92e78fb2a2c59ad9cbc71a84bb86eea785049df8dd1e02496e9ea78038a826d092debe947
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.71.0.ebuild b/dev-libs/boost/boost-1.71.0.ebuild
deleted file mode 100644
index d4c6da3453b3..000000000000
--- a/dev-libs/boost/boost-1.71.0.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
-
-MY_PV="$(ver_rs 1- _)"
-MAJOR_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="https://www.boost.org/"
-SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
-IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
-REQUIRED_USE="
-	mpi? ( threads )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-RDEPEND="
-	!app-admin/eselect-boost
-	!dev-libs/boost-numpy
-	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
-	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
-	python? (
-		${PYTHON_DEPS}
-		numpy? ( >=dev-python/numpy-1.14.5[${PYTHON_USEDEP}] )
-	)
-	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
-
-S="${WORKDIR}/${PN}_${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
-	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
-	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
-)
-
-python_bindings_needed() {
-	multilib_is_native_abi && use python
-}
-
-tools_needed() {
-	multilib_is_native_abi && use tools
-}
-
-create_user-config.jam() {
-	local user_config_jam="${BUILD_DIR}"/user-config.jam
-	if [[ -s ${user_config_jam} ]]; then
-		einfo "${user_config_jam} already exists, skipping configuration"
-		return
-	else
-		einfo "Creating configuration in ${user_config_jam}"
-	fi
-
-	local compiler compiler_version compiler_executable="$(tc-getCXX)"
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-	fi
-
-	if use mpi; then
-		local mpi_configuration="using mpi ;"
-	fi
-
-	cat > "${user_config_jam}" <<- __EOF__ || die
-		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-		${mpi_configuration}
-	__EOF__
-
-	if python_bindings_needed; then
-		append_to_user_config() {
-			local py_config
-			if tc-is-cross-compiler; then
-				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
-			else
-				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
-			fi
-			echo "${py_config}" >> "${user_config_jam}" || die
-		}
-		python_foreach_impl append_to_user_config
-	fi
-
-	if python_bindings_needed && use numpy; then
-		einfo "Enabling support for NumPy extensions in Boost.Python"
-	else
-		einfo "Disabling support for NumPy extensions in Boost.Python"
-
-		# Boost.Build does not allow for disabling of numpy
-		# extensions, thereby leading to automagic numpy
-		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
-		sed \
-			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
-			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
-	fi
-}
-
-pkg_setup() {
-	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
-		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
-			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
-			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
-			die "Unsupported target in ${EROOT}/etc/site-config.jam"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-ejam() {
-	create_user-config.jam
-
-	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
-	if python_bindings_needed; then
-		append_to_b2_opts() {
-			b2_opts+=( python="${EPYTHON#python}" )
-		}
-		python_foreach_impl append_to_b2_opts
-	else
-		b2_opts+=( --without-python )
-	fi
-	b2_opts+=( "$@" )
-
-	echo b2 "${b2_opts[@]}" >&2
-	b2 "${b2_opts[@]}"
-}
-
-src_configure() {
-	# Workaround for too many parallel processes requested, bug #506064
-	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
-	OPTIONS=(
-		$(usex debug gentoodebug gentoorelease)
-		"-j$(makeopts_jobs)"
-		-q
-		-d+2
-		pch=off
-		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
-		$(usex mpi '' '--without-mpi')
-		$(usex nls '' '--without-locale')
-		$(usex context '' '--without-context --without-coroutine --without-fiber')
-		$(usex threads '' '--without-thread')
-		--without-stacktrace
-		--boost-build="${BROOT}"/usr/share/boost-build
-		--prefix="${ED}/usr"
-		--layout=system
-		# CMake has issues working with multiple python impls,
-		# disable cmake config generation for the time being
-		# https://github.com/boostorg/python/issues/262#issuecomment-483069294
-		--no-cmake-config
-		# building with threading=single is currently not possible
-		# https://svn.boost.org/trac/boost/ticket/7105
-		threading=multi
-		link=$(usex static-libs shared,static shared)
-		# this seems to be the only way to disable compression algorithms
-		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
-		-sNO_BZIP2=$(usex bzip2 0 1)
-		-sNO_LZMA=$(usex lzma 0 1)
-		-sNO_ZLIB=$(usex zlib 0 1)
-		-sNO_ZSTD=$(usex zstd 0 1)
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	fi
-
-	# Use C++14 globally as of 1.62
-	append-cxxflags -std=c++14
-}
-
-multilib_src_compile() {
-	ejam "${OPTIONS[@]}" || die
-
-	if tools_needed; then
-		pushd tools >/dev/null || die
-		ejam \
-			"${OPTIONS[@]}" \
-			|| die "Building of Boost tools failed"
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use numpy; then
-		rm -r "${ED}"/usr/include/boost/python/numpy* || die
-	fi
-
-	if ! use python; then
-		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
-	fi
-
-	if ! use nls; then
-		rm -r "${ED}"/usr/include/boost/locale || die
-	fi
-
-	if ! use context; then
-		rm -r "${ED}"/usr/include/boost/context || die
-		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
-		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
-	fi
-
-	if use doc; then
-		# find extraneous files that shouldn't be installed
-		# as part of the documentation and remove them.
-		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
-		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
-		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
-		docinto html
-		dodoc *.{htm,html,png,css}
-		dodoc -r doc libs more tools
-
-		# To avoid broken links
-		dodoc LICENSE_1_0.txt
-
-		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
-	fi
-}
-
-multilib_src_install() {
-	ejam \
-		"${OPTIONS[@]}" \
-		--includedir="${ED}/usr/include" \
-		--libdir="${ED}/usr/$(get_libdir)" \
-		install || die "Installation of Boost libraries failed"
-
-	pushd "${ED}/usr/$(get_libdir)" >/dev/null || die
-
-	local ext=$(get_libname)
-	if use threads; then
-		local f
-		for f in *${ext}; do
-			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
-		done
-	fi
-
-	popd >/dev/null || die
-
-	if tools_needed; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED}"/usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# Yai for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
-		if [[ -L ${symlink} ]]; then
-			rm -f "${symlink}" || die
-		fi
-	done
-
-	# some ancient installs still have boost cruft lying around
-	# for unknown reasons, causing havoc for reverse dependencies
-	# Bug: 607734
-	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
-}
-
-pkg_postinst() {
-	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
-	elog
-	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
-	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
-	elog
-	elog "Then you need to recompile Boost and all its reverse dependencies"
-	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
-	elog "requires a complete rebuild of the boost-dependent ecosystem."
-	elog
-	elog "See for instance https://bugs.gentoo.org/638138"
-}
diff --git a/dev-libs/boost/boost-1.72.0-r1.ebuild b/dev-libs/boost/boost-1.72.0-r1.ebuild
index ef8bfc574f38..024bfbd5114f 100644
--- a/dev-libs/boost/boost-1.72.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.72.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
index 02a22661925a..0e1d0e3655ee 100644
--- a/dev-libs/clhpp/Manifest
+++ b/dev-libs/clhpp/Manifest
@@ -1,3 +1,3 @@
 DIST clhpp-2.0.10.tar.gz 129954 BLAKE2B 1beb9b41ce1ad8ec88d0ccfa5f1d7a7af931841fa64d79b9eb9db90538f1b43f3cee5c74dc015ba835ee4ded2e926967bc3aa00dcc6ec0f5b65a04f9618ea1a9 SHA512 4a4898540c55422ca0cc6ba7f0c5495b915fc34df50f8add90e7f06dd5ef1d01a767234ecdee3757292980aa2f938e773177bcc73f28ac9c1b42d386863dea58
-EBUILD clhpp-2.0.10.ebuild 952 BLAKE2B c9e73b82210db05466e0c5eede4d6594fd42f3dc405b767fed7bcfd47db1b4242d9960c0350128f69036d622f88827fe80034cdd4d317f2074db556d9bb5260e SHA512 c9e447c75d2a407bea0731b740da007fcc74c4733dad2f3e80e3f901385670539bcc62e087c324e426ff2e575a4bf402eb6d589bb04bae171a9d0deda77295be
+EBUILD clhpp-2.0.10.ebuild 942 BLAKE2B 65c993533fb5861855529ee574286411ce6f2d8af3e14b80f16507b7c6493d44f5f9e6890e9273cf00afb4ad6f598b73096e23d6147df6da9658df9ca5303892 SHA512 fece5a2d1439eaa87035614311938a60277cfade13f874126594b27a6040efeaafae7e2aa7138290baabcac97cf70d4fa4ded7c45d91db8770accf59c63c7c1d
 MISC metadata.xml 336 BLAKE2B cf9637d462e3606aa1a49639f60217f003e2271fa064d6bb36e9d1744c3b84815c0b75c2d42a3e761876879ea7eb92c32986f8e54926ed7e544690035985a86a SHA512 77d25c077302f6e92b83c869c45c9f91131160fa250f5a5087067e3291a1a0954e883ae110d20d9420cd9c01720803977ccf1d5ff6250bee91d6e5192798e55d
diff --git a/dev-libs/clhpp/clhpp-2.0.10.ebuild b/dev-libs/clhpp/clhpp-2.0.10.ebuild
index 00c6a559dd9e..db06bf085688 100644
--- a/dev-libs/clhpp/clhpp-2.0.10.ebuild
+++ b/dev-libs/clhpp/clhpp-2.0.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 DESCRIPTION="Khronos OpenCL C++ bindings"
 HOMEPAGE="https://github.com/KhronosGroup/OpenCL-CLHPP/"
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index fc9cb782c490..922bf845d042 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -6,5 +6,5 @@ AUX dmalloc-5.5.2-threads.patch 165 BLAKE2B fee0be1573996dc7460735a94c645989db6f
 DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93
 EBUILD dmalloc-5.5.2-r4.ebuild 1751 BLAKE2B 20ab1cbcf7ef36a0b9f39d0833c1276eef87c245dc368f57cc6fccd1d822fef98d118fc3f193c9bba6d0fb996bdc74b93aed54486ea5d2daae951725de0cd098 SHA512 5f928b8f2f09820053461ec831b46958f630ef989c53deb91988a1bfde68816f73149f89b675966ba5738fc13c75f2fdd1bb702f780c497f9f034941937a704c
 EBUILD dmalloc-5.5.2-r6.ebuild 1917 BLAKE2B d980f68e26716599b285f5cb34fcda0f52060146b3c671723b7c43dfc88ffe43032e9634edaeafbee5b2777ecd5882cef8dc14c659d821571f6d0a36ece56b5a SHA512 529084695792373fc5f6c5e862751a90694314c4cd5c6fd1a6fdbf982a304414420d9c015df8af92c013b269ba1e2ee8cf51741b52fc59a5c46c9fbcb758ec37
-EBUILD dmalloc-5.5.2-r7.ebuild 1858 BLAKE2B 011aa02de5b353827fc61b62cfe4e3793ec85314d3380082957575d7254fa49056539bd7c440f7056af4db21aa66bb7b77dfbaf1873a0cc232dfecaef4fe0a82 SHA512 4030a84dee4c1a58a406fd35bad418ed00514be2fa921837bcb421cd842a3677a84cd2e7f8865f8d32d5cea4914c63948454ea1ceee0a9dd5e2b89ba6bf0f433
+EBUILD dmalloc-5.5.2-r7.ebuild 1857 BLAKE2B dceabac7feac1a370db5ac445857b8631bd33e3887f5020392cf86e22632a60aaf283cf57dc8fe8a463423606b67f57fb55f28fe35f74ae3ed4275c90a32e870 SHA512 03698f59a9e72ba87bf6bfacdf182c24485a2fc1afa3ea51ebe79d2500241da161ab1c8fb311b83b3305981617439590491219667a580fd755f8ac9624de9d12
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
index bda4a27d0c9e..16b4911b2230 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://dmalloc.com/releases/${P}.tgz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="static-libs threads"
 
 DEPEND="sys-apps/texinfo"
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 9ce401e54be3..69c3ebcc006f 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -2,5 +2,5 @@ AUX 0001-CMake-install-to-correct-lib-dir.patch 1957 BLAKE2B a8139d2c7474b96526b
 DIST double-conversion-3.1.4.tar.gz 7022872 BLAKE2B 270f318e6b37205ab3da3ccf5c598ca7a02dc2e728a5d8e3467523bc8f21039651bea3f70aeb9f8579505812d63181de9d1e8106997795a79efeb663e1bc22d7 SHA512 715a34ace2ff74b79d80a8c003c16cfbf958ebc92264e28cc572e1a12a786e1df9678abb46f032c2be387495e1a3d02957b12fa4a245ec6cfe19ca637519ac3c
 DIST double-conversion-3.1.5.tar.gz 7023792 BLAKE2B ed70a554bd52e23aadecbeaa6607dfcdb670450b95e2ff699c784512e6cb0c022f51f6ab775ebc5b3c293f991e5200ff5528d689c74dae92e8e68bedf672c5ac SHA512 0aeabdbfa06c3c4802905ac4bf8c2180840577677b47d45e1c91034fe07746428c9db79260ce6bdbdf8b584746066cea9247ba43a9c38155caf1ef44e214180a
 EBUILD double-conversion-3.1.4-r1.ebuild 1413 BLAKE2B 84e0a0d86df46566dfdfd37c1d43fa4667c47ad62f8cb1e274c0ed5f0aa9ffeb9ab019c12be0abc959d152ef37c1d1d8a3f6fcc7bc4d9059f12ae9d0e4ad0006 SHA512 dd10edb94846e496187fbcd4d877e87075426d78616162c0823c934e984da4d82232d996918a78b62dfd43003f2e715b2994c15b22d8be53be9ac073cf00261f
-EBUILD double-conversion-3.1.5.ebuild 457 BLAKE2B d07c81ac6dbbdb3389d674ebd864bfe2d5949b455b62dc4a5c90566dbd52811ca86c8a54584cf121e55b4a63231827d6dded5b5461b1eb625a67e0fd9917e2c9 SHA512 c4998bae35b178ffe22b889df1061e68f66d84f8ee8b3228d08ef7c44dbf59270af381f366161a1cbb43a9a37aa4f12d80f02cb689ad839fcc5d560f7b0b4aa5
+EBUILD double-conversion-3.1.5.ebuild 456 BLAKE2B cf4218e87915914583c82ccffde6bf92bac0bbaa546394a227e002b713cf746950e815f3327bde1461c5e25c5135b27f4886c239a18f0c34a8e43fa099cdcfc2 SHA512 94f9e80922ae6b45b4e679009729dfd3849ee60f5aeddc177311afe165792e443537b882eccf1dc02cc9f0fad6bbcbeb84cf084569de6cda1f306562e4cc4fe8
 MISC metadata.xml 681 BLAKE2B add558ddf626cde6768c25b9a6c3f004ca0e588e99f247d7c1000ca9e7f572429a2d321af2c39b82b61ad1cf66b87f108a241100f6ef28cf85f8daf172e05489 SHA512 e7eee783d9ed17369d7dabdb78eb1bed547c6d75a527b418fc42815ab161688740633d062d59f6b7b30ca26872b40163a8188eefbb4f2eb19299a8809bd49524
diff --git a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
index c55eb82b6ae2..0bc709db3550 100644
--- a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 5ea6631e0440..82a94559666f 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,5 +1,3 @@
-DIST efl-1.22.6.tar.xz 70641848 BLAKE2B a6644f25934d3c9776b06edd7a9ffc321da42ee039b703c1af317d14e757b489c6d42add281febde5e81b48e38fbfa31f5b201ade4d27cd50cc70d16b9028fdd SHA512 adf2b9275c295b61928134ce1af53d8830b46815d8ba09d221c7659b8a2aed6e4593b35919a98f0e33ec9b7930c5b09de8e6680536cccb21c551908b25158f56
 DIST efl-1.23.3.tar.xz 77485032 BLAKE2B e5f65080aec1d11a43f1e1786b8ac4e7be70ddd9614b53db822177c28ee73f9590f63d032df5ddf00db6224730b45b045d9f91da2287a4dec7589e902cbcde28 SHA512 47ad067c43d39b534834195f89a745c4a47d867f33aaa68c28c6dccd147379e9bc2416bd68878cc16585f8cb60e926a7df62102658b205756c01985f37f0d297
-EBUILD efl-1.22.6.ebuild 6910 BLAKE2B 52d27a0baa59508ebb3e522338aaa6fe8cb15f5be8f265bf264b8a56209a6e9a5ed801eca19fb32d815282cafa3a2eadf1b781dd2c22935eba6af34d331cfbad SHA512 67aa26a52d2e234d7bd64f6f2c508762805aa45433c7733638e0564f8de32d8b7374618b59660827ea90749976deeb17e415ef7bac69e542d3da7cec02b63334
-EBUILD efl-1.23.3.ebuild 7498 BLAKE2B afbb8beeadae25c6fcac0f11367e81ad937dcbddc60317e3746bf405822dae7cc57599caeeae63c0614fe7a86f2a31139353b0bfc2712e9c1a867310fdef5f46 SHA512 ea2993c2d5c819dc3ff4fa960df70b03f58f9560c374cf4e7e2dbc092a160dbc2de69274eafce3638dff1efdecf75f61da99b418ba7e97a87c58b192cb3ca663
-MISC metadata.xml 2199 BLAKE2B 56690b1757b3903b9c7008e64a287ed84420d1da4b3bbd4260617c66da0eded0bd5bb29d1880dd9484b428beb9a02f4b36f7f9b146c090e1c1f55272b5b77066 SHA512 45a075877b05d2dcca13c376b8af5fa269855e9419dbbaa60234a7529a737697ac8eb56ffb7c14b6216ec537b367de47b2558716dd7dedbfed737d07e307595a
+EBUILD efl-1.23.3.ebuild 7505 BLAKE2B 6e240ebe30b78abce26867a88778d9a81cbea680c326f72405d713a4c0cd59ab9d2dab33eb056801c5388b8fbcfb83d36f28c69b9f0f0d82a2453f7bce1fd0d4 SHA512 92517227d2e7006d227ea74d45fe54915284722e2fcaedf511cf1689294a39968f7135b760aaee5380fa64e3e3e4b15376c9e94637bfd990bec7caa4d69f4db1
+MISC metadata.xml 1987 BLAKE2B 86cb4cbb5deb978955e4008c3d7ae92430daa8739d75c9515c3c33339b05b545b5af8b8bdce0dc4ca2dffe17097ca8a04104e1ed3fe99a548c625416d467d2f2 SHA512 b543190ca4b753101085f3964608b06ee489f6e0d268e84866162370b029cc8433e2925ef92104a38a57a3c0fb491150f6376cdf996a45cdb0848287b8aaf58f
diff --git a/dev-libs/efl/efl-1.22.6.ebuild b/dev-libs/efl/efl-1.22.6.ebuild
deleted file mode 100644
index 946104590533..000000000000
--- a/dev-libs/efl/efl-1.22.6.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	?? ( gles2 opengl )
-	fbcon? ( !tslib )
-	gles2? (
-		|| ( wayland X )
-		!sdl
-	)
-	ibus? ( glib )
-	opengl? ( X )
-	pulseaudio? ( sound )
-	sdl? ( opengl )
-	vnc? ( fbcon X )
-	wayland? ( gles2 !opengl )
-	xim? ( X )
-	xpresent? ( X )
-"
-
-RDEPEND="
-	net-misc/curl
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-apps/util-linux
-	virtual/jpeg:0=
-	connman? ( net-misc/connman )
-	drm? (
-		dev-libs/libinput
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	elogind? ( sys-auth/elogind )
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gif? ( media-libs/giflib:= )
-	gles2? ( media-libs/mesa[egl,gles2] )
-	glib? ( dev-libs/glib:2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( media-libs/harfbuzz )
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:= )
-	libuv? ( dev-libs/libuv )
-	luajit? ( dev-lang/luajit:= )
-	!luajit? ( dev-lang/lua:* )
-	pdf? ( app-text/poppler:=[cxx] )
-	physics? ( sci-physics/bullet:= )
-	postscript? ( app-text/libspectre )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw:= )
-	scim? ( app-i18n/scim )
-	sdl? (
-		media-libs/libsdl2
-		virtual/opengl
-	)
-	sound? ( media-libs/libsndfile )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	system-lz4? ( app-arch/lz4 )
-	systemd? ( sys-apps/systemd:= )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib:= )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	vlc? ( media-video/vlc )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	X? (
-		media-libs/freetype
-		x11-libs/libXcursor
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-		gles2? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-		opengl? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-		wayland? ( x11-libs/libxkbcommon[X] )
-	)
-	xine? ( media-libs/xine-lib )
-	xpm? ( x11-libs/libXpm )
-	xpresent? ( x11-libs/libXpresent )
-	zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	# Upstream still doesnt offer a configure flag. #611108
-	if ! use unwind ; then
-		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-		configure || die "Sedding configure file with unwind fix failed."
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--enable-cxx-bindings
-		--enable-image-loader-generic
-		--enable-image-loader-jpeg
-		--enable-image-loader-png
-		--enable-libeeze
-		--enable-libmount
-		--enable-quick-launch
-		--enable-threads
-		--enable-xinput22
-
-		--disable-cancel-ok
-		--disable-cocoa
-		--disable-csharp-beta
-		--disable-csharp-bindings
-		--disable-doc
-		--disable-ecore-buffer
-		--disable-ecore-drm
-		--disable-ecore-wayland
-		--disable-eglfs
-		--disable-g-main-loop
-		--disable-gesture
-		--disable-gstreamer
-		--disable-pixman
-		--disable-tizen
-		--disable-wayland-ivi-shell
-
-		$(use_enable bmp image-loader-bmp)
-		$(use_enable bmp image-loader-wbmp)
-		$(use_enable dds image-loader-dds)
-		$(use_enable drm)
-		$(use_enable drm elput)
-		$(use_enable eet image-loader-eet)
-		$(use_enable elogind)
-		$(use_enable examples always-build-examples)
-		$(use_enable fbcon fb)
-		$(use_enable fontconfig)
-		$(use_enable fribidi)
-		$(use_enable gif image-loader-gif)
-		$(use_enable gles2 egl)
-		$(use_enable gstreamer gstreamer1)
-		$(use_enable harfbuzz)
-		$(use_enable hyphen)
-		$(use_enable ico image-loader-ico)
-		$(use_enable ibus)
-		$(use_enable jpeg2k image-loader-jp2k)
-		$(use_enable libuv)
-		$(use_enable !luajit lua-old)
-		$(use_enable neon)
-		$(use_enable nls)
-		$(use_enable pdf poppler)
-		$(use_enable physics)
-		$(use_enable postscript spectre)
-		$(use_enable ppm image-loader-pmaps)
-		$(use_enable psd image-loader-psd)
-		$(use_enable pulseaudio)
-		$(use_enable raw libraw)
-		$(use_enable scim)
-		$(use_enable sdl)
-		$(use_enable sound audio)
-		$(use_enable static-libs static)
-		$(use_enable svg librsvg)
-		$(use_enable system-lz4 liblz4)
-		$(use_enable systemd)
-		$(use_enable tga image-loader-tga)
-		$(use_enable tiff image-loader-tiff)
-		$(use_enable tslib)
-		$(use_enable v4l v4l2)
-		$(use_enable valgrind)
-		$(use_enable vlc libvlc)
-		$(use_enable vnc vnc-server)
-		$(use_enable wayland)
-		$(use_enable webp image-loader-webp)
-		$(use_enable xcf)
-		$(use_enable xim)
-		$(use_enable xine)
-		$(use_enable xpm image-loader-xpm)
-		$(use_enable xpresent)
-		$(use_enable zeroconf avahi)
-
-		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
-		--with-glib=$(usex glib)
-		--with-js=none
-		--with-net-control=$(usex connman connman none)
-		--with-profile=$(usex debug debug release)
-		--with-x11=$(usex X xlib none)
-
-		$(use_with X x)
-	)
-
-	use drm && use wayland && myconf+=( --enable-gl-drm )
-
-	if use opengl ; then
-		myconf+=( --with-opengl=full )
-	elif use gles2 ; then
-		myconf+=( --with-opengl=es )
-	elif use drm && use wayland ; then
-		myconf+=( --with-opengl=es )
-	else
-		myconf+=( --with-opengl=none )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if host-is-pax && use luajit ; then
-		# We need to build the lua code first so we can pax-mark it. #547076
-		local target='_e_built_sources_target_gogogo_'
-		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
-		emake -C src "${target}"
-		emake -C src bin/elua/elua
-		pax-mark m src/bin/elua/.libs/elua
-	fi
-
-	V=1 emake
-}
-
-src_install() {
-	V=1 emake install DESTDIR="${D}"
-	einstalldocs
-
-	if ! use static-libs ; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/efl-1.23.3.ebuild b/dev-libs/efl/efl-1.23.3.ebuild
index 982a3b498ff0..3a1dc1e3db54 100644
--- a/dev-libs/efl/efl-1.23.3.ebuild
+++ b/dev-libs/efl/efl-1.23.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="+X bmp connman dds debug doc drm +eet elogind examples fbcon fontconfig
 	fribidi gif gles2 gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
 	lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 02343d8644fd..4d01748725e9 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -18,12 +18,10 @@
     <flag name="ibus">Enable Intelligent Input Bus</flag>
     <flag name="ico">Enable Ico image loader</flag>
     <flag name="json">Enable lottie animation support</flag>
-    <flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
     <flag name="luajit">USE <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
     <flag name="mono">Enable mono bindings</flag>
     <flag name="physics">Enable Bullet physics effects and support</flag>
     <flag name="pmaps">Enable PMAPS image loader</flag>
-    <flag name="ppm">Enable PMAPS image loader</flag>
     <flag name="psd">Enable PSD image loader</flag>
     <flag name="scim">Enable Smart Common Input Method</flag>
     <flag name="system-lz4">Use system liblz4 instead of bundled one</flag>
@@ -31,7 +29,6 @@
     <flag name="tgv">Enable Tgv image loader</flag>
     <flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events</flag>
     <flag name="unwind">Enable debug support via <pkg>sys-libs/libunwind</pkg></flag>
-    <flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
     <flag name="vlc">Enable <pkg>media-video/vlc</pkg> support</flag>
     <flag name="xcf">Enable XCF image loader</flag>
     <flag name="xim">Enable X Input Method</flag>
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 49ecda8d3646..a1d008121e2b 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -6,6 +6,7 @@ DIST ell-0.24.tar.xz 473332 BLAKE2B 97b5f5de1a4680f5b8da5db8d151df56d2eadb511c54
 DIST ell-0.25.tar.xz 473392 BLAKE2B cefb71c0bd1c30a1c2e85baf19097f9028b3d2d1e8df14beb231f3c52f39e2ec98fbafdfbba4c05e94328c0c5747eb49111e1c76b3cb02fe22c09b51a5016f17 SHA512 7f12e2dfae16a38750166787ede7e3bf6def1e15a8bcb33bdba80ff84c2930d1857437f4ab871c408a52b18fec2212856ae9190ddf5eb542e90ebc76edd1f693
 DIST ell-0.26.tar.xz 473512 BLAKE2B bad1545b65caad7263e03156740ef5dfc401536fc063f34bdac5346a9edca8b7b16fd175abb264a6163e9dca87d1469f388984a95962dcc695e3e98549ff2a0a SHA512 b7a841f6e3c50077b60c210549744344ee70b5116bc9ee0f44dfea896f68fe6ab89a6fa38fcfe04e259648de978162aa5592f2e07accf13825584b40d57ef6cb
 DIST ell-0.27.tar.xz 474412 BLAKE2B 3b7d7ccfff8a92bbe930032b6a54bdc91b6541d1e6d8e514f1e49fcd08f3f5bc47beb3722dc864a63dcbbd72f793fbc2bc590b168f1623ff6e7088fbc960acb1 SHA512 ecda285155ef5ac1b8bdeabfba2e972149a5027c85236af74366c735aec7304b2dee8ff6aa931000b4299e8bb7654e7d4a63c1738de6e6e740f5ba16467f2823
+DIST ell-0.28.tar.xz 474880 BLAKE2B 2c571f952056c9f4e3e8c245b2b57645c4baa2935fdbe758170dcfe689f4db2162322f25a80cc5a7d4d5bded6159d1fa0d583be979a2708d32e61e91d1ced585 SHA512 6c3aef4d403878c0c9b8a1e5e8861656f2abbab19dd275b1aecca899ca615c00aee30e18f194435ec6be859adcffbe3703a79b13508e1e76c2192ec51f7c0cd7
 DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
 EBUILD ell-0.20.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 EBUILD ell-0.21.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
@@ -15,6 +16,7 @@ EBUILD ell-0.24.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96a
 EBUILD ell-0.25.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 EBUILD ell-0.26.ebuild 1053 BLAKE2B c0cd7bb5e24325b1c318ec0796b05d8e8b74b95a94bb4940d25e7f608bc71dd45ce870809f402fc2886d5b4e31863256029a4b296149245a9b0dbc5cd90c867e SHA512 696af928f58f982b99f7b74351b15d231e7a367a0622bc078d512e0b22347c65ef6f049b57e157e9630f638265fdbd5b62e3dc7c06c26a4e1b3a6f1617eda146
 EBUILD ell-0.27.ebuild 1055 BLAKE2B 82bc62ee0f9f22caf0d0aaf85a98ddcc3f543d5150220c514c9eda74ec30dec8ee7bf9490030dfc4d92994b155ddfb40d21aa2b0889b78463d65804b53c2bcee SHA512 6ac6af0784d2c94afb47c6910403c05d21d06d3e76ec95b088c80515f2f1c0fd11eb4616c18e9e4c1fda38650632460e216706c5922933add4708bdc316566bb
+EBUILD ell-0.28.ebuild 1060 BLAKE2B 66bafb93ce83f0a394e53b6d8293ac32bdb32c42345d4b9078b230ca50b7e287e63266ac924bc96a532bc3edec2f9fb0f9ba0f1fdc7821a7bcebb026a4e1fda9 SHA512 975ddf76ae6fb0dbb8b09907570383c950f0c8956b2ec67e0cdf0aad0c80b70b6ebb780a97be39e7ba6e5e1444b1ac241c25be650430835ad022552a0e2d204b
 EBUILD ell-0.9.ebuild 821 BLAKE2B 000640e99b5e0c1e1a328014a8edfe47cc197201757fc6b4e71ce3c9efe27d7ea3f89c7171c2366605374624b4282fbf2859b1832d3f5136e4c713ccf0530391 SHA512 9d497dbe091631b7863b8f403e2ae138cf30c38a1b1eb7e98b775275649fce9c67717599f1ca38ab705dd7bb33e8bc406035c2102c368fa83a15c13069c0b79e
 EBUILD ell-9999.ebuild 1060 BLAKE2B 66bafb93ce83f0a394e53b6d8293ac32bdb32c42345d4b9078b230ca50b7e287e63266ac924bc96a532bc3edec2f9fb0f9ba0f1fdc7821a7bcebb026a4e1fda9 SHA512 975ddf76ae6fb0dbb8b09907570383c950f0c8956b2ec67e0cdf0aad0c80b70b6ebb780a97be39e7ba6e5e1444b1ac241c25be650430835ad022552a0e2d204b
 MISC metadata.xml 454 BLAKE2B a0768369a4193ad0aa995290515a1c2e2a99e363d345d33a52933ac274e0c10364801ed20727a78f0d22088bfea0eb833d54f08d4de47790e6e0213a0318ecbe SHA512 583e77bec8ec2bed4e72ae117a7afba7cbe3abd0c3d139227aaebd0f06081faf827356e871494c9fbd16bc16a146f23099729afd80e2583e2bacbda9226bfabf
diff --git a/dev-libs/ell/ell-0.28.ebuild b/dev-libs/ell/ell-0.28.ebuild
new file mode 100644
index 000000000000..615074c27a1b
--- /dev/null
+++ b/dev-libs/ell/ell-0.28.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="glib pie"
+
+RDEPEND="
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable glib)
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest
index c597aec6e404..a7f0d11c57a6 100644
--- a/dev-libs/gdl/Manifest
+++ b/dev-libs/gdl/Manifest
@@ -1,3 +1,3 @@
 DIST gdl-3.28.0.tar.xz 541252 BLAKE2B 7254a9e15e9e79229c85b12c02ff5307bf99569428b13629ac8b3a5e79383f14a248d6e74f139e44145cd1a2825a2d10859c922a07a22fe1243edfafdb01514b SHA512 d6a697b8cd098abfcb560d8b6c8a326b05f6f22211a3bc92ea458d643170abc514acd4105e372fb61777d2a5dd09709d7e3d6d3ad75215fffdf2809b3df3c471
-EBUILD gdl-3.28.0.ebuild 717 BLAKE2B 5420ef2fa53f6675cdf177e3023f27639d99ee74349f06b7c93238ed11d46a342661e2536703f598e045bf962f7df7c1136100166b5b0faa2146a8a113cb443f SHA512 80ce35b4557c73bf7efa803c4c495145d016735328d792ddeb542fd8118ed03e3187e5651239c3843e4b4be1b789260e095ea02ee9b7df06b1fcef0f294bcc9a
+EBUILD gdl-3.28.0.ebuild 718 BLAKE2B ba3464870bc5dd164669573444abb5c76ab39dbfbee74d33e87ec0d8b40dda7b73cd515041aec636eafab174420918dc586ad9198de4b002c37ace0781eb2b43 SHA512 30f3c1f39244997cf01f4d456c8b7b551770938b1a584cafea94da8a5c87cbfae70cb7714c3b00fcd99751198633f53478b03d74de3eaeb116ea085ae10d273b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gdl/gdl-3.28.0.ebuild b/dev-libs/gdl/gdl-3.28.0.ebuild
index 81ce966a715c..2b38e3b527f0 100644
--- a/dev-libs/gdl/gdl-3.28.0.ebuild
+++ b/dev-libs/gdl/gdl-3.28.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdl"
 LICENSE="LGPL-2.1+"
 SLOT="3/5" # subslot = libgdl-3 soname version
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/dev-libs/go-fuse/Manifest b/dev-libs/go-fuse/Manifest
index 1f655bb164bb..783f0bc6dc2e 100644
--- a/dev-libs/go-fuse/Manifest
+++ b/dev-libs/go-fuse/Manifest
@@ -1,6 +1,6 @@
 DIST go-fuse-0_p20140812.tar.gz 111389 BLAKE2B 13cc74fb8844b0486e593ab62e5564111d0a01361edfb3be4c8b0ae3bc298d0043ad80a33318a407236e74f0d9bcea2f87ba4681db4d34ad8818a32b8fa0e459 SHA512 d951094e290bc914b418c165106368d6b73634ffb177b770ce53baaca4cd6026967f11d602b3e687e59a49323c7af1af74913ec1a911093e4e32503025842cb3
 DIST go-fuse-0_p20150422.tar.gz 110741 BLAKE2B 4c01af2a86a97ea9d0309066bc032aa41847b74edc18bc91483fbc789e143f297c90c7fe89f7c376ec0f12859d337a271122884bab79b4e9a94f95bacb63e426 SHA512 a0c9fa666ab39632db258baa5bf6ba1546aa847beb0d4a4b812a96e66d8573e3c0a0600ad24e16e314fbd8082b36027a3e1bc2092667766f611b1321aaea70c5
-EBUILD go-fuse-0_p20140812-r1.ebuild 1379 BLAKE2B ba788c52241655fc72a0bf5646d656410cb10936a3f9e6873a78e98c01107f275d4d3338cc4dc89d8544ecdbca3a04674e462310b579a919610a9c8fe2b8e7f5 SHA512 5605e07f718424b11adbd14907cb371b6c203565542731aedcaa647cc82fb6b706aed51c09766ae98cbf9a289f074d10b63392efb76783a0accc295b48afb72c
-EBUILD go-fuse-0_p20150422.ebuild 1175 BLAKE2B 36c74448cdb232be840afc69bf07ab909468ea1229c01e09e79da749b4722604be7209c0fc284f4733826896b818098f245ea2e6c8b8ab4d0a71a3ae475a4d0a SHA512 501d9403f7505622b1c6671db51d7c7ad2e417d30d3de68adfe9c6c2d04ddb67b6f3457fab94f4180f6b8d1794fbbc5ddd0d1e2b535ba73272ba9e9e53510a90
+EBUILD go-fuse-0_p20140812-r1.ebuild 1396 BLAKE2B 6cf1a95d60bbba45dd0854b5407eb7f882617eab012623396ecca511ed469e84c625393835c4a0a6e90950aad15ce88e09b906ec020e25e20a59ac986f4352ba SHA512 5ee5ac97c30ccb8968c6f7136fab3ee89a38ad8eee50fab1aac2a0ee1e7714f3c19ffdf6c969c064704b5c908913b97ac06d0820d1dd52823df522c5dda41d9f
+EBUILD go-fuse-0_p20150422.ebuild 1192 BLAKE2B b6486de417a5dce2400f774f3c4cd81bc31597e139b767a9f8dad7d6bddee3c3479ecaa69f7d227ca16f552a60beab9e09324de811b658d7bcdf916b2a25ba18 SHA512 0efea3292243977eecf6319cb99542b6f752d91162a6d5df86bc1b62c235c210a09be7da22fe82debf27698c96c64b5e0a95777f662cf29e2270110bbe9f623c
 EBUILD go-fuse-9999.ebuild 1266 BLAKE2B 863b8fcbdee31d71dc5ad97be41f62df5142cc63f6fc60f068679e9eadf82ba381a5fd5a869243402fe5933f2883228391450a12479776b4dcc3bd1b008c88fc SHA512 34ad9860ee72c0a8555be7c232eb3526923326ac1328536cbe1040ac42825a107a82dad06b32eec93dcfda15cc4db1868f5dee8964eca10a3d00fae9d8c9734e
 MISC metadata.xml 336 BLAKE2B de18fba9c2787705a6a3589ee62ac0147e67b24717499e2b2072a876e44b7529c7ddbd8ac238b6f13d0e1170b608d5de19bb9715825b333f771fc3b29aea21a9 SHA512 d8919ea0b18f378d1dfcae8879976485da1fe27d700fbad0006a9e835a4e87ddae1e91703be9d6ec6d8232737049805f57adf93d9cebbe64c7ad82bf1fed7373
diff --git a/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild b/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
index b697e9c46d3b..b73da8e807fb 100644
--- a/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
+++ b/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
@@ -8,7 +8,7 @@ inherit eutils
 GO_PN=github.com/hanwen/${PN}
 EGIT_COMMIT="8c85ded140ac1889372a0e22d8d21e3d10a303bd"
 
-HOMEPAGE="https://${GO_PN}"
+HOMEPAGE="https://github.com/hanwen/go-fuse"
 DESCRIPTION="FUSE bindings for Go"
 SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild b/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
index 894c8c631d8b..f2386f6a8c31 100644
--- a/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
+++ b/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
@@ -8,7 +8,7 @@ inherit eutils
 GO_PN=github.com/hanwen/${PN}
 EGIT_COMMIT="ffed29ec8b88f61c1b8954134cc48ef03bb26ce1"
 
-HOMEPAGE="https://${GO_PN}"
+HOMEPAGE="https://github.com/hanwen/go-fuse"
 DESCRIPTION="FUSE bindings for Go"
 SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index d645008e22f9..3375247b1081 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,3 +1,3 @@
 DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
-EBUILD gobject-introspection-1.60.2.ebuild 2159 BLAKE2B ed9fcec2fc965bca3fc726f819bc09de7dd6259648dbb9303607b81e66fc305196fa6ade2dba675b8c4b990da58c0a36f4166a3a9f79fd7e7f77f8d7a8e79e46 SHA512 159fb5e70b7f4639a563a083f664816c2b3b93894309382b1ccc457a19a3124f35fae4ecf43cb03b4b0cb4eb47582df7d1119d9f5bc4413a9660156001f3c565
+EBUILD gobject-introspection-1.60.2-r1.ebuild 2246 BLAKE2B dcf18d94a0416c1555dee6bf95b04fba01e87a37289ded333b74382dc51e05043a2e2a009f25da75acfba996983fcff22cba118cc7b01b423083d56d64471d3d SHA512 1565cfdc1944e9189d5306a0c575c310bbbba66fd6166ecfde06e24b3cc55e7185d8348eaf3f1b91a4682ad7d6aecdbf0d7c6370b68caf3837265fa1993c04cb
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.60.2-r1.ebuild
index 4b780a3b6c9b..8a63af2a15f4 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.60.2-r1.ebuild
@@ -24,8 +24,12 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~a
 RDEPEND="
 	>=dev-libs/gobject-introspection-common-${PV}
 	>=dev-libs/glib-2.58.0:2
-	doctool? ( dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}] )
+	doctool? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_MULTI_USEDEP}]
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	virtual/libffi:=
 	virtual/pkgconfig
 	!<dev-lang/vala-0.20.0
@@ -38,7 +42,10 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	test? (
 		x11-libs/cairo[glib]
-		dev-python/markdown[${PYTHON_USEDEP}] )
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 " # autoreconf needs autoconf-archive
 # PDEPEND to avoid circular dependencies, bug #391213; but needed for tests, thus test DEPEND as well
 PDEPEND="cairo? ( x11-libs/cairo[glib] )"
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index e4bfdad206d2..0106e96bfcd8 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -1,6 +1,6 @@
 AUX hiredis-0.13.3-disable-network-tests.patch 1297 BLAKE2B 49b87fc28763d551c51524941dd8254765569546997dea69d427473799fe4921b96013cff79a9c09af3341bee848274a5b2281c16785fd44592ebbec866c6978 SHA512 bfbf4ee0a6780cbdcac4c8578aacac241d2b00c94dedd4f298ff06d65cab100f446072573ea0b57a513d3f7146070776fa08e949374e43272c2b05e601f250fc
 DIST hiredis-0.13.3.tar.gz 58291 BLAKE2B 2af5853475a48b1f05c17100197633af61663a23a1259c702545938367b6a5b9fc09b886e12f57d27f23db3f5c636bb42d7e58887cc1481b7016cea405345ddb SHA512 0d8b71d5ee4105e8aaeeee308795afc2c1f60a04b0bfe8ae873d800a0c157882ec307efa04a8d0e63b538fd3fc3f88eedf4d46cb87c8937e2403927aeb7e434c
 DIST hiredis-0.14.0.tar.gz 63061 BLAKE2B 1923a63317f5f4a5bcbc9f8fd35e11fda15c30bb766d377f3be1eaf961cf34339e16b9b7c468b5bf07e513db4913c564e49eb29a2684b945db6c914b07d01905 SHA512 57a81a35b4750f0ca9dba830789483667f8ca1559f13b0ebdc3fab3e34ad16b2809f9734cf88157041263784e11447556b7a748bfb7ef318a60bb5dda3e358a0
-EBUILD hiredis-0.13.3.ebuild 1872 BLAKE2B fda15070c741dcda0a4696bdafe06d06dfae5552e9ce6da4c75a7a8a1ebd78bfc13cbe95d3167552b38d1e3ccc83c43dcc3061dffa44779192f9efe3f3597e42 SHA512 3e4ce6fb3f440d4e13ab71da8b13c3a1b838790e81dde82e811cc29ad8ebcd0ec8c829c4c173259d15812d3a5c237920f842b9c162ef3cfa7bfd8ae5b5476bdb
-EBUILD hiredis-0.14.0.ebuild 1884 BLAKE2B f4a58ee03ee045213dc4a1fe66511082857c79d2c9bc0e468d5cb31e1696cb5290121149e19f4fc30d9ac9bd58fcaa73cb3acc90a322d61c759bfa7b127db724 SHA512 f41ab5694ae37de96945666f48d86afeaeb1ff161db3a480589abaaabab8779b9405c50fb51be46e55782600783a69bcb484c5d0935839739d4e446810825252
+EBUILD hiredis-0.13.3.ebuild 1870 BLAKE2B facbe66e462079e237a670b2cbe699b020075648f0ed0e178f8581c4ed0ff567482890c7fc0ba321d96161ab42294fc3e65c384c9836fe765bd14878ffe67860 SHA512 61bfca9c72ffe51105048909d7f66526b2051cdb68c52abc0f35f1e01a9b9a4d44531fb93b99d1d9e2f1badab98ee2ff2f09acc8b0deda23f650f57faac8ef61
+EBUILD hiredis-0.14.0.ebuild 1878 BLAKE2B d735004be7f0afc70dbf6cdb4a230685c1026ced55cf61e48927a96ad268fc8fdb393ccbb41f35de9c6bc6f9592991807902048d25d4229d26dd115d9e04f565 SHA512 14560267c5f3c8d634a1d33bedd2aea6a7559ba1ce89840cf8e8e2b83e7dafe7dafd0912fb45b4e7d0bf4c5f112baf5c78b72946efbf53095c71da9c3470fa67
 MISC metadata.xml 324 BLAKE2B 4b317777c17533d9f574064a410d1431dde5ac68fe50b25140f63cd21829b30cede1a4e3d38996eb50de1cc38257a9e5eabb2c2871c1d5727132a698048de93e SHA512 5c81a7e5c915ae46f6d2849806534ee520d413f8ca2f640c7441a61a478652bdc6f0a2501504843b1f07b557c06c0045e92ee87a949e018f7d95884e38faf78c
diff --git a/dev-libs/hiredis/hiredis-0.13.3.ebuild b/dev-libs/hiredis/hiredis-0.13.3.ebuild
index 77e4dc9e8c53..33c0e2fabc38 100644
--- a/dev-libs/hiredis/hiredis-0.13.3.ebuild
+++ b/dev-libs/hiredis/hiredis-0.13.3.ebuild
@@ -29,7 +29,7 @@ _build() {
 	emake \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
-		PREFIX="${EPREFIX%/}/usr" \
+		PREFIX="${EPREFIX}/usr" \
 		LIBRARY_PATH="$(get_libdir)" \
 		ARCH= \
 		DEBUG= \
diff --git a/dev-libs/hiredis/hiredis-0.14.0.ebuild b/dev-libs/hiredis/hiredis-0.14.0.ebuild
index e9e551acd1a5..c87b5ddc5a1f 100644
--- a/dev-libs/hiredis/hiredis-0.14.0.ebuild
+++ b/dev-libs/hiredis/hiredis-0.14.0.ebuild
@@ -29,7 +29,7 @@ _build() {
 	emake \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
-		PREFIX="${EPREFIX%/}/usr" \
+		PREFIX="${EPREFIX}/usr" \
 		LIBRARY_PATH="$(get_libdir)" \
 		ARCH= \
 		DEBUG= \
@@ -65,9 +65,9 @@ src_test() {
 }
 
 src_install() {
-	_build PREFIX="${ED%/}/usr" install
+	_build PREFIX="${ED}/usr" install
 	if ! use static-libs; then
-		rm "${ED%/}/usr/$(get_libdir)/libhiredis.a" || die
+		rm "${ED}/usr/$(get_libdir)/libhiredis.a" || die
 	fi
 
 	insinto /usr/$(get_libdir)/pkgconfig
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index 9197904b91e7..0ba39be6833c 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,7 +1,9 @@
 DIST hyperscan-5.1.0.tar.gz 1810559 BLAKE2B 0946b3afe00cdce51b82852515ffe674729854d762854c252ba90fc73cbdc23205fe75f8e6c4e976efb31bf10950076b5790bd9692768dabcbd642d53e739c32 SHA512 5e6d11429e61dc061dd31e6b311a8c1dbfcd03af6e24d97b95eb2cef24dcd33d593064e5faa7c22807d785a8921bc410a69a43c4e5b3d7b4774f37c4a12a025d
 DIST hyperscan-5.1.1.tar.gz 1811275 BLAKE2B 524f1fbdfd470cd12ebb0ab4e122a97f6a90a1027adfa0850921a8f80c09f87792fed3da6b10367336b1e84987414bda93b98aa30aa9ff6dd899bf29fdd4294a SHA512 2812174890f775bc0c99019afe49cfde9ecc1107626cb4f1c9e1518228d090cba43bc15a19beaa00bae2a8a3dad85e7f27d4b237973360a294db78098fcb8508
 DIST hyperscan-5.2.0.tar.gz 1818751 BLAKE2B 4d74a4d022a59ee37c7df274ff1a37153898aa403bdfa3ec39df7304f7f65bcae1bbc074a2801223ef00903a5b8a01845e985c2ad196496d40899bab79df3844 SHA512 4d56e2d02dfbedf3caa8b212dae2ac3575b343b1ed2a75e91f6074ef265bbc28cfb78ad7f08dc47d7cc2e3e3e02e488c4cb75efacc41755f993236d97ddcb4cc
-EBUILD hyperscan-5.1.0.ebuild 778 BLAKE2B 284cbe1b20de0502a6f0b37dcab5993a4dac89d35d7806f56c90bfed11bf533187a8b5e2efd60f82bdb6e697674feed6a308a869f77f9c197c819fb43f4ed09b SHA512 0dc0f886dbe41fd7a2ac437586e664cc8fb7a65480698ad28e743342fd23303291df88450686836f0affe5e7bd5f15fae4319298db915112a12556bd8f9da9fd
-EBUILD hyperscan-5.1.1.ebuild 875 BLAKE2B c75b0928f76f19df13f2af28c804b84f1243eb95c8fd65ca5ee103c34150e0082efe63eb365f7891484cbddf28014afcae556bb275db017504c59d0656a4a517 SHA512 ddea5e7a39ce0586f3e715b885d2c8e01953bc401f7755a2c278c50ae3147a4be96fa45fc9fff956fdb47c303354df0d45f9f386da5b1b77008070ceaf0a8110
-EBUILD hyperscan-5.2.0.ebuild 875 BLAKE2B c75b0928f76f19df13f2af28c804b84f1243eb95c8fd65ca5ee103c34150e0082efe63eb365f7891484cbddf28014afcae556bb275db017504c59d0656a4a517 SHA512 ddea5e7a39ce0586f3e715b885d2c8e01953bc401f7755a2c278c50ae3147a4be96fa45fc9fff956fdb47c303354df0d45f9f386da5b1b77008070ceaf0a8110
+DIST hyperscan-5.2.1.tar.gz 1818935 BLAKE2B 8b073c946b970867221043b88f36203a0bfa3f2b94002ce2e46f0aa5c616d3e09f19a750510bd88ed30d0aa4324c0d0f04d6a816775b4bed2c246bbc1548b2f0 SHA512 e6ac2aef1f3efa1535c00d73fa590ea62fff4686c4ad3ee023d2e72c51896ca4616ec1b85d7c6f88ac7b42d92c3557b9c4bb3b51cfb796e20a79d53b28e53b6c
+EBUILD hyperscan-5.1.0.ebuild 813 BLAKE2B c9b2941dd08d11cf53c5180d5f45a4091185f94198c57a9f72ceb595015c84f355dcce7fac7e72dbd02ccf8fe4e21b14fcb50d270df2ba213f76c4c74adc3318 SHA512 60473762453443d896b96ff005ae58495e136f1bea3fa31380eba2747012ea73f886c2126ac5410a052b537f61ba345a52a6bac784dea6559739e3379db02317
+EBUILD hyperscan-5.1.1.ebuild 911 BLAKE2B 041491b397dd7f4ed9af4649d85c01f8e439d2f083e5a55274c6007e3d58191e5c792357333694b689eae39149a43e1f1cbe8dbc95f8beda235857cb57872e16 SHA512 d90ce5d7baeff45e00cf3d34cf94c336e7c62d3a41b837739206dc96c883acff091e3a6c483cfb6185a4f723cdefd13b20ce7ab42491dac1e59700ea1637e6f1
+EBUILD hyperscan-5.2.0.ebuild 911 BLAKE2B 041491b397dd7f4ed9af4649d85c01f8e439d2f083e5a55274c6007e3d58191e5c792357333694b689eae39149a43e1f1cbe8dbc95f8beda235857cb57872e16 SHA512 d90ce5d7baeff45e00cf3d34cf94c336e7c62d3a41b837739206dc96c883acff091e3a6c483cfb6185a4f723cdefd13b20ce7ab42491dac1e59700ea1637e6f1
+EBUILD hyperscan-5.2.1.ebuild 960 BLAKE2B 405bb4bd788e4471e6ba89a8d26df888d84e975240123be0eb598c4f5bee34d7c45920488ab14be4efba2bfcedd32d639041f4dd6bd7a45a4ebf9d5927fcd5e1 SHA512 3bf42a53408fe604a456109e6ce0671c57708d4c929af095d8c07d3e66e35e25c2db9f44c4af43054d2fc2fd85e6ddbae501911c1b8a1b75de2d9fa0d2091bfa
 MISC metadata.xml 444 BLAKE2B 135788c6bce69014c87cd2e80660f5ab8563afb0e2bddf281245d64e9787318b8b4cfa743d0d2648b40f40ce909dfe5a8677fe00114311c4d8ea88b037ff9afd SHA512 8b3dd40cc7b43125b2a7297c991143d74a5d3cbb70e0d5608ede859987cd27cae0a27b92c46419746d56a0f88252e6cb75ad6111ac25e920ba4e46acc8caa423
diff --git a/dev-libs/hyperscan/hyperscan-5.1.0.ebuild b/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
index ec3fa0a718e4..52d8497da64c 100644
--- a/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,9 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit cmake 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"
+SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/hyperscan/hyperscan-5.1.1.ebuild b/dev-libs/hyperscan/hyperscan-5.1.1.ebuild
index f21c9535c2df..42551e93ced8 100644
--- a/dev-libs/hyperscan/hyperscan-5.1.1.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit cmake python-r1 flag-o-matic
 
 DESCRIPTION="High-performance regular expression matching library"
-SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://01.org/hyperscan"
+SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/hyperscan/hyperscan-5.2.0.ebuild b/dev-libs/hyperscan/hyperscan-5.2.0.ebuild
index f21c9535c2df..42551e93ced8 100644
--- a/dev-libs/hyperscan/hyperscan-5.2.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit cmake python-r1 flag-o-matic
 
 DESCRIPTION="High-performance regular expression matching library"
-SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://01.org/hyperscan"
+SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/hyperscan/hyperscan-5.2.1.ebuild b/dev-libs/hyperscan/hyperscan-5.2.1.ebuild
new file mode 100644
index 000000000000..8789fd913c71
--- /dev/null
+++ b/dev-libs/hyperscan/hyperscan-5.2.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake python-r1 flag-o-matic
+
+DESCRIPTION="High-performance regular expression matching library"
+SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cpu_flags_x86_ssse3 static-libs"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/ragel"
+
+REQUIRED_USE="cpu_flags_x86_ssse3 ${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	# upstream workaround
+	append-cxxflags -Wno-redundant-move
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
+		-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	"${BUILD_DIR}"/bin/unit-hyperscan || die
+}
diff --git a/dev-libs/hyphen/Manifest b/dev-libs/hyphen/Manifest
index 05e15b5089a1..c58255ae6ed7 100644
--- a/dev-libs/hyphen/Manifest
+++ b/dev-libs/hyphen/Manifest
@@ -1,4 +1,3 @@
 DIST hyphen-2.8.8.tar.gz 638369 BLAKE2B b20bf9476d573c344eeaa5088da5dad17ef025d37717391965880b60b78908bfa00347b4840267a8bab77bbf0c3d653313e342b892581f1864381c476804c3c1 SHA512 ee514952be56869840b70fb74f60eba14dc4de246733ff8705492367e8cf00c485f8778a9d5a7ba374c988d4ac9fedbe75826dc559e1b62465dbfba21f6ce7de
-EBUILD hyphen-2.8.8-r1.ebuild 751 BLAKE2B 99e901ddbd3aeb7ab344dd9f4cff9f172f7ce62213079f6576cdf33e6759e56f0c38d8a82bb65e891c7be05d169be5c5dd1ceeb804e39e013ded45a37c941927 SHA512 e12a7f2aeba6afac085fabf4edaadb354bc258b3dfc3db3974a7ed7ab51c7667578ebba1ff25124364eecac19523511a0e35e2c6c402d0fb9e19f36b432d5c5c
-EBUILD hyphen-2.8.8.ebuild 721 BLAKE2B 973906a5054ac995bd0a4c0604050cdd41b4397004bcd224f5b536246fcd902b685aecddd014f97f98c2adf6d131fff66797dcc2a090ab7cd2b59527c02d6612 SHA512 02691d1c40723bb7d559402008cbdf689dc0ba2247ab463e5e628c9edc4651e82c832b9054d3dc7fb428feff92d942653310250e3aeacb032cbc48a89696cc7c
+EBUILD hyphen-2.8.8-r1.ebuild 750 BLAKE2B 30a28efe2fc28684d96cb1e59281627bd5162264668e0e182c22a4b269e5abb03f5bbe7da9e3cf0a90b71529c55b1beb54255d8f4cb14a35c81282dd282fc79f SHA512 2b1d0988e846d99bd0c53457a7f9b12e054521a149c87e91e07a7d7a15c6d0a1cb740710454e8f2c332ff546c1aab2e8acc94fcc2c91820e4df1665692b677a4
 MISC metadata.xml 333 BLAKE2B 989788782df7e4531d2ad8a12b49eb19f8651468467ef9c2894163c9089679622ed1bc597336afb881ca85bf0523e7e8077c8060d46b6237e4ff5dfe16bc1c1a SHA512 1c2849146c40fcf9b1c352d57e9580ea7d9c2fbdc71c5cf601343e3beb9580876b6dc1d42d41abe01163d92c0eb7837fedf85fc3e7408801f0d966ccc8e78ba2
diff --git a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild b/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
index 22bb0667ff6a..3c23fbe56f58 100644
--- a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-text/hunspell"
diff --git a/dev-libs/hyphen/hyphen-2.8.8.ebuild b/dev-libs/hyphen/hyphen-2.8.8.ebuild
deleted file mode 100644
index 315fe7fa9324..000000000000
--- a/dev-libs/hyphen/hyphen-2.8.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="ALTLinux hyphenation library"
-HOMEPAGE="http://hunspell.github.io/"
-SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="app-text/hunspell"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README{,_hyph_en_US.txt,.nonstandard,.hyphen,.compound} THANKS TODO )
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	rm -f "${ED}"usr/lib*/libhyphen.la
-}
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 06f2233fcb23..cb39607a3801 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,6 +1,6 @@
 DIST jsoncpp-1.9.1.tar.gz 203067 BLAKE2B 654f39b1265b344bb24d3fefb34d4d8b44f69ec819f333f00033ef90acfd5b926fdcc743badf403af797a6f58fe58d195ec0cdf4a1514629f8a1e75c20a6e2f6 SHA512 4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766
 DIST jsoncpp-1.9.2.tar.gz 211341 BLAKE2B 9081bf2b2599194c1c77476287e34aaeacc3c331147db79e3343eae28321e55dbfc8d74faf899912c257194030d39eac4fdb016a68290755badd1b68b0a69dd4 SHA512 7c7188199d62ae040d458d507ba62f0370c53f39c580760ee5485cae5c08e5ced0c9aea7c14f54dfd041999a7291e4d0f67f8ccd8b1030622c85590774688640
 EBUILD jsoncpp-1.9.1.ebuild 1367 BLAKE2B d99f9444620096bd27c6618010c2e2953e362927e447286443a354bca85aeaf68de4223b1cb65be2fe11ba72638f61c7e8271a7f16ecfbcb4ecc9aa2caf9ab56 SHA512 c9ab1d7b1c2029b3f9fbca574f4c7b35bab866877745166fd2502ad6581b184535ff0348aa595d64d4dbdcf03481ca3228e6a1a1b49d3fa7c442a8f9af82cb77
-EBUILD jsoncpp-1.9.2-r1.ebuild 1382 BLAKE2B 6023bb2bc76bede8e7e0e4adef0dbfd349019acdac5981f04ffd1cfebd1e00a396696282ca83734a2b799cefa4a01890c6ebfb9730c3bdc4be3dd54ed866a740 SHA512 c2507dbe67f923f0201d4ebf291c0161d22e5b830b028000027e3bcdf92c949ee8577e0ec783a6d50b6220857efb62018a2d10942b0dbeda031c069619ea16a9
-EBUILD jsoncpp-1.9.2-r2.ebuild 1001 BLAKE2B 6107c074591edc1800dea6e6dfc0d8374e665bbc6e04d9d5c24e85be3934ee45834c3adf5920447d25ee5036ee918c8e5e028eee1e18cba7f64d88831c206ad0 SHA512 96b69f89c2d7c56cad2174029c97de0eef42ef4e48f2032367596c1e3735b928b4e876d7f161a26f3f6bce1564d96ae93895d045e827ebcc2ca97017db49ce1d
+EBUILD jsoncpp-1.9.2-r1.ebuild 1372 BLAKE2B e33bda4af994ea0ec1a2c7e8d5012f93e20dbe0583253ea8cd026d1e2bcc25a769500a47a58014471fe348f425c3301b3c3502522d0edcf09a1727d22d46c659 SHA512 eaddfaa3ddb9516b144472db2e584700f3862a9cf7fa4195b5d0b63a6f3e3a36ae2039a01e378981991b7adbd6cad140cb636741bf8b25d461e821faee73a8c1
+EBUILD jsoncpp-1.9.2-r2.ebuild 991 BLAKE2B e2f317f69acf14707bc1861e96689c89f7fceddd20a5639dc9431cd5824b078cc5794c566097ca0eaa054025668e1dbac3444daacd2f843801efa5964d486ddd SHA512 5ad3d87053f8af8b437cd5cd1fb5dfe23d38b476845da81e0d4b3bccc7d99e8f74057bd227e6699bd028ec10949a83cabd11f1e5deaa662732615340a9a9ac7b
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
index e9a33fb38a9f..822b5d285097 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-any-r1
 
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild
index adf6eea6b377..3e8ebb177b77 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit meson python-any-r1
 
diff --git a/dev-libs/kuserfeedback/Manifest b/dev-libs/kuserfeedback/Manifest
index 18d88b35f17b..199a10110f43 100644
--- a/dev-libs/kuserfeedback/Manifest
+++ b/dev-libs/kuserfeedback/Manifest
@@ -1,3 +1,3 @@
-DIST kuserfeedback-0.9.90.tar.xz 182600 BLAKE2B 8f2d5face65e002ac805013fc897f55099bdbf19e7a4a5f6b26e1c728a2181ae3d11fcdad05417d3c5d3c81ab46958ae8ab237cd849df44f407ff823a066e94d SHA512 a4f5ee35d54479d0ed8c8e142c6d600a95f6a5e0179398953ef9e9b439b5f286ca90306577797478d53b07da258070710a442b227d6f70e4f2f372dd13b60aae
-EBUILD kuserfeedback-0.9.90.ebuild 1259 BLAKE2B e81fbad7a6cba8390efcdd42f389296002bb94c908c30ecff0730adca24a6aec6241c705f09dddd6d0b8cc6ad163d226726eff4bb974bbc026745836c24698f4 SHA512 0ac178c605fc106f6eafb66214b0ef810671bfba603f7894a43c13883c12950e7995617e8c0ab8a8abfb5289f4ac5a51d7a2a566283edd934211d1f84aa4c0ca
+DIST kuserfeedback-1.0.0.tar.xz 187784 BLAKE2B 24acb6c1f143a0811a84c7d4f5ffe923df2fe94b0d13e361870d308b65ee8be747cef1a2ab719c6023b4f5885fb9970620a2a5da0d073e70b1e4912c6f64c5d1 SHA512 d45c45b3f7b50f7ff3e5e5ae7e6a4cd68c0aa444553d0c44a969ae17e51ef5114ab6401c8ce65744ec3d635cb2edc7a127187547f01f4954faa55087c702dea7
+EBUILD kuserfeedback-1.0.0.ebuild 1257 BLAKE2B 9acae65acdf587e6aae6c03dfb144ac2cc06507de8118f020eea8f7644cc9bc92d57d570d58df7a6e289ee811958e42e326524188040fd6929adf46385d914b9 SHA512 7fc3ebf56053484dc164cca0745570c3f9a1c4c267ece38d57b7db5e1c421bb627bfbb2b9d5a01b4dfa9bbc1073bd98246104a8409401e8816ab8b25065757ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kuserfeedback/kuserfeedback-0.9.90.ebuild b/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild
index 32461ef3c280..d254a943a562 100644
--- a/dev-libs/kuserfeedback/kuserfeedback-0.9.90.ebuild
+++ b/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz"
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~ppc64"
 fi
 
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index c99b75e90abf..620ddad55716 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -4,9 +4,9 @@ DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba
 DIST leatherman-1.8.0.tar.gz 815287 BLAKE2B a8377cedac49e0845e689e4e8ff58fb59e6e59c77e8cd363774d22650b4b286d85e0b5e52b926c3e4169ba2eadf9fc50f16f5161001a16f63c49f3ca66c996cc SHA512 fb308025f0807b12527fe6fc287fee861eb27b6987df38c03e1da73c477aec5a2a6c92860c983c4cc10282388ee34f2cf657a38831db007519c471f815f492f6
 DIST leatherman-1.9.0.tar.gz 815504 BLAKE2B 62b4b9aeca3279b7f89fba1c3a7655e59c5d490cb44ba92e4c2dfe5ffa78eeb02a448bd6c6e6b08c324531b799ab5d1800a3b57c4e490794f76bf9737db16963 SHA512 d8e0fe7f165845056a0308241ef0e656077269cd6cbc656b1a72295ff475e813d3f523c8d45b14d7e10a8deebe786ac7fc836c46d4230142812a9c0362cd8967
 DIST leatherman-1.9.1.tar.gz 815756 BLAKE2B a0c8777531b066e247d8abfefc1b22fec825f7db22ef67cad6a703a7cd168f19349b13b923841e8064eec1e7bc7b755181b58370c7501b37710ac376687c5b43 SHA512 51dc356ec7196c7538fac154a094d3693de5ef89d50a07651753c400daff3ecdfbfe46516ffecfa592484aa1ec8afb891f2f2b6be62c94a8f0ab08a3bba65786
-EBUILD leatherman-1.10.0.ebuild 1179 BLAKE2B 13726a13fe2107141de86745224909019b492fbccf5e83b4e08156b498d80c83d959265dec427bb0c03808759a35e595d633880d6b829b4735393bf13958f786 SHA512 a8d3e0a56969c52486e1255b1245bbb75989c9c509b59c6fe01be8a2d8f4dd777f66cf7294cf28b9ce7c411c7662a8c4397312e1a444200b09cc1f0b773e09c3
-EBUILD leatherman-1.3.0.ebuild 1091 BLAKE2B 53d75a2e93e6eb2bc30446327f70d929b5550e298e1e6d8f9c6396d6bdaa8c5f08cf50b2bfa717f6c7e9a61b72575eb03ce83b8c0846595d25f536685779d8cc SHA512 c51284fd5eb7481623e606e4843595ff52875de13909c2d0e052f563953448444dce71a4a5d2f6aaf481970d3b89fd063e44311edb5be66de2a0522d6a429ff4
-EBUILD leatherman-1.8.0.ebuild 1177 BLAKE2B 3151809adaa90822e9ff2ea0ab19b1a25787e098b67ae26c47f53e5d5f0ba7698c0b452d990b54d53aad2fa11cee4e7c7a5f3cca4d615ca81d2cdbd9e7121c06 SHA512 157ce4dda5741fc00f0aa8ba3cc38650b0f7a5c72a890deaa32a8caf869359c3ccc4476e70750869e1d3762d9b0ac3701ef4b895d3aa9dfca7c83628cd50f7f9
-EBUILD leatherman-1.9.0.ebuild 1177 BLAKE2B 3151809adaa90822e9ff2ea0ab19b1a25787e098b67ae26c47f53e5d5f0ba7698c0b452d990b54d53aad2fa11cee4e7c7a5f3cca4d615ca81d2cdbd9e7121c06 SHA512 157ce4dda5741fc00f0aa8ba3cc38650b0f7a5c72a890deaa32a8caf869359c3ccc4476e70750869e1d3762d9b0ac3701ef4b895d3aa9dfca7c83628cd50f7f9
-EBUILD leatherman-1.9.1.ebuild 1179 BLAKE2B c7e13c301c4d161afca945a196e62af93d03a3b13eab021613710423c3d6c5ff0e6caa464284abf24be953465708a5236411b8b1878c68c4d61449d4a0907cc1 SHA512 9bc9e413fc5e30aa9bcd5ee8c02781a0545e3057462317e0e0d5affef1334cac07782c39ddf52b8647b65df1f751d33cccc231d33f31c426e67fdfe1bc8c3a86
+EBUILD leatherman-1.10.0.ebuild 1149 BLAKE2B fda0e19074801348d21878b2384d3e798fc5052ec95f504fd25345d73df8b3c9d07a4c68757429468218d73c9014a66ba6dc849f86c28c7778ee2a69cc5eea22 SHA512 79d9503051af852eadc7b97957d13ebe6c585480664951a09f0b18635025e3f796c99e54c7fb2bc7cac932b68d36ff4e6f1dc8ab062e278728855046d6eb4e7b
+EBUILD leatherman-1.3.0.ebuild 1061 BLAKE2B 6746bfad248fff04b92bf83e90b68441a9626ce74ff3ac10bbdd0fde45f527940ed87fa7008f6bce5d441cb8b826192a58d36a9b34fc5b4088b2e6b294435cf3 SHA512 88ad0b28642f62b6e828dec3945dd616224e2080a2aca3215e7d24e59a3a532da66da363631848685b7d034a6d3fa28f6fd7000848e2b4a7843df6704450c478
+EBUILD leatherman-1.8.0.ebuild 1147 BLAKE2B 95571a3deb6cce15aa187d8fbf4307ac183537f4906200b645639cc8da60375215e753be25436295fa9913f794ab19bc7072b43aa09eb8ad30e210cac05f618a SHA512 ed666a70945b7fe6c12b8cfc49b3d00a280b4e12b0fc6d4ad6238e37a9d6f48a106f2e60279d5c7b7394224cf127b8ec8e90eb9f169536c64468639003afbdcb
+EBUILD leatherman-1.9.0.ebuild 1147 BLAKE2B 95571a3deb6cce15aa187d8fbf4307ac183537f4906200b645639cc8da60375215e753be25436295fa9913f794ab19bc7072b43aa09eb8ad30e210cac05f618a SHA512 ed666a70945b7fe6c12b8cfc49b3d00a280b4e12b0fc6d4ad6238e37a9d6f48a106f2e60279d5c7b7394224cf127b8ec8e90eb9f169536c64468639003afbdcb
+EBUILD leatherman-1.9.1.ebuild 1149 BLAKE2B f4e5c9d54e2e718c39f18567b54aa074faf2e7dd133eee41a6cb8b20b51e9d2cd60e6d47bc528c1c1d4aa4a2a51a62b55b8041dd84fb8623d1d4b98c42ec7592 SHA512 2cb9442fd75f52223eb5fa7a6a018f65dbe13f41854ea962ffc0e7d88e95cb20126db8ddbe52ee7c0d522382e9d3647d5e3068b6ebd357153ddc6b73f6e94628
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.10.0.ebuild b/dev-libs/leatherman/leatherman-1.10.0.ebuild
index ac093ea96d57..aef4cd923095 100644
--- a/dev-libs/leatherman/leatherman-1.10.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.10.0.ebuild
@@ -31,7 +31,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
 	)
 	if ! use static-libs; then
 		mycmakeargs+=(
diff --git a/dev-libs/leatherman/leatherman-1.3.0.ebuild b/dev-libs/leatherman/leatherman-1.3.0.ebuild
index 276c9fbb29ff..34c6c1180ae0 100644
--- a/dev-libs/leatherman/leatherman-1.3.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.3.0.ebuild
@@ -31,7 +31,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCMAKE_INSTALL_SYSCONFDIR=/etc
 		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
 	)
diff --git a/dev-libs/leatherman/leatherman-1.8.0.ebuild b/dev-libs/leatherman/leatherman-1.8.0.ebuild
index 978d0a696adf..c4941f2415ce 100644
--- a/dev-libs/leatherman/leatherman-1.8.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.8.0.ebuild
@@ -31,7 +31,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
 	)
 	if ! use static-libs; then
 		mycmakeargs+=(
diff --git a/dev-libs/leatherman/leatherman-1.9.0.ebuild b/dev-libs/leatherman/leatherman-1.9.0.ebuild
index 978d0a696adf..c4941f2415ce 100644
--- a/dev-libs/leatherman/leatherman-1.9.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.9.0.ebuild
@@ -31,7 +31,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
 	)
 	if ! use static-libs; then
 		mycmakeargs+=(
diff --git a/dev-libs/leatherman/leatherman-1.9.1.ebuild b/dev-libs/leatherman/leatherman-1.9.1.ebuild
index 5767dcd6355c..af63706df334 100644
--- a/dev-libs/leatherman/leatherman-1.9.1.ebuild
+++ b/dev-libs/leatherman/leatherman-1.9.1.ebuild
@@ -31,7 +31,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
 	)
 	if ! use static-libs; then
 		mycmakeargs+=(
diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index 0e1bd58b651f..09d5e44810a8 100644
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -1,6 +1,6 @@
 AUX libappindicator-12.10.0-conditional-py-bindings.patch 2019 BLAKE2B a57b1b2e3ac115ebc7395967f36b2f648abfba2abc32fb77505a77ddb63d3f7e99c0f5ceeeeabdbe541edc6db1f76fc23e28c0df81c0c4bea600d4a0f72b5f26 SHA512 69d86a3d1e930a0f0c79091dba9691610ecb0fcf13c672fc0ff511bb764b7f74f6c42cab558b6412863a8353fe9a8d72c40419db873fdc4716a93ba3bbbd0aea
 AUX libappindicator-12.10.0-vala-inherit.patch 561 BLAKE2B 481ebe7b58af89df6a326b79a65f9ac7110c9d82a61efb993051d691d5cc728075bdd5ac904e9986cb0e41780d3e36e1637e5bd58532781934587b8c1bdf458e SHA512 b021bc0ec7fc1b311add7d6f8a9018fa6f5e807168055c95440e5f5d3d6d5b48375e11542b906058a0786194b1911c8bdcab9632573c1f128772ff6d54aa9173
 DIST libappindicator-12.10.0.tar.gz 535562 BLAKE2B a05dc839aaea9fb3fda118d16aac0eb5c35e6c5095a83eb5e8a2af4902bc1da14960fbd57d3cda5d4d5d874023549ce83657a515aa9ee16a54cadfa81062d993 SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a
-EBUILD libappindicator-12.10.0-r201.ebuild 2230 BLAKE2B c4d8027aca60142ed183ec9248b4ef6f5d4346727c36f69559bd19e77c77fe1a6c4a0045134ee190c2ca31c974fe1ed5a6e4b7161a9afda2c095031d3c66eec2 SHA512 34710e0c796dfc2091eaa98d2e72f6a27bbb5d45a00ed13981e83f892ca9ee3ca867a47faf65cc3a5318c654ae2fe8f13bc40c837862473d0a9e56f9c1998c4c
+EBUILD libappindicator-12.10.0-r202.ebuild 2268 BLAKE2B d00efd597c2fbe4a3c00da16bce78b581fedc2407677f18525265dfa3ac91dbcbc9f17c3cfc220104e411f3957724b0dc8219a039301148109628da5171aedf5 SHA512 508f637eeb1b4e6304aa7b8735a488f5b3edd822c792ee235018a35538d2e835585cd260ba5d0c77c665f99058a0cd6ed0ff2f019b62fa58be48e3a4059c70c3
 EBUILD libappindicator-12.10.0-r301.ebuild 1933 BLAKE2B 76a50a3d5790eb65d68d4d804e08be25c8fed69342ce5eceb83c7ea2e3f22dd762f96e79884a70fc917f452b5c85f3140527953140f7ccbfc8d33f542fefd56b SHA512 474781520757a59bb6ffb69dd9ea1a25f4da1964c5996cd6aa6a72e6a6f15272cb5090e52afd514b7f7a62b6c79567a614b97d8db57f128f2299d81cdca96c63
 MISC metadata.xml 250 BLAKE2B 8bd202d452582a51ddf3c4bc92840531d0fee0262d112e5fc1173c8fb95a0776efe14ff15613373fd4acab6082ad6f672e278a9b942e072a643b351e8af4d467 SHA512 161da1b732e0f23b06e0732db24f27cb486e7c673e8585d2f6403dc23147b56b5a64dd09978e3dd2db20e9e6a462daf50fe8bc73774d52445d1f6549d82104e0
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r201.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r202.ebuild
index 40fe8964c862..2803f1e0e278 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r201.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r202.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,9 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-1:= )
 	python? (
 		${PYTHON_DEPS}
-		dev-python/pygtk[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index 58586e4347f8..af2ec6d4d460 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -2,8 +2,8 @@ DIST libarcus-3.4.1.tar.gz 29699 BLAKE2B 73f132ff9d908468f1d67c54b7430ac84c0aebb
 DIST libarcus-3.6.0.tar.gz 29469 BLAKE2B c032dd51631b10c04e69dac4425c8a5d180cf8c983b896330b2dcd5d479467d6a2e94827ef8accad25399167457e5ae9e96f1a363c986be33de8255c3e80b1fb SHA512 1bc50a08cbec61edefd78f3c347cca08f6bc40a308472bf6788c2c8962b03ea81b32357be18a3c34847c121eb52ee6836da22cea65b1a8f64b7c924bda290430
 DIST libarcus-4.2.0.tar.gz 30582 BLAKE2B cb2390d7fc8942cbdd880385313f4bd8886a1ea4eaa5246c76b0b3243e8a099953ecf51d09486e005c8c14783ec67435b33068efae2ea6075edf91b90b9fa9b2 SHA512 f9a38d095a2ba2ab29a382466ce16d1c0f5cdb34b60a2b930529edac94de177d7bed37ee26bf615833c94ccd0e3b7c71d502f5f815d92eeffdf3bc1f15b49ba5
 DIST libarcus-4.3.0.tar.gz 30540 BLAKE2B 58937764d9eec4a235bcc26aa85ab1f1418ae2c576c24759fee5155c7690a3a5feee1946cbae8e7836fd4eccdb0f673167aeda46c3dae124101cfb03510697e8 SHA512 b3893e3c422de85a6968443a6f26149e9dee9f15038c11c219693b9aa8d5174d908421e33c8e3ce4e4ecab8c5077da217b44a9ec6bb4b351ff67b7f2d42cc890
-EBUILD libarcus-3.4.1.ebuild 1078 BLAKE2B aeab9c7377add43ff6cf2826049d15d3e2637d3b71e644906ca60331327eb12f9653f42e78183c01fd9dc5f35bf54a15f9c4b713d9924808999356f3d2cafcf2 SHA512 6fea171aab92edfbed650c06de1b82e773e2d58effb03eaa8fe9769e4d1ed539d7271a7ff3ec86cebcdcc1d99d1479baa4887434ae1d66c2091196cf0b0fc884
-EBUILD libarcus-3.6.0.ebuild 1078 BLAKE2B aeab9c7377add43ff6cf2826049d15d3e2637d3b71e644906ca60331327eb12f9653f42e78183c01fd9dc5f35bf54a15f9c4b713d9924808999356f3d2cafcf2 SHA512 6fea171aab92edfbed650c06de1b82e773e2d58effb03eaa8fe9769e4d1ed539d7271a7ff3ec86cebcdcc1d99d1479baa4887434ae1d66c2091196cf0b0fc884
-EBUILD libarcus-4.2.0.ebuild 984 BLAKE2B e594a58069aa855442fa53ec8f78831e3c22e6d6c10e07221396bba14891e5f453f16768dee72b4753c8f919d35ec50e426a5c97041fd2035ceff9f3cd30376e SHA512 ec724940dff0d8ebd9ffaca81fb48db75570f81066c695954e1571089fc3fe84e28af9fc2ec60092f5c25c226c85c98a31e959a3b2263559a4074a3ae4733a23
-EBUILD libarcus-4.3.0.ebuild 1353 BLAKE2B 957389a5982d129a7e415082ca871cce23fb7a1fc8264bd1dbdf5287d2a1eac2bac6ea809953e4194658497a644b81a44fd25b13670d51df4978bbeb1e27f245 SHA512 d4b63dce7de402181406c798cf959233614d55e524f08c3afb6860ecf828ff0b8eb572f8f75f02bc34d233a7811a98a0e84445a10c6271d00e8987fddb4e72c7
+EBUILD libarcus-3.4.1.ebuild 1121 BLAKE2B 060bf6c289603efb42deec75419d01ca4e566fe73f81d022ba36b225108fb54d4cc9b3bb504dda665840ef3486b98d59abaee4d4b58935bcd5f5128d257f7c0e SHA512 b7c94cfa331d8f36c00fdb9e1085742efc6bfe1e2013e01def0f6cb142488e7633af9952cde05d1f9f15c30d09cdd4855871bbd7f51c7d95555fde1870bceab5
+EBUILD libarcus-3.6.0.ebuild 1121 BLAKE2B 060bf6c289603efb42deec75419d01ca4e566fe73f81d022ba36b225108fb54d4cc9b3bb504dda665840ef3486b98d59abaee4d4b58935bcd5f5128d257f7c0e SHA512 b7c94cfa331d8f36c00fdb9e1085742efc6bfe1e2013e01def0f6cb142488e7633af9952cde05d1f9f15c30d09cdd4855871bbd7f51c7d95555fde1870bceab5
+EBUILD libarcus-4.2.0.ebuild 1027 BLAKE2B 029645fa5e8c62b062f4ddbd2dbc0ecabcfc7d2833481024de1a0bd308a126c7529850049fc45f1e051f94a3b82d87869fa8e002b99a2df4794f1092ad9d3e09 SHA512 e3c7c30e082c55851acb1bd08d81f5c20261e09fdf5d88395e393b47ef0bbcc020e64b5183b79d12e62f7e519a19b3a1eb8a89c1ee7d986f94564240fdfcf60a
+EBUILD libarcus-4.3.0-r1.ebuild 1396 BLAKE2B ace6fed8c7a8b8db4829737c3b1b8d99a0d8ccb53688de4e029b39b7391b8a8771388f818eac032164c2efd74110a6bc987bc3d05dc81758eaabcbf24b5cff7b SHA512 9ec58979bafc8a7d4e5d0e334d0e12d3716fbffd4d2d9060cb52b9f061a06c676a95c0cafa8a344b22b8dcd855e3a41794d7669f4f037290d951acc6bcd0763a
 MISC metadata.xml 860 BLAKE2B 9375bca572d46d985fbbf11b222728cdaba22c2fde64e1b4a057d2920b9845bf442bb35ce0b2b1e78fc949cd687604f9f89d5b5665e3cee7afe5b69f09f5ed2b SHA512 9dbfeff3c641642edfd27fbbd27d2ef5810833e4cb3ae5b949c1a20c27377ac70364010fc9fbc759f456e93f294af62f3c08c59bb0585a3ca01f5cd157b3b33e
diff --git a/dev-libs/libarcus/libarcus-3.4.1.ebuild b/dev-libs/libarcus/libarcus-3.4.1.ebuild
index ced7f6897f9f..120cd3820013 100644
--- a/dev-libs/libarcus/libarcus-3.4.1.ebuild
+++ b/dev-libs/libarcus/libarcus-3.4.1.ebuild
@@ -20,9 +20,11 @@ IUSE="examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/sip[${PYTHON_USEDEP}]
 	dev-libs/protobuf
-	python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libarcus/libarcus-3.6.0.ebuild b/dev-libs/libarcus/libarcus-3.6.0.ebuild
index ced7f6897f9f..120cd3820013 100644
--- a/dev-libs/libarcus/libarcus-3.6.0.ebuild
+++ b/dev-libs/libarcus/libarcus-3.6.0.ebuild
@@ -20,9 +20,11 @@ IUSE="examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/sip[${PYTHON_USEDEP}]
 	dev-libs/protobuf
-	python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libarcus/libarcus-4.2.0.ebuild b/dev-libs/libarcus/libarcus-4.2.0.ebuild
index deb2605d5649..0dbed3da3dd0 100644
--- a/dev-libs/libarcus/libarcus-4.2.0.ebuild
+++ b/dev-libs/libarcus/libarcus-4.2.0.ebuild
@@ -20,9 +20,11 @@ IUSE="examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/sip[${PYTHON_USEDEP}]
 	dev-libs/protobuf
-	python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libarcus/libarcus-4.3.0.ebuild b/dev-libs/libarcus/libarcus-4.3.0-r1.ebuild
index 0869769e8f5b..f949a913e19b 100644
--- a/dev-libs/libarcus/libarcus-4.3.0.ebuild
+++ b/dev-libs/libarcus/libarcus-4.3.0-r1.ebuild
@@ -20,9 +20,11 @@ IUSE="examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/sip[${PYTHON_USEDEP}]
 	dev-libs/protobuf
-	python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index f3aae2ed6226..87a4e5746dcb 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,7 +1,5 @@
 DIST libburn-1.5.0.tar.gz 979953 BLAKE2B 7fdd6d8314d65547e48baa3bb7c0b8f94c5d5a799e62d79d8dfcd5de644c555be437fc7c84134598703b9335c2330c49e8c7c7adbaefa9e1f288109e0010f8df SHA512 c524d672d79db2f6dc22f6381cd422ddaa3b61d6741c998c773772722e37c53576ae9549dd17a33c2d020c66857ecbb948f353bc22cdf28c2bb115bd2b82d4a2
 DIST libburn-1.5.2.pl01.tar.gz 989073 BLAKE2B 4c62b236560d79ef528d9b0f419bb18a874a3feb6359d72f716ceda75cff9c5369417e85622f4016c352f255b0b4e46a6336be61e26b78a3ddc3adac5ac836e3 SHA512 40da5d4033b5f3b8e4fce8798d34c6608030f09bc1d98286b2b2e58f2fd1d348b115013b1a381eb9f1a3cf0c259c453507ee840e3aa24194521fe34fc3423a3e
-DIST libburn-1.5.2.tar.gz 988375 BLAKE2B 838a19e1e99786633e13f7265eb90922a82d5b3b2094e1397ad6eb3ec4b853ad9d18e3377e2308724a94bf99b903b856ffa3a0b98b6404f874845933ac3da18e SHA512 a8887907bbfcd9b743dfc2e8924cc9290d7af5a71651aeabfdc5874f2df076278ccdbc94f81efd6a720972f380512d330576739837ba685055ee717dd74797d3
 EBUILD libburn-1.5.0.ebuild 838 BLAKE2B 70b7534f6d4447cb74844a2cb55559aff2bb2282bf879de316afa41e5d2bf8b38c632052304ce92c6cd8be992a492b766ae3f83bccabfe20aed1a16fe9b6db82 SHA512 647754047a02f6fe370dcba700edc6e6f4a60515e872dab1c0a1c48be1930c5b315cf7df78e3da7f95a99f0318049348078d84689a03f93bd43e106adebe6045
-EBUILD libburn-1.5.2.ebuild 847 BLAKE2B e53346b68d0581aa21e9baf0481789337029f81b470690b49c91ecec725b98136ca97ae5cca990e000cee1031d3afa52ee37eb53ba1a03d941b82636c8bd83b8 SHA512 e6ff684fa8582d58cd3e0753c2fd6bee3939b75dd6ef413039d6af103f6fa9f93f49c6ef9782db7a3e3a97b8d65067d76d3c0fb830b4a75aa48a09362fd7a639
 EBUILD libburn-1.5.2_p1.ebuild 896 BLAKE2B 0c1200d24e2aba3185f53c548970f24c401079e7220b4f5ac6539acaff9c31330359ab82ce452ee20f27f1fd750066d2f8ee375f96d33fd8918017cb5e6073d1 SHA512 e37fbef828e574b6f4518007b4e21c55359e9a7353ab39abb64fe039ef1afc3c40284004d798ade1aa6580080b195d6b5e4bda94c65a9bb9218529f69d6dc5f0
 MISC metadata.xml 374 BLAKE2B ed3416052b36f8644d2231fd2d4d16e4177fd2feb09f4e5d81222dc9b4fb32cb5772d8eb86a739fc8ad11e398013c50ec802685848cc298a9e7f5efbe8928879 SHA512 1b78c0e0f60761b001b44216ac4c3de7fb6491a4d8b79b45c6e1f81f438df95ebe2cb70b273ed4a470283ec6e57c91d4fb1981fb365ed61a692214bed4097860
diff --git a/dev-libs/libburn/libburn-1.5.2.ebuild b/dev-libs/libburn/libburn-1.5.2.ebuild
deleted file mode 100644
index 3be51babba79..000000000000
--- a/dev-libs/libburn/libburn-1.5.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
-HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
-SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug static-libs"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-"
-
-src_configure() {
-	econf \
-	$(use_enable static-libs static) \
-	--disable-ldconfig-at-install \
-	$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	dodoc CONTRIBUTORS doc/{comments,*.txt}
-
-	docinto cdrskin
-	dodoc cdrskin/{*.txt,README}
-	docinto cdrskin/html
-	dodoc cdrskin/cdrskin_eng.html
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index b360bac1f8ec..689a3b23f84c 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,5 +1,7 @@
 DIST libbytesize-1.4.tar.gz 80943 BLAKE2B d4c6c34d81be01bf7db2c37b0660886d99eff3c0a87024f5fbc12cc3606dc01e772b81dfbcacbf76c62213120253a9e7bda90adbc749b6d4c3e31e1ed3ae7702 SHA512 5dd13cf52a1674be776220ee1863f42261a47dc53af1ce4a31460d6d02ce87e19c5a52260f700928af98f1d9d7a96de7c11d8f384907b3187ef2effc10cbb593
 DIST libbytesize-2.1.tar.gz 440209 BLAKE2B 7c689f269eae7b408b7f85fb9c877c9eb519d2a2eb143ef0ddb1657fbb4d79fab7cdaa56b35b4bbbb964e47361e37d7c70a0a135bacb8f817bd6cf8d2e22b68e SHA512 6b93d877e921820c19ed6874a36d9f8b6958112f6230f24980e8e6e30570b39ce74594f0ef126f70dc81b5434899c1f0f3ad0925f3ff7b6a596a9329c8f106c8
-EBUILD libbytesize-1.4.ebuild 1216 BLAKE2B dfede52acdcc463ddf1f7e5d4a0b6164439d0cd7b9ce9aa9ad88c2636c12e87dd68ebf54e1ab16673d7ca80f4b477ac40c9a64bab00616dc263a5b7f8ebfab7b SHA512 ee59f2fcef3379e2097fdacd583a822839ee0e2c730134b00b3d53f5808b48dffc967d4fb3595414da6fc0cd5df7de4d638ae790e85e7e4826e600e78cfe0a4b
+DIST libbytesize-2.2.tar.gz 443040 BLAKE2B 04035f99f1da4d2d426106e1f292d71089dae89923d41425fa815a72e375639a7d8b6fc5552a3f08462597ce9c19797c7fce5b79fdad504b9062168093a70a4f SHA512 4538ac3499a24023c21fe07f527e400f99509921e377248970ac2da0eaf1655ddb261f432eed46a59ef69a1275ba7d1e5b0cc488d64eeea936b6cfa54c552ac1
+EBUILD libbytesize-1.4.ebuild 1210 BLAKE2B 1a9c7143221924ea84b8ca543a18b3f471cc9dff10e83d1879c980381e38a89c32f479bb8451c90687d8195d9c554383029f2f7a8218b5082a0e52c44bdef7cb SHA512 4a59c6e654e6ec3c98f74845a466f5856339494ba70475120a2e78170fca215ff1ba709f3455f880d0c4fbebdb4e6d639876a2fe7c30aa708f44d2903d191eb2
 EBUILD libbytesize-2.1.ebuild 1471 BLAKE2B c0842eec1dda3bb554f49f372f6063bf632a0c49ef25e75d347ba84b652ee8f7ff8d583ed5e9b8f5e44a207c7f2e19cfd858fecea832f3206136a15f2d8adfff SHA512 34f5bb741c18768a015b9c2eeb33d534ff62b88ba6cc60dc70fc6924e6693a181f02bfd6c11a2a60e4aff407fc1d4f395a83b34ab417600bf4570ef3d907710e
+EBUILD libbytesize-2.2.ebuild 1471 BLAKE2B c0842eec1dda3bb554f49f372f6063bf632a0c49ef25e75d347ba84b652ee8f7ff8d583ed5e9b8f5e44a207c7f2e19cfd858fecea832f3206136a15f2d8adfff SHA512 34f5bb741c18768a015b9c2eeb33d534ff62b88ba6cc60dc70fc6924e6693a181f02bfd6c11a2a60e4aff407fc1d4f395a83b34ab417600bf4570ef3d907710e
 MISC metadata.xml 425 BLAKE2B 445bf1e0d46e04c766c4c81c90f9acb8e8f3c1c3eeb567c3101400139a7b2ab830efcf737e30332af5dd0e50d46bdf9f583cccbfb2e50186cbb6d3f5a396f0df SHA512 24b8980240c3513229ea2e181c64b7f89597be9cd121459ad62bce935fd52a7bbc0ee4871e15899b69b477fdbaf0850d55821a6fbcf3afc30d0cb81a3eb83b65
diff --git a/dev-libs/libbytesize/libbytesize-1.4.ebuild b/dev-libs/libbytesize/libbytesize-1.4.ebuild
index 326218a5913f..35486a532930 100644
--- a/dev-libs/libbytesize/libbytesize-1.4.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools python-r1
 
diff --git a/dev-libs/libbytesize/libbytesize-2.2.ebuild b/dev-libs/libbytesize/libbytesize-2.2.ebuild
new file mode 100644
index 000000000000..0d91bc5f9998
--- /dev/null
+++ b/dev-libs/libbytesize/libbytesize-2.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-r1
+
+DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
+HOMEPAGE="https://github.com/storaged-project/libbytesize"
+SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc python test tools"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tools? ( python )
+"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/mpfr:=
+	dev-libs/libpcre2
+	python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	sys-devel/gettext
+	doc? ( dev-util/gtk-doc )
+	test? (
+		dev-python/pocketlint[${PYTHON_USEDEP}]
+		dev-python/polib[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.md )
+
+RESTRICT="test"
+
+python_do() {
+	if use python; then
+		python_foreach_impl run_in_build_dir "$@"
+	else
+		"$@"
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with doc gtk-doc)
+		$(use_with python python3)
+		$(use_with tools)
+	)
+	local ECONF_SOURCE="${S}"
+	python_do econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	python_do emake
+}
+
+src_test() {
+	python_do emake check
+}
+
+install_helper() {
+	emake DESTDIR="${D}" install
+	use python && python_optimize
+}
+
+src_install() {
+	python_do install_helper
+	einstalldocs
+	find "${ED}" -name "*.la" -type f -delete || die
+}
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index a145c3c673c7..4f257f22e5bd 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -1,6 +1,6 @@
 AUX libcec-4.0.2-no-tinfo.patch 829 BLAKE2B 2051bef2e92fa61f4afa90728c99f7943d1d382bb2e91633fd07f8cff73055eecabcd68f3c95928e83ca1e676f3f07c9a5118b51d7cba42029a3826530c3784f SHA512 7ea5c0334535e8f731c12e1f257ff9a08b303ecf449afc0fdff36b1f06107e47356dff42bbf38c9e838adcd511e059e71179fefecc892c631a453160576b0e8b
 DIST libcec-4.0.2.tar.gz 334995 BLAKE2B bdbebeb339ce39f2f740805c4c627cc5190cc0dd57d0d87e3d3aa4ba8feeba103336d035fb8b282358f2e08fa470111be43df4df48870be0e9aa93f35434d0ef SHA512 7bb80965cd1bef713f59bff136dc4a7f1172c4a9bdb8e2f59c6bcc5b74110848c0b2912263280ea68177908a688127e8d7208fc43ce6e65d589343b85395a0bb
 DIST libcec-4.0.4.tar.gz 344976 BLAKE2B ce88730ee6e9f57a3f874dd47343e8bb12bd9d3644b58703f0b797bfe656fa25461e6847db4023fec92d9e9740f0e58b59a203258d39d8883b8ae9cde147f455 SHA512 8991ba96fe9a87e5e1f63ff87f77fc0fc3b735c537e2ee6cb004fdc264d75cecd043e39b49cf9e64aeadd24bb1fb57911d9c4bd6c494d9ba4035d7320c268116
-EBUILD libcec-4.0.2-r2.ebuild 2152 BLAKE2B d41ee10b9cf58e9b82005df317341473572aa538c55582aec15405b3d73069d12f24612155eef0e5408418f494c86ba40b24958d7ab98b1777606341caabb002 SHA512 a6b6bda653f261d5a15b466c05bf0ea5c895697f9a26debdc288d21c5dc3be1927970435521da5f4674ccb162e1b3e426416272b74f6e7e45285afe764caddef
-EBUILD libcec-4.0.4-r1.ebuild 2035 BLAKE2B ef266ab2d7b28c543818a9c6762f6c1eaed14725eb2702867e59d5d1750256d2e801d893528a0a220918c2b59470e76f58332027bda3e488a6355fd3ffc8c5f5 SHA512 ddb2ae941bc7339a26771f48e889d73e56cdd6c8ddd26385002aa4729938917ad50fed6bb86597ea87f040e99fa597473f33edf75f3498910345f52ea46b4ab6
+EBUILD libcec-4.0.2-r2.ebuild 2146 BLAKE2B df530ef55089bb3f35de91a3dcd0166688c437526d6e6129d730326b8bf20ac1ea0a226417d4ac893fcaba43103fb1106186c74b72de2bc23f4d6cdd83d6a883 SHA512 28e88a43c8dc584161f256b174f6151dbcb5d97b326a1b9da784083e16616dcbb971a11c4894dc65b2c762fef1c870f284da0133ec1e81f631c6b931358f6296
+EBUILD libcec-4.0.4-r1.ebuild 2031 BLAKE2B f9401cb848c3107c0e6799c903054705e87172422dabed7d80d22caaa5e548066edc91a6930aedffeded9dd25474284f939966e65040a990f10e6346dabb2b04 SHA512 be107c0fcba6de25e9ca697e1b1c98438d6678d495aa055f30d360ec4c6e2f61246e4ad255496dcd8f1d83b554279b62c9f6b769a2838b62e358fcbf1f19f19a
 MISC metadata.xml 662 BLAKE2B d87a9b256eb1cec65184415c8172819e8ffd47f38da6ef0aab46c0b8c40ff09b6b365d4051d44d2fee46a4bb0a7c0fbc0a87d92a171e92961b6f6b7a50d5868d SHA512 5abf50f31e2a18c7a5fce12414dd74efab13be9ea00a70b84384de8f95722f327d7446f51369b7feb33616bc0ff182cbbb7dd0be2855f5b54aee4e3c69dbc59e
diff --git a/dev-libs/libcec/libcec-4.0.2-r2.ebuild b/dev-libs/libcec/libcec-4.0.2-r2.ebuild
index 581e64dcf5f8..7a242dcd5187 100644
--- a/dev-libs/libcec/libcec-4.0.2-r2.ebuild
+++ b/dev-libs/libcec/libcec-4.0.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
diff --git a/dev-libs/libcec/libcec-4.0.4-r1.ebuild b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
index 06c3c9d49603..c07d3a0f291f 100644
--- a/dev-libs/libcec/libcec-4.0.4-r1.ebuild
+++ b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index d5c672127b32..ea2a5fd7e00f 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,3 +1,3 @@
 DIST libclc-0.2.0_pre20191024.tar.xz 128628 BLAKE2B dc750725ee48456e3678cb4f730cc889045ff7401c4b40ac3ae9b656da9fe429aa2094c2042a18eda4f7e87c786ff8ae121fbf726a18de03884f30dad48b3fa1 SHA512 b4c2ca980fb28b5662055bea951de844284fcf122695234d7618439234f0203baf82b5cc5cf8acddfe387f19d32be3a958e53511bb1e33e9469f6be5951dbcdb
-EBUILD libclc-0.2.0_pre20191024.ebuild 1579 BLAKE2B 13afe2571643cd69a0a98d9eba3df38a0f00056faa7e822129e5f47dbd77d1d6343e9bc5ff4e094f9a35e31c9edc0262872d422d4c055611bfa76b91a71d77cd SHA512 1c28111a6dffd3d73dbc61fb39e25c7da17265bbda8a58fe050fca40ebc6477d196ccc51a4796748d1837bf8e16a4ae86fdde41059da9de7b4c618cdd8cb702d
+EBUILD libclc-0.2.0_pre20191024.ebuild 1573 BLAKE2B d92057298cab9b9603503f564c85870c409609d71490c2f70f74f71d793cd1e8842854659bcd2b1d7a4c1c420b48c55f2291f9923dd24c1d12b2ad7d93599fcd SHA512 256594cafa7fc68551ecef4c3a8ef40b2972e77a412eb14ea29675c3636a2bb2d33192079c592747396aa71519db052b917c274e2c8bede027ed7a374665dc71
 MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
index 569f65967e0e..291fe729330a 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit llvm prefix python-any-r1 toolchain-funcs
 
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index 24b8329b8048..6e8043029d70 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -5,6 +5,6 @@ DIST libedit-20170329-3.1.tar.gz 508504 BLAKE2B 83857f2e56c1f3857e981556c4d5bb90
 DIST libedit-20190324-3.1.tar.gz 521999 BLAKE2B c48161626a5cf3140f75ec1df1d9652d961e568a0464a34f9e679f51e1e991a14c9d04a05f0de3815c4a38a9f17789a18e89ebd026450fa1053ef6420c045141 SHA512 240098989e3c5c8c5e28a61036655ad5a57f1c484e1cce2eaf3da157ff238dfb9cd81c766f82efbefa0935b7b5c07328087788cbac007b11dfb558cfaccaedf3
 DIST libedit-20191211-3.1.tar.gz 516620 BLAKE2B 765926c035143e8e409d87d4f75709c861d83e2d725ec02c7ecfc3cccebe895be7d2902dd41970811207db32e6847689368f6544ea49ad42a600037a3a4edb58 SHA512 8393477a87e65d330b037494110501b5d6d2c1cbe80d82b9bc7a6315a21fd1327fe91354346966d30541015e2c277be2187fa4bb737b14f706957c70f4083547
 EBUILD libedit-20170329.3.1.ebuild 1263 BLAKE2B f3733fcab6145b5a624f153a2dfdc662a8caf53372b647ffa1fe0104953fdc11474354192b644ac9d61f643eaff9eca46b227d4ee7ecea8f7fbb7810977daeed SHA512 f561066e5aa531cc36160fa52338cb6950a09565318a8538f325ab8cf3634dfeb850789cc1fc2d64821f179004c022648d5a075fe6fd2b1645a433dffb796306
-EBUILD libedit-20190324.3.1.ebuild 1194 BLAKE2B 14bc529388ed15caea9491f59ac539c0ef2b13c7af57fd0c62ff58ceb625554a384d10a6ed1947202d688e5e0c566430ea2e32af45d16303216c51e23b160f7b SHA512 60fd95883b5e5c423640f3b071101a1428df35671024da18689abb72de19fc72298e718f15a15d0a92f958963c0b35966b86d1e9222c59bfb29285d6151950d9
+EBUILD libedit-20190324.3.1.ebuild 1192 BLAKE2B 5023ddf7b5ac9c2f9d0774d2b91609d44c60aaa95d6e0f5278ea119cc6fabb78d58c3ec1950ca5191c324deb7b3d0edfdd04bab7006ac942b5c8b2d7f1eed074 SHA512 74db523c633d8a9b0028acedaa6d4f8d650969874a09eab2b51c60dcd648ee88aed5fbfdbd03200dec54795696557c65214ea39a16c230ca46b129cd1b087173
 EBUILD libedit-20191211.3.1.ebuild 1162 BLAKE2B 571be8db01b101a3110e650c5d1357c2705fb82753ade3c4ff8cedbdd6861aef380aab19240e8c747149b5af505e1c5aab137c9900b4270a4d013bbd262c3311 SHA512 1444594a3cc5157c08ec9e63c4b379bdc289dfbc5df4f86461e421e890213f838b3a9c369fdb5672ff81ce2e4beb379b75d714bdd775e9ddebc375a3423041a1
 MISC metadata.xml 641 BLAKE2B 9571b8de7209e3769419ab4286915a24f0efdc432725f0d7157a7625049702db7b05819e542a586583c3df77a3ad34b099c1f00d28855dcf7e117a81f5828e46 SHA512 ad32daf90166761308b53cb1de6fe923e52217f7d3e2359a7c5b8797841de3d4064437b1ffba727acca9085816b615e0c207c268017908ac1557943730539629
diff --git a/dev-libs/libedit/libedit-20190324.3.1.ebuild b/dev-libs/libedit/libedit-20190324.3.1.ebuild
index 155e3b58af49..3efaf7c17f3b 100644
--- a/dev-libs/libedit/libedit-20190324.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20190324.3.1.ebuild
@@ -48,5 +48,5 @@ multilib_src_install_all() {
 	einstalldocs
 	find "${D}" -name '*.la' -delete || die
 	# file collission with sys-libs/readline
-	rm "${ED%/}/usr/share/man/man3/history.3" || die
+	rm "${ED}/usr/share/man/man3/history.3" || die
 }
diff --git a/dev-libs/libestr/Manifest b/dev-libs/libestr/Manifest
index 4081780a421f..dc5618c0bfe9 100644
--- a/dev-libs/libestr/Manifest
+++ b/dev-libs/libestr/Manifest
@@ -1,3 +1,3 @@
 DIST libestr-0.1.11.tar.gz 355544 BLAKE2B c165212c4a56ee577a76dbb95dfe9d08d84087d490422d4fb7c29cadc5b5d0eed97234369331286433e2d860d3cfa8af3117d3ff94e8833df91f6586905ad2c8 SHA512 0ab98c2fa4b58cf6fee89c88602725b8b5e8e5a171a6976cdd8cff4dfc1cd3e5b747868da74fccd1bca66b9fa524ceae1c4f1ad5ee653a44ff81df6916ab5328
-EBUILD libestr-0.1.11.ebuild 726 BLAKE2B e708d7594479d2207467a5cfbdfdbae8cc83bf650c240bf7637e8e57db3c09417bc9207e623cf401f05abcc3bfeb25b61b34d4ff9afbe0c67a1d8f41aebd84e6 SHA512 6f84bdc6d5806f8fc2e32f92c3fbb993b844987fab03dad493657f3c12bc3c93d220e4a4bbea80b3a14a1b3bb13a89e59ae24277df00a37cce89b40c8eb41a03
+EBUILD libestr-0.1.11.ebuild 724 BLAKE2B f516c34ebeb29f3b88669be1e1f3eb46a727b5716aad5034163b58d6d2806f3eb4deec97c4e803c8e2ccac8d290e82399320e78fb776a0289b6a5bbae6ab5599 SHA512 8213af23fbfa8299337e9d72f92d9ce4b8421a82e7eccef9320a24ed9c8c1c970bafd7a72bf2eeb2eed5cb52f251f878e77511d082011cc3836a10eda3a01a13
 MISC metadata.xml 563 BLAKE2B fb15f2cda9e02291c5a88dc7ac002a69d4504ca2e0d496962986846ff089628064e5334688d9806bb9e3478073e8b6fecdad7ca227723c8e4b8f4c7c83ac0aa3 SHA512 4ebbbbddedbb2ee70c52c73b23ef83c0920756ead3e14d8a75afd5bc994bdeaa63a6e9255083b74bdd80da8367650544c92763e299f3f6d49c930b2f92e7c478
diff --git a/dev-libs/libestr/libestr-0.1.11.ebuild b/dev-libs/libestr/libestr-0.1.11.ebuild
index 885dcf112cf2..5e480cbe20fb 100644
--- a/dev-libs/libestr/libestr-0.1.11.ebuild
+++ b/dev-libs/libestr/libestr-0.1.11.ebuild
@@ -37,5 +37,5 @@ src_configure() {
 src_install() {
 	default
 
-	find "${ED%/}"/usr/lib* -name '*.la' -delete || die
+	find "${ED}"/usr/lib* -name '*.la' -delete || die
 }
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 9691bcead432..5e85c64a4c76 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,4 @@
 DIST libevdev-1.8.0.tar.xz 439000 BLAKE2B 408c60669557419c945901da5f146302cf0cdc43ed74cf4dc8ff4a9c272319c49f644bf95acf3d8656173bfc2f3763a6cc172ee4707a7f0129d15449701e9449 SHA512 8d285632f4fe87c01e81f94e514bec4e37fed4bc44d6d38b9297dba1114e42f6ed8d143fc05f3d0e8d51b08b659e34481dc4c65f60421c54e2f3e11efbafdeb4
-EBUILD libevdev-1.8.0.ebuild 1105 BLAKE2B 9aea6a20ed27760e6c225c81aa6bfecd8b3cc5b16d0c7a178d312e7615490678103bb6c4fbdb5787007486d312caebd4541ca04fd1d0a4dcdcc64ea11ad08f92 SHA512 e4d274623c81502de977ce7c015550ca1fe32412b46eeac86111a1720f4e4f56763395571a899496a4ac96c380b0428d6877a914f6eb59ce534e6dd7e5c5f5cd
-EBUILD libevdev-9999.ebuild 1115 BLAKE2B 834182fa133843b04d4035a81194397dcb9e6c105c6f4f76abe95cd028d2675d98e5e162a2261d8f284a61f258886d2340fd32a02e6c1b3343f38ef42fa88b54 SHA512 9991ad20557ce739693f16f28bafc0c8e727ead20eebbb01ac225d5e8405bfe626512334e818842e075b69a57cbece0ff9e29497eb891166eedfbf4c59bd7e84
+EBUILD libevdev-1.8.0.ebuild 1101 BLAKE2B b59518fd0e42768821b5d28326430de969e51cd27aa093353fd1a985c888ef68f5ec27c6b2f0b0c8cedf6ac1b9907ffce0005e3efe83c796b1a349c900e87ff5 SHA512 862ad52029ab5f00883ce0fd5c35d11f517d641bbc6506584f8f935639b6800adfcd7c07f84a25ecf53bd8effda727859b9573dbc2fa4da0ff1de4ff4b38a104
+EBUILD libevdev-9999.ebuild 1111 BLAKE2B b6c4e0879dbf3c835ef3875217d5bf916b3cfee67c736276ba1b8bffd92c55d5457d50641665dae25b1a4609ef29346107d9691e1e0fadb3661a0de230f72d86 SHA512 710c8ba52f27cb93d19ad95c7d8999da9ca20bbd604ea4e06b68791ec5459e3ec9aac579c92842f6eddbdd4230af8708e5d469e91adcb0862afbc136105aaad6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.8.0.ebuild b/dev-libs/libevdev/libevdev-1.8.0.ebuild
index 82af5e42bc7a..c3b2cd42dbad 100644
--- a/dev-libs/libevdev/libevdev-1.8.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index 0921bb7c5582..ffddd6b0bd13 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 139bd633a8b6..3526c4e037f7 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,7 +1,7 @@
 DIST libevent-2.1.11.tar.gz 1082234 BLAKE2B c6721589834bff027a8149ee0076e1877fba000d1712a405e20030192d9c81b892d0930bc1a4774650bef4cb08c60ac81b5928dc17346492ae7e4ded2125579a SHA512 9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3
 DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
-EBUILD libevent-2.1.11.ebuild 1685 BLAKE2B ec8083997c5c5c21306306b00efdf5077d66f7895ef366c19abd00a4f83b1b1150e036e0c3fab2117a0ae8d6f9ea80a95e5fbc621a862a544d665451572878b4 SHA512 377dcc47b403d47144dea3a94950ec40ff626b072b36ad028802453a6095ee19b87f7362e3517de8caa9211d0377e13360487d844ee529d04cf6b52b301b6bcf
-EBUILD libevent-2.1.8.ebuild 1658 BLAKE2B 4cae138bc7f814cbdbfbd0db9f2daf4e9bc7a6396174657ebd64c80b15006c541910e3aee9a6f0fcecce27f8820bd8feb02bbb412c4a757d37b4620800a0a849 SHA512 041a18c711f5a1c566c0a14364641c53cc133274e39947e8bf448c93932d052f63ca37c411bbefc237fc028546e77ea0172549a30aaf69b20aa87b3a08aefd6c
-EBUILD libevent-2.1.9999.ebuild 1305 BLAKE2B 700706493970712ee849965e9a43aa4698694793e43316cb041f24dd1a5918f0f9be95f8f831938bc5ce22c8658781b1c8adc9822f1b3048c8317304576716ec SHA512 6833ac30705f79f88d348c4b0fb5a71ae9749be51036a6890a7d3260a92dcc32970aad657eff6400c89e5e786cdd8825bfebf9cb943f2abaef38c0e411c15f0d
-EBUILD libevent-9999.ebuild 1242 BLAKE2B 64d887151fa3290389d91f64142e85b8302c0150ea943197ad0e4b64ff41f07426b573dc7e98d715f9a7c523f12d8b68aa477d4a2ec898189b5f73b0a73ca263 SHA512 54669027b1982f5f538df5f68aa32b91b468c9be132419e532fb7effc97d488417037ed480efd7e008f913724d347f5d037b6c8a2378e7b65489034c55628e57
+EBUILD libevent-2.1.11.ebuild 1689 BLAKE2B 0a81daa8592c1c919c1d6c7c9b28babe3c317243c4d8f7fa5768ff6a0e26644d30775ffdc2f5b8a03c03535ce8cd4b72d6f3a7ba1f10f1f3440c1d0aeee3f641 SHA512 a98a8e1d68e8e9b7ba962e34061282056bae99a8e5cb568d658cf3301fe68dd4c34d5174f9babb3b77c075ed85bb350b6addf48a18d8dfdfe4813551c0c348bb
+EBUILD libevent-2.1.8.ebuild 1662 BLAKE2B b973460bdc6341d018ce6051ec400460b1c402dd7a204992bd7d38acce553871ebf5fe3ff3103ae8c53f4f6f9aac1ed28653e4d48df7c64f8eca6536f6984f23 SHA512 96e79e5bd9cff0acf2b196f1f3b1f21a4e72ea993df230a2795f7108f12e49a8d832c273dc771ec5972d63e58f1053e866eae7c568b992df5aff3fc9abbad527
+EBUILD libevent-2.1.9999.ebuild 1325 BLAKE2B d13ce04a316e5077545ec3381e50b2682bb35cfcca22d722be6742034b95adebf84d7572a4161aab1f912aec36d5634fdeec764803ff45e170ab05a556fc53bc SHA512 80a3570a6c941db984fc4aeab1f4160ddc305345660e606fa712c0480f1ab27bff7fbc4f057e44e631e4e9c8027b3e5f75689538c8c856150c9e8df0fa6c56a3
+EBUILD libevent-9999.ebuild 1262 BLAKE2B b6911f7b2bc9a3c1557c52fff44d083486444629490d0d15b5ca3056d2baf7f1abee38cb396d324a021443ad2f3837fbdf7eb17ad6070e663ac7246da4a884ba SHA512 b441e20f56a1c2b44a4ce39d1df4ff3289332af9adee21270c0848ea9d3c3de59b71ff7a1ae1f1e90eaa64a672e761dcd1a6948953266bc9d8e9f0d6071b0383
 MISC metadata.xml 547 BLAKE2B feca63a3b25db4aa0a078b6135188aa7e4250fa9afb207e14c9b02cad83709abe5dace68f5a34cccc0a2a745424c4c044696d0e6021c4c83bcc2666700a8528d SHA512 556eebbb7d05a8234e9705126549520a8b8d553cf6331f353bf7a5bad343b0ad56292dbdda5bccec827772faf07bf17f0163e4b479530eea0832e31d9f17f73a
diff --git a/dev-libs/libevent/libevent-2.1.11.ebuild b/dev-libs/libevent/libevent-2.1.11.ebuild
index e446b3d11f89..61d3a118faba 100644
--- a/dev-libs/libevent/libevent-2.1.11.ebuild
+++ b/dev-libs/libevent/libevent-2.1.11.ebuild
@@ -5,7 +5,10 @@ EAPI=7
 inherit multilib-minimal
 
 DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
-HOMEPAGE="https://libevent.org/ https://github.com/libevent/libevent/"
+HOMEPAGE="
+	https://libevent.org/
+	https://github.com/libevent/libevent/
+"
 SRC_URI="
 	https://github.com/${PN}/${PN}/releases/download/release-${PV/_/-}-stable/${P/_/-}-stable.tar.gz -> ${P}.tar.gz
 "
diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.8.ebuild
index efa8eba27bdd..24602b3e46f8 100644
--- a/dev-libs/libevent/libevent-2.1.8.ebuild
+++ b/dev-libs/libevent/libevent-2.1.8.ebuild
@@ -5,7 +5,10 @@ EAPI=6
 inherit eutils multilib-minimal
 
 DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
-HOMEPAGE="https://libevent.org/ https://github.com/libevent/libevent/"
+HOMEPAGE="
+	https://libevent.org/
+	https://github.com/libevent/libevent/
+"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}-stable/${P}-stable.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-libs/libevent/libevent-2.1.9999.ebuild b/dev-libs/libevent/libevent-2.1.9999.ebuild
index cf4e7dfeb381..ee3fb1e23814 100644
--- a/dev-libs/libevent/libevent-2.1.9999.ebuild
+++ b/dev-libs/libevent/libevent-2.1.9999.ebuild
@@ -9,7 +9,7 @@ EGIT_BRANCH="patches-$(ver_cut 1-2)"
 EGIT_REPO_URI="https://github.com/libevent/libevent"
 HOMEPAGE="
 	https://libevent.org/
-	${EGIT_REPO_URI}
+	https://github.com/libevent/libevent
 "
 
 LICENSE="BSD"
diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild
index b18a797059eb..85e2c2bd254d 100644
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-9999.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Library to execute a function when a specific event occurs on a fil
 EGIT_REPO_URI="https://github.com/libevent/libevent"
 HOMEPAGE="
 	https://libevent.org/
-	${EGIT_REPO_URI}
+	https://github.com/libevent/libevent
 "
 
 LICENSE="BSD"
diff --git a/dev-libs/libg15render/Manifest b/dev-libs/libg15render/Manifest
index eb75f4bb028f..ae86c28eab2c 100644
--- a/dev-libs/libg15render/Manifest
+++ b/dev-libs/libg15render/Manifest
@@ -1,6 +1,5 @@
-AUX libg15render-1.2-freetype_pkgconfig.patch 1091 BLAKE2B 2913ad950880964b82d2b4dfa59a8351ab37abe65616da8069adebd1315a9ee893566b29af50315111d8bb28705c6e64520fe3404a13ad01b43b297841dfbb25 SHA512 3e5313232eb5fc84e039d8d0ea524d3c6e3d238fea7f29f52754ed1b4bb886ec0b7ada57570018da99ae238bd28c7e1fc36c8f6b88227af2df7991afdabacae5
+AUX libg15render-1.2-freetype_pkgconfig.patch 1660 BLAKE2B ac8e1a850a796592a248e9a5231376d906aee234a57c075af76a9c812f27f401e9e6eba79eec5dc6abeaf72968c99a39b0213bfbaf8d72e48037e0b69af35961 SHA512 f06d0d85924c543dfc8a9593e9c99ee6394f3032f57d1059d7c47698aab99b263d2d17ecfc0089375f3c59531a4f990edd11974dfd5962939b301c7975c24c10
 AUX libg15render-1.2-pixel-c.patch 686 BLAKE2B a6273daa806090247eab17e2f03f3baa3fbcd7ffe4ee502611a4ecb39134dea809a46d77243c61e949f732b9f7fabd7a7002cc0434dad7e7986da1f25dc2962d SHA512 f1d40893c1f2f17d42c9ca6941d802e0c22a5eb85d9f8167612f7bf21045c096744634ea38928ecfc30c39a6085e6b8652168e711534edf82e3d8f5243c072a4
 DIST libg15render-1.2.tar.bz2 246034 BLAKE2B 70c21341949186dc65bec7ef0f695c783928ab024e5bd3f83eedc527a501bee64cf0561f5e642e3e9173f063b6f74ecca458262ee9c40a2a8837f197338bbb31 SHA512 960fd6bc6159b1b12e1de3b0c07e5960d7d5056d4927be8eddf89a911e2c97a8677ef41456aa255399e8a86cd354b848fab28a47005ee2d1b6640e0c886deaac
-EBUILD libg15render-1.2-r2.ebuild 968 BLAKE2B ce22275e91cf2cc19e5b43d8f040e324dd2b83179919379a49cc7bad0a53c9200c0b07c1b2fc6e17450b76f8d9097b17f64036ed365b5fcfdd92cf82c1564269 SHA512 7c712b31f4de39af50ddd02ec4cf3975016e167053e3df521aabd6c175c1ee67be02d21e3153adc0c4f0162366816e5a86952d61fba4c6c04e8e6972859e3dea
-EBUILD libg15render-9999.ebuild 1168 BLAKE2B d194698228a89c3e8117cb87da0cdef47a3e68ad0da1a9938b213d06ad24b0845c8b3b6e0f21fe6dccbf3edbf6039c815b1d8f3a145a85498bf0ff354b0ec74d SHA512 bab94ac83adfbd395a9fc5ceadaa3f961377987ca5e2685abf8c2582cc43a63810ac774538ff6e8a4cc221d561bca015a571e0efdde53435f66ded723154a782
+EBUILD libg15render-1.2-r2.ebuild 859 BLAKE2B 4ab2dd1dfcf5641df4ceeb0ed19b099db43a909442961ef6d53956f72a064757f0e8ae63ed28553a1b4e7d8344f4aece477860fd1383248323d2e913c967f5b5 SHA512 f5abaef308901205053b5a007f9d71cbec6d069aa0c4631df1b5716a1d846b5e8ee77d7aa6d13721414eb15cf70b1f44b9efdafa06035030155474348dbaa9b5
 MISC metadata.xml 408 BLAKE2B 2165f633654f865b41938473830e3a25c373d585a453ea4a084eb4912e0abb0567366c76a9d11373b54bc0e1fd1e76d5fbdc3724a1dd05e47442e778f60fe754 SHA512 e4da283d6a210afc06b392ed61be935a1a1dfa0d886c0f3e6e82bd5e78323e080e911ef7eee9ff2e6ab98ced93804ab8f48433b9f0f630d8c68a62f91a3e780d
diff --git a/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch b/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch
index 83df9fa4f0fa..313d2ef5b6e2 100644
--- a/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch
+++ b/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch
@@ -1,5 +1,5 @@
---- libg15render-1.2/configure.in
-+++ libg15render-1.2/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -13,19 +13,20 @@
  AC_PROG_LIBTOOL
  
@@ -33,3 +33,21 @@
  
  # Checks for libraries.
  AC_CHECK_LIB([g15], [writePixmapToLCD], ,AC_MSG_ERROR(["libg15 not found. please install it"]))
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,3 @@
+-LLIBDIR=@LIBDIR@ 
+-AM_CFLAGS=@CFLAGS@ 
+ lib_LTLIBRARIES = libg15render.la
+ libg15render_la_SOURCES = libg15render.h text.c pixel.c screen.c font_6x4.c font_7x5.c font_8x8.c
+ libg15render_la_LIBADD = @FTLIB@
+@@ -7,8 +5,7 @@
+ include_HEADERS= libg15render.h
+ EXTRA_DIST = debian Doxyfile libg15render.3
+ man3_MANS = $(top_srcdir)/libg15render.3
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+-doc_DATA = AUTHORS ChangeLog COPYING NEWS README
++doc_DATA = AUTHORS ChangeLog NEWS README
+ 
+ dist-hook:
+ 	rm -rf `find $(distdir)/debian -name .svn`
diff --git a/dev-libs/libg15render/libg15render-1.2-r2.ebuild b/dev-libs/libg15render/libg15render-1.2-r2.ebuild
index 816da20255ea..1082ceb99bf4 100644
--- a/dev-libs/libg15render/libg15render-1.2-r2.ebuild
+++ b/dev-libs/libg15render/libg15render-1.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -12,19 +12,18 @@ SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-
 IUSE="truetype"
 
 RDEPEND="
 	dev-libs/libg15
-	truetype? ( media-libs/freetype )
-"
-DEPEND="${RDEPEND}
+	truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	truetype? ( virtual/pkgconfig )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-pixel-c.patch"
-	"${FILESDIR}/${P}-freetype_pkgconfig.patch"
+	"${FILESDIR}"/${P}-pixel-c.patch
+	"${FILESDIR}"/${P}-freetype_pkgconfig.patch
 )
 
 src_prepare() {
@@ -34,17 +33,14 @@ src_prepare() {
 }
 
 src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable truetype ttf )
-	)
-	econf "${myeconfargs[@]}"
+	econf \
+		--disable-static \
+		$(use_enable truetype ttf)
 }
 
 src_install() {
-	emake DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF} install
-	rm "${ED%/}/usr/share/doc/${PF}/COPYING"
+	default
 
-	find "${ED}" -name '*.la' -delete || die
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libg15render/libg15render-9999.ebuild b/dev-libs/libg15render/libg15render-9999.ebuild
deleted file mode 100644
index 58ded405385e..000000000000
--- a/dev-libs/libg15render/libg15render-9999.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-ESVN_PROJECT=g15tools/trunk
-ESVN_REPO_URI="https://svn.code.sf.net/p/g15tools/code/trunk/${PN}"
-
-inherit subversion base eutils autotools
-
-DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard"
-HOMEPAGE="https://sourceforge.net/projects/g15tools/"
-[[ $PV = *9999* ]] || SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-
-IUSE="truetype"
-
-RDEPEND="
-	dev-libs/libg15
-	truetype? ( media-libs/freetype )
-"
-DEPEND=${RDEPEND}
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-	fi
-}
-
-src_prepare() {
-	# Merged upstream
-	#epatch "${FILESDIR}/${PN}-1.2-pixel-c.patch"
-
-	if [[ ${PV} = *9999* ]]; then
-		subversion_wc_info
-	fi
-	base_src_prepare
-	if [[ ${PV} = *9999* ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable truetype ttf )
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF} install || die "make install failed"
-	rm "${ED}/usr/share/doc/${PF}/COPYING"
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-libs/libgaminggear/Manifest b/dev-libs/libgaminggear/Manifest
index 1df17a1bb51b..10a582319b30 100644
--- a/dev-libs/libgaminggear/Manifest
+++ b/dev-libs/libgaminggear/Manifest
@@ -1,5 +1,5 @@
 AUX libgaminggear-0.10.0-doc.patch 484 BLAKE2B 9a63685991e322157ba941ae167ce6dea78a20bffb85662c5a7c2cb6879950dd9e085be83a53d4d13294f73e23cf7e1661c357e1140e5c0903942531a5676f7f SHA512 c5fbfb231f075f34eb4237edf3de6e335ff735513b72a41fd602422dc9f0fd511f66b4c087bfd0dfc68ebda8d1bc0b70a6eb35e5e3158c50b7a5d641e78ada01
 AUX libgaminggear-0.15.1-cmake-3.13.patch 613 BLAKE2B 4f2690aff5f33555a5fd446cc3ae8d9f7a417fc8753f2b8f77451394b1ed57d3be277e8d0bb02cb573a0efce3b15fe00f1e9f37139b0de24a78c3aadd70c67ed SHA512 e9a9173f9d5749803b88be2fdc4f5d2fd2207131622d558316428c791983f76ba477c645b2a410a7536b5614c141fc91dc9b51e84e3ff3d8167589e7bfb95a4a
 DIST libgaminggear-0.15.1.tar.bz2 111959 BLAKE2B 6a8d5cd01adcee1d870aada9f20b229e95975a013bfb8076c8135a7b4cbd5f2043b68ad481d0df1b369f560c2ea2172ff2a542ca61ce30317deeeb66a5aa2588 SHA512 a6635a74557f276ab65eda4610ba8a053fedf10f9d898a1dc875082a36b2822544f61fc7a274691673670b12d4de968aa4921d102a588f3d0777397730082990
-EBUILD libgaminggear-0.15.1.ebuild 1114 BLAKE2B 762c86812ca10a55c4ce0169e4a19120d2fb6162e759e746c8d5d90eefd30544447c47465a5a4e991619d99b27574d05998fce3cfc00f8c130868708b93a5883 SHA512 3f9d5e33bbcebf744be6662996f8d3bfb906df6d6358da1cb1f6bed8c9e07f05d2c758c7623764d8a06c9a5cc21a384db122df87b78a8593727e45869d5a6aa3
+EBUILD libgaminggear-0.15.1.ebuild 1072 BLAKE2B 2e31f7945767136014bfd18bce2b6d01235a3e3ffc8667b2c6cd230f53dbbff2367f1c63cb20810e85f22a2edd9e0d84ce6247ce17fcb1feb5d067245ed07586 SHA512 0810051610fc567432058747d3ad603762c4f7df24ee0784093b676c53984a774827970e8dab060da74bec8fc90f68c4ae5fcaba68753006d19a35cd5aa19f2d
 MISC metadata.xml 334 BLAKE2B 245d055909acec999e4e5e299ed9832df4ea83e59c8b02b464f8bd6da255ad713666d6db088f89014b5d006ca5171723fbef98d5daf19ac34088f2b58f44aa5c SHA512 f820f9ab3cd47f39e43ee66b01244397d9cf8f3da675208e1b26d97e908a037a9ee61a7c25d05b4e071a9a666b04aa46a641e49dbf93b55fe02f7ffe08b033b4
diff --git a/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild b/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
index 40164dbc61bf..ce042cf9a600 100644
--- a/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
+++ b/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
@@ -46,7 +46,6 @@ src_prepare() {
 
 src_configure() {
 	mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
 		-DWITH_DOC="$(usex doc)"
 	)
 	cmake_src_configure
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 86a3fab707e9..d12ca61f0e45 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,7 +1,3 @@
-AUX libgdata-0.17.8-disable-demos.patch 1941 BLAKE2B e8c3b0b558d3c446f3e383268b75bc17a2149cefaa2fe1005ed695b1d0c4bd66cf4a89a4ea4e11e598d044b1b8bf469f3ddf96f3365a5542ae138d4262752d57 SHA512 4df919d8b09ef0b1af0b47c3262e08faa158b99e444a5d7d4d1b19a2987883fbb9e3f1a6dc2f858b8d343fbd5c2d266c3e02a47ad310aee92d1a5b14983d8f55
-AUX libgdata-0.17.9-ax2019-compat.patch 788 BLAKE2B f08605ae9ba096ed20b08c324727be214de5b1746280881f3017e066dfbda6eabd3a83908964c17e6932fafccf0021cc3eb775d2523c1f5bf828d97371527702 SHA512 35eacb0e1af5ae35e458a44563f830a4f19798bc3423e5bbe5fef9df048a20fabfead94a597343b7b342b510fc9e21cdf8bc2a69d7b930cbcb6ffc8ab7cbc66f
 DIST libgdata-0.17.11.tar.xz 843948 BLAKE2B 8be79ea5840a585c5bdd5b51aa99401aedce0562ceaa98c7e323cdb2354384db635288d05c740993da49fa9c60c2cafab4e7c43ab82de4295afc0ca6b690d4dd SHA512 5abb00e6ebee1010fb6d9eab675e03d94883cac88e42b403a7d750bff73d65d0b35aae5c9e8f17a182819193b4a049ac7e9fc644ad9fa79872924ed5704c8982
-DIST libgdata-0.17.9.tar.xz 1434700 BLAKE2B e0b10bdd962aa5d294d75c15c3aa9187342cd85b9a28816fe5628864bc2236e10ee2765ed8123c8b90422f0394b342a2a144dc7ef844486193c8eec2a46cb17f SHA512 90289309cbdc4ec6932bf385ddbfcc75c0c2f8b9ca356329298aaa37f6c3db7a16de20e5c947c16c595e43e729a664e4d6d3e2c5a60bb1e463a13d1306f374ce
 EBUILD libgdata-0.17.11.ebuild 1771 BLAKE2B b349a241ea4bea39ca54817be50fb6c42d458dda0a65659d785bf1c02cde0278f3cc09715a788a2f6e76ce349dcdece372b741e1e718190c73d81bb0da5f3478 SHA512 3a386c1052b2cafcb559b008f58bf8a7b5e86766f2dde5ab292618dbfde0d507a1b42bf8c9471de93449b4e089a4a149e5d6ad8a648cbf32ac987c974211e750
-EBUILD libgdata-0.17.9-r1.ebuild 1783 BLAKE2B 770295ef5ffd64f457d43e473243628bb69a6688e8a323bd1078d42e731baa84219059d91565e5fe3d09c8eb99fad1b4ec27665ef9a587d2fb699505547ff9bf SHA512 65529ed7f972655a787d8a8b2d623df26f837b105ba0b3a3683d87c1bac235fdc8161526778464270b3fc70c4013dda513fd20d3811468aed9f6eade91429ec4
 MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd
diff --git a/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch b/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch
deleted file mode 100644
index fe06cee34281..000000000000
--- a/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 12fb11f46a7eb4054b74679a6f5ad12dcc41132d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 23 Jul 2017 20:46:19 +0200
-Subject: [PATCH] Control build of demos
-
-Building demos is not necessary for distributions. Allow disabling it
-but keep it enabled by default.
----
- Makefile.am  | 2 ++
- configure.ac | 7 +++++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 0e4cf631..8c0c7143 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -635,6 +635,7 @@ endif
- CODE_COVERAGE_DIRECTORY = $(top_builddir)/gdata
- CODE_COVERAGE_LCOV_OPTIONS = --base-directory $(abs_top_srcdir)
- 
-+if ENABLE_BUILD_DEMOS
- # Demo programs
- noinst_PROGRAMS = \
- 	demos/youtube/youtube-cli \
-@@ -650,6 +651,7 @@ if HAVE_GTK
- noinst_PROGRAMS += 			\
- 	demos/scrapbook/scrapbook
- endif
-+endif
- 
- demos_docs_list_docs_list_SOURCES = \
- 	demos/docs-list/docs-list.c \
-diff --git a/configure.ac b/configure.ac
-index 3b0530c3..1e09f277 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -152,6 +152,10 @@ AC_SUBST([GNOME_PACKAGES_PRIVATE])
- AC_SUBST([GNOME_PACKAGES])
- AC_SUBST([GOA_ENABLED])
- 
-+AC_ARG_ENABLE([build_demos],
-+              AS_HELP_STRING([--enable-build-demos],
-+                             [Enable building demos (default: yes)]),,
-+              [enable_build_demos=yes])
- AC_ARG_ENABLE([always_build_tests],
-               AS_HELP_STRING([--enable-always-build-tests],
-                              [Enable always building tests (default: yes)]),,
-@@ -161,6 +165,9 @@ AC_ARG_ENABLE([installed_tests],
-                              [Install test programs (default: no)]),,
-               [enable_installed_tests=no])
- 
-+AM_CONDITIONAL([ENABLE_BUILD_DEMOS],
-+               [test "$enable_build_demos" = "yes"])
-+
- AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS],
-                [test "$enable_always_build_tests" = "yes"])
- AC_SUBST([ENABLE_ALWAYS_BUILD_TESTS],[$enable_always_build_tests])
--- 
-2.13.2
-
diff --git a/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch b/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch
deleted file mode 100644
index c73e3f9eaee2..000000000000
--- a/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-autoconf-archive-2019.01.06 breaks AX_CODE_COVERAGE usage by requiring
-a different integration inside Makefile.am. This would be fine if the
-local m4/ax_code_coverage.m4 would get used, but eaclocal parses out
-the install from ACLOCAL_AMFLAGS, and calls aclocal with that, which
-overwrites ax_code_coverage.m4 with the newer version, obviously
-breaking the usage of all that in Makefile.am.
-Workaround it by patching out the --install argument, thus using the
-tarball copy of it (older version), which works with Makefile.am
-without further patching.
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,6 @@
- SUBDIRS = . po docs gdata/tests
- 
--ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS}
-+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- 
- DISTCHECK_CONFIGURE_FLAGS =
- MAINTAINERCLEANFILES =
diff --git a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
deleted file mode 100644
index c00287ed11ab..000000000000
--- a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 vala
-
-DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/22" # subslot = libgdata soname version
-
-IUSE="+crypt gnome-online-accounts +introspection static-libs test vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	gnome-online-accounts? ( crypt )
-	vala? ( introspection )
-"
-
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/json-glib-0.15[introspection?]
-	>=dev-libs/libxml2-2:2
-	>=net-libs/liboauth-0.9.4
-	>=net-libs/libsoup-2.55.90:2.4[introspection?]
-	>=x11-libs/gdk-pixbuf-2.14:2
-	crypt? ( app-crypt/gcr:= )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	test? ( >=net-libs/uhttpmock-0.5 )
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.17.8-disable-demos.patch
-	# don't overwrite m4/ax_* with newer breaking versions
-	"${FILESDIR}"/${P}-ax2019-compat.patch
-)
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-build-demos \
-		$(use_enable crypt gnome) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(use_enable static-libs static) \
-		$(use_enable test always-build-tests)
-}
-
-src_test() {
-	unset ORBIT_SOCKETDIR
-	dbus-run-session emake check
-}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 4a8a06c93f9e..3e4d6ecf3765 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,4 +1,4 @@
 DIST libgit2-0.28.4.tar.gz 4991720 BLAKE2B 7dc94dce69c27f6de3736b94b4d80b727e3e2a7db255a9eab7422cebd93a3ea1a6f47d1de6c3fbe4ba5bcb28ade9b23a989c5b54c06eafeaf30e382f3b859cdf SHA512 b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15
-EBUILD libgit2-0.28.4.ebuild 1657 BLAKE2B 59e4dc8b77221684bd08cee0123117fc56dc00b25fcf2879e8eebfd49cab36b8b38d56b7045bb0712304b9c518d89fd65af614611f30079386823d56601bc1cf SHA512 184d553f4a849ef06e19e9366a92ea2ccfc5a2322d788202b324abfc62dd5d1101c9305743379b4ace46aa1073339bf35d1c61d6a425fd42b5c7317b117e3f68
-EBUILD libgit2-9999.ebuild 1661 BLAKE2B 58810e5332148cd646da00a829eb7c9668cc7659e28c2927d23e114cafb1c9dd840411f3cfd8e4ec629a185635cac1271890baa46e1a5e0a5ec8a8918c0dd656 SHA512 80813e0018838d4bb581413e7b6b054fb69976474e641c289955ec69dc8a974af01e701e53a9aeede5dd1e4d58af4d03a55813a5f84e101000ba2a500e1b01c6
+EBUILD libgit2-0.28.4.ebuild 1651 BLAKE2B 74131b4ca7dbebcd1a15ee10ba20d0d8326447b9ace6069f10bc81d1cc31eac4450cf03f2412be57a4a1651ceb2e6f40bdd13434e4efb26ca9edc0db7c221651 SHA512 da910710957b1f30208f77d5edc1573509629dd8bab12921962b1e9316a59d76d9749acbcf8a104798e96f137d3ac1c25fbe8fcef6ec23aea31cddb3829cca3a
+EBUILD libgit2-9999.ebuild 1655 BLAKE2B 2fb83e4ef74143c9bed984ebc03842fd32f820c3249f5bfc77a114c97c01eb7ac62d10528bdfc54c5f389b702af61438e5458eec59a21e30e06890df48befa0a SHA512 41d11a84eeedccd2ad2c15ca547d3ca43519b34a2e826bee3ecf3116a591653b1ed280df5a8b166823a00e83d01246c206738f8c8d82f94264354ad3af2bc2a0
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-0.28.4.ebuild b/dev-libs/libgit2/libgit2-0.28.4.ebuild
index fe94903c855e..7f89d8572ada 100644
--- a/dev-libs/libgit2/libgit2-0.28.4.ebuild
+++ b/dev-libs/libgit2/libgit2-0.28.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-9999.ebuild
index 0519a2c0e43f..41394dc15ba1 100644
--- a/dev-libs/libgit2/libgit2-9999.ebuild
+++ b/dev-libs/libgit2/libgit2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index f34d4b9a9e38..7512f1357dcd 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,4 +1,7 @@
 AUX libgpg-error-1.36-gawk5-support.patch 4306 BLAKE2B 60bca612d1ce3b69facd0d27daac6275ad1f33ea1a514c762fdd4ff28c55a5e9725c2cd83429e1c2368b42fa6e9850400ffa668a6ce160cdbbc289e421d53c02 SHA512 69cd5219f47193a4b350661fde2d3dcf639ac38dacb6e076ae1d49bd1989562e034f5a238db3fa8af6fb1b80c22d5a6a7fa3f20a2fed95fe756e1a7840a1d886
+AUX libgpg-error-1.37-remove_broken_check.patch 786 BLAKE2B 38c3b7039d17de117ba876c11377fe765e39a4630d2dbda21d07aa6a0e027b5ee0e4f2da225d7d6847b5086c7f4aebe378c82a259ec9d82e7ecaac1f77413959 SHA512 6b9087cfa21d844f2306aca0e5575a03b9409ae8e5ea55158734560abd135af265512bec3de8c943210ade60b6334ea1798aa517ba5738cb9fe6720b3cb3c68f
 DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
+DIST libgpg-error-1.37.tar.bz2 937282 BLAKE2B 70666749aa0156652405ee15e4307f29bdf748f06728da5c672c0208053e0d3a041aaef882b263dd828e2aa7dd8a2f77334447af2c499f81f7602150d84f593f SHA512 fa12977237fcc872e944cda39ca43ee7d2cc9c52e243ede6077f4a31ae135e322dc848b4b55cffdc4ec53f27601ba30ddb368b090a94cd00d9345a55b323f179
 EBUILD libgpg-error-1.36.ebuild 1685 BLAKE2B c4ca02517b51a00898bd3aebf08688b6f1a5543086ad9167cb312bc55985d63aa06cee42b39fa92daeb48341a0754e374bd838c6448004ea505b8057e4d7360c SHA512 c21def95376b920b2c2b2cf1c1a59aa9076076932749ed6ac3444b446bee49170fe4eb5b363d3491155c68dbd64e0c9dae3e24fe5bafe272bd1c7ab483c77bbe
+EBUILD libgpg-error-1.37.ebuild 1701 BLAKE2B e92db632fa62016f6de848f018c409b767a1ec979588bbfbd0db320bdb5642e68e9acb211f635237092a5a39c38da3ba2ab26bc3ad26ce500db6ccebc5356c54 SHA512 d9f298c42512e343abb840900169403f6eb50d0c3737bd8744a12689ce08da497732089901ff7246840bc87fcee546fa2e7a642f132dfc18246240089c92eddd
 MISC metadata.xml 438 BLAKE2B c080438b3f22dbb803acca5a47dd880271b97c2def132cb0fefbc3d3e30c663d02be6bc7553393ab1d33932313026ade3f3f0c576fb572938f0b5fdc6f07210f SHA512 5a5c496db2115e5bc4ccb81aa69995c85a6b967c3acaab1423f94d22c55965f8e9377711e8c3a4e359ae661ef9d6137959058500a6cb036656a5d14fb88d0bac
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch b/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch
new file mode 100644
index 000000000000..2919a9d73be0
--- /dev/null
+++ b/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch
@@ -0,0 +1,22 @@
+This breaks our multilib builds:
+
+  Confirm gpg-error-config works... no
+  ***  Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log
+
+--- libgpg-error-1.37/src/Makefile.am
++++ libgpg-error-1.37/src/Makefile.am
+@@ -338,14 +338,6 @@
+ 	cp gpg-error.h gpgrt.h
+ 
+ gpg-error-config: gpgrt-config gpg-error-config-old
+-	@echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)"
+-	@if ./gpg-error-config-test.sh --old-new; then \
+-	  echo "good";                                         \
+-	else                                                   \
+-	  echo "no";                                           \
+-	  echo "***  Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \
+-	  exit 1; \
+-	fi
+ 	cp gpg-error-config-old $@
+ 
+ install-data-local:
diff --git a/dev-libs/libgpg-error/libgpg-error-1.37.ebuild b/dev-libs/libgpg-error/libgpg-error-1.37.ebuild
new file mode 100644
index 000000000000..382f00f81ae9
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.37.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib-minimal toolchain-funcs prefix
+
+DESCRIPTION="Contains error handling functions used by GnuPG software"
+HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="common-lisp nls static-libs"
+
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gpg-error-config
+)
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/gpg-error.h
+	/usr/include/gpgrt.h
+)
+
+PATCHES=( "${FILESDIR}/${PN}-1.37-remove_broken_check.patch" )
+
+src_prepare() {
+	default
+	# only necessary for as long as we run eautoreconf, configure.ac
+	# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
+	# not a pure /bin/sh script, so it fails on some hosts
+	hprefixify -w 1 autogen.sh
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(multilib_is_native_abi || echo --disable-languages)
+		$(use_enable common-lisp languages)
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		--enable-threads
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 1f599ab653e7..cf4678d995ec 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,7 +1,9 @@
 DIST libgusb-0.2.11.tar.xz 291992 BLAKE2B f43065fac0fcfbc3e392b90dc05537746ce1325d623161e93e1a306b87b07012ef4e11242514cd3da0b83a7df6adc052e20fd3336b53d2543ed9e23886a776f5 SHA512 f9c3c204b5f0feaf706b23dd9a174feb36a9f3c8db8ffb5dcdefa66b18ba0ac963c6041d2d91a6a2f6e23036fc6486d142210bd5348e10c026a6defeb0bee096
 DIST libgusb-0.3.1.tar.xz 38568 BLAKE2B d09afae9d210fde1411de5a0b9b8852eef49f88558ff4c434ef5f2ed9c1c6c29600b96dad73f6873027c5ce0987a3fd99691ffd97d90cfba9f63fbb2cc73f8cd SHA512 5c864e35ec64d1e52ec15ab971c75e0ee3e4664223a6b365815a54819f23342889e5f9739b998799a3af3d37ee75f0ae38ee0d8bca4ed1e2d6ff712f65a53b9a
 DIST libgusb-0.3.2.tar.xz 38852 BLAKE2B 72f98e54e9c4716380430103395ad6da830148c7ef4fb3e7e1445fa28c40b6cb1dfc954403896dedcd584d154383c38233abd422e20801a7e2f9165a6b69e4e5 SHA512 db4274b67d775ac0a46df11037dbd4cab84e1128be6d5b579ee5e1f493f3cc9d0950958610207ad5f207423570a86e664a9817885e25f86a858a95f96cfe19c2
+DIST libgusb-0.3.3.tar.xz 38928 BLAKE2B 711bf59db0d86879961fbba1cd87d5a8557cd4c735f3eaf80bb75f1ac55ededecb4038125428c1297942d014dfd3ea995f7cee8355150f1e90e0fec4aa92cfa9 SHA512 8be37283f2c1719976bbd9bc33eacf5afd4cef107a6629e8f9523b49e66ab2782d9937e4d9fa18760b9083c991c91d6126cfcfa22921b3436a9ebc3a858d855a
 EBUILD libgusb-0.2.11.ebuild 1274 BLAKE2B 2c1c8b748b1bff04c5d0976ac125ba508428237eda965ed898d4db331b2250116bb4e8bde8030e6d3a49a7abb92629b7efc058cc21a3b3f515400d7b94312584 SHA512 0458fd41a58329590c700f181c41c5737daa636a213ea285d5c3930ecafe2db29db7b427b575f6103e807fc5492f792fdf9f8d44f45d8beff3129f6e3e52ddcc
 EBUILD libgusb-0.3.1.ebuild 1497 BLAKE2B 53a724d97fb95eb4ebba955663c744288fdd8ff643794e664286c1aa26a35ea2d0409bb0facae0c5d7c367c71b197aa55c67c33eb50cd7494ddc9f8cd195d39a SHA512 77da2fd2c758dd43c4217b225856fb1c00b3f893d7c629bec305474b72a79e61a1e62aed6e140e52b6e434a0a1c7a665f17b100d5a3b582afc37c078d609d1d1
 EBUILD libgusb-0.3.2.ebuild 1497 BLAKE2B bdeb19cfcc0b05b846e546b6a1eac91f7cca3acdbf898922f6f8ec7dac36d0ed02d3184e85cbb94eb4c5af2cb55a88fe7ed42191f887cf64f8feb9c682bc764a SHA512 2d5f829dfb61c0a88284676a6e6eb4ef468c9faf17dac39a6da81c27c6ecabf2d8f79e9a2189437b2609a7c83455e9d0dbaf7ef6ee7fe8c50abacce2602a0335
+EBUILD libgusb-0.3.3.ebuild 1499 BLAKE2B 2e7e4dbd2d6ed3616f2c4c7fa4fc603bd78294caece4cfa0daa31985f50c5f59de387acaf150bf42303f3dbbf0f5ebab0c59bd3e3542154b5a596ef612b541d9 SHA512 47fd9ba8968f866a828298334d066054d7ce54544408030d899771f59928ee0b355a9202e6be60368cc16b7add69f020f38eedc954f45f20c422488c1083c53c
 MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.3.3.ebuild b/dev-libs/libgusb/libgusb-0.3.3.ebuild
new file mode 100644
index 000000000000..87219dfe567e
--- /dev/null
+++ b/dev-libs/libgusb/libgusb-0.3.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit meson multilib-minimal vala
+
+DESCRIPTION="GObject wrapper for libusb"
+HOMEPAGE="https://github.com/hughsie/libgusb"
+SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gtk-doc +introspection static-libs test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
+	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	sys-apps/hwids
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4
+		dev-util/gtk-doc
+	)
+	vala? ( $(vala_depend) )
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_use test tests)
+		-Dvapi=$(multilib_native_usex vala true false)
+		-Dusb_ids="${EPREFIX}"/usr/share/misc/usb.ids
+		-Ddocs=$(multilib_native_usex gtk-doc true false)
+		-Dintrospection=$(multilib_native_usex introspection true false)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 09abcc7c9855..bda55670f9e2 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,4 +1,7 @@
 AUX 3.32.1-meson-tweaks.patch 3169 BLAKE2B 4bfc87153b5f63626ca21a17706e1c510915929fccb691ba9ccc4b3d2f5869927a49cd82a638e7a9b265ebf31f4320c226090a9bcc94f8d438583dd709272695 SHA512 570beb2093ee4f39920cddc95f464aa0cac09ebe299418c8924713e1db060906ddcb8aef7db617079a50dba4ab2b3923aed99f3adf3377e52c7562719072b885
+AUX 3.34.0-tests-Add-another-duplicate.patch 981 BLAKE2B c1f3a196fac3da61a03b081eb82c6726cde11af9d18fb193794339f639953653f937442bb78a9561cde9a0860d0d4841ec50943d218f87ea4507bf05a7b45337 SHA512 529fe41ded3a199795d39490804f6ab8bfb108e0c9b8ca4cafd7b4a27d695d0a32aaa0954b0a89650d160cba3b7ddb2efad4170f2fbdad806e611aaf918b83cb
 DIST libgweather-3.32.2.tar.xz 2716144 BLAKE2B 56bf66edde8293758f49c1ca14b47fb725f72a0202e95e6e1d1832c179fd9414d527827be5cb7daa17627abfbd1ac16d8d09dbdbbdcb24d62cc62c25a220c156 SHA512 61543e5eaf8c04605a91a6f47811b3a0ed2b04c2f50eae9b8d08a4e24904db4731748fa27a0863d2cdab5fde776ec55abe9fd9fb2a72c7bd546665d59957cb4d
+DIST libgweather-3.34.0.tar.xz 2725096 BLAKE2B af1034b905354aed433e3a5249305718b850f84dabcf3e96b9f9bcdda7dd78258ede0a9e82cab9b9d7f1b63d8e1a61bc3c83c1c18ec38790bc43c29fe98bb89d SHA512 44451837039965251d86f6f538c943a771ab1944d9190ddb2c6bdb34b3ed0e33756c537e84f24487fd5f28b107e8d3af05a6c20a68f83734ac26ff69a8bd0aba
 EBUILD libgweather-3.32.2-r1.ebuild 1665 BLAKE2B 26223bd855a2e91e1a2f89074bcab4d45929cc72ca8dc31b9c6ebd6d44642612d2aa3893a83726712a61b3800ae9e973de51369de1dbea4a3612ea660ff7cd9d SHA512 2a52ab224d0994413117042f8ca00721343ef5a99f10031336dd90736a1c8efa3b5bee5d55f6c01ecea35cdf9c4b52a587e3442e729c8da246b4f54a3e1d9862
+EBUILD libgweather-3.34.0.ebuild 1722 BLAKE2B 8c6913ae9887bc98d9d7c430b5ef37253380c89a9930125f1a4baadb5d9a7725205727a2ce8af5b28a95400b80765ace1ae3432c70cef04b320213f3304c3c1d SHA512 1bb16e597289809c136fd1185ece24198cdd9e09dee4261676a63ad8b1dbfbbd9d4e1ff6c566891ca0024fd783cf877271047f79252d23fec988d7f5ec9ac106
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/files/3.34.0-tests-Add-another-duplicate.patch b/dev-libs/libgweather/files/3.34.0-tests-Add-another-duplicate.patch
new file mode 100644
index 000000000000..29956e3f498f
--- /dev/null
+++ b/dev-libs/libgweather/files/3.34.0-tests-Add-another-duplicate.patch
@@ -0,0 +1,27 @@
+From ee246dc058098dee1709d76635e72db35efcef4e Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 20 Nov 2019 10:55:02 +0100
+Subject: [PATCH] tests: Add another duplicate
+
+$ wget -O- -q https://www.aviationweather.gov/docs/metar/stations.txt | grep KX26
+FL SEBASTIAN        KX26  X26          27 49N  080 30W    6   X           W    8 US
+FL VALKARIA AFS     KX26  X26          27 49N  080 30W    6   X                8 US
+---
+ libgweather/test_libgweather.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
+index 1bfa3d4..8a21911 100644
+--- a/libgweather/test_libgweather.c
++++ b/libgweather/test_libgweather.c
+@@ -336,6 +336,7 @@ parse_metar_stations (const char *contents)
+                 "KHQG",
+                 "KOEL",
+                 "KTQK",
++                "KX26",
+                 NULL
+             };
+             if (g_strv_contains (known_duplicates, station)) {
+-- 
+2.24.1
+
diff --git a/dev-libs/libgweather/libgweather-3.34.0.ebuild b/dev-libs/libgweather/libgweather-3.34.0.ebuild
new file mode 100644
index 000000000000..c92f920bd9ec
--- /dev/null
+++ b/dev-libs/libgweather/libgweather-3.34.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Location and timezone database and weather-lookup library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
+
+LICENSE="GPL-2+"
+SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suffix for silent ABI break after 3.28 without soname bump as per distro-list
+
+IUSE="glade gtk-doc +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=x11-libs/gtk+-3.13.5:3[introspection?]
+	>=net-libs/libsoup-2.44:2.4
+	>=dev-libs/libxml2-2.6.0:2
+	sci-geosciences/geocode-glib
+	>=sys-libs/timezone-data-2010k
+
+	glade? ( >=dev-util/glade-3.16:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.11
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+PATCHES=(
+	"${FILESDIR}"/3.32.1-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically
+	"${FILESDIR}"/${PV}-tests-Add-another-duplicate.patch
+)
+
+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 6a6305af97a7..169ca062d49d 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,5 +1,7 @@
 DIST libinput-1.14.3.tar.xz 567560 BLAKE2B 76d38b795a5e721a73062e9c37b23bf6739291549cadc66401ef47b1a9afd5766f1d0ed855fc66912e4257fae4b1b813946c67246adb8d8566d5ad9478079636 SHA512 f01d1bd1b25b8060519575644597d35f0c89de5386d298441f440128ceee3e57549921a058adec31adc8b33dbdedf4c0bd12c76905a69f752859d3136e26336d
 DIST libinput-1.15.0.tar.xz 573364 BLAKE2B 521e5775fb98b1b3a281d1002bd41fb0cd3e7dd3d7c1f11bd32773fb8651cddfa7db1fa2ca686a213ecd726f2f0fb475cd3f40a7a7290101286a334fa7b0086d SHA512 5dab48e1b4c9c0deb5b01ebc3ccb4cc28d614be25d87daaf42f51fbd2d955266f3fdba73029bc0094caa55060dad8967751b72d8f45f19a40b542f0c9118c1b6
-EBUILD libinput-1.14.3.ebuild 2068 BLAKE2B 9c8389061e1dc228e7a871110ee821ba79a012692738ad556000a15b5476ff27a8df18570059c76a113db186cd64ffc1e94aa28756e82c425e99a5cc8e8d56d6 SHA512 d23d2a0fce2e1fbce84e8c98c0646e62af3b1a8c859a657d78654cc1ea5c5105bad060b5c1ef78f4a040296f7ad5a6e305a4755c017bd878b2d49cbfea424861
-EBUILD libinput-1.15.0.ebuild 2111 BLAKE2B 8ae2dcf29df2fb409f8cd1609e9fd82ba9fbba8d7fab64512ef99ca22d6a2d814819426e3cacef11d493c00f9b14667d689969e6205f1906fa583ffd2de60939 SHA512 9f59464f1569e7d7634d042cf60ac8b927a38d14b330491c0119bf5f2162c282ff479381c8732baccec3ab7a84b189be0ff8ed168692ad9d9d942e9067698992
+DIST libinput-1.15.1.tar.xz 579236 BLAKE2B 0b0b8cd6643ef33c1fc52461caea332d98cee38b79eee3947fc3d853e6a9402ffc9ba2ac5588430c28c73b6444fa06f6743b0c932077ef29e97d0b1384e20fca SHA512 634810359bc4d86f2c4c75f472bee5eaed04ed93af3c91c4bc46a596402323941f9cc90173e278bfa7e5cbda6b7a20adc59bd09520dd4152fc961302b7e57904
+EBUILD libinput-1.14.3.ebuild 2062 BLAKE2B 2f69359a6fbf4ff51d52b31d98a1219577414f7462ead908fe9cceb9b46c1825f50bb422a666a3f69b5fb3086bdc6747908826cbb2a7d093e0a8a6bce9adb25a SHA512 d10de59e53d94998d274502d0e9f9c384e4ad267783b87bf3509d1e3e40132b25832926fabdf24a40a8fa2426d81c64622635d35b198dd12d39fac5a4f0af39c
+EBUILD libinput-1.15.0.ebuild 2105 BLAKE2B e9ff1aba1ea011b3bdc5c54480485d5e4f72871bbc655261f89b42e4d73ec7e0fc718be7452967cbca6717997663584220ada483fb3d8ebd12028cbddf898223 SHA512 7a72ecb0d8cf333018d72709a7cb08e3c9a67a7c4ea8674357284937358a77111a1414444c806c35a493c18121a6dcbd2a70fa47f78612f53b06b051ba2662e5
+EBUILD libinput-1.15.1.ebuild 2105 BLAKE2B e9ff1aba1ea011b3bdc5c54480485d5e4f72871bbc655261f89b42e4d73ec7e0fc718be7452967cbca6717997663584220ada483fb3d8ebd12028cbddf898223 SHA512 7a72ecb0d8cf333018d72709a7cb08e3c9a67a7c4ea8674357284937358a77111a1414444c806c35a493c18121a6dcbd2a70fa47f78612f53b06b051ba2662e5
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.14.3.ebuild b/dev-libs/libinput/libinput-1.14.3.ebuild
index 23c60db47803..7a369d3cd2dd 100644
--- a/dev-libs/libinput/libinput-1.14.3.ebuild
+++ b/dev-libs/libinput/libinput-1.14.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit meson python-any-r1 udev
 
diff --git a/dev-libs/libinput/libinput-1.15.0.ebuild b/dev-libs/libinput/libinput-1.15.0.ebuild
index d0cb85f869aa..313a4e3d067c 100644
--- a/dev-libs/libinput/libinput-1.15.0.ebuild
+++ b/dev-libs/libinput/libinput-1.15.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit meson python-any-r1 udev
 
diff --git a/dev-libs/libinput/libinput-1.15.1.ebuild b/dev-libs/libinput/libinput-1.15.1.ebuild
new file mode 100644
index 000000000000..313a4e3d067c
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.15.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+[[ "$(ver_cut 3)" -gt 900 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc input_devices_wacom"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? ( dev-util/valgrind )
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="${RDEPEND}"
+#	test? ( >=dev-libs/check-0.9.10 )
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		-Dtests=false # tests are restricted
+		-Dudev-dir="${EPREFIX}$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	udevadm hwdb --update --root="${ROOT}"
+}
diff --git a/dev-libs/liblist/Manifest b/dev-libs/liblist/Manifest
index 7b694029c392..699a2a636b0a 100644
--- a/dev-libs/liblist/Manifest
+++ b/dev-libs/liblist/Manifest
@@ -1,3 +1,3 @@
 DIST liblist-2.4.tar.bz2 275234 BLAKE2B 2f18d8b85476bd9369ef597553a546450fd33b3f3b4486ca371e6efd810a51b23ca3880300e0ecf826e9a9e8591f2b90a6a0006d224b34552f77416a83f7175e SHA512 814a02e4e47de8d234e592b87156533c30563c64c3a7515712fb9b75119bcee21796232b2a5abf7e4ab892932fa256890ad175aecb75aad8fb4614c6f4fbe3dd
-EBUILD liblist-2.4.ebuild 1313 BLAKE2B be3464f685e9699c9ec98c67bf6874597700a73193eaad4f31c893c554a92d04b13943d6f911500899f72091d3a1f5508a60520d29727ceb108fe4bfb30c35a0 SHA512 9a6dc3507516c4f138544a702328ac2b7360cfdf86295751f913299670b00e8f13e1cd15a8baf0e235ce45050415cc8a2c64d79eb7b33ff42b6be06c03c42bbc
+EBUILD liblist-2.4.ebuild 1207 BLAKE2B 712b61bce5ed43e2388aa24b2b900d80008400d517ade4e77a578305a5c50c46a2725ad86e472ce93017b67e02576f0cd9c5546f87daed633d1bc01a66373533 SHA512 a229a31f5696516eae6054b322749477beaef1b8cd664e46c9c11c2b53d2dcebe56a36159ee8478f3eb715ae88ea9a3e8ccdd4b0a281a1372d41f398a252b5a6
 MISC metadata.xml 356 BLAKE2B 2e6c2a54ee9fd3a59c8e211ac442b72d4015961357c5ec18d277f4a6b322c2ba3cfc4fb107732037149d290c308ced9c357198fddf62649a6fea40d6da0fa055 SHA512 8f96ffa65c0fdb773f41835d285cf5d2aa59d84ab3c096ec6b6224d057c32b657f0d3de7a531fbb602ce2d84d2fdbcbf4a96a9947a2cd244dd90fcf7b8972f11
diff --git a/dev-libs/liblist/liblist-2.4.ebuild b/dev-libs/liblist/liblist-2.4.ebuild
index 0133d56da438..928ed1b2bfa5 100644
--- a/dev-libs/liblist/liblist-2.4.ebuild
+++ b/dev-libs/liblist/liblist-2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit autotools-utils multilib
+inherit autotools
 
 DESCRIPTION="Generic linked-list manipulation routines, plus queues and stacks"
 HOMEPAGE="http://ohnopub.net/liblist"
@@ -12,36 +12,37 @@ SRC_URI="ftp://ohnopublishing.net/mirror/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
 
-RDEPEND="doc? ( media-gfx/transfig
+RDEPEND="
+	doc? (
 		dev-texlive/texlive-metapost
-		virtual/latex-base )"
+		media-gfx/transfig
+		virtual/latex-base
+	)"
 DEPEND="${RDEPEND}"
 
 src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable doc docs)
+	econf \
+		--disable-static \
+		$(use_enable doc docs) \
 		$(use_enable examples)
-	)
-
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
-
-	dodoc README
+	default
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/{*.c,Makefile,README}
-		insinto /usr/share/doc/${PF}/examples/cache
-		doins examples/cache/{*.c,README}
+		docinto examples
+		dodoc examples/{*.c,Makefile,README}
+		docinto examples/cache
+		dodoc examples/cache/{*.c,README}
 	fi
 
 	docompress -x /usr/share/doc/${PF}/{list.0,paper.dvi,examples}
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 8f734ffd5cee..63f8c22b76eb 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,5 +1,5 @@
 AUX libmspack-0.9.1_alpha-fix-bigendian.patch 444 BLAKE2B bc62193205d7d96b8e2b535236463d0695dfb1a3cc4b2290d172873c11f9d3184550426e10bd1457282531f27a22585365e5b1537f1b9f85eeed4fd31afa5748 SHA512 c2e138e19c7e8b8f90e1dcc35d32f655ccd7a1930eab7a0b49686e9d2be26cefba48bc895ef1ebcb1959c0422e824779f7e31940bbde0c8bfd8a2828c2ad6c3c
 DIST libmspack-0.9.1alpha.tar.gz 494651 BLAKE2B 4543215efbcac9cd2703cd56f2297645463831cc2dfa6b38d87c5f48f39676347bb20739e0e389e021983d910b9be99bfd369fb30d36090f3f72f09532d6bd1d SHA512 4e39c2be8768c5c0b0d0798c9322ff022173f5e05af1636c18541bbc9f58c1ae1af59252d5631340fca601495c5b1e5abed0ad83481387421d2df5efb75cd49a
-EBUILD libmspack-0.9.1_alpha-r1.ebuild 1681 BLAKE2B a4cfaa14f0905fb300c4e0ebf6df92b4cd410e35f9e75c09e5f0e7a5a03b6aa0ca47d1fde348d31e8e6b96e0f64c14a31977c15f86f40349ee0db027ab6a220e SHA512 2191619f66d31f445250d40631d7888ea0e8807da3a04cf6c6217d2cc562db9592409bce1a4d2f451f2c021a0433f1bb51046fbfe3250ec6ee0360ac509e55cc
-EBUILD libmspack-9999.ebuild 1606 BLAKE2B 54a39c3d22d8cfd335eab023702e83e0a3f05c1ec9c96890e4c0f622aab2a88bfd9216678127126ab0ee33965fe51a821d4c32636a5050b68830bda83a2ea828 SHA512 71ad3f2118af448b402b2d674015fa2f92ed7005bf11bd8d951416f7d92d6dfdab285f68a29a23f9fa6fa1d75e8d07109f27e7707b91d067b96ee8870a926ec9
+EBUILD libmspack-0.9.1_alpha-r1.ebuild 1679 BLAKE2B 2d37393c2dff02706e23a043bd184c3419730c2a2a324c3cdba130829cf197b65d485e63435aa7e0da907933540d767fc0efd910f73349ed40fca5da35ea225b SHA512 3fbb6254454fe8ac83370cb7093ec6920f317dec0b25680365d7b1df38b97100bcad7aba81d3aeb84209c5a160701ccabbc481138936227a4454fb627d169c40
+EBUILD libmspack-9999.ebuild 1604 BLAKE2B 065b1f6ea752283a4fa67976537753974b68bf42433860e61459c39a318b1acf8b43545566fd5d28cb4625199978cbc08897e03982736f65c5c7b26770724b76 SHA512 81e07e9d7b67ee674897cc783787c822aceb258a9fe2282fef375c1ccae2a73d2003a38f39368310fe7a42b61219b5962b64a9632704d650a17ef20cdcf64efa
 MISC metadata.xml 251 BLAKE2B f8ea69eed31c6ee4eca7ce37a9ee2b99d4139e42e53a0c93441863f1c2eb1148149038cbef9ec91a4c92971077fd6ba8e6ea995a138f8863c06d8ee57bc4f74c SHA512 14f3538a99bd8d32654ef4630d0cc667d55b36b44701791eb42d98f8e958641188915d86c306d68c7c20a4587e53477a3f9e32aeba2e0ba51c63c903391c4277
diff --git a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
index fdf5ee9550e4..05d375d16b1f 100644
--- a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
+++ b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
@@ -65,7 +65,7 @@ multilib_src_install_all() {
 	use doc && HTML_DOCS=(doc/*)
 	default_src_install
 	if use doc; then
-		rm "${ED%/}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
 	fi
 
 	find "${ED}" -name '*.la' -delete || die
diff --git a/dev-libs/libmspack/libmspack-9999.ebuild b/dev-libs/libmspack/libmspack-9999.ebuild
index 4c72d6fbe69a..31e174d47f43 100644
--- a/dev-libs/libmspack/libmspack-9999.ebuild
+++ b/dev-libs/libmspack/libmspack-9999.ebuild
@@ -63,7 +63,7 @@ multilib_src_install_all() {
 	use doc && HTML_DOCS=(doc/*)
 	default_src_install
 	if use doc; then
-		rm "${ED%/}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
 	fi
 
 	find "${ED}" -name '*.la' -delete || die
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index c66cd2b6e6a0..1bb9c244038f 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -1,5 +1,5 @@
 DIST libowfat-0.31.tar.xz 183684 BLAKE2B 67c60ebba10463f28196e3d9ed5f20fdbe79db8b499b226fb02d4f38833747e5e709054473267a1e139e1bef29222220e7f60cf2f472ac58ca67b52dca2c5661 SHA512 b3ce973d6edc501ddaa6caa84dc3b74e3e31ced92e4f707038858cd36c977863251a7eaeababdad34ffe6b8ad13c9702118464f6f9fd827e05f6fbc5004408b5
 DIST libowfat-0.32.tar.xz 195820 BLAKE2B 6dc19b947867a9b08eece785378be2493fb7185d1cc334de080ab1c288884fe0b670ece6f3785f051c707cc98afc4d843a262b9761fc9cc68fdf1f1ac8df1eb8 SHA512 c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
 EBUILD libowfat-0.31-r1.ebuild 994 BLAKE2B e93ab5d7746de5c071b55a8dee7d2415f64f623aa98c543cdebc0a6007dff1b6eb362197f5143e7ec2f0ff97ff07e46d6298afe255af0a9ad2d2e5db1d626ab0 SHA512 070b2af23d5f88a2295c34674f86af39c68ca88480ca5882f79bc4c9a4b75f3a6f7a99ddc4deb85e4d3d20f8ae7dd04c336aced617eee63417f128378b1d05fc
-EBUILD libowfat-0.32-r1.ebuild 1055 BLAKE2B 9cb834bb413232dc3a96ba6c03d75193b06b50bdafc6d1407819722ab694ed4a31fdb64686ab514c1b4cf9dfe7aaeaf71f4e55dae8901ee900f8f96cd8b3da22 SHA512 1282bf87ebd5cd46c15e435a4d4482b7e3b374b815786402d8e07b0dfb59ede787e6af01040006a1612297431ef3bcbf73e4bc1734cbc7003665252f8fef5af2
+EBUILD libowfat-0.32-r1.ebuild 1039 BLAKE2B a942d8bb1b68df60e25d245b644b39a9157bf298c9f6afa4184ed876b1ce9d7795be39ec329e7f28e5de8d92e280afc8b3f274e1c988bcbda94fb7e8e74264a8 SHA512 4d715c44e78e1e76bb9af21e29490cb3e1ac7e51693d0aa63295a0c2dfed723847af63427bbacb03f04e2da6e33a05cbde20150f69dd08b3794c1e7957da73f1
 MISC metadata.xml 430 BLAKE2B 16b95e09cd79b1b22a0b391fbd70b3ef51b08dd5d92449613f21e8e1ac85f16fdb5e0bde3a298aa7b2c740439c909836a3a71dc55022a1322746f2078522ed78 SHA512 83ef95906f9aa9e0a88eb9241dd1245cd6628a24acc06fc99d97028ef9d82e4369fbed5643d88d51ae514dedf70dde032443a1523d335ea0fb1f96cdd9149a79
diff --git a/dev-libs/libowfat/libowfat-0.32-r1.ebuild b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
index 622656e3a5f3..8fcd920a4772 100644
--- a/dev-libs/libowfat/libowfat-0.32-r1.ebuild
+++ b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
@@ -27,19 +27,19 @@ src_compile() {
 	emake \
 		CC=$(tc-getCC) \
 		CFLAGS="-I. ${CFLAGS}" \
-		DIET="${EPREFIX%/}/usr/bin/diet -Os" \
-		prefix="${EPREFIX%/}/usr" \
-		INCLUDEDIR="${EPREFIX%/}/usr/include" \
+		DIET="${EPREFIX}/usr/bin/diet -Os" \
+		prefix="${EPREFIX}/usr" \
+		INCLUDEDIR="${EPREFIX}/usr/include" \
 		$( use diet || echo 'DIET=' )
 }
 
 src_install() {
 	emake \
-		DESTDIR="${D%/}" \
-		LIBDIR="${EPREFIX%/}/usr/$(get_libdir)" \
-		MAN3DIR="${EPREFIX%/}/usr/share/man/man3" \
-		INCLUDEDIR="${EPREFIX%/}/usr/include" \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		MAN3DIR="${EPREFIX}/usr/share/man/man3" \
+		INCLUDEDIR="${EPREFIX}/usr/include" \
 		install
 
-	mv "${ED%/}"/usr/share/man/man3/{buffer.3,owfat-buffer.3} || die
+	mv "${ED}"/usr/share/man/man3/{buffer.3,owfat-buffer.3} || die
 }
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index ad5342564372..08f8b711bc11 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,4 +1,4 @@
 AUX libpeas-1.14.0-lua.pc.patch 553 BLAKE2B a86596d6c76e22e3e947709db226a47110f0964ae493d4fd16e506f4666de5fd5214d431a5109ffb0b68a6743bf2aa89aba84b63fabe4e402ac491be01479743 SHA512 ead06352498ff82a4520d4a7ed7b5d03e2d0adcdf2025413851b8385bfdd691c938b456b555d2214ec2dc7b95708f306149d6f1cfa7c5b03ad28a1c90c873349
 DIST libpeas-1.22.0.tar.xz 561332 BLAKE2B 219918f8663cd60c9353f477ef905ce0d1e21bf5b7c09661c4cb3c8adbba3af9f5e93b9de8a1b098dab09b1f4071854a871c8ea1db878bda8fe9e51aa45e5f87 SHA512 9c1da1d4b5688c0f4d0647f3519dbfbed94c8921091057aaef0e41bf5ed3f8faf04a49ce9e4eea3fd7bf4ac4dfa1727d76a5f6dae2a4f52228d4c8c74b420c91
-EBUILD libpeas-1.22.0.ebuild 2196 BLAKE2B 05cffe6a03650ba0fb57f52721d2edf1a6a7f8fdf8197c729a11f7894ae7c357cc80f6b26786a5c07a1ec33e8618634bb09d227af4367f4bb13a4e2378f68bca SHA512 9681bcade2c2148f21364184ff36eb5592726cffc4ecb9464a83cb3ab52dcfee13320fa2837f6bcd8c5aa9749acda4e40b93dc4e89ee716f31d06771c07d891a
+EBUILD libpeas-1.22.0-r1.ebuild 2235 BLAKE2B 0a127c7459e00373fe163207b56e14bece19db601f9970f37c4a7e51f86e0cd88c17e9891b8cbe2964789a77c8b7e8ffe8fee84a10c5b339f732960ce2639d95 SHA512 125bd2134814f61805fcafa2547662c9d92cc1aadc360ff49d78b720d6634b70f203b28b88df19bd7ed858ec3b21d52948567c672b61ac0a296f7b8e706c87ff
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.22.0.ebuild b/dev-libs/libpeas/libpeas-1.22.0-r1.ebuild
index c4cdb1939630..d2eec7dc5313 100644
--- a/dev-libs/libpeas/libpeas-1.22.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.22.0-r1.ebuild
@@ -28,7 +28,10 @@ RDEPEND="
 		!luajit? ( =dev-lang/lua-5.1*:0 ) )
 	python? (
 		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}] )
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.2:3[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 4d54806490cd..c694f7d94727 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,3 +1,3 @@
 DIST libpqxx-6.4.5.tar.gz 715081 BLAKE2B 4f1356dc5fc9baddd8fdea6095541f4d90657ef0211edec7796ddd3693933b8d37d5bb14e19249a2e4627b85aef11c582b0ffac0226c8e99a70af1d2b0396e5c SHA512 b6f79c4af93876eaf859626c2deae3b23bd4fa1a438390bc01513ccc48b90565d59588f6977e7475bb7b8dbeb8b1c8ef2a4737d8eb4d15682531fbf78590ed5e
-EBUILD libpqxx-6.4.5.ebuild 2166 BLAKE2B f7053fe86073075eeae79d9c9e71975641049476a858e086e0321e61d38d95239d4e54d85ea4d35d154e0e3707e7900403786cf1b642366ba4f755f05d616af7 SHA512 5e9138f44bc74c5025b84d67020fffaeac27e4882b962bb02abce643fad7b10df338652ceadced91909b3a1814781d405565cac3632304201ee8ec0affc6c58d
+EBUILD libpqxx-6.4.5.ebuild 2160 BLAKE2B f1de8130b63c0f06f97288684678436487e1b0b45d21864c8e6c14213a8cbd8182770df85b5f67643df999c2949f7f29ddba450b5408e01f54cf3026b5e8997b SHA512 7aa95d7c2af3745a29d8673824b22ee09a7ce78b92ecc5c71a55379e73c44748dc519fca23574e2b2ac9d0420af8d459d0edc175a7e6b3937d15ef97b85ab13d
 MISC metadata.xml 597 BLAKE2B 2371e4c701506d5e8b4eb0938325a6cd909ad874badbc000a7ea831d2e7ff55cf1b6f4fbb3ae09f9392850319f9cbbbde083492a20cf1209e94139f7b1ceb927 SHA512 c732dc922e3ac9e63a373dbe8b53ef8fb93d87c7cd91a1db1b94e89fe33f3109b818cf0730df36b00f2abf1dc554e1bf261f39db807cf61775b8177db231d37f
diff --git a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild b/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
index 45ec518c2990..41b9508b37d1 100644
--- a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
+++ b/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
@@ -45,11 +45,11 @@ src_test() {
 	einfo "The tests need a running PostgreSQL server and an existing database."
 	einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
 	einfo "set PGPORT and PGHOST. Define them at the command line or in:"
-	einfo "    ${EROOT%/}/etc/libpqxx_test_env"
+	einfo "    ${EROOT}/etc/libpqxx_test_env"
 
 	if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
-		if [[ -f ${EROOT%/}/etc/libpqxx_test_env ]] ; then
-			source "${EROOT%/}/etc/libpqxx_test_env"
+		if [[ -f ${EROOT}/etc/libpqxx_test_env ]] ; then
+			source "${EROOT}/etc/libpqxx_test_env"
 			[[ -n $PGDATABASE ]] && export PGDATABASE
 			[[ -n $PGHOST ]] && export PGHOST
 			[[ -n $PGPORT ]] && export PGPORT
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index a425d5a73967..bea0a095f9f8 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -1,5 +1,5 @@
 DIST librelp-1.4.0.tar.gz 519235 BLAKE2B 9c1e52cc9f666e75f261db65f45e3d954afa033cac59f93394c30ba99ed772d71b2882bdbb9bed696e57ed99805d47e57fd5e331cc3bc3850c5f15041a0d70d0 SHA512 92d01a51b4ee3c66d1f65d2e26f214646d72b41a8411ab700fe5f9f30f805ef98dec962526ef95c8d8428bf7398d38f656c919f95a3e49382adc745ef9eb4239
 DIST librelp-1.5.0.tar.gz 521793 BLAKE2B f3fa42ab1df5bc7fea340bf87f241666535f61a5726df55f47f6f324347a1dbbede2a66d252fe654d21e79ee44684aa51e83cace32491778d6cc42698f578195 SHA512 b7fb35e4ddb5c3c14ef733699405f8aa62911adef305cd4f494170e111bc61a9208b84dab472a708582cd76ad9976894dae0e7574e60acdae2b56491aa7daf36
-EBUILD librelp-1.4.0.ebuild 1409 BLAKE2B 56e8e417025698416c1c04d3a1bb99d3a588483d7256b66ffee11d999dbe90e7d6a86d14afab952877e8ff2135a11ce68db4bcf30180df75b902df903ebca327 SHA512 9b69b3b1a806a6e407ef2bc92a725617aa02b4ef8914418ac7b730c732fbf0fbddaa6c95fa22ee82447e8a587924a3542b0859e9891692cc0183b72e2c2e6d86
-EBUILD librelp-1.5.0.ebuild 1426 BLAKE2B e66afcaa5300bbcccffae0b396ca1fd837ae7c1d00231d9e4e71470553ec64a00af1932727a54d5d3a9a45ad4a1c6572f07bc7a519718f829c3f56cf005c48b2 SHA512 380f1cd27b8f8ed98a74088012a343cbce81c3dbdf5f6c705cf133db6d9fa766ac2000a4e5cb2a71b861718795c667ea40729d1fabe5c66104d34b82d9d76876
+EBUILD librelp-1.4.0.ebuild 1399 BLAKE2B 330788604ea143718e59ab3c88d5248cd93c914c70a8c91d6d5cfbf3cea0a286355cefec2f6b8aa9604b932283b618f7e5615a58ca50dc14089e94eff09311b7 SHA512 9b2a4086e5a56bd13b7741f285753fa834e2f2b8cc7c376e539e5b8507e8d61dce8264ea0e1ebfbdf1ed26dd34b44b490f125d13bf97a106384f81a51ff83847
+EBUILD librelp-1.5.0.ebuild 1416 BLAKE2B c1d1c05cd987f44ba5d965d63ef92d554c3c802e1c8376a8b4213da06448d87dbd5b95088592a530bc24722f7ab6f35c2112cc4c6e8211b56828856b731e834e SHA512 23ba67da9b64b8c0ada1ec3659a0010f5556353ba7e4a2a346bd84cad9cde718a418fae8959e37001995122a131a8dd62c8ddab453a16a09d4cd6df7d050162a
 MISC metadata.xml 392 BLAKE2B f8320c59b6d3f84ff3e9b782f77d785aa001c5f45dd54afcd0cf726cfc070c076fcebb99313612e58acf6f275900e0641a2fa9bb1151eca0561bae9087e2c5a7 SHA512 d286592d19517966bab79c3bb232ee02a8028b15602fcb6c12edf1523158d07298c33328a808f065de074f701778f9c2fea436d3924a67c2635c911a9e7f15a4
diff --git a/dev-libs/librelp/librelp-1.4.0.ebuild b/dev-libs/librelp/librelp-1.4.0.ebuild
index 3bfd7307720d..529fe6d6459c 100644
--- a/dev-libs/librelp/librelp-1.4.0.ebuild
+++ b/dev-libs/librelp/librelp-1.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools python-any-r1
 
diff --git a/dev-libs/librelp/librelp-1.5.0.ebuild b/dev-libs/librelp/librelp-1.5.0.ebuild
index c5a14c6f2f49..edacd29ee8ed 100644
--- a/dev-libs/librelp/librelp-1.5.0.ebuild
+++ b/dev-libs/librelp/librelp-1.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools python-any-r1
 
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 303fe1d76fb8..dd42a2cf27aa 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -14,5 +14,5 @@ EBUILD libressl-2.9.1.ebuild 1706 BLAKE2B d5cee2b2dc1e31e7c2efc76ee9b735fac74bea
 EBUILD libressl-2.9.2.ebuild 1741 BLAKE2B 3ff5a7daf910176ae42a6ca9ed12f385d71045531bc8fd06dbe48b33d4578d8152f2f9eca2b89f8c072bb834fe68e8eabbe9e315609a7beb38bf6671032c1427 SHA512 bf8c33252b6a914c5c6ba488803fe5640c29351166747e78fa7b062f26a42916d7a3d4ee95f708804c8c5c4940f073b5d271be27e00777ca7f86c1d2c057ebdb
 EBUILD libressl-3.0.0.ebuild 1706 BLAKE2B 4e52ea77d949b992fb391ac7f5ba0bca0abac46a93cb352dd942aaa82d2b1088273a61e1c5fbfbbcec29b9a03cb3f0d5111253953fc1be5f40568e236d301674 SHA512 7688885e27c01946f0013e3336691973b2d56250d624ef55521493526e753c5229c57ccf62be8d9f39d1d8bc030b34c7cdb5031de3c32a1cdd7682ffdcfdc8b2
 EBUILD libressl-3.0.1.ebuild 1706 BLAKE2B 4e52ea77d949b992fb391ac7f5ba0bca0abac46a93cb352dd942aaa82d2b1088273a61e1c5fbfbbcec29b9a03cb3f0d5111253953fc1be5f40568e236d301674 SHA512 7688885e27c01946f0013e3336691973b2d56250d624ef55521493526e753c5229c57ccf62be8d9f39d1d8bc030b34c7cdb5031de3c32a1cdd7682ffdcfdc8b2
-EBUILD libressl-3.0.2.ebuild 1702 BLAKE2B 5d0393573ef69a6dd5cb814a95ff8025f431fdb0a0332c52cd6f6672ca71f9b0a89649ca790760e865e80f5d6f8172c24fcb2125e048b82996fcf56e6d4d9acd SHA512 594900dfe0fee806a35842f0976fffc833bb9c6788a569c7d7d0cbe74e987ebbdb7f2ee39afe38925d861c5cc81a0435da153bb0bedba365ff270e3eea88ef70
+EBUILD libressl-3.0.2.ebuild 1701 BLAKE2B 6a176fa77177cd2a629d2433ce01d2fbd7ef5157c55ce825d3a823325952f670a3fa5dbdb44fc1acee3e9b94a985e525111d36992df440d648fc6278ae385491 SHA512 e33f2e7d05e1b74f63f04865f799ec475cffabb1ea6b814d4528800726708766e37b3094114d873d2ef2e470d3096c80b1ee608e71f3bac27636408ebbcaf651
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-3.0.2.ebuild b/dev-libs/libressl/libressl-3.0.2.ebuild
index 58ef921f2581..dc819f980b67 100644
--- a/dev-libs/libressl/libressl-3.0.2.ebuild
+++ b/dev-libs/libressl/libressl-3.0.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/47"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( static-libs )"
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 78eea66321da..9bf7c16d6e94 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -4,8 +4,8 @@ DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235
 DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b671821474b78fff084c4f1c3bebab7b2ae16f75918d4eb40996e293165be46f98efea20edc57b1e1255c2ea9fed0 SHA512 6d7c416218a69b1327ed211a9b198cdfb6ebdf1fc9c8c76b898882a63d0905521d5e41380b21f0b8100ab3e3474bbbf142adea29c6643f03bc3f8c3e6ec3c72f
 DIST libsavitar-4.2.0.tar.gz 96223 BLAKE2B bfb41111e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 SHA512 9d1ee73b8e29e1b8b5688c309471cb6053addce351df8deb4e0cb46d15ffc8fe764216c9abd603440b6a60f42379fa03d88e8023ed01502c4e905ebc6a4f393d
 DIST libsavitar-4.3.0.tar.gz 96154 BLAKE2B 866edadad2ea27002b79e018dc073f53409e5fc3af86941ca3e196ab0c8e7299f945997801126b79776538abe81af3abec5c116dac9eb977c1fac02fa45767b4 SHA512 4accce4a96deddfe148540c3abb3cba391178ffc34b88ea77e07053c36eb2c3d6aa7b040ec386ba5bb2eb9e6d9c371b5c35fae268f953694f6ccd9e6c82223d6
-EBUILD libsavitar-3.4.1.ebuild 1032 BLAKE2B 69c336990a66ce8e5d2b6d1c70befceb5a80a84ebe0b38926e7e642025e494504dc9c8e7903725e200c75e6c250371e0b5c7720ffab1d1e39bdfd4bf66e397e7 SHA512 2b8048bc003af91fe6dc1068ec053c12130b142fc74383016428c11eb77533157923b962dc3c1e6f54599100c840a0bbe333c930f8c3ed4858d10fdad31b7a30
-EBUILD libsavitar-3.6.0.ebuild 1032 BLAKE2B 69c336990a66ce8e5d2b6d1c70befceb5a80a84ebe0b38926e7e642025e494504dc9c8e7903725e200c75e6c250371e0b5c7720ffab1d1e39bdfd4bf66e397e7 SHA512 2b8048bc003af91fe6dc1068ec053c12130b142fc74383016428c11eb77533157923b962dc3c1e6f54599100c840a0bbe333c930f8c3ed4858d10fdad31b7a30
-EBUILD libsavitar-4.2.0.ebuild 938 BLAKE2B 6e0b3cee2d6a4a3cfdad5081446dc6294c6ebb6b675cd9e70ea19b811a39d941398f386ac44aa3b1be26c11e7d80ee2ae77d6de70d3717a33bfbc109eb99cc1b SHA512 8348a643cce7914d325004e40d94654b64abd1cb2d3b04c13cd48b9b05469e6a93b738b7694e28222adf5107d7f8042bb90ee3928882a5936b176362e1624b97
-EBUILD libsavitar-4.3.0.ebuild 1297 BLAKE2B 88b6c910fa8363f373c11aac2cab5b0a44589cd6d737c346f22c0a030a471294e717747cf6b38861da72b5b8a559575d470fa513992bc70acbc7ee7f66039e89 SHA512 e384f0e18573609feb3fe494c93f662a81ae00edaf2bdbbbf21fa8fd844161815ac0527bdf635d68e8a6f049dcc6e24c58f054880c00093f580058048b92b798
+EBUILD libsavitar-3.4.1.ebuild 1068 BLAKE2B f68d50b167fe7c07c7cea56efd8638d8fddbc7ab135103e79656de88fee9ac329bca1769a0aaaf71865da29cb9a28ba90f47199eb2708e3857934f24a1eb8bd5 SHA512 47efb7b0ae80817a113e4ad9e6a8e583d63f0a7125a2d9ee082fd9cf33bc534ee011de3af7da6bb57c548034f11b65e4b000723c4cbd0c03a81463b6b00bcae9
+EBUILD libsavitar-3.6.0.ebuild 1068 BLAKE2B f68d50b167fe7c07c7cea56efd8638d8fddbc7ab135103e79656de88fee9ac329bca1769a0aaaf71865da29cb9a28ba90f47199eb2708e3857934f24a1eb8bd5 SHA512 47efb7b0ae80817a113e4ad9e6a8e583d63f0a7125a2d9ee082fd9cf33bc534ee011de3af7da6bb57c548034f11b65e4b000723c4cbd0c03a81463b6b00bcae9
+EBUILD libsavitar-4.2.0.ebuild 974 BLAKE2B f3b391057a360f16ee8c8752e2ad22b123fdbf251fc350d978227f3a9e974eb8c542f87ef3779eb88f446424c9c3de88644b55d37e6e3e715109765891db9b07 SHA512 f12bab72f5b81ff3ba3fc78083e2606d0e2107ee52961c0e26079e4628862f4a6aed905ee736c37eb5e7bb40b7f00131e20c2ee47b9d9887fcab096ce754c1a6
+EBUILD libsavitar-4.3.0-r1.ebuild 1333 BLAKE2B 05501ca347209f318581ce3fe680a3b4ba3a5f5830f2b7c0b06f02f178b572de60231e19584d074c96cb878de5329797097a3926a9baf858b7db4cd5781f407d SHA512 3e3ef5511fed7b8e6ce2b4737d7710e9b5b11365a3237ed7cc7d254b20a69b97e17fee02ce64c393df0bfb047f56cf5b2bded3f449fc45e98f124ab51522ce78
 MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304
diff --git a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
index d9ecc72540b0..1ee1e2a50841 100644
--- a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
+++ b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
@@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/pugixml
-	dev-python/sip[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')"
 
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
index d9ecc72540b0..1ee1e2a50841 100644
--- a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
+++ b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
@@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/pugixml
-	dev-python/sip[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')"
 
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
index 26c10c69fca2..55f2b677a7ef 100644
--- a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
+++ b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
@@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/pugixml
-	dev-python/sip[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')"
 
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/libsavitar/libsavitar-4.3.0.ebuild b/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild
index 1b2ed0ae3c2b..599349de9add 100644
--- a/dev-libs/libsavitar/libsavitar-4.3.0.ebuild
+++ b/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild
@@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/pugixml
-	dev-python/sip[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')"
 
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/libsecp256k1/Manifest b/dev-libs/libsecp256k1/Manifest
index de5c6a1be1a9..96f1ed9742aa 100644
--- a/dev-libs/libsecp256k1/Manifest
+++ b/dev-libs/libsecp256k1/Manifest
@@ -1,7 +1,7 @@
 DIST libsecp256k1-v0.0.0_pre20161213.tgz 147557 BLAKE2B 078cb90c078722e2eb3b5645f9692d737c99ebfe04db5a96dcfb57bb750b31c009cd3ae46f793bb1789239be9689f6e695a5b03477eecea84f2c657d0cc7442c SHA512 f4d16fae972364fd04bfcfbaca1edde4410a7367a936f76c1e93b85ac3c9c45da58785f604a4fc14cdfb4d7a23395d2d274957ad83118e15a236dfff0d0f57dd
 DIST libsecp256k1-v0.1_pre20170928.tgz 150935 BLAKE2B f8b3408a33f36186c07cf931a8183a7a241e6418a846f4c3b248cf87e7a8b33a5a92368aa30310efadb066792eebead7fb48b4f4d902e7c8e9b4209717d7b8c0 SHA512 f480c76ba04b3d731c65227e156eb726b27da92f5dcfbd9b0a34c62e97f9b6dfd5c3fae3180b59244d0c9845fdf624b05f29e097f3ac0032ab15cebc4bf00660
 DIST secp256k1-v0.0.0_pre20151118.tgz 125884 BLAKE2B 7a4fc950006138d04d8d3da35db24be0c568e25202c16f34f94555fde1297fba839fd114a003b5510693de3386de22166c6f1294726fe381ae5b565cb9866a75 SHA512 3cc0a4973acf7936a7c6dc0abc37ee43ecd69e835069ed40765595d36ca597b43837b5d6f90499455599de03abfc775d7c9d019d26216b79b03dd6dc53a73e19
-EBUILD libsecp256k1-0.0.0_pre20151118.ebuild 1380 BLAKE2B 8cadeb5057f75775c0f2322dcea8f1bd92d9a82e83ba62c5f24f24746044d8a36dd73bea8c26cbf0b8bcead7dd2e09b8246027147bf3eabb15f343c4df45221c SHA512 5a2dcb53dde35df5c45d44d69b093f85dd3288b0e85ce6ae76c6d1c4ed8b66206d8bc9a28d6e78796cb0c59595722d9aae2bb745b15a3aa0b1cd6633227362a0
-EBUILD libsecp256k1-0.0.0_pre20161213.ebuild 1544 BLAKE2B bb172053e180ecf05098953d39ba8b7c168fc78f215d3f1fbd8c7f20502a64a86a425dcfccf401d744699083d5d47a681243c8e78ebb0f834ddeb2e8a0cb6344 SHA512 4bb8091298f568a4e661e3075d839f5b104b714e67c9632f8f713bd095cb95d96c50994f3e67774b71db4ddbc4f1653a3ecb469349eb90b4d7cf9903bfa11612
-EBUILD libsecp256k1-0.1_pre20170928.ebuild 1587 BLAKE2B bc6ab78e259982f38b30d41c6d548ece072f4afa9a6147505c0ab6d7ef151be72397b29ae82085e5fc6d673729c2e8e6faed4b2685c0507e9c1fd5024483fb8b SHA512 e5ddf94c45d693b21ab6f4d97d0aa2ea15291c1db42b1df29b8ebab4dc4d6e6d0bc1186d276df2de6f69939c30f31a253efbc12b6b309b80c76ae9f2961eed9d
+EBUILD libsecp256k1-0.0.0_pre20151118.ebuild 1382 BLAKE2B 4f3ff495b3a6d1238c8ebe50c341aed0637bebb2bb1fe5c637fa3f2a94588c5addfbe0bbd7e9af56efd0e598d0c1757254d77f2636157e06e72069d29fdd8568 SHA512 1cc8cca3d30578fb81a5cc6a7883db4588fcecfa5946e43b648f73b7c8b6c86b5f3506132511574d911b21676d35eda706287f7d8bca7c54689042e683d759e4
+EBUILD libsecp256k1-0.0.0_pre20161213.ebuild 1546 BLAKE2B 270a70a3f6b6caf1ff105bb06d889ae106378976832bbe4c42a658a9182556c203c7cba40e471a174174a0e82e3dcb518112fc3bfcf5232549b032a6fc7a7af0 SHA512 9d57cb0261f61a4bccf735735dc8208f9c56e7c7d8ea928e87098ec7ba1700d8c75cb56225ca5c44c4cd7a50654bd4622222cb19e50d65ac83b34d75e98e019a
+EBUILD libsecp256k1-0.1_pre20170928.ebuild 1589 BLAKE2B 7f180be997a92ae35daa86b708e60a83518b118a93094e10ecb7a17bb1c4da61693a6c2764582f7bbbf9bd50dc52f09bd032c8b60445c55cd180a59d068a2282 SHA512 e2572b08bfac62c605d033baa21e2b24034fea5a9a0d774e5b91b110f1378d1ab98757c4329a6584538e301e8f72deacb4fa0e5e14b8a2c952d60812d5dfa1c7
 MISC metadata.xml 945 BLAKE2B 7a69755c3d1c70ed97958a6597821b2d35175bdb8a396bccef731a9da250a4b8b4a14fb9f28df076b265db72f96cf5d75c3892449bc7bc3f320c69d5d8e79c19 SHA512 f90780064a7b48ef4d9ad70fb20f61ee2ff62508c396bd79f157d2790becacd833d035cc9bd7719aec29acd0b4a30b37426106196f1e229f86bb6eb5c2abb8df
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
index 71d047416824..a4f3ba2ec144 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils
 
 MyPN=secp256k1
 DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin/${MyPN}"
+HOMEPAGE="https://github.com/bitcoin/secp256k1"
 COMMITHASH="6c527eceee7f5105c33c98dfae24ffeffd71f7cf"
 SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tgz"
 
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
index 7716244ab405..5d593b8155f6 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils
 
 MyPN=secp256k1
 DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin/${MyPN}"
+HOMEPAGE="https://github.com/bitcoin/secp256k1"
 COMMITHASH="8225239f490f79842a5a3b82ad6cc8aa11d5208e"
 SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz"
 
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
index bd971f602e6d..86225fa50e57 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils
 
 MyPN=secp256k1
 DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/${MyPN}"
+HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
 COMMITHASH="7a78f60598a6aeb635ef227ead50fb44a209c363"
 SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz"
 
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index d43d8561d93d..e0de67d276db 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -1,8 +1,8 @@
 AUX libtasn1-4.15.0-noinst_fuzzer_tool.patch 918 BLAKE2B 4b0aeaa49d3c1460f0e333932a5f17e6fa289bac4f014d71a8acdc89748a30018ed8fadfc7e9410e30dbed70889ea2227ecb8e6e30b2b044f435cd44d3d6199d SHA512 be805ec8b11ad97a3bacdcbdcb80bc22a3be8fd1de9d512b7dd44ab207d1cf3f7db1d60af2e4c4634dcda37031a754d678ea8dab76cb23dcaf7d7bbd9683ce86
 DIST libtasn1-4.13.tar.gz 1891703 BLAKE2B 5a8bfefe1a3701505c8a1a4920412a6dd15fe771fb848fbd00f0a332388795dc6108a0fa5a282b4212abe0b0642f205bda53c2c39a4a2d65fa71e082fc76a6d2 SHA512 bf5b60a296795e0a8a4a658c0106492393aa7ce698e785256b3427c17215c2a5b6178a61a2043c93ea4334f754eabece20221ac8fef0fd5644086a3891d98a9f
-DIST libtasn1-4.14.tar.gz 1771184 BLAKE2B fab592db4c62d1ed1201637fdbfbf7b753ff90994245b28bad4fbbb6f28616f0abc65fb5cf4fe9b9cd6cc7c4ffb442686b275a97dcfdbdb6a08b0d8e781576f5 SHA512 efdcf3729e9e057cafbfdc9929f08531de03cf3b64e7db62cb53c26bf34c8db4d73786fd853620ab1a10dbafe55e119ad17bfeb40e191071945c7b4db9c9e223
 DIST libtasn1-4.15.0.tar.gz 1800713 BLAKE2B 005a36bfdd89a167d469ef834c00d8b89e0fba42c0c973709be93c1d703b8042d5170df855085bac9945b6512dc3abef9405461988d634cb32ec0fe99f49367d SHA512 a8095aebf57a0b482027d06e0ee6978946f267b57bf2db3c891c4656ca35250cc1f72e2e90f4cc0ddbdf6cd2b1783881a62d495a57ad4a98684f8d037307552d
+DIST libtasn1-4.16.0.tar.gz 1812442 BLAKE2B 1a79494da959808d1b05099409cab70a08bf8be039f32c2e487ec8cee240d92aca9a3ec137721bac3bfe1ecd59334f4f31e0e0c25c6f06ee850af69842c0fefc SHA512 b356249535d5d592f9b59de39d21e26dd0f3f00ea47c9cef292cdd878042ea41ecbb7c8d2f02ac5839f5210092fe92a25acd343260ddf644887b031b167c2e71
 EBUILD libtasn1-4.13.ebuild 1176 BLAKE2B 1a652e984ba4178bcc24291f56b87ae03a71c823e9233302d90c45a4955aff0f2ba519ae22ed48c4d5bc5c625ee3f661df7808ad323c195660c9351d0cdb6e87 SHA512 a7964013c6856734947d51573aa17c4d50cca48f70ae38ad551b5dcc1590dd879fe5385ff7d99b73e27f74db0b8ffdc0bf86fcfbca81e18dfb90101ecc0e63ee
-EBUILD libtasn1-4.14.ebuild 1198 BLAKE2B 79f5f4e71758e7e019a8342e0a2e78ae8862d17b2cfaac1b508e09ba00c2379ff611bc6738293fad2c2194a08b42be1ac0a464f44671f705ed535c9938c4ada8 SHA512 a1b4f3a55a866fe4fb5f87b4567d4be7c5779c560ca7a925b4b44ea17e3ee964d2108a41c909f603a46971d025bc4b5fc2fe354adbe818aad30348f73f236de8
 EBUILD libtasn1-4.15.0-r1.ebuild 1296 BLAKE2B de75957eec71b3b4955c1b7109372f4b59c57a000923ca57327891f3573edaa037765e19dd43de13b927010b9eb6ffa4a843fe8f7e279838bd7d9eca97799868 SHA512 a2d407306a86b1562c89c489bc72690c0c2d1514591f725e64a67d0c919738bf78eccf6bceab0d6cb964ffe3166b2a3a41d5e2f4a62df949c77c77fd772cadd6
+EBUILD libtasn1-4.16.0.ebuild 1238 BLAKE2B b81eee3faa0cfbf77821450e42bb691772cce1be249f825b5299c2a054ab867a19a8112b3dfae0a832ccf37a3159f1b00d3b29af0d6bcb8ce58da77e53d81ee1 SHA512 fe1cbb04b69e09051369a07695c399deb2438193c93023d7333a021faf27c97191a6a5860eeccf4584d2a920fa11c41ce8f23b13a04d4c64176afee8ca944fe3
 MISC metadata.xml 445 BLAKE2B 9b3976fd78a81ceda730e46f0c5f74ac3f24744bf5503ffdcc8ad617133b643fd535dc7decd0f5060bbf77e0e3307f501d6355daa4e07d32f98532a0407c5aba SHA512 9eed39ede450d1598c75c1ebc487e5520f6cd8e1819a14b4d448502b380ccd0a7dc1510be8887cedd4b94add0e24700b84a588544bfcc29dea5d55b12c7aa556
diff --git a/dev-libs/libtasn1/libtasn1-4.14.ebuild b/dev-libs/libtasn1/libtasn1-4.16.0.ebuild
index ce8e7f67a174..a2542fee79b1 100644
--- a/dev-libs/libtasn1/libtasn1-4.14.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,9 +41,11 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		$(use_enable static-libs static)
 		$(multilib_native_use_enable valgrind valgrind-tests)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest
index 846bab950efa..25a6de0766ca 100644
--- a/dev-libs/libtermkey/Manifest
+++ b/dev-libs/libtermkey/Manifest
@@ -1,5 +1,5 @@
 DIST libtermkey-0.20.tar.gz 45167 BLAKE2B e51a0c91efce056824ee56918aa6a794096e1f19e02d04278c0f3e82382055f16b0413c9f3832492677fbb68bcc1803303cb4c8ee8dc7363276dfeda3e5a6e4f SHA512 81a4bc5917c60ca692ec3065ac0252ae5dc1adccc2832be1c83c82318c97473d883900ab88a8a0ee08ab3f831ff07f3a4827ee3d8e936a3a42c4708ee58f6301
 DIST libtermkey-0.22.tar.gz 46147 BLAKE2B fddc00a1ae525e5ed8c9c6eaee46fe30a99dbbc76ca988f9f5301b3c5c13a6de4462d6cc612119409a21737176f67ac196109b11fb58f414b25db5b6a49f4982 SHA512 2e8242cd1e6acb8900125dcee9fd47f7554c359363f760b88858c82667e1f3871bdd87358b14c8a133ef3cd2699947a5045477e64cdf7f96d4ead1723e73a219
 EBUILD libtermkey-0.20.ebuild 965 BLAKE2B 1e16f410da62765d9818cd526aa1e2cb5e88f96940d17bbd21c9d90ca7d50787825f0115a633dc4803be5e37d2cf39945c84d559a21dc22ca0ae62f1ff6fcae6 SHA512 a738569e408342f8605d32dbe96fda1f4843a39efe49f998b981b5d4f3d78cacf2e2be5832603704aac66c6a9fe84fc052aaea925196298721d4f69380bf641e
-EBUILD libtermkey-0.22.ebuild 969 BLAKE2B 078e9ce4fab1b490f7d9537448609b7761a1abb93a4ee802e71085a903b5bb9f185fd83d75e374a004cff3510b70475d4123726d4e81ff7bc3d3496f6079435c SHA512 7cc7b3f2da87558b313b52f9d9aca6ec960be077dfa6ccf96f1ce722a1e29f456919df27725c5541bbafc8669cf8e3ce01abfad4d9d3a3f810317cc32cd21957
+EBUILD libtermkey-0.22.ebuild 967 BLAKE2B a515cff5b3329b6fb7b22a8a056f8bcf4937224f5a16cf1ce294e6afeae94b76e267941f699c1d400ee0bf7698d444d29ba5e5898bfdc0762c2b5fa5f103b6f6 SHA512 cf6347921c7809afcb0bac8362f4037107851be2d22097096f7dc1ef595f2f6f46eadb631551279b57b2294ea340787d867cdb36fe08a9577b2661c369c0267d
 MISC metadata.xml 357 BLAKE2B b658c2de2a5bcbf02faff436d83266b842ab4217adb954f71f0543e5be5f791e48c97f4299e6c97e1338b0a2ee3937136062d0b80c1c8cb09deb3cec8d7add13 SHA512 0b48ba4931f32eda8d9c162693389fc65a0e0eac83b8f2f0dda2e58cabcd93a2bbf301c86c12cc0b2d89ed2c19afd82bbc3a54da9ab3e3f8c615aca24290dfbd
diff --git a/dev-libs/libtermkey/libtermkey-0.22.ebuild b/dev-libs/libtermkey/libtermkey-0.22.ebuild
index 4177883c0d2a..77170f6e2c9c 100644
--- a/dev-libs/libtermkey/libtermkey-0.22.ebuild
+++ b/dev-libs/libtermkey/libtermkey-0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="demos static-libs"
 
 RDEPEND="dev-libs/unibilium:="
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index b75ab8bfa3cf..f676ad891b1c 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,8 +1,3 @@
-AUX libtommath-0.42.0-makefile.patch 1694 BLAKE2B 37c2e368bb4f2d6f7738e3f110bb55686983fb701c4eb3513fd1779572a8d8449a305e34c2194fa07fe7b74a63572addb764f3ba8c7cd3285a25c5502c25f842 SHA512 3ba5253df119d57e598167d4ea0c3cbc000c50395598a953462d24e21832d41bdb16631688a99266f533e133fa39a58cc271e32d05e61b3756697ddb06898999
-DIST libtommath-0.42.0.tar.gz 1732144 BLAKE2B 624697bfa0bab0244783c3d2c92df2a1c0418611dc7f25989d038a5689beae325a426d8de38967ec856bd1e6f2d9413615333eebbf9316add838deda5b122de3 SHA512 d26e7737e5750530a7b96432502f0d458931e67af528872c46ad8dfc921b8f6ef4b3e05cb07d22bd13a8b24db65812928ae4c381250a4df95f6ca55efc3dae23
-DIST ltm-1.0.1.tar.xz 2210120 BLAKE2B e616f0359a1fffe8e1280dc24df1a83eb568d55f9f8acd0e4016fdd63b8ef10d939a8acbd4d49d70a69adf0e492ea5127200798f02af6af1c30e2e1f57870e3a SHA512 f98f7b0f91268e898803478fd52f578f476d378d096a25e48fa2e291159dc89bd1a6dc7d8c5c2254df840c731e5d009ec9728b72190318b6d1ba2916f5c66fb6
 DIST ltm-1.1.0.tar.xz 2125456 BLAKE2B 3aca7993704341f6a81e7fbef35389ac8ecd957dd78b5d576f0305d37493c3ddc32462cd787de2fb67d8e165417b18fcfde70accf991cd9433ff87591d8265ac SHA512 6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91
-EBUILD libtommath-0.42.0-r1.ebuild 1415 BLAKE2B 8a60c97932394540e696c4690510f5ea7b61649c04bee0e1df526ec460344ad693539dfe4fa8fb1a48095eb76faddd7a7a0d64908a0416ecf11f61dc84ecb8d4 SHA512 9df0399d9a9aaf4206ef2074efa02e84eae6c957fc3342203de199b74548f554f930eeee2d759df36baeb32d2de5564f5f0c533b024e4fd4418d7dcb74db898b
-EBUILD libtommath-1.0.1.ebuild 1485 BLAKE2B 0b5c4ba53bfe781804588a997a4cff542c269fdb6c0044fa2666b0eb523f7b6ab2de82e8ff8600f9331d2bf3c869eb1163cacf5eb843a5af4a694af6123df0e0 SHA512 be54807025371e26e1040e50b6b29a31ec1de08e4b0c4da0c85507ee8ea6410237633b4cd735ad9c6e7e830081fdc93a147ec4a43a4b2d1c7c58abfa1e76bda7
 EBUILD libtommath-1.1.0.ebuild 1515 BLAKE2B 394980d8ee01eccd82a3f9b49ce61570cea348ac4508662489a0918c2950c4d55b749e32b24b17c52434d9b249abeb112e2c35898e8041abb4c4d2f59375dd5c SHA512 be507edafbc2b683a80474aba78516a7e3475381d9dbc74a62c2e3b54f5275d64572b639c32e53d17a2d1c4ddd3f54300decc424f01fd203d09472c9352414f4
 MISC metadata.xml 2967 BLAKE2B 8adab466c3bf4d4e4b2368e56c7cf35c6a0e03f0dc9a237070e56bc224333876accb0c229d520f863041c0ee48b380225121d47554bb5aa511ff5689dd0e4e9b SHA512 73ce667c4bd2943f848274ee3952961d8b09c2c1faa4920cb74f9d8630470119c7e55a112b3c7dc2243c3746f75fa15db5c143e05e6739d2c9c19536f09a937f
diff --git a/dev-libs/libtommath/files/libtommath-0.42.0-makefile.patch b/dev-libs/libtommath/files/libtommath-0.42.0-makefile.patch
deleted file mode 100644
index b3f1ed6252c8..000000000000
--- a/dev-libs/libtommath/files/libtommath-0.42.0-makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- makefile.shared
-+++ makefile.shared
-@@ -3,7 +3,8 @@
- #Tom St Denis
- VERSION=0:41
- 
--CC = libtool --mode=compile --tag=CC gcc
-+LT	?= libtool
-+LTCOMPILE = $(LT) --mode=compile --tag=CC $(CC)
- 
- CFLAGS  +=  -I./ -Wall -W -Wshadow -Wsign-compare
- 
-@@ -82,21 +83,24 @@
- 
- objs: $(OBJECTS)
- 
-+%.lo: %.c
-+	$(LTCOMPILE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
-+
--$(LIBNAME):  $(OBJECTS)
--	libtool --mode=link gcc *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
-+$(LIBNAME):  $(OBJECTS:.o=.lo)
-+	$(LT) --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
- 
- install: $(LIBNAME)
--	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
--	libtool --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)
--	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
--	install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
-+	install -d $(DESTDIR)$(LIBPATH)
-+	$(LT) --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)
-+	install -d $(DESTDIR)$(INCPATH)
-+	install -m 644 $(HEADERS) $(DESTDIR)$(INCPATH)
- 
- test: $(LIBNAME) demo/demo.o
--	gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o
--	libtool --mode=link gcc -o test demo/demo.o $(LIBNAME_S)
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c demo/demo.c -o demo/demo.o
-+	$(LT) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o test demo/demo.o $(LIBNAME_S)
- 	
- mtest: test	
--	cd mtest ; gcc $(CFLAGS) mtest.c -o mtest
-+	cd mtest ; $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) mtest.c -o mtest
-         
- timing: $(LIBNAME)
--	gcc $(CFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest
-+	$(LT) --mode=link $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest
diff --git a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild b/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
deleted file mode 100644
index a1596d889e30..000000000000
--- a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils multilib toolchain-funcs
-
-DESCRIPTION="Optimized and portable routines for integer theoretic applications"
-HOMEPAGE="https://github.com/libtom/libtommath"
-SRC_URI="https://github.com/libtom/libtommath/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples static-libs"
-
-DEPEND="sys-devel/libtool"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-	# need libtool for cross compilation. Bug #376643
-	cat <<-EOF > configure.ac
-	AC_INIT(libtommath, 0)
-	AM_INIT_AUTOMAKE
-	LT_INIT
-	AC_CONFIG_FILES(Makefile)
-	AC_OUTPUT
-	EOF
-	touch NEWS README AUTHORS ChangeLog Makefile.am
-	eautoreconf
-	export LT="${S}"/libtool
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-_emake() {
-	emake CC="$(tc-getCC)" -f makefile.shared \
-		IGNORE_SPEED=1 \
-		LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
-		INCPATH="${EPREFIX}/usr/include" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${ED}" install
-	# We only link against -lc, so drop the .la file.
-	find "${ED}" -name '*.la' -delete
-
-	dodoc changes.txt
-
-	use doc && dodoc *.pdf
-
-	if use examples ; then
-		docinto demo
-		dodoc demo/*.c
-	fi
-}
diff --git a/dev-libs/libtommath/libtommath-1.0.1.ebuild b/dev-libs/libtommath/libtommath-1.0.1.ebuild
deleted file mode 100644
index 8f04224dc876..000000000000
--- a/dev-libs/libtommath/libtommath-1.0.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib toolchain-funcs
-
-DESCRIPTION="Optimized and portable routines for integer theoretic applications"
-HOMEPAGE="http://www.libtom.net/"
-SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}.tar.xz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples static-libs"
-
-DEPEND="sys-devel/libtool"
-
-src_prepare() {
-	default
-	# need libtool for cross compilation. Bug #376643
-	cat <<-EOF > configure.ac
-	AC_INIT(libtommath, 0)
-	AM_INIT_AUTOMAKE
-	LT_INIT
-	AC_CONFIG_FILES(Makefile)
-	AC_OUTPUT
-	EOF
-	touch NEWS README AUTHORS ChangeLog Makefile.am
-	eautoreconf
-	export LT="${S}"/libtool
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-_emake() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		-f makefile.shared \
-		IGNORE_SPEED=1 \
-		LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
-		INCPATH="${EPREFIX}/usr/include" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test_standalone
-	./test || die
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-	# We only link against -lc, so drop the .la file.
-	find "${ED}" -name '*.la' -delete
-
-	dodoc changes.txt
-
-	use doc && dodoc *.pdf
-
-	if use examples ; then
-		docinto demo
-		dodoc demo/*.c
-	fi
-}
diff --git a/dev-libs/libunique/Manifest b/dev-libs/libunique/Manifest
index 9144eb35e13e..4e4c9468192d 100644
--- a/dev-libs/libunique/Manifest
+++ b/dev-libs/libunique/Manifest
@@ -5,6 +5,6 @@ AUX libunique-1.1.6-include-terminator.patch 1150 BLAKE2B 19bb13cc29b4aadd12c52c
 AUX run-tests 500 BLAKE2B ff93701e0eb4c78416581d5758e83654d1c3ce197a1c6834ce1170f6da63bcdedf7502549ad0dadacda7e36cf62695acd897be60d6cb4320438a5496adb0081d SHA512 2ff3662e87cb00f33e68a342740c56ae8294e3cae069f1191156fb58077e7a7c1a1aad75018673b494b0be71f9c7cb15c9e2c5b826fd733a72baa761b4994547
 DIST libunique-1.1.6.tar.bz2 335534 BLAKE2B 79f04c514620c5247609660bf58fa207589e9d1a011837f31d782864bdb5f6dd2ee8a44dddbce746cdb5e62df28d1ab20ee0e069cf21ab3d36e8edb2db06a5fc SHA512 82893e1d51a553b3c1413498e48a3a132e2c05779b4442c3732b5429d698e133741615657432a3d05c82a05c79bb59acc13df500bb08010212155db5e4ee6bde
 DIST libunique-3.0.2.tar.xz 294712 BLAKE2B 6045abb17862188940c81389883eeea88b75166b0dc64aba93dbd59c94cc117dc4d410dcb855fd6f3bc7eaf6d918aafb1a0683ca03315f5df0f2f2cde3790aca SHA512 b053b9f265c751bd581d15bf73246fb087075eaf75760565671c09a4ab80db342b4d2185050a877c4e25276d24f7895f4325ca60b918a7c4acd9d1591e97a8b4
-EBUILD libunique-1.1.6-r2.ebuild 1562 BLAKE2B 61cbbafddd7ba0d2eecf06062162d00275a34451316ba29feb9123ff42352640c7361274cb8a9a9c0c8241afee75ba6f6ea82857ac62919f5a2a324fe494654c SHA512 bd9976f31cbfe67733ec0fa68e5d47a23b2f16707818b38956471407aa211dd50472c066bb2cdcf1365dc1335aa6d332d301ebad10e0ab772ceb023c0830d8b7
-EBUILD libunique-3.0.2-r1.ebuild 1121 BLAKE2B 285ae340dc04a072dcdba9381cf0d0f45e5a5535543ff15d8d0e75e041d4f99d9099ca91df01357b1164c6dbe7c379df737b393258df845a808f01670d9a1076 SHA512 8b6da2120fc6a42f33e4bc1406388cdcddfdc3d52db783a64f3f2e3735fb6b671a0b4361cf75275400d55dda7960aac21ae66d7992c72b70ba27b494d0c64bac
+EBUILD libunique-1.1.6-r2.ebuild 1563 BLAKE2B c9087e52806f0bcb513308e6998f59e625f30fedaa3d4daf5c792244939781d386b21d37f494b233c346cc97ef68d36e1bf77ba4959faec645638b5dd865e92f SHA512 4befd5c11eea5bc6908d651c1962d3bb17942645ff1dc10a9b3d4adaacb7f3ffdf893f649dd1c4487e00b78bc5686612d207287c57d672a64ea28243675659bb
+EBUILD libunique-3.0.2-r1.ebuild 1122 BLAKE2B abf5274137154c0a3d9bf7e9605c2a1040c968b8269d5dca8a25765ee9a344970219934b354bbd428e3b9282024ec63aa0a98f2206a276c46083be6ebd3d7a53 SHA512 aee268ab6a1fadbccabcc262ffa0aae9ae3042134e9b27b885668d2b9a4c873557fd5143c09ba7303cc7cf6be801b723a66f63445f9a9e7a08f277a885dbc4be
 MISC metadata.xml 500 BLAKE2B 3416f2d8574c38adee051c11070f680ec248b554f3945872561aec335a42b712634416b9d1087b7cb6ca8504ae1ecf246f0dc9f4e0ded538c24a1ff0b09bc9fa SHA512 bcdaa87134abaef8a3490e11fb9716a20594a0dc862f5b07b446c266f39d4954e0fe3f7f89d6412687bc7a126387d469454d7d1b7ba46684e8cf174a8f78c169
diff --git a/dev-libs/libunique/libunique-1.1.6-r2.ebuild b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
index ae2f2abfab91..57808ea31a87 100644
--- a/dev-libs/libunique/libunique-1.1.6-r2.ebuild
+++ b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug dbus +introspection"
 
 RDEPEND="
diff --git a/dev-libs/libunique/libunique-3.0.2-r1.ebuild b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
index 0538409e7f89..c20d503efe82 100644
--- a/dev-libs/libunique/libunique-3.0.2-r1.ebuild
+++ b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
 
 LICENSE="LGPL-2.1"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug +introspection"
 
 RDEPEND="
diff --git a/dev-libs/libx86emu/Manifest b/dev-libs/libx86emu/Manifest
index 006724f9468c..e1b38c84dc8b 100644
--- a/dev-libs/libx86emu/Manifest
+++ b/dev-libs/libx86emu/Manifest
@@ -1,3 +1,5 @@
+AUX libx86emu-1.1-fix-makefile.patch 1885 BLAKE2B dd89e7cc3a9b0ce336607a62f3e83be02fab3db01755144a322ccab44cfe3a93ca69298290c0d377e3792f9ba63d2fd8054afbf641f3e2f26cbd40b791c8fb49 SHA512 c62ceb8eaec38cb401016ed72332cf54125faf10dcb123714afc700bfec304fe1cb3e96f798c28218475f50f3941ad33277b0dc4f5874a0a9be67005b4db14df
+AUX libx86emu-1.1-gcc10-fno-common.patch 339 BLAKE2B f74fac4b1e8ad0251a3e0dbd2be7e9301e914a0acfa341a044d88cc6d251d9da7b8fd0b9e44a49f44a0a2e895cbd84351e7dcfaa0c2efb50c4de910ab71d6332 SHA512 c8ccccc91780dd2d467588576947891b25b9e02ae23b20ce48de9246cd37c2ec6d2fc4b5472bdfd8f569f6f1efeb85a826a2b848b609f7fff980c0477c1b82a2
 DIST libx86emu-1.1-9.8.src.rpm 59517 BLAKE2B 6ae5b7792b9b67b93d12e9908e9941417e4149ed6289e0d02b23710ae4295d74aae806d85b0a0aa719eee6d63725b161dd8870d92b5352383a0beee5ce7827c9 SHA512 cb44306bb76feb47d46f1f3dd92cc6bf694dcc2c42d191fd9ff9f0b68744aeb25e99b29336e5ffe67e9a3d02c51d56690429b892d7fd26438dcc1d6603e18bcb
-EBUILD libx86emu-1.1.ebuild 886 BLAKE2B 56f0048eda88ca0438ecce4de862c92ed0443385eb9918edcd522e4b538b52e66aee51ec4a4c995476d1cac0f3cf4d0c2319788d87a57e6a0612c0e22d6fadac SHA512 d8923437491b4e5711029cf7b6dcfa732cfe280894337c05116400ba0b14a3cb8077858c49035487389ddac9d37c33430339dee8d4d7af070379ad6d96fae739
+EBUILD libx86emu-1.1.ebuild 623 BLAKE2B 00684cacf83c68f69685ee76d37f04f5fb627b42e8bdd9d09b22e7c65009d6a1cf0647e7b9d8d4c41735b3ea5a5edadf8affc1cccf5cbcd8812912ce9c70ac41 SHA512 7930ab8a012526a85ac04ecaa4d168a9ca907277eb51665cffd0de0ead1638c3dd2a08b895f2a8ed10a7cabaa9f70e816f6b840ce2d3388deb27bb8682e64c59
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libx86emu/files/libx86emu-1.1-fix-makefile.patch b/dev-libs/libx86emu/files/libx86emu-1.1-fix-makefile.patch
new file mode 100644
index 000000000000..6e565340e67b
--- /dev/null
+++ b/dev-libs/libx86emu/files/libx86emu-1.1-fix-makefile.patch
@@ -0,0 +1,82 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,15 +1,4 @@
+-ARCH	:= $(shell uname -m)
+-ifneq ($(filter i386 i486 i586 i686, $(ARCH)),)
+-ARCH	:= i386
+-endif
+-
+-CC	= gcc
+-CFLAGS	= -g -O2 -fPIC -fomit-frame-pointer -Wall
+-ifneq ($(filter x86_64, $(ARCH)),)
+-LIBDIR	= /usr/lib64
+-else
+-LIBDIR	= /usr/lib
+-endif
++CFLAGS	+= -fPIC -Wall
+ LIBX86	= libx86emu
+ 
+ VERSION		:= $(shell cat VERSION)
+@@ -24,9 +13,6 @@
+ 
+ .PHONY: all shared install test clean
+ 
+-%.o: %.c
+-	$(CC) -c $(CFLAGS) $<
+-
+ all: shared
+ 
+ shared: $(LIB_NAME)
+@@ -38,13 +24,15 @@
+ 	install -m 644 -D include/x86emu.h $(DESTDIR)/usr/include/x86emu.h
+ 
+ $(LIB_NAME): .depend $(OBJS)
+-	$(CC) -shared -Wl,-soname,$(LIB_SONAME) $(OBJS) -o $(LIB_NAME)
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) $(OBJS) -o $(LIB_NAME)
++	ln -snf $(LIB_NAME) $(LIB_SONAME)
++	ln -snf $(LIB_SONAME) $(LIBX86).so
+ 
+-test:
+-	make -C test
++check:
++	$(MAKE) -C test
+ 
+ clean:
+-	make -C test clean
++	$(MAKE) -C test clean
+ 	rm -f *.o *~ include/*~ *.so.* .depend
+ 
+ ifneq "$(MAKECMDGOALS)" "clean"
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -1,9 +1,10 @@
+-CC         = gcc
+-CFLAGS     = -g -Wall -fomit-frame-pointer -O2
++CFLAGS	 += -fPIC -Wall
++CPPFLAGS += -I../include
+ TST_FILES  = $(wildcard *.tst)
+ INIT_FILES = $(addsuffix .init,$(basename $(wildcard *.tst)))
+ RES_FILES  = $(addsuffix .result,$(basename $(wildcard *.tst)))
+ TEST_OPTS  = --verbose --show code,regs,data,acc,io,ints,attr,time
++LDLIBS = -L.. -lx86emu
+ 
+ .PHONY: all test clean
+ .SECONDARY: $(INIT_FILES)
+@@ -12,13 +13,12 @@
+ 
+ all: x86test
+ 	@./prepare_test *.tst
+-	@./x86test $(TEST_OPTS) *.init
++	@LD_LIBRARY_PATH=.. ./x86test $(TEST_OPTS) *.init
+ 
+-x86test: x86test.c
+-	$(CC) $(CFLAGS) $< -lx86emu -o $@
++x86test: x86test.o
+ 
+-%.result: %.init
+-	@./x86test $(TEST_OPTS) $<
++%.result: %.init x86test
++	@LD_LIBRARY_PATH=.. ./x86test $(TEST_OPTS) $<
+ 
+ %.init: %.tst
+ 	@./prepare_test $<
diff --git a/dev-libs/libx86emu/files/libx86emu-1.1-gcc10-fno-common.patch b/dev-libs/libx86emu/files/libx86emu-1.1-gcc10-fno-common.patch
new file mode 100644
index 000000000000..8d69e874523d
--- /dev/null
+++ b/dev-libs/libx86emu/files/libx86emu-1.1-gcc10-fno-common.patch
@@ -0,0 +1,13 @@
+--- a/include/ops.h
++++ b/include/ops.h
+@@ -39,8 +39,8 @@
+ #ifndef __X86EMU_OPS_H
+ #define __X86EMU_OPS_H
+ 
+-void (*x86emu_optab[0x100])(u8 op1) L_SYM;
+-void (*x86emu_optab2[0x100])(u8 op2) L_SYM;
++extern void (*x86emu_optab[0x100])(u8 op1) L_SYM;
++extern void (*x86emu_optab2[0x100])(u8 op2) L_SYM;
+ 
+ void decode_cond(int type) L_SYM;
+ 
diff --git a/dev-libs/libx86emu/libx86emu-1.1.ebuild b/dev-libs/libx86emu/libx86emu-1.1.ebuild
index b8392b9291f2..21c131149a92 100644
--- a/dev-libs/libx86emu/libx86emu-1.1.ebuild
+++ b/dev-libs/libx86emu/libx86emu-1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit multilib rpm toolchain-funcs
+inherit rpm toolchain-funcs
 
 DESCRIPTION="A library for emulating x86"
 HOMEPAGE="https://www.opensuse.org/"
@@ -12,24 +12,14 @@ SRC_URI="https://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-9.8
 LICENSE="HPND"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-src_prepare() {
-	sed -i \
-		-e 's:$(CC) -shared:& $(LDFLAGS):' \
-		Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -fPIC -Wall"
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-fix-makefile.patch
+	"${FILESDIR}"/${PN}-1.1-gcc10-fno-common.patch
+)
 
-src_test() {
-	ln -sf libx86emu.so.1.1 libx86emu.so || die
-	ln -sf libx86emu.so.1.1 libx86emu.so.1 || die
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${LDFLAGS} -Wl,-rpath,${S} -fPIC -Wall -I../include/ -L../" test
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 59fa3431987e..ca84397488b0 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,6 +1,6 @@
 AUX libzip-1.5.2-mbedtls.patch 707 BLAKE2B 1905d00a6d8185cd5e6223b9ec6e82ffa5bc910522e38dd05546c995d90d5377cd0419666e4b724448cf6d38110faa640191d98b06bbe08610ae947340658f0a SHA512 e8af90b4559df0a6b2c8d0d1b7797833d0f59c4827082cd5dd8459d57ac1557249030510dcdad5f31a84a99cd79e30bb7b9293b1f19303be750faa40be2892cc
 DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643
-DIST libzip-1.6.0.tar.xz 732812 BLAKE2B 9023994e3f0a6e893ab42e2f2951b4b32ee8c1f6ea265a9481e32293c0ea229e364f00d9340cdc22404aa7ab7a294ff297ea9e821c2d1ad8486eb8b5301b637b SHA512 a173bebc0a199d65d9e2d5e5adf65eb10e9d3a1c409006b3f78e3453aa6166d825fea20e818e725f5d3c6b63137023a2cccb7fb2a1da50a88c4f5f057cf879f8
+DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574
 EBUILD libzip-1.5.2-r2.ebuild 2280 BLAKE2B f102a555784cab5a21fa0e49d5d2d965b1af8739551a02ce7a8c901ca6ad9dc5d40430fe263f561482d3f528d7ea94d52a3d23e3e346523b0842c20c38299b6d SHA512 f6d34b19bc4ae80a8b57dc7ee5f23f86b659dccfb8a1c0891fd8d94e88d99466759b2d62b416d79cca10fc572a478900d3ce98e185f95c20ba6c6e7d6bb5a817
-EBUILD libzip-1.6.0.ebuild 2269 BLAKE2B 69fea9eddb814fe679679ab4ca3aca249c61a883a72c9a61d5586d55ec4ad956271cc8cca3fb090c9c3f00833aa2029bdb20e68af6689f6f06789c2370dd133d SHA512 338e80c3e39f1cb15f93c770271d27eb5bb6aebe3a394cf9290097b68c10030b28d4a53431e5b144dac1683d5f40adf55e71a5d3cb1fc993b906101f924c3d03
+EBUILD libzip-1.6.1.ebuild 2274 BLAKE2B 16dfa0ed548741d805440cef657b7d07eaf8d0eb8f74796a7a83592214a9c3c1fe6e332a3fcae91da3f83bb432b8055e6ef1d6a9472752fc8390cdfe2beff0dd SHA512 2941d0fbb7cfc15493fdec538c846e696d1d55e92d6d24e2483dcda6adf86aff0b8d9d62c3e57e75fdef2064554ff8f279453aa2179809c27563d389d01ea6a6
 MISC metadata.xml 411 BLAKE2B 9b9ed5a214bd0ada5651c71831f103af8729535fb0ddc43cbab1ccb14cbfcd4103052b2549b739ded6caca6dc9f65bac346a00ed55806e37c77de367980b1bef SHA512 16b33f8e04a089007c9744141f12d04df43f1a733aed098fc6759d68616849b884180cdbafaf6694c8553de86dddb95864beeb76447f3dc241b83846ef651e3d
diff --git a/dev-libs/libzip/libzip-1.6.0.ebuild b/dev-libs/libzip/libzip-1.6.1.ebuild
index 71e055e5470a..0e5d64337ebf 100644
--- a/dev-libs/libzip/libzip-1.6.0.ebuild
+++ b/dev-libs/libzip/libzip-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index f0804870a160..3c2e91bafaf2 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -1,5 +1,5 @@
 AUX marisa-0.2.5-cpu_features_check.patch 4645 BLAKE2B 3ccd0b23d881d56d2341e1ed87f39acb0324440fd019b94fb7b846cedad756a9bd5c76fcbafac08ea7be294fb58334dfeda02d26ba575beb18df410dc921ca5d SHA512 5098491cddcd53451264d127373b29bed7e2260887494b1f562b94f1ab5d71962ee9fdc5d811d9ea0062c11c14d5cd4a81428da9f04d92ef2efe3a3810e844b2
 DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547
-EBUILD marisa-0.2.5.ebuild 2229 BLAKE2B 892624c70436db9f826a843def566b081a5062ceee70f59d59fd5f2c63944c1fe05d8cef3c0da48cbd259f6c42e07815042d06eace22cd81820a8ec192887db6 SHA512 07e5e79b72d0d8b0a6b77c39741fcfb58dc9b03b5bf6493005a060ff0e28e26f4ecfdf3e490fdfd0d67dbed90fa86d5afdf4f70bafb3bf13970b19221875c337
+EBUILD marisa-0.2.5.ebuild 2228 BLAKE2B 9016cc0ae3419ac26b864ad5dd07edfc0d13a2bbb34ba1c6c76b6ba1c40a4616a6c4f417252390c515253f62059677223f26187be02a0f12b9e429b5133ba20a SHA512 8db639b8a07201e062395540eb84dd108865a4ee18e090b06dea15ab93468758a3aa354f20d3b14800393ef7542e55babcfff18079e97c02092ae0b58f4ba548
 EBUILD marisa-9999.ebuild 2139 BLAKE2B 08fe3511b7340f07991121f9d84e36bd69a0c6a479ecfdd5f4c044174b501fbe1ff6f44226c33aa7ac20fb2b554be3e038a3d2893476e81cb810cec7f61e2c7d SHA512 3306d92fb8d241f09ad57fd1a8f7004ea85be1481d3f808f07821ce295c42566fceb732e358bc49797617767bf06238fc349f48aa0fb0be3f6ce0570b85d3285
 MISC metadata.xml 317 BLAKE2B 16fd28ba01ffdf67af29ea7f6b41be190ecff6ab88706b0cb04b6e9dee5a623087652e666af02cff1c3ed3bd4b42f252adf5fce1b08c2eb9a998e8c112dba922 SHA512 0e782fba322f87cfc0f180f812d0e33630c4295df1f434d497aba1a7f9d922e9674a3c23a821211cbe11d419eee70c25dbabb7508abc7bd56267e9648a1e721c
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index 3379c58070f1..4289f375ea65 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2019 Gentoo Authors
+# Copyright 2014-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="|| ( BSD-2 LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ppc ppc64 sparc x86"
 IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 87457b4c532c..783aa6d48165 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -7,6 +7,7 @@ DIST nss-3.48.tar.gz 76481237 BLAKE2B aded12d9f917d87e6fe32bc6c57b19e478507919c7
 DIST nss-3.49.1.tar.gz 76489134 BLAKE2B 4b1ceb6e1a366f506d13ceaa88663fba400318bff872305993369c2caa1e1aef654fa02308957bc2a2774b7e0b4bafd097ad16831d38d7da53753991419839b7 SHA512 e463c9d71537ac30dbd2998cbdbc0cadc734768a6f3a316c57b6a6d01ad6d26ca732dff65e9c88555a834ae7d71fc857e4cbc1799438069f544a1e27f75985e8
 DIST nss-3.49.2.tar.gz 76489641 BLAKE2B 844a88984fde45142093ee6df2934d89cb4911d3e716019c0d1620254064af51b56249bc4348816e546c5dcab66d7fc9d4def32021661f4f3d868e09c342abec SHA512 fe0fe032db15853384a50b145dd6f3187a855109f0b81f1846312d33f8c628aededcbca4d199f974ae52530aec3f2312f80afbca3e5b97ed1ff96fcffafd2881
 DIST nss-3.49.tar.gz 76488781 BLAKE2B 12ce6477b95bc0b0623cfe297c771832818798e39d1ab5cbc7f30e21336644498f5201abeb2ea1cbfd7cf75d64e4423152b9fe4e5c6b1761c5c049ec3da0e9fc SHA512 7d8df73a2e585585a7cb3f887af3f933854984479531b3dd30316873bdd92c130e2fadb54e7b3b1f0b10675b1bce09112ef39860d74ef6f0df7b57bf430bd072
+DIST nss-3.50.tar.gz 78041630 BLAKE2B 4d21a1cac475936e153b22829f8b4b2f6f6a57c41e14d091b287aba633a8d4c80c045882ce6f1cb7a2f9ce760d616b13389f90e59f60250c41080ed1f5a4900a SHA512 d6bcaf8ad65b5a97c42cd6cbbc68add5c4b49db74b2debcedb2a007f72511ac0e9bd21fd2dec041bc1975cfc8af26a48450aa0d1b962f755931ab2ac45c795b1
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
 EBUILD nss-3.47.1-r1.ebuild 9422 BLAKE2B 890a152a86404e751dd3f7655d980f5071ba98b2afe7491dda5ca353f32311cdaf830f8d7762df5054cdfde4e61cd2881142e1c52cd0c74e0cae53ab5d45c664 SHA512 eca35b5d30baa1ad7694ce7d1a57f9befe3e5e0ef4c72b43af49a2d7ad843d12f2d17395e02eeeff9254859a4867d7968bb1954474a62d37e71263420691d494
@@ -14,4 +15,5 @@ EBUILD nss-3.48-r1.ebuild 9432 BLAKE2B 1fce14bbf780d6c44a7cb2a0b6e9a144096a76f41
 EBUILD nss-3.49.1.ebuild 9432 BLAKE2B e6959a9647c675b695b8266af822821ff79e37f5fc9a6881cf00ed6b0d1298a8a13c12f5cacc12507a6012d9dcea71cf846c2640bcb136326551379af3475314 SHA512 e7d6dd9c4924e12119f9097fa87f8488aeea25fb4060a87530452a8079efd93d6460534f224d3eb86515f425231ad046edec98612265115a32e0cd26e3855bc6
 EBUILD nss-3.49.2.ebuild 9432 BLAKE2B e6959a9647c675b695b8266af822821ff79e37f5fc9a6881cf00ed6b0d1298a8a13c12f5cacc12507a6012d9dcea71cf846c2640bcb136326551379af3475314 SHA512 e7d6dd9c4924e12119f9097fa87f8488aeea25fb4060a87530452a8079efd93d6460534f224d3eb86515f425231ad046edec98612265115a32e0cd26e3855bc6
 EBUILD nss-3.49.ebuild 9432 BLAKE2B e6959a9647c675b695b8266af822821ff79e37f5fc9a6881cf00ed6b0d1298a8a13c12f5cacc12507a6012d9dcea71cf846c2640bcb136326551379af3475314 SHA512 e7d6dd9c4924e12119f9097fa87f8488aeea25fb4060a87530452a8079efd93d6460534f224d3eb86515f425231ad046edec98612265115a32e0cd26e3855bc6
+EBUILD nss-3.50.ebuild 9432 BLAKE2B 32161e5154134ef351722519915e76cd0bab88f028a9ee929d8f9c0c760732149ead0d0858b33864ee33ff89c7972d68f7aa67b0d2eba4f80b1b918db663c26d SHA512 283de19e80817b39ea66bfd2b66fb2e83b1f428aa9b44e8a421570dcbdfc2847d29a5ad1458584e076fc1051ceac83a76f38e8473cc0a41ee633143e1b1ef152
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/nss-3.50.ebuild b/dev-libs/nss/nss-3.50.ebuild
new file mode 100644
index 000000000000..c3b9fde93445
--- /dev/null
+++ b/dev-libs/nss/nss-3.50.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.25"
+RTM_NAME="NSS_${PV//./_}_RTM"
+# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
+PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
+PEM_P="${PN}-pem-20160329"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
+	nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cacert +nss-pem utils"
+BDEPEND="
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.47-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_unpack() {
+	unpack ${A}
+	if use nss-pem ; then
+		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
+	fi
+}
+
+src_prepare() {
+	if use nss-pem ; then
+		PATCHES+=(
+			"${FILESDIR}/${PN}-3.47-enable-pem.patch"
+		)
+	fi
+	if use cacert ; then #521462
+		PATCHES+=(
+			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
+		)
+	fi
+
+	default
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		aarch64*)echo "aarch64";;
+		hppa*)   echo "parisc";;
+		i?86*)   echo "i686";;
+		x86_64*) echo "x86_64";;
+		*)       tc-arch ${t};;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	# Do not let `uname` be used.
+	if use kernel_linux ; then
+		makeargs+=(
+			OS_TARGET=Linux
+			OS_RELEASE=2.6
+			OS_TEST="$(nssarch)"
+		)
+	fi
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export NSS_ENABLE_ECC=1
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export ASFLAGS=""
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits:-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d}
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index 75578f5acd6c..4e0885327799 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -4,6 +4,8 @@ AUX pigpiod.initd 215 BLAKE2B d7797cc0d1d388fd21831e33cbadd031e2cb974e26367596dd
 AUX pigpiod.systemd 121 BLAKE2B acb298046861f0dc0ee65505e2fa4c62cdfee3e628044d07881891f630e70507d27f253e1735457d56b6f7d9e8602c5a1597765c808f8cacaff96ce0efb52df9 SHA512 bb67874841fc629f5987dc41115ac6cfdd477264d5022bac06bcb3762394818a27f4f6357d537408c2cbcb81959e60ab894fd7e5c45f9a138a45f6da7208ef61
 DIST pigpio-72.tar.gz 384220 BLAKE2B ff3466df80adb6ee9bb2f6bc8aa9589bb6789746eedfab410d2a23dcd4986c29297f71469c8330c55603d8aabba7a4b2171390a63c21a12464b45cc4e24645d8 SHA512 c090962cb11204774e4a97a3dec37146882d66abef4d3e4de62e116b64650d6c66f95646f6350e3a45d8b2ba261a8d16c74f7648869cd0e94f42a80d88bb6d6e
 DIST pigpio-73.tar.gz 385233 BLAKE2B 5b58b399ffccab456d64decea4190e326c70cfe36b5513d0c69aa68c5ebfe2667ec5b4a028d19ec987d948c7b94dd23d67903bbae901d61f751dd606540324ea SHA512 bc6d2bbc2f2067c851a74a6137913b9abf2a7424bc2f78cf4086a1210f5c1116f71dcfa94a1268c137f4181e2db39af0bd2025caa1a7f98374b2043a166af746
+DIST pigpio-74.tar.gz 385851 BLAKE2B 7487808407972815a5c2123c8cf97f12aa241f4f7c8bc1610d8a31e11d5946aba52a9c452c6c552c27599a4f9f57ec1e03a17a6a5a4157bec7d3d302e9abf680 SHA512 8bd2c3a1c9b8e3287120f6c45d281e2e93020fe50080b3ba8d454a255a5b378b4d08f372bcc3ce407bf0579103916ff20b7741e1ed6c05e09b08a948827a7a60
 EBUILD pigpio-72.ebuild 1097 BLAKE2B 5c6270ccecbe72419ea7a457f01a2cff597eca6e5e49955b1edd69eb0a2381a35c4b861c8e83c978d1dcc6bba8e014d77ef392424a5cf90f05a74b1e7d0bfcca SHA512 9fccd5891ad79f89fb8f25267e9c43439adf67f7343ffbd0aa799c85efc89fbb3cda639bf1e5fbe9f616e72a668f68e478efd8c9af6e254af14ab86a6ab41583
 EBUILD pigpio-73.ebuild 1093 BLAKE2B 37fa60cb0c9194f07feafaa953d3d21629ed48c91fe5fce67e447f5ee6e12eef3c7d1d9ecefb648aece77081ed40a567c542eef584abc2872c350811a4143d72 SHA512 4ecf45c2d6a9f798b23ea7c24cd07e011028b1c3c090e49bd0ab0fe82257423ba478492d458c580e8571e3d01fa379979e5d5fee40b3ab87d43e7dca75ca10ed
+EBUILD pigpio-74.ebuild 1099 BLAKE2B e16aa6e02499ac1cb9207f4dd0bdf42fa58af0a60f8c03ef38dece5dc4bdf84317afb8468c4b524d55ebbc6089d2362b3ee79b9584804a900b9476c19c0efefb SHA512 828bb572843c59322a062cb4c1e470b4ba6b89c4cc6a449438a582cd645fea66448ab1d554c1c36197914eb238d3823fe03574dfa832e06732de5ab09c49fd9e
 MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
diff --git a/dev-libs/pigpio/pigpio-74.ebuild b/dev-libs/pigpio/pigpio-74.ebuild
new file mode 100644
index 000000000000..738bf586aaa1
--- /dev/null
+++ b/dev-libs/pigpio/pigpio-74.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 systemd toolchain-funcs
+
+DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
+HOMEPAGE="http://abyz.me.uk/rpi/pigpio/index.html https://github.com/joan2937/pigpio"
+SRC_URI="https://github.com/joan2937/pigpio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~arm"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=( "${FILESDIR}/${PN}-70-makefile.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
+		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
+		mandir="${EPREFIX}/usr/share/man" install
+	einstalldocs
+	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
+	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
+	systemd_newunit "${S}"/util/pigpiod.service pigpiod.service
+	use python && distutils-r1_src_install
+}
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 016a3a1ddc81..2015846b7878 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -3,5 +3,5 @@ AUX protobuf-c-1.3.1-protobuf-3.7.patch 562 BLAKE2B 4319e91d94a0f3f47bba3dfca74e
 DIST protobuf-c-1.3.1.tar.gz 498779 BLAKE2B f9ecb2cccd8e01a2ab5bd797883f245db418a76ac73ba3e756e997e944637732d45b3fca2a45d3caf4cd89f35259180fa05e64b8b02b63537005420f2233ba37 SHA512 b32920130b4be5e8a8373c2ca37ffe7eb263accf163d93e25a9eb4b6336ec40b05dda2458fe8f0c3cbcf6e0e08e9541fdff004d696f30a5d135b7a3bdca8b2c3
 DIST protobuf-c-1.3.2.tar.gz 500100 BLAKE2B b8bcd4ad6f9ddc05f28526f7cc58778b21a34fc18c7c7aa2a5bb45ae7fdc7c5d8957f989fe1bbfe353214ca87b02afed8cf0ad43c0f0e39f7e13059a5dfd6b7d SHA512 d94d2c6f11b3e482fd3d1b8cef5b2d896ad37a679068f393d29916311deadc5b6b86f946b046d7ee49260b0223e3128e052dc76324b4a8cd6ea184d566ad9aa6
 EBUILD protobuf-c-1.3.1.ebuild 1045 BLAKE2B 9ad619c70aade683ec26c85427302087f8c607a601dc9a98691936e3b7c59f6249c69b67b2f4cdf1b03a17cc7f0f6ce5b7040f1d89aff893d571f5efe3a005bc SHA512 ad8bf49f7dd92516c97665ba60b95341bc9f03760f8f4fbf15427feac9f0f2f71aced5a776ed314e6c4fa5fb035afac76be7b0e9882d201bf6c93299ffc959bb
-EBUILD protobuf-c-1.3.2.ebuild 989 BLAKE2B 9a1ac99450d314014beb8d416535ee4c7c05e10b590a24b01d22e70172ed0ce23f2516b32f7c964e2f956ca09775640e3ab0755120f5f02a2d588bd99b130dc6 SHA512 68a35e10250bd76ac1525d8c0f8b06aa9b13a4f18987f5063151fcdedb26edd1c3183bf6d1b00bd527334b793ae253dddd3c391c8c9fa5d430c47fb109823fd2
+EBUILD protobuf-c-1.3.2.ebuild 988 BLAKE2B 1b14a19bf7256b370c2b8c0934f2ff590be13684d284f21221d0559253b15fbdb71764b5776a290004c358d63895b61f82816703b15de285e04c1916b6845b68 SHA512 3e36427bdb7cb5acbf8f61c817053cdad85c97b2ff076fd62f23fe8188f6049b86e8390e6080839e256c95ee082ff97309fb9f56878288073c5405bec840b1d1
 MISC metadata.xml 258 BLAKE2B 4600b6e0e51f9c280726dd71ec122d3c51e0c2b1f8b4ef208a1c9838a01d405bedce2cfd6949bb2dbcc448f76f45c717a630eed98fb9d0ad06c91dafdc2ad288 SHA512 92e3b05f2cf1d2ff09b852d2ad8707f55b4cd3fc78df317fa5234a9c0018405cfad67d90211435963983440228dfb75de28ab7ee62f1a80bb97192768d93ce92
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
index 41fe7fd76f2a..baa5c3a190dc 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 4a50bbfe326b..e2671ea8db07 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -14,5 +14,5 @@ EBUILD re2-0.2018.04.01.ebuild 1306 BLAKE2B dcfd4db7dfd17f0ffbab32c96f605ff81593
 EBUILD re2-0.2018.10.01.ebuild 1345 BLAKE2B efa3dbca54f7d8916ef63e41091daecd85d829a0641877fb82e0ad9251d179a247c5fc69127945a7aad4537d83da7cb93abc1576e223f1bb83527187cffa2795 SHA512 d3c6e9cff14639ab4e8ac01e90e896cdc671898f718444009e32750fb392b35836e87e3a2394b55313d58b652cd6b1822a49211dd3159f7fc867c3dcce6815a1
 EBUILD re2-0.2019.08.01.ebuild 1349 BLAKE2B f661f3d4e88cc5c99cf82d8b802343e4a74fa977b3aabf032212dc968cd9d1b7619b8214fce8394a1469d64fe58bf487babe0a2bafdf9fca5a81500fa5dd8e1f SHA512 6d1e8d8a9241017af2e080b5dad79fa1d710f0f07e48e39d48186cf78af4ec1e0c08eaf246f45474494d881018f7596c29b51e296ea8319665c9d4973f64f1dc
 EBUILD re2-0.2019.09.01.ebuild 1349 BLAKE2B f661f3d4e88cc5c99cf82d8b802343e4a74fa977b3aabf032212dc968cd9d1b7619b8214fce8394a1469d64fe58bf487babe0a2bafdf9fca5a81500fa5dd8e1f SHA512 6d1e8d8a9241017af2e080b5dad79fa1d710f0f07e48e39d48186cf78af4ec1e0c08eaf246f45474494d881018f7596c29b51e296ea8319665c9d4973f64f1dc
-EBUILD re2-0.2019.12.01.ebuild 1349 BLAKE2B f661f3d4e88cc5c99cf82d8b802343e4a74fa977b3aabf032212dc968cd9d1b7619b8214fce8394a1469d64fe58bf487babe0a2bafdf9fca5a81500fa5dd8e1f SHA512 6d1e8d8a9241017af2e080b5dad79fa1d710f0f07e48e39d48186cf78af4ec1e0c08eaf246f45474494d881018f7596c29b51e296ea8319665c9d4973f64f1dc
+EBUILD re2-0.2019.12.01.ebuild 1346 BLAKE2B 4f33270da11833d2a60e0bc24989ee71c1778b32944967364fac738dbb4008b5d13c1db01225d048f057a4ab6be99cdfd1a8cfc59abc7ad758ec5c784562a77d SHA512 0c250c68ea4381bd6f82a562c694aa23c91665a3e161419ce313fa220f294e4df71d974a289f1e6120826bb6c8cf266f19095d9cd59e21b17bf9c2b1ef1a1999
 MISC metadata.xml 471 BLAKE2B d5263d5aa06995cb4abacde849d1f7d970a7c365654fc25c4e4fd9c423f9a99f21e86f60abd8bb50bcba08aed799f510353e6baf23b42299c294b77f95d657fd SHA512 7534d637458ea189e20f259c9f039629f9b5fc738750d8d6e1050163aa147ec447d38ed93df98cedc71510be3fc5949c9084f63da86c12bdfd0c109122a001a8
diff --git a/dev-libs/re2/re2-0.2019.12.01.ebuild b/dev-libs/re2/re2-0.2019.12.01.ebuild
index 697b91bfc42a..e160a28429ed 100644
--- a/dev-libs/re2/re2-0.2019.12.01.ebuild
+++ b/dev-libs/re2/re2-0.2019.12.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="gentoo-2019-01-01"
 SLOT="0/${SONAME}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="icu"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 53ff88f5f11f..f9a0cff9096d 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,5 +1,5 @@
 DIST serd-0.28.0.tar.bz2 371592 BLAKE2B 143e858b5947cd52d01341ec7ff5fb36f98aefceda4e748b2a999c2e6d2c972b2f5d30053d8538f04f236597da93a595d0fabbfa4c667397e27d4c897458d1ee SHA512 b25cc70af17ff821812ab2a70c2812c1713ff811a0f18fb5d5c54f3b67e0c68293aabedfacd687afe6b7acdfd81602ef81764d7e11bc0d933de738bc6d4fce3e
 DIST serd-0.30.2.tar.bz2 590337 BLAKE2B 7b47f4f9940d9d2d37772c034c3f15801fff2bc8a058d30b40891ae900bdee3a631803e25505230a853e4beb083be4c854c627074eb89c0b23781da42fbde2d5 SHA512 b1e18ac883aac2a8146ee0e1de553ac2b512deba5307e5c9fa2733d9011ed0777d67790aa6527e73b3f11c9da0d8c9a98227457bb412897296f4464228cac0f7
-EBUILD serd-0.28.0-r1.ebuild 1147 BLAKE2B 8482d16dc393f5b38e612622d0e77c3d27597d19d4c0a28625a4af23a99d0ed754f7b1de2438733ad2f97662104c3f611faca35e14dff1e5a00d2d188ec1185c SHA512 9f442c744d41f252ed67c8d606d13774ecad6f6492ed0ff0b6ea21cf01e91aacdafd71b8fdcb8ffd70be99ab6fbb759db2b11867b20d710bbde449ed83bcf08f
+EBUILD serd-0.28.0-r1.ebuild 1141 BLAKE2B d01a86c5664a3c9a4387effa85ac48be466b50a3598118d04504f0a0c09c3cab4d8db444b3c56244e0f6d22b61594631de4fabef45d8c70bb16ab7dbb870de64 SHA512 5c6a6d56ca08e5739584df2a6e9d923c90ac80f16bbb93deaf9890fa8e0bdaea794307e41f06faa39ba9cbf1fb726086553d7875ec25ad2c5e1422902283bb1e
 EBUILD serd-0.30.2.ebuild 1149 BLAKE2B 083af72a17803897ab655fc4b42d6601ccde1d3383c1540d0dbe30dbb1898f7090c34f34684ea0bea5d06771dda1394a0b054e19390f7b5c8b72df6363082cb2 SHA512 d3bec2207e55c829e0172c7dfd9143e9b789986f88ab94ac23623f3727183c36eb5d73b878ece936af4af66628c404b6f92a568a20f4397d0441de7b4939ada8
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.28.0-r1.ebuild b/dev-libs/serd/serd-0.28.0-r1.ebuild
index 2674299b05c9..6c70a4cc334d 100644
--- a/dev-libs/serd/serd-0.28.0-r1.ebuild
+++ b/dev-libs/serd/serd-0.28.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 2add49422dcd..18787775c941 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,5 +1,5 @@
 DIST sord-0.16.0.tar.bz2 316331 BLAKE2B 27702600e48e14c75be18cc2b83705cdea1eed7158223ee685821ae80b18b61f5db82f804ee6a32236143cf8287ee875c3b3354edc6ccd1d4f25eaa3a04c785b SHA512 e18c6de62f2cbffedd4c200f6452f4fd37f719aed764ccc1b77c8da04a0f3394d47e8b57e19eefd6d600770926f505fdfa5da91564bbff5f4ead49f1adaba249
 DIST sord-0.16.4.tar.bz2 510920 BLAKE2B e52b659e8070dc63188225741d1bfa31480214e47b53b4834dd0bccc5dcd688b93fc65c894b25540d89dbb20b04d8fd1952dcc65999c2ae7b650065c80b387dc SHA512 98bb102cff5ab38d999c2f966597508076ccce54583a739810b0c28b4f3d570b2ef414605fc08361ecb11ac3184d3176f2f50c7c59c06cc50c3d522e26ed5576
-EBUILD sord-0.16.0-r1.ebuild 1149 BLAKE2B a441f86affefe2eb7402f28e8f63b4c01f2f002db6fcc81aaea7bf0e4dc89ab868d2829107f063dcd0ca846694f9e27891687f023e39e50b799aad2d5dab2a7b SHA512 1c2a3988d047b2e2e8ffab2b7fa5cf28a55963c16a74dbd222b178dc178a9a9e99132409221143b17aa5e29e6ea143a8c2fc3e7f8b815f5eeff9ca6bc1a94812
+EBUILD sord-0.16.0-r1.ebuild 1143 BLAKE2B 320eaaa4874a0308b9190a7402dd86d0429f11a72517a64e9a0d6fd138474047e1ac36f90d9c9d0034c34782a57d0f75adff8eff22fa8a5dc8e0cacd0f95a52b SHA512 e16fc70f671e9fe4bc0cb72e499916210b504cfb513afd2c76efa36ad3f5f3e596e7580a57460159f8a2bd09fc8e966bf78920aa7239fc6f38e2b68634ec4269
 EBUILD sord-0.16.4.ebuild 1172 BLAKE2B 4e93146d8552fa99ce7b6d2e388987175851ae16ac33cb555ccaa3b98c28e4fa1c31573e26c39c16fd75e93b8bb4e6f99c638fca52389e97922f3b22c804d5bb SHA512 fbf328befc121bba84c79b24fbe7f83bcb38608e190cca0150bbf8978578309c6f32e33869a792887c3cf55fd812216465031cc8766e4dd4f78c44629a25c6ac
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.0-r1.ebuild b/dev-libs/sord/sord-0.16.0-r1.ebuild
index 09d51dc13f1c..b66124773d89 100644
--- a/dev-libs/sord/sord-0.16.0-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index 948ce32cb82d..01434fe100d6 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -1,4 +1,4 @@
 DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bbd33ccbbaf07b57a28c4e485d596725297fc2de83c23fa3c66872519883727714d236f4a37e07ed4825fc9 SHA512 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5
-EBUILD utfcpp-3.1.ebuild 948 BLAKE2B 387a70b0dbdf706c8b41620ff54938d2b0f21ed45061173e29910ec352207d0b5c933ed99048a3fa04fff13fd615ef6abfdeaac104ec9596230d18b18a7650ba SHA512 a97cbda1e503c591504368101a3b150aed6d5b215fb2f115d45ba781c2fea849672876bf9369ba5d9c8ccad52f58d0283a870ae6e0df43ec1e2d7be8b87359ad
+EBUILD utfcpp-3.1.ebuild 947 BLAKE2B bbb927d26dc9cd404a3aaa41e3b6619f57b579b8845d7ddd75459d23596e5f4dc44634b7c0eef809aa2d38b9c62e5730ca04b4ddd7825f9fe32453836147139d SHA512 5f51e3bd6cebb0cf9846a59fe2ac348dd3f37815efb1901d3b2370685b7502b74f48ba1cfba3fd8472e51fba3fc1a0a1733cac038504c7c9daf1058d7e6a7203
 EBUILD utfcpp-9999.ebuild 916 BLAKE2B 8a7a1e05ae84fbb8d875e0b7fb0558cfc0c9835090b0253343648d6d9c1833724f99de9b64702d1976a89f93bfdb38f36cf7c41979e73cae9a39bdf66338f5d0 SHA512 e7d512b80328c68fd6037d08796ea88ffabaf903d18e33ebed26253f03c5cdd02c050450a38980e23d83356c3bb30f90ecdba1c8125fb86f877c846c4bb33b01
 MISC metadata.xml 494 BLAKE2B 9e52a09505cc2bdae2fd434169a21ca63d48d62dd917bf2fcf15a54378b1894191cacc0c676705c731cbc05720723604b18c1bc982da036168d6b9bc184d1b71 SHA512 af81373c64b07a3650d3a613d0b260a55740ce140546db9f7b839c5b5b7f7b02abd85307e033a980da8a1182fcbc5182c0415a3bb8a89d3fdfaaee8eeb648612
diff --git a/dev-libs/utfcpp/utfcpp-3.1.ebuild b/dev-libs/utfcpp/utfcpp-3.1.ebuild
index ef987e96e653..5afa6b050632 100644
--- a/dev-libs/utfcpp/utfcpp-3.1.ebuild
+++ b/dev-libs/utfcpp/utfcpp-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2015-2019 Gentoo Authors
+# Copyright 2015-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,7 +22,7 @@ fi
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 5c2a1e62ea51..d6256059a01f 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,9 +1,8 @@
 AUX zziplib-0.13.69-SDL-test.patch 453 BLAKE2B 645e55b034ec72abbab26fad4062cf9f7137aeeac2cc33aad89d9b86f4b616b5bdd256d383bfaa3252459caa2150f1b6426d3ca31ce8c055d0cae92d81547cd1 SHA512 2a524efc04721459cfb744ce7d0e3b6a4412e791250442632093116e181642184ba3cfa4a93fff8bdb792a03c293ab317696a78aed422ec75c26448552bc5721
-AUX zziplib-0.13.69-disable-docs.patch 1700 BLAKE2B f0e4ef353a9c0d86d8eb345bf03bd1f1008e81a019cc60ab480e66327fe0db06b6efb35c5ac556c1539426b56a88a9bc4ff8974f9600414d5d1fa7a4cdc577d6 SHA512 3c0b95209e215d955b1710d08dc4976caaedb512aec926b376adb7393c1cff4c269ee5741feddd8a1c4ca5e5ebfa987d40ffe5d966d799e659bc5606acd2b6dd
 DIST zziplib-0.13.69-html.tar.xz 152536 BLAKE2B 05f14b2e6d2e3af4488096eabc1614222cb9607e832618e7534cb55a022f2ba3d2c6f8c6337f4bf9e80a350e43eb05a4c1708b63efa5e0ed10297a5f19ec7adb SHA512 211a83594d4043a29472f9c556d72ad486e40f28d55426b970b8b0617aca76f9dcbd4a3ca5991df943dfac1a1cab623b19aa04fb6ef7807a7740730e01926205
 DIST zziplib-0.13.69-man.tar.xz 10988 BLAKE2B 2c3c5cfd17b3d3e17a3e72031b2246e32c9fe471b9578a4717c128725493054ceafc34763a763d31cf5532f082a596a6bceb8e417ef70476a59f4daa0a14b587 SHA512 5a804896a2d06b1d32d6b8715ffdb374ff7179145d033e919acecd46426dad3e44d4889adabce33e7f6bbc18e2b70b50a8a059498bf4f1f3d6844dda90c33c7e
 DIST zziplib-0.13.69-patches.tar.xz 5000 BLAKE2B 4612052bb8a312831daec9283cad8593b2161e2acd76122a982339154cd76d58b5398c61f605e3e29e0f63399c9a176710f95a1e6632ff4e1249ac596978006b SHA512 16190e20b8c722f3aee8e77ef7cc24026976b067402430c833d21761a13e32ed5f2eff543a2c13469e442d01c2ed5ae373badd6b8851c962852d6c09620a0d91
 DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
-EBUILD zziplib-0.13.69-r1.ebuild 2365 BLAKE2B 391f285ed2defd290ef3bb2a399d0ecadf353c4fc95e6eb9087c6c802b5b75a5cac17d588e2dc5f5734423019b4f51e78656534527e89a9e9394b0ed762f513b SHA512 b9d8552ff972a391050f2c6ec02be81010c2fa3773eaf255756af742344d7afc77a08c1cbd653b89f3e04c1ac63c063559e6b10fdce9196e70735dab89890f61
+EBUILD zziplib-0.13.69-r1.ebuild 2364 BLAKE2B 5735aa94ff5fd4c6d20ce8340a94f80351662d74a29456738193b719880eb0ae2a8f829eaa8ebcd37867fb6af1cb9fbd0a98f6a3278b80ff8f703a0e0be5d210 SHA512 860c611315be3fe8fb8e5d07c3e76889e45afa390b39fb16110d731ca695506ecea9d648f704c1a0eb88853425ee393cb08a2432d05d955b53cf0a6d73ceb7b1
 EBUILD zziplib-0.13.69.ebuild 2321 BLAKE2B 70b2339cb6a663bab224a73258c433fb2bff1f20d2bb380a5f34ca54d40b43bcaf1d479bb61cfd5f02527c332cebda6ccc1bd87a68aecc0d6fbb6d250879fbe3 SHA512 5fdecae3196a733820c06bf9107edf51825d0401e7b95521793d0000d50a3f3b099e56cd611b7f9ddb5d252b7c5a1c184a50b0443f069c85410c032a048426cd
 MISC metadata.xml 244 BLAKE2B fc7489e331f708001ddc94cbb6b4e2c22d80c32883cb48c8044da1c8326143eed049e7f867342bb5b389f9252949f89dcb3084369729d52e49a8924d842d4693 SHA512 73f6d031dd2239ef69ea83120b253dbd61d8db15603514a673da83c3cbe9f7f881613e5fa3387917428b994bab1bd466e49ebe2c7a68829f0f2551e0124620a0
diff --git a/dev-libs/zziplib/files/zziplib-0.13.69-disable-docs.patch b/dev-libs/zziplib/files/zziplib-0.13.69-disable-docs.patch
deleted file mode 100644
index 8b492d10f56e..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.69-disable-docs.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From b34cf087aaa0b02c4a9c9ab6959a3567ad31acea Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 17 Jan 2020 02:01:01 +0100
-Subject: [PATCH] Disable building docs (requires python2)
-
----
- Makefile.am | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index c54b2cc..560c9e6 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,8 +3,8 @@ ACLOCAL_AMFLAGS = -I m4
- WANT_AUTOMAKE = 1.7
- WANT_AUTOCONF = 2.57
- 
--DIST_SUBDIRS = zzip zzipwrap bins test docs  SDL
--SUBDIRS =      zzip zzipwrap bins test docs @SDL@
-+DIST_SUBDIRS = zzip zzipwrap bins test  SDL
-+SUBDIRS =      zzip zzipwrap bins test @SDL@
- 
- rpm: dist-bzip2 $(PACKAGE).spec
- 	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.bz2
-@@ -62,9 +62,9 @@ osc-distclean:
- indent-check:
- 	(cd zzip && $(MAKE) `basename $@`)
- 
--doc docs docu clean-doc clean-docs clean-docu   zzip.html zzip.xml zzip.pdf \
-+doc docu clean-doc clean-clean-docu   zzip.html zzip.xml zzip.pdf \
- man mans manpages htmpages unpack clean-unpack  changes.htm pdfs \
--omf install-omf install-doc install-docs install-man3 install-mans \
-+omf install-omf install-doc install-install-man3 install-mans \
- upload-sourceforge www:
- 	(cd docs && $(MAKE) `basename $@`)
- 
-@@ -104,7 +104,7 @@ msvc6/zziptest.dsp     msvc6/zzip.dsp
- EXTRA_DIST =   zziplib.spec zzipback.sed Makefile.mk \
-                $(MSVC8) $(MSVC7) $(MSVC6) $(am__aclocal_m4_deps)
- 
--PHONY = auto boottrap rpm doc docs man manpages htmpages sdl testsdl \
-+PHONY = auto boottrap rpm doc man manpages htmpages sdl testsdl \
- 	comp compats msvc6 msvc7
- # ------------------------------------------------------------------------
- 
--- 
-2.25.0
-
diff --git a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
index 9ea820e6eed9..9adb168f5ea5 100644
--- a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc sdl static-libs test"
 
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
commit	71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree	9f1f0dee23e13658e52f49437befe78427148c51 /dev-libs
parent	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)