gentoo resync : 30.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
commit: f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree: 8bfecb640b7b6403d7a3d662d923eed630033da7 /dev-libs
parent: 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
213 files changed, 2818 insertions, 2195 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index e6acc94a4cea..67dbd54b9145 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/OpenNI/Manifest b/dev-libs/OpenNI/Manifest
index 56dbcdbb4c8a..4de7c81deccf 100644
--- a/dev-libs/OpenNI/Manifest
+++ b/dev-libs/OpenNI/Manifest
@@ -1,8 +1,10 @@
 AUX OpenNI-1.5.7.10-gcc6.patch 5012 BLAKE2B e5cb8535a1df4a2f8f4c4d34955004ed6e2c3d32a8fb41ea452576715f146794697ecc8ae0377f68f551fd85f153ce10156d6dff42c0b290ef426c35da9ec53a SHA512 129eedc33941df3b3a126528f8d0503c2808930276aa0350c89af42b9b34642eafb8304610443699b839f0158c0412a38bf3a4722af7497534519ecf753e99ac
+AUX betterdefines.patch 670 BLAKE2B 616b3d78de981d735ba5ade80059c76046b811c8a493b4299ddeb9e289a80adb44e52dde34f8a1d430ffb80205f94c3e93d658b3b2399126b00f215ebf87ff1c SHA512 b647a813d41f30bdd3af6c0625e1a250b962df9115f47f9498cf996e8797f67c1982cca34d888154646aeba962c7ab981b914c232186d63765a432455c3e3cc2
 AUX jpeg.patch 704 BLAKE2B a3261b7834fec0134929782a8283840bf9a5c2483272f57598c93d635707a58c2ec14f57877032bab6bce2cc3c94a560fa99f29ab759fc51c406226535b987cc SHA512 4276584d5252fd2ce9f7fc7b4389d079276f3626fe140344bd7ba5083f7190455a82aee98742bbf3e8f527947c3128281f63e940c114e85f92be94f71819a117
 AUX soname.patch 670 BLAKE2B 2fa9843c9be26474a9ba7d5a45ce258ff97ac32ffd4e32c23d572de94f9b7b3722e8f6a61ec5f6ed7d96837eb7e423163536960f07a5b4ecb86c96835ef841b8 SHA512 422c90b220b9366320f2513798d00c2d8a17b0db0ccb87150038c2f237d22c7f0d28206e6d00a7c73b758b6b021886a666a8860586f27fe9b57ddb14094ba7f4
 AUX tinyxml.patch 828 BLAKE2B 33698417dada91b4dbefe81de4f41f0fb9990478a1b0db9e4cc6fea4bb6951c49f7bdf09830cce81c4faf87213318fd0137e8058a7f4dc83b5ed9d688ec2655e SHA512 97cdcbbcd1d4ab4990c7a96ce21c4da983347f73c8064959bbb66d49cc9cda5e293b0273f19d1595ef5b26a6c32267b54cdd45fd4a86b2d8881501a3cea5724a
 DIST OpenNI-1.5.7.10.tar.gz 23378582 BLAKE2B c3532e3fb03bce9a30c94dc950591064d7b62d9eec8d5321c4dc65433be47652f9323a12401b8cbe4d3b81516120712720c1497ab51f220889b26fb33a4fcbc8 SHA512 f7b6106198c4314584cf327744e9d8b193ff9f2e8d416769aafb2aeeda0593ccbb37c3187ed75f1960d2ae8e80e8f30e0fced9ff82e20fe6f24c54246f77d512
+EBUILD OpenNI-1.5.7.10-r1.ebuild 2511 BLAKE2B 5daab8302831e9b5d8ea458e0e8b7549be14b5f35a1160e7d855b2b51d2dfd1a2e513d7e58b25f8c34f62fa34c61bf87c5d8676df5d9260f546e0373e3b096a2 SHA512 f1e1f672e815617d7d17421a98de866ab2796b2149d739cce8e948b5ccfd7a0f2b8ba2ad2ad05771aed004bc476907a7321d0eea021fed5bcfdab74d6e26decb
 EBUILD OpenNI-1.5.7.10.ebuild 2473 BLAKE2B e3a90c1a8a86b3c41272ba282b9522bc366d33533bafd1a3d4264662afaf84a1fd12f0f2665e89a306fa2d9a61bc0e08ea271c7513f0f3465f7bccf6e2ad8bff SHA512 c64a68f6495f0cfef657c6ec24104ec9af66b6d3ab5624c74b72faa3681c6b3a6d68775b6cd3e8d46f1610b081f26d9ef3cf7e027182f6d5940a7b212ff7ad8c
 EBUILD OpenNI-9999.ebuild 2483 BLAKE2B 362b271856cc9c01c4f4e4459404581b6611496de0c449fc5a8f4ef309a5230aea4695468692867d30e3dbbf9f205a8e09f4eacbdd9c439abd8a538022da45d3 SHA512 84ee0a656058d83265ab8ea7ce5774242571d6b31cd3df46788c81aaf7b34e2608d946ae2d638e965ebb9085dbd658fd8963ba581a90b035d8ae159cfb826a83
 MISC metadata.xml 337 BLAKE2B cd1617fea5ee8e8c5a39708ca2fe56342ac9bc77d7bd6a82ee1c2a3a81b16d5af8e4e90d916164fc9e998d523cfac65bdf5ea03e80e6e3f64c00a35bee310186 SHA512 31029665f81cf415898ab97a48804b3ddd5efae31f7800348a7b96dfd3a7faf1d4ae3275f039a8397040c6a3c83868252671ce1dcd35b6f1135d221b325ba5b8
diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild
new file mode 100644
index 000000000000..674ccb33fff4
--- /dev/null
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/OpenNI/OpenNI"
+fi
+
+inherit ${SCM} toolchain-funcs eutils multilib java-pkg-opt-2
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/OpenNI/OpenNI/archive/Stable-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-Stable-${PV}"
+fi
+
+DESCRIPTION="OpenNI SDK"
+HOMEPAGE="https://github.com/OpenNI/OpenNI"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc java opengl"
+
+RDEPEND="
+	virtual/libusb:1
+	virtual/libudev
+	virtual/jpeg:0
+	dev-libs/tinyxml
+	opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] )
+	java? ( >=virtual/jre-1.5 )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	java? ( >=virtual/jdk-1.5 )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/tinyxml.patch" \
+		"${FILESDIR}/jpeg.patch" \
+		"${FILESDIR}/soname.patch" \
+		"${FILESDIR}/${P}-gcc6.patch" \
+		"${FILESDIR}/betterdefines.patch"
+
+	rm -rf External/{LibJPEG,TinyXml}
+	for i in Platform/Linux/Build/Common/Platform.* Externals/PSCommon/Linux/Build/Platform.* ; do
+		echo "" > ${i}
+	done
+
+	find . -type f -print0 | xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" || die
+}
+
+src_compile() {
+	emake -C "${S}/Platform/Linux/Build" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		GLUT_SUPPORTED="$(usex opengl 1 0)" \
+		$(usex java "" ALL_JAVA_PROJS="") \
+		$(usex java "" JAVA_SAMPLES="") \
+		ALL_MONO_PROJS="" \
+		MONO_SAMPLES="" \
+		MONO_FORMS_SAMPLES=""
+
+	if use doc ; then
+		cd "${S}/Source/DoxyGen"
+		doxygen || die
+	fi
+}
+
+src_install() {
+	dolib.so "${S}/Platform/Linux/Bin/"*Release/*.so
+
+	insinto /usr/include/openni
+	doins -r Include/*
+
+	dobin "${S}/Platform/Linux/Bin/"*Release/{ni*,Ni*,Sample-*}
+
+	if use java ; then
+		java-pkg_dojar "${S}/Platform/Linux/Bin/"*Release/*.jar
+		echo "java -jar ${JAVA_PKG_JARDEST}/org.openni.Samples.SimpleViewer.jar" > org.openni.Samples.SimpleViewer
+		dobin org.openni.Samples.SimpleViewer
+	fi
+
+	insinto /usr/share/${PN}
+	doins Data/*
+
+	dodoc Documentation/OpenNI_UserGuide.pdf CHANGES NOTICE README
+
+	if use doc ; then
+		dohtml -r "${S}/Source/DoxyGen/html/"*
+		dodoc Source/DoxyGen/Text/*.txt
+	fi
+
+	keepdir /var/lib/ni
+}
+
+pkg_postinst() {
+	if [ "${ROOT:-/}" = "/" ] ; then
+		for i in "${EROOR}/usr/$(get_libdir)"/libnim*.so ; do
+			einfo "Registering module ${i}"
+			niReg -r "${i}"
+		done
+	fi
+}
diff --git a/dev-libs/OpenNI/files/betterdefines.patch b/dev-libs/OpenNI/files/betterdefines.patch
new file mode 100644
index 000000000000..5fd2eaed5d7e
--- /dev/null
+++ b/dev-libs/OpenNI/files/betterdefines.patch
@@ -0,0 +1,16 @@
+Index: OpenNI-Stable-1.5.7.10/Include/XnPlatform.h
+===================================================================
+--- OpenNI-Stable-1.5.7.10.orig/Include/XnPlatform.h
++++ OpenNI-Stable-1.5.7.10/Include/XnPlatform.h
+@@ -61,9 +61,9 @@
+ 	#include "Win32/XnPlatformWin32.h"
+ #elif defined(ANDROID) && defined(__arm__)
+ 	#include "Android-Arm/XnPlatformAndroid-Arm.h"
+-#elif (linux && (i386 || __x86_64__))
++#elif (defined(__linux__) && (i386 || __x86_64__))
+ 	#include "Linux-x86/XnPlatformLinux-x86.h"
+-#elif (linux && __arm__)
++#elif (defined(__linux__) && __arm__)
+ 	#include "Linux-Arm/XnPlatformLinux-Arm.h"
+ #elif _ARC
+ 	#include "ARC/XnPlatformARC.h"
diff --git a/dev-libs/bglibs/Manifest b/dev-libs/bglibs/Manifest
index f2912055bbcd..147aa8cc03bb 100644
--- a/dev-libs/bglibs/Manifest
+++ b/dev-libs/bglibs/Manifest
@@ -1,5 +1,5 @@
 AUX bglibs-2.04-stack-buffers.patch 1676 BLAKE2B 356ef239c23178b5f07d80776279c0e91a35af07623c977d051217317496e796a337dd81df5bffa828296e78a007bdb043d73d195a3bfb74116b7751b1c2f42d SHA512 0000b26a5c781b3e68253b6aa8642f1b8d0fe99d4c6cef4a776a33b83272c1ea218ae91845ccd7ba291be6a17b719513317dba32fbeedcba42f469ea65b85b85
 DIST bglibs-2.04.tar.gz 713673 BLAKE2B 9e1353b3221ef6a8cfb256ec8616d1e208777b20ecade3e6ae17faca6b42222e18aa601a948e6201139378bf6f8131a2b7a053d77b198176776d42a1af611186 SHA512 094268cad7d4bacf65c0dd3d42fde2e6bac34da0fd6193b1c8202c018e752b3ef80a86c38e687467fb3a4e97130126fe74ee4a86063e4b25ee291de573984a6f
 EBUILD bglibs-2.04-r1.ebuild 1686 BLAKE2B e54a329c71f42760d20e7b1b0327b99030ef144472eeca6a167154bf8e9ac1e53f5601ef1499b5a91d85ecf68265a6462202ad1b5aae7ff6e28672caac0387e1 SHA512 466298718dfff3cb09a1bd18100ebe97eb4db210988e798c126dac0c2f3107fcdc8ba1c47c80957bd2f4d3dbdcb35f124a371d43e1385d457bd8785200162916
-EBUILD bglibs-2.04-r2.ebuild 1747 BLAKE2B 15669efef55687f638022fc9dbaf1b1939644a5870e2215c3b93e8ff25a596b9b0f257db0d41c4894575dd353c3ca04271f89a402ca1865b608180882333a98e SHA512 bc9f3fd975e25031ed01e7a9185f952c7ba9329740dda40485ed330c1023e6e2f349ee4d2cdf9220d9164cef32bb5d8a1ca08f9894063930922781204f3d5413
+EBUILD bglibs-2.04-r2.ebuild 1802 BLAKE2B 97ca0f1bc6f622fe26f9f15ac46af422ee5130466d0db6a867a5a58dd4f101ab2464f86591a5c3ad40769007dedea63a96a099e5afeb49bac6e660f3f2413859 SHA512 ee4d7a9b135e22acea601a28b8722673e4c82020fc1bf3a40d9a5480591545642bc7929f9f836d56762a0672076060b0c7de540721d090f568b378fafdb6b6d7
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/bglibs/bglibs-2.04-r2.ebuild b/dev-libs/bglibs/bglibs-2.04-r2.ebuild
index 9a31a9e7b6e5..2ec52132c373 100644
--- a/dev-libs/bglibs/bglibs-2.04-r2.ebuild
+++ b/dev-libs/bglibs/bglibs-2.04-r2.ebuild
@@ -45,7 +45,9 @@ src_configure() {
 }
 
 src_compile() {
-	default
+	# Parallel build fails, bug #343617
+	MAKEOPTS+=" -j1" default
+
 	if use doc; then
 		emake -C doc/latex pdf
 	fi
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 7e494187d757..af1a3d02b504 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,5 +1,6 @@
 AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432ee7af503dd2fc8a59185c5406b659629ee5a0c4f73c2c090dfccf64757baea196fcca4f60379a2b2f04baf81ee6 SHA512 bccb615e832ef31381afd0996a06cfb4c37f29bd8d7691435d592f2ec88f525f3e9e19adf84c78ebd6f24f60e407e29ef99bdff11103ef1344250fe5251fca0a
 AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642
+AUX botan-2.14.0-bindist-test-fix.patch 3167 BLAKE2B bb94b4081469c8cfcfff5a187151eacbb5dc1be0bf0ce87ee434da40cefb8e898bae478940c3410c873b1f58c75cf915d7ebe2b90a713a0428db8842fac1be33 SHA512 c60bbe81a007b8f8a5cb197542ae3a2fc1c94c76f10d1ff6ca18576fee84106aca29c158b1c9a967f047c3ca9b527255772bd66ad859f9d49c6e94c86b61b71c
 AUX botan-2.9.0-build.patch 1886 BLAKE2B 62f6b5f9c47ded4c460c6c6b3057cbbb95711b5b5db300523f45e25e6bc161277174ea4c461e872f24bfd23839510a7857c44733a333cb6054b7dc183faa3e2e SHA512 90948e75d5bb6f2620a92fe4aea37d05aaf25e98430b112651aa6ad635f19f8659658ae79d16e60e27ca61ec5da92d5dd1c234c4c9e2ae0fab44b92806bcafe0
 DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649
 DIST Botan-2.11.0.tar.xz 5765712 BLAKE2B 5602ef9485363b21f6f622f7370e486d834477730c2fc2f0bb9211db944d2b2a6a03d8ae14845cf871f648c76c77fd3e18804bd598f805a5754e3bfadb114d5d SHA512 a697a7f29788afc561cde35431e65e2f37e40fd45af89a6d060bf9988d28089905c6a1c005f9b23fb377547cd7a96a41f62c8d2f61a7f80d1ca1b9ccf857a2ce
@@ -7,6 +8,7 @@ DIST Botan-2.14.0.tar.xz 5958948 BLAKE2B 90e73945b22f6e4e8d6163bfb45eca153eb1495
 DIST Botan-2.9.0.tgz 7216373 BLAKE2B 5ad2e15db871ccc3a32b29b7f54a02d69f251f0aca2ce656b557dbbb3814a793053a54905371b3414ad72952a64bece43e2383da91f205f68b0fe31be2f9439c SHA512 b88f3894a4a5b7b2fbff9be6eb0b774bf679a014bd2364811b7e63d4f323e22ca9ef916491afbc2cdf9db68727c1449fbeb6fd417e591560add0955517db3f65
 EBUILD botan-1.10.17-r2.ebuild 4260 BLAKE2B a638b40227d5f8e4f4776407718ab20921930d1e0aebf73322097ea5e106c77c570f4b59890a044f965930cfc3c04900e359027793ea70835e98e6df1d5a0cc3 SHA512 8735649c85d603ceba417a7d2b5d61a3067c4e8493965d54d02c10fbf48e431846dcb3138a313fe00eea1a12fec7d84d8a43e7a7160b6ba54e9e7da1c940c093
 EBUILD botan-2.11.0.ebuild 2458 BLAKE2B 9b222461452f52d637669263c552779697b12b8e843490e8257061148864cdc820f94dd1e3fba4445ecaad8318597a7b792a3d8f45b9525478646779dfd7457d SHA512 af7f1e9d8f65ef7b0fd6b09d1b239a43456382929e490600fb77eb28d5412ab5fac82e92c433017bf666d3e7ad3e4ba68f9a832191bae5d3d2c32e3977d941e1
+EBUILD botan-2.14.0-r1.ebuild 2709 BLAKE2B 1b9d62c590914deb61320a16d953f9ea7ee489ca25b9206d8eec8e86f9299196c370da912a955b0b6b1599c6359f5b40004561cb1a4e2ed0e359be7f7af4a0bd SHA512 f27eb2aa547602352fdb53618c14b75884cc4499dbca233475ce9be0c404638f6fce4e601efd87a5cf74e4fc23676113d7de32619994e305003cc4cfb9954755
 EBUILD botan-2.14.0.ebuild 2459 BLAKE2B ec844c7d54d51204af44e4e55464a71b1c15670326a267d28a0c177314cf49eaab7ee43b7b64a4ef2af00d47f0809d3f1778f87c6a4d1a28a164fe9007320c2c SHA512 4e9df2af74bac749cf9a74a14286962e35a245912e248530221200fa5d07280ff45f71398863055373704eaabde6535dbcd8f61b343a8c522d7fa9856ece5054
 EBUILD botan-2.9.0.ebuild 2520 BLAKE2B 05a0f8bdd64a4f1c5cdfbcaf2c25e2c104f6e2f2e530836f1c1b3bca690ab10e68acf6a8dda28bb74ad48f571472cb406c7bb46eddd0f6471b26a7b9376b4cc3 SHA512 fe4b4d40ddf86130ccfd96601f885447805475a0e66f1f2cfc1398b454269567feaa83480935a52398e72a76aea2b8d7b5284caca8092e77d0500eccdab4ff7c
 MISC metadata.xml 492 BLAKE2B c8e3a6426a1aeaeb0695e8ea5217d6ff49210ea5d81d842daeaa433535f57a487d04b987d59a548ee44ab45b66c5da2f4d64e35a445848e476d415ffb0e88305 SHA512 80160b6d84260644b66622005766ac2725274109aca7d29814e5e544cbda51ba35ceb3162bed329aeeca2ebe9299af4c77fc3f32fef7b08bbc8e2889a4a6fb56
diff --git a/dev-libs/botan/botan-2.14.0-r1.ebuild b/dev-libs/botan/botan-2.14.0-r1.ebuild
new file mode 100644
index 000000000000..14416b0af355
--- /dev/null
+++ b/dev-libs/botan/botan-2.14.0-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+MY_P="Botan-${PV}"
+inherit python-r1 toolchain-funcs
+
+DESCRIPTION="C++ crypto library"
+HOMEPAGE="https://botan.randombit.net/"
+SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="2/$(ver_cut 1-2)" # soname version
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
+IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}
+	boost? ( >=dev-libs/boost-1.48:= )
+	bzip2? ( >=app-arch/bzip2-1.0.5:= )
+	lzma? ( app-arch/xz-utils:= )
+	sqlite? ( dev-db/sqlite:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.3:= )
+"
+BDEPEND="
+	dev-lang/python:*
+	doc? ( dev-python/sphinx )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-bindist-test-fix.patch"
+)
+
+src_configure() {
+	local disable_modules=()
+	use boost || disable_modules+=( "boost" )
+	use bindist && disable_modules+=( "ecdsa" )
+	elog "Disabling modules: ${disable_modules[@]}"
+
+	# Enable v9 instructions for sparc64
+	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
+		CHOSTARCH="sparc32-v9"
+	else
+		CHOSTARCH="${CHOST%%-*}"
+	fi
+
+	local myos=
+	case ${CHOST} in
+		*-darwin*) myos=darwin ;;
+		*) myos=linux  ;;
+	esac
+
+	case ${CHOST} in
+		hppa*) CHOSTARCH=parisc ;;
+	esac
+
+	local pythonvers=()
+	if use python; then
+		append() {
+			pythonvers+=( ${EPYTHON/python/} )
+		}
+		python_foreach_impl append
+	fi
+
+	# Don't install automatically, do it manually later in right place
+	# https://bugs.gentoo.org/723096
+	CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
+		$(use_enable static-libs static-library) \
+		$(use_with boost) \
+		$(use_with bzip2) \
+		$(use_with doc documentation) \
+		$(use_with doc sphinx) \
+		$(use_with lzma) \
+		$(use_with sqlite sqlite3) \
+		$(use_with ssl openssl) \
+		$(use_with zlib) \
+		$(usex hppa --without-stack-protector '') \
+		--cc=gcc \
+		--cpu=${CHOSTARCH} \
+		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
+		--docdir=share/doc \
+		--libdir=$(get_libdir) \
+		--os=${myos} \
+		--distribution-info="Gentoo ${PVR}" \
+		--prefix="${EPREFIX}/usr" \
+		--with-endian="$(tc-endian)" \
+		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
+		--without-doxygen \
+		--no-install-python-module \
+		|| die "configure.py failed"
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
+}
+
+src_install() {
+	default
+	use python && python_foreach_impl python_domodule src/python/botan2.py
+}
diff --git a/dev-libs/botan/files/botan-2.14.0-bindist-test-fix.patch b/dev-libs/botan/files/botan-2.14.0-bindist-test-fix.patch
new file mode 100644
index 000000000000..35b17976dbd5
--- /dev/null
+++ b/dev-libs/botan/files/botan-2.14.0-bindist-test-fix.patch
@@ -0,0 +1,91 @@
+https://github.com/randombit/botan/commit/df73ee690c5795be586cd4df3e33253113a0dcdf
+https://github.com/randombit/botan/commit/d9d6d7a593da135d2046aeb8a9e05e967d90f538
+
+diff --git a/src/tests/test_pkcs11_high_level.cpp b/src/tests/test_pkcs11_high_level.cpp
+index 47a5bf5e56..07dc86ef21 100644
+--- a/src/tests/test_pkcs11_high_level.cpp
++++ b/src/tests/test_pkcs11_high_level.cpp
+@@ -909,6 +909,15 @@ BOTAN_REGISTER_TEST("pkcs11-rsa", PKCS11_RSA_Tests);
+ 
+ /***************************** PKCS11 ECDSA *****************************/
+ 
++#if defined(BOTAN_HAS_ECC_GROUP)
++std::vector<uint8_t> encode_ec_point_in_octet_str(const Botan::PointGFp& point)
++   {
++   std::vector<uint8_t> enc;
++   DER_Encoder(enc).encode(point.encode(PointGFp::UNCOMPRESSED), OCTET_STRING);
++   return enc;
++   }
++#endif
++
+ #if defined(BOTAN_HAS_ECDSA)
+ 
+ Test::Result test_ecdsa_privkey_import()
+@@ -976,13 +985,6 @@ Test::Result test_ecdsa_privkey_export()
+    return result;
+    }
+ 
+-std::vector<uint8_t> encode_ec_point_in_octet_str(const Botan::PointGFp& point)
+-   {
+-   std::vector<uint8_t> enc;
+-   DER_Encoder(enc).encode(point.encode(PointGFp::UNCOMPRESSED), OCTET_STRING);
+-   return enc;
+-   }
+-
+ Test::Result test_ecdsa_pubkey_import()
+    {
+    Test::Result result("PKCS11 import ECDSA public key");
+diff --git a/src/tests/test_pkcs11_high_level.cpp b/src/tests/test_pkcs11_high_level.cpp
+index 07dc86ef21..c77e8ea42e 100644
+--- a/src/tests/test_pkcs11_high_level.cpp
++++ b/src/tests/test_pkcs11_high_level.cpp
+@@ -28,10 +28,14 @@
+    #include <botan/der_enc.h>
+ #endif
+ 
+-#if defined (BOTAN_HAS_PUBLIC_KEY_CRYPTO)
++#if defined(BOTAN_HAS_PUBLIC_KEY_CRYPTO)
+    #include <botan/pubkey.h>
+ #endif
+ 
++#if defined(BOTAN_HAS_ECC_GROUP)
++   #include <botan/ec_group.h>
++#endif
++
+ #if defined(BOTAN_HAS_RSA) && defined(BOTAN_HAS_PKCS11)
+    #include <botan/rsa.h>
+    #include <botan/p11_rsa.h>
+@@ -909,7 +913,7 @@ BOTAN_REGISTER_TEST("pkcs11-rsa", PKCS11_RSA_Tests);
+ 
+ /***************************** PKCS11 ECDSA *****************************/
+ 
+-#if defined(BOTAN_HAS_ECC_GROUP)
++#if defined(BOTAN_HAS_ECC_GROUP) && (defined(BOTAN_HAS_ECDSA) || defined(BOTAN_HAS_ECDH))
+ std::vector<uint8_t> encode_ec_point_in_octet_str(const Botan::PointGFp& point)
+    {
+    std::vector<uint8_t> enc;
+diff --git a/src/tests/unit_x509.cpp b/src/tests/unit_x509.cpp
+index eaae358420..d9b7858898 100644
+--- a/src/tests/unit_x509.cpp
++++ b/src/tests/unit_x509.cpp
+@@ -603,7 +603,7 @@ Test::Result test_verify_gost2012_cert()
+    {
+    Test::Result result("X509 GOST-2012 certificates");
+ 
+-#if defined(BOTAN_HAS_GOST_34_10_2012) && defined(BOTAN_HAS_STREEBOG)
++#if defined(BOTAN_HAS_GOST_34_10_2012) && defined(BOTAN_HAS_STREEBOG) && defined(BOTAN_HAS_EMSA1)
+    try
+       {
+       Botan::X509_Certificate root_cert(Test::data_file("x509/gost/gost_root.pem"));
+@@ -1600,6 +1600,11 @@ class X509_Cert_Unit_Tests final : public Test
+                continue;
+ #endif
+ 
++#if !defined(BOTAN_HAS_EMSA1)
++            if(algo != "RSA" && algo != "Ed25519")
++               continue;
++#endif
++
+             std::unique_ptr<Botan::Private_Key> key = make_a_private_key(algo);
+ 
+             if(key == nullptr)
diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 25b71d275bd1..cf279342ef95 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -3,8 +3,6 @@ AUX capstone-3.0.5_rc2-FLAGS.patch 398 BLAKE2B 40cdebbdd64e057982af6d7b4cce44821
 AUX capstone-4.0-FLAGS.patch 418 BLAKE2B 425d12eeeca7d4ca2d350d0ec821c6861c0fd7df7021be44c3c371837ab27e22af83d0af1627ae6c920628619d780608863d6f4d41ec6f79a18ea37251b82915 SHA512 c423d0f827afd4b11979ac6fbf4f8972df10670dec113f4a08f1860229cd3e1c5b61f3f6fc7195f457f29eeb46580e18213e9195acae821ca57b63372af07564
 AUX capstone-4.0-double-DESTDIR.patch 307 BLAKE2B 91fad2475b7289311c8eeceaec962a9b1cf735cb13835de19eeed208a20c2b4f8b3cf59683ff72bc726b83ca41d696f3889b7019e2751d79c8d4fba48f736018 SHA512 92d839aad1a576ae550c618ffda3cd070419b72b105583f3861d47df0a57f29fbf8b4e1727c7768199fa650e1c734726f7cc8bd0ef913da336ed16d6d77feda4
 AUX capstone-4.0-no-fuzz-tests.patch 367 BLAKE2B 890047c65669c6d323fa5f8bb80df449ea6a8fe9e6e58c43438f37c63edce46d4f64db953322ac74c54fc1077f35b0d86d732685533cfe7d495a235afebc40ef SHA512 2abc022678214a09869c728e1cb83a4a69213d977d1ad752cda415e5861b83d4af2ca2fa80377dee1322d8bfad6fb5d1d12e23cdc30285ebe83c3eca91110279
-DIST capstone-4.0.1.tar.gz 3434276 BLAKE2B 585e0ee19b76d96116c67b021bbe19fd01d8db600b565094ff71a01d8a87b1123a8c5e2f944f1551c411565d5a25dfbfbb3138ca220b1281044a31004002399e SHA512 43c52024065b41b45eff9423341db3f3d5163fa7aa01b360faa30437786740c8f2c34c36faa04dced5308e09d8bd78df3bad0ab9c06f98612169edb176f83c36
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9 SHA512 7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
-EBUILD capstone-4.0.1.ebuild 1639 BLAKE2B faa0dd154c884f9e4074a8a6111e656df160c165b1ead2abb96d9005eb7353442861d4c0232a1a6b2be3d378128c5ca7eb94c41a5a8b4ec1a78ca6c7c91042b8 SHA512 d611934bcc6f3d0faee23835917c1b66cd7d65c1f737ff496810a8d9c47cba0323313fe0047c09b09bfed0f6ea557573f94b84aca468d2d25371faef208e8429
-EBUILD capstone-4.0.2.ebuild 1639 BLAKE2B faa0dd154c884f9e4074a8a6111e656df160c165b1ead2abb96d9005eb7353442861d4c0232a1a6b2be3d378128c5ca7eb94c41a5a8b4ec1a78ca6c7c91042b8 SHA512 d611934bcc6f3d0faee23835917c1b66cd7d65c1f737ff496810a8d9c47cba0323313fe0047c09b09bfed0f6ea557573f94b84aca468d2d25371faef208e8429
+EBUILD capstone-4.0.2-r1.ebuild 1325 BLAKE2B 09988c2ae5ef6401220570c2ecee7ae39106a30c35489ee9330b078233e3551a05dde3ad82b3eae93007c4f279ad1910eedc1495ed68c58e37ed90079ab00c34 SHA512 02f30417e3de309847bd26ca97f5a3e1df99366f78d533a78e2d551a41e3d24b4ea1b5acf9e6c7cd6bb8025474c3016717432dc67265ab6bca880902d61de25c
 MISC metadata.xml 332 BLAKE2B 944b66779658094b7b1020400c1821dcf1f5138c85531fb83e853fa6d38219606f0f92673f57b3b621ffb3149eb50d60da281acaf469e97fc4c826b90c06b5a3 SHA512 a4952a89d043c4c8aec5a7a307d37d895880d49b381e5b881ffecf74b61c9c22cd854a68a1d1de3926431cdfad4f8ba70812be36bb7cac2df5dee8efe96dc269
diff --git a/dev-libs/capstone/capstone-4.0.1.ebuild b/dev-libs/capstone/capstone-4.0.2-r1.ebuild
index 3f7e112a1071..6de5971d2cdc 100644
--- a/dev-libs/capstone/capstone-4.0.1.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python{3_6,3_7} )
 
-inherit distutils-r1 toolchain-funcs
+inherit cmake-utils distutils-r1 toolchain-funcs
 
 DESCRIPTION="disassembly/disassembler framework + bindings"
 HOMEPAGE="http://www.capstone-engine.org/"
@@ -18,18 +18,13 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RESTRICT="!test? ( test )"
 
-IUSE="python test"
+IUSE="python static-libs test"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
 "
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-FLAGS.patch
-	"${FILESDIR}"/${PN}-4.0-no-fuzz-tests.patch
-)
-
 S=${WORKDIR}/${P/_rc/-rc}
 
 wrap_python() {
@@ -41,52 +36,35 @@ wrap_python() {
 }
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	wrap_python ${FUNCNAME}
 }
 
 src_configure() {
-	{
-		cat <<-EOF
-		# Gentoo overrides:
-		#   verbose build
-		V = 1
-		#   toolchain
-		AR = $(tc-getAR)
-		CC = $(tc-getCC)
-		RANLIB = $(tc-getRANLIB)
-		#  toolchain flags
-		CFLAGS = ${CFLAGS}
-		LDFLAGS = ${LDFLAGS}
-		#  libs
-		LIBDIRARCH = $(get_libdir)
-		PREFIX = ${EPREFIX}/usr
-		EOF
-	} >> config.mk || die
-
-	if ! use test; then
-		# Don't build tests if not requested: bug #663006
-		sed -i tests/Makefile -e 's@all: $(BINARY)@all:@' || die
-	fi
+	local mycmakeargs=(
+		-DCAPSTONE_BUILD_TESTS="$(usex test)"
+		-DCAPSTONE_BUILD_STATIC="$(usex static-libs)"
+	)
+	cmake-utils_src_configure
 
 	wrap_python ${FUNCNAME}
 }
 
 src_compile() {
-	default
+	cmake-utils_src_compile
 
 	wrap_python ${FUNCNAME}
 }
 
 src_test() {
-	default
+	cmake-utils_src_test
 
 	wrap_python ${FUNCNAME}
 }
 
 src_install() {
-	default
+	cmake-utils_src_install
 
 	wrap_python ${FUNCNAME}
 }
diff --git a/dev-libs/capstone/capstone-4.0.2.ebuild b/dev-libs/capstone/capstone-4.0.2.ebuild
deleted file mode 100644
index 3f7e112a1071..000000000000
--- a/dev-libs/capstone/capstone-4.0.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/"
-SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/4" # libcapstone.so.4
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RESTRICT="!test? ( test )"
-
-IUSE="python test"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0-FLAGS.patch
-	"${FILESDIR}"/${PN}-4.0-no-fuzz-tests.patch
-)
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-wrap_python() {
-	if use python; then
-		pushd bindings/python >/dev/null || die
-		distutils-r1_${1} "$@"
-		popd >/dev/null
-	fi
-}
-
-src_prepare() {
-	default
-
-	wrap_python ${FUNCNAME}
-}
-
-src_configure() {
-	{
-		cat <<-EOF
-		# Gentoo overrides:
-		#   verbose build
-		V = 1
-		#   toolchain
-		AR = $(tc-getAR)
-		CC = $(tc-getCC)
-		RANLIB = $(tc-getRANLIB)
-		#  toolchain flags
-		CFLAGS = ${CFLAGS}
-		LDFLAGS = ${LDFLAGS}
-		#  libs
-		LIBDIRARCH = $(get_libdir)
-		PREFIX = ${EPREFIX}/usr
-		EOF
-	} >> config.mk || die
-
-	if ! use test; then
-		# Don't build tests if not requested: bug #663006
-		sed -i tests/Makefile -e 's@all: $(BINARY)@all:@' || die
-	fi
-
-	wrap_python ${FUNCNAME}
-}
-
-src_compile() {
-	default
-
-	wrap_python ${FUNCNAME}
-}
-
-src_test() {
-	default
-
-	wrap_python ${FUNCNAME}
-}
-
-src_install() {
-	default
-
-	wrap_python ${FUNCNAME}
-}
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 4eb06e43c6fa..b3489ffa3549 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -2,6 +2,5 @@ AUX check-0.12.0-fp.patch 1727 BLAKE2B 8643aa3b1ebaece72c9bb6bad52077f554baea2d5
 AUX check-0.14-xfail-tests.patch 310 BLAKE2B a4b3e9a58ca841cffffa0754ef429db19cf92ddcac1f214ac13d655af505c6e660aa0ea865c3e7fedf993f6ef77c5504301a4d7ad7017e2aba5f6d3785208f73 SHA512 1be74226886d47acae417e5b871459bd96d768115c97576a142bccb8e50ea1b0ccc69b6068cc44743a8e9bfa3341739402342697cde32686ae6cfb4fd413ee18
 AUX check-0.14.0-r2-disable-automagic-dep.patch 769 BLAKE2B 286eeaa0e45e524c400f1967756b2e2912d76826c2fb92d9008afc338f19a4edc55b23e2751ce46f52e2fccc3e091f7143647a42a017c02ee580e138c3a50536 SHA512 4370bb6551c3e2f414b6580f26ed3a7429278139d5835b44c8769f1583363aaf8e25982e6f86bbcf2e7fc06d3c406d9a2af4a47fbb99377c6589f276aa9f29a3
 DIST check-0.14.0.tar.gz 303471 BLAKE2B d602bb56d205eccf06e4177e3f6d3f7270c3a0cba0e1d397480f0409a916ec4118c48340ad6f6a8955ea30d9e22252ff8381a687d000c3f8e62828cf656f1245 SHA512 54ad175c00cf0c73b4386cf6b3d6a404a5da4f57897d099e772f148f410108c44767c3266a940113be73a6861b3f3ee1706c558cc71ec51df99687f19f3a3bb4
-EBUILD check-0.14.0-r2.ebuild 1500 BLAKE2B 9719980e95ef562ee6cf5b23f138e7dc97e540eeb7273ee57ee693b2cfa8c816f8f14bfdfc4fe4ddc340c3f9c3ebeb53eb51521376585c6e04dd5d5c9fadae36 SHA512 0e4a30769f47efce5806b414729eed51696677d70fb6d6b22676fbdd56ff63418ae8a6c9d8d0d44574108c942e5038b34e288f0f50f17bf1bbebe39d09a15667
-EBUILD check-0.14.0.ebuild 1554 BLAKE2B 3bbb3e62ce8f784fe940d402af3136ab906006d5880abb03e51a2154d7816be353b7cdde134de5fb04b0f059aebeabcb072d3ebfb0e67a778c0e2c509221e791 SHA512 d53a839fd83aa14817159b917e291d99f1b76127147fcb9249757d8629b4ff698460e455051e86e08a349bc9e318beb651f6090073188f19dcd44be7591002d8
+EBUILD check-0.14.0-r2.ebuild 1498 BLAKE2B f9c8ceaf6000ce5c0878bf85a2a88f3098d40f6c77c7f928f81fd91624bd9293fc447f94498e5e475b3f699d115b80b5705169ab99560b15fa779c924be81a14 SHA512 815f57a1c3474e680dbd55b1d514daea2626fea087aef056b5d0547cce11ba9815f6ff4ef5e36d4e9b1b8264191d3ba30b40d29b882446c09ea6e90c1b91b100
 MISC metadata.xml 488 BLAKE2B 27eb0323a4d7cac50b2f4ee935c75e7a35c34066a0dbc5bf21f8b4fb93abe82aa79a5fa1fafed0e623417ceaa553dc8395f201a24c3e0123df3104be44106bb7 SHA512 4b69b4b1ca91bfe4b04d03935d3d6e9b8ca10ecaa538884834f357708db5380a90e9cf1fdcef7996b7c4d8a23c0cb8e1d9eb9d34faa584637804ebc67657be69
diff --git a/dev-libs/check/check-0.14.0-r2.ebuild b/dev-libs/check/check-0.14.0-r2.ebuild
index e104b81ce89c..565a288bac27 100644
--- a/dev-libs/check/check-0.14.0-r2.ebuild
+++ b/dev-libs/check/check-0.14.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc subunit test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/check/check-0.14.0.ebuild b/dev-libs/check/check-0.14.0.ebuild
deleted file mode 100644
index 40aa0e80af0f..000000000000
--- a/dev-libs/check/check-0.14.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A unit test framework for C"
-HOMEPAGE="https://libcheck.github.io/check/"
-SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs subunit test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="subunit? ( dev-python/subunit[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/check-0.12.0-fp.patch
-	"${FILESDIR}"/check-0.14-xfail-tests.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable doc build-docs)
-		$(use_enable subunit)
-		$(use_enable test timeout-tests)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	default
-}
-
-src_compile() {
-	if use doc; then
-		cd doc/ || die "Failed to switch directories."
-		doxygen "." || die "Failed to run doxygen to generate docs."
-	fi
-}
-
-multilib_src_test() {
-	# Note: test-phase takes a long time.
-	emake -k check
-}
-
-multilib_src_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	default
-
-	rm -r "${ED}/usr/share/doc/check/" || die "Failed to remove COPYING* files"
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index 83fdfe741869..72aac36feb44 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,3 +1,5 @@
+DIST pcsc-cyberjack-3.99.5final.SP14.tar.bz2 1090014 BLAKE2B 15c9d0225f03d1fcbc636b6f8ae29f265243af35bc78c48f2e9cca27c7731ebb30069eb5bf377ce66d2c7afb31e1fb5d839001fa21e854a4bdc56237bf780327 SHA512 f39e4f13776d8c4e4bc5ea3cc64e64649d8dea334f50b9bcc9cc6f1fc9e7433ef32b8fcb00b5dad78867029dab0a099c0d7799d7e8f80d0f310b0f53dbd2a7b9
 DIST pcsc-cyberjack_3.99.5final.SP13.tar.gz 1617714 BLAKE2B 344f00217fa5dfb18e5318d2b8ccb88a3cc12b86a9c14d41a9800d701d0fc7a0a486a0b3c05188d07d1f7c51c4c514c48a55d987d8d9d2af574f427e550c8654 SHA512 74ac56a0f74a69006c87e2c22e147b65d26582d29753de03d56e4ad76413f4477a031d47f5eb074323b4ffd000b0908a1fb2b12fb7d91e9b3ee67e983e09e968
-EBUILD cyberjack-3.99.5_p13.ebuild 1909 BLAKE2B 89a8930abaf196be95b6657497a5756469ffb0d1021aea7fb383aa4cbe0a44bdf4f19eb89e91908f79afcefd42d48c9c66d89ddc645270c610c2d7fce4fcd945 SHA512 e639adafff9fbc49deafaba8c35886bc3efb260a37dfdcd18200b70a6fb43cfa8781609e5ab87fbeb844c9bf10908d5a880468130c6522e592062bda29040862
+EBUILD cyberjack-3.99.5_p13.ebuild 2053 BLAKE2B db68e22e63e6baef0a5ef2c0a1bee7a80a7230029baba274da4d4adcb48e71ad9d75c231f8e45372e047658c0f392f1f87639b29ef43e072695f91cc9f5edeba SHA512 7e6e012f1c60baf55b6565144dacef25022336f8895731363f561837330dfd60d5e54b6b4d8b2af502a4a87405ccf32eb9d323f8b92db6b75001a8b7191d38a6
+EBUILD cyberjack-3.99.5_p14.ebuild 2076 BLAKE2B 98a47e796c0cd1fffc15d4130390e3ca2db53722fe5414aad35cf1fe2cb7803dddd91851b8be0f99e760f3e7a1206937a876789168f4899b17f87abe06c749cf SHA512 7d71bb42bfdaccb82bf815b324cf2a69e1aa7166890b7024e8f6fc81119fdb97367b778b2ba80721680ed1af0b0c49bb26ae2299c645e21e52428a9ff7c3c679
 MISC metadata.xml 622 BLAKE2B 4238fe4ea370787f4542d53d161afaa0c0df5788d7a2da5ee6b99b788ae6d4456cd43d6ea8df0a174431b4582127fb49712a59ed2acdbeaf4808f57b8fa44930 SHA512 2062ac48ee73a6a58a2663e39f467e8e55f06af48b7a04b5f174e467c3f33d4b92b93b8fff3747447503b3256fc514fc40c8e07f7cbec8e1608d6389d9aed4ba
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild
index edde80805904..97f2ad1beba3 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p13.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
@@ -7,7 +7,7 @@ MY_PN="pcsc-${PN}"
 MY_PV="${PV/_p/final.SP}"
 MY_P="${MY_PN}_${MY_PV}"
 
-inherit autotools linux-info toolchain-funcs udev
+inherit autotools flag-o-matic linux-info toolchain-funcs udev
 
 DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
 HOMEPAGE="https://www.reiner-sct.de/"
@@ -32,6 +32,12 @@ S="${WORKDIR}/${MY_P/_/-}"
 
 CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
 
+pkg_setup() {
+	# Add workaround for GCC-10,
+	# by defining narrowing as warning like GCC-9 did.
+	append-cxxflags -Wno-narrowing
+}
+
 src_prepare() {
 	default
 
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild
new file mode 100644
index 000000000000..53d0aee2a30f
--- /dev/null
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="pcsc-${PN}"
+MY_PV="${PV/_p/final.SP}"
+MY_P="${MY_PN}-${MY_PV}"
+
+inherit autotools flag-o-matic linux-info toolchain-funcs udev
+
+DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
+HOMEPAGE="https://www.reiner-sct.de/"
+SRC_URI="http://kernelport.com/reiner-sct/SP$(ver_cut 5)/${MY_P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="static-libs threads tools +udev +usb xml"
+
+RDEPEND="
+	sys-apps/pcsc-lite
+	usb? ( virtual/libusb:1 )
+	udev? ( virtual/udev )
+	xml? ( dev-libs/libxml2:2= )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P/_/-}"
+
+CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
+
+pkg_setup() {
+	# Add workaround for GCC-10,
+	# by defining narrowing as warning like GCC-9 did.
+	# Upstream is working on that.
+	append-cxxflags -Wno-narrowing
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-debug
+		--disable-error-on-warning
+		--disable-hal
+		--disable-mac-universal
+		--disable-mac-arches-i386
+		--disable-mac-arches-x86_64
+		--disable-visibility
+		--enable-pcsc
+		--enable-release
+		--enable-warnings
+		--sysconfdir="/etc/cyberjack"
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(use_enable udev)
+		$(use_enable usb nonserial)
+		$(use_enable xml xml2)
+		--with-usbdropdir="$($(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use tools; then
+		# cjBingo can't be compiled, as it's defines stuff, which got dropped
+		cd "${S}"/tools/cjflash && emake
+		cd "${S}"/tools/cjgeldkarte && emake
+	fi
+}
+
+src_install() {
+	default
+
+	use tools && dobin tools/cjflash/cjflash tools/cjgeldkarte/cjgeldkarte
+	use udev && udev_newrules debian/libifd-cyberjack6.udev 99-${PN}.rules
+
+	dodoc debian/changelog doc/{LIESMICH,README}.{pdf,txt,xml}
+
+	docinto html
+	dodoc doc/{LIESMICH,README}.html
+
+	docinto source
+	dodoc doc/*.c*
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index 52f105e50bb4..9c687882abc9 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -4,5 +4,5 @@ AUX dmalloc-5.5.2-cxx.patch 546 BLAKE2B 6f85a3024d417c81f3a4dd4f50cf444f09eb3b53
 AUX dmalloc-5.5.2-string-macros.patch 367 BLAKE2B 7fd3e6ae9b4564ec519da953c5116b9a8d19fa446c1d3e24ff736ce3725fd7425881dc07272a3f5dbdee1202e1dac8f68f19266296f5c8335976e5287fa90ddc SHA512 61d0015e7997ecad97e722a1b308ec90e996e9d53b9f475c911f1d9eb929d8007881e52699e9f3427c5cecb9f0b2d202d12a7d607d23434913afbef455f08617
 AUX dmalloc-5.5.2-threads.patch 165 BLAKE2B fee0be1573996dc7460735a94c645989db6fb9570e1140ec64e87e4bddd6b84227d072454bd64c4e0f261e81da0dd27a6ebf310b60e8a74539a21f83370e291f SHA512 b561c715c19604128c046b36bfe09794922176ce1cd12947da277631a410bbc19c5a1f7e998f0b61d7564e3b7516bee0fb4deddb13e036bb9e667f3502e56d0e
 DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93
-EBUILD dmalloc-5.5.2-r7.ebuild 1854 BLAKE2B dc3cf3c92373e5e0493705e382643de854a8e9462abb4b5f5515e663bb46890ce10ab636c6db5a7d7850c7d02e1861b97d78ab9a2687496b780c8d39c4d78b63 SHA512 cbe198c721b3ebee01382f417adc61004192210e298cdf501966ecbfacdc37a20251ef4b69828c948be2b442e8adf56016826dc15461acd115cbe9a31ca72105
+EBUILD dmalloc-5.5.2-r7.ebuild 1856 BLAKE2B 5b53473108b3734739b190bcbb6de70223f995c56eb2970c60711e2fe0381acc64fe63c7077bc827e9c9fab93787887d1cc11eaa45fc0f6c3b5d356c31a67f35 SHA512 2f38656b920367281a179afb298c7fc2a4cbe7f3db56001f9812711c6836ad18e579c7e78427d110b329a528b443bf40852aaae92819b2aa8e13d88dcbd18f57
 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 8adc613bba3a..447c2e1307ab 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 inherit autotools multilib toolchain-funcs
 
 DESCRIPTION="A Debug Malloc Library"
-HOMEPAGE="http://dmalloc.com"
-SRC_URI="http://dmalloc.com/releases/${P}.tgz"
+HOMEPAGE="https://dmalloc.com"
+SRC_URI="https://dmalloc.com/releases/${P}.tgz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index b55668b64e60..530cb9f2a0d7 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,5 +1,5 @@
 DIST efl-1.23.3.tar.xz 77485032 BLAKE2B e5f65080aec1d11a43f1e1786b8ac4e7be70ddd9614b53db822177c28ee73f9590f63d032df5ddf00db6224730b45b045d9f91da2287a4dec7589e902cbcde28 SHA512 47ad067c43d39b534834195f89a745c4a47d867f33aaa68c28c6dccd147379e9bc2416bd68878cc16585f8cb60e926a7df62102658b205756c01985f37f0d297
-DIST efl-1.24.1.tar.xz 72277640 BLAKE2B 1568df21256bd9c223214d72df38520941d6e117a3590511144627947bfa903e74eaac45085e18172c5c44127b7d14b6f1e03f4a4cba12c6f3d2b55a8b2650f4 SHA512 6fe4d87a9db1e0022c1dff94c14d334d61e561608016072bcb1d2633054ff9a6a74c84bc9903592d716abc9e1fae48b6ff66b259a5a59114a1cd54f083ce8b51
+DIST efl-1.24.2.tar.xz 72280100 BLAKE2B 638e39d188ce2e4d22a39913880c023090aa8a49cdbb878efcf38150f70681dbeb0a76b5a71b21e377e10f04ad31d28b36317fe0d3537de0766641149d120c49 SHA512 0fc2ee94a074e33ae3c7142f2bb8ec5d174c843a26d2cb0641af466c3f413a25ee81bba2445fe03d518358f11546ec716a70e785fe1a8b90727e29bcc7d5f706
 EBUILD efl-1.23.3.ebuild 7543 BLAKE2B 37c683746d6d01f96e92888328669cab20c8ad0061ace69af670cfc1c47046fd52280e976fd46d75e5f10c7884e46eef6c6db9aa716a6b4f5e2ec41e150915ff SHA512 82fa39d4524400a21d59072cfd87cc8d2eb529af5eebecbd7703951ea9b3105e28629aa038fcf6c643ac486bb725a1b23d9d97e2d165a94a971df92b7ae018a5
-EBUILD efl-1.24.1.ebuild 6887 BLAKE2B f05cf89bda8a72caff985c8e92475cc7a99c5a24b971525c4f735fe78e380908e9c76ebd08fdfc879c95deced1f4808ae15cb37fa3c34bbe3b618a1b06c73ef2 SHA512 01894a1f8b212dcd9aab01d49a977296dbd6257943204de6eace244a993847b00caae99566d8978049c18fb643f6f5c799b9e708300b5603833f08f1c3326f3d
+EBUILD efl-1.24.2.ebuild 6888 BLAKE2B 01b37c05f756826b26607ba79697f39f38052b27f0a55a5201f894881b80f28f43b45751d7291852ff641dbf88c331fe4dc6c42f31457486ba326506d1f0a37f SHA512 b9042f7d3eefb47803ce1ed995e6eca482d47bc8fd13bef6f42abcccebd22ee8e7217318598f9d3aea5d2b974dbcce75190ba71bd7904d68a9e80038e22d1096
 MISC metadata.xml 1987 BLAKE2B 86cb4cbb5deb978955e4008c3d7ae92430daa8739d75c9515c3c33339b05b545b5af8b8bdce0dc4ca2dffe17097ca8a04104e1ed3fe99a548c625416d467d2f2 SHA512 b543190ca4b753101085f3964608b06ee489f6e0d268e84866162370b029cc8433e2925ef92104a38a57a3c0fb491150f6376cdf996a45cdb0848287b8aaf58f
diff --git a/dev-libs/efl/efl-1.24.1.ebuild b/dev-libs/efl/efl-1.24.2.ebuild
index 745ca8e21df7..397a184692d9 100644
--- a/dev-libs/efl/efl-1.24.1.ebuild
+++ b/dev-libs/efl/efl-1.24.2.ebuild
@@ -12,7 +12,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 ~ppc64 ~x86"
-IUSE="+X bmp connman dds debug doc drm +eet elogind examples fbcon fontconfig
+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
 	pulseaudio raw scim sdl +sound +ssl +svg +system-lz4 systemd tga tgv tiff
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 03cf87ba0027..f52d3474ca3a 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,5 +1,4 @@
 AUX elfutils-0.118-PaX-support.patch 962 BLAKE2B f631b1dcf20cf257efd83f24cf53b3324f57a5db8a13b8d618c75239d339f01c0f0a13bc87c1988e9ff05e92bfd69b0bbce0f5260a3bbb9d38b9d000ac809818 SHA512 ce542011f6ea4398455e418a8eae06508407e975e179306ffca5e3e9702583ff9f5e6010ee2e25d098b7f396c361029c932cd0c40ba3d910d9fb60c97f07f50c
-AUX elfutils-0.173-reorder.patch 1262 BLAKE2B e2691a7e5dd1d6332c7b300a4262f82cc781430dce18adf1184dac99173a6ef41feb013b25c1d8e1c30c8872add163ed232900bfaf0d017e9a427c9ee924c4d6 SHA512 faedaa3b78abf8bafce480be32b5fba3b1964ab2da2e99fae85503a28889b11f1138a40827a289341cf4e29c65ab8ded5bbf92c59f46ca337ead43c8f906ad9e
 AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b16fdf6bc203ed2cde70b0da80d982dc3493c993532492cdb8f597b66fd38ebedf7517403096c1704d77f7541972d875af2b952cad3586751bb SHA512 d3263c42b1638a416e95c2b8e68b15a9723e748490c8eca727da94bf7bb3dd8389222dd01bf69612ba45a20114ee1427d77935c41436d1ca9180fcfd71d3cdfe
 AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f55e0611fe83782374d5201b984e85e7c27897d0d056f53af40ebb383e8cbe315a57adce2af378348ee1a573cfeb005e7a43 SHA512 2660ee456b62d6b1ed72ede92d8b00e9d1cd4b0a5778a80bfbdc3139e5527758591cdb05110b39a5c5811f60e2223cc8c83a488ac055a554f5b3c71fc5980acb
 AUX elfutils-0.179-PaX-support.patch 1071 BLAKE2B 5b47db44011092b6fc9cfef342b87bea02c78ee247a1acfca69e0414a741875ba87a6fba3d370cb20541f9d8950552b31ea6a6e9736c6b5da285d45a2bc81d1d SHA512 9d21b955532fe5261fb314283d723f04ff4a04cdd31598bbc1904f9c7e833b8d62cd19b1560882c66900c9adeb24ec1b6a173de94ac1fcbce25b67c8db8006a2
diff --git a/dev-libs/elfutils/files/elfutils-0.173-reorder.patch b/dev-libs/elfutils/files/elfutils-0.173-reorder.patch
deleted file mode 100644
index fd3dede7c25a..000000000000
--- a/dev-libs/elfutils/files/elfutils-0.173-reorder.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/666954
-https://github.com/rpm-software-management/rpm/issues/423
-https://sourceware.org/ml/elfutils-devel/2019-q2/msg00077.html
-
-From: Mark Wielaard <mark at klomp dot org>
-Subject: [PATCH] libelf: Mark shdr_flags dirty if offset or size changes during update.
-Date: Mon, 13 May 2019 00:13:42 +0200
-Message-Id: <20190512221342.23383-1-mark@klomp.org>
-
-We forgot to mark the shdr_flags dirty when only the sh_size or
-sh_offset changed during elf_update (). This meant that if there were
-no other shdr changes we only wrote out the section data, but didn't
-write out the shdr table to the file.
-
-Signed-off-by: Mark Wielaard <mark@klomp.org>
----
- libelf/elf32_updatenull.c          |   5 +-
-
---- a/libelf/elf32_updatenull.c
-+++ b/libelf/elf32_updatenull.c
-@@ -366,12 +366,15 @@ __elfw2(LIBELFBITS,updatenull_wrlock) (Elf *elf, int *change_bop, size_t shnum)
- 		    }
- 
- 		  /* See whether the section size is correct.  */
-+		  int size_changed = 0;
- 		  update_if_changed (shdr->sh_size, (GElf_Word) offset,
--				     changed);
-+				     size_changed);
-+		  changed |= size_changed;
- 
- 		  if (shdr->sh_type != SHT_NOBITS)
- 		    size += offset;
- 
-+		  scn->shdr_flags |= (offset_changed | size_changed);
- 		  scn->flags |= changed;
- 		}
- 
diff --git a/dev-libs/gf-complete/Manifest b/dev-libs/gf-complete/Manifest
index 8cfc419e7ac6..ce59577631c2 100644
--- a/dev-libs/gf-complete/Manifest
+++ b/dev-libs/gf-complete/Manifest
@@ -1,5 +1,6 @@
 DIST gf-complete-0.0.0.tar.gz 596339 BLAKE2B add52827288d08e8d546787f8bc42554ce8900a21dfdc47e66aea2990aa48604f8a51d573f84c667e2479a03ddb8412c43a0acae745cb1e3e5aed0bfd0dd0a83 SHA512 7942a29b80972fffab15dc86c560345911db5aa976d2c505804d0eff10c9135f674f3511b579e2bac26342ca53a81d323826a1ff1d790836a4650a07769851a2
 DIST gf-complete-2.0.0.tar.gz 122566 BLAKE2B 20cfc2dcf437109f5ed703434c5c383bc910d57127583a4eca6ccea860d0f42c82c93558ba992b9b35d6025d745a8bb39c32ed35809ffc063fa83b11a975e0d9 SHA512 3b0693bf374086417f04cee09dceeb694aafaf7fb3c829b89f303b65634ae509406c8a0de10f57c666b4c78b11043f355bb3c81f95eac061cb16de9db2b71b89
 EBUILD gf-complete-0.0.0.ebuild 628 BLAKE2B 7c3b73a700a367011a1eb16dd47f92caa5b6cda46b4b1c8f3596a5dea16d2824b0171327f66f19efa5178f340abcf2c16569dcb2be6b97937631abb834084088 SHA512 0d3bbf3b76ef8a44e7a8366b04ca609db2612e77f0e4666b320420e0c06e7c60c3092db149603855ea3eb83518a548e6bbac27e47348450467aa9e840b82d32f
+EBUILD gf-complete-2.0.0-r1.ebuild 725 BLAKE2B 2dc03bec72fe8cdea724f4af50d6a6599afb8c34b83ce82fda11e15d1e488ed50fb52f28c94d1568ca64905092505e9eab0cb75ac5a7326724ea7ac489277b97 SHA512 94b29eacadbbc9b8a8f94ce916a5a4c1c48fee798cfaed50689cf22fb18f852599d607a33a3e5376a844b570d4b2bc91549e3603fe5046b516306cde010dcafb
 EBUILD gf-complete-2.0.0.ebuild 654 BLAKE2B 4385c144aa769748612ea4f0a2a2a2f6821e7183f89b313d85d45e45dac34756195795ff8f21d1a70748dbd80524a7559d253ebb1464e1cad9ae71f176d9b9ed SHA512 bdccdbf0466182afd3f28949ac9a9df48a5223489e9c7a9a1843891ce1622411082e3f631531a773a9d40856bc4f9fcec86ccf49151296c8a7b9408e5f6a7b57
 MISC metadata.xml 371 BLAKE2B 57b48284c6902ef89797ac9e63452e3ae6dc0b1cb223c9dbebeba4aa52d4c37f64cbb0ecab23099c68cb1eb9ac675a3fd90bb86520d7fe17505024fe4578abba SHA512 6073568ff06bc2ee07189affd7dd44425d9e028a5dd558d3aa41b6813b123681f4e50cf7a911fed42f342d576088f0be61282748c5d0e067bd664aa5b7acd554
diff --git a/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild b/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..5f56086483b3
--- /dev/null
+++ b/dev-libs/gf-complete/gf-complete-2.0.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools eutils
+
+DESCRIPTION="A Comprehensive Open Source Library for Galois Field Arithmetic"
+HOMEPAGE="http://jerasure.org"
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/${P}.tar.gz"
+S="${WORKDIR}/${PN}.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i -e 's/ -O3 $(SIMD_FLAGS)//g' src/Makefile.am tools/Makefile.am test/Makefile.am examples/Makefile.am|| die
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 6522534200c7..f61b5ba50f73 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -3,10 +3,8 @@ AUX CVE-2020-6750.patch 29371 BLAKE2B df3061eaa5de4115143d52fac6663c791bd5f1d1d3
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
 DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421dbc46579aadc5fbbacb8f934af4374b61bb26085e5c9ab78a868c567818f3fb9d67adddce37f5c4fec00e0d276 SHA512 8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5
-DIST glib-2.64.1.tar.xz 4758548 BLAKE2B 5585d23fee28d7c32b1bb9e1defbc31ba469aa259e3c328760d1e702d98706cf251bfb50b5e2aed37b2cdfa6ab4319372ddcd0a9937c97a2614741b504af17a5 SHA512 1cefe49a42233f24ac6bd09c134ceea7119f4f74f42204a731be56100a180eec69c8224674f0b08d1538ad0859896ed08260a6af0fed469c7d10b4508116a6bc
-DIST glib-2.64.2.tar.xz 4760436 BLAKE2B 8145684ca9f966f92ed9cdafcbf46c59291dc1215fc9feae482fb33f61bd175a679fe5bc80f031190c9a0eb5eb650fab01e13bdda4bd41e9df3d21c6779681bc SHA512 c65adb76f4a03c19f2df186dde49724135975ec6cd059efca5d753e7459f77925657b1fb6fc4ff0d09b2461b2f6e58c9710fc8cde0a5d648ba0d68ccfef1ec57
+DIST glib-2.64.3.tar.xz 4778964 BLAKE2B 98ec6e15a8ff642fbccd4809d749234d5adae8abcab7a3619caed0aa60370d0409a76a2c64a95998401e8a339dcc264f4f808f3d7be457ff40e38d70b0a8076b SHA512 a3828c37a50e86eb8791be53bd8af848d144e4580841ffab28f3b6eae5144f5cdf4a5d4b43130615b97488e700b274c2468fc7d561b3701a1fc686349501a1db
 EBUILD glib-2.60.7-r2.ebuild 10254 BLAKE2B b0dfbc7218f55ef76c175843266fa68a217aa837dd90fb1b97a28cc258420da832cee5832703cc3cb31a402cd845fc41b6d1b7c6bb5119028b60107b58b0a169 SHA512 82206417d477653373ca1e023b6172e15d90e4f44cd7ef4f9fa25c45ebf267adc0f4e974bbc72d101d0c400c9b0f75670cb00a6ec07051600d35ee8b8f45db00
 EBUILD glib-2.62.6.ebuild 9780 BLAKE2B 2d579c9b3305f25ddec85e34a0d3231272e2751773250b5825cef468fc7886f06461137d4aff9dd0fd85f740470e7f510892646ca114d800ef57e9528f978a25 SHA512 3ad88843bf521fb4286a07191bd721a5a23f6a7d78704c6e7ce307c761927fac5e33cc2dff579b87661825630db95e4dfbc524e917189eb90fb3f7989be7e424
-EBUILD glib-2.64.1.ebuild 10101 BLAKE2B d39f731ad9d2e845246eaaa2b525814e55f822542b030830e90849610865787f110e5e94400b7efe880980a64be73a1c1bcf0606b81120077eb8061af96ceb38 SHA512 4b867fefded0d6b0dc9ae42efefc39087d0c0c54e6afa9555cb0d01ffb22e5bfb67d0cf4dd7125db7066752197807163a2c80d4645b1c59955fc3fd7359a1f6c
-EBUILD glib-2.64.2.ebuild 10109 BLAKE2B 3271b9835f2c6f694facd6e750eb83dd76cd6320cb4f9294f6055e86eaee7c7344bf99b90e12969db0e31bc7065d3232c6d234cb84f4dbec7a7bb5596c70c49d SHA512 b4e95d8dff478d2eb9e06de60d739c260d605967160040d623ee90ce579607d1e7f4e7b124d67cdd886b0cfefbb747b2178b56692b422fc5584de3b20f4b4dff
+EBUILD glib-2.64.3.ebuild 10365 BLAKE2B 4702138fc2ac027dd6f694bf07b0cf9e1d147d5171c3f7d22955766e9d243549372570a54c31977e40edf1924b7d22441d91afa9d529278c2f4d5adecb064f18 SHA512 20ff3ca65e3506b8ab40998f5d7154d15c20808458ceffdc85b02801e05feb08f68bd40f9ac440e7796e76152c3cb872c11debaa273565598b1b93e8da75dc6c
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.64.1.ebuild b/dev-libs/glib/glib-2.64.1.ebuild
deleted file mode 100644
index 9e610133a79b..000000000000
--- a/dev-libs/glib/glib-2.64.1.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# 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 flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# * libelf isn't strictly necessary, but makes gresource tool more useful, and
-# the check is automagic in gio/meson.build. gresource is not a multilib tool
-# right now, thus it doesn't matter if non-native ABI libelf exists or not
-# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	virtual/libelf:0=
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? ( >=sys-apps/dbus-1.2.14 )
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-mark-gdbus-server-auth-test-flaky.patch
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test; then
-		# TODO: Review the test exclusions, especially now with meson
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-		#	ewarn "Some tests will be skipped due to missing terminal program"
-		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
-		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
-		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		# desktop-app-info/launch* might fail similarly
-		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
-		#fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
-		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
-		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
-	fi
-
-	# Don't build fuzzing binaries - not used
-	sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
-	# gdbus-codegen is a separate package
-	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
-	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
-	sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
-	cat > "${T}/glib-test-ld-wrapper" <<-EOF
-		#!/usr/bin/env sh
-		exec \${LD:-ld} "\$@"
-	EOF
-	chmod a+x "${T}/glib-test-ld-wrapper" || die
-	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
-	xdg_src_prepare
-	gnome2_environment_reset
-	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DG_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
-	fi
-
-	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
-	#if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
-		#case ${CHOST} in
-		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		#*)            export glib_cv_stack_grows=no ;;
-		#esac
-	#fi
-
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_feature selinux)
-		$(meson_use xattr)
-		-Dlibmount=enabled # only used if host_system == 'linux'
-		-Dinternal_pcre=false
-		-Dman=true
-		$(meson_use systemtap dtrace)
-		$(meson_use systemtap)
-		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
-		$(meson_use fam)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-		-Doss_fuzz=disabled
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
-	meson_src_install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
-	rm "${ED}/usr/bin/glib-genmarshal" || die
-	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}/usr/bin/glib-mkenums" || die
-	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}/usr/bin/gtester-report" || die
-	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
-	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
-	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"${cache} || die
-		else
-			touch "${ED}"${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	# glib installs no schemas itself, but we force update for fresh install in case
-	# something has dropped in a schemas file without direct glib dep; and for upgrades
-	# in case the compiled schema format could have changed
-	gnome2_schemas_update
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "$v" "-lt" "2.63.6"; then
-			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
-			ewarn "to restart your session for \"Open With\" dialogs to work."
-		fi
-	done
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/glib/glib-2.64.2.ebuild b/dev-libs/glib/glib-2.64.3.ebuild
index a1034108695a..8b05703c3473 100644
--- a/dev-libs/glib/glib-2.64.2.ebuild
+++ b/dev-libs/glib/glib-2.64.3.ebuild
@@ -20,6 +20,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
 # right now, thus it doesn't matter if non-native ABI libelf exists or not
 # (non-native binary is overwritten, it doesn't matter if libelf was linked to).
+# * elfutils (via libelf) does not build on Windows. gresources are not embedded
+# within ELF binaries on that platform anyway and inspecting ELF binaries from
+# other platforms is not that useful so exclude the dependency in this case.
 # * Technically static-libs is needed on zlib, util-linux and perhaps more, but
 # these are used by GIO, which glib[static-libs] consumers don't really seem
 # to need at all, thus not imposing the deps for now and once some consumers
@@ -36,7 +39,7 @@ RDEPEND="
 	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
 	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	virtual/libelf:0=
+	!kernel_Winnt? ( virtual/libelf:0= )
 	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index b24160d86c93..2815c70832db 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,5 +1,3 @@
-AUX gmp-4.1.4-noexecstack.patch 474 BLAKE2B 9b2e6835a9a3b4c23adc3b9569a507d43429b5a8c1e4798717438c84675571bac90ec8202b90b526e46a50a69db1f0b9afb83333d9a69de4397c6c97e70485f3 SHA512 74b8b68061a1a5ac0f8b163974834465e86e930884e1a9cd15c4c948fdae95ffdcbb6e0210d56df6d0dcf1ccbe13dbdfe45552e645c3fdea6454747731b63bc8
-AUX gmp-4.2.1-s390.diff 1848 BLAKE2B 9c7a36b5b203dd5c66084d42bbfb0800269a9c2f534632fb14d94c7561af7eab978c18d66b9a3997f65bf6efa7d800cd673a9b0c329d7f15bd7c646b9fc8efe8 SHA512 ab13186cfdb2a217edb5bd77379d68442685319ec3ca5b9ccadd67a68356f56881ea5feb7dbd40821d6587553d46b63b19ba454a9e3ede27baf72a6857169c44
 AUX gmp-6.1.0-noexecstack-detect.patch 970 BLAKE2B 3b74021e37d5fd6b0b7baa6ad8298962c54cceb769a5f70b3c5fb5ef82392ee2308e6613cd93b0a78b69235c1a73aedc0eb54bbc77b0daebc022d3f1bd05413d SHA512 29af921eed5dbd2d506bc1acdc0eacb8b7f5e7f575fd62038f00a910242bf622980a4197dae18daf5915963c3407ca7eb5bdcb9760f958794348b449fc54e042
 AUX gmp-6.1.2-gcc-apple-4.0.1.patch 979 BLAKE2B 0fe8bf2db0e4633f5d230f02a0bbeb8f0a0dea5c5f2b79e0821733612dadcb0ae4c5815255640afe383e8424e2cf323c0ae33990ee2c21e963811ac434b466a1 SHA512 d1d9898c1978dcdc41dce95d2fc9e23f2ccb0615d02ca453045ece04e9bfd45aa9194774e1e3ea4efe7b40c8f2179233dbecbaa748e7c40d4f31f3adc78d878e
 DIST gmp-6.2.0.tar.xz 2012444 BLAKE2B 928141cf7b0b70f78b66e7bc52aecd39a5fc30e8865b6de6effb5b061ade05a5a51b4680ef2f36ea0d682b319d54ceb1c6c8ef93bde6c2eef2e8b826a34602c3 SHA512 a066f0456f0314a1359f553c49fc2587e484ff8ac390ff88537266a146ea373f97a1c0ba24608bf6756f4eab11c9056f103c8deb99e5b57741b4f7f0ec44b90c
diff --git a/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch b/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch
deleted file mode 100644
index 093bec1a5dca..000000000000
--- a/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-fixed executable stack
-
-http://bugs.gentoo.org/115038
-
---- gmp-4.1.4/configure
-+++ gmp-4.1.4/configure
-@@ -21689,6 +21689,13 @@
- fi
- echo "')" >> $gmp_configm4
- echo "define(\`__CONFIG_M4_INCLUDED__')" >> $gmp_configm4
-+# Gentoo hack
-+case $host_os in
-+	*linux*)
-+		echo '.section .note.GNU-stack,"",%progbits' >> $gmp_configm4
-+		echo '.previous' >> $gmp_configm4
-+		;;
-+esac
- 
- # Create Makefiles
- # FIXME: Upcoming version of autoconf/automake may not like broken lines.
diff --git a/dev-libs/gmp/files/gmp-4.2.1-s390.diff b/dev-libs/gmp/files/gmp-4.2.1-s390.diff
deleted file mode 100644
index 82dbb722eb14..000000000000
--- a/dev-libs/gmp/files/gmp-4.2.1-s390.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-stolen from SuSE
-
---- configure.in
-+++ configure.in
-@@ -1050,6 +1050,9 @@
-     ;;
- 
- 
-+  s390x-*-*)
-+       path="s390x" ;;
-+
-   # IBM s/370 and similar
-   [s3[6-9]0*-*-*])
-     gcc_cflags="-O2 $fomit_frame_pointer"
---- configure
-+++ configure
-@@ -1050,6 +1050,9 @@
-     ;;
- 
- 
-+  s390x-*-*)
-+       path="s390x" ;;
-+
-   # IBM s/370 and similar
-   s3[6-9]0*-*-*)
-     gcc_cflags="-O2 $fomit_frame_pointer"
---- mpn/s390/gmp-mparam.h
-+++ mpn/s390/gmp-mparam.h
-@@ -20,7 +20,8 @@
- MA 02110-1301, USA. */
- 
- 
--/* BITS_PER_MP_LIMB etc generated by configure */
-+#define BITS_PER_MP_LIMB 32
-+#define BYTES_PER_MP_LIMB 4
- 
- 
- /* Generated by tuneup.c, 2001-12-03, gcc 2.95 */
---- mpn/s390x/gmp-mparam.h
-+++ mpn/s390x/gmp-mparam.h
-@@ -0,0 +1,27 @@
-+/* gmp-mparam.h -- Compiler/machine parameter header file.
-+
-+Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation, Inc.
-+
-+This file is part of the GNU MP Library.
-+
-+The GNU MP Library is free software; you can redistribute it and/or modify
-+it under the terms of the GNU Library General Public License as published by
-+the Free Software Foundation; either version 2 of the License, or (at your
-+option) any later version.
-+
-+The GNU MP Library is distributed in the hope that it will be useful, but
-+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-+License for more details.
-+
-+You should have received a copy of the GNU Library General Public License
-+along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
-+the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-+MA 02111-1307, USA. */
-+
-+#define BITS_PER_MP_LIMB 64
-+#define BYTES_PER_MP_LIMB 8
-+#define BITS_PER_LONGINT 64
-+#define BITS_PER_INT 32
-+#define BITS_PER_SHORTINT 16
-+#define BITS_PER_CHAR 8
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 07bb38381882..1f8ca8d08d2b 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -5,5 +5,5 @@ DIST icu4c-66_1-src.tgz 24361305 BLAKE2B db26e9380305601f8429366e2813ce3ccae11f3
 DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
 EBUILD icu-layoutex-65.1.ebuild 2578 BLAKE2B b23ccd7059c974b440f832c296e85210c2eb567d371751b2e839bd5d387a87efeac85db7e5830f1e396a01164740cb86aeb90fc3c7b17c7f3f868ba4a93f0efa SHA512 8b0916aee9dd27e7d2a1e507fd9cf11cc98a175b043844076c070d96df6ee5f507c11222e35b23bcd5eb0cd5f18699224181df4a7fc0d0d7dd841dc27089e320
 EBUILD icu-layoutex-66.1.ebuild 2584 BLAKE2B bcdba335888e2f7f6c1627c62cef1105c1bc48b3ef47ec46a898a2b57cb6552bffbc7399b2875f7483bce63d9cb1c7d69b51213ed81217ddda31eaf91c4bcaf6 SHA512 ad10557dde1cf70e99dae4aa8a00ec1db205173898ac2017d523ac4855e19d2e859d4ba25ad012b735196b462d6ba2c966fac078fee57f228bbfa51cd211522c
-EBUILD icu-layoutex-67.1.ebuild 2528 BLAKE2B f0ef3fb94ea1688cec7f9bb89a78ca71d50e24b5a4ddea9c6b63d28cda1d456e56b312d8602df9fb68beabc66dc786d478ef7356873ad4961e49e375cef678dd SHA512 52a392697a53387568be14fb20e7a9afe71394b6dab663a0305338c4e2229f5b0c81393a96b5afd24f27cd7a54d93837ef996ca2b41746aa1f4cf85bec9627ac
+EBUILD icu-layoutex-67.1.ebuild 2525 BLAKE2B f6a6dc984f36755ed2eeb46a5fb0005a6c2765ccdea6fcf86e6470bde80c19ab271086557c87f33124ea00933c1ac0ed543a4a1d85b4a8082689d05d907fe3ae SHA512 d3376a6f4a304e38b030ca1d6b94b108f5c30e5e8da92f1ce8fcb7024af2b4ea664af34795719fcce1169227f583a1cab4ef9da61be9a47ff79a345db9c4faf6
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild
index 847fdd9e2fdc..6ad2e05b44c9 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-67.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/icu-le-hb/Manifest b/dev-libs/icu-le-hb/Manifest
index 7741738cdd2b..1b085b32bd70 100644
--- a/dev-libs/icu-le-hb/Manifest
+++ b/dev-libs/icu-le-hb/Manifest
@@ -1,3 +1,3 @@
 DIST icu-le-hb-1.0.3.tar.gz 39352 BLAKE2B 7cc2e56b6ac334e0f9c259d4f9d0356480c1ae4eb647610ebfb81ee9b1bc0326f1dba68991e2893cc9b029ea53705cc0936cbbf29e74ab4ef336f58f5e8b47ab SHA512 06dff69bc17c39c13bd5bc801dbe09e2dc2f0cdf1acd774fa863e09f4a65820b2f330d4836da6748c077365f685fa74452ec1924785e3191cc2925036803cbb4
-EBUILD icu-le-hb-1.0.3.ebuild 848 BLAKE2B 18456898b19e3b1849e3d08e70aa59f1ce76b7556d55db4febef31557f56ab09f0af785adc7af05e44d30f86fd022790541f5daca3a9a92a6d53c9563f64582a SHA512 a3f99b8eb392d028cfe7c1ec241cd82c1c95e741d563c8c464cf6c6babc95a8b54527574bc55fc76112b423bb232400140df41865971e9b73feffae56e46b973
+EBUILD icu-le-hb-1.0.3-r1.ebuild 956 BLAKE2B eebef476b3b8355bda7a40712743362efeb2bf313506a7716f8c23dbf474bcdcbdaae8231184386ffbc7c9c7f907125cefef41daa07ae7f0085fa9acb8c4c994 SHA512 c2a45cf4bcf8ba1de7e43e88e9e683b896552c63c545517336fd573f7fbb350bb32f08f19634e1b3c16bbd8f1b0dc3d8070cfa97a9da3bbaa4f0ec4ab89ef841
 MISC metadata.xml 464 BLAKE2B 326f9087cfc3c08145ed5ef2dd2c109fcf1c81ca3a8a4394504045361243c4e9db69fee1f47d67bb7aa9a91e3d6e62cc61f45a74b611d62c389a70e1a1829058 SHA512 40aeb13c0ee32afb9b58e3412bf26806bbf724deebd6b966477412df1889cfc62c90755820381d3622a535ce83ec7bf4e051f85dea84138b84bf553ecc7b84fb
diff --git a/dev-libs/icu-le-hb/icu-le-hb-1.0.3.ebuild b/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
index 303b08a82b8a..bc67bb2c0d34 100644
--- a/dev-libs/icu-le-hb/icu-le-hb-1.0.3.ebuild
+++ b/dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools multilib-minimal
 
@@ -22,8 +22,8 @@ RDEPEND="
 	media-libs/harfbuzz:=[${MULTILIB_USEDEP}]
 "
 
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 "
 
@@ -33,5 +33,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf
+	ECONF_SOURCE="${S}" econf --disable-static
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index 7d1c3104d44c..6bbb300825a9 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -7,5 +7,5 @@ DIST icu4c-66_1-src.tgz 24361305 BLAKE2B db26e9380305601f8429366e2813ce3ccae11f3
 DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
 EBUILD icu-65.1-r1.ebuild 3450 BLAKE2B 6445ff5d1a3aabd1e13c3c28bc88d73d8e17987796ee78d34b5e6691ad9fc05476fabf9d1e7de3358e83b47ad06a52a73abb7009cc01f2236dc5ebe5bdde9744 SHA512 a9a93f1b1ecc9572ca6d4372722fac674a04782a6e96a883463f0ba56d5412bd9e9848b95c59de72d5db2d60c068f70a04b6d47062afeb370180e4643c619149
 EBUILD icu-66.1.ebuild 3461 BLAKE2B 37520954048dfffe44283613d9c3e16163f4a91b6650c0aba6c58308171cf5a965c3c509c3368bc7f00be62d5f9967331201bba383e4ce05f90b088df4243160 SHA512 7cf2a24f268663dc45d4e79be2e896c1fdd4b2f29e404f54c92fedefd294fb09602ca9882239400f4fb818ca1b167773ac76bef21a18ddcc2b54e13565e0f918
-EBUILD icu-67.1.ebuild 3343 BLAKE2B b786864541035086d91e701ce101079e25efb10263535b623d76d1a25be63d19315f02c2d7c83007f191e020708d5f91f472967823ce42c17da2dcba0cc298a4 SHA512 02ffddad997ede82780250a3e81fbd4a2e857ce77a0687af22db146f93dc2eadd0cb855a1669ea9ea08993486694996fdab3b53c73e40bdbc401a40a4915d102
+EBUILD icu-67.1.ebuild 3339 BLAKE2B 2165f22dc3da219ded8d825179a6238c17930b09d4921300bfafdb96ddf48d879e6939a8f301e0270f7267a31749919764e595485864b2edabfd4b71f9375ef6 SHA512 941d0f8419bee814518e60306e7c3c2a61d78ba0bb6022a53a2375e9884579ad58478ce6a93ee55e6677f4e9f9b9f841aa7cae190ea80e99ca1c4fc6fe3c2979
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-67.1.ebuild b/dev-libs/icu/icu-67.1.ebuild
index 50248a6dbbd2..a5ddc28cca99 100644
--- a/dev-libs/icu/icu-67.1.ebuild
+++ b/dev-libs/icu/icu-67.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index fd3c59ace464..7a28e2e1cf8e 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1,6 +1,5 @@
 AUX isl-0.07-gdb-autoload-dir.patch 871 BLAKE2B c3bbc1db60cbf0c844839f07190e81265e606d7796438be1e7d370f559316f4a0096ce12fc93b583c0663de83592e6f4c50bef838eb42273059ac2cea16e17b5 SHA512 ffe4db1e1bc2199718667d7e3835d5d3fcabfa82402d39ec540fb86641ced3a46d43cd60682188883927c796925679142b4481b231d218bd776cb3c08ef8117e
 AUX isl-0.19-gdb-autoload-dir.patch 809 BLAKE2B 59dce21b8f0a7226b7b266eebd6226c0821658a548d6b1f896e58f09b03f703162db287df2f2dcaaebe58bcb76ea7e24075802e6df32581cf5e96f3e43ca1e58 SHA512 396c7c00b00c19a269540abf464f6e30d4473c9413d67a436cd4294b3cb53a5c94ab34e8e5c76c863243437d8754edaf924148596e547ef551e6d72c8122ff27
-AUX isl-0.22-bmap-nullderef.patch 1223 BLAKE2B 21af9877b9a6ea9645ad1b86f40dfd6d4a0bf8f68e905c34deb5aff376791de7f363c4086a7fab63fa0aaface5488c58fce25e583558c055502d6437d9230687 SHA512 56cb1c77b16b03e2c6a50a6cc2e6e8480027b4874ebc56660d931c03468c6c8c5f21fbab5f5d27b7b93bbf6d7680b52e52349bcf433456a8cd2ec4a7bb8a0ff7
 DIST isl-0.12.2.tar.bz2 1319434 BLAKE2B 53f009dc8093fb3d7d2db40db8f6fd9d7de630777e0308ac3c5918c2c106eda0edd7451df18c954ed6c9fc3ed7d18c73708d7b1f94c8c5c55aa94f8845f5b219 SHA512 b5dea4d6b504fac22f2d8cd9c47d6896994d3966635a514d45010243db44cfbc009574b808f3587f35d91de629110bc11b52941d4075e21f8646c59656e62aea
 DIST isl-0.22.1.tar.xz 1676948 BLAKE2B cf1661f785344d8132e8f8a339ed8d457677ca1bf943a597d3d0be1e80d8c42e788cdde79fd073d130d681424da7a8e3ca9fa2cd4cd4232220f5c5a1ce99ab99 SHA512 8dc7b0c14e5bfdca8f2161be51d3c9afcd18bc217bb19b7de01dbba0c6f3fdc2b725fb999f8562c77bf2918d3005c9247f7a58474a6da7697390067944d4d4aa
 EBUILD isl-0.12.2.ebuild 1031 BLAKE2B 250f4a805da5df7152375487b1266d2f11814078ba9cb26f7eb8f850a78845c083d6126cf65837f3efb119ec7a7f29e4870c0e33ce76f21a53ca89a92efab131 SHA512 03c6813fc31fdb31b307f2440234551bcf72819eac85750b2fbd4d987e431605518568a30a596cd7e372dd779fb9f424ab558c3827bec034891ebff0b7409be9
diff --git a/dev-libs/isl/files/isl-0.22-bmap-nullderef.patch b/dev-libs/isl/files/isl-0.22-bmap-nullderef.patch
deleted file mode 100644
index 00104f1f4321..000000000000
--- a/dev-libs/isl/files/isl-0.22-bmap-nullderef.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://groups.google.com/forum/#!original/isl-development/Otz1QKZDpzA/71GkTvqkCAAJ
-https://bugs.gentoo.org/702968
-
-Subject: [MAINT PATCH] isl_basic_map_underlying_set: fix error handling
-Date: Tue,  7 Jan 2020 23:02:42 +0100
-Message-Id: <20200107220242...@kotnet.org>
-X-Mailer: git-send-email 2.24.1.591.g12029dc57d
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-From: Sven Verdoolaege <sven.ve...@gmail.com>
-
-The check for a valid bmap before accessing its n_div field
-was inadvertently removed in isl-0.21-230-g6a4c4bbf31 (isl_map.c:
-extract out shared isl_basic_map_{take,restore}_space,
-Thu Aug 11 10:27:49 2016 +0200).
-
-Reported-by: Richard Biener <rgue...@suse.de>
-Signed-off-by: Sven Verdoolaege <sven.ve...@gmail.com>
----
- isl_map.c | 2 ++
- 1 file changed, 2 insertions(+)
---- a/isl_map.c
-+++ b/isl_map.c
-@@ -5511,6 +5511,8 @@ __isl_give isl_basic_set *isl_basic_map_underlying_set(
- 	    !isl_space_is_named_or_nested(bmap->dim, isl_dim_out))
- 		return bset_from_bmap(bmap);
- 	bmap = isl_basic_map_cow(bmap);
-+	if (!bmap)
-+		return NULL;
- 	space = isl_basic_map_take_space(bmap);
- 	space = isl_space_underlying(space, bmap->n_div);
- 	bmap = isl_basic_map_restore_space(bmap, space);
--- 
-2.24.1.591.g12029dc57d
diff --git a/dev-libs/jerasure/Manifest b/dev-libs/jerasure/Manifest
index 0a6e5e66cc27..8bde780006ed 100644
--- a/dev-libs/jerasure/Manifest
+++ b/dev-libs/jerasure/Manifest
@@ -1,3 +1,4 @@
 DIST jerasure-2.0.0.tar.gz 806283 BLAKE2B c2513c103aaaeab072978c0711081b0ec89d75881e7ec5a3046fc31f96ce3e2540dd988078aa705768de28c8d495b4c035256d87810d54b6d29ac0b4678c39c6 SHA512 c14b227b4c4ae50d7e1add0f14a888894233228be8aadfc96e8788a14c51ff82fd48d9ca5fbd7d77bf5d17edf0deaef9ff61dffc65100f22f28d7cf32fa32e31
 EBUILD jerasure-2.0.0-r1.ebuild 731 BLAKE2B f4ed7dc776e27397700e23d0213565fafcc76a95a9ac41b0068f2172be93e2a361342f66766e6660203ec5fcecc8bad1b558ec995b91d4e1fd58beca48479dce SHA512 cbf9e0934b4bedb6b5f43e61b71d302090c8926873eeeb96ce8c88f9ca039a2934d25e762940069847cd1d52acb9259fd96ea76de0daa5604283526fc61c7834
+EBUILD jerasure-2.0.0-r2.ebuild 830 BLAKE2B 59315d7fdd5a347bec0086e31072a2f8bde5f748248acf8bc3dc435bfe8f04ffdd25eaf7cd3735d69b0ff0fa53970790c9f068ed19b97789f8cb237be3021f7a SHA512 d65a75a5728e7a6d46049dbd6edc630f141f0d24369eed786c7db91b1578261cb58c8368482c794b0856d9b040b09ecbaf8d35878f96318ba3d58e4622c0493c
 MISC metadata.xml 371 BLAKE2B 57b48284c6902ef89797ac9e63452e3ae6dc0b1cb223c9dbebeba4aa52d4c37f64cbb0ecab23099c68cb1eb9ac675a3fd90bb86520d7fe17505024fe4578abba SHA512 6073568ff06bc2ee07189affd7dd44425d9e028a5dd558d3aa41b6813b123681f4e50cf7a911fed42f342d576088f0be61282748c5d0e067bd664aa5b7acd554
diff --git a/dev-libs/jerasure/jerasure-2.0.0-r2.ebuild b/dev-libs/jerasure/jerasure-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..1796fd75e75c
--- /dev/null
+++ b/dev-libs/jerasure/jerasure-2.0.0-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools eutils
+
+DESCRIPTION="A Library in C Facilitating Erasure Coding for Storage Applications"
+HOMEPAGE="http://jerasure.org"
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/${P}.tar.gz"
+S="${WORKDIR}/${PN}.git"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/gf-complete"
+RDEPEND="${DEPEND}"
+
+DOCS=( Manual.pdf README README.txt README.nd )
+
+src_prepare() {
+	sed -i -e 's/ $(SIMD_FLAGS)//g' src/Makefile.am Examples/Makefile.am || die
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	einstalldocs
+	doheader include/{cauchy,galois,liberation,reed_sol}.h
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index dd25e7b78f3f..3497ddb6bdb6 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,9 +1,11 @@
-AUX json-c-0.14_cmake-static-libs.patch 1818 BLAKE2B 4058bdcf64d59510e4f7dbbf5a1aa2d36d5c3f3b094c999a09afd5739dc8e837a08fd39aeabee72cc9845a11e3923c1271b51a5273bc8850a1a75e1e832ff094 SHA512 23c8fb64ca5c7e97ab060d5e984c264fb9ff508fa08dd99c362a52fbd281c488c5d84e0426ea386c87afc87cf0d0d68ab3618d86a599f9be6e4fec1c158b75a2
+AUX json-c-0.14-cmake-static-libs.patch 1818 BLAKE2B 4058bdcf64d59510e4f7dbbf5a1aa2d36d5c3f3b094c999a09afd5739dc8e837a08fd39aeabee72cc9845a11e3923c1271b51a5273bc8850a1a75e1e832ff094 SHA512 23c8fb64ca5c7e97ab060d5e984c264fb9ff508fa08dd99c362a52fbd281c488c5d84e0426ea386c87afc87cf0d0d68ab3618d86a599f9be6e4fec1c158b75a2
+AUX json-c-0.14-object-limitation.patch 8789 BLAKE2B 39e307143dd439cf5eafebc86851c98cb09ab45ad33f4e30b7d1f88a4d22feebbe9a472d8b856de15d9a5f66f5b3b1a507958a5594967ac1e44b130ef62f91de SHA512 6a3ad442ae56082f6c76dc53aa9d9d5eb77743a33f1ed28fc49df6e445932f5809d094feca8d1f4cf90f6fe6516e902de99c481bab0527e2fa382ab008dbdd7c
+AUX json-c-0.14-security-fix.patch 4830 BLAKE2B a8df7709bd2924946b038ed724a2e764c3786b8a35ad6b4e5736561901fd7c24f46f0f48b7dfb1b21395fa0fbda24e2bbbfd81d50f9c8de52908022c766df744 SHA512 3a3c31890ef7c1d6cca4f2bcd1b76602165471ab03d55c85da8c821e82e1985fa33ebbc35fa63350158fba5ba517f45f0a895f0624da97bb6f7caab0e4eec7b6
 DIST json-c-0.12.tar.gz 501419 BLAKE2B 24f035792ff1ba5c39e55bca6ee4ba2509ab71d0374c70b520791f38e1ec4ff2245a282f234fde9f4a02cd9eaaaaa998ce307563a20702c04ee972fdf51f2539 SHA512 c959804362386f6b77e9d04b5fedf6d6aff1fcd0ab50250edb25f759b510b402e7ad4b33d1cbadc3337b63a3145d19f310812a9ee351748348304b384dc2dc35
 DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
 DIST json-c-0.14.tar.gz 321677 BLAKE2B 39325988dd58dad589fc0f036c17b2337c81cf7aab8ecb2232f8d59fef9d38df28e096f8d22320e0003799d477debddc4926eaa7a170954263c6b303c1fa056e SHA512 75537c61d0632a01f94d2394d7a4387ef1eca0b68aa56c495d3d96dd29b38ed20eb0cc3f6e5e24dc6660c8939669f8954005d9c3ba20437f3fcc9f9dd896b00d
 EBUILD json-c-0.12.ebuild 916 BLAKE2B 835228c2ad857ff7a698d12400958b8aaa7da2828d92617b36db62e01433a3efbd3704134089b63f3a440489ae03bfcf873c303b35ccca516099d47f7633fb0c SHA512 02b0f07045736394ef18ca98901496c73153043e8825da2039c89607d5d2ca399e70ae371297f0b88ec05caad06a95ba83e589ebc89eea5345ecb12a05b4b3de
 EBUILD json-c-0.13.1-r1.ebuild 979 BLAKE2B 7df2aca92e501c35826dc6c30e190cbafc2719203bba58bcf525b8d6bb15e3602d4b69c5544032c34e90fd6e9a285cedeab5094e383aa2b0d434660ee8b72b35 SHA512 b7ed1dd4ac4ba08082c244bfe414abc1462491ab03d3ee1756641936323f8c19d6ee45a4681e48f3facd6584c8678e5c200d920950a4533b0b8c345273885056
-EBUILD json-c-0.14-r1.ebuild 1085 BLAKE2B 292a5c208ceacf84dfe9741954c23cc3ebef6211ae9bf2cd822cb0799432905aaacec37b3925d018eb1c60ee53d571407ccb5e84cb78534d096e235c981e0b5e SHA512 2130bf196a82c1dce499e9a84bdae5ef09a5aed7eb481a92a040b74a0f0b570cd7331c9269dcf51f91aa465833c6b37bd5396c83c5cbc8eeb78121ead68745d5
+EBUILD json-c-0.14-r3.ebuild 1171 BLAKE2B c721f662a31ea9027873323bd09d4e36ea0dd65b532b68a0cb399fb94c6a25a87f90b5607bb9dbef8d76b6bb0b089b7776a037524f4342fac8e44859b2141cb7 SHA512 3b9eafd2027eee5164ad6ff6a952c6ee27490ee62085e5b1dd7803f95acd80e1c36d4bb2a61397355b9efd87ddec0998a8997f0512e314ae234294a513d46aab
 EBUILD json-c-9999.ebuild 896 BLAKE2B 50472b5af6d32d7f34260d23cd3104b169950f4d2558e709e4ac1891a5fd3318e3642c24aac053237dddf3164407d028270c7380c211ae7df24679bbc2bccf66 SHA512 e415df947a96271e63acd845b5a61032f7258b9cbfe60771f849c928f0223728f2053b73045163fd5a9601551956567b0f802f893e1077c4a87cfc60020fdd18
 MISC metadata.xml 1000 BLAKE2B 3b29ad6f95a8a66a09a2db159cc3bb6881cca30bf12a6659999c68500b739a5562e67d56380aca518da55f32e4edc117f59200adcb73b51257d34e6e952a460e SHA512 fc23e7b7ab9b16a04e5a1bc85571edb5629d37eb599d76db34ab9d988e54dd4d2ddc98f8e2567a97bc18871c0375cf3353053a67ae7eea47657928f40b363f6f
diff --git a/dev-libs/json-c/files/json-c-0.14_cmake-static-libs.patch b/dev-libs/json-c/files/json-c-0.14-cmake-static-libs.patch
index 3913fc320bca..3913fc320bca 100644
--- a/dev-libs/json-c/files/json-c-0.14_cmake-static-libs.patch
+++ b/dev-libs/json-c/files/json-c-0.14-cmake-static-libs.patch
diff --git a/dev-libs/json-c/files/json-c-0.14-object-limitation.patch b/dev-libs/json-c/files/json-c-0.14-object-limitation.patch
new file mode 100644
index 000000000000..ebd7ca805065
--- /dev/null
+++ b/dev-libs/json-c/files/json-c-0.14-object-limitation.patch
@@ -0,0 +1,93 @@
+From 519dfe1591d85432986f9762d41d1a883198c157 Mon Sep 17 00:00:00 2001
+From: Eric Haszlakiewicz <erh+git@nimenees.com>
+Date: Sun, 10 May 2020 03:32:19 +0000
+Subject: [PATCH 01/13] Issue #599: Fix the backwards check in
+ lh_table_insert_w_hash() that was preventing adding more than 11 objects. Add
+ a test to check for this too.
+
+---
+ linkhash.c           |  2 +-
+ tests/test4.c        | 29 +++++++++++++++++++++++++++++
+ tests/test4.expected |  1 +
+ 3 files changed, 31 insertions(+), 1 deletion(-)
+
+diff --git a/linkhash.c b/linkhash.c
+index 51e90b1..f930efd 100644
+--- a/linkhash.c
++++ b/linkhash.c
+@@ -582,7 +582,7 @@ int lh_table_insert_w_hash(struct lh_table *t, const void *k, const void *v, con
+ 
+ 	if (t->count >= t->size * LH_LOAD_FACTOR) {
+ 		/* Avoid signed integer overflow with large tables. */
+-		int new_size = INT_MAX / 2 < t->size ? t->size * 2 : INT_MAX;
++		int new_size = (t->size > INT_MAX / 2) ? INT_MAX : (t->size * 2);
+ 		if (t->size == INT_MAX || lh_table_resize(t, new_size) != 0)
+ 			return -1;
+ 	}
+diff --git a/tests/test4.c b/tests/test4.c
+index bd964ec..fd2f3be 100644
+--- a/tests/test4.c
++++ b/tests/test4.c
+@@ -3,8 +3,10 @@
+  */
+ 
+ #include "config.h"
++#include <assert.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "json_inttypes.h"
+ #include "json_object.h"
+@@ -24,6 +26,30 @@ void print_hex(const char *s)
+ 	putchar('\n');
+ }
+ 
++static void test_lot_of_adds(void);
++static void test_lot_of_adds()
++{
++	int ii;
++	char key[50];
++	json_object *jobj = json_object_new_object();
++	assert(jobj != NULL);
++	for (ii = 0; ii < 500; ii++)
++	{
++		snprintf(key, sizeof(key), "k%d", ii);
++		json_object *iobj = json_object_new_int(ii);
++		assert(iobj != NULL);
++		if (json_object_object_add(jobj, key, iobj))
++		{
++			fprintf(stderr, "FAILED to add object #%d\n", ii);
++			abort();
++		}
++	}
++	printf("%s\n", json_object_to_json_string(jobj));
++	assert(json_object_object_length(jobj) == 500);
++	json_object_put(jobj);
++}
++
++
+ int main(void)
+ {
+ 	const char *input = "\"\\ud840\\udd26,\\ud840\\udd27,\\ud800\\udd26,\\ud800\\udd27\"";
+@@ -52,5 +78,8 @@ int main(void)
+ 		retval = 1;
+ 	}
+ 	json_object_put(parse_result);
++
++	test_lot_of_adds();
++
+ 	return retval;
+ }
+diff --git a/tests/test4.expected b/tests/test4.expected
+index 68d4336..cb27440 100644
+--- a/tests/test4.expected
++++ b/tests/test4.expected
+@@ -1,3 +1,4 @@
+ input: "\ud840\udd26,\ud840\udd27,\ud800\udd26,\ud800\udd27"
+ JSON parse result is correct: 𠄦,𠄧,𐄦,𐄧
+ PASS
++{ "k0": 0, "k1": 1, "k2": 2, "k3": 3, "k4": 4, "k5": 5, "k6": 6, "k7": 7, "k8": 8, "k9": 9, "k10": 10, "k11": 11, "k12": 12, "k13": 13, "k14": 14, "k15": 15, "k16": 16, "k17": 17, "k18": 18, "k19": 19, "k20": 20, "k21": 21, "k22": 22, "k23": 23, "k24": 24, "k25": 25, "k26": 26, "k27": 27, "k28": 28, "k29": 29, "k30": 30, "k31": 31, "k32": 32, "k33": 33, "k34": 34, "k35": 35, "k36": 36, "k37": 37, "k38": 38, "k39": 39, "k40": 40, "k41": 41, "k42": 42, "k43": 43, "k44": 44, "k45": 45, "k46": 46, "k47": 47, "k48": 48, "k49": 49, "k50": 50, "k51": 51, "k52": 52, "k53": 53, "k54": 54, "k55": 55, "k56": 56, "k57": 57, "k58": 58, "k59": 59, "k60": 60, "k61": 61, "k62": 62, "k63": 63, "k64": 64, "k65": 65, "k66": 66, "k67": 67, "k68": 68, "k69": 69, "k70": 70, "k71": 71, "k72": 72, "k73": 73, "k74": 74, "k75": 75, "k76": 76, "k77": 77, "k78": 78, "k79": 79, "k80": 80, "k81": 81, "k82": 82, "k83": 83, "k84": 84, "k85": 85, "k86": 86, "k87": 87, "k88": 88, "k89": 89, "k90": 90, "k91": 91, "k92": 92, "k93": 93, "k94": 94, "k95": 95, "k96": 96, "k97": 97, "k98": 98, "k99": 99, "k100": 100, "k101": 101, "k102": 102, "k103": 103, "k104": 104, "k105": 105, "k106": 106, "k107": 107, "k108": 108, "k109": 109, "k110": 110, "k111": 111, "k112": 112, "k113": 113, "k114": 114, "k115": 115, "k116": 116, "k117": 117, "k118": 118, "k119": 119, "k120": 120, "k121": 121, "k122": 122, "k123": 123, "k124": 124, "k125": 125, "k126": 126, "k127": 127, "k128": 128, "k129": 129, "k130": 130, "k131": 131, "k132": 132, "k133": 133, "k134": 134, "k135": 135, "k136": 136, "k137": 137, "k138": 138, "k139": 139, "k140": 140, "k141": 141, "k142": 142, "k143": 143, "k144": 144, "k145": 145, "k146": 146, "k147": 147, "k148": 148, "k149": 149, "k150": 150, "k151": 151, "k152": 152, "k153": 153, "k154": 154, "k155": 155, "k156": 156, "k157": 157, "k158": 158, "k159": 159, "k160": 160, "k161": 161, "k162": 162, "k163": 163, "k164": 164, "k165": 165, "k166": 166, "k167": 167, "k168": 168, "k169": 169, "k170": 170, "k171": 171, "k172": 172, "k173": 173, "k174": 174, "k175": 175, "k176": 176, "k177": 177, "k178": 178, "k179": 179, "k180": 180, "k181": 181, "k182": 182, "k183": 183, "k184": 184, "k185": 185, "k186": 186, "k187": 187, "k188": 188, "k189": 189, "k190": 190, "k191": 191, "k192": 192, "k193": 193, "k194": 194, "k195": 195, "k196": 196, "k197": 197, "k198": 198, "k199": 199, "k200": 200, "k201": 201, "k202": 202, "k203": 203, "k204": 204, "k205": 205, "k206": 206, "k207": 207, "k208": 208, "k209": 209, "k210": 210, "k211": 211, "k212": 212, "k213": 213, "k214": 214, "k215": 215, "k216": 216, "k217": 217, "k218": 218, "k219": 219, "k220": 220, "k221": 221, "k222": 222, "k223": 223, "k224": 224, "k225": 225, "k226": 226, "k227": 227, "k228": 228, "k229": 229, "k230": 230, "k231": 231, "k232": 232, "k233": 233, "k234": 234, "k235": 235, "k236": 236, "k237": 237, "k238": 238, "k239": 239, "k240": 240, "k241": 241, "k242": 242, "k243": 243, "k244": 244, "k245": 245, "k246": 246, "k247": 247, "k248": 248, "k249": 249, "k250": 250, "k251": 251, "k252": 252, "k253": 253, "k254": 254, "k255": 255, "k256": 256, "k257": 257, "k258": 258, "k259": 259, "k260": 260, "k261": 261, "k262": 262, "k263": 263, "k264": 264, "k265": 265, "k266": 266, "k267": 267, "k268": 268, "k269": 269, "k270": 270, "k271": 271, "k272": 272, "k273": 273, "k274": 274, "k275": 275, "k276": 276, "k277": 277, "k278": 278, "k279": 279, "k280": 280, "k281": 281, "k282": 282, "k283": 283, "k284": 284, "k285": 285, "k286": 286, "k287": 287, "k288": 288, "k289": 289, "k290": 290, "k291": 291, "k292": 292, "k293": 293, "k294": 294, "k295": 295, "k296": 296, "k297": 297, "k298": 298, "k299": 299, "k300": 300, "k301": 301, "k302": 302, "k303": 303, "k304": 304, "k305": 305, "k306": 306, "k307": 307, "k308": 308, "k309": 309, "k310": 310, "k311": 311, "k312": 312, "k313": 313, "k314": 314, "k315": 315, "k316": 316, "k317": 317, "k318": 318, "k319": 319, "k320": 320, "k321": 321, "k322": 322, "k323": 323, "k324": 324, "k325": 325, "k326": 326, "k327": 327, "k328": 328, "k329": 329, "k330": 330, "k331": 331, "k332": 332, "k333": 333, "k334": 334, "k335": 335, "k336": 336, "k337": 337, "k338": 338, "k339": 339, "k340": 340, "k341": 341, "k342": 342, "k343": 343, "k344": 344, "k345": 345, "k346": 346, "k347": 347, "k348": 348, "k349": 349, "k350": 350, "k351": 351, "k352": 352, "k353": 353, "k354": 354, "k355": 355, "k356": 356, "k357": 357, "k358": 358, "k359": 359, "k360": 360, "k361": 361, "k362": 362, "k363": 363, "k364": 364, "k365": 365, "k366": 366, "k367": 367, "k368": 368, "k369": 369, "k370": 370, "k371": 371, "k372": 372, "k373": 373, "k374": 374, "k375": 375, "k376": 376, "k377": 377, "k378": 378, "k379": 379, "k380": 380, "k381": 381, "k382": 382, "k383": 383, "k384": 384, "k385": 385, "k386": 386, "k387": 387, "k388": 388, "k389": 389, "k390": 390, "k391": 391, "k392": 392, "k393": 393, "k394": 394, "k395": 395, "k396": 396, "k397": 397, "k398": 398, "k399": 399, "k400": 400, "k401": 401, "k402": 402, "k403": 403, "k404": 404, "k405": 405, "k406": 406, "k407": 407, "k408": 408, "k409": 409, "k410": 410, "k411": 411, "k412": 412, "k413": 413, "k414": 414, "k415": 415, "k416": 416, "k417": 417, "k418": 418, "k419": 419, "k420": 420, "k421": 421, "k422": 422, "k423": 423, "k424": 424, "k425": 425, "k426": 426, "k427": 427, "k428": 428, "k429": 429, "k430": 430, "k431": 431, "k432": 432, "k433": 433, "k434": 434, "k435": 435, "k436": 436, "k437": 437, "k438": 438, "k439": 439, "k440": 440, "k441": 441, "k442": 442, "k443": 443, "k444": 444, "k445": 445, "k446": 446, "k447": 447, "k448": 448, "k449": 449, "k450": 450, "k451": 451, "k452": 452, "k453": 453, "k454": 454, "k455": 455, "k456": 456, "k457": 457, "k458": 458, "k459": 459, "k460": 460, "k461": 461, "k462": 462, "k463": 463, "k464": 464, "k465": 465, "k466": 466, "k467": 467, "k468": 468, "k469": 469, "k470": 470, "k471": 471, "k472": 472, "k473": 473, "k474": 474, "k475": 475, "k476": 476, "k477": 477, "k478": 478, "k479": 479, "k480": 480, "k481": 481, "k482": 482, "k483": 483, "k484": 484, "k485": 485, "k486": 486, "k487": 487, "k488": 488, "k489": 489, "k490": 490, "k491": 491, "k492": 492, "k493": 493, "k494": 494, "k495": 495, "k496": 496, "k497": 497, "k498": 498, "k499": 499 }
+-- 
+2.26.2
+
diff --git a/dev-libs/json-c/files/json-c-0.14-security-fix.patch b/dev-libs/json-c/files/json-c-0.14-security-fix.patch
new file mode 100644
index 000000000000..69a0bc754716
--- /dev/null
+++ b/dev-libs/json-c/files/json-c-0.14-security-fix.patch
@@ -0,0 +1,155 @@
+From 099016b7e8d70a6d5dd814e788bba08d33d48426 Mon Sep 17 00:00:00 2001
+From: Tobias Stoeckmann <tobias@stoeckmann.org>
+Date: Mon, 4 May 2020 19:41:16 +0200
+Subject: [PATCH 1/3] Protect array_list_del_idx against size_t overflow.
+
+If the assignment of stop overflows due to idx and count being
+larger than SIZE_T_MAX in sum, out of boundary access could happen.
+
+It takes invalid usage of this function for this to happen, but
+I decided to add this check so array_list_del_idx is as safe against
+bad usage as the other arraylist functions.
+---
+ arraylist.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arraylist.c b/arraylist.c
+index 12ad8af6d3..e5524aca75 100644
+--- a/arraylist.c
++++ b/arraylist.c
+@@ -136,6 +136,9 @@ int array_list_del_idx(struct array_list *arr, size_t idx, size_t count)
+ {
+ 	size_t i, stop;
+ 
++	/* Avoid overflow in calculation with large indices. */
++	if (idx > SIZE_T_MAX - count)
++		return -1;
+ 	stop = idx + count;
+ 	if (idx >= arr->length || stop > arr->length)
+ 		return -1;
+
+From 77d935b7ae7871a1940cd827e850e6063044ec45 Mon Sep 17 00:00:00 2001
+From: Tobias Stoeckmann <tobias@stoeckmann.org>
+Date: Mon, 4 May 2020 19:46:45 +0200
+Subject: [PATCH 2/3] Prevent division by zero in linkhash.
+
+If a linkhash with a size of zero is created, then modulo operations
+are prone to division by zero operations.
+
+Purely protective measure against bad usage.
+---
+ linkhash.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/linkhash.c b/linkhash.c
+index 7ea58c0abf..f05cc38030 100644
+--- a/linkhash.c
++++ b/linkhash.c
+@@ -12,6 +12,7 @@
+ 
+ #include "config.h"
+ 
++#include <assert.h>
+ #include <limits.h>
+ #include <stdarg.h>
+ #include <stddef.h>
+@@ -499,6 +500,8 @@ struct lh_table *lh_table_new(int size, lh_entry_free_fn *free_fn, lh_hash_fn *h
+ 	int i;
+ 	struct lh_table *t;
+ 
++	/* Allocate space for elements to avoid divisions by zero. */
++	assert(size > 0);
+ 	t = (struct lh_table *)calloc(1, sizeof(struct lh_table));
+ 	if (!t)
+ 		return NULL;
+
+From d07b91014986900a3a75f306d302e13e005e9d67 Mon Sep 17 00:00:00 2001
+From: Tobias Stoeckmann <tobias@stoeckmann.org>
+Date: Mon, 4 May 2020 19:47:25 +0200
+Subject: [PATCH 3/3] Fix integer overflows.
+
+The data structures linkhash and printbuf are limited to 2 GB in size
+due to a signed integer being used to track their current size.
+
+If too much data is added, then size variable can overflow, which is
+an undefined behaviour in C programming language.
+
+Assuming that a signed int overflow just leads to a negative value,
+like it happens on many sytems (Linux i686/amd64 with gcc), then
+printbuf is vulnerable to an out of boundary write on 64 bit systems.
+---
+ linkhash.c |  7 +++++--
+ printbuf.c | 19 ++++++++++++++++---
+ 2 files changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/linkhash.c b/linkhash.c
+index f05cc38030..51e90b13a2 100644
+--- a/linkhash.c
++++ b/linkhash.c
+@@ -580,9 +580,12 @@ int lh_table_insert_w_hash(struct lh_table *t, const void *k, const void *v, con
+ {
+ 	unsigned long n;
+ 
+-	if (t->count >= t->size * LH_LOAD_FACTOR)
+-		if (lh_table_resize(t, t->size * 2) != 0)
++	if (t->count >= t->size * LH_LOAD_FACTOR) {
++		/* Avoid signed integer overflow with large tables. */
++		int new_size = INT_MAX / 2 < t->size ? t->size * 2 : INT_MAX;
++		if (t->size == INT_MAX || lh_table_resize(t, new_size) != 0)
+ 			return -1;
++	}
+ 
+ 	n = h % t->size;
+ 
+diff --git a/printbuf.c b/printbuf.c
+index 976c12dde5..00822fac4f 100644
+--- a/printbuf.c
++++ b/printbuf.c
+@@ -15,6 +15,7 @@
+ 
+ #include "config.h"
+ 
++#include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -65,10 +66,16 @@ static int printbuf_extend(struct printbuf *p, int min_size)
+ 
+ 	if (p->size >= min_size)
+ 		return 0;
+-
+-	new_size = p->size * 2;
+-	if (new_size < min_size + 8)
++	/* Prevent signed integer overflows with large buffers. */
++	if (min_size > INT_MAX - 8)
++		return -1;
++	if (p->size > INT_MAX / 2)
+ 		new_size = min_size + 8;
++	else {
++		new_size = p->size * 2;
++		if (new_size < min_size + 8)
++			new_size = min_size + 8;
++	}
+ #ifdef PRINTBUF_DEBUG
+ 	MC_DEBUG("printbuf_memappend: realloc "
+ 	         "bpos=%d min_size=%d old_size=%d new_size=%d\n",
+@@ -83,6 +90,9 @@ static int printbuf_extend(struct printbuf *p, int min_size)
+ 
+ int printbuf_memappend(struct printbuf *p, const char *buf, int size)
+ {
++	/* Prevent signed integer overflows with large buffers. */
++	if (size > INT_MAX - p->bpos - 1)
++		return -1;
+ 	if (p->size <= p->bpos + size + 1)
+ 	{
+ 		if (printbuf_extend(p, p->bpos + size + 1) < 0)
+@@ -100,6 +110,9 @@ int printbuf_memset(struct printbuf *pb, int offset, int charvalue, int len)
+ 
+ 	if (offset == -1)
+ 		offset = pb->bpos;
++	/* Prevent signed integer overflows with large buffers. */
++	if (len > INT_MAX - offset)
++		return -1;
+ 	size_needed = offset + len;
+ 	if (pb->size < size_needed)
+ 	{
diff --git a/dev-libs/json-c/json-c-0.14-r1.ebuild b/dev-libs/json-c/json-c-0.14-r3.ebuild
index 90731d8f93d0..2b34de77a7fe 100644
--- a/dev-libs/json-c/json-c-0.14-r1.ebuild
+++ b/dev-libs/json-c/json-c-0.14-r3.ebuild
@@ -12,11 +12,13 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc static-libs threads"
 
 PATCHES=(
-	"${FILESDIR}/${P}_cmake-static-libs.patch"
+	"${FILESDIR}/${PN}-0.14-cmake-static-libs.patch"
+	"${FILESDIR}/${P}-security-fix.patch"
+	"${FILESDIR}/${PN}-0.14-object-limitation.patch"
 )
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index b9968357fdd8..a7f6d8a23fd0 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,7 @@
 DIST jsoncpp-1.9.1.tar.gz 203067 BLAKE2B 654f39b1265b344bb24d3fefb34d4d8b44f69ec819f333f00033ef90acfd5b926fdcc743badf403af797a6f58fe58d195ec0cdf4a1514629f8a1e75c20a6e2f6 SHA512 4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766
+DIST jsoncpp-1.9.3.tar.gz 212922 BLAKE2B 6f89762e899ffe127705a30c1fe86f458d62fa05b8dbde6c465c73b6855d3945f3d739ff0c26e1a6326a211c946277908684ace9363df72ba0f460f66b3e3fd8 SHA512 f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559
 DIST jsoncpp-1.9.3_pre20200412.tar.gz 212522 BLAKE2B 17b0cc2ef40ae932c6ff26c0fa77e8326099a1b6f088e53697c2a3c286d23ef63dd372f2ba721025b84670957689251c2d15083bdd24565715a78beac556ead2 SHA512 6e58870c5c478fe2bba125c50c4f77654f304051f4091cc5a98f9a3c9aefbb94d1156eb07ce004a7683675fd971ec825a0828803042d9b03783b1debf3a39e2b
 EBUILD jsoncpp-1.9.1.ebuild 1368 BLAKE2B 5ea4045f527ec2abb4d2585dcbc9257ce03d06175b1f85a0bca909c8575290316bf0ea833ec06b22cb45a70785f4dc80edaaa23debbda8b6e9668eddaf059109 SHA512 951d7df79acc8b22544cc83c9ff7fbe0b670722764eedc01024c115cf574e535ea5ef7bfeb833a0971f01ae0d1e927af7713bbee9dc4f5f0076c878075864229
+EBUILD jsoncpp-1.9.3.ebuild 1029 BLAKE2B a64080988f56fae4e45f23c7c672c97732b55f15bad7b40d40de5690cd2511268b247e739e2fcc44bf78b3ff402d8ae29380e1a32e2ae6c63eee014bdc29343d SHA512 f7fa0fcb578b8cb37ab009d3fe752b41321da44e182a1d44857cfd14be0b23cd63090d8adec70013dee2f875b5be71d729e4a2ea796e14f3f61c95d059e9efd7
 EBUILD jsoncpp-1.9.3_pre20200412.ebuild 1118 BLAKE2B 7454688bae7e11a6ee228f0d3235efcd04b74ee73900a1a18dc29fc9b4b25b767a2c7325a9869384b2bdb03202affa7ba3c1ded15cad20d36bc226dfc2aafb78 SHA512 1b63de1ff112e0bb1d7f94161f81227052602ee49be09ae2cce5bdda5819be0ab98246b44880da496b6b927cbd8fa98a3bdc8410e0983f003ab16d7a145416b1
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
new file mode 100644
index 000000000000..36523a5b6ec1
--- /dev/null
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="C++ JSON reader and writer"
+HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
+SRC_URI="
+	https://github.com/open-source-parsers/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="|| ( public-domain MIT )"
+SLOT="0/24"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_configure() {
+	local emesonargs=(
+		# Follow Debian, Ubuntu, Arch convention for headers location
+		# bug #452234
+		--includedir include/jsoncpp
+		-Dtests=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	if use doc; then
+		echo "${PV}" > version || die
+		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
+		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
+	fi
+}
diff --git a/dev-libs/kpathsea/Manifest b/dev-libs/kpathsea/Manifest
index 520d223d250b..5864b0bffca0 100644
--- a/dev-libs/kpathsea/Manifest
+++ b/dev-libs/kpathsea/Manifest
@@ -8,5 +8,5 @@ DIST tl-kpathsea-2020.tar.xz 32324 BLAKE2B bf4365d3ae47ce5344916d6622d40c121a34e
 DIST tl-kpathsea.doc-2019.tar.xz 1068236 BLAKE2B 19ecf7d3e5dc1c7a537f59ad45188bb2cd23127682382e719d8bfced05a7f46704606be55c1ff3fe1374587b99866f441b67cb1b555dbf2e33f332d147e30dda SHA512 bd13bb8a5740df0abda5d5f546138504bf3b6bd54caa95e5f1758cc540af4bbbd055e3868c494f65e9bebe108038205d8537fcffbc821a8f17bc51119e5d479c
 DIST tl-kpathsea.doc-2020.tar.xz 1066608 BLAKE2B 02f9fd2e704392c6b82af9317418f4baeead00d02a204db0e7d58ba5eb9da6047a0bfd235123964c78bed5da68e79bd0964f943331f2ceb03ff591fd4efba266 SHA512 fd9d0de2cc576ced6ad5d0ba6dd07d0f8a1e63dc473de849148b5a7890277122f7a37ea6476db20ff3b56546cd467126a881505aa60ef66a86a232e35e3f3303
 EBUILD kpathsea-6.3.1_p20190410.ebuild 3269 BLAKE2B 989ee8e08c3543ff97e42734e316705652001c83171d27c1e0e2378e16ca634ed0e38ff5009b5c327837ed3053d44ed41ed6e25f1c2224470daa8831d64bb7b8 SHA512 675097dd22208308555163575e4800f0439c58b2738060a5a99855354b6530007ea8a3e7e3472479f4942a292d6ab5bf8c052f36816bf6096b36cb75c5781a20
-EBUILD kpathsea-6.3.2_p20200406.ebuild 3276 BLAKE2B dc8f47016bd50caecb81c88c02ce4c1806196e35f86af7c800a4f9836454f678c9e9d9228e87e3163bc48023ac4a824458d4aaacf1b99db6e24d6ccb5bd07286 SHA512 d060821d50bbf2b6ecebaebde3cad3c11bbdd6b1938f57a344069db3e5bd0993d29f7ed2db3f85be87c3b41f95a12c6d80f79b3feba42b06aa6a184fb07c4764
+EBUILD kpathsea-6.3.2_p20200406.ebuild 3271 BLAKE2B e5cee6782fea2e8142caca0ecaa53ac0a921076ce4117294f2752df65192a4cbe1dfd8fadbb9a3fba3ce767dec7b0cb0833b79370a0684f89f463463d14e8bc7 SHA512 671ad65915a05b34dd0c040f2de0026c0cf0737e4071231cf55e09f1cb18638960dbaaa01fb30da415172c58d158f0cdd8078f60f4ea87e56419de93d4f75ae1
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild b/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild
index 2512119aaf6f..8972dbfc92e7 100644
--- a/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild
+++ b/dev-libs/kpathsea/kpathsea-6.3.2_p20200406.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="GPL-2"
 SLOT="0/${PV%_p*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source static-libs"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
diff --git a/dev-libs/kpeoplevcard/Manifest b/dev-libs/kpeoplevcard/Manifest
index a02dfe4b232a..ae8d984a023d 100644
--- a/dev-libs/kpeoplevcard/Manifest
+++ b/dev-libs/kpeoplevcard/Manifest
@@ -1,3 +1,3 @@
 DIST kpeoplevcard-0.1.tar.xz 13424 BLAKE2B 567b5f081283da8af26e03c3e46c50bf67524146171a6f8afa938ac9609d11bfe32ad8de39a29ec0431af135f33825149fb8e98a28141941fd418539a8f03c30 SHA512 9f11ee768d1ddce1f03f41b604180078c0315eb8b9f0118dd99eba65333400b0a0ed12ab1e08ebce3c6c0a2c93563e5c3e832a0cd458d6ea296bd64eeb9413e7
-EBUILD kpeoplevcard-0.1.ebuild 627 BLAKE2B 25166543cbea5e49a8206c802d9d125a07a7fbb9413eeff1a58afe18de9a97f547ee739f10d55e50884194f5e37e5b0e72c8bb550bc38c10a478032766a7f0f3 SHA512 4681858903aea233688359a0b9ba88e6218831f629f658a770b2632992d8a2262335f89b70f0697993a04c1016b1819a60a031c04cb452b6ebeed1f2bc2761a2
+EBUILD kpeoplevcard-0.1.ebuild 629 BLAKE2B dad8b701fac20b68cfde74f23186d823ae265654d300da6c9c89f93f366f724e33bf28085ae9d62df8c568ecd6bb708eac495c2b1791a2f18552244157706946 SHA512 7fbec934a3790500fe8cdbf222a145595a2558c1c7e545ed2ca4ea8b4e5a264c30e28ede20c0e3cf08af423e5b194f487d4afd88c76e84a739ee5ba8f1dccd3c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild b/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild
index 3c8f5e033cc1..bfa637c05761 100644
--- a/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild
+++ b/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild
@@ -8,7 +8,7 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Library to expose vcards to KPeople"
-HOMEPAGE="https://cgit.kde.org/kpeoplevcard.git"
+HOMEPAGE="https://invent.kde.org/pim/kpeoplevcard"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
diff --git a/dev-libs/kqoauth/Manifest b/dev-libs/kqoauth/Manifest
index ed26f9675844..db8d3ded6dc5 100644
--- a/dev-libs/kqoauth/Manifest
+++ b/dev-libs/kqoauth/Manifest
@@ -1,3 +1,3 @@
 DIST kqoauth-0.98.tar.gz 37059 BLAKE2B d1214ac22cb52e7ead1be3ce7af2af9c4b2e1cb74e2b4bf3891300099c0a0abb0c7295fb4616adcb59cb4405eb52bec4097b48d39563ac407bfe692ce94492a2 SHA512 f89e0f046fb7fd7812548f94c460d7c18d4881972e155a99e07503e97fd46b6eada0de9f2c3a94af33ef5b1b3b489bbd5dc6738cee104fe2d11ed62e681c7979
-EBUILD kqoauth-0.98-r2.ebuild 980 BLAKE2B 4ae4037f10861ebe48c087b7d1f67179123b49dea9833aba9d47842c8845714a1481822a0b9f2a5da14a6ba668b69e70f426101ef491cd6ae3716da10d1a75d2 SHA512 e21769ccb5b3c837a57421ead31d67cbb9890aadda59544254ed08f3647b7fab53d8f7ff635706a8d43d1485a3f19813b3cd7275c904f618061dafcc66b4a5bc
+EBUILD kqoauth-0.98-r2.ebuild 976 BLAKE2B 611fdf2cf91b9a2f3d6ad640c30b2eeb3fb1ebb6b0b2f59233edf33153f660d4d329aeef7d2ca3f3d05a50c3670402a07635e8957b798f5f0c65cf731afe04dd SHA512 9b6dd2ed8de3c89573548149fdcceaf2e3ada6cf8d005c4085f80a59040c83593c4c46abcd5a69904cf9ccf58a21feba4d5f775207662bdec6f05c67f2656095
 MISC metadata.xml 443 BLAKE2B e38dcf6daed9ac5a23061075de0f992b2e3a879ca35450617ce70dc3a007ea989ffce209a4ac150a98cfe37c6bd013484a3dca219934479128ad11bc493a7b93 SHA512 56182d7d36d0d01d2a64393e60cefb440650b46dbc45e102cfa7f3fe6431552dd4dfa03eb4f34a284fb8dfafa14ef711fb8586a7beaf6aed71f6048401c89aaf
diff --git a/dev-libs/kqoauth/kqoauth-0.98-r2.ebuild b/dev-libs/kqoauth/kqoauth-0.98-r2.ebuild
index dbfc65327cd6..af40313065f8 100644
--- a/dev-libs/kqoauth/kqoauth-0.98-r2.ebuild
+++ b/dev-libs/kqoauth/kqoauth-0.98-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
@@ -30,10 +30,10 @@ src_prepare() {
 	# prevent tests from beeing built at src_compile
 	sed -i -e '/SUBDIRS/s/ tests//' ${PN}.pro || die "sed on ${PN}.pro failed"
 	# respect libdir
-	sed -e 's:{INSTALL_PREFIX}/lib:[QT_INSTALL_LIBS]:g' -i src/src.pro || die "sed on src.pro failed"
+	sed -e 's:{INSTALL_PREFIX}/lib:[QT_INSTALL_LIBS]:g'\
+		-i src/src.pro || die "sed on src.pro failed"
 
-	sed \
-		-e "s/TARGET = kqoauth/TARGET = kqoauth-qt5/g" \
+	sed -e "s/TARGET = kqoauth/TARGET = kqoauth-qt5/g" \
 		-i src/src.pro || die
 }
 
diff --git a/dev-libs/kuserfeedback/Manifest b/dev-libs/kuserfeedback/Manifest
index f4a191697eda..99147e422171 100644
--- a/dev-libs/kuserfeedback/Manifest
+++ b/dev-libs/kuserfeedback/Manifest
@@ -1,3 +1,3 @@
 DIST kuserfeedback-1.0.0.tar.xz 187784 BLAKE2B 24acb6c1f143a0811a84c7d4f5ffe923df2fe94b0d13e361870d308b65ee8be747cef1a2ab719c6023b4f5885fb9970620a2a5da0d073e70b1e4912c6f64c5d1 SHA512 d45c45b3f7b50f7ff3e5e5ae7e6a4cd68c0aa444553d0c44a969ae17e51ef5114ab6401c8ce65744ec3d635cb2edc7a127187547f01f4954faa55087c702dea7
-EBUILD kuserfeedback-1.0.0.ebuild 1274 BLAKE2B 77a3e988d9a383529ebde873970312b444b3ce6a2fa4330ae2ffbdb9e2e2936750d2361be969f69976066d167acbda4cc5599259fbd02e0ec86e2a369ce03f51 SHA512 6c57a3aa0813dadc5fda29bfaef9b7df9e1c3dcc7498ac06abd36d503009ab2317d4031c9500719d9453f726591dcd83b8a900678847dd91b188a63825fcbdee
+EBUILD kuserfeedback-1.0.0.ebuild 1271 BLAKE2B e9ca9132a28a5f82b2fd996a5e6a571ce14fb1e9d49b1f29759505c20765462d3386ba8bd54b984b38f01d35009f9f2a4a1da0aa51429ce57dad605b692c334e SHA512 340ba6917f2db07cfd0ccef5cccf8c67aa3d2a6014c529f6fafc134e86cefa0b3a83d6b50b0529ec6972cbed318652da804f939a5fc2d83f2f88bee148cc5380
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild b/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild
index 9d35caa08776..502a4bc2125c 100644
--- a/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild
+++ b/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Framework to collect user feedback for applications via telemetry a
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index af2ec6d4d460..07d8858ff800 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -2,8 +2,10 @@ 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
+DIST libarcus-4.6.1.tar.gz 31938 BLAKE2B c1da0181e07f297549df92ed23848343f0dadf94af7ce64ff2661e5c09c68768d47180aff505f2a225af2d49e493b8511ac9560a9b51a4eef98d6da82566b093 SHA512 3c56133fee2eb152f0557a1860d1d298b44a021a53247687ce938949c49e1999c3e2287552e67ff65a58bf6aecbd82c8412da394f83a9981bfa68d29e9501250
 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
+EBUILD libarcus-4.6.1.ebuild 1413 BLAKE2B b86d88ae8593f0604b1aed03d4463bec146eeb3ffe7b9387a3e4a40fa4aaaa02dfbfd2fcf75441012aeea630700e606a7f0d2fbb5e164e5100b4792795d94dd3 SHA512 d96d6c1dc57ae1364d6776ab0eadfa05633982fc43e0275cb9b488813b73157849c8b11b64d8eaf479dd26c137680a6873c11726fedd1348bcedab9bdaa8a3da
 MISC metadata.xml 860 BLAKE2B 9375bca572d46d985fbbf11b222728cdaba22c2fde64e1b4a057d2920b9845bf442bb35ce0b2b1e78fc949cd687604f9f89d5b5665e3cee7afe5b69f09f5ed2b SHA512 9dbfeff3c641642edfd27fbbd27d2ef5810833e4cb3ae5b949c1a20c27377ac70364010fc9fbc759f456e93f294af62f3c08c59bb0585a3ca01f5cd157b3b33e
diff --git a/dev-libs/libarcus/libarcus-4.6.1.ebuild b/dev-libs/libarcus/libarcus-4.6.1.ebuild
new file mode 100644
index 000000000000..a1481fb098bd
--- /dev/null
+++ b/dev-libs/libarcus/libarcus-4.6.1.ebuild
@@ -0,0 +1,56 @@
+# 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 cmake python-single-r1
+
+MY_PN="libArcus"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libArcus"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/protobuf:=
+	$(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}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Find SIP for current python version, not the latest installed
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
+		CMakeLists.txt || die
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
+		cmake/FindSIP.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples ON OFF)
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libax25/Manifest b/dev-libs/libax25/Manifest
index 567d2f79d259..b689ea7379f6 100644
--- a/dev-libs/libax25/Manifest
+++ b/dev-libs/libax25/Manifest
@@ -1,5 +1,3 @@
-DIST libax25-0.0.12-rc4.tar.gz 335535 BLAKE2B 604b78851ba7946ad49e51525f88503a148ceadc2e4276df263c127d1022001a80b36e91ff919b027b049c357383fab40708646194b4a4e8c7826ca7cd2e1bff SHA512 d11ed19cf72b8eed22c6cbaa5f45f0eb3b96672a6c9334a095da36b622a0453b0d7b72f75f7aa5753c9cf10636d5b10c36fe9b445481e04f7cba711609f7a812
 DIST libax25-0.0.12-rc5.tar.gz 360123 BLAKE2B 55b1797977e5bb508aed67b43665cefdb7b296c6f2fc5d68f2e59e20da4833cd19030c1fa6deee4d463135a5eb4a944c2c779a47570e5cbfb10fd640f8c00bf2 SHA512 01aaf1ef5be7a347ec702f890e26e7cad02eff1cc8b4932fe9452cab8012bb0d7cd25f74871d83f188f22a3a5fd600ec57131ddb540a6c746908bf47e42f958f
-EBUILD libax25-0.0.12_rc4.ebuild 535 BLAKE2B a50fc2ae538885545e9507247ad0462cd57d5982780289aa65a6c251f2134cfed37035a074581fb8c76cd75f447d97d63dadb6cd281f9bebdd7ecbf1bb6052ec SHA512 1e19e36f67f92753427cc4eede5f050524653511bb539865bca8da819ef183109f93d7a06396541b2ddae1b9266fa475532550ddc15991c882508b4957213c38
-EBUILD libax25-0.0.12_rc5.ebuild 564 BLAKE2B 1323818a7c43f1fa3e2a9a653b87de01418557d10d751d31f62a55266d1dc4d19b4912cda9db46890c614e8b01823b0942f956db2adf7adec4f51065ca409f53 SHA512 a4d1465b367eada6d858cfff6a137d12ebda2fc1d78013c0ed162f6640b475f374b4882b183bc8c5a879536350c3174cf495a4672a8f21027c6a88ae0d93458b
+EBUILD libax25-0.0.12_rc5.ebuild 561 BLAKE2B 0d5b69d1acaa0bb1b57bbcc9fcc40182dcb034ccc23b66c9954fc608c6627afdd76c5681efeff9951c8e43167a716a1936efe48c4a2d8ce47263db2c5853053d SHA512 f1c5927d147fe5b1718fc59c2f340ffba39e9eead7d23916485003a5e6a4c21feaa1f895af68f9969a82531d0cee4b946292328231fc9ef2d580e41c115d7b56
 MISC metadata.xml 255 BLAKE2B 1be00b412c042706a649da1ef71b5e431369da25a82d18464ba48a54e0353ff297feb91071ac4d75007c756f8e65cb8c59da78efbdb725fb669644de5ba018e4 SHA512 35a18c5a178cc996bb71a27b11fb361198ae96d24ee3cbbc105a64824e1dcddd71d017270539daa3688ec2f04a8f564dd08ca491f62a3da4cca650c9bf35600d
diff --git a/dev-libs/libax25/libax25-0.0.12_rc4.ebuild b/dev-libs/libax25/libax25-0.0.12_rc4.ebuild
deleted file mode 100644
index 4912d3abd96c..000000000000
--- a/dev-libs/libax25/libax25-0.0.12_rc4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-utils versionator
-
-MY_P=${PN}-$(replace_version_separator 3 '-')
-
-DESCRIPTION="AX.25 library for hamradio applications"
-HOMEPAGE="http://www.linux-ax25.org/"
-SRC_URI="http://www.linux-ax25.org/pub/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="static-libs"
-
-S=${WORKDIR}/${MY_P}
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_install() {
-	autotools-utils_src_install installconf
-}
diff --git a/dev-libs/libax25/libax25-0.0.12_rc5.ebuild b/dev-libs/libax25/libax25-0.0.12_rc5.ebuild
index 168644f69174..8e5aa531773e 100644
--- a/dev-libs/libax25/libax25-0.0.12_rc5.ebuild
+++ b/dev-libs/libax25/libax25-0.0.12_rc5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.linux-ax25.org/pub/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="static-libs"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index cf3ec3312950..fe5db67c7a80 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -28,7 +28,7 @@ EBUILD libbson-1.13.0.ebuild 949 BLAKE2B 66d9d8d61397c5c09ae66f01fddf9f200a893be
 EBUILD libbson-1.13.1.ebuild 924 BLAKE2B 7c1d43932fdbb16e0b21f81fe81d5b52adc60341463affe63746f6e014137721f3a300dcbd08e51da092336f5fb19357cbec2e667b09263c0773df21e7b3552b SHA512 78d83659129ef419351106ddc48584a5ba8de957df2f6dfe9dd6dd2bc00e7fa3aaf6023fd74ecffe57470a6324126fa5efed8b4dbfb547bbb588304eb7384f4f
 EBUILD libbson-1.14.0.ebuild 1011 BLAKE2B 1fd3f9eabb58d7851351e122f0e5f1c83705aedd9fabb60afa4479d4ff54f3e98b83502c526c9b7737c4e00f51ea0153c60dceadcde3e79e3dc829f6b3124a84 SHA512 389b9149d0b3a3e47bac57f9c5435586be324493ee194349225850a84590de921ac189af4f4438ec87164029d74d267c0a12c2ee86941a244e5f9a6ac183b4ab
 EBUILD libbson-1.15.1.ebuild 1011 BLAKE2B 1fd3f9eabb58d7851351e122f0e5f1c83705aedd9fabb60afa4479d4ff54f3e98b83502c526c9b7737c4e00f51ea0153c60dceadcde3e79e3dc829f6b3124a84 SHA512 389b9149d0b3a3e47bac57f9c5435586be324493ee194349225850a84590de921ac189af4f4438ec87164029d74d267c0a12c2ee86941a244e5f9a6ac183b4ab
-EBUILD libbson-1.16.2.ebuild 1100 BLAKE2B b7348ccf954efdaf6e9e0c4623377f5446a93678b8785663865413da077552115dde5aad4b8d250c1b6d4e4ad2a6a86a7c63e9c89f5934fd6354700ee16d3f34 SHA512 741e9984914c91da6ae1802fa8aeb2e80ba89818a3f10961be228bf5bc9abab988ba1dae78391a325e34c86bc14c97adc123a8861aeeb176772a0dcb644e28df
+EBUILD libbson-1.16.2.ebuild 1099 BLAKE2B 643da07f4d77092e406fbf950417bd859a78711ed37360f2896ebdd85560e4759cb9dd62eb322e0b15e073593433dbce6172b9bc4df371dee0ef5bec47e615db SHA512 5c0dfe65b6269d328a9c578c2c2e8de19f410b81017096b08535d0d587f66e7081cbecafb7b4be944744a9f72020c99d0c529247de47c16c519ea68dcd2276d1
 EBUILD libbson-1.3.5.ebuild 1145 BLAKE2B 6467960799504edf6ad9ecd42af2ec474e0884cc63380cf736a0e771a5994f7aac46236965c5345dc4f5576ea4fdc7070c9d4579a1189e96dd9200dcd079cdf5 SHA512 015f73d09a48b70c80943cccfcba82a4978bcbbf72e41d5f44fb3137b81384f78e3811528f5292b4d57d88ebfdeab03f2779552ecd0359b5a460d054eabe83e5
 EBUILD libbson-1.3.6.ebuild 1127 BLAKE2B c712b6aa9fc634c293446adeacdd8c7d97056a2c219bbf2bd2954f911778b7001c091e2044c3ab607e576d4a3124121576aaad528d0f1a5c9f2b549c43008117 SHA512 0b814d017de2a19d79dc7502e9b25d924b20d4358c88b5a8180695b2559b9ffde1bd906180614548551c7e5cea2fc528485dd5460989d14cce8ba0f61c6b6ee3
 EBUILD libbson-1.6.2.ebuild 1029 BLAKE2B f0a06a4ce9183946888f5ccc420e14c14ea2efa69904816355d5cfba5f69ead47bfbd385f2bd9b905e9af670f9476be3163551c1677694c6ebd55091fed46a0c SHA512 1dfdf5109c4ddc3820fa445c22aa0f8ca49bd141cbd6ef733bcfd689dce291b31073f172e53054f241d6860eff34e76411ab77fb381948ee147ff1d1aa4a6843
diff --git a/dev-libs/libbson/libbson-1.16.2.ebuild b/dev-libs/libbson/libbson-1.16.2.ebuild
index 6aca55220c67..d826e85d1342 100644
--- a/dev-libs/libbson/libbson-1.16.2.ebuild
+++ b/dev-libs/libbson/libbson-1.16.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/mongo
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc x86"
 IUSE="examples static-libs"
 
 DEPEND="dev-python/sphinx"
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index b4c18cca2623..4664e249db60 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,5 +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
 EBUILD libburn-1.5.0.ebuild 839 BLAKE2B e695b22513039dec53601898332fb2e36c11ef2ae8c015c9ec9864e43a078448bd697d17f8c7fca6411df2de8c4df650c957e73d4caf00c99015a5b9515a3536 SHA512 5cd009e1e4c3fd504e2ca40f4a7b1d08c60eddfd0096e6137b3b17cbf357d239a9ab636cd2edb2b242ffc1f8c55b52e905b9d5bcdc25d522bcb2f61a7310f2ef
-EBUILD libburn-1.5.2_p1.ebuild 896 BLAKE2B 0c1200d24e2aba3185f53c548970f24c401079e7220b4f5ac6539acaff9c31330359ab82ce452ee20f27f1fd750066d2f8ee375f96d33fd8918017cb5e6073d1 SHA512 e37fbef828e574b6f4518007b4e21c55359e9a7353ab39abb64fe039ef1afc3c40284004d798ade1aa6580080b195d6b5e4bda94c65a9bb9218529f69d6dc5f0
+EBUILD libburn-1.5.2_p1.ebuild 889 BLAKE2B e4e4160573c901ed2b4acb475d05bcf79329f8fcdcd84b3b98781b16beea4447def031e3545eb0999aaba7cf2e9af148adebfdfcd12c7003ed7a2f63870144d2 SHA512 5b8c87202cdd06b931fd1dfad22c6f1c556ef7749052f90434b6833c57f3ba52b1d2bafc4f05c6af52e0c4dd259aadd6adb5b3db2d7896676ceb63e0787325d3
 MISC metadata.xml 374 BLAKE2B ed3416052b36f8644d2231fd2d4d16e4177fd2feb09f4e5d81222dc9b4fb32cb5772d8eb86a739fc8ad11e398013c50ec802685848cc298a9e7f5efbe8928879 SHA512 1b78c0e0f60761b001b44216ac4c3de7fb6491a4d8b79b45c6e1f81f438df95ebe2cb70b273ed4a470283ec6e57c91d4fb1981fb365ed61a692214bed4097860
diff --git a/dev-libs/libburn/libburn-1.5.2_p1.ebuild b/dev-libs/libburn/libburn-1.5.2_p1.ebuild
index e77f0b1b71a3..e9bc399a1223 100644
--- a/dev-libs/libburn/libburn-1.5.2_p1.ebuild
+++ b/dev-libs/libburn/libburn-1.5.2_p1.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
@@ -11,7 +11,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 9861e8a1e5c9..e01054021772 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,7 +1,5 @@
-DIST libbytesize-1.4.tar.gz 80943 BLAKE2B d4c6c34d81be01bf7db2c37b0660886d99eff3c0a87024f5fbc12cc3606dc01e772b81dfbcacbf76c62213120253a9e7bda90adbc749b6d4c3e31e1ed3ae7702 SHA512 5dd13cf52a1674be776220ee1863f42261a47dc53af1ce4a31460d6d02ce87e19c5a52260f700928af98f1d9d7a96de7c11d8f384907b3187ef2effc10cbb593
-DIST libbytesize-2.1.tar.gz 440209 BLAKE2B 7c689f269eae7b408b7f85fb9c877c9eb519d2a2eb143ef0ddb1657fbb4d79fab7cdaa56b35b4bbbb964e47361e37d7c70a0a135bacb8f817bd6cf8d2e22b68e SHA512 6b93d877e921820c19ed6874a36d9f8b6958112f6230f24980e8e6e30570b39ce74594f0ef126f70dc81b5434899c1f0f3ad0925f3ff7b6a596a9329c8f106c8
 DIST libbytesize-2.2.tar.gz 443040 BLAKE2B 04035f99f1da4d2d426106e1f292d71089dae89923d41425fa815a72e375639a7d8b6fc5552a3f08462597ce9c19797c7fce5b79fdad504b9062168093a70a4f SHA512 4538ac3499a24023c21fe07f527e400f99509921e377248970ac2da0eaf1655ddb261f432eed46a59ef69a1275ba7d1e5b0cc488d64eeea936b6cfa54c552ac1
-EBUILD libbytesize-1.4.ebuild 1211 BLAKE2B 8cb40347ee5d044fa305b13b389d0c0afb925dfe9a6c827b137c768699abddc50e8cb1f6f13be89625f4d26d1b6d6b4b0d8664fe30b77aa7427ef127fe47d291 SHA512 c14e40928448a88f618e0559d6b070a3dcb09c4b66ea39b346f3ac999668833ffd8ed95b4dee37529f8f6fe3e10dd62c335463e67f0acdd42c4c2d6ccbbc6adf
-EBUILD libbytesize-2.1.ebuild 1471 BLAKE2B c0842eec1dda3bb554f49f372f6063bf632a0c49ef25e75d347ba84b652ee8f7ff8d583ed5e9b8f5e44a207c7f2e19cfd858fecea832f3206136a15f2d8adfff SHA512 34f5bb741c18768a015b9c2eeb33d534ff62b88ba6cc60dc70fc6924e6693a181f02bfd6c11a2a60e4aff407fc1d4f395a83b34ab417600bf4570ef3d907710e
+DIST libbytesize-2.3.tar.gz 438198 BLAKE2B 583450b66781bbb16298507292ffe60012ccc296f0822784ead13bcf1ce3f9a9cf7c2341d5f64d3356fb78aefb3e6b0770bce64ebf85aa92d168277d35f9629c SHA512 23720b90f4dbf7880a640ec04e910c4c1f34637dd3621900772187cb2e1d04ec34d4900ce3c9b4083ac462b411d5a409a644f62ed76b2c57ef1f11432c58be8a
 EBUILD libbytesize-2.2.ebuild 1464 BLAKE2B 33d4475e703efef58b8039e29dc5c38fef87b2256a1ed84706ca3169188e67d0dbc4f9a9cb1a75ebd53352c240f6b8fffc98273658629436f2511f7c7599fe3c SHA512 a1f95c286915b32198816aaef5a25ff45356d3337a3b58a807b84d1e8128c3faf1acb1ea64096193e770eb54a6af5772facb91101f8a3f883e77f408ca6674ac
+EBUILD libbytesize-2.3.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
deleted file mode 100644
index 617d3525db99..000000000000
--- a/dev-libs/libbytesize/libbytesize-1.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools 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/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="doc test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/gmp:0=
-	dev-libs/mpfr:=
-	>=dev-libs/libpcre-8.32
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )
-	test? (
-		dev-python/pocketlint
-		dev-python/polib
-	)
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-python3 #634840
-		$(use_with doc gtk-doc)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	python_install() {
-		emake -C src/python install DESTDIR="${D}"
-		python_optimize
-	}
-	python_foreach_impl python_install
-
-	find "${ED}" -name "*.la*" -delete || die
-}
diff --git a/dev-libs/libbytesize/libbytesize-2.1.ebuild b/dev-libs/libbytesize/libbytesize-2.3.ebuild
index 0d91bc5f9998..0d91bc5f9998 100644
--- a/dev-libs/libbytesize/libbytesize-2.1.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.3.ebuild
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index b5bca0d461e3..5a7862f382e6 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -5,5 +5,5 @@ DIST libcbor-0.7.0.tar.gz 266323 BLAKE2B 76f93d3199e703c4167aeed262da7ba78d1df82
 EBUILD libcbor-0.5.0.ebuild 1308 BLAKE2B 1024113bdbf7409c9e7e6644ca543edc3bb5835ba16ced60fc44a5fbd74a26c4ddef2ba46f2cdcceb975d0fbebaa31265e6753ee55d5720e1d30e6461d733646 SHA512 25cf8a6eecb5efc065447fc8d56f40fd9112e778a58738993c24a45fc6d819a339ba2fe510d742092a540433ba575b4bdd187ed66038da80afa304d439ffcb31
 EBUILD libcbor-0.6.0-r1.ebuild 1303 BLAKE2B d7caa064bea8106579e3da3267cd64f6086d10509a38cf108b0e7faff386208afb72292f9d9847a539478ca64fa1a0328b1807b50194ab409da2a5276fd4a29c SHA512 3922e922e408f6f9adca1f704ee6a0800ee7657d06276b9b17477350850e1d1933638adf7bb534d39da6e1214ea24bab37aae0c793d0cd850aea76483373d1cd
 EBUILD libcbor-0.6.1.ebuild 1309 BLAKE2B edc2449e15d584345d162d18c21aefc832f8890cc42b2f95cea0891ed69377e16cc3ddc3697e0ecc4e8f38eaffb415d06c4c321f966638b2e87a58947bfbdb99 SHA512 4d8abc7dea8dafe9d6249ccd98578d989078d1bfa46b3932b8ce7b42f51e053134678742814725e435f63d516fe9344ec5c77d843d944809f2f2ba54680211eb
-EBUILD libcbor-0.7.0.ebuild 1320 BLAKE2B 733ba022ba5fee13581bc5f12afbd84a624d747e4ba99ab12f43be1e236ae4e0ce4f7897fba980dc7fe8527681df1c14b6093a76cb8ab72dc68b1f18c52d860c SHA512 bf01390c6c697847205d9855e2d71302bcd627bb8a9fadcf7cad7d19fb43271bba3d0789a8649edbd281bd641f866408d8df16751f94a2fd2380d60ab4abd65d
+EBUILD libcbor-0.7.0.ebuild 1327 BLAKE2B 83494889324d327955b8b57a8f943327abe0d4af884091a271fd3e1101f96e221998baa55417a6db32cb7c9a884fe7f47c14fda0d4dc848f3cd9a6b1b6c13ac5 SHA512 93caf8fd8936abf08a2805d8c166a7ef577471562e28b79feaf31f4b20ba2034520022305bc9204537d94258be91929e6c6b042ea62ab150b2c0287dac6ebb5b
 MISC metadata.xml 353 BLAKE2B ac88c66fa58046797dba48cfe47fc42a3aaf8d8a256fab563def54d126c7ad903bc2d47095ca7221b84f0fd59bcbb6677ffaef9062c9c662ef95b02bf3563b99 SHA512 56f76a4b80d8cf12f854022c2c7353119b11052bf6d454b5d2f6427a02ab64176d2d7ecfadecabafceac6b7aa5ec066145a62831d33f09a829b37cdb8bec64cf
diff --git a/dev-libs/libcbor/libcbor-0.7.0.ebuild b/dev-libs/libcbor/libcbor-0.7.0.ebuild
index 7f1fba770430..7041fdc527a0 100644
--- a/dev-libs/libcbor/libcbor-0.7.0.ebuild
+++ b/dev-libs/libcbor/libcbor-0.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
 IUSE="+custom-alloc doc test"
 
 BDEPEND="
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index 2d6287c2f658..a7939118d7ea 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -2,8 +2,10 @@ DIST libcharon-3.4.1.tar.gz 143489 BLAKE2B e8eb5317c708b808981cf8cb53614b54a34ab
 DIST libcharon-3.6.0.tar.gz 143947 BLAKE2B 5787f734e0d494eb9fc151fcf240c36b0ade38546fbbcc4e563c4d746d3e3634bd7e599e8258c0f05d96f33f6ee8283101c7dcaa1e3583244e0109bdbff7a041 SHA512 15d2b0f348bb70ef4fd92e9a4f11ed8d70bd8ee0fcd1e1e8c71d4e04a54fb5dff66f7abe81fea34630f3e200dd1aae39c697dffd95ff35fb60ff06f4a443e8b4
 DIST libcharon-4.2.0.tar.gz 145482 BLAKE2B 38f2efa1c19f81646e8b9692c57d71dda0a53fcc7c120e973f8faf55a0d92d4f8daa21e3debb873f4965f37c7e1cf0f5f1aaaebb9d078565d4fcb3edc57c9314 SHA512 4011cba788ed1789c0f364d605dfe2fc775a1f5e0ab9f0457454094f9cc3a400fdc7241692e88abae968e32e3c5394bef95cd3f77d2c68e4dbfc73ed27905b86
 DIST libcharon-4.3.0.tar.gz 145484 BLAKE2B cbb0edca76921c32b69809dfa8e07c07baedba90ff3c8f2ad5128cc1efa60e34f0f96c1936567825f7e876d298ef1ed4c10d0058f5b3697f87c412891654fabb SHA512 77ed18fbd11c008659a02419250647c9c977a57772d648f4af353c637224ba586006665e60e7fa2394b9f8cf53359a6211b936b5920ccc379754a743dbf2416f
+DIST libcharon-4.6.1.tar.gz 145486 BLAKE2B 43a3bcddf128da9305711757b707394b5b0c23da27e27c3615d521e0af79683b2a525fefa7ae877581b56dae4c1dd7036c3189c17f8f86c92492b46e129a22b3 SHA512 43f7606529a933067bcb82a16e95d76f713a7847535887968c2933131d3197ec6127376e10c7d5f1debd218fc902962329fe22d4f9229b434a804daff94122cc
 EBUILD libcharon-3.4.1.ebuild 583 BLAKE2B f8fcd59c85371cf9b74c0425b00bb84472fcf544e9792f91594608514d0338115c131409c7732dad13ac22762feea4971ce3fd6a1c65e0409faa8575dbf25ff7 SHA512 8c32389c36ca4d7c5339e39732d929a9943181f9195a8328f44b8c77725246e9374589b9739f195418ea542afb3b44d8cc00237df624b3ae7369bfa19c1df571
 EBUILD libcharon-3.6.0-r1.ebuild 583 BLAKE2B f8fcd59c85371cf9b74c0425b00bb84472fcf544e9792f91594608514d0338115c131409c7732dad13ac22762feea4971ce3fd6a1c65e0409faa8575dbf25ff7 SHA512 8c32389c36ca4d7c5339e39732d929a9943181f9195a8328f44b8c77725246e9374589b9739f195418ea542afb3b44d8cc00237df624b3ae7369bfa19c1df571
 EBUILD libcharon-4.2.0.ebuild 563 BLAKE2B 05d8210539c2251b38bc8314a70aceca0a5355b81c98e444c918d678b719efecceaacdf4e587b4c7da8a855fec1c288084958e155580148db58396d945abb90b SHA512 3fd4727350ed0160d2024e04f29dee04468f93490a81c9c6639bc018f3da8b68743107680222dfd0ecbd8324a7935c148061bf928fcd90a53d07a5760aee9bbd
 EBUILD libcharon-4.3.0.ebuild 783 BLAKE2B 116426e6f5089367803504a211916b3a72f97164ef43526e44e12ce51cc15d3876ecc519d643dc3ac5d37140dbcf7b57e6d8bc1d5d8214848ade6c6d35745c65 SHA512 0d3cdb427aa4f7e375baca1818fc5160cbccd45bfcb1dc03df7f873bef33ffc6584b5627fed840a059a432bf9048b2dad18b6763ec774d5f73e08ddec5f82fc5
+EBUILD libcharon-4.6.1.ebuild 879 BLAKE2B 16669d87920270c86b67935c836b5f6929218aeaaa8904301c7ccd439954b6a6efb26b0e06c8dc82531ceee401def4581da1b85ac6e08eb668aa2c1b984ef1a9 SHA512 4675e202878348756d337c789f08d610ebd44cfa74e29b2fc76eb424e81358a5fedce52995b304a365fd118ab61e1754583257b3de8ca875206dad0a3f2fb135
 MISC metadata.xml 861 BLAKE2B dd8d5bdc3a7e48870daffb19659eba707b1c43c6682fbd5cadf52babd3282315419451c1d5352f0a2e044e60d6fc16c19d546b1dc32ec9da7dceeef4deb45eca SHA512 15a172c082a1cbcdbd0ecd93f475f9a193d3bb0707980904d8f7d6adde745297f64b906134c0c338cdd088f6f54e736b29ee3df39638ffc941dd5eda5f15f735
diff --git a/dev-libs/libcharon/libcharon-4.6.1.ebuild b/dev-libs/libcharon/libcharon-4.6.1.ebuild
new file mode 100644
index 000000000000..9ff0c625233c
--- /dev/null
+++ b/dev-libs/libcharon/libcharon-4.6.1.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 cmake python-single-r1
+
+MY_PN="libCharon"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libCharon"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="${PYTHON_DEPS}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	# Use current python version, not the latest installed
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
+        CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize "${D}/usr/$(get_libdir)"
+}
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 97ae38bb8d1a..eb1aebecb94e 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 1555 BLAKE2B c91b856f2bf27d055e79e983dda6b8f4471df390dc8c15b1259d35aa4132ce6eea1a550e4861c4f4359c835c61cfc761df73150b1ba59f850917ef129078331b SHA512 da10b37118fbd5ba4acd8fa706fa3ae0c7aecc97f8f1a3aca0e53159f30dccc149b2dc1772b17976510dd8c75a560df546231d11044fbefc1ce9828aa89f8800
+EBUILD libclc-0.2.0_pre20191024.ebuild 1535 BLAKE2B 441d8fad75eb9811e92601e7f237fb11a7d73ae4ce178e80c64789db6caf2a89523a3d11256fb80a3def6e4c272cd82f5c387dda91455978bec3a99f514ce182 SHA512 c083757137ac0b0767816ff93f6f1e6c0e84bb588c0c403410212bf4cf4666db4da47433fdc09dbbe885469da934db37870852afcbd2ecbb6dfe10e9b6b9a0e7
 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 76895636d570..cf5cf7c3624f 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
@@ -23,7 +23,6 @@ BDEPEND="
 		sys-devel/clang:10
 		sys-devel/clang:9
 		sys-devel/clang:8
-		sys-devel/clang:7
 	)
 	${PYTHON_DEPS}"
 
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index bb32fcda472e..e23757c400b2 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,6 +1,6 @@
 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 9960594c47720f02f6f42a83e6be2e2fbc31994e607577f776b7659b34b16b2749b77de1f7792e83f0d5e39251f70e2ed680c95e04910157d043408c8be10c94 SHA512 6005bf285688874a459fa7ee3450aff8f803c9772d5082003f27bcd8f2aafb0f870cf15431a6abaaa749667f35c1f0929de67502d93231e6192913aceffa3cb0
+EBUILD libevent-2.1.11.ebuild 1677 BLAKE2B 76e400b4cd9c5416779b64008b51c5a040f15aa4f35a8dbe94c1e6824d31fa3f603a1ae64d7ff2b190f28dd0855fa7cbd62df954fd0986435e84d52be990110f SHA512 71a0312c5cbab93cf28a6c7d53b913c3e8cf818802e0f26046a3b1ed21d1e78e5b63397bef7b192897bbde776a639f79d2ce0020998f9bc9df9605d6879e51cb
 EBUILD libevent-2.1.8.ebuild 1669 BLAKE2B 54aa18351c31a916764cfa58ab80162aea085b2e47a79c580a15f98e88bfd24524dff4494b89c4d6de8447161672dc2ed0a20095e77093cea1f84f4fb8015990 SHA512 a1eeb850d53b60c071240591387d01377216a8272c83e6b507196ce4b2fdea80d7e123a52dbbaa35a36b4c09e2183a490df8ddfd4293c92f334b28bb94d8e2b5
 EBUILD libevent-2.1.9999.ebuild 1325 BLAKE2B 00950c513155950753eb2a59d53b082101f883581318f74f17b8ac19b8f01c032e3705e015ce9d389785b588e17ecb7b8b54601f1c150ac5c87689afd5b25ab2 SHA512 be226220566535a11b0372307b80c6505574bafdf644ad5242d374ea5e27a04c05181aaebfe61529b45805fb13d6bb5ac01da852f49417afb41891f038be6dc8
 EBUILD libevent-9999.ebuild 1262 BLAKE2B 22ce0e6670997f58d38256d01c014db1d0c1b3375c9c33e410cf9afa177b774695276fbcaea5e2729e5dbbf55290fc0c55556a94b0ca299cea06ae4451502b0e SHA512 f95954c09907a4983bdaac89f230d6f35382f52bd2a3cfaf78323406f2152a524860a59187e9766d65977cf33cc72777ed1c70cfbf924192d0690f62cbb34fc0
diff --git a/dev-libs/libevent/libevent-2.1.11.ebuild b/dev-libs/libevent/libevent-2.1.11.ebuild
index a4491d74305f..7f049a6b7e69 100644
--- a/dev-libs/libevent/libevent-2.1.11.ebuild
+++ b/dev-libs/libevent/libevent-2.1.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 LICENSE="BSD"
 
 SLOT="0/2.1-7"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug libressl +ssl static-libs test +threads"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 30448bd900da..b5c60b780a29 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,15 +1,7 @@
-AUX libffi-3.1-darwin-x32.patch 606 BLAKE2B d5fb0c46d294241fd054717e3da00fdfa4e37b9d98bd79801843b0562f8ec02943659ce1baac5ed24a8651771ef318626b8f70d054e300572c2888a482a3084d SHA512 909e4c45f124d6a9d4a0b2b97fdcbf0451a15c11c3da581fc8571d4f4f0857306bbfddf682bbe0441f0c5c84a8489e4a79a792883bfe440224cf672567bf0a24
-AUX libffi-3.2.1-complex-ia64.patch 1622 BLAKE2B dc51b1cf0d0cd796d168bf4cdb66a8d5fc34a5fd46d96fd0dffd07d5885032775389cfd1465100d9972eb0ce736e8caab14dd49318dcc6630754825806be342e SHA512 136eaaa9e467afba2634fd4f997cfd982fc0162a48aba7efc429e719afea53e40607c973d281f78d5cf2d7886664ddc4b19161d35af113c9a7326c637e10b2e1
-AUX libffi-3.2.1-complex_alpha.patch 605 BLAKE2B 3b14addb7797ff99a465101487be49c922f0286f49230d13cebdec159e0054defa0f35e5dbbd0c5dad71117ad72d183d0a88af5b175957b3585d2b1639c87a2b SHA512 c5a3c287db9b7a71068c4f73c0dc3c3e2ee602a9c55c57cae393fcdbdc913e77e18481c19f8454b74ed7b66f7dded9e30b11b61d079c8567c585f6cc890cd70b
-AUX libffi-3.2.1-ia64-small-struct.patch 2306 BLAKE2B 1bace1573d4bdb93e7be97a8609426d35a1217cbb0718e7580c2a3b646a7d493d4b7aecc25dee35f61f7e036904e6b7dde8d3d398842dab7149053da2a2761a3 SHA512 4f33d849210da633629e16e96779dce2e03c0d1e6f44b91b68410e35433378f8cf0a04736d161539ea368f54a713177e6e8df2fde93d40c6917d03ad74a99c2c
-AUX libffi-3.2.1-include-path-autogen.patch 2901 BLAKE2B 836e61b6f64b9d649e969799e42c5dd808750ba51997d7486eef58e636ef2e1f215f9a26b5e88e61366d57e758688c4e69f578edd81167e1dbb0a8357f049150 SHA512 6c8b2d7dca0cdc6f69b2393777f546b6722b6260cfa6fcb814915975227185cc3b467b6537939f8f8d05df5fd8f245301030aa4ef74a3c2fa073e6200e91d47f
-AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f58265246599d0283bb148f954fb79d8037e37ae332a664f57a201589b89022d63932d8a4e56c4b0c6a7a9a2240ae6602e847fff3a55 SHA512 f387590510ee5e3aedc03744fcf1faae35c105a81d4c2f646e495d489bc6467cd88d4a0a63b40a29fe620ad71db1a05c1fe483af63974222f366135f73f36cb3
-AUX libffi-3.2.1-musl-emutramp.patch 1182 BLAKE2B 44db381b87d3f3f85b60379398b1a1d97437e14a8ab75d1035ee1cf498a6cb79b6d68a3a38d87e9e16ddd74d66a585064831a5e9370227289f2ddd297d90542d SHA512 cfd5106226fa45beaecf3b7eb039d77f5113e393b9e958625b8d015550daaea527365938a97f2ce5286777662df4848d6112961cb76653d8335950a734da43c5
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
 AUX libffi-3.3-power7-memcpy-2.patch 1086 BLAKE2B 954504aca37f2dd16913c3fb3d61e8fb5e8db017d897405905366f4701bf2357871dd41e86e59050733f04321e0155b03683577f132504aec5c476cc78323be6 SHA512 5a0d8590c2e53e20e4384dad704060a2c781b91487a0e14d2f1521f69b722ccc60e25b84c38f9ded65b01bef49250e07c6935be577d100aea18496abfbe374f5
 AUX libffi-3.3-power7-memcpy.patch 1681 BLAKE2B 6e3df741b07718f13c347ae54fe82bbf0f433790d14dff4114ffa77f2c3700460801af3fc5a649589ab2d1d0122db0729cd1aaa5321ea3f7822b1cd4d7f64b05 SHA512 13eb09d8080cadedb959c8d62d37f80bf3c32fbe488fdb59955ff6c8649f1086baaedb015e47ee52de65836f57bc172dbce2d2b3bc1aee6aca07eb9da451cf70
 AUX libffi-3.3-power7.patch 1172 BLAKE2B 42408c0774553fde9c086ea3c2b0d0152d15a9dce63860e8884c683ce92553c3db38d6fdddcdee644f7819f56a28a12e639ee05a0956cf0fa3fed521157754f7 SHA512 17062f152ce2aa8d46e4e01c3c0b8e52c67d30c3405b9b2f40656dfe731c774fd67ff3ad397f426d9e56ca4fe4ec4908f5c8f6082d52975cf19171ca4e39c534
-AUX libffi-3.3_rc0-hppa-no-TEXTREL.patch 2821 BLAKE2B fcc7eb0ed4a3f9b31718bf7761de8194a5fff6dc0c32be843e15e3da089ccd3819b656843844475199eb5ecc53312f4ad5c1b26d896df464d077ce15ee32eb13 SHA512 202b0685ecbf058a0414e1f2e673e4c793f5381b5714e5e8f025307068eb48f5c7eb85081859194b4500cbc5b6981f07fb4b6efc866071ea0e64f9231852444c
 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
 EBUILD libffi-3.3-r1.ebuild 2792 BLAKE2B cb9ff2ba67aaa92522f8e7a4d808db29c006bad4bd2eee00f1ddab0939c8a6bbb2ac05cd98d09a990787f12cf284523264daec11c50acd79c383f9af96c0094c SHA512 90c1e7e9f7d186f6100dc0d5a4c4bbc45c14cc6dfc4bc803bc1853c6b18a3ac5ce17ed30a84967ddee59881c3e2c8764efb4092a844ed81eec01ad7d20d7c6e0
diff --git a/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch b/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch
deleted file mode 100644
index e5f100e56726..000000000000
--- a/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=513428
-https://bugs.gentoo.org/show_bug.cgi?id=536764
-https://trac.macports.org/ticket/44170
-
---- libffi-3.2.1/src/x86/win32.S
-+++ libffi-3.2.1/src/x86/win32.S
-@@ -1184,7 +1184,6 @@
- 
- #if defined(X86_WIN32) && !defined(__OS2__)
-         .section	.eh_frame,"w"
--#endif
- .Lframe1:
- .LSCIE1:
-         .long	.LECIE1-.LASCIE1  /* Length of Common Information Entry */
-@@ -1343,6 +1342,7 @@
-         /* End of DW_CFA_xxx CFI instructions.  */
-         .align 4
- .LEFDE5:
-+#endif /* defined(X86_WIN32) && !defined(__OS2__), for the eh_frame */
- 
- #endif /* !_MSC_VER */
- 
diff --git a/dev-libs/libffi/files/libffi-3.2.1-complex-ia64.patch b/dev-libs/libffi/files/libffi-3.2.1-complex-ia64.patch
deleted file mode 100644
index fd5c1ea4b282..000000000000
--- a/dev-libs/libffi/files/libffi-3.2.1-complex-ia64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-ia64: fix small struct handling (missing complex type entry)
-
-commit 6e8a4460833594d5af1b4539178025da0077df19
-added FFI_TYPE_COMPLEX value type (comes after FFI_TYPE_POINTER)
-
-ia64 ffi_closure_unix reiles on the ordering of
-types as ia64 has ia64-specific FFI types:
-small struct and others.
-
-As a result all tests handling small structs broke.
-
-The change fixes dispatch table by ignoring FFI_TYPE_COMPLEX.
-This has positive effect of unbreaking most tests:
-
-                 === libffi Summary ===
- 
--# of expected passes            1595
--# of unexpected failures        295
-+# of expected passes            1930
-+# of unexpected failures        10
- # of unsupported tests          30
-
-Bug: https://bugs.gentoo.org/634190
---- a/src/ia64/unix.S
-+++ b/src/ia64/unix.S
-@@ -529,6 +529,7 @@ ffi_closure_unix:
- 	data8	@pcrel(.Lst_int64)		// FFI_TYPE_SINT64
- 	data8	@pcrel(.Lst_void)		// FFI_TYPE_STRUCT
- 	data8	@pcrel(.Lst_int64)		// FFI_TYPE_POINTER
-+	data8	@pcrel(.Lst_void)		// FFI_TYPE_COMPLEX (not implemented)
- 	data8 	@pcrel(.Lst_small_struct)	// FFI_IA64_TYPE_SMALL_STRUCT
- 	data8	@pcrel(.Lst_hfa_float)		// FFI_IA64_TYPE_HFA_FLOAT
- 	data8	@pcrel(.Lst_hfa_double)		// FFI_IA64_TYPE_HFA_DOUBLE
-@@ -550,6 +551,7 @@ ffi_closure_unix:
- 	data8	@pcrel(.Lld_int)		// FFI_TYPE_SINT64
- 	data8	@pcrel(.Lld_void)		// FFI_TYPE_STRUCT
- 	data8	@pcrel(.Lld_int)		// FFI_TYPE_POINTER
-+	data8	@pcrel(.Lld_void)		// FFI_TYPE_COMPLEX (not implemented)
- 	data8 	@pcrel(.Lld_small_struct)	// FFI_IA64_TYPE_SMALL_STRUCT
- 	data8	@pcrel(.Lld_hfa_float)		// FFI_IA64_TYPE_HFA_FLOAT
- 	data8	@pcrel(.Lld_hfa_double)		// FFI_IA64_TYPE_HFA_DOUBLE
diff --git a/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch b/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch
deleted file mode 100644
index 5e8c943eee38..000000000000
--- a/dev-libs/libffi/files/libffi-3.2.1-complex_alpha.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/alpha/osf.S.orig	2015-01-16 10:46:15.000000000 +0100
-+++ b/src/alpha/osf.S	2015-01-16 10:46:24.000000000 +0100
-@@ -279,6 +279,7 @@
- 	.gprel32 $load_64	# FFI_TYPE_SINT64
- 	.gprel32 $load_none	# FFI_TYPE_STRUCT
- 	.gprel32 $load_64	# FFI_TYPE_POINTER
-+	.gprel32 $load_none	# FFI_TYPE_COMPLEX
- 
- /* Assert that the table above is in sync with ffi.h.  */
- 
-@@ -294,7 +295,8 @@
- 	|| FFI_TYPE_SINT64 != 12	\
- 	|| FFI_TYPE_STRUCT != 13	\
- 	|| FFI_TYPE_POINTER != 14	\
--	|| FFI_TYPE_LAST != 14
-+	|| FFI_TYPE_COMPLEX != 15       \
-+	|| FFI_TYPE_LAST != 15
- #error "osf.S out of sync with ffi.h"
- #endif
- 
diff --git a/dev-libs/libffi/files/libffi-3.2.1-ia64-small-struct.patch b/dev-libs/libffi/files/libffi-3.2.1-ia64-small-struct.patch
deleted file mode 100644
index 6e21f3566bc9..000000000000
--- a/dev-libs/libffi/files/libffi-3.2.1-ia64-small-struct.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From b58caef7fd620408be9239ac24ea89d5bc84f30b Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sat, 17 Feb 2018 19:00:40 +0000
-Subject: [PATCH 2/2] ia64: fix small struct return
-
-This change fixes libffi.call/struct10.c failure on ia64:
-FAIL: libffi.call/struct10.c -W -Wall -Wno-psabi -O0 execution test
-
-.Lst_small_struct handles returns for structs less than 32 bytes
-(following ia64 return value ABI [1]). Subroutine does roughly the
-following:
-
-```
-    mov [sp+0]  = r8
-    mov [sp+8]  = r9
-    mov [sp+16] = r10
-    mov [sp+24] = r11
-    memcpy(destination, source=sp, 12);
-```
-
-The problem: ia64 ABI guarantees that top 16 bytes of stack are
-scratch space for callee function. Thus it can clobber it. [1]
-says (7.1 Procedure Frames):
-"""
-* Scratch area. This 16-byte region is provided as scratch storage
-  for procedures that are called by the current procedure. Leaf
-  procedures do not need to allocate this region. A procedure may
-  use the 16 bytes at the top of its own frame as scratch memory,
-  but the contents of this area are not preserved by a procedure call.
-"""
-
-In our case 16 top bytes are clobbered by a PLT resolver when memcpy()
-is called for the first time. As a result memcpy implementation reads
-already clobbered data frop top of stack.
-
-The fix is simple: allocate 16 bytes of scrats space prior to memcpy()
-call.
-
-[1]: https://www.intel.com/content/dam/www/public/us/en/documents/guides/itanium-software-runtime-architecture-guide.pdf
-
-Bug: https://bugs.gentoo.org/634190
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/ia64/unix.S | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/ia64/unix.S b/src/ia64/unix.S
-index 4733377..e2547e0 100644
---- a/src/ia64/unix.S
-+++ b/src/ia64/unix.S
-@@ -175,7 +175,6 @@ ffi_call_unix:
- 	;;
- 
- .Lst_small_struct:
--	add	sp = -16, sp
- 	cmp.lt	p6, p0 = 8, in3
- 	cmp.lt	p7, p0 = 16, in3
- 	cmp.lt	p8, p0 = 24, in3
-@@ -191,6 +190,12 @@ ffi_call_unix:
- (p8)	st8	[r18] = r11
- 	mov	out1 = sp
- 	mov	out2 = in3
-+	;;
-+	// ia64 software calling convention requires
-+	// top 16 bytes of stack to be scratch space
-+	// PLT resolver uses that scratch space at
-+	// 'memcpy' symbol reolution time
-+	add	sp = -16, sp
- 	br.call.sptk.many b0 = memcpy#
- 	;;
- 	mov	ar.pfs = loc0
--- 
-2.16.1
-
diff --git a/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch b/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch
deleted file mode 100644
index 522e1fa9c486..000000000000
--- a/dev-libs/libffi/files/libffi-3.2.1-include-path-autogen.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Autogenerated part of libffi-3.2.1-include-path.patch
-
-https://bugs.gentoo.org/643582
-diff --git a/include/Makefile.in b/include/Makefile.in
-index 9d747e8..99ecfd7 100644
---- a/include/Makefile.in
-+++ b/include/Makefile.in
-@@ -152,2 +152,2 @@ am__uninstall_files_from_dir = { \
--am__installdirs = "$(DESTDIR)$(includesdir)"
--HEADERS = $(nodist_includes_HEADERS)
-+am__installdirs = "$(DESTDIR)$(includedir)"
-+HEADERS = $(nodist_include_HEADERS)
-@@ -317,2 +317 @@ EXTRA_DIST = ffi.h.in ffi_common.h
--includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
--nodist_includes_HEADERS = ffi.h ffitarget.h
-+nodist_include_HEADERS = ffi.h ffitarget.h
-@@ -360 +359 @@ clean-libtool:
--install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
-+install-nodist_includeHEADERS: $(nodist_include_HEADERS)
-@@ -362 +361 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
--	@list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-+	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
-@@ -364,2 +363,2 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
--	  echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \
--	  $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \
-+	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
-+	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
-@@ -372,2 +371,2 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
--	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includesdir)'"; \
--	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includesdir)" || exit $$?; \
-+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
-@@ -376 +375 @@ install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
--uninstall-nodist_includesHEADERS:
-+uninstall-nodist_includeHEADERS:
-@@ -378 +377 @@ uninstall-nodist_includesHEADERS:
--	@list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \
-+	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
-@@ -380 +379 @@ uninstall-nodist_includesHEADERS:
--	dir='$(DESTDIR)$(includesdir)'; $(am__uninstall_files_from_dir)
-+	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
-@@ -468 +467 @@ installdirs:
--	for dir in "$(DESTDIR)$(includesdir)"; do \
-+	for dir in "$(DESTDIR)$(includedir)"; do \
-@@ -522 +521 @@ info-am:
--install-data-am: install-nodist_includesHEADERS
-+install-data-am: install-nodist_includeHEADERS
-@@ -566 +565 @@ ps-am:
--uninstall-am: uninstall-nodist_includesHEADERS
-+uninstall-am: uninstall-nodist_includeHEADERS
-@@ -577 +576 @@ uninstall-am: uninstall-nodist_includesHEADERS
--	install-nodist_includesHEADERS install-pdf install-pdf-am \
-+	install-nodist_includeHEADERS install-pdf install-pdf-am \
-@@ -582 +581 @@ uninstall-am: uninstall-nodist_includesHEADERS
--	uninstall-am uninstall-nodist_includesHEADERS
-+	uninstall-am uninstall-nodist_includeHEADERS
diff --git a/dev-libs/libffi/files/libffi-3.2.1-include-path.patch b/dev-libs/libffi/files/libffi-3.2.1-include-path.patch
deleted file mode 100644
index e1269b2398a4..000000000000
--- a/dev-libs/libffi/files/libffi-3.2.1-include-path.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/643582
-
-From 982b89c01aca99c7bc229914fc1521f96930919b Mon Sep 17 00:00:00 2001
-From: Yen Chi Hsuan <yan12125@gmail.com>
-Date: Sun, 13 Nov 2016 19:17:19 +0800
-Subject: [PATCH] Install public headers in the standard path
-
----
- include/Makefile.am | 3 +--
- libffi.pc.in        | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/include/Makefile.am b/include/Makefile.am
-index bb241e8..c59df9f 100644
---- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -6,5 +6,4 @@ DISTCLEANFILES=ffitarget.h
- noinst_HEADERS=ffi_common.h ffi_cfi.h
- EXTRA_DIST=ffi.h.in
- 
--includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
--nodist_includes_HEADERS = ffi.h ffitarget.h
-+nodist_include_HEADERS = ffi.h ffitarget.h
-diff --git a/libffi.pc.in b/libffi.pc.in
-index edf6fde..6fad83b 100644
---- a/libffi.pc.in
-+++ b/libffi.pc.in
-@@ -2,7 +2,7 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
- toolexeclibdir=@toolexeclibdir@
--includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
-+includedir=@includedir@
- 
- Name: @PACKAGE_NAME@
- Description: Library supporting Foreign Function Interfaces
--- 
-2.15.1
-
diff --git a/dev-libs/libffi/files/libffi-3.2.1-musl-emutramp.patch b/dev-libs/libffi/files/libffi-3.2.1-musl-emutramp.patch
deleted file mode 100644
index 7c011d2b6d07..000000000000
--- a/dev-libs/libffi/files/libffi-3.2.1-musl-emutramp.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/libffi/libffi/commit/e169ba2b83c780058fe626856cfdb5903a85cb97.patch
-https://bugs.gentoo.org/694916
-
-From e169ba2b83c780058fe626856cfdb5903a85cb97 Mon Sep 17 00:00:00 2001
-From: Kylie McClain <somasis@exherbo.org>
-Date: Fri, 29 Apr 2016 21:04:07 -0400
-Subject: [PATCH] Fix usage on musl libc
-
-A gcc compiled on musl does not define __gnu_linux__, it defines __linux__.
-Only on glibc does __gnu_linux__ get defined, but both define __linux__, so
-we should check for that instead.
-
-With this patch, libffi works perfectly, and passes its testsuite entirely
-on musl libc systems.
----
- src/closures.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/closures.c b/src/closures.c
-index 3dec0e31..05849e06 100644
---- a/src/closures.c
-+++ b/src/closures.c
-@@ -35,7 +35,7 @@
- #include <ffi_common.h>
- 
- #if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE
--# if __gnu_linux__ && !defined(__ANDROID__)
-+# if __linux__ && !defined(__ANDROID__)
- /* This macro indicates it may be forbidden to map anonymous memory
-    with both write and execute permission.  Code compiled when this
-    option is defined will attempt to map such pages once, but if it
diff --git a/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch b/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch
deleted file mode 100644
index c6286f349900..000000000000
--- a/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 955e3c56459556284cf4a7fb23c51f9d310be80c Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sat, 19 May 2018 10:49:07 +0100
-Subject: [PATCH] hppa: avoid TEXTREL in .eh_frame section
-
-Before the change hand-crafted .eh_frame section contained
-ABS relocation and caused TEXTREL tag to be emitted:
-
-```
-$ ./configure --host=hppa2.0-unknown-linux-gnu LDFLAGS=-Wl,-z,text
-$ make
-...
-/usr/libexec/gcc/hppa2.0-unknown-linux-gnu/ld:
-    read-only segment has dynamic relocations.
-```
-
-Link failure is caused by absolute address of FDEs
-encoded into .eh_frame entries.
-
-Fixed TEXTREL by using pcrel (instead of ABS) encoding
-for absolute addresses (__PIC__ code) by adding augmentation
-information ("zR" CIE type).
-
-All tests still pass on hppa2.0. The specific tests that still pass
-and exercise this code path:
-    testsuite/libffi.call/unwindtest.cc
-    testsuite/libffi.call/unwindtest_ffi_call.cc
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/pa/linux.S | 25 +++++++++++++++++++++++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/src/pa/linux.S b/src/pa/linux.S
-index f11ae76..ab04c75 100644
---- a/src/pa/linux.S
-+++ b/src/pa/linux.S
-@@ -297,10 +297,18 @@ ffi_closure_pa32:
- .LSCIE1:
- 	.word   0x0     ;# CIE Identifier Tag
- 	.byte   0x1     ;# CIE Version
-+#ifdef __PIC__
-+	.ascii  "zR\0"  ;# CIE Augmentation: 'z' - data, 'R' - DW_EH_PE_... data
-+#else
- 	.ascii "\0"     ;# CIE Augmentation
-+#endif
- 	.uleb128 0x1    ;# CIE Code Alignment Factor
- 	.sleb128 4      ;# CIE Data Alignment Factor
- 	.byte   0x2     ;# CIE RA Column
-+#ifdef __PIC__
-+	.uleb128 0x1    ;# Augmentation size
-+	.byte	0x1b    ;# FDE Encoding (DW_EH_PE_pcrel|DW_EH_PE_sdata4)
-+#endif
- 	.byte   0xc     ;# DW_CFA_def_cfa
- 	.uleb128 0x1e
- 	.uleb128 0x0
-@@ -310,9 +318,15 @@ ffi_closure_pa32:
- 	.word   .LEFDE1-.LASFDE1        ;# FDE Length
- .LASFDE1:
- 	.word   .LASFDE1-.Lframe1       ;# FDE CIE offset
--	.word   .LFB1   ;# FDE initial location
-+#ifdef __PIC__
-+	.word	.LFB1-. ;# FDE initial location
-+#else
-+	.word	.LFB1   ;# FDE initial location
-+#endif
- 	.word   .LFE1-.LFB1     ;# FDE address range
--
-+#ifdef __PIC__
-+	.uleb128 0x0	;# Augmentation size: no data
-+#endif
- 	.byte   0x4     ;# DW_CFA_advance_loc4
- 	.word   .LCFI11-.LFB1
- 	.byte	0x83	;# DW_CFA_offset, column 0x3
-@@ -338,8 +352,15 @@ ffi_closure_pa32:
- 	.word   .LEFDE2-.LASFDE2        ;# FDE Length
- .LASFDE2:
- 	.word   .LASFDE2-.Lframe1       ;# FDE CIE offset
-+#ifdef __PIC__
-+	.word   .LFB2-. ;# FDE initial location
-+#else
- 	.word   .LFB2   ;# FDE initial location
-+#endif
- 	.word   .LFE2-.LFB2     ;# FDE address range
-+#ifdef __PIC__
-+	.uleb128 0x0	;# Augmentation size: no data
-+#endif
- 	.byte   0x4     ;# DW_CFA_advance_loc4
- 	.word   .LCFI21-.LFB2
- 	.byte   0x83    ;# DW_CFA_offset, column 0x3
--- 
-2.19.0
-
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index 8ee65401224f..89f11663a50c 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -5,5 +5,5 @@ AUX libfido2-1.4.0-cmakelists.patch 1247 BLAKE2B c290dfdb1f25b241b1a51725d568169
 DIST libfido2-1.3.1.tar.gz 1512676 BLAKE2B f69a04fc69c46b688d83afe9d72b2fb1860ac00a09665d55e25293595520e95d45486ecc5355c479bc8bc06dbe6ed4fd469c511f5bf5f341a0ec86cb099fce28 SHA512 fc56f7bcddd7ae0f950b4e94f08ad726f7de68b975c0bdcbca98c7932c2c3d2e2a51b30eaf41e8dba08e82af3926cbed44264244ae721902af46e47df9fcbe1b
 DIST libfido2-1.4.0.tar.gz 391439 BLAKE2B d45ff3e1a5605c5ea4c5bddbe423bb69e6237e7a359fcc58469a86c503c934ce4491b98fdd673130d419cabe09acab7e201592f923ffe3908568b2b0888ae32a SHA512 5cf2f2d70bdba893fd33bf3ca91940c7eded5ed1728b517ff3fc46cbde58bf64f16da4104138b20dcea1d9a1cec730e532bc4938cdcba4ad86343e51a1c3c513
 EBUILD libfido2-1.3.1.ebuild 926 BLAKE2B c5f312bba979b24d41a7c62efb6404974e1fffdce9f83dee419ced2afdc98c8039b477eba994c6205d4b25826eb7b048d2f6489bacae158d5261d20485eca663 SHA512 0d108575faaf6af6adb53812b72dc2479068f7be72bded5564dd2f54a6545e7ceed12bbe7fae70530e49c8fd7c5e4f346e6cc3eee1e2406cc580a49eff23e4c4
-EBUILD libfido2-1.4.0.ebuild 887 BLAKE2B d06e538f6dc32aac106ec272d0da2e06645f26711556e898c0e84dba5b80941653e13fce54ec10af6b7e5547febaafe667a8c3b0cb92c76394bb0aacbe5ba7f2 SHA512 6cff42541d20c1b2d0df8afa297f4bcc020ed2a0c14a0331b9e1a7250a63d1397ffa4c5beed6cd4534babdeeda9fe894cb9fe3335f7b58cb8eb66ca0558b29d9
+EBUILD libfido2-1.4.0.ebuild 894 BLAKE2B 4a47f509d3c62535fca87048013d35b6c07a7ce1793f13aa0658edda9390f9660f0e70415a3da9b31b80dd9ad2f201e7713722a44ce70631761c4b8761febdbc SHA512 1b0f5611588b67f2726e851e26a899313f9317f37e455a286042a6915177ac8e104054b378663f559cb491a144108728cbc343b25548aac5f545400ec3abc3e1
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/dev-libs/libfido2/libfido2-1.4.0.ebuild b/dev-libs/libfido2/libfido2-1.4.0.ebuild
index 91759e82b0bf..f9b15003f562 100644
--- a/dev-libs/libfido2/libfido2-1.4.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="libressl +static-libs"
 
 DEPEND="
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 4d5b360532f5..c1e31eb8db6c 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,5 +1,7 @@
 DIST libfilezilla-0.20.2.tar.bz2 549679 BLAKE2B 929c535ed7ad65fb35bc7f3a21c827ff51d01e387f383bf677f86b78aa79deafa81781eee87afe3c9c8a4d48c60ea02f7fff45b4e469f3755511c9b11001dc88 SHA512 242df38b335558c83fde91800787992adaa617292d119a15d8036adc1622b207127d0e8e6fb935b4300e1e0d63e196636589ba513e410c751dea052164a773d7
 DIST libfilezilla-0.21.0.tar.bz2 552491 BLAKE2B fb2729c1c2616b4dbdc292651fd5afe85fdcd77dd70d179605f737539dd4db54c95aeff9053131076241ca57317b2361a201f6fae381c374e81ca4bc250cf1ea SHA512 a4986f8da4ac6980e7b1e564d3b033853b0e5442e4bbdee337238ad5e896b80c74e7176f973055593bd45789c41725a6315c6d510ad44354588188a1cc9f29f9
+DIST libfilezilla-0.22.0.tar.bz2 557320 BLAKE2B 864f286844a3693ae1aa9f0176dbcf32a6a483174aa4b29e23ebccd309f88e97cb84368b3b5d22f07f94d396885b992e2e2e4b2f64bfec490bbcb898c88e0dc5 SHA512 6ec53a4d82dc4c6650c560633c1f1cd50866fd954d5153be7e9ebea3ee0fa38d287e16dfdccb9ad22a7e7a325eec5d659bc51dd963b2deb540e8206e0f45513e
 EBUILD libfilezilla-0.20.2.ebuild 1085 BLAKE2B 36321bf7a60560c9f99041af0e3cf6607d52254a189130e5e044b1aa8b5319c2025e84a19b2b9b246f906b599c945471a99ff028d1e3103039e6def8c91df6a5 SHA512 1c7cdf4f3fad0ca0972e5230f7f4c86a3806937cb462ca500c34834aacdc37b9133c160060919db128ee6e55183bf690352bf5096ea6f710d981e53c42bad70e
 EBUILD libfilezilla-0.21.0.ebuild 1087 BLAKE2B 60d3c3e36532022c5d100508ba220a5a128b461324201cf1a1cae0b5599fa90399dcfd85eac8f57c2851610067ce237fa31bef608204a27e3b484e735fc084d4 SHA512 e16ea6e70a9f805bdc5556df9801242f2a37724f2532b008bea7f30361d39b2531118a8d615e0691e64540d1fe79869b126e438d15284e00b35d0e52c2111598
+EBUILD libfilezilla-0.22.0.ebuild 1087 BLAKE2B bb93cb261fb3d9e2e7779fa26c0a954f27b9c5ad2de4b462b3d97af617369a51b2627fab61144f115e5e517340ff6286ea9f72ec0e90ed96be9527a1e4f16261 SHA512 a996968500007e666db75fd884490950a3aa45e6f9fe3e447ba6a1357ee9f6b72b81ca24048ff5769d10cbe757dc93968afdbd12d57d1cf341f5607be2f80244
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.22.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.22.0.ebuild
new file mode 100644
index 000000000000..37ef85045da1
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.22.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/7" # libfilezilla .so version
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_install() {
+	default
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index ba060dbd5ce2..554e179df415 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -2,7 +2,7 @@ AUX libfmt-6.2.0-unsigned-char-strings-in-printf.patch 1478 BLAKE2B e5ffa271437d
 DIST libfmt-6.1.2.tar.gz 723160 BLAKE2B 36e7451a8732c62dcbf47e6d287ea582827b6196a468b8648803ea1bc9a37a5f681d87488f748d749183d97783ac7fb47a3f2aeed64fc6a684f9ee85b67ae28d SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7
 DIST libfmt-6.2.0.tar.gz 733403 BLAKE2B c7ff69a56b90ec8df7d1af5c9934592449f2052046192aa498a6440d2aab76f10c17fa2833a41475b777dca2e3a1ae671021530bf0ef8be12443541f0f5212b3 SHA512 0003543f437bae416600a2b982eb133f65588bd36d7506fa7d883ae3133fcaf7ad825904af9b588ea22e5d91e56560aaf4243a6afa11ff6d8aace2e4bb1b0cee
 DIST libfmt-6.2.1.tar.gz 733646 BLAKE2B 74394efc67065bf7a2259f5c16521b1cc4fb08bd599fe99be86b97b712c60d8790f39d65257ab18fe95bcde3d115d97e91c41d23309596f279cf51ebd4d2957d SHA512 520ef3addfecd9796253c347e0ecf4c18ef2f86d3b1b6b714f7834741f4737f1b7ed8365d3be46c9186617898911b23680cad2ae3cb7aadaf641ab32e327b0dc
-EBUILD libfmt-6.1.2.ebuild 780 BLAKE2B 39b407844dae2f714850f0c0b5c03c2048ff8c0c50e711a974d55bb84cdbfa01a97859c48e5ac52abdeda691d5ebe1ef925990301fe55ef9efb4a20f6134b2e6 SHA512 25ddc394e6d4b5f17875a00eaf4f5df8aade0874dfb0e4621c3a11510243b248a4e0659a2737a3720d1479a092745728ede4d50dd7c65a87a88f13c81424312f
+EBUILD libfmt-6.1.2.ebuild 779 BLAKE2B 2683bb7f04d4d9280df07b28d745afa01f734bc3fd8d1d52def8b37e1188dd54fe381dc846b877e5978374fad89c0db31d06bac1bac37b533b76403c085fd87f SHA512 abb2693b00595db88f3906bb782213b53b9655de994832eb4a189f89f301506113bf9743eb9b64fd7f835f0707866bc170a20ad52ddb8c08248799d5fe19e797
 EBUILD libfmt-6.2.0-r1.ebuild 843 BLAKE2B bb2d750324db52df30d3f21c3141ae9d871527871d37a4ce26f7bf6364ad5152f59e100f4fc880ad588aa81cfd141378365a5537c619037f19b22a51317b7cba SHA512 d1cfbd8023705dc6e8456ea7c2412b3885ff0434803ceb1665477fff9b1c44d565bc4cc024036a9cf4be4801e5ab10db5b7fdfe182373e97f8b8b2847e58af44
 EBUILD libfmt-6.2.1.ebuild 772 BLAKE2B 53eaf21c8e01d31c44adc443812fa21ca3e48db4914131ce3a56e52cfa04bedc44e44fc1a7bdf11865336bbb0fee4d364b6521d60945aa5b87c153c5e8019b14 SHA512 0dfb8292beaa1a0f9cc942b303fe5bbfe391d6f6b59cd2399ba5c47d6549eb2077101af54f034a2bfcdcd99c39aad4b5fd3acc545e8a4a2b873fe0f598ebd755
 EBUILD libfmt-9999.ebuild 772 BLAKE2B 53eaf21c8e01d31c44adc443812fa21ca3e48db4914131ce3a56e52cfa04bedc44e44fc1a7bdf11865336bbb0fee4d364b6521d60945aa5b87c153c5e8019b14 SHA512 0dfb8292beaa1a0f9cc942b303fe5bbfe391d6f6b59cd2399ba5c47d6549eb2077101af54f034a2bfcdcd99c39aad4b5fd3acc545e8a4a2b873fe0f598ebd755
diff --git a/dev-libs/libfmt/libfmt-6.1.2.ebuild b/dev-libs/libfmt/libfmt-6.1.2.ebuild
index e3dfe088fc67..c3530a47003d 100644
--- a/dev-libs/libfmt/libfmt-6.1.2.ebuild
+++ b/dev-libs/libfmt/libfmt-6.1.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libfstrcmp/Manifest b/dev-libs/libfstrcmp/Manifest
index 0c176bd4e99a..53e1733d7f54 100644
--- a/dev-libs/libfstrcmp/Manifest
+++ b/dev-libs/libfstrcmp/Manifest
@@ -1,3 +1,4 @@
 DIST libfstrcmp-0.7.tar.gz 394845 BLAKE2B a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e SHA512 aaeb0227afd5ada5955cbe6a565254ff88d2028d677d199c00e03b7cb5de1f2c69b18e6e8b032e452350a8eda7081807b01765adbeb8476eaf803d9de6e5509c
+EBUILD libfstrcmp-0.7-r1.ebuild 927 BLAKE2B 599323861b622381047549ec74c4a4bf08c081ce6040f844a243308847fb5bb52bb8a5d16c266927a38c7d3b7a97270eca563c16ecf1600c6941e68056a23541 SHA512 56e8f61aa6815ff315667b570fe2678bf4a0ee9715131baa5e2cc7a9e05912d00490efb3a4fddf93dfaf4927a8f0ec8f98da0d4cc37cec2e1049652c7aa72b5e
 EBUILD libfstrcmp-0.7.ebuild 798 BLAKE2B 6b0fa888e5ecbad92001c73cc21a2371719b044e1054d79160b7f0ace9fd3706b60b623240555c99f60c6c139e91a8c97017df5c6350895e769786302fb32a14 SHA512 b2ba229672a48f925bf39d0d6246cb5e958f7290b8eecd226084875e9d8dbc0c71d656dd034da0e31b39531fbf7e0d4f836b7f41e2789c14eab2575f55172683
 MISC metadata.xml 325 BLAKE2B cc27381f0071006c05af2fe95a2dbbc481fbb8457976c4c4eec7c3321df75ca4957b7a626ebc1d20aa524bedae4730ca05bf0fb36f8e2b0177429993d73d5237 SHA512 f9baf25481af2a997d7f05610c68b7a3fb376d4bdf1526e59b172d2e3c4e4a2008b1fce9c66247bf01b488db4932872dc58eb0e1fffb9e6a2cc769023f7c75d6
diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild
new file mode 100644
index 000000000000..d56c71db588a
--- /dev/null
+++ b/dev-libs/libfstrcmp/libfstrcmp-0.7-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Make fuzzy comparisons of strings and byte arrays"
+HOMEPAGE="http://fstrcmp.sourceforge.net/"
+
+LICENSE="GPL-3+"
+IUSE="doc static-libs test"
+SLOT="0"
+
+SRC_URI="http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/fstrcmp-0.7.D001"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	sys-apps/groff
+	doc? ( app-text/ghostscript-gpl )
+	test? ( app-text/ghostscript-gpl )
+"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	emake all-bin
+	use doc && emake all-doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-bin install-include install-libdir install-man
+	find "${D}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${D}" -name '*.a' -delete || die
+	fi
+	use doc && emake DESTDIR="${D}" install-doc
+	einstalldocs
+}
diff --git a/dev-libs/libg15/Manifest b/dev-libs/libg15/Manifest
index af41ac5fac5c..7417215e83a3 100644
--- a/dev-libs/libg15/Manifest
+++ b/dev-libs/libg15/Manifest
@@ -1,4 +1,3 @@
-AUX g15tools.patch 2929 BLAKE2B cc88ba441a27b7cc2e256712536304f7a1d3667b04fc1e2583dea994321df8a59ad295a6cecc76cf5633a5f6994cb674e7a7f3f8eaf2c0d86dad35b3e7d0c8df SHA512 2cd1b1f54ea8d4cc2a322c657cce6b8252b9425df6ad031401d6187ff82472fc3fb974734cfefe80b85b3e1a3532b26a5685b5aa9ff42ca7453ec55892834e41
 DIST libg15-1.2.7.tar.bz2 232475 BLAKE2B 490193410f2127d4efc0bcf64909514faff2ecce57bba08e1cf53a958ab296a59bc12867bbd14ca1bf866e5f69833d99f4e3ebb7d078ece35725afe2c0dd03ab SHA512 ddffb38f5c3d9ce0cb90b0375c2f5d317a7bb3889fe59d56932a0889c6e15bc2f1e590757d3182eddf7c5bd3101303b332b18fbd37247c20f66e1be256aa93c0
 EBUILD libg15-1.2.7-r1.ebuild 781 BLAKE2B 21ba3edd5b9e96420b200b05fe8df6e4053c3c6586c6157e4dcce45fbce3c7b5b3f63a643e683dad8e21b1ebd1bd6946ec9ce430fd02d6d85bb5c98c6c5b07f5 SHA512 5f5e6ece6abef9db83d3da6d6c93b6c9c1dcf4c58c0cd24384500bf7c566cbfefd9c1df04efd7139b20122d16b453c0ad27f93f6bb28314c285736f88b770c4f
 EBUILD libg15-9999.ebuild 781 BLAKE2B 21ba3edd5b9e96420b200b05fe8df6e4053c3c6586c6157e4dcce45fbce3c7b5b3f63a643e683dad8e21b1ebd1bd6946ec9ce430fd02d6d85bb5c98c6c5b07f5 SHA512 5f5e6ece6abef9db83d3da6d6c93b6c9c1dcf4c58c0cd24384500bf7c566cbfefd9c1df04efd7139b20122d16b453c0ad27f93f6bb28314c285736f88b770c4f
diff --git a/dev-libs/libg15/files/g15tools.patch b/dev-libs/libg15/files/g15tools.patch
deleted file mode 100644
index 7eb6e915e596..000000000000
--- a/dev-libs/libg15/files/g15tools.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Patch from upstream bug tracker:
-https://sourceforge.net/tracker/?func=detail&aid=3336448&group_id=167869&atid=844658
-
-As only part of G510 support was merged to upstream. Does NOT apply & compile
-on top of 1.2.7-r1.
-
-diff -aNru trunk/libg15/libg15.c mod/libg15/libg15.c
---- trunk/libg15/libg15.c	2011-03-31 23:33:44.000000000 +0000
-+++ mod/libg15/libg15.c	2011-06-26 07:08:21.000000000 +0000
-@@ -1029,6 +1029,76 @@
- 	}
- }
- 
-+// Logitech G510 Media Keys implementation. Unknown if this will work for other
-+// models. Using the backlight key as a modifier. The assumption is you would
-+// normally not be holding down the backlight key while pressing G-keys.
-+static void processKeyEvent2Byte(unsigned int *pressed_keys, unsigned char *buffer)
-+{
-+    // Key modifier
-+    *pressed_keys |= G15_KEY_LIGHT;
-+
-+    // XF86AudioPlay
-+    if (*pressed_keys & G15_KEY_G1)
-+	     *pressed_keys -= G15_KEY_G1;
-+
-+    // XF86AudioStop
-+    if (*pressed_keys & G15_KEY_G2)
-+	     *pressed_keys -= G15_KEY_G2;
-+
-+    // XF86AudioPrev
-+    if (*pressed_keys & G15_KEY_G3)
-+	     *pressed_keys -= G15_KEY_G3;
-+
-+    // XF86AudioNext
-+    if (*pressed_keys & G15_KEY_G4)
-+	     *pressed_keys -= G15_KEY_G4;
-+
-+    // XF86AudioMute
-+    if (*pressed_keys & G15_KEY_G5)
-+	     *pressed_keys -= G15_KEY_G5;
-+
-+    // XF86AudioRaiseVolume
-+    if (*pressed_keys & G15_KEY_G6)
-+	     *pressed_keys -= G15_KEY_G6;
-+
-+    // XF86AudioLowerVolume
-+    if (*pressed_keys & G15_KEY_G7)
-+	     *pressed_keys -= G15_KEY_G7;
-+
-+    g15_log(stderr,G15_LOG_WARN,"Keyboard: %x, %x\n", buffer[0], buffer[1]);
-+
-+    if (buffer[0] == 0x02)
-+    {
-+        // XF86AudioPlay
-+        if (buffer[1] & 0x08)
-+            *pressed_keys |= G15_KEY_G1;
-+
-+        // XF86AudioStop
-+        if (buffer[1] & 0x04)
-+            *pressed_keys |= G15_KEY_G2;
-+
-+        // XF86AudioPrev
-+        if (buffer[1] & 0x02)
-+            *pressed_keys |= G15_KEY_G3;
-+
-+        // XF86AudioNext
-+        if (buffer[1] & 0x01)
-+            *pressed_keys |= G15_KEY_G4;
-+
-+        // XF86AudioMute
-+        if (buffer[1] & 0x16)
-+            *pressed_keys |= G15_KEY_G5;
-+
-+        // XF86AudioRaiseVolume
-+        if (buffer[1] & 0x32)
-+            *pressed_keys |= G15_KEY_G6;
-+
-+        // XF86AudioLowerVolume
-+        if (buffer[1] & 0x64)
-+            *pressed_keys |= G15_KEY_G7;
-+    }
-+}
-+
- int getPressedKeys(unsigned int *pressed_keys, unsigned int timeout)
- {
-     unsigned char buffer[G15_KEY_READ_LENGTH];
-@@ -1063,6 +1133,13 @@
-       case 9:
-           processKeyEvent9Byte(pressed_keys, buffer);
-           return G15_NO_ERROR;
-+      case 2:
-+          if (g15DeviceCapabilities() & G15_DEVICE_G510)
-+			 {
-+              processKeyEvent2Byte(pressed_keys, buffer);
-+              return G15_NO_ERROR;
-+		    }
-+			 // Deliberate fallthrough
-       default:
-           return handle_usb_errors("Keyboard Read", ret); /* allow the app to deal with errors */
-     }
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 7d82357d2be6..de356f2e816f 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -2,6 +2,8 @@ AUX libgpg-error-1.36-gawk5-support.patch 4306 BLAKE2B 60bca612d1ce3b69facd0d27d
 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
+DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de
 EBUILD libgpg-error-1.36.ebuild 1682 BLAKE2B 060fea2878a9ff65e895978743bdf00435e4c275bbf2769777d52d60108358bcf02b8387671f9ac46bf8d9b2b542dd0a383950734baea3568d69fa10fc05a1e7 SHA512 77a635e5f705bdbacf5bcbb9a9bdeb26aed6ec2f7f06a213a2f1bcf84c5c15cb6072511988c95d1f7832e23aaedd42059a3481c1f55fc1e1e0b66f18343b3d9a
 EBUILD libgpg-error-1.37.ebuild 1697 BLAKE2B a788777367e04315c576a22bfb0c8ef7fc5e4c5e7d2aba90ab57079226c57a18a386162d5aac94f66ddbf8f45b65d3b8542642a94f13b49dc7d05ebe8ba17496 SHA512 cf202bc7d89a137245aec1c04dc956483ba93fe1e8ef8896b4aa48a576cb54f9ecb7eb64a7dd8eec58861e9ca3aa42feb988f3e99a87e372e8e8863cbb0e7030
+EBUILD libgpg-error-1.38.ebuild 1697 BLAKE2B a788777367e04315c576a22bfb0c8ef7fc5e4c5e7d2aba90ab57079226c57a18a386162d5aac94f66ddbf8f45b65d3b8542642a94f13b49dc7d05ebe8ba17496 SHA512 cf202bc7d89a137245aec1c04dc956483ba93fe1e8ef8896b4aa48a576cb54f9ecb7eb64a7dd8eec58861e9ca3aa42feb988f3e99a87e372e8e8863cbb0e7030
 MISC metadata.xml 525 BLAKE2B b2be127796014b926129f269602f39c5b0fa9ae4022b1d7492c201725c27e614e0dd6a0f8bacd1e6703309130f7e758c0bb7abef9d532c01182eb7b4fdc0a13f SHA512 48841f068de32aefcdafd5b831a90811c8006862a8aea7b9cd48e77dc3f9e1dfda00d952de9f5784a58f730ae2707eda2ca4bfc1509985988042017419a7b8b5
diff --git a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
new file mode 100644
index 000000000000..f6fa282fbe08
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.38.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 ~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/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index 5683951a4a7d..7c241ed75d33 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,5 +1,5 @@
 DIST libisoburn-1.5.0.tar.gz 1550656 BLAKE2B 447c383b3847b7ca0c4aca73f5317dec03ef79b34debc3ad2149fae4e7216f29c4a0dd918271087b530fb6c476b219430159e1515bec4bcf51c47d5b2ee05d89 SHA512 c74a9e2887244c28c82abe70d2603dbcd49b639c370e5b7fea03aabce59ff2b361345cd6ec88fe8152727e8a416d4759b88d91e2b5aec8a697408e00b7dc9e4d
 DIST libisoburn-1.5.2.tar.gz 1564700 BLAKE2B 5c7a77f427adff46923f9dc8833f40db36f6ac1ee3b0e58d0111a03ee5c7ae5cc60d613f47d4bb64b848feeb24599b424284cffdbe5c1eebcf7b5e3c58b19b53 SHA512 b481aa5ff20bb35ab0ab19f3f4f3ebc4f2baa8366a14a5afe4f262788441679b6501e140e182f4e80045c747f1cf48db40832d8d5cd064e58a02de2882536897
 EBUILD libisoburn-1.5.0.ebuild 1833 BLAKE2B a3cce6f0983bbccf7d3cff9d64a1c86f1ed8a84e504a46d4d2760c11a984ec028a15b7452334e1b7146693b116815650789162b15a9c61d89db3b2b93c03ffa9 SHA512 1069189e9f365f71cafc740aab68521eddb0b5abef7d22bb0429aee9379880cdcf85c3d26f666e9a203185d1eb6e551c043dc45330633b633fedee59220682bd
-EBUILD libisoburn-1.5.2.ebuild 1840 BLAKE2B 05a5666b81d848ee6c841bc7e82bb4768d76f7f329e9ad5af8b0a523d423f9ec52d5b0ebe4bd87ce4a0569a71279e16f91c6db9e4d4be1bae95426dc9bd9519d SHA512 26b28195ee02de2afb5255876befd7dfc78664a191986f9a131b292f9d196bfac6299e471e44957286aac40a2601de8daba15a8895890909b8aacf722efdb6a0
+EBUILD libisoburn-1.5.2.ebuild 1833 BLAKE2B 678d1c0237c07ef4f67ddc74ae6d48b193cf6fb1af9da852a732dae9373516e70466bed96858db0bfb53897d05ffd73cc81e3bb033fe32245d0d68af35c00bc3 SHA512 7d8d4e3bfc772db96383b9c5d7cdf0352fb69b91fc2c11151c902ea666adf5eec5f2d1ecb61a5ba077dc37b3d79c753d2716b9b4400b5e681a50cc23e558171d
 MISC metadata.xml 829 BLAKE2B 3a7a3c710e8886e60f6447baba781e98cd29d64daeae498ed8423ba40ef08258e8b249530666c487a1ddff81e837a97dfa6a9746872ee1feb7c66dd949471edc SHA512 0a3690bc939275faf4c7179c1e26d4dd93464820d3c21e8694119faab3a417b823661ac399f33d423793b2cc234828445a5d6af7d5067150b5e5a3018ecdae7f
diff --git a/dev-libs/libisoburn/libisoburn-1.5.2.ebuild b/dev-libs/libisoburn/libisoburn-1.5.2.ebuild
index 7142387b37cb..a3340ea83328 100644
--- a/dev-libs/libisoburn/libisoburn-1.5.2.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.5.2.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
@@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="acl debug external-filters external-filters-setuid frontend-optional
 	launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
 
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index b3d196c50bac..7049462a6ae6 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,5 +1,5 @@
 DIST libisofs-1.5.0.tar.gz 834099 BLAKE2B 57dbdb4173df635d2811c61a0b88e49f617b628909a6f87eeca7715a2c94b25b381860722cd56752cac28993bb314c9b0371ae5c0ca73e37044192f50aa47179 SHA512 1d0bc488c18b95971b7aa89765d7b5772b64d17eadeae9ec52c0f880c6f68acee80ee39b603752a1f9fbe0f35029c27023d5a6710d149a0f568bb396c3dcede8
 DIST libisofs-1.5.2.tar.gz 857346 BLAKE2B 25e03054e2bea2dfdbe07af77eed07a94e98288d059873c6fd06dab9b7dd3985af585a8938a11bb6834034a545fad4240546bd307ba83411d566b2a3dfbb7c70 SHA512 65048f2e33e96091ebce5b432ea607242050a3561c8eac18364bbe966d38c4f12ac1f4b38da5ea95ad4414f2b79b5fca99c1c0827e754bbbf6f7668d7e2c2bab
 EBUILD libisofs-1.5.0.ebuild 960 BLAKE2B 4604be19de39db7afaaf49f4349e0380650ff19ed75637cc9368ac3b6398cec1b250eb7dbd073c25f29cf97f6d96c220e13fb891c80edfed809d7ebacbb8c7a5 SHA512 6df2c2bae4372a1a81ea388c3e084f927ae771ca1ad11f820a61b69ead60e9e269feb0a8f8e946fb09ad5a8656ca5b3c96e2ef448d4e6a15d284a54f8f6cb289
-EBUILD libisofs-1.5.2.ebuild 967 BLAKE2B 77cf7ba476381df2d7b6eada717502fdc36ebd059327bd86f18467f35bf67bdf0019f6f16d11037261f8ff50f5c1cb3895c298ae23cda61bcb2dba5f87d6c47f SHA512 8516bfe16db4eb5df427851096f0ed27fb529d3cf821624bd8fb8d59ae1fe8c0197bb0dad9dcf099174950bc1946f0b58b50c9a403b2493547d5a920b56ab337
+EBUILD libisofs-1.5.2.ebuild 960 BLAKE2B 4604be19de39db7afaaf49f4349e0380650ff19ed75637cc9368ac3b6398cec1b250eb7dbd073c25f29cf97f6d96c220e13fb891c80edfed809d7ebacbb8c7a5 SHA512 6df2c2bae4372a1a81ea388c3e084f927ae771ca1ad11f820a61b69ead60e9e269feb0a8f8e946fb09ad5a8656ca5b3c96e2ef448d4e6a15d284a54f8f6cb289
 MISC metadata.xml 320 BLAKE2B 04767bbd76091dc5cbb1d5aad9f7c8b1adf5f36a98b82efb2047ee8c60f7c341b8cbff45c966bc549d975a7d7f4234609a47090cd8919a19c51b9d290c263366 SHA512 cce70181ca955dc89d0d02186bbc8fca4608e41ac59b00ad1e10dca94fb259797bf93d9bf942b38d00feaad274f85c0b79ab0f5e672dff405af799a4799871ce
diff --git a/dev-libs/libisofs/libisofs-1.5.2.ebuild b/dev-libs/libisofs/libisofs-1.5.2.ebuild
index 0d969ee783c8..c510381d1d31 100644
--- a/dev-libs/libisofs/libisofs-1.5.2.ebuild
+++ b/dev-libs/libisofs/libisofs-1.5.2.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
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="acl debug static-libs verbose-debug xattr zlib"
 
 BDEPEND="
diff --git a/dev-libs/libixion/Manifest b/dev-libs/libixion/Manifest
index 9df1a99d0f7f..6b701fb9d8b1 100644
--- a/dev-libs/libixion/Manifest
+++ b/dev-libs/libixion/Manifest
@@ -1,7 +1,8 @@
+AUX libixion-0.15.0-bashism.patch 895 BLAKE2B 6da1172978c76732c2e7127a6c85e1bb6bac7912fabe96e0ad91f07f1ff89a97fed2e3bf7d348c58f79fcedfb17d2f5e33dd6738769fb208c3c28a4521b7a9d7 SHA512 aa93ad7dcd20b703b9bab4fbd880ae13cc532345a007e28fca010215bbdeab411fffc1ce5cff5e7b602ffec2db4193d212e2b5a956b33cbaa05207b04921205b
 AUX libixion-0.15.0-musl-clang.patch 754 BLAKE2B 7764c55758669b39ee8ad38b976653e805840a5831ce38f2458c3e2b008dfca94b5bd68cdbadeda81a6b4bbd647fa3883d3c47dfa76761a31f8f9ff699c0ad8d SHA512 1b6a62c9219705472046d9da5fa8a92672a7055160c66f16a31fd003fe88ceceedaac4d67774bf55103a98d7434c030e1a020e15dd818aec23267b47bcb9561d
 DIST libixion-0.14.1.tar.xz 360568 BLAKE2B e4da21f0eff9111272618d1bad87790ed0c4b461478473654f8366b0023c0650b41d355b0737a4fd4ac943e66f919e2f0d6bf04250e597e54a290d4415f3a093 SHA512 e4ae6348833d2178c1dc76916937bcc9d7821dc6570fe13093c441ca22e0301a1ca6a4cf85d9814b83534733dba98f4c4a372791f93bc57173317657675b9ae3
 DIST libixion-0.15.0.tar.xz 447388 BLAKE2B 55df3417783f1653b0aa4b80a5f0107a3794fcb403c1c1263ce9829b31ee5263a104fa210be151535c1ff091d5dc2519f694ef3cdb16074f86dab4d48a127afd SHA512 feecaa4a8e6191649a7ecbc6c0f4d7db6dba3a5e4a031c1f55236907bf94e2ece9ee05d18ed345e3503cffb4a380b04f6c4941ef4214ddf92687998a070b7543
 EBUILD libixion-0.14.1.ebuild 1086 BLAKE2B be7d43f7bf671299ccc139795972b51675d8331c48c13a99fdaec84457d528fd5e7f00ede6fdc5fd3950def9474f3edecd0523e660c4996ff51de5c2e283d9c6 SHA512 ad84f5be51fef4f66dcfd79dcecc294fd10095e535ad596990d3f2a3b115a22a4fa7204066a6df8727cf5bedfe71604753b2dd6a04330dd5be23c9f7c54bbf2f
-EBUILD libixion-0.15.0.ebuild 1206 BLAKE2B 0fde2611bc7513b15de9572186d42e00ca5ed463b919ea70658081eea1ec14fc7983acb08018ff25e970bfb22b083a713456826f7de19f94ba0eb26e53810523 SHA512 9dd464c9906f5c2e93764f211c9e3a0035b75ab57a9d77d1a9a7e1be10f46114dd0f78182113764189fd477b4ab8c29dc215026613987a02d00a9fd6379efc03
-EBUILD libixion-9999.ebuild 1190 BLAKE2B ae0379d0d47a50787dfdcba5ed739a67288e90e0f8865d0446c026179f9ed29fdb27cb7444af3416c7adbfa9becd3edf32385fa924b0770a9189f4e8ad79df3f SHA512 1b06ae898271b7b07b257b436fe8839a252c98400e75132cab36ef39ad578e803817004d0ccc372b1163e80f6e943ab9114ed868be87dda26c0746e2a2d31556
+EBUILD libixion-0.15.0.ebuild 1200 BLAKE2B 73b521722306f4708e1e00c13f5b3c5f1af9364885519e50b65da42e47b857c63f3a14ccdaddea814d9238ebd18ba77c8ee08b546c43b85b8b93476cd593309c SHA512 212f660e8aaf0de1624269f1e9c7d3763f688ee3fa6f6f156211550aaed6dfc1413fbe2b5f2f73bbf608153074fce92ac32d5f4fef29e12c513940006f550e5b
+EBUILD libixion-9999.ebuild 1162 BLAKE2B 44bdf04b4f1db4dbe197626d9fa95ad37795a9ceba2a4161b0982ccf0a66489cb7fb651109dc7422328bad93aff9529b990061b68239a76d88cc07d9495222a8 SHA512 cbf07ffafb0f0e679eb56a0b1f09bcfe141927f47f05cb11f6796ef46d4cf595b6f673d932d3bbe32acf838abfba57e095670c2126f7170bf47744f25fc86d82
 MISC metadata.xml 397 BLAKE2B f586541f39dbba914dbeac46a03879649b394183dc117093dd1cac33d506dfb5cd0193a322761c3aebe5801a9851cfebc674e2487c86f03a5f6a53fdac059876 SHA512 558a3f9911ec5f5404e709f634595a4001adab07488e9da379b4936fd4d6742e40490aa1290f2e88716d2e5732462b1d63d52b8cdea4c58c77e1fbff17439312
diff --git a/dev-libs/libixion/files/libixion-0.15.0-bashism.patch b/dev-libs/libixion/files/libixion-0.15.0-bashism.patch
new file mode 100644
index 000000000000..9df7b04a865c
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-0.15.0-bashism.patch
@@ -0,0 +1,32 @@
+From 076f6576e7398842457d34fd68140512795c7e00 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 15 May 2020 12:42:20 +0200
+Subject: [PATCH] configure.ac: avoid bashisms
+
+or else we end up with unpredictable results if shell != /bin/bash:
+
+  ./configure: 19427: test: xno: unexpected operator
+
+Reported-by: Matt Whitlock <gentoo@mattwhitlock.name>
+Gentoo-bug: https://bugs.gentoo.org/723128
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3a07dd8..505aeba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -182,7 +182,7 @@ AC_ARG_ENABLE([werror],
+ 	[enable_werror="$enableval"],
+ 	[enable_werror=no]
+ )
+-AS_IF([test x"$enable_werror" == "xyes"], [
++AS_IF([test x"$enable_werror" = "xyes"], [
+ 	CXXFLAGS="$CXXFLAGS -Werror"
+ ])
+ 
+-- 
+2.26.2
+
diff --git a/dev-libs/libixion/libixion-0.15.0.ebuild b/dev-libs/libixion/libixion-0.15.0.ebuild
index 2387edbadd60..b93481abbcaf 100644
--- a/dev-libs/libixion/libixion-0.15.0.ebuild
+++ b/dev-libs/libixion/libixion-0.15.0.ebuild
@@ -4,22 +4,22 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-single-r1
+inherit autotools python-single-r1
 
 DESCRIPTION="General purpose formula parser & interpreter"
 HOMEPAGE="https://gitlab.com/ixion/ixion"
 
 if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/ixion/ixion.git"
-	inherit git-r3 autotools
+	inherit git-r3
 else
 	SRC_URI="https://kohei.us/files/ixion/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0/0.15" # based on SONAME of libixion.so
-IUSE="debug python static-libs +threads"
+IUSE="debug python +threads"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -32,7 +32,10 @@ DEPEND="${RDEPEND}
 	dev-libs/spdlog
 "
 
-PATCHES=( "${FILESDIR}/${P}-musl-clang.patch" ) # bug 714018
+PATCHES=(
+	"${FILESDIR}/${P}-musl-clang.patch" # bug 714018
+	"${FILESDIR}/${P}-bashism.patch" # bug 723128
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -40,14 +43,14 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	[[ ${PV} == *9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
+		--disable-static
 		$(use_enable debug)
 		$(use_enable python)
-		$(use_enable static-libs static)
 		$(use_enable threads)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-libs/libixion/libixion-9999.ebuild b/dev-libs/libixion/libixion-9999.ebuild
index 28084226f1e7..e3b55ff91012 100644
--- a/dev-libs/libixion/libixion-9999.ebuild
+++ b/dev-libs/libixion/libixion-9999.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0/0.16" # based on SONAME of libixion.so
-IUSE="debug python static-libs +threads"
+IUSE="debug python +threads"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -45,9 +45,9 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--disable-static
 		$(use_enable debug)
 		$(use_enable python)
-		$(use_enable static-libs static)
 		$(use_enable threads)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 0553e4eb7b86..6bf65a804c3a 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,4 +1,6 @@
 DIST libksba-1.3.5.tar.bz2 620649 BLAKE2B 6ed250684e40b4efcc07a86584adfbc659f886919d0306e82e2275c9acb8a1df698c7cc9a917fa66dd906fe473d14fa29507c03e681aed86286d65d9551cb5f6 SHA512 60179bfd109b7b4fd8d2b30a3216540f03f5a13620d9a5b63f1f95788028708a420911619f172ba57e945a6a2fcd2ef7eaafc5585a0eb2b9652cfadf47bf39a2
+DIST libksba-1.4.0.tar.bz2 651319 BLAKE2B 0e3f49fd0d389d905ff75ddad6ac1f3d158d2d4d9f47d08c14d11e3fdc07aa3f661e7ea53612770269b4e08e7b61af2d83a1679874daa0605638454059cb3321 SHA512 7c1666017ebfa50b5663153dead1e019e0ee342c4f44ee8f644fc749e82dcc983237ef0f557de9de3f7908dc90405d967a4db2e36e04fe0d5a09edf49f8a0c8d
 EBUILD libksba-1.3.5-r1.ebuild 776 BLAKE2B 9b948e3df0c84119d0c0974a26d4cf459492e282fa5efa49557de21707ef0b0f9897979a3745a9ef62143c0c2d18ab316765df1e5748d4bd93beb40579ac97b8 SHA512 2470eac50d217d0f55aafb00bc7472838d41b908360f82171854b71830c694ab3ea020733fa40c73419517655e921a31cc8dd79c8afdbdb335eb333a014d1da6
 EBUILD libksba-1.3.5-r2.ebuild 1040 BLAKE2B 8c46f984ce2c32ef10474865be55b553b43aa17f001b484a82eae18efd0d66f4f7e7c9472c91d3980de836a72c105f1e4e608715405da25bb74e5f43bfc51319 SHA512 372baf48e452491a1e3855c344a8f8b54b5c8d17c9463d48cbacf0303449dea5d3acaa51b7fa4fa269fef80b0a51ddd49288c338d78e645355a565f511947484
+EBUILD libksba-1.4.0.ebuild 1066 BLAKE2B 1e1b1bafe5833bba24cd3d3369be1c70f6ea466d4ff789455eebcb397bd5beb46a057bcf09f93f76271430d13a3c3e3ae1a46eb273f8e7bebc478cc73d6ff8c0 SHA512 216796c77a8b0451f97724e14e9f78223eba29a5327395f843e0b0e33627180850e981dfb1cfb83e34b0458473ae58efcb24ed2d17e688786feab2e1e087ef3c
 MISC metadata.xml 363 BLAKE2B 47525d43d5882725cae82a4da39f6a4e3f5dfb9918fbd2cc869af4016a41db7768120db58dd68b2fdf6b433b4f571080c96642af30a3399023bedfda72f3cdf8 SHA512 3bda082ad019aac69218fe9211a5a36a43f9f4db2c0017669fd1a4ce73d24f37798c1f3368562e6bb91417fdfff0ed795e1b2684e05a83100a18cd809cc0e396
diff --git a/dev-libs/libksba/libksba-1.4.0.ebuild b/dev-libs/libksba/libksba-1.4.0.ebuild
new file mode 100644
index 000000000000..c2943f6574d1
--- /dev/null
+++ b/dev-libs/libksba/libksba-1.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X.509 and CMS (PKCS#7) library"
+HOMEPAGE="http://www.gnupg.org/related_software/libksba"
+SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
+
+LICENSE="LGPL-3+ GPL-2+ GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.8"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/bison"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
+		LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config"
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# ppl need to use lib*-config for --cflags and --libs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libnfc/Manifest b/dev-libs/libnfc/Manifest
index c774641e9b27..68e091328a23 100644
--- a/dev-libs/libnfc/Manifest
+++ b/dev-libs/libnfc/Manifest
@@ -1,3 +1,5 @@
 DIST libnfc-1.7.1.tar.bz2 484309 BLAKE2B 7a86394e8902421410d54de2b2710cee7ea34a6f950f6d76ec59d24d6e46798cd10a9725f405c729df44da84b810b5853a5eef0ec5f2a10ccbcf7585d33f34ef SHA512 6a03d197c450c0ab8f2d16ae8c1f80e206fa909ece84a32dbb962acd0f7ef693a419608cdaa4c2207a1d2593599e44479520d7413eace7fca19d3230442e506c
+DIST libnfc-1.7.2.tar.bz2 534821 BLAKE2B 015634a696aeda77abdb53ab658504d0183b8d8d5899f368b122660d6527cf4d3ec988147082620d87d007ea33320acfde6cc013c9257b9c62fa4fb99528eeeb SHA512 c93ab10667998b6c6bf948082253715762ae91699d3e035f1149cebf6d3881cbc2ab570976c70cd12f886f76a18a82ac048fad0664512d1cd553c0fd1fdf7674
 EBUILD libnfc-1.7.1.ebuild 1028 BLAKE2B bee89d075ef440e75098aaa3b17562b24d3c2c9a1e57b8eb4241491123b6afc98ac7459024d692b17f93b386bf1dcd24a4ce62fcca712d9a26c05dfe34023b05 SHA512 d022f3e1de007df189e8c72fe57e07531f8462c45a535dad9ce87324edce108a140facc80985a898499052e166a8fb87537292af3e3e86d8787d0507939865c0
+EBUILD libnfc-1.7.2.ebuild 1025 BLAKE2B ae078e376e5f9184c5b7331f5da8ff38cf6720933f35c01ea06ac85eff3add00228ee58abb7e19a4911d2fa5863fa0db08694f2060656461859a45df126a5710 SHA512 a2437f94ba444cafaef9d97ed30a6916009d25ee24233c2e375113268e08c1f7f764c88b450e50420a941d8a8468a6217680fda0252488ddf6dd2913e9dd2d8c
 MISC metadata.xml 463 BLAKE2B ef027bb940311ecc6a1c0095114924a3daefc3b85b1bcdddd83d0c1b87e6a2b210c3b5411fcc7a9fdd9940cd709758e743c6e3a462c100fcc31904cc88af9e8c SHA512 20f4b81da686998f0e779615d995433aab1cdc89f30bb79bf5426b2dad480da5ec90d65d371f6fad11ad94773bd758c9650a157067dc73547c180c8ce4c54dc6
diff --git a/dev-libs/libnfc/libnfc-1.7.2.ebuild b/dev-libs/libnfc/libnfc-1.7.2.ebuild
new file mode 100644
index 000000000000..cb49692161fb
--- /dev/null
+++ b/dev-libs/libnfc/libnfc-1.7.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Near Field Communications (NFC) library"
+HOMEPAGE="http://www.libnfc.org/"
+SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc pcsc-lite readline static-libs usb"
+
+RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite )
+	readline? ( sys-libs/readline:0 )
+	usb? ( virtual/libusb:0 )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s"
+	use pcsc-lite && drivers+=",acr122_pcsc"
+	use usb && drivers+=",pn53x_usb,acr122_usb"
+	econf \
+		--with-drivers="${drivers}" \
+		$(use_enable doc) \
+		$(use_with readline) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	use doc && doxygen
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name 'lib*.la' -delete
+	use doc && dohtml "${S}"/doc/html/*
+}
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 43e22dd9d598..f0f434b61cc4 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -1,6 +1,7 @@
+AUX liborcus-0.15.4-bashism.patch 640 BLAKE2B 4ccb09840325fb59756b806c1be68bd327757899ba904e9c3b83bafe167c61ac3e94b9779e2df547b2427f622532c86ebba56d20d853095c215a0a15d7b179bf SHA512 0d7605eea0594b81b45faa0120e7fc37021efbae8b676ee0a1262923aa69511203927163785a8648ab23ac8df8ea5b4bb08ca8f0dda436b81ec287dbe2064951
 DIST liborcus-0.14.1.tar.xz 1894680 BLAKE2B 0070baf319bf35275f36f3082141f154404ad43d8143588b35c00b8b536f0c1cf5bf38fd9e997c4be45a454f16de1cc1a25186da40e3ed0606a87e9a6a968053 SHA512 a32dc5a652ce99cff37273c38fb9460e13e7bfb562f40c8d0c79b65c33e340daaeeb2c796308ca700b85bfc13cc8215641563b9e9f6d44b7d61adb8e8a3c950f
 DIST liborcus-0.15.4.tar.xz 1590048 BLAKE2B b2edff8a00439154c2850e49fff151f59c0c5a43163cebe5cac84b627fcf87c89a0a522797d8a5bc39eaca9205d74ff3f0bdf9ba77561c5cc7aefe98f35a4c8b SHA512 edbe1d6f86a249e43915e7fb960e6b269fa8703e3f571a023e811dd3f9b5d9c9a36edff491faa7ed7ea3490bf5afe1999e26d05c658a0a393b3ffd08b311b76f
 EBUILD liborcus-0.14.1-r1.ebuild 1244 BLAKE2B 0732a37541b1fff62423a0ff2bf5bf31802c1c1b5b10a0c0147984957119e5898398a146cf55201c66bff31115c9add5d3df03b8a8638e667bbaed8e1a7e1004 SHA512 5632ae0533067bf40858f8997510c1cc07f051095146ae57c89cc54cd7119693cec2eae63378e9cebc70bce5b2e0039d4edac813c7de961765a7a5a1f03fac9c
-EBUILD liborcus-0.15.4.ebuild 1280 BLAKE2B eb3bb2cba6958f6e5d04a46f2538d7fb7c98df152f68284185bcc65bf70f685fff2e556bfbd0936d1c53436bdbd5ae72517e1137e27e97fd2551073be4fbb44e SHA512 4960579802a32a15c473db2b12213ba0ef3a74e29598c56ec5ff429a7c92801299832a6209c1ddea78f9785e2f275b8aa4dda636c5b4c948550b8b885763c3c2
-EBUILD liborcus-9999.ebuild 1326 BLAKE2B f39ce495ed871d8410505d51832a61797da681fce6601865c8982d09a92405c4bb647978fcedd1d7fcefb6f33698d0a4167797e7d14863bb9bcc77c0f3ba813e SHA512 441ec34bfaecdb443ad645bd6aec07f4d7f57dc26719bbbe9fb39e89d02c7b25f2c5dd945624a3766e112fbc35404db1cfa6c3beda5f9ddb64f2945a8111f311
+EBUILD liborcus-0.15.4.ebuild 1285 BLAKE2B e64c9e75330c1191f7d512baded7464254f6ef14e68e1c74ab1e75d04a529c39f95a7e53ce6ea3c5b37e8771c856571bc1c80d7b33509a459cd1d78b0d28cf3f SHA512 2e94350986379449d0fcd1d05637a8d22ec46bdc5420779da62114f7af843cc1fe02ada8be6685e77e71af00de2bf3ca8a5b959ac327ff0dee1db6f95866590b
+EBUILD liborcus-9999.ebuild 1298 BLAKE2B b52cee71e2fcb7065bcf5cb5ea5aa94159a0b0b75718bda35fd3066fb95013b23e29617718c7377a3d13df01a9c016f0ccd30a2d236458e7b3f765ac3966b92d SHA512 c262623856b8e4ad196f5657b17717bdff2de6f8c334cb9b1a6bb46a4220047674f65864511f993672e98a5ab570c1371700f95c41bd4d7ccf2040e397ab2ee4
 MISC metadata.xml 556 BLAKE2B f60b17901e0ac564d2d495122a673c6c397e8ca78cc5035b53be81e48d6653d9804fbd337a5e308fb993a28f39aec13f0b8da85bc8e3bf213f0411e08f977a60 SHA512 c16a1b111116eddfdf0095b3b8c6e44e3dd60ec9049907459eef7906cc3f9673ee099651bdec081efe86abf2afc0340afcf204b7439481201188ac682eb11bf2
diff --git a/dev-libs/liborcus/files/liborcus-0.15.4-bashism.patch b/dev-libs/liborcus/files/liborcus-0.15.4-bashism.patch
new file mode 100644
index 000000000000..cc201a5024e0
--- /dev/null
+++ b/dev-libs/liborcus/files/liborcus-0.15.4-bashism.patch
@@ -0,0 +1,26 @@
+From 7d2ae0b6e47aa0c1fc43a91300d82c5394420162 Mon Sep 17 00:00:00 2001
+From: Ryo ONODERA <ryo@tetera.org>
+Date: Sat, 11 Jan 2020 23:01:29 +0900
+Subject: [PATCH] Improve POSIX shell portability
+
+DO not use bash syntax.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index bc5dc195..a854c0c9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -322,7 +322,7 @@ AC_ARG_ENABLE([werror],
+ 	[enable_werror="$enableval"],
+ 	[enable_werror=no]
+ )
+-AS_IF([test x"$enable_werror" == "xyes"], [
++AS_IF([test x"$enable_werror" = "xyes"], [
+ 	CXXFLAGS="$CXXFLAGS -Werror"
+ ])
+ 
+-- 
+2.26.2
+
diff --git a/dev-libs/liborcus/liborcus-0.15.4.ebuild b/dev-libs/liborcus/liborcus-0.15.4.ebuild
index 0d5789e0eb5e..999baa80ea0f 100644
--- a/dev-libs/liborcus/liborcus-0.15.4.ebuild
+++ b/dev-libs/liborcus/liborcus-0.15.4.ebuild
@@ -4,22 +4,24 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-single-r1
+inherit autotools python-single-r1
 
 DESCRIPTION="Standalone file import filter library for spreadsheet documents"
 HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
-	inherit git-r3 autotools
+	inherit git-r3
 else
 	SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0/0.15" # based on SONAME of liborcus.so
-IUSE="python +spreadsheet-model static-libs tools"
+IUSE="python +spreadsheet-model tools"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-libs/boost:=[zlib(+)]
@@ -31,7 +33,7 @@ DEPEND="${RDEPEND}
 	dev-util/mdds:1/1.5
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+PATCHES=( "${FILESDIR}/${P}-bashism.patch" ) # bug 723130
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -39,15 +41,15 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	[[ ${PV} == *9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
+		--disable-static
 		--disable-werror
 		$(use_enable python)
 		$(use_enable spreadsheet-model)
-		$(use_enable static-libs static)
 		$(use_with tools)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index 0ae4b1aa76b6..3aa2c7dcba29 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -21,7 +21,9 @@ fi
 
 LICENSE="MIT"
 SLOT="0/0.16" # based on SONAME of liborcus.so
-IUSE="python +spreadsheet-model static-libs tools"
+IUSE="python +spreadsheet-model tools"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	dev-libs/boost:=[zlib(+)]
@@ -33,8 +35,6 @@ DEPEND="${RDEPEND}
 	dev-util/mdds:${MDDS_SLOT}
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -46,10 +46,10 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--disable-static
 		--disable-werror
 		$(use_enable python)
 		$(use_enable spreadsheet-model)
-		$(use_enable static-libs static)
 		$(use_with tools)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/dev-libs/libpfm/Manifest b/dev-libs/libpfm/Manifest
index ba4f3032ad9a..4ba072d12090 100644
--- a/dev-libs/libpfm/Manifest
+++ b/dev-libs/libpfm/Manifest
@@ -1,9 +1,6 @@
 DIST libpfm-4.10.1.tar.gz 1005988 BLAKE2B 7bdc64540cdf0404bfab0a631e506f37a79ca090d68c798fe4943f627ebc3e15e01f6c4530d4eec2c82a6f759845af518cbf34b3ad19ecc5fa48a874611aaa16 SHA512 33d99824216b4d83784e0db9f1aae3b39f84c2ba42dee64dde0b3c43cc5ee3a18c206d9044e75bf10867768add7cb9967c6318f7aa196f178f334271fa05e1aa
-DIST libpfm-4.4.0.tar.gz 649910 BLAKE2B f74246d1ee23c7793e89db5d96f7abca581932273e3b0c8669c4e0ae54907e3bf53c3c1a5d09cee93458802263159f0ab808ff62774a422257a7f781c6ce454a SHA512 e7f9b50d0c71c08697283d043231234b39695fda6796ad1e2c48fdd67e2936a3cf5d864b5e1b9c68a34f1d726f2b273eb1267adec3060085f3a51e9886f5704a
-DIST libpfm-4.6.0.tar.gz 767447 BLAKE2B 2374abdbc9d886d4e0101a2dc77e699a47abdbd67c0f490706ae78032b89b5ecf9d577ab8f0ca297841ddb3b39da6994e833fea8659cfd21b5fbcdc53f2f84c3 SHA512 73bd11bd0c11c0ec2fa71935c967f36431a00b548b8b47575e00e8cc3e1f8ef3fc2d449d493f51a198eaba5b1629cdf79330cbe2a8ca8867e15fddbfdbf571dc
 DIST libpfm-4.8.0.tar.gz 828853 BLAKE2B e6caa0ffa4584dab805ef08ce5318bf73fda906afddb30b1490a34ec62e522a6bb713563c5ffecb22596e6c5c1c06c245c5b9bc59fea74face90a9edcbfb4eac SHA512 a06f3713c70fb4fe694154057604ae42627ad764486a3d3e28b0ef2e46fdd0a0431ec1a3c52ebc711ae174a1fbd7b3ddd0c736a568f57d4606ecf8064ff38228
-EBUILD libpfm-4.10.1.ebuild 912 BLAKE2B 2a333e5c700cb45d9e662e27716f6a90a1aabb075beb39df62a776ede76237fda65cc2bc16cfe670f016ffee51d7b98bd056437dea53e0c29fb261cdb5796237 SHA512 ffb3ea4efe55416b33f824e87e924a8c070da90610be9043b20ec89084d35a9219bdf59bd0012301f1e487daacdf21fa14846cf4c4ba5ffb5b85af2142af6476
-EBUILD libpfm-4.4.0.ebuild 887 BLAKE2B 6e3b57d6d5bb98aee5f3072020306b329e0e2b8979d8b81d889c81ab1823c9388f8f22034ff5c501fb349266ca53b3c708619d58ace567e1b25435a9578dcf11 SHA512 3db81f6920687de1f1fe33c6eaa3c5129b2ce1c6191c68be789035799099124cd34f49010f019f637fd867cf47c759ae75d7c17ed0abfdfc2674f633d2d217d5
-EBUILD libpfm-4.6.0.ebuild 893 BLAKE2B 17221f8f7813320e8a99bdd01b9e2694ff425ef1496c74668fb04fa315236fce95ff1745df357f46b1d9f959097cd808aa47d99b0de000d5d56c363723005aeb SHA512 60e921666e7a19741cb764126f608944ce197c426e401d11d42f60a4f4950b16b6a8b5d0ac27ad3fd91ce7d0650cdb05f9538e10be770610c66639b3ce097bf0
+EBUILD libpfm-4.10.1-r1.ebuild 931 BLAKE2B fd78952d231bead016b9df3d5043b4929419b34208c5e8855e26bc8979688a69bea1e3a8f020eefccda0f24e429928058358c5a53d6508b32292fbdbc8cc13bc SHA512 f964db85d758a74cf1c4094b72af0be6df91bb09de8a48133875d656e1908adec6b1147d11ff86d2e8898b7a2d813c46bedcdd07b73b26092039556793f2eee6
+EBUILD libpfm-4.10.1.ebuild 911 BLAKE2B ac53ebf9f52a16f7e858a3ed19f819a2fac6b701ca0d004161560c8d7fe6fff89ff8e2e554c7daf0ac27b15fad3c141ed56fa56cb392b674f2ee6176110ffa59 SHA512 3144203053c462d094ffc34932328837898dac743bbccaa46d0bf0a1e076294cac0bfd4cb639e68dc0ed5e1cef1ad443060c139bebb25fc3eac7889e6a683f96
 EBUILD libpfm-4.8.0.ebuild 905 BLAKE2B ff05bc659b6caf37ac53b4052017dd9d454e6db023869dec984ac3cacdd97d4543361f2a055724624318bddc9adc18f7e19b2cdb6db7e7963093ec01c66063b5 SHA512 a12aa728c30342c051f850587c7c5a7052c837a61208d0e483fc116d48a0bd392ddb3848763fa4b9e13f680ed442d245e1ea9ab9a30f6977c298ae634e34ad95
 MISC metadata.xml 245 BLAKE2B 1e997172fd9bcc973ca12e8e67047a3b873376bc0110c7005244d7352f728d3d87fd310a200da274dcb6b0c47701b2652bd51440370f519ee51af7e1556a0048 SHA512 98e5a067f6f6b505c2e52e1a33464d536b0bbfcb495a63808869c5e76052d64b6d18c608072b83c4ce284589a07549e363fb2e108d487473d0646bea6afcc2c8
diff --git a/dev-libs/libpfm/libpfm-4.4.0.ebuild b/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
index 608bb97fd700..99cd8b0c3d91 100644
--- a/dev-libs/libpfm/libpfm-4.4.0.ebuild
+++ b/dev-libs/libpfm/libpfm-4.10.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit multilib toolchain-funcs
 
@@ -11,13 +11,15 @@ SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0/4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="static-libs"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
+
 	sed -e "s:SLDFLAGS=:SLDFLAGS=\$(LDFLAGS) :g" \
 		-i lib/Makefile || die
 	sed -e "s:LIBDIR=\$(PREFIX)/lib:LIBDIR=\$(PREFIX)/$(get_libdir):g" \
@@ -26,7 +28,7 @@ src_prepare() {
 
 src_compile() {
 	# 'DBG=' unsets '-Werror' and other optional flags, bug #664294
-	emake CC=$(tc-getCC) DBG=
+	emake AR=$(tc-getAR) CC=$(tc-getCC) DBG=
 }
 
 src_install() {
diff --git a/dev-libs/libpfm/libpfm-4.10.1.ebuild b/dev-libs/libpfm/libpfm-4.10.1.ebuild
index 97e838e53dfe..cb4c5baa3478 100644
--- a/dev-libs/libpfm/libpfm-4.10.1.ebuild
+++ b/dev-libs/libpfm/libpfm-4.10.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
 
 LICENSE="GPL-2 MIT"
 SLOT="0/4"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-libs/libpfm/libpfm-4.6.0.ebuild b/dev-libs/libpfm/libpfm-4.6.0.ebuild
deleted file mode 100644
index 5224fe87b8ed..000000000000
--- a/dev-libs/libpfm/libpfm-4.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Hardware-based performance monitoring interface for Linux"
-HOMEPAGE="http://perfmon2.sourceforge.net"
-SRC_URI="mirror://sourceforge/perfmon2/${PN}4/${P}.tar.gz"
-
-LICENSE="GPL-2 MIT"
-SLOT="0/4"
-KEYWORDS="~amd64 ppc64 ~x86"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e "s:SLDFLAGS=:SLDFLAGS=\$(LDFLAGS) :g" \
-		-i lib/Makefile || die
-	sed -e "s:LIBDIR=\$(PREFIX)/lib:LIBDIR=\$(PREFIX)/$(get_libdir):g" \
-		-i config.mk || die
-}
-
-src_compile() {
-	# 'DBG=' unsets '-Werror' and other optional flags, bug #664294
-	emake CC=$(tc-getCC) DBG=
-}
-
-src_install() {
-	emake DESTDIR="${D}" LDCONFIG=true PREFIX="${EPREFIX}/usr"  install
-	use static-libs || find "${ED}" -name '*.a' -exec rm -f '{}' +
-	dodoc README
-}
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index 56b82b820744..afa91b5fb2d6 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,5 +1,7 @@
 DIST libqtxdg-3.3.1.tar.xz 66004 BLAKE2B a676f22144ddbf67e02686fc25b381a911e5d0391e2f735c6d85914362433aad20ad0a3740ea7101d26b5b5692d0504c3798489333b1bf9585c3be88f6636beb SHA512 f0fdb95f20ee49becf770455a513178bb3ce63ee460e8bbaac8d40f50ae47a139ff518021c8fc19254bbd777b67bc7f2754302de7e2bb6cdf929bc559a1b51f3
 DIST libqtxdg-3.4.0.tar.xz 73060 BLAKE2B db23fe8bfb6e8b73a76b710f121464e3a8f5b60f1019705bb6a234eb4c0a9a5ad9469ab95eeac8f392ca10a86343f9d0b3040eae4131d1d421800b8054247d6d SHA512 9bd52ae3aa32f8c7de48e562ada1ff2413892c7ac58d5f7a06c0c512a4a6c03e9c5c44930f7781930c9c701894ea38a450a61a3c26afc047c76313ada0a890e6
-EBUILD libqtxdg-3.3.1.ebuild 961 BLAKE2B 17dbcba235fe1b37bbe16ebc22791b040001d5dfcfb60526b164b3be76da036261ec611bd672c51e7869e33a35ea82f3fd9c5fe3dcb1e4218e82d9e783f1d3da SHA512 d770af95050773034ecbbd3890b1e32265c51a62f63316ce0211f22770fc9a0683648da5ad48c0ddda04404c56c70032a0bbf4e0ba1e81a4a0d4aea80ea3fcf4
-EBUILD libqtxdg-3.4.0.ebuild 962 BLAKE2B f8484b027d1e7b24722dbe431c4c337f43e9fe4f5137edb249fa7f50deb0e72c9e193758452b0d9323f4f0473b1610f2902ce8537827ecc044931c8b95ada2ad SHA512 ea837a0e0d4e912046b5481a0be8a012c5b8d4f2e133958e9069e8e61d1d7cdf98a5c1599048d7b2fd639f4f8722b91f7a78db63de6e59667385f5603a2769ac
+DIST libqtxdg-3.5.0.tar.xz 73248 BLAKE2B 0e587e640abda9cdf55cbeac270382386be2bc26b291bb9f655d845acb381b7f65048d213039a6e7ae9cc5d03fa29911bc2277140524d73f0e005745759a39b6 SHA512 014407a3dc869dd324c3840d54c0aa4565a2f69f147b172548458dee69d33474d9c2ebf50112d1ef7e36ed0aea0fb055f8e03901314230a6c55a84808bd52653
+EBUILD libqtxdg-3.3.1.ebuild 967 BLAKE2B 6e1d908b08da2edb6bd01966e3055b36a796ffe18b538935c6b4c291afdbcee417c823b273d980f5c02265544f524015f72cbba082713c803352d175752f7ba8 SHA512 e8a17c51d87c715cdafd1b381b8dfdf8638028ac679fb6d198d89caeeb5b498d33ea392d91e01036903778903b42f3bd4991e77c9e9331a1da30f8c740ecdecb
+EBUILD libqtxdg-3.4.0.ebuild 968 BLAKE2B fd988d0b1b55d110ce23135255ecf40d06895186508852a8fd9665d8e06a344a1608900d113b6a1f0bd5da299b3675fdc88104141ecf7edac62cffcbcd5557cb SHA512 ded8649801c95ed493a7b1ef5f839a9107837e0b1415bc7ef402b849f63b9e7a1bad8d0fe576df39ade21a8ac6ef5cbfe6929dc8997b96a73b8466f48004de33
+EBUILD libqtxdg-3.5.0.ebuild 973 BLAKE2B e9885b7f5f0ce2d36b6cbd6c7bcd7246807d8f1bad8949d1f510189b25f77beb8cfe1fd5f9e9aea7ec235f1d61e0f95cdf33bf86e0a4598f07faeddeb9395025 SHA512 ab8acd4eb8d46f30853df4187c8f160608df4e8af31d7f4edeed0f14824c2f19e64edc077c81c5ce9467a9ca66432c6bc85ca246c55df0c4cfe34215de2ea734
 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b
diff --git a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
index d865124a86d7..a1620ba0ecf4 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.3.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake virtualx
 
 DESCRIPTION="A Qt implementation of XDG standards"
-HOMEPAGE="https://lxqt.org/"
+HOMEPAGE="https://lxqt.github.io/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
diff --git a/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild
index eebc37d82ef2..089177d5fd38 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.4.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake virtualx
 
 DESCRIPTION="A Qt implementation of XDG standards"
-HOMEPAGE="https://lxqt.org/"
+HOMEPAGE="https://lxqt.github.io/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
diff --git a/dev-libs/libqtxdg/libqtxdg-3.5.0.ebuild b/dev-libs/libqtxdg/libqtxdg-3.5.0.ebuild
new file mode 100644
index 000000000000..5c925fa5ebda
--- /dev/null
+++ b/dev-libs/libqtxdg/libqtxdg-3.5.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake virtualx
+
+DESCRIPTION="Qt Implementation of XDG Standards"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
+SLOT="0"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-util/lxqt-build-tools-0.7.0
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5=
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	x11-misc/xdg-utils
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	# Tests don't work with C
+	LC_ALL=en_US.utf8 virtx cmake_src_test
+}
diff --git a/dev-libs/librep/Manifest b/dev-libs/librep/Manifest
index 1fff7f0447be..f2bfd4f78da3 100644
--- a/dev-libs/librep/Manifest
+++ b/dev-libs/librep/Manifest
@@ -1,5 +1,7 @@
 AUX 50librep-gentoo.el 180 BLAKE2B 7d60b7ef76c4c695eca84d2c85e1d139fc34fcaaa76189510d8fe021b05a276da9ab33f38622e04c55bee7dcd312bc20baf86383114e527b34cc8daa305b35f5 SHA512 04a4da2e38ddf04bccd28002a46f13526249f31d2e25769056e1b763e3a22f75ffc2a906b68eef0ce04b1e6505acbf858f4d7f911258461e39419ebe4b098b71
 AUX librep-0.92.0-disable-elisp.patch 838 BLAKE2B ec37012dd440def1beab62335b787d7d064b416f3274bf5e563127801f0b242313fbdc5b30e43dd7e518c2a91a05532f606126645af33d45c808d570731a759b SHA512 cdbfe9f8f210869243e38e6ed4f2ea66cee4a1c626e7fcd8b9733870998e59e0a294c3cb9c491eefac8d6b89a8effc9068ea0dd9f2d2d6a86c9dc49dd838f126
 DIST librep_0.92.6.tar.xz 472152 BLAKE2B 165fa8b1d68360e0b08909663cab0f334774030e970c0d376652bc819368eae647882091f1e8d1329f4d3c1c53def4f69aeb8c4d7fe5f327d06d528dc9bb2267 SHA512 6e347e788922af9458e6eddfdaf7935b69df8f70b3f6deb11e6abd67596aec05e7dce7f41db1c84e478347d379ced10cfb34672a797c853913fd538a78a1f96d
+DIST librep_0.92.7.tar.xz 651344 BLAKE2B 3a0e9a3eef0afa2e095537dfc307418ba87ce7a9baabdba262fd9a24b71cc6577fe1282412da495d56bf22007f1931c5b834f5bcf4c5ebe87d6b43a4975d630e SHA512 752cb2da31457200b5896f70ce24a097b261b996da25998cd78a777f982597473afce1a216f449a4a969d29b1678bf54e2f148e86de6f9548eeb5cfd530ae377
 EBUILD librep-0.92.6.ebuild 1506 BLAKE2B 96adfcb03ac626268728915315b75cc72a829978049036fe05f0b88011289661ea127869fc0e1f98fa35567ffb45ca2d7346669e4a27e5c37b55687d29af649f SHA512 b14d9fb9778d682b0d68c1c9a6b7d4f60717f3a554ccfb4ab5cc3d6f50adda342cfdf801ea85b463e8aa8fe006ec43a105dd4bd5b0a323e09d0ca8298b26a393
+EBUILD librep-0.92.7.ebuild 1586 BLAKE2B dbf6fc55544ebf3b9190a2e768a68710072a23955698a20997ad0e4aa0adf2048ce0874d38f2f1eceae534e2b71d6aa9215af4591f8835dc45f30c4180256cae SHA512 0b2dfe4b28dec15b1ef612c5d587a5651e300d26a6d4222f3a02a1185e3f8ba7bc9849b4f4380c2912dcb992f47bcd1d8efbeb0e0b4ae2832119126545f5f1aa
 MISC metadata.xml 243 BLAKE2B 424708417b0be4fbbd98ebe053b99952e71bf62573e9c47eccd5adfa07de8ed4d9477bf5883b3ba4d4e9d1af015ff6e4f347fe1caa3fefa1ae7a1d5c9c0a82fc SHA512 6d786c0bd00b4cfc39b7705053bfda7169666513c7e7ca16f9fdcca5244b89f1e0024731214956e6cdcde8d241914c6f66b7dae153c4c48e5a41e44bd1b04411
diff --git a/dev-libs/librep/librep-0.92.7.ebuild b/dev-libs/librep/librep-0.92.7.ebuild
new file mode 100644
index 000000000000..829d45fb63d6
--- /dev/null
+++ b/dev-libs/librep/librep-0.92.7.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools elisp-common flag-o-matic
+
+DESCRIPTION="Shared library implementing a Lisp dialect"
+HOMEPAGE="https://sawfish.fandom.com/"
+SRC_URI="https://download.tuxfamily.org/librep/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="emacs gmp readline"
+
+RDEPEND="
+	>=sys-libs/gdbm-1.8.0
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gmp? ( dev-libs/gmp:= )
+	readline? ( sys-libs/readline:0= )
+"
+BDEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.92.0-disable-elisp.patch
+)
+
+S="${WORKDIR}/${PN}_${PV}"
+
+src_prepare() {
+	# fix #570072 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+	default
+
+	# The configure script is missing from this version.
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with gmp) \
+		$(use_with readline) \
+		--disable-static \
+		--libexecdir=/usr/$(get_libdir) \
+		--without-ffi
+}
+
+src_compile() {
+	default
+
+	if use emacs; then
+		elisp-compile rep-debugger.el || die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	find "${D}/usr/share/man" -name '*.gz' -exec gunzip {} \; || die
+
+	dodoc doc/*
+
+	if use emacs; then
+		elisp-install ${PN} rep-debugger.{el,elc} || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" \
+			|| die "elisp-site-file-install failed"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 6be96126f256..8316564a94c3 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -3,20 +3,14 @@ AUX libressl-2.8.3-solaris10.patch 1928 BLAKE2B e12372c1fba9c586e5d8c4ccd7af0c3d
 AUX libressl-2.9.2-non-glibc.patch 981 BLAKE2B c9d208dac68fbe7205617ca667d111d00ab9d2324ba0c91c36f05efba9372a97ca76d844144d886814798e5be29c8e6a1bc0ac0341ee420660282d6d5267970f SHA512 5672b69a6c4ad68eb02e7e2b43dca6b2c557e0b74c29fcd249f46e65b284c740d9979e43fb36a7784ad41e7bbfee79ce18242990e62ecdb80d1a44cf1540dc8c
 DIST libressl-2.6.5.tar.gz 3225481 BLAKE2B fcdf0d8b4b68fdb6c17299f4b9897c84f51ec3407abc6c1bf8d474c4424161c563667ca1fb26c45dd20a0e895457e9210b7bd0539581472b94d594cc32a68191 SHA512 0601c73bb5c3d149df7eca3566831f1b35713aa16a15788a291922fce0bffa1ba0bc6ea9cac1fcecfd980009f2292b08b2a57d66b517fc1bc8c7364a24dbbd9d
 DIST libressl-2.8.3.tar.gz 3366196 BLAKE2B e32c097b31998d68a31266fbbf3624d5ab8ca716f8c53e423bcf09b3a8ab3542c92a99e259ded7b86f99b45cc199cd44791520a609f18c35d150365de5768eec SHA512 3967e08b3dc2277bf77057ea1f11148df7f96a2203cd21cf841902f2a1ec11320384a001d01fa58154d35612f7981bf89d5b1a60a2387713d5657677f76cc682
-DIST libressl-2.9.1.tar.gz 3607116 BLAKE2B a4542d7fc97bfd213162fe908e28b27d52329e2b6a5d77e0cb67d1a6732c500ca772d0c5735c9fcd036c477e6ede330305b4675bfcff9f72fd7886a781f30015 SHA512 7051911e566bb093c48a70da72c9981b870e3bf49a167ba6c934eece873084cc41221fbe3cd0c8baba268d0484070df7164e4b937854e716337540a87c214354
 DIST libressl-2.9.2.tar.gz 3607549 BLAKE2B 496e993e4f1c85167e0344afab61259d4e3f094a7e5dfac85878191070e2c196753162532efb921fab582481aeda3705fca9a2b48921cba82465192f2c1eef95 SHA512 b43e73e47c1f14da3c702ab42f29f1d67645a4fa425441337bd6c125b481ef78a40fd13e6b34dadb2af337e1c0c190cfb616186d4db9c9a743a37e594b9b8033
-DIST libressl-3.0.0.tar.gz 3620475 BLAKE2B c1dc1709e60cfbfa9907c206340262b78e1bfb991d3956dfc0a5d8d80f80b61df41059e645f9f096185724470e8466a5b7a444a575f5f09d5a0f9eb35ff3ae7e SHA512 460fa390012218262b7c148a28e6ddfc0dc3d669c4bdd37b68bfa6f50a0cb2fb81a277fb46ae0ac22673aae5b5cc4476fe96e56471a6812176bf76e9c5e10838
-DIST libressl-3.0.1.tar.gz 3668819 BLAKE2B 0e0e9db5018f7fd6c5d3f15dd911e375ae51885321fda2a6bef8f56620ca9d8b63d587f5acdf78afafabdd7ee1243c79bdf9b68a890dfc5f76fa45bbaf060563 SHA512 d2d665734d8aab2b998769492cbb1e7fddead52430ef503650c14786196241a6d1137f47b33ddf2037cc1ff13c240283f591dce83ec0da475619679a051d725f
 DIST libressl-3.0.2.tar.gz 3669468 BLAKE2B 84ad2c1fea8d2119f191ec8ab3f999fb0354636d48aabb76fa1786139c669c9d8ca105d79cc8416dd20683818eccc84490cdadc9ca94cb2b0e411644e923a3d6 SHA512 19226da3bc9776e1da40b8e94dfa53564d5e6acc80edee539ba12d7a75c1bb8c0603e7633f26a6ef8b12adc56bb677ccda448575aa6be2ad3df5447465a4b080
-DIST libressl-3.1.0.tar.gz 3758950 BLAKE2B 0ea1caa80ab54a5346f239dd1205f7fea56cf1a8a541766068c002647144ca6df0e32ff1bb451ebe42100eb27d08ce9afd4a13c2b2c5bab4ffcbcbeae7e4c94d SHA512 365ccf01d4802af048b2a03b6994b17cf051185fa4a0940ae72bd3ec3927467486501d334d2fa7904b07d9364093a97e1b90bb67d3bd8bb1d807643c20a0c677
 DIST libressl-3.1.1.tar.gz 3765769 BLAKE2B 8524a4d83e05b0f2992df8e3797cbf43220a8619431f4737887db2fa35419a925907691ac1aec5b3cc1660179d4ac5e44714540ae591c5aa4957db1f26068a7e SHA512 353a5c95bb0c160b698b95b91d6857ddb63a75b0685a233ed2515f46ad8369d40857aa1ff8407aa9bc78a5c3c29c25376e7a55a3c96fce40840633411944fb1d
+DIST libressl-3.1.2.tar.gz 3765944 BLAKE2B b0181a1936af3aad3908668cae14aa87e8dca594ebb1effa354eb57529c21aca2052ce6bc85958dd83645c9026c84410939018d16c8e70a60f336145d45790e6 SHA512 b024c5661777daa73feff7085ce7be76a2e766d2f3cb5ca35c208c471e5651a365252758ca36782e20cdfb2bc8171919a08ad592420878a5c95fbe646f5288c8
 EBUILD libressl-2.6.5.ebuild 1478 BLAKE2B 44e283811242efc54261ad1ab9a6241e3dba2217093b3226084fd143fa9ae30a127833a774cd725608690c720b97fed3e2c00ae92ac109295b485e6e63fd8564 SHA512 ea00fe358ce009a9e916897ffaf949c3c709455f5f69c5517845f2413a5e7559f2e1c717a941ef43e1776f334123cddcc730537428c63e38c7edf7e4fe3a972d
 EBUILD libressl-2.8.3.ebuild 1572 BLAKE2B aaeecb5de2282cc7ed5f925a7930abcbdaaa2528e26a7972e070667edb22ae0415a4fc42d639fda455cc25746653a3954b03688075355082d77a080dadc48513 SHA512 bbf59b1952b1892b56df2199613baea4f4bcf85c7b1bbdd25a6a4ed7ba6f645172b20ebfdad8c1cc63c7669f68fd423581677dede98bb9838a14393b6f9c701b
-EBUILD libressl-2.9.1.ebuild 1706 BLAKE2B d5cee2b2dc1e31e7c2efc76ee9b735fac74bea53545b5a4dd3c58a8ecbf962a9ab1a8aa6f82868994beef87c6940ac3b5b6999083b20b5641a337d85f11867e4 SHA512 220f19943bb1a1d2951f680128f87d4dd31d8bdbbe7279e87f6e629af326f9117c1a2ea56c5d2ef4b8c803fe1d88f62b11cf62e3ff4ea342ab912d2e1f4735aa
 EBUILD libressl-2.9.2.ebuild 1742 BLAKE2B 3ba8f8b51b4b89515c6dadfb4b5975b1d683b04aea39fee7a509953f900d35f62d365896d3a2c7e5a53af943c184c362629c214147a5f4c3115833ba62473b85 SHA512 745a0e3f946ed03e90a876e78cab5e36c59b1c5ffe121499c0c149ad510cc47e62078bf62c0b43d7a0d2aa75c6103c1650193df8ec87ed4354f76080660f7cdb
-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 1700 BLAKE2B 7e504f9f0cd914d6f6377df8a6ee579bc425645fcb86c679d94747aed2d0d35b88e1409fff4ca07f1bb3c002357e1bc6d591c2fa880ec71961987f9af8691990 SHA512 e562c9f2045fc553999e8afbf226c059ec99f96948559a6438f2d147ecf9452ec1c88bcd2303433e7a6c038301d96413ed916df6db03029717d6e50e65cf2bbe
-EBUILD libressl-3.1.0.ebuild 1706 BLAKE2B 5ce07e1a9288f5f08df63198eec6b6e88b96c3648d3d4f6c98772a14f76d62e7add706d950386cf58f3c6439f5453ffa3dd4441efc3b4ff1c9b8fa7792c19aff SHA512 bd7e013012d0cab433ede6dcf10d3ae135b85bbaec33dae33a7ec1ca94e02493f4c31a667285b3160208be30ce92788515537efc690e98dc13332631a4c4a539
 EBUILD libressl-3.1.1.ebuild 1706 BLAKE2B 5ce07e1a9288f5f08df63198eec6b6e88b96c3648d3d4f6c98772a14f76d62e7add706d950386cf58f3c6439f5453ffa3dd4441efc3b4ff1c9b8fa7792c19aff SHA512 bd7e013012d0cab433ede6dcf10d3ae135b85bbaec33dae33a7ec1ca94e02493f4c31a667285b3160208be30ce92788515537efc690e98dc13332631a4c4a539
+EBUILD libressl-3.1.2.ebuild 1704 BLAKE2B 5ac0555b7d9418b31d785ab6af057f9cfaa241b687adaa43b0c01ab0f347f69d46127443fe92e9340909fdc4b7326914de2970610d807b23b44e8a96eace48fe SHA512 0aa0400c9a672ab615675cf4694338f5c82b0b9034c9d3321f1880ccf2dfd02bd28ec08939b09d37d55ebecb980e1ad016ecce25ff5fba989dbafc5a19b8d5ac
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.9.1.ebuild b/dev-libs/libressl/libressl-2.9.1.ebuild
deleted file mode 100644
index f3e254c6715d..000000000000
--- a/dev-libs/libressl/libressl-2.9.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal libtool
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="https://www.libressl.org/"
-SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/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"
-IUSE="+asm static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( static-libs )"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	touch crypto/Makefile.in
-
-	sed -i \
-		-e '/^[ \t]*CFLAGS=/s#-g ##' \
-		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-		configure || die "fixing CFLAGS failed"
-
-	if ! use test ; then
-	sed -i \
-		-e '/^[ \t]*SUBDIRS =/s#tests##' \
-		Makefile.in || die "Removing tests failed"
-	fi
-
-	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
-	eapply_user
-
-	elibtoolize  # for Solaris
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable asm) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/dev-libs/libressl/libressl-3.0.0.ebuild b/dev-libs/libressl/libressl-3.0.0.ebuild
deleted file mode 100644
index 9a52b9353853..000000000000
--- a/dev-libs/libressl/libressl-3.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal libtool
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="https://www.libressl.org/"
-SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/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"
-IUSE="+asm static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( static-libs )"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	touch crypto/Makefile.in
-
-	sed -i \
-		-e '/^[ \t]*CFLAGS=/s#-g ##' \
-		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-		configure || die "fixing CFLAGS failed"
-
-	if ! use test ; then
-	sed -i \
-		-e '/^[ \t]*SUBDIRS =/s#tests##' \
-		Makefile.in || die "Removing tests failed"
-	fi
-
-	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
-	eapply_user
-
-	elibtoolize  # for Solaris
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable asm) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/dev-libs/libressl/libressl-3.0.1.ebuild b/dev-libs/libressl/libressl-3.0.1.ebuild
deleted file mode 100644
index 9a52b9353853..000000000000
--- a/dev-libs/libressl/libressl-3.0.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal libtool
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="https://www.libressl.org/"
-SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/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"
-IUSE="+asm static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( static-libs )"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	touch crypto/Makefile.in
-
-	sed -i \
-		-e '/^[ \t]*CFLAGS=/s#-g ##' \
-		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-		configure || die "fixing CFLAGS failed"
-
-	if ! use test ; then
-	sed -i \
-		-e '/^[ \t]*SUBDIRS =/s#tests##' \
-		Makefile.in || die "Removing tests failed"
-	fi
-
-	eapply "${FILESDIR}"/${PN}-2.8.3-solaris10.patch
-	eapply_user
-
-	elibtoolize  # for Solaris
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable asm) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-}
diff --git a/dev-libs/libressl/libressl-3.1.0.ebuild b/dev-libs/libressl/libressl-3.1.2.ebuild
index 48642f97b49f..ab31f2041689 100644
--- a/dev-libs/libressl/libressl-3.1.0.ebuild
+++ b/dev-libs/libressl/libressl-3.1.2.ebuild
@@ -10,8 +10,8 @@ HOMEPAGE="https://www.libressl.org/"
 SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
 
 LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
+# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
+# we'll try to use the max of either. However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/48"
 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"
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 9bf7c16d6e94..00fc61628655 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,11 +1,14 @@
 AUX libsavitar-3.3.0-remove-packaged-pugixml.patch 3294 BLAKE2B aa31da750cf1adcba252560a9160b96d7289a4d5fbc417396cb3c01e655e48f8014bc99b65554c8b03d28f0d00f99dfaad47a8fa0c2d3364221ae2971a42e4ec SHA512 5f944f2e32ca0b6b9bf161802816a32e9835198923a5ff5dc0f483df3ce41a69d08c1eb49c2e932c4cf5347aafeba0f29c88dfc091c06ca2057f7f92ed55d21c
 AUX libsavitar-4.2.0-remove-packaged-pugixml.patch 2079 BLAKE2B a0fe34d3d4e2325904cad018409faecc0c6292e4e0e67f4655c7f94a36c756d1a647a62d4bb735b428fb0b8e5eca32dd8c523beabd29a52cc4dc888e7313a018 SHA512 c42965261c9aaad911a5d6f947ce139c4948375e7c74481682a4e6774a6368f335ca88024886e8640ec2a24fd382b1015ec35a75e873316a6b6dde171022f459
+AUX libsavitar-4.6.1-remove-packaged-pugixml.patch 2098 BLAKE2B 83bf2850e91dfca67288d6dfabd8cd70551a6e35d40d79621ec652e227a3831f675d2fa31ebf080ba6db1da023c4288ff141339b72c7f533e795e8c881bdd60b SHA512 159c669eeb7c324155bf06ad57574e7405fb29fa3f843fb64879ec9ec65a259a5cf5c5b3f4de90f4e06967c08abf002ee75b49c53d053200cadc881780115441
 DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235f46c8abb1365eb5e439b6f1cf3eed6ff1fa4f2a3476a6f3ed0193356d8019a6ccbce044c29339ec2693b96db3d4 SHA512 4273723536578816ab16c2d9f8c0fba57651a2cd5730e45a27e5ed5ec6a7986f59ef932094392b6bf7bd9dd9555cc44e09505c843e9b364a2c7bcc1770af1f35
 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
+DIST libsavitar-4.6.1.tar.gz 98202 BLAKE2B 8025d11316fb777a037c01fb9411a6368e5e7a1b64c4a695a114ff94c1a2802d4eaeb6c8512e14db74ddbbffabd2bc98f93f61adfc2cbdc7ef329d30b105bd4b SHA512 49a0f2e98bc26d84b638d6eb44f9fd93811d92ad398f3c85b1abf2cca3172667315b907d30807eb70b497bd652d95cd443c8cc4daa68c8852787ef46fda47cc2
 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
+EBUILD libsavitar-4.6.1.ebuild 1346 BLAKE2B ebee4d8131f57b10ef3901e18a4c7c5463d38047eee586eb5a834af5274ab42af091aedf658507ad57f4c67ab3049781e4068087a8d5bec45e3986674a2013f3 SHA512 a2a4472d6c54f88910ada2200a0ae8491469852406e10712b5dedd5cbad2ca36069867584643069cf34c63b6550f48129c317741bcc96807be907846af08e14c
 MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304
diff --git a/dev-libs/libsavitar/files/libsavitar-4.6.1-remove-packaged-pugixml.patch b/dev-libs/libsavitar/files/libsavitar-4.6.1-remove-packaged-pugixml.patch
new file mode 100644
index 000000000000..b1b77469d740
--- /dev/null
+++ b/dev-libs/libsavitar/files/libsavitar-4.6.1-remove-packaged-pugixml.patch
@@ -0,0 +1,60 @@
+diff -urN libSavitar-4.2.0_old/CMakeLists.txt libSavitar-4.2.0/CMakeLists.txt
+--- libSavitar-4.2.0_old/CMakeLists.txt	2019-07-30 09:03:53.000000000 +0300
++++ libSavitar-4.2.0/CMakeLists.txt	2019-08-04 17:23:27.099395645 +0300
+@@ -15,7 +15,7 @@
+     find_package(Threads QUIET)
+ endif()
+ 
+-add_subdirectory(pugixml)
++find_package(pugixml REQUIRED)
+ 
+ if(BUILD_PYTHON)
+     list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+diff -urN libSavitar-4.2.0_old/src/MeshData.cpp libSavitar-4.2.0/src/MeshData.cpp
+--- libSavitar-4.2.0_old/src/MeshData.cpp	2019-07-30 09:03:53.000000000 +0300
++++ libSavitar-4.2.0/src/MeshData.cpp	2019-08-04 17:23:59.891051757 +0300
+@@ -17,7 +17,7 @@
+  */
+ 
+ #include "MeshData.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+ #include <cstring>
+ #include <iostream>
+ #include <stdexcept> //For std::runtime_error.
+diff -urN libSavitar-4.2.0_old/src/Scene.cpp libSavitar-4.2.0/src/Scene.cpp
+--- libSavitar-4.2.0_old/src/Scene.cpp	2019-07-30 09:03:53.000000000 +0300
++++ libSavitar-4.2.0/src/Scene.cpp	2019-08-04 17:24:10.425265944 +0300
+@@ -17,7 +17,7 @@
+  */
+ 
+ #include "Scene.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+ #include <iostream>
+ #include <string>
+ using namespace Savitar;
+diff -urN libSavitar-4.2.0_old/src/SceneNode.cpp libSavitar-4.2.0/src/SceneNode.cpp
+--- libSavitar-4.2.0_old/src/SceneNode.cpp	2019-07-30 09:03:53.000000000 +0300
++++ libSavitar-4.2.0/src/SceneNode.cpp	2019-08-04 17:24:31.617696840 +0300
+@@ -18,7 +18,7 @@
+ 
+ #include "SceneNode.h"
+ #include "Namespace.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+ #include <iostream>
+ using namespace Savitar;
+ 
+diff -urN libSavitar-4.2.0_old/src/ThreeMFParser.h libSavitar-4.2.0/src/ThreeMFParser.h
+--- libSavitar-4.2.0_old/src/ThreeMFParser.h	2019-07-30 09:03:53.000000000 +0300
++++ libSavitar-4.2.0/src/ThreeMFParser.h	2019-08-04 17:24:53.996151843 +0300
+@@ -21,7 +21,7 @@
+ 
+ #include "SavitarExport.h"
+ #include "SceneNode.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+ 
+ #include <string>
+ namespace Savitar
diff --git a/dev-libs/libsavitar/libsavitar-4.6.1.ebuild b/dev-libs/libsavitar/libsavitar-4.6.1.ebuild
new file mode 100644
index 000000000000..8c07045e9b5f
--- /dev/null
+++ b/dev-libs/libsavitar/libsavitar-4.6.1.ebuild
@@ -0,0 +1,53 @@
+# 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 cmake python-single-r1
+
+MY_PN="libSavitar"
+
+DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
+HOMEPAGE="https://github.com/Ultimaker/libSavitar"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="+python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/pugixml
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.6.1-remove-packaged-pugixml.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Find SIP for current python version, not the latest installed
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
+		CMakeLists.txt || die
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" \
+		cmake/FindSIP.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libtimezonemap/Manifest b/dev-libs/libtimezonemap/Manifest
new file mode 100644
index 000000000000..62a2f8d0a87d
--- /dev/null
+++ b/dev-libs/libtimezonemap/Manifest
@@ -0,0 +1,3 @@
+DIST libtimezonemap_0.4.6.tar.gz 2872895 BLAKE2B ec9da9efe4f58cd7c3cd6cb502ffc23d1331f8b8352021d30c4157d4a6fec983702c049725af672136f332e450191e03bb0c36c752cbd496c37a7e0bf64c4514 SHA512 3cbd4f577684254a91f1e745ecb49e58fe3c75e28c172a6115fbe68e7868c33ff4c68b80ef1d7f5c759f67d288e29a2a057e00e1788a57c4e55e0cbfef351761
+EBUILD libtimezonemap-0.4.6.ebuild 638 BLAKE2B 2e9ffc90fdc52982dea9cea9a7f31bdc5c9cfc12809b5da485245000913acfbef085ccf683e12b44e70e9ae202f53d6d5f798fd0c9dacf3f9d4cc9b7b18c8bb5 SHA512 ac3593e35c1eba84ccb946ad15f2e832281b32114e0127468248d6aa3ce6543abb35e067b5a570f409172acce8eec3524ff6e4a77678d98cd29b4f4186623be1
+MISC metadata.xml 566 BLAKE2B 01fedfbe030ae44dd6b98a83a49fb5ffdb7f91a78dfc7f6e5f041238726aef27b39220861b4ae4d9ec6b291734f0911ea7ecc051491b8818f8dd236881e221bf SHA512 df9ba788c73e608eb2dfcd2dd1d917340ac83e204d8ffc4e309b90035e1054faa9f107f3c8f2b398cabf988f100d886ac63a9361bba3d1fe22d4e4564f4dde5d
diff --git a/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild b/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild
new file mode 100644
index 000000000000..a109233b6fef
--- /dev/null
+++ b/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="GTK+3 timezone map widget"
+HOMEPAGE="https://launchpad.net/timezonemap"
+SRC_URI="mirror://ubuntu/pool/main/libt/${PN}/${PN}_${PV}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/glib:2
+	dev-libs/gobject-introspection:0=
+	dev-libs/json-glib
+	net-libs/libsoup
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libtimezonemap/metadata.xml b/dev-libs/libtimezonemap/metadata.xml
new file mode 100644
index 000000000000..72451521d14e
--- /dev/null
+++ b/dev-libs/libtimezonemap/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cinnamon@gentoo.org</email>
+		<name>Cinnamon Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sparky@bluefang-logic.com</email>
+		<name>Matthew Turnbull</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">timezonemap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index f7e44913d30c..7389e68702e9 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,3 +1,7 @@
+AUX libtpms-0.7.0-tpm12-Fix-potential-buffer-overflow-in-filename-creation.patch 4565 BLAKE2B a0df14afa6d95e36f75d9c74ddff9fed42a54ef3c0320e095f47cb7c1fbd4d29bfee870779aaa19a64663f18227877c79a47469c44338d6db528725ea0eb1e69 SHA512 f8a5fc3810e96bca2c9a4221f01b66177657f294bbf1537643551a1a6c0a816ef865e23030913196667dc21b10423c0cced2eba3e6667acdc6312a9376c27884
+AUX libtpms-0.7.0-tpm12-Initialize-a-few-variables-for-x86-gcc-O3.patch 6793 BLAKE2B 5462fc0a5ebe83a3c560519cb821b90b7c6b490c6a8046ea131cdbb5a65068b63d1edde55c5f80a967492a2615c07d049e496afbeb2a348a4186de885b65293a SHA512 8e570a081f24c19afb65d04b17c07680967453d29697b7fd3af72dff1bdf99e92f03e19b290db992859a7bd6665651c0bc90117656d016266fd289aa2afd6db8
+AUX libtpms-0.7.0-tpm12-Initialize-some-variables-for-gcc.patch 3972 BLAKE2B f2f0e3a93c36adaa9e8cef7bb6e6ee723408acd26046a7bb4d0ffb1361502aa7c6a3316e2d8df5225ab0651e1aac0e84e03186bc0aa83c98d21d8f0be220a30d SHA512 36975108af1f1a5914e6b35bff00f7ed63e5b349cf7433687d23faa87bf1072ffa779c35313feaba50c6758fee6d66ccdc2f151ecdb50cf4606fbedd518308a9
+AUX libtpms-0.7.0-tpm2-Fix-a-gcc-10.1.0-complaint.patch 2324 BLAKE2B 2d132eecdd410889ebf2452f83b24a6f9a8df53769d63cfcb0a4b5ab62d2cbd096b82208e73691d030a07968937c899e1dc606a492ceb68d4739a3a204c8808a SHA512 0f290bf4cd2a83176158bf0c67d1be6ea405cb7133ea2d83c5b86b05370b208e6266a050d49c4e5954e8da76eb4d15f24b8238625483d5f4c0d6a20061febf79
 DIST libtpms-0.7.0.tar.gz 1203837 BLAKE2B ca5a3b78dc63c09c4ff084124838fedeb5be0580f709ad6165680159ba7ba4b1f751b9fbc67f6b5a8f39b82bdd420afb47087412a47b72cbe5b418a97a4860fe SHA512 92d1eb5d1a1cae08e97cceaca56fc9bc6d43c54a93edae2accf19807a4e93e19d88064a0b11db796c79d32c821e6b320ebbacb65cd20da3e5b1205f3b861cef2
-EBUILD libtpms-0.7.0-r1.ebuild 663 BLAKE2B fede09b0b2dc21512c6b36c29764d38d3171887ff58ca893c52f21c7ae8734c598ba0e6b12f550becc154a59181d86f86c9207c40accfa56f9cbd971140364e8 SHA512 653431c4728c6efa1f0e0449f2ae41b5791806afc00e8f53e31b0460b4fc947498c245d928c30705c2b2911206dfa06da4877b425a4561fbbcd602051cd0d398
+EBUILD libtpms-0.7.0-r1.ebuild 958 BLAKE2B 0fcfec0ab17ca845399bc857776e2ef6bf4e9f47dc23e90aa80792d0a70f09fdc4dc7047ffb2a7662002554f93c4e0e6d18fbd0d0e5fce7338e3ad4ce7c94ab3 SHA512 8b079683c1a0aef0f925bf3199e0d464b0e83f62f6c9c26187a02e14614e6e142ff6e637da99d0468ed5470291ffa8ca3c57351433fd325130478c0951f58834
 MISC metadata.xml 370 BLAKE2B eb4d1a4a8e56cbdcb5b7f86029feb6e2151967f7b4801fbb3a8c2de35840969a4987ca2aada95792cb35ab03702715b1f66fe966c176969de743c64775bed0cb SHA512 5a2f5a0089bb0c54dd36821005a65cbe8c4fd05f1d7e0367eaff02031a39c749e005e5432da334081304af8c55b330b549821819455f1f0919d4525a254ca5c6
diff --git a/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Fix-potential-buffer-overflow-in-filename-creation.patch b/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Fix-potential-buffer-overflow-in-filename-creation.patch
new file mode 100644
index 000000000000..9e7af9e88ed3
--- /dev/null
+++ b/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Fix-potential-buffer-overflow-in-filename-creation.patch
@@ -0,0 +1,105 @@
+From 1cdd950e7342240ed8edc695372365cf57fbc6cb Mon Sep 17 00:00:00 2001
+From: Stefan Berger <stefanb@linux.vnet.ibm.com>
+Date: Thu, 17 Oct 2019 10:19:23 -0400
+Subject: [PATCH 2/2] tpm12: Fix potential buffer overflow in filename creation
+
+Fix a potential buffer overflow bug in the creation of filenames
+that were using sprintf() rather than snprintf(). The buffer overflow
+could occurr if the buffer is longer than 4096 bytes. The state path
+may alone be 4096 bytes and could possibly trigger the overflow.
+
+Swtpm for example is not affected from this since it uses the callbacks
+that are invoked before the faulty function is called.
+
+Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
+---
+ src/tpm12/tpm_nvfile.c | 43 ++++++++++++++++++++++++++++++++----------
+ 1 file changed, 33 insertions(+), 10 deletions(-)
+
+diff --git a/src/tpm12/tpm_nvfile.c b/src/tpm12/tpm_nvfile.c
+index c8e7bcf..0268bd0 100644
+--- a/src/tpm12/tpm_nvfile.c
++++ b/src/tpm12/tpm_nvfile.c
+@@ -70,7 +70,8 @@
+ 
+ /* local prototypes */
+ 
+-static void       TPM_NVRAM_GetFilenameForName(char *filename,
++static TPM_RESULT TPM_NVRAM_GetFilenameForName(char *filename,
++                                               size_t filename_len,
+ 					       uint32_t tpm_number,
+                                                const char *name);
+ 
+@@ -189,7 +190,10 @@ TPM_RESULT TPM_NVRAM_LoadData(unsigned char **data,     /* freed by caller */
+     /* open the file */
+     if (rc == 0) {
+         /* map name to the rooted filename */
+-        TPM_NVRAM_GetFilenameForName(filename, tpm_number, name);
++        rc = TPM_NVRAM_GetFilenameForName(filename, sizeof(filename),
++                                          tpm_number, name);
++    }
++    if (rc == 0) {
+         printf("  TPM_NVRAM_LoadData: Opening file %s\n", filename);
+         file = fopen(filename, "rb");                           /* closed @1 */
+         if (file == NULL) {     /* if failure, determine cause */
+@@ -297,7 +301,10 @@ TPM_RESULT TPM_NVRAM_StoreData(const unsigned char *data,
+     printf(" TPM_NVRAM_StoreData: To name %s\n", name);
+     if (rc == 0) {
+         /* map name to the rooted filename */
+-        TPM_NVRAM_GetFilenameForName(filename, tpm_number, name);
++        rc = TPM_NVRAM_GetFilenameForName(filename, sizeof(filename),
++                                          tpm_number, name);
++    }
++    if (rc == 0) {
+         /* open the file */
+         printf(" TPM_NVRAM_StoreData: Opening file %s\n", filename);
+         file = fopen(filename, "wb");                           /* closed @1 */
+@@ -339,14 +346,27 @@ TPM_RESULT TPM_NVRAM_StoreData(const unsigned char *data,
+    state_directory/tpm_number.name
+ */
+ 
+-static void TPM_NVRAM_GetFilenameForName(char *filename,        /* output: rooted filename */
+-					 uint32_t tpm_number,
+-                                         const char *name)      /* input: abstract name */
++static TPM_RESULT TPM_NVRAM_GetFilenameForName(char *filename,        /* output: rooted filename */
++					       size_t filename_len,
++					       uint32_t tpm_number,
++                                               const char *name)      /* input: abstract name */
+ {
++    int n;
++    TPM_RESULT rc = TPM_FAIL;
++
+     printf(" TPM_NVRAM_GetFilenameForName: For name %s\n", name);
+-    sprintf(filename, "%s/%02lx.%s", state_directory, (unsigned long)tpm_number, name);
+-    printf("  TPM_NVRAM_GetFilenameForName: File name %s\n", filename);
+-    return;
++    n = snprintf(filename, filename_len,
++                 "%s/%02lx.%s", state_directory, (unsigned long)tpm_number,
++                 name);
++    if (n < 0) {
++        printf(" TPM_NVRAM_GetFilenameForName: Error (fatal), snprintf failed\n");
++    } else if ((size_t)n >= filename_len) {
++        printf(" TPM_NVRAM_GetFilenameForName: Error (fatal), buffer too small\n");
++    } else {
++        printf("  TPM_NVRAM_GetFilenameForName: File name %s\n", filename);
++        rc = TPM_SUCCESS;
++    }
++    return rc;
+ }
+ 
+ /* TPM_NVRAM_DeleteName() deletes the 'name' from NVRAM
+@@ -380,7 +400,10 @@ TPM_RESULT TPM_NVRAM_DeleteName(uint32_t tpm_number,
+     
+     printf(" TPM_NVRAM_DeleteName: Name %s\n", name);
+     /* map name to the rooted filename */
+-    TPM_NVRAM_GetFilenameForName(filename, tpm_number, name);
++    if (rc == 0) {
++        rc = TPM_NVRAM_GetFilenameForName(filename, sizeof(filename),
++                                          tpm_number, name);
++    }
+     if (rc == 0) {
+         irc = remove(filename);
+         if ((irc != 0) &&               /* if the remove failed */
+-- 
+2.26.2
+
diff --git a/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-a-few-variables-for-x86-gcc-O3.patch b/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-a-few-variables-for-x86-gcc-O3.patch
new file mode 100644
index 000000000000..e1c79875a02d
--- /dev/null
+++ b/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-a-few-variables-for-x86-gcc-O3.patch
@@ -0,0 +1,108 @@
+From 464083396ae1d242fb2a26c1ab6e39971e82f47e Mon Sep 17 00:00:00 2001
+From: Stefan Berger <stefanb@linux.ibm.com>
+Date: Fri, 17 Jan 2020 19:01:24 +0000
+Subject: [PATCH 3/3] tpm12: Initialize a few variables for x86 gcc -O3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+gcc (Ubuntu 5.4.0-6ubuntu1~16.04.12) 5.4.0 20160609
+
+The above gcc on x86 with -O3 reports the following false positives:
+
+ gcc -DHAVE_CONFIG_H -I. -I.. -include tpm_library_conf.h -I../include/libtpms -I../include/libtpms -fstack-protector-strong -DTPM_V12 -DTPM_PCCLIENT -DTPM_VOLATILE_LOAD -DTPM_ENABLE_ACTIVATE -DTPM_AES -DTPM_LIBTPMS_CALLBACKS -DTPM_NV_DISK -DTPM_POSIX -DTPM_NOMAINTENANCE_COMMANDS -O3 -DUSE_OPENSSL_FUNCTIONS_SYMMETRIC=1 -DUSE_OPENSSL_FUNCTIONS_EC=1 -DUSE_OPENSSL_FUNCTIONS_ECDSA=0 -DUSE_OPENSSL_FUNCTIONS_RSA=0 -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign -MT tpm12/libtpms_tpm12_la-tpm_nvram.lo -MD -MP -MF tpm12/.deps/libtpms_tpm12_la-tpm_nvram.Tpo -c tpm12/tpm_nvram.c -o tpm12/libtpms_tpm12_la-tpm_nvram.o
+tpm12/tpm_nvram.c: In function ‘TPM_Process_NVReadValue’:
+tpm12/tpm_nvram.c:1539:38: error: ‘isGPIO’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+      if ((returnCode == TPM_SUCCESS) && !isGPIO) {
+                                      ^
+tpm12/tpm_nvram.c: In function ‘TPM_Process_NVWriteValue’:
+tpm12/tpm_nvram.c:2323:6: error: ‘isGPIO’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+   if (!isGPIO) {
+      ^
+
+gcc -DHAVE_CONFIG_H -I. -I.. -include tpm_library_conf.h -I../include/libtpms -I../include/libtpms -fstack-protector-strong -DTPM_V12 -DTPM_PCCLIENT -DTPM_VOLATILE_LOAD -DTPM_ENABLE_ACTIVATE -DTPM_AES -DTPM_LIBTPMS_CALLBACKS -DTPM_NV_DISK -DTPM_POSIX -DTPM_NOMAINTENANCE_COMMANDS -O3 -DUSE_OPENSSL_FUNCTIONS_SYMMETRIC=1 -DUSE_OPENSSL_FUNCTIONS_EC=1 -DUSE_OPENSSL_FUNCTIONS_ECDSA=0 -DUSE_OPENSSL_FUNCTIONS_RSA=0 -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign -MT tpm12/libtpms_tpm12_la-tpm_process.lo -MD -MP -MF tpm12/.deps/libtpms_tpm12_la-tpm_process.Tpo -c tpm12/tpm_process.c -o tpm12/libtpms_tpm12_la-tpm_process.o
+tpm12/tpm_process.c: In function ‘TPM_Process_GetCapabilitySigned’:
+tpm12/tpm_process.c:5089:19: error: ‘transportEncrypt’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+      returnCode = TPM_ProcessAudit(tpm_state,
+                   ^
+tpm12/tpm_process.c: In function ‘TPM_Process_SetCapability’:
+tpm12/tpm_process.c:5309:19: error: ‘transportEncrypt’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+      returnCode = TPM_ProcessAudit(tpm_state,
+                   ^
+tpm12/tpm_process.c: At top level:
+
+gcc -DHAVE_CONFIG_H -I. -I.. -include tpm_library_conf.h -I../include/libtpms -I../include/libtpms -fstack-protector-strong -DTPM_V12 -DTPM_PCCLIENT -DTPM_VOLATILE_LOAD -DTPM_ENABLE_ACTIVATE -DTPM_AES -DTPM_LIBTPMS_CALLBACKS -DTPM_NV_DISK -DTPM_POSIX -DTPM_NOMAINTENANCE_COMMANDS -O3 -DUSE_OPENSSL_FUNCTIONS_SYMMETRIC=1 -DUSE_OPENSSL_FUNCTIONS_EC=1 -DUSE_OPENSSL_FUNCTIONS_ECDSA=0 -DUSE_OPENSSL_FUNCTIONS_RSA=0 -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign -MT tpm12/libtpms_tpm12_la-tpm_transport.lo -MD -MP -MF tpm12/.deps/libtpms_tpm12_la-tpm_transport.Tpo -c tpm12/tpm_transport.c -o tpm12/libtpms_tpm12_la-tpm_transport.o
+tpm12/tpm_transport.c: In function ‘TPM_Process_ReleaseTransportSigned’:
+tpm12/tpm_transport.c:2810:42: error: ‘t1TpmTransportInternal’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+  returnCode = TPM_TransportLogOut_Extend(t1TpmTransportInternal->transDigest,
+                                          ^
+
+This patch initializes the variables.
+
+Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
+---
+ src/tpm12/tpm_nvram.c     | 4 ++--
+ src/tpm12/tpm_process.c   | 4 ++--
+ src/tpm12/tpm_transport.c | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/tpm12/tpm_nvram.c b/src/tpm12/tpm_nvram.c
+index 1b9c005..620944e 100644
+--- a/src/tpm12/tpm_nvram.c
++++ b/src/tpm12/tpm_nvram.c
+@@ -1288,7 +1288,7 @@ TPM_RESULT TPM_Process_NVReadValue(tpm_state_t *tpm_state,
+     TPM_BOOL			ignore_auth = FALSE;
+     TPM_BOOL			dir = FALSE;
+     TPM_BOOL			physicalPresence;
+-    TPM_BOOL			isGPIO;
++    TPM_BOOL			isGPIO = FALSE;
+     BYTE 			*gpioData = NULL;
+     TPM_NV_DATA_SENSITIVE	*d1NvdataSensitive;
+     uint32_t			s1Last;
+@@ -2000,7 +2000,7 @@ TPM_RESULT TPM_Process_NVWriteValue(tpm_state_t *tpm_state,
+     TPM_NV_DATA_SENSITIVE	*d1NvdataSensitive;
+     uint32_t			s1Last;
+     TPM_BOOL			physicalPresence;
+-    TPM_BOOL			isGPIO;
++    TPM_BOOL			isGPIO = FALSE;
+     uint32_t			nv1 = tpm_state->tpm_permanent_data.noOwnerNVWrite;
+ 							/* temp for noOwnerNVWrite, initialize to
+ 							   silence compiler */
+diff --git a/src/tpm12/tpm_process.c b/src/tpm12/tpm_process.c
+index d6a3b8e..c433621 100644
+--- a/src/tpm12/tpm_process.c
++++ b/src/tpm12/tpm_process.c
+@@ -4844,7 +4844,7 @@ TPM_RESULT TPM_Process_GetCapabilitySigned(tpm_state_t *tpm_state,
+     unsigned char *	inParamEnd;		/* ending point of inParam's */
+     TPM_DIGEST		inParamDigest;
+     TPM_BOOL		auditStatus;		/* audit the ordinal */
+-    TPM_BOOL		transportEncrypt;	/* wrapped in encrypted transport session */
++    TPM_BOOL		transportEncrypt = FALSE;/* wrapped in encrypted transport session */
+     TPM_BOOL		authHandleValid = FALSE;
+     TPM_AUTH_SESSION_DATA *auth_session_data;	/* session data for authHandle */
+     TPM_SECRET		*hmacKey;
+@@ -5144,7 +5144,7 @@ TPM_RESULT TPM_Process_SetCapability(tpm_state_t *tpm_state,
+     unsigned char *	inParamEnd;		/* ending point of inParam's */
+     TPM_DIGEST		inParamDigest;
+     TPM_BOOL		auditStatus;		/* audit the ordinal */
+-    TPM_BOOL		transportEncrypt;	/* wrapped in encrypted transport session */
++    TPM_BOOL		transportEncrypt = FALSE;/* wrapped in encrypted transport session */
+     TPM_BOOL		authHandleValid = FALSE;
+     TPM_AUTH_SESSION_DATA *auth_session_data;	/* session data for authHandle */
+     TPM_SECRET		*hmacKey;
+diff --git a/src/tpm12/tpm_transport.c b/src/tpm12/tpm_transport.c
+index 2261670..7b9c520 100644
+--- a/src/tpm12/tpm_transport.c
++++ b/src/tpm12/tpm_transport.c
+@@ -2599,7 +2599,7 @@ TPM_RESULT TPM_Process_ReleaseTransportSigned(tpm_state_t *tpm_state,
+     TPM_BOOL			authHandleValid = FALSE;
+     TPM_BOOL			transHandleValid = FALSE;
+     TPM_AUTH_SESSION_DATA	*auth_session_data = NULL;	/* session data for authHandle */
+-    TPM_TRANSPORT_INTERNAL	*t1TpmTransportInternal;
++    TPM_TRANSPORT_INTERNAL	*t1TpmTransportInternal = NULL;
+     TPM_SECRET			*hmacKey;
+     TPM_KEY			*sigKey = NULL;		/* the key specified by keyHandle */
+     TPM_BOOL			parentPCRStatus;
+-- 
+2.26.2
+
diff --git a/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-some-variables-for-gcc.patch b/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-some-variables-for-gcc.patch
new file mode 100644
index 000000000000..309c78b3d1eb
--- /dev/null
+++ b/dev-libs/libtpms/files/libtpms-0.7.0-tpm12-Initialize-some-variables-for-gcc.patch
@@ -0,0 +1,74 @@
+From aab357515eda564500290a4b3f542d2b4609af4f Mon Sep 17 00:00:00 2001
+From: Stefan Berger <stefanb@linux.ibm.com>
+Date: Tue, 14 Jan 2020 18:05:06 -0500
+Subject: [PATCH] tpm12: Initialize some variables for gcc ppc64el compiler
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+gcc (Ubuntu 9.2.1-21ubuntu1) 9.2.1 20191130
+
+The gcc compiler on Ubuntu Focal reports several false positives for
+potentially uninitialized variables:
+
+tpm12/tpm_session.c: In function ‘TPM_Process_SaveContext’:
+tpm12/tpm_session.c:3229:19: error: ‘tpm_auth_session_data’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+ 3229 |      returnCode = TPM_AuthSessionData_Store(&r1ContextSensitive, tpm_auth_session_data);
+      |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+tpm12/tpm_delegate.c: In function ‘TPM_Process_DelegateManage’:
+tpm12/tpm_delegate.c:1787:49: error: ‘familyRow’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+ 1787 |  if ((opCode != TPM_FAMILY_CREATE) && (familyRow->flags & TPM_DELEGATE_ADMIN_LOCK)) {
+      |                                        ~~~~~~~~~^~~~~~~
+tpm12/tpm_delegate.c: In function ‘TPM_Process_DelegateUpdateVerification’:
+tpm12/tpm_delegate.c:3575:48: error: ‘d1DelegateTableRow’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
+ 3575 |      d1DelegateTableRow->pub.verificationCount = familyRow->verificationCount;
+      |      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+All of the variables are initialize under the same condition as they are
+accessed.
+
+Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
+---
+ src/tpm12/tpm_delegate.c | 4 ++--
+ src/tpm12/tpm_session.c  | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/tpm12/tpm_delegate.c b/src/tpm12/tpm_delegate.c
+index 51d12f3..37ebc02 100644
+--- a/src/tpm12/tpm_delegate.c
++++ b/src/tpm12/tpm_delegate.c
+@@ -1629,7 +1629,7 @@ TPM_RESULT TPM_Process_DelegateManage(tpm_state_t *tpm_state,
+     TPM_SECRET			*hmacKey;
+     TPM_SECRET			savedAuth;		/* saved copy for response */
+     TPM_DELEGATE_PUBLIC		*delegatePublic;	/* from DSAP session */
+-    TPM_FAMILY_TABLE_ENTRY	*familyRow;		/* family table row containing familyID */
++    TPM_FAMILY_TABLE_ENTRY	*familyRow = NULL;	/* family table row containing familyID */
+     uint32_t			nv1 = tpm_state->tpm_permanent_data.noOwnerNVWrite;
+ 							/* temp for noOwnerNVWrite, initialize to
+ 							   silence compiler */
+@@ -3360,7 +3360,7 @@ TPM_RESULT TPM_Process_DelegateUpdateVerification(tpm_state_t *tpm_state,
+     TPM_DELEGATE_INDEX		d1DelegateIndex;
+     TPM_DELEGATE_OWNER_BLOB	d1DelegateOwnerBlob;
+     TPM_DELEGATE_KEY_BLOB	d1DelegateKeyBlob;
+-    TPM_DELEGATE_TABLE_ROW	*d1DelegateTableRow;
++    TPM_DELEGATE_TABLE_ROW	*d1DelegateTableRow = NULL;
+     TPM_FAMILY_ID		familyID = 0;
+     TPM_FAMILY_TABLE_ENTRY	*familyRow;		/* family table row containing familyID */
+     TPM_DELEGATE_PUBLIC		*delegatePublic;	/* from DSAP session */
+diff --git a/src/tpm12/tpm_session.c b/src/tpm12/tpm_session.c
+index 5e7b708..15b977f 100644
+--- a/src/tpm12/tpm_session.c
++++ b/src/tpm12/tpm_session.c
+@@ -3044,7 +3044,7 @@ TPM_RESULT TPM_Process_SaveContext(tpm_state_t *tpm_state,
+     TPM_STORE_BUFFER		b1_sbuffer;		/* serialization of b1 */
+     TPM_STCLEAR_DATA		*v1StClearData = NULL;
+     TPM_KEY_HANDLE_ENTRY	*tpm_key_handle_entry;	/* key table entry for the handle */
+-    TPM_AUTH_SESSION_DATA	*tpm_auth_session_data; /* session table entry for the handle */
++    TPM_AUTH_SESSION_DATA	*tpm_auth_session_data = NULL; /* session table entry for the handle */
+     TPM_TRANSPORT_INTERNAL	*tpm_transport_internal; /* transport table entry for the handle */
+     TPM_DAA_SESSION_DATA	*tpm_daa_session_data;	/* daa session table entry for the handle */
+     TPM_NONCE			*n1ContextNonce = NULL;
+-- 
+2.26.2
+
diff --git a/dev-libs/libtpms/files/libtpms-0.7.0-tpm2-Fix-a-gcc-10.1.0-complaint.patch b/dev-libs/libtpms/files/libtpms-0.7.0-tpm2-Fix-a-gcc-10.1.0-complaint.patch
new file mode 100644
index 000000000000..539ddb243d07
--- /dev/null
+++ b/dev-libs/libtpms/files/libtpms-0.7.0-tpm2-Fix-a-gcc-10.1.0-complaint.patch
@@ -0,0 +1,53 @@
+From f3f78c72a5b6ef42119188ac5af73bb3a0a8bbba Mon Sep 17 00:00:00 2001
+From: Stefan Berger <stefanb@linux.vnet.ibm.com>
+Date: Tue, 12 May 2020 13:41:53 -0400
+Subject: [PATCH] tpm2: Fix a gcc 10.1.0 complaint
+
+This PR addresses issue 133: https://github.com/stefanberger/libtpms/issues/133
+
+bin/sh ../libtool  --tag=CC   --mode=compile x86_64-pc-linux-gnu-gcc \
+  -DHAVE_CONFIG_H -I. -I..    -include tpm_library_conf.h \
+  -I../include/libtpms -I../include/libtpms -fstack-protector-strong \
+  -D_POSIX_ -DTPM_POSIX -DTPM_LIBTPMS_CALLBACKS -I ./tpm2 \
+  -I ./tpm2/crypto -I ./tpm2/crypto/openssl -g -O2 \
+  -DUSE_OPENSSL_FUNCTIONS_SYMMETRIC=1 -DUSE_OPENSSL_FUNCTIONS_EC=1 \
+  -DUSE_OPENSSL_FUNCTIONS_ECDSA=1 -DUSE_OPENSSL_FUNCTIONS_RSA=1 \
+  -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign \
+  -c -o tpm2/libtpms_tpm2_la-NVDynamic.lo `test -f 'tpm2/NVDynamic.c' \
+  || echo './'`tpm2/NVDynamic.c
+libtool: compile:  x86_64-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. \
+  -I.. -include tpm_library_conf.h -I../include/libtpms \
+  -I../include/libtpms -fstack-protector-strong -D_POSIX_ -DTPM_POSIX \
+  -DTPM_LIBTPMS_CALLBACKS -I ./tpm2 -I ./tpm2/crypto \
+  -I ./tpm2/crypto/openssl -g -O2 -DUSE_OPENSSL_FUNCTIONS_SYMMETRIC=1 \
+  -DUSE_OPENSSL_FUNCTIONS_EC=1 -DUSE_OPENSSL_FUNCTIONS_ECDSA=1 \
+  -DUSE_OPENSSL_FUNCTIONS_RSA=1 -Wall -Werror -Wreturn-type -Wsign-compare \
+  -Wno-self-assign -c tpm2/NVDynamic.c  -fPIC -DPIC \
+  -o tpm2/.libs/libtpms_tpm2_la-NVDynamic.o
+tpm2/NVDynamic.c: In function ?NvNextByType?:
+tpm2/NVDynamic.c:126:10: error: ?nvHandle? may be used uninitialized in this function [-Werror=maybe-uninitialized]
+  126 |  *handle = nvHandle;
+      |  ~~~~~~~~^~~~~~~~~~
+tpm2/NVDynamic.c: At top level:
+
+Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
+---
+ src/tpm2/NVDynamic.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tpm2/NVDynamic.c b/src/tpm2/NVDynamic.c
+index 32f46bb..4381658 100644
+--- a/src/tpm2/NVDynamic.c
++++ b/src/tpm2/NVDynamic.c
+@@ -114,7 +114,7 @@ NvNextByType(
+ 	     )
+ {
+     NV_REF           addr;
+-    TPM_HANDLE       nvHandle;
++    TPM_HANDLE       nvHandle = 0; // libtpms changed: gcc 10.1.0 complaint
+     while((addr = NvNext(iter, &nvHandle)) != 0)
+ 	{
+ 	    // addr: the address of the location containing the handle of the value
+-- 
+2.26.2
+
diff --git a/dev-libs/libtpms/libtpms-0.7.0-r1.ebuild b/dev-libs/libtpms/libtpms-0.7.0-r1.ebuild
index b13d07d50237..a64f5e30012b 100644
--- a/dev-libs/libtpms/libtpms-0.7.0-r1.ebuild
+++ b/dev-libs/libtpms/libtpms-0.7.0-r1.ebuild
@@ -17,6 +17,13 @@ DEPEND=" !libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-tpm12-Initialize-some-variables-for-gcc.patch"
+	"${FILESDIR}/${P}-tpm12-Fix-potential-buffer-overflow-in-filename-creation.patch"
+	"${FILESDIR}/${P}-tpm12-Initialize-a-few-variables-for-x86-gcc-O3.patch"
+	"${FILESDIR}/${P}-tpm2-Fix-a-gcc-10.1.0-complaint.patch"
+	)
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 11e3da501f2e..11d6a5180a16 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,6 +1,8 @@
 DIST libuv-1.35.0.tar.gz 1253950 BLAKE2B 81ed766d0ca6fc0f8d2ed0b530b9a43104a2f985f86974a30b2d0abe08327cfeb7dfdd7c5b31619fbfcd8f9ca2e03987e16856d8abfef8b9eb9afa7f8c7b0b27 SHA512 a05bfd7cab6ae74022e7120a48772a6594522fb5bc467c8c05eb4809d7c78b68fa4843d86e2e34a68d439767a27dbc49f3b1dcbc8df85bec64471c1b459989c3
 DIST libuv-1.37.0.tar.gz 1249701 BLAKE2B 4c48e2062eaaa259623908db99e3ca4b63f27dcbae097b05af542b32860d79aa5aaf5b388c48902a1927b9c4ad6e88b1c2dc2c052815e1321c3e17932c7f09c6 SHA512 ae0d864f5455696507b3a7680170d26e0e333aaeeb74dc2647fc9774a89912ba8ac2be056dbd5cd2b0224ec36ef7bb223fbc851a77302be82c531f8ea01545e0
+DIST libuv-1.38.0.tar.gz 1261216 BLAKE2B 837a98e176878e81a9dbe10ee178fa1f738c406eb765308017cc3507ba8343ffbb0c09a68dd1376c855e5c0eb938196ab477aeef764219b64f1999468cadf72b SHA512 da9af33ec17f46f2390661f84e942115c442e665cb63ba5637eb12d2cb0b034889e0d816f261abe7fff3b4d0b44ab8bb63c81f3ec1917325cf0ca93e01921641
 EBUILD libuv-1.35.0.ebuild 1238 BLAKE2B c87031d7cecb688e0a6d6a2ababb0ae63758f8b3b9be8dbb4e49795a9157c29cd9bd850b8316718ec348672736a84fd51c75c0c0d3be2932aa38676741a3d8de SHA512 ef1451af4f77819ff7afb6f9edbe9d4116a9a3efaaf16ce531efd70ef36a6bb7278ee3be6e44742270169de6a301252985ac4e91ca29deaf53d1a1c2d0785dcb
-EBUILD libuv-1.37.0.ebuild 1247 BLAKE2B 1d14427ff52449afbb132ae4987dd3c931d7d2f9ca033bfbdf2c450777d19e27280a0b9bd3c2e8dff049d02ff4070003d92f389414cae2d0afd2ff13d550f3e4 SHA512 4621824e3357f24443d29fd50a6bf302cadb378c613fa95357c7ae86e27634541ccc0bdf7cd93c0aff2b9ad18645b33b7fdcd93348cad53094ed21efc6b41cae
-EBUILD libuv-9999.ebuild 1016 BLAKE2B 7d72cbf0f224869e127da3ea2826d2d69b7e080d43cea51d4fea2f5fa87f24b5a6b38f7b9ceb371c2cf93c4bb54f254a1a38d4e55be726ab387eab166751f9be SHA512 25d5485d6d1a55ab89db02f116e62e9538f1af795c44d57bce3b5f0e0e05704b2f5954fc3a2e5c4886fe76d22be145cbb66ced3375ec7a1cfb453596dcc35cc0
+EBUILD libuv-1.37.0.ebuild 1243 BLAKE2B 898d9ca446b093489e78aa7805d344607a8f15cd0d25cf30e2328c8aed4d7f8c2859f893b68f86d59d31f040f6faef7de737c1d9ef3205b42d084e28afa3f9f4 SHA512 687cd9f01e785823478e104ea9d4fcb4eebcca5b38dcc9ca99bbbcc51b5cd57b216e884b9f38c5f506d506a45dfeaca4ec01ec9d57a38586208a86e63a341f81
+EBUILD libuv-1.38.0-r1.ebuild 1251 BLAKE2B 55d182222a48ba675170c69c76f9487906c34900b4f7c7183e1942498e971c2438a00a96da9afec6c7f9acbe51208a2caf0c2f0d32a1eacb1951b31f4533b9fe SHA512 042316c0a9964960c817a58fe5450aa324e286dacb6187a50b046b8d3c597a72d5cde263de59bff5dc7855a07ba3bb0c48eb683cf55b2e48bfcf2145d91f0e49
+EBUILD libuv-9999.ebuild 1020 BLAKE2B ac28f13aeffef3d784808698662178c705aaf99e5cd9b18ea17082109126719378fcaa61bbec13c71b3d832958d0750ea4476d2933db7ed16ef5130552f7bb39 SHA512 2130b102ea6e192b320b87b2ca5ae3d9eaecf000bd7e7d420c97d60f60fc9cb5809f415246c3e209a4afae4fb4919f371ab34a90dbbc79c0b3b47da00d8ca4bc
 MISC metadata.xml 1392 BLAKE2B e4e8980feed751a6ddc0284d1bc0e56635707adad5ccedea3a78c9a22b0ef700f7554a62d7edc5a2d824dfd66036937e9056bd9db7cd302c5028469bbebbd3e9 SHA512 d2d709b7c1cfa4d83957365d62bf7fb95e1948129f499a907718228c067d871212c9b16f8272f000db92aad8eeb35505dd50a08357b8ae07dbbc9a4fe8534b3b
diff --git a/dev-libs/libuv/libuv-1.37.0.ebuild b/dev-libs/libuv/libuv-1.37.0.ebuild
index 3deb47fd69a0..837368a91e49 100644
--- a/dev-libs/libuv/libuv-1.37.0.ebuild
+++ b/dev-libs/libuv/libuv-1.37.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/libuv/libuv-1.38.0-r1.ebuild b/dev-libs/libuv/libuv-1.38.0-r1.ebuild
new file mode 100644
index 000000000000..a1c26f2a3fdb
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.38.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	# upstream fails to ship a configure script
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libuv/libuv-9999.ebuild b/dev-libs/libuv/libuv-9999.ebuild
index 7079f95f58e7..20c92f0e53d8 100644
--- a/dev-libs/libuv/libuv-9999.ebuild
+++ b/dev-libs/libuv/libuv-9999.ebuild
@@ -14,8 +14,10 @@ KEYWORDS=""
 IUSE="static-libs"
 RESTRICT="test"
 
-DEPEND="sys-devel/libtool
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
 
 src_prepare() {
 	default
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 93b9c5726542..f9b0f98b750a 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,9 +1,5 @@
-DIST libzia-4.18.tar.gz 623928 BLAKE2B ff7f4873f77c1782bc704ff11f0fcdc2a479404cf0719d9156fad2ad01634241f7f556699d778fbd6e3f4bfe108b1735c65def859d56cefcedd6a3c760200a14 SHA512 7d4287cf6804ae757d6c96c03fd948db1bf0b5463d345929b2c8dd4540e66b45849a8096500576199fa650b63b892ea17c976338b88e9310d64f804fa3920489
-DIST libzia-4.19.tar.gz 623995 BLAKE2B 55bc17854614af92873059e741179d9bc4f35000c4fc29cdd56854b85cf059d422ec49cee9d07056cf8fd18f7a6bf15aeb98a3f3dcbee44420ca1862175d3938 SHA512 65b7cb87740a3288c186f30a10d29824f2b725e54290d4c56ebfd9aa6902ff2e1e48725ed35e3ff5c2d144ccd6a20384df470c1b615c99da8a14c7e0647b0f6a
 DIST libzia-4.20.tar.gz 624009 BLAKE2B f0342c144c3e0b9dd7720466b24d79632de6dc8597786ba22acccd4eee20cdfb4f941da5717fde27a7ee0097f4f57b20a93455c123fd518916c1552cab801bc2 SHA512 0780eb791fdd85778a074eddab933650d4fbb09a9b441432cf6e63fe97978d47c75155caa251820f283badb16ffa5ac2d323b1f98ab5864caaa020511ff856d5
 DIST libzia-4.21.tar.gz 631871 BLAKE2B 8c54ae86e38569914c05da6c11b8ffe2c349884fb4e8ea00b05b88da12f6ee4e80ddac82f1790b67586c24d9df5b0ab71053fc80479cfdde22250a034db6dbef SHA512 e4277dfc3c004a0a1d1ccd8a11431e46344763ff5df68403b451e2be4b6bd00862fe2af0e15ce9017c3d6144d301e792f9279632687697e0dd4a238c805b04a8
-EBUILD libzia-4.18.ebuild 719 BLAKE2B e89d28fdf28d1405fc39d7eabf559a3dd3493cc1436752fecfb4e73386ba4c73b88907736ea9b1f107325c2bce071b696f84e2f880ea2c4df4535ca57b6a9ca1 SHA512 0c6653c16bbb1136bccc3e6d672de98c64a7695dcb8a38ddb7acf93c0d1b61449519cc0386ffc270f99155ea451c95ad6befde6f3772e639c1b8f0a2dd2deaf8
-EBUILD libzia-4.19.ebuild 721 BLAKE2B 6f33ec501f2f24c9d27a0f2ee655c526bc4e758f4febec914f8f12809b687748bbb1238490e3fc3e0ab596d8a8ddd06010fb5e98c18e3ea7abc6a38e9442689a SHA512 6c4dfdfae0bf2dc34d8d237bf25767a22739ccc6350e25bf88a4ce82c48b96fcbd0b8b5d0f668d41319ba6d029fbf5c192db8a3c82a37a35249d120ada340ea3
 EBUILD libzia-4.20.ebuild 719 BLAKE2B 3d6ccf2b62b7ff127dab3bffa2c5b0d52ba374f389998d7b60662874ca34ded6eaf6f58851a0a7ade1ec7d9e1cbd9e6fde4d95a0fd774845c92a3e9af74827f9 SHA512 d69a02f5bc0f92b8fdc50afad08c06a8d32999aed136edb99ca7bdd74fa15f1f242fb21e34cd48fc28bd40303740a2528dcfd5a22151b486eb069049c234d037
 EBUILD libzia-4.21.ebuild 721 BLAKE2B 6f33ec501f2f24c9d27a0f2ee655c526bc4e758f4febec914f8f12809b687748bbb1238490e3fc3e0ab596d8a8ddd06010fb5e98c18e3ea7abc6a38e9442689a SHA512 6c4dfdfae0bf2dc34d8d237bf25767a22739ccc6350e25bf88a4ce82c48b96fcbd0b8b5d0f668d41319ba6d029fbf5c192db8a3c82a37a35249d120ada340ea3
 MISC metadata.xml 451 BLAKE2B 539464597b5fcacdf3701b1400a6ea8725e46164b768c129d98a0ca37e1edba4c90c619ff7138988cbcf0136201f723327d1fe561179181a30709e2977730255 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773
diff --git a/dev-libs/libzia/libzia-4.18.ebuild b/dev-libs/libzia/libzia-4.18.ebuild
deleted file mode 100644
index 88159bfcae8d..000000000000
--- a/dev-libs/libzia/libzia-4.18.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="platform abstraction code for tucnak package"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ftdi"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	media-libs/libsdl
-	media-libs/libpng:0
-	ftdi? ( dev-embedded/libftdi:0 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	eapply_user
-	sed -i -e "s/docsdir/#docsdir/g" \
-		-e "s/docs_/#docs_/g" Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ftdi) --with-sdl \
-		--with-png --without-bfd
-}
diff --git a/dev-libs/libzia/libzia-4.19.ebuild b/dev-libs/libzia/libzia-4.19.ebuild
deleted file mode 100644
index 63b54d9c6b89..000000000000
--- a/dev-libs/libzia/libzia-4.19.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="platform abstraction code for tucnak package"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ftdi"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
-	media-libs/libsdl
-	media-libs/libpng:0
-	ftdi? ( dev-embedded/libftdi:0 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	eapply_user
-	sed -i -e "s/docsdir/#docsdir/g" \
-		-e "s/docs_/#docs_/g" Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ftdi) --with-sdl \
-		--with-png --without-bfd
-}
diff --git a/dev-libs/maloc/Manifest b/dev-libs/maloc/Manifest
index 7fc046713a7f..a95d33f0798c 100644
--- a/dev-libs/maloc/Manifest
+++ b/dev-libs/maloc/Manifest
@@ -2,5 +2,5 @@ AUX 1.4-asneeded.patch 533 BLAKE2B b2f1202d6f788c41f4e96c2a9b2354abe922fda568ebc
 AUX 1.4-doc.patch 539 BLAKE2B fbd5b0c726273bec32d7643edfce37bf4295fd12c92664bba6c5136cbfda4e50c3f260fe87577dd8eb32a3e847ffac08dfae376345675b3732d04e92f08cf744 SHA512 7ca3d028c86c6938a51f44f9d7f769702b5a8732bbd98ac9abaee916f25b2b7bad69883844a36a4add055838ce67e779ccc02634aed05bea2704c20b59b5fb67
 AUX 1.4-mpi.patch 652 BLAKE2B 0ad1e3ea9b79178ba8e1d16efc1fd6b59b931773faa0add3519a917164d4d62bbe158e05881d8e077c3ff375cefec2851ddbb160b2d64fac299cde145c2eb3d1 SHA512 73d00caccb02f5fa94336c63a653e99bccdeebd39d6e10d4c8eaab95a8e4f4b90ac5d1232d781e25e5079c7fdb8038471078cc63ba638579f523e27816e49d43
 DIST maloc-1.5.tar.gz 794138 BLAKE2B 28b5b6a3bb9769ead517e181c9098762378dea7c8b8ddddaf809c958a553a4e96ee654d477a974c769b027c57c93b84ec5e447af142489b59d2ce8800b5631a6 SHA512 9b50ffc0dd2a9c74808783fdc3bcad9dd6fb4ba0edcdad099eb7ab5e9a1f7d5c708db4b6e2a5373adfabd2a013b1cc4f92281905ef108df3fa6376726ca7a62c
-EBUILD maloc-1.5-r1.ebuild 1232 BLAKE2B fe4d5573f7110b48982722fbcf07146b76dc1af396b81910caadae49a262af1a95d7b93f8adccf5ef28eefa3fa6a8e4c841381f14f34f0906f7c814d7a4445b8 SHA512 c0b69bf4eba7e579f4e0fbf00dffd35457cb93d71e25908febc29efdb20154a176bc62337b8c2abe70b35c8283bbbc8f78142e204529459738ca5649bf2ee4f3
+EBUILD maloc-1.5-r1.ebuild 1232 BLAKE2B 89fd133e2ded56a3c6fb919b4c0578ffa721f9fe1df05d500a1c7efe02f63b35dc0fba0f255f8dd7d628a0dc5b7d6723a703d2b1f883e321cc92e3d820d9ca2e SHA512 75b23865c0516751d547942681c768c5503613351ed79ef8ae5a63adbc64977d560b6a6532275cfe5f5aec16dfeffa644a7fece4aa82c137b96df38ad1f39baa
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/dev-libs/maloc/maloc-1.5-r1.ebuild b/dev-libs/maloc/maloc-1.5-r1.ebuild
index a28998d13c5e..09db961acc5c 100644
--- a/dev-libs/maloc/maloc-1.5-r1.ebuild
+++ b/dev-libs/maloc/maloc-1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ IUSE="doc mpi static-libs"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
-	sys-libs/readline
+	sys-libs/readline:0=
 	mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}
 	doc? (
diff --git a/dev-libs/mathjax/Manifest b/dev-libs/mathjax/Manifest
index 0e0163c48500..eb797679cb31 100644
--- a/dev-libs/mathjax/Manifest
+++ b/dev-libs/mathjax/Manifest
@@ -1,7 +1,7 @@
 DIST mathjax-2.7.0.tar.gz 24594403 BLAKE2B 7cadfe7565a7ebba3569fb298a097f07081926b843a06c3c32447757eb0a5d463d654f20c42821010c81c59819bb14fdc5e84a39e87106bb6808bd6c9ca52bb7 SHA512 2a7c2b4a4991485c18f78dda4115da05a31c1a2d952c403726e99d22fd26f166298199238ad482e53b63b5414be687f325b586f5ebe4e2d552447c929415b350
 DIST mathjax-2.7.4.tar.gz 25355532 BLAKE2B 0bed5224356757c64989de8b9355f5c2505f1fa951456c52caf1cc0a9b5a864633ce5299cc9b67b1e5c743e39bcb6aee787a76d6871fc998b614d62e12499f6f SHA512 cddc4c64c188620307f0ede3b0bc7ba071f78702ba6315426d8c83129543a6b81a3a9a115f88017e23b5094b7aefd934c39aeec9688419830e33f9fd0fb1de7e
 DIST mathjax-2.7.7.tar.gz 25347766 BLAKE2B c1f11bc854c95888d7f04ee627094a2e297e7554b0380dab30c08e2c4405495df611b440da0efd1e6456150513e07fa4ef90808d2332f9fb83785c118228de18 SHA512 471bd22475827a13d79de7d335f3e51ace06dfc04f575e8829b4505f428949f1dbe58798635cb434ed02ae0cd3fd8d1d577196b4961365fbcb399cc075d3284f
-EBUILD mathjax-2.7.0.ebuild 1226 BLAKE2B 5c800209a6e4bd212bde4e6f1a6ee5e7af3019d69ebad5c1ccaead342e9051ac06978fccddccf330dff0c31bb504ed58437030457b9a768dc96b28eeaddf6024 SHA512 33f33428b09dcd5aca7b94ef322e419ebead5558bd99e841a78ccb8593f205f19b13df0c2edefe9b2f03ff13a077916a1d00e5b21ccbf8f5379c70b03ee68670
-EBUILD mathjax-2.7.4.ebuild 1226 BLAKE2B 5c800209a6e4bd212bde4e6f1a6ee5e7af3019d69ebad5c1ccaead342e9051ac06978fccddccf330dff0c31bb504ed58437030457b9a768dc96b28eeaddf6024 SHA512 33f33428b09dcd5aca7b94ef322e419ebead5558bd99e841a78ccb8593f205f19b13df0c2edefe9b2f03ff13a077916a1d00e5b21ccbf8f5379c70b03ee68670
-EBUILD mathjax-2.7.7.ebuild 1342 BLAKE2B 9a1e6be03d053eaf6268911209571661a4804d08c20c7bab93869c07a690add946dcd785e0c18c13d5a6babf2f82d3077829d31fb61acb53a9b7aa1c3b2f9b18 SHA512 4bc6cc9a93c369b4685d746c9e2765e2aeaa1173e6f163ea2fdf9eda3a250bcb00772d056b30a65871f76b951fafd5fec71bad633d977877647964678f096b1d
+EBUILD mathjax-2.7.0.ebuild 1227 BLAKE2B 6d20d73dd444ec67032fc13236558941ec7cedc25965167d6fbd91f2490f0a4ae1bf3be28f1c676a81b46a4d9f70dfc856477af9e4f839382146fe97e3a75c80 SHA512 67c3d55adcdbf879b1d5079d45d6c29b5ea604a4f3d7d58ae1b5915e9ba2d435180eaee1fe1c24786f8fa25b9067ddccb541bafd93dee003212189ba94cac19e
+EBUILD mathjax-2.7.4.ebuild 1227 BLAKE2B 6d20d73dd444ec67032fc13236558941ec7cedc25965167d6fbd91f2490f0a4ae1bf3be28f1c676a81b46a4d9f70dfc856477af9e4f839382146fe97e3a75c80 SHA512 67c3d55adcdbf879b1d5079d45d6c29b5ea604a4f3d7d58ae1b5915e9ba2d435180eaee1fe1c24786f8fa25b9067ddccb541bafd93dee003212189ba94cac19e
+EBUILD mathjax-2.7.7.ebuild 1343 BLAKE2B a87bbb4f0acf5ebe4c4e8e39bc15d3609bff3d419a43c74455cd8a482f1cefb8b10d90e2b679de4242e5d794235606cd4228ac6553121abb4edd8cc23d1177c3 SHA512 51210c177016bf87990ca8066101c8aa7d04bc8f224c31458f4a154d2ff599f3ac1e72c04660696811ac48476bce5a0036a8d3cfe0c38d0a570c98db74ce89af
 MISC metadata.xml 1030 BLAKE2B 8f3b54b726e2f135394cd6a0957d309070d3aba8fa7c40ef4b51ef8daaa0123b7f30f6cc793e2d93cef3c9f801267640444d7c604a3d6dcb277d9621ec6dd1a7 SHA512 aa7911df581513457da3e6f146e9d7d986c9b028698309ed42d1980f7bdd7a738dd6eb2a252ffbdd49fded3877e196c32b0a75f90fd1fd928b078429ed84565e
diff --git a/dev-libs/mathjax/mathjax-2.7.0.ebuild b/dev-libs/mathjax/mathjax-2.7.0.ebuild
index 7a926467c507..d2f69ad8e4c0 100644
--- a/dev-libs/mathjax/mathjax-2.7.0.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit eutils vcs-clean
 
 DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
-HOMEPAGE="http://www.mathjax.org/"
+HOMEPAGE="https://www.mathjax.org/"
 SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/mathjax/mathjax-2.7.4.ebuild b/dev-libs/mathjax/mathjax-2.7.4.ebuild
index 7a926467c507..d2f69ad8e4c0 100644
--- a/dev-libs/mathjax/mathjax-2.7.4.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit eutils vcs-clean
 
 DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
-HOMEPAGE="http://www.mathjax.org/"
+HOMEPAGE="https://www.mathjax.org/"
 SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/mathjax/mathjax-2.7.7.ebuild b/dev-libs/mathjax/mathjax-2.7.7.ebuild
index 85f1f957063e..8d4bc7f5cc7e 100644
--- a/dev-libs/mathjax/mathjax-2.7.7.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.7.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit vcs-clean
 
 DESCRIPTION="JavaScript display engine for LaTeX, MathML and AsciiMath"
-HOMEPAGE="http://www.mathjax.org/"
+HOMEPAGE="https://www.mathjax.org/"
 SRC_URI="https://github.com/mathjax/MathJax/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index e93557d890ce..98f225dd13cd 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -39,7 +39,7 @@ EBUILD mongo-c-driver-1.13.0-r1.ebuild 2447 BLAKE2B 9d78225d7dfad62360686f37b607
 EBUILD mongo-c-driver-1.13.1.ebuild 2482 BLAKE2B a023ec4ab0d023c30e6f664eb1209136429c19321f07fbdf7def6b2fcb7d66f873fd394d48db98f08f2466c4c46a9fbba8f8a48e57a355b09c2d9e4582d1ebda SHA512 f587c3e03233039d8869b5d75b8fd1cee617da4a1b4fd6acd97a043c78a7604320c42e78e5e21df0783da98092252e4301011804384988df548449a350e89a47
 EBUILD mongo-c-driver-1.14.0.ebuild 2551 BLAKE2B 63c599838498a5893429ff5def20a62f50205e9c6eb8cbc09fd32bcdacd8b70531cc46041023999a634f990c4982a3b94a027cef2314e1b6d5e0a8edb8d9768a SHA512 3ad5c4651b4c3d00c9c01159648750f46cc52e8c9c910ca5534518c7ee7255bba6069ef5a26f5734d52b7a978cdf089ffac52af10fcc15c41a573e6cd6f7fcb6
 EBUILD mongo-c-driver-1.15.1.ebuild 2536 BLAKE2B b4d2263f92d32b3605188b6ea91d8dd1a3100ad13e73c300b6efe5a684483a9669c389d591c6681c5f6a2a1501bbc1d2fc4c1db88533c868ca1b4fe30348203c SHA512 393ffad442d3db5ad0661459f3ef9cbe9d37a5087079436ac6c534dee378d207c802f928b6dbef13626d6c77026971215c52413e8ea7bf21167f74526b9b6560
-EBUILD mongo-c-driver-1.16.2.ebuild 2542 BLAKE2B c09f85b6e762b864208cbc25cd6f65d14e9918d289030d3f56826badda2ef6ea72fbfb09225c7001c866be69df2aee5d4bc2927a69c7fe31af42e161923bf6b6 SHA512 25549dbcd88d12a0f3dd21d10966211384dfeada442c5ffa3639d1ede0df5117fe73502c6dad7ef08095ca91fd765fd61844e0eabbf3523d3bdbe2653d924873
+EBUILD mongo-c-driver-1.16.2.ebuild 2541 BLAKE2B 5fc7fc60e1667bbf7d169036435634466b35c26bb5f4036c790fe6d58b21ece802c51aa40cf2aa5ff808b24bfd490c918ac00f169d354a74c42098ca845907f9 SHA512 4842863de11b4cf4fcdba090ebf4705307b7fab39144b84d4af9e6cd2a2d6a94db510522c4a6d4dbd5b7d6fbb5bc1d837c6d86185587e85169c94de187ff6be5
 EBUILD mongo-c-driver-1.3.5.ebuild 2171 BLAKE2B 62807837e21c6ce5c098fb5160aae99b01d6dd01550d3bd837ca727616036ec453a9e37f0b4ae71979bdce01344a265d0ccc23d324d9827084bfc302b980a6d1 SHA512 1b22d611b3c235883d4115fbf82d800fae0fd81453d2b4dff8abe8dbeab065b04e2abd506ad6050c10862a7bb7f28cc7ad41b08bf16a53598c20eabcaaec4cd8
 EBUILD mongo-c-driver-1.6.2.ebuild 2070 BLAKE2B b2a25755c6a37247c42f41134684387b2e584a241a411fce98c96f057ef18c050bc4e8ec3aadc4de716fa7369ca797ca75cf9ac2fb39d3dba0827190d9cad2be SHA512 22a44789068ec7277d10feb6d41b82526b09aad1213ae8b9827131e63df1d78ce07704f295178cfa085a6c6c645f7d456150caca51265b00dd8bf6cca2c6f42c
 EBUILD mongo-c-driver-1.8.2.ebuild 2128 BLAKE2B ef502986fe7b125c8abd168119797b89706209b0f6c7a2f99dbf4a0e9de93687babc79d504e366ba4bdad52215e2f5c4c72f259f81ea3bd70c627591389cf9dc SHA512 87607915dab15ffbe9f2dea28a243d14ec5c20d7290fd9018a57a7e31cbe4bc62b731f236da06d246823b070ea2230b588159a8001e792ce7273f492452811fb
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild
index e5f55ceb6252..e82f70860420 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~s390 ~x86"
+KEYWORDS="~amd64 ~hppa ~s390 x86"
 IUSE="debug examples icu libressl sasl ssl static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
diff --git a/dev-libs/nanomsg/Manifest b/dev-libs/nanomsg/Manifest
index d45767681588..80e23b5ad562 100644
--- a/dev-libs/nanomsg/Manifest
+++ b/dev-libs/nanomsg/Manifest
@@ -1,3 +1,3 @@
 DIST nanomsg-1.1.5.tar.gz 310739 BLAKE2B be3a6c3b8d41373798909f24f49c24018d99454e431dc64105a554021b1b49c8ed4fc6d14adfef315f5defd38d19482ab3a7625ea54fefea0794f149038ddfd4 SHA512 773b8e169a7accac21414c63972423a249164f5b843c6c65c1b03a2eb90d21da788a98debdeb396dab795e52d30605696bc2cf65e5e05687bf115438d5b22717
-EBUILD nanomsg-1.1.5.ebuild 806 BLAKE2B c6dad3bacc30c657f9ad57a526066f3b27d1619b3de879ae9d498eed635334e19f694762f90e3229b0eae5175de148a90766f819ea78eabafd5b8bcc61074734 SHA512 7cee0921659e65b311e874ec86c40153e548a313bbb72f4b1db96b82fa4a2f057b2c344d26fde14f7f5c59aede7349897a00d7f174b59831f2ce2db5f88def5e
+EBUILD nanomsg-1.1.5.ebuild 805 BLAKE2B ae4b62ab7fa6ca8e8fe532d22d3ec2e6edc72a1529ce40a721774c6d354e5e20ac3fc17c6e33cba8157fa55b5e150df70b879007d5aab9f8a4d5316a8b381cfc SHA512 4747e6a3bff09f7fcbe217caadeefe3a9cc1adb689889d6178e7bd5948a3e5544b05fb335d6f303c90c2915140ce3a4201e971b732e175fc2f0a1ec1eb4f5773
 MISC metadata.xml 433 BLAKE2B e0f53ba20bd2976c331ffed8c188bd0bb4e90a6c703024ec7de86ca239733d9f080fbc3400e423afdd295d684b4d3b02790d9791c44da066868effc0ac716716 SHA512 3fd07647af6e9d7c4b3996674b0376a22ec9727a86b9e1af89a3a9695d547f36a745b9c448aa1cc57c37f094965ca64524f1ba465b6cf1938f731b0d0caa9d6d
diff --git a/dev-libs/nanomsg/nanomsg-1.1.5.ebuild b/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
index 6dc699b6e733..06f2ea0e6c57 100644
--- a/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
+++ b/dev-libs/nanomsg/nanomsg-1.1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nanomsg/nanomsg/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/5.0.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="doc static-libs"
 
 DEPEND="doc? ( dev-ruby/asciidoctor )"
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 34840b41baed..8f65473c0aa1 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -5,6 +5,6 @@ AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b
 DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f346fb7bf71de6fc5a59ee3d9d43bb4ad3bdfab7535d4d2eddeed62f72cea1861ac537f2bd7a62e7f76069c692 SHA512 0c10c373c6a5299a85fc38f32d3590fff3b26c4be40e6c85ed73c20724ef2fb094bf37a8c3b1b80a4bcdfc14fe59254d4419c391245c298a4e16788954b88236
 DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
 EBUILD newt-0.52.20.ebuild 2010 BLAKE2B 5511040fa591a77591849582adb578a69c38af1b7884cc8741e102ef6e602d5dc8b57c53ebf105593ef04e4773398f817e6e0ccb6a2b46eb230c51d6bb79155d SHA512 9dc54c30ba5c8d920b6c75576282bdd6e454e8db321af39cecd3fe3f11164b865f6a8cd802fa64c931f3f38226f2999c90525eabd5dfdedb0c01bef36b27f688
-EBUILD newt-0.52.21-r1.ebuild 2243 BLAKE2B 029971d40f19499331d8acd76201bdd374dcb256febf3361d25fd5fd7e5e71f4a9567863fe1ec6f0b54ff4e21d1446f0a6d038988f9dce71644f00630d39d9c9 SHA512 1253cce7f50357cd47771b49d07ca507899e43f9f10e1db8a3d9aea932b86927ec945504a3dfe19932c8e6c382fb06835600038d797e12f88d76fe1a0cbd2f79
+EBUILD newt-0.52.21-r1.ebuild 2245 BLAKE2B 9a0d5fb29521c38714710175ad18a4c5de5b1b0a1988d255d809497dfdb272489b876420a1622b45299e8e7c452c5c12cb2b67a40813590ad53a349d6cf9a5db SHA512 e647f52683d7df3ca43e8ba31dd5de4add226f9ada32fc7e257a2bf17c71fb08acd035d97a2ce3d6cf7d530f08e5d1946eb40bcb641f90494c9a2c443ed57aae
 EBUILD newt-0.52.21.ebuild 1963 BLAKE2B 6f13f195dbcb4673bab8f816d81eb3c681ae1df05d0e331dcef12999644e8d2edf982c241277c902f2068e7a7cf1e3080da172a5358caa7b5a8924aa8360427d SHA512 cf562a3657a555797e45bba86fa4e49015cb20c096c70dd994396eeafe0e458aa5d76f599a6988d0e744505ba85793318e4af89478a7a774009012848f8a9182
 MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/newt-0.52.21-r1.ebuild b/dev-libs/newt/newt-0.52.21-r1.ebuild
index a3aadea62ece..0e660b1c0512 100644
--- a/dev-libs/newt/newt-0.52.21-r1.ebuild
+++ b/dev-libs/newt/newt-0.52.21-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit autotools python-r1 toolchain-funcs
 
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 9a7335cfcd15..461e203543a1 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -3,9 +3,11 @@ AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef
 AUX nss-3.47-gentoo-fixups.patch 5260 BLAKE2B 994233aad2a0016676e6aea2bf4331a131561aa2b67bf6bab369b86e3a31e2fe651b0cd3fe77c6b8127fd276a5a2b8fccf3db90e0ecf63cd6d3a43e4dc26849a SHA512 c917ee0a2e4c889613f0d931b2553a6338c60a4ef898ea30bcdb888f94a30994849a3d33cd0b9eb7c5d1baebd2c7d991f2dfef44b50a0b59bf2f6b332ee3ef84
 DIST nss-3.51.1.tar.gz 78310874 BLAKE2B c295b5fdf6e1d24cc79474f2c5a9e91fccf777212fbb072e8a64576ed1b060fea6ecbde1fa59bb07c998b9aa92bb7d450e722a8f34a72eaa35aef6cbd693420a SHA512 1878780886cc330489a14a60ee5cb67b174f3167d020db256eacdce079652ef8af65813914cd0fb5684457053fa27acc9bff72d0713fbea28795613ca45a6d46
 DIST nss-3.51.tar.gz 78305125 BLAKE2B 2c7b90d4cc9fe283bf81e21d0dceefff503e5a31f0053828b140b2b927ddab8c8881b23c7d4c003f3e2d0dcd22efbe699baee63443cab6e72d33a552fd430e3c SHA512 9c894b1ea41449b000750a7b3a89fcb43dfc3d0d4d6dcc0dc288bc73996f76f1ee1ede927a8aecae6d4a07f9f3d3e3a042c6a60cf06e27e0cdc004fce2e510fd
+DIST nss-3.52.1.tar.gz 81222116 BLAKE2B e7a1a24c0a4765fb13a4c13a93187a26df6df68b3e8d623514928cf505215e67f5f22387b6a6b0680117b1c2af13752cb981c173bb50424784d05b459704d528 SHA512 be8746984e3028e5ed49f2132ca08687f6ac75e50208d8cfd6ffbcfd5db1ab8dcaf1f2a0a6c6c1920573de80490301b21c022759c7e2309a22d29698bb169dd6
 DIST nss-3.52.tar.gz 81220587 BLAKE2B 0208c9047c61233ed36f02d57fdc64fa1734ef69d17fa499707f4a3b14a2e880b1dcf4b19b17a38e9b41d2e46b4a9488613d82989be747ad82aebc35b8e491af SHA512 a45baf38717bceda03c292b2c01def680a24a846327e17d36044a85e30ed40c68220c78c0a2c3025c11778ee58f5d5eb0fff1b4cd274b95c408fb59e394e62c6
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD nss-3.51.1.ebuild 9076 BLAKE2B 10ea62155df3c5b19e89875f2bf4932751d269feeb0ee6cb1640e25f9240efd53e4f70a75d640ae130bd39cc4ea2f2a858ff39ae1a5e7f001237cb694a1f43c1 SHA512 5a94e706858d39ab5dbe1d0bfdf43ba657a768811b48948bd5595dc6966651284ed3b224eaefd03c855ecb3b4c1d2ee61ea5aaf9bd34e32f0579dab08330de3c
 EBUILD nss-3.51.ebuild 9001 BLAKE2B 0cff38cb15c49d2791d940588cedb83a7226f4f7cfe81a0807ec808ac86f2cf61f2add00868bab13783d561a6f2252d5cff6045630fe764c167fdbd319d38d0b SHA512 6b3d93d9c8dde4e3d18086104b7271a5ee67edcc2fc6f90563464cddbac5a272f18e06c10f4a8996ef7a3ac510d68b3f1175ab348439e1a9aac5dfcbccf6320c
+EBUILD nss-3.52.1.ebuild 9076 BLAKE2B 10ea62155df3c5b19e89875f2bf4932751d269feeb0ee6cb1640e25f9240efd53e4f70a75d640ae130bd39cc4ea2f2a858ff39ae1a5e7f001237cb694a1f43c1 SHA512 5a94e706858d39ab5dbe1d0bfdf43ba657a768811b48948bd5595dc6966651284ed3b224eaefd03c855ecb3b4c1d2ee61ea5aaf9bd34e32f0579dab08330de3c
 EBUILD nss-3.52.ebuild 9076 BLAKE2B 10ea62155df3c5b19e89875f2bf4932751d269feeb0ee6cb1640e25f9240efd53e4f70a75d640ae130bd39cc4ea2f2a858ff39ae1a5e7f001237cb694a1f43c1 SHA512 5a94e706858d39ab5dbe1d0bfdf43ba657a768811b48948bd5595dc6966651284ed3b224eaefd03c855ecb3b4c1d2ee61ea5aaf9bd34e32f0579dab08330de3c
 MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0
diff --git a/dev-libs/nss/nss-3.52.1.ebuild b/dev-libs/nss/nss-3.52.1.ebuild
new file mode 100644
index 000000000000..6ad4600ae7d7
--- /dev/null
+++ b/dev-libs/nss/nss-3.52.1.ebuild
@@ -0,0 +1,358 @@
+# 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"
+
+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 )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cacert utils"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+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}]
+	>=virtual/pkgconfig-0-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_prepare() {
+	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,cmac}.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/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index 613a235ec69f..0b091c38b5f6 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,6 +1,6 @@
 AUX ocl-icd-2.2.12-gcc-10.patch 1551 BLAKE2B 0a2b6c66e83e67db9ba08af5311da65fc8795e36c9de1b25e53db8c593796c3f5903452bc3cc5c9e36c8fc32e286a588b942d9687c38d95133f125054cfbba48 SHA512 4d0a9168d31efe845c20623802aadc91bdf87524700708ba6ffcacd563344f4eb952eed99326ccd7d44b6ffbed145edae7d453b32a70362531d416c1b521bd4a
 DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
 EBUILD ocl-icd-2.2.12-r2.ebuild 1289 BLAKE2B 65b27579e5479f321cd239a96f0bcd6ed28370c7500b5adbf25c45c4989e7cf1f653409727eecd14726ee6de007777d6776cab463c736760bb648a09bd3d1991 SHA512 6a9b659fc0b7d28183c377ffe9bd78894d42d4f927e5933646ea14ec8ff99ebb245106b251e32c1d98fa5a40c238f8b178f3d225494e84994478920a891d9caa
-EBUILD ocl-icd-2.2.12-r3.ebuild 1201 BLAKE2B f59058b5a2713b31df98d6d3f6a6f392e9b05411e7685b24c5ab9535b20b6e2fc1d378b194a6d73cfc53ee5f11600a77a51d6ce4a969455ace9ad59e49f4af35 SHA512 1e98b8d49f048986b44717f87ffa3b30a21d75be4e160c26ea809346cf58e3478d2eb7cc4e4955dbc1b01a290a19e35eb9d23dd844fde96ad45657bd64b06884
+EBUILD ocl-icd-2.2.12-r3.ebuild 1200 BLAKE2B 30cdb8257c4ec6c10f47edaf53c6f3ef055cfc1107cdea5512be426a21983d9dc4352b5ff518feff23383560c565b9246781274bba8c1239d6f0af79d16d1e0a SHA512 aa0cd0135aa63dcc4521b043dcf1e00dc07bcae6deb6ed49c6802fa3979bdf433e7aaadefcf9638dc95a3a477604f2540b7f3c993ab2947444dd18e1d41838e4
 EBUILD ocl-icd-2.2.12.ebuild 1207 BLAKE2B 05ddc8149f9a60bd1de2862be075fbd9d815352e68bc1c35315d72c2d32a7a54de4da2786adca0e919f46a2e1686e06112d6f666c97a898a971fb04c8cde4136 SHA512 9852a177d53bcdaabc0f36b6bcbcfcef587e34e97131cd4e97d5494efa58abb34595e57defc0916596f9a7035b1d4bf84daa964462458fc6a6b025deb2e624a4
 MISC metadata.xml 396 BLAKE2B e87119ee4f6793c9fa1229c9c2430f8eba749df95522f5f658a6bc26fa22265bdcaa185e8338eef057320342beea263b64f162b2a8ad3c6aa4db73307b949244 SHA512 69effb7af79439eae9702055f6f1e20318f30ef76827e5be6d69ae63ff39a6bafbb177c681f76ac9bdf861a9921d7c897cecaea320d796e6d104dbcab9a24b79
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
index efbc9bb4b363..73e2edae5f4f 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
 SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Does nothing now but by keeping it here we avoid having to have virtual/opencl
 # handle ebuilds both with and without this flag.
diff --git a/dev-libs/opencl-icd-loader/Manifest b/dev-libs/opencl-icd-loader/Manifest
index 3a4cceeda6aa..c544d9f72708 100644
--- a/dev-libs/opencl-icd-loader/Manifest
+++ b/dev-libs/opencl-icd-loader/Manifest
@@ -1,3 +1,3 @@
 DIST opencl-icd-loader-2020.03.13.tar.gz 57833 BLAKE2B 7d74ce808f446554c92fea1e431f2026ed33b6c19a6dd6bf832184f8e4fb34a362464e5b844e99b1866afe55b7a521fa669388f868549882a4fde5c4c3c9313b SHA512 56dadf660d4add8cf779e389be1b4d60742b293c5452d7b114b79fe0d96591e56f338303ea991f1b77a40d321a23d53cb1ad9cc95bec502594ee18335641f060
-EBUILD opencl-icd-loader-2020.03.13-r1.ebuild 1069 BLAKE2B 7bca06f996bed7076c354ebeea422bdf3fb8fb8ec71666f7ca7f95ed93c16dc3c8fc8803710ad1e4858d191b2708fe94761f6f87116fa2a30b64ab8793ed1d4d SHA512 e5f06b6490ff365e42693531c6f5b821951af4f4fefd31ac8091e09ed17f607877f9683e3fe4d1f3b92dbc2194a1e6051242aee0637b32d42da1d0594f8e7028
+EBUILD opencl-icd-loader-2020.03.13-r1.ebuild 1068 BLAKE2B 7bacea0b4e36efb729e59bbc42ee7ed011ff4c2c756616de604b3197c333a6da91f79dd9dd1e7e43bbae4d703246f8afa890100a954fb7e51069240480da66c5 SHA512 1e2d7d06bea5fdf73d95553e34e48e00011e605f64fd140981edd9f317449c665569d15830a75671cd2d601c40d796f8051866412977e1ba5c35c3a663e53722
 MISC metadata.xml 341 BLAKE2B 8247bc53586bf8ddce72fd2cfbf2db0121e2dfe7b39c15fce5c9351f4db01df288ef4ab0e1e39af56a1da1022ab6f7bf68afb50f26165d253b422056899db998 SHA512 4d82edd65e1745e9550a10f02d865c73e0438799ee7f5fb1d4147af4ddc7c5ae8c978542bbdb8c9f99b33c8dfe203a56c891351b6d4aba831d39224e1b26010e
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
index 334c9390cc27..566faffb1de0 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index 15abad729396..4e95b2601765 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -10,6 +10,5 @@ DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
 DIST openssl-compat-1.0.2u-versioned-symbols.patch.gz 24633 BLAKE2B 6bfad4ad27dbca0bd85bfd9521ffc844c3e93e6a1cca7c814edd49affc60ece1c706dd3aa7be2ce80857532531eac6f0f03f43c0be22a769d00d9241686eff71 SHA512 3d85aa34f2491e0e36eedc45829709e0fb552f6d558c2726b59dafa98c3e679b88497f3f7399d7565d88e727591e7d9b12f5b1e27116ba19b9a661d7f75b07a9
 EBUILD openssl-compat-0.9.8z_p8-r1.ebuild 4961 BLAKE2B c7df84cfeaa20321bd4325b80dcdf05030d9b1b05d6e1a59521fd32354c350afcbbe4acce8952508f21cbe01ff644cdebb42e6aeea7a2f7d4974d38291d781d4 SHA512 ac4308c5d28481bf492007879d284be72742a7c3f846debd6f010250a3c714082a0d9a00dfcb69d473960a608d0649c555d7aa1fdfacd79f28329859606d79cb
-EBUILD openssl-compat-1.0.2u-r1.ebuild 7767 BLAKE2B 46308e760a4baeaa25733f48df2073d8302cfbc41f4b1f6a71ccd819d74fc03527b092b9e5dd67a031d85e3f61eb7c579d414bb155e5a00a46fb8c3325bdbe11 SHA512 c8375de35cf1ad9c0ffa246a1a6e66d1a8cccb8ac99ed9a0465a2e7503926d5d2a5e85b0789b28a3ce97feeeae9414b57856f0d72908c229dc6f1e756893ae93
-EBUILD openssl-compat-1.0.2u.ebuild 7581 BLAKE2B c4b7716ab019b21d79769edcf78ecfa4733fe889007c63ed524b6480be1081d9ade64281fe3180eeb0718455ff13586fcc94174e5bebaa09e874963897e648d3 SHA512 a5548ca652e74eb1a3b5ea005bc9b7d470e3ebfc788022c96bfc323bc604bfa48cbc6a06dfb4abe5a49943fbd53a928b3e9d08abb8e4f19b26d955b557a90eb2
+EBUILD openssl-compat-1.0.2u-r1.ebuild 7765 BLAKE2B 14149b50171790fa67e53358e9b17cb0aae83c162472789f31d60c615a917679e7734e6bb5b7a7637f5957a84e09f06f6dd8a3e2f698ba3626d45c740424a1d4 SHA512 1727bbc6ca47cdbf6ee0940ab16fa6b3a57a3a27ffd3866687a0f8fe833cfc24c271d6bc2f2fd7dd4f6833b54458c6e7b3b2d60a4b98108e208c69cd94c1dec4
 MISC metadata.xml 967 BLAKE2B ed2fb20c832fbd18b7834f35e21072d419e8da5d88c165b7113a3835af1408f10e8c649dd2ccdffac35b6ed297320c18c0ae76b7a124fd3db6ab1a316f11c31c SHA512 12392dd6d10877fd78b8f54d6c51a5b5d50db3690fff0084112389a1ff3d28a0a37ec09262e4e817337eb04133877de8aa06f341bf9c96e73cb36c31e77f9e0f
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r1.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r1.ebuild
index 2885b3e2a415..1501ae504d38 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.0.2u-r1.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.0.2u-r1.ebuild
@@ -38,7 +38,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="1.0.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 
 RESTRICT="!bindist? ( bindist )
diff --git a/dev-libs/openssl-compat/openssl-compat-1.0.2u.ebuild b/dev-libs/openssl-compat/openssl-compat-1.0.2u.ebuild
deleted file mode 100644
index 25a816cf47de..000000000000
--- a/dev-libs/openssl-compat/openssl-compat-1.0.2u.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic toolchain-funcs multilib multilib-minimal
-
-# openssl-1.0.2-patches-1.6 contain additional CVE patches
-# which got fixed with this release.
-# Please use 1.7 version number when rolling a new tarball!
-PATCH_SET="openssl-1.0.2-patches-1.5"
-
-MY_P=openssl-${PV/_/-}
-
-# This patch set is based on the following files from Fedora 25,
-# see https://src.fedoraproject.org/rpms/openssl/blob/25/f/openssl.spec
-# for more details:
-# - hobble-openssl (SOURCE1)
-# - ec_curve.c (SOURCE12) -- MODIFIED
-# - ectest.c (SOURCE13)
-# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED
-BINDIST_PATCH_SET="openssl-1.0.2t-bindist-1.0.tar.xz"
-
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="https://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
-	bindist? (
-		mirror://gentoo/${BINDIST_PATCH_SET}
-		https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET}
-	)
-	!vanilla? (
-		mirror://gentoo/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~chutzpah/dist/openssl/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~whissi/dist/openssl/${PATCH_SET}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}.tar.xz
-	)"
-
-LICENSE="openssl"
-SLOT="1.0.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x86-linux"
-IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
-
-RESTRICT="!bindist? ( bindist )
-	test"
-
-RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-	!=dev-libs/openssl-1.0.2*:0
-	!dev-libs/openssl:1.0.0"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/perl-5
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-	)"
-
-# Do not install any docs
-DOCS=()
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
-	if use bindist; then
-		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
-		bash "${WORKDIR}"/hobble-openssl || die
-
-		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
-		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/crypto/ec/ || die
-
-		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
-
-		# Also see the configure parts below:
-		# enable-ec \
-		# $(use_ssl !bindist ec2m) \
-		# $(use_ssl !bindist srp) \
-	fi
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		eapply "${WORKDIR}"/patch/*.patch
-	fi
-
-	eapply_user
-
-	# disable fips in the build
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	sed -i \
-		-e '/DIRS/s: fips : :g' \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		Makefile.org \
-		|| die
-	# show the actual commands in the log
-	sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
-	# since we're forcing $(CC) as makedep anyway, just fix
-	# the conditional as always-on
-	# helps clang (#417795), and versioned gcc (#499818)
-	# this breaks build with 1.0.2p, not sure if it is needed anymore
-	#sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
-
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export CC AR RANLIB RC
-
-	# Clean out patent-or-otherwise-encumbered code
-	# Camellia: Royalty Free            https://en.wikipedia.org/wiki/Camellia_(cipher)
-	# IDEA:     Expired                 https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-	# EC:       ????????? ??/??/2015    https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-	# MDC2:     Expired                 https://en.wikipedia.org/wiki/MDC-2
-	# RC5:      Expired                 https://en.wikipedia.org/wiki/RC5
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	# See if our toolchain supports __uint128_t.  If so, it's 64bit
-	# friendly and can use the nicely optimized code paths. #460790
-	local ec_nistp_64_gcc_128
-	# Disable it for now though #469976
-	#if ! use bindist ; then
-	#	echo "__uint128_t i;" > "${T}"/128.c
-	#	if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
-	#		ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
-	#	fi
-	#fi
-
-	# https://github.com/openssl/openssl/issues/2286
-	if use ia64 ; then
-		replace-flags -g3 -g2
-		replace-flags -ggdb3 -ggdb2
-	fi
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	# Fedora hobbled-EC needs 'no-ec2m', 'no-srp'
-	# Make sure user flags don't get added *yet* to avoid duplicated
-	# flags.
-	CFLAGS= LDFLAGS= echoit \
-	./${config} \
-		${sslout} \
-		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
-		enable-camellia \
-		enable-ec \
-		$(use_ssl !bindist ec2m) \
-		$(use_ssl !bindist srp) \
-		${ec_nistp_64_gcc_128} \
-		enable-idea \
-		enable-mdc2 \
-		enable-rc5 \
-		enable-tlsext \
-		$(use_ssl asm) \
-		$(use_ssl gmp gmp -lgmp) \
-		$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
-		$(use_ssl rfc3779) \
-		$(use_ssl sctp) \
-		$(use_ssl sslv2 ssl2) \
-		$(use_ssl sslv3 ssl3) \
-		$(use_ssl tls-heartbeat heartbeats) \
-		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
-		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAG=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAG/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile || die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 V=1 depend
-	emake build_libs
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	dolib.so lib{crypto,ssl}.so.${SLOT}
-}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 5d92d76adc51..44fe5234894a 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -21,5 +21,5 @@ EBUILD openssl-1.0.2u.ebuild 9865 BLAKE2B f0b332d3fc6d45583b2cee5dbfc1c64f970878
 EBUILD openssl-1.1.0l.ebuild 9592 BLAKE2B 8778c7cff0b81a5bfc1b8161b45c7a5a4f89cc7bb07e9c8e213a034a651d80ac3acd0939fd9eb986f1965119e399868c3106a4ce3c58b637e2289582543d6105 SHA512 691be7e7221f7bfc7e95e1d118f8d32b40e45afe5b213c342a40f610088cb3e5a7acc1351f27330653775a5f773cbc16e5531302c343af768b2d385967983970
 EBUILD openssl-1.1.1d-r3.ebuild 10436 BLAKE2B b5ca5102365b4773db76c2060d1c0a786cc91a7aa339ef10a4cbd25a1e7a72bdc21e7fc8165306bb53458170ae19eb4980899259886ce4fcd25ef22036f6511a SHA512 52a486e668901024c54d7e9ae2c82f3c7d2e8012820da38150ec0547d9354f146fc92ddcb969449631cf6ffb7d7cf3536e0d9107eede349dfa1e9f09f4ba25d2
 EBUILD openssl-1.1.1f.ebuild 10195 BLAKE2B da0c3d13bf583fe264e01968b48757467b1b820809724524154232851c32dda2ed2088fe852b02d59b87b9971e77793f4fb4263708e3e7a2b5670b198dae9a88 SHA512 0e8be7b427d0d8b090e0704de4b0aeeff758a706cf93c3d53834cff0a9f6c8faabdd16bb21e5a39fcde0415ca6a9c611a98a78af4e17386c95e69deb245847eb
-EBUILD openssl-1.1.1g.ebuild 10194 BLAKE2B 0ae0778f72fc24afc3445dfbde251c29fc58ceebbd0d408c603f737a56c3651da2a21a9028ef8e2882e5eb1922bffc356840c551d2af84e2d389975762a7de6c SHA512 48e13082a7a9a78e6c80e21b45d07a14697b4b714af6cb720d32f59cfe99957c0c6224bbf9d66e5b1bd364a58058c6902efd1409bf50addb9f833b3f29d1a9db
+EBUILD openssl-1.1.1g.ebuild 10192 BLAKE2B e52c4546f93268a03098ec24f91d29bfeae5c0705319379194973f91e50ca3b7977ab8c6942b9e7364b910d0709c16477740b046a236dd7d2859f3b038cb16ab SHA512 bc36994596f5e67bcd7e3fac1bb43ec628880497299cc4b5e0e596f08de24eca47abefb6958c73e297168830f67b3ede49ea8795a5de02305af2f5fa9ada4672
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.1.1g.ebuild b/dev-libs/openssl/openssl-1.1.1g.ebuild
index cb9a8e24cc5c..7a3f675be54a 100644
--- a/dev-libs/openssl/openssl-1.1.1g.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1g.ebuild
@@ -27,7 +27,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
 IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )
 	!test? ( test )"
diff --git a/dev-libs/pcl/Manifest b/dev-libs/pcl/Manifest
index c2ce058bb28c..3e03259e2bf5 100644
--- a/dev-libs/pcl/Manifest
+++ b/dev-libs/pcl/Manifest
@@ -1,3 +1,3 @@
 DIST pcl-1.12.tar.gz 384986 BLAKE2B f549dd9205ad12a8bd157b4e04e94e156f056e2190c25afcf3c9a0d4488d3e442f9cd3159c6ba68570bff61998b5d6b058c0cec5c57bfe00046379f09bf741ce SHA512 bf0168d8bb3bef8edc36085f6157661cc15f6587c847ed236983612e08955cd1fddcf2b95bbf6c04d275201aecc3842c2ab3679e7ebedb4f5fa9691c73771279
-EBUILD pcl-1.12-r1.ebuild 312 BLAKE2B 4edd45300c9879a8e5b9dc85574774f43fb8eae5e6ed6809125894a853bb5b0267d44e52d965cd7be412373705d2b0b6187e31527fb2574b1361bcc61e5c0b07 SHA512 45be834f9ab787079aa279638fea52f237f256d8c52729367fa477ee42bdd2b774503f6dbb34402a1436210b93fb846b5420508523698edf3304a79ee669dcd7
+EBUILD pcl-1.12-r1.ebuild 311 BLAKE2B c1ac7a7b997d5c4fca7f6904b0962d7b1de4234d0b42b17fae40373a9fbe5eba291e5f70a30c009bfc6b83539f4cb35a005e4eff4805f5814103ead99b7ca5ee SHA512 daf52b1308cca40406cdd0612de145686cf6325a35957c339de05171b0cac18597ff844fc4c9225ff4d3ed0d33ca55c329ad9515fc24473336affefb4b01dcb9
 MISC metadata.xml 312 BLAKE2B dfa077775d15071c5ec983c38cc443e693d0c2998b583c56a685145a523ee58cb473a872d418018e8366fa73e2cef4235315fc45c9291c93c5dbf4f1388d50d6 SHA512 e90839ce3cf7ce5848f665f2fb70b8ce8619db0c6b0b005f37765fc621a7bbec305680ea4d4cf10111220d390a622c00c43f239530640d3328fb7aeb64a58582
diff --git a/dev-libs/pcl/pcl-1.12-r1.ebuild b/dev-libs/pcl/pcl-1.12-r1.ebuild
index 7131adfcab25..d67d3078ccea 100644
--- a/dev-libs/pcl/pcl-1.12-r1.ebuild
+++ b/dev-libs/pcl/pcl-1.12-r1.ebuild
@@ -9,4 +9,4 @@ SRC_URI="http://xmailserver.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index b1de11412109..3e564c0fe853 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -2,12 +2,6 @@ AUX pigpio-70-makefile.patch 3244 BLAKE2B 3a8155c52ec15227c815a5bac7b42a1fddf968
 AUX pigpiod.confd 201 BLAKE2B 6707d0f0f8772110b6e1167abcfcdcdfdb22936024f3c1234f05c198853cde3b55c5474922fdb64dcdf49440e9ad163216c0b11ffb80ebea2fd413cc17fdc685 SHA512 96431969640fef1b5ce317f0f9ce93fae081f186dfa89c00b4f469e3657a7792c5d157ccff7d019ea4bb4848a6657c8bb8f111f5a208440cc8a0723772e7c708
 AUX pigpiod.initd 215 BLAKE2B d7797cc0d1d388fd21831e33cbadd031e2cb974e26367596dd4c9ba054fbdd4b04200d0ff61dfe797520d2e0745420a5d973b44a41e15713800a7828f097cec1 SHA512 e1db38677a248c3dbc33aae6809eb8df1dd6253f60ca852d98d8d6d428d23d7a8a31a031da3b786b7105d90f0cc52687bfbfe320e5c6cbf0fbf02b5ad5c6e606
 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
 DIST pigpio-76.tar.gz 2905839 BLAKE2B 7828a94fad9f110392dc114534a3b242f1f135d352885f3c4332a1d4a16f49d2fa58b57e9e3d64c2bf9b5f3bdd7e84a74775b518fc409daf75a55a87c5f3af57 SHA512 8cc1dc64ae32a07f4b6e200638065ba5fb26a94c1a730d81b64fa5f2bb9356b2b9910decb41def6932fc76f7ebd1df99a7966516ba3df9a09108de0afcd119d3
-EBUILD pigpio-72.ebuild 1091 BLAKE2B 2ad0df61c154728dc256c554caf6aff8bc4aa7bf71d798e32fcb681f0c65d0077a09d40a96c7e07de2a4da99caeba744dd89ceafbea1d16b8fb9af28b95418fd SHA512 81b9b2e7b5b05ee6d659aeb52d364359d3f5ee8fe7dcaf9fb4de910c0db49cea94472909f1bc0185674be55f073f0ba17b091c1256c9151ca2fbc605f4aa142f
-EBUILD pigpio-73.ebuild 1093 BLAKE2B 37fa60cb0c9194f07feafaa953d3d21629ed48c91fe5fce67e447f5ee6e12eef3c7d1d9ecefb648aece77081ed40a567c542eef584abc2872c350811a4143d72 SHA512 4ecf45c2d6a9f798b23ea7c24cd07e011028b1c3c090e49bd0ab0fe82257423ba478492d458c580e8571e3d01fa379979e5d5fee40b3ab87d43e7dca75ca10ed
-EBUILD pigpio-74.ebuild 1099 BLAKE2B e16aa6e02499ac1cb9207f4dd0bdf42fa58af0a60f8c03ef38dece5dc4bdf84317afb8468c4b524d55ebbc6089d2362b3ee79b9584804a900b9476c19c0efefb SHA512 828bb572843c59322a062cb4c1e470b4ba6b89c4cc6a449438a582cd645fea66448ab1d554c1c36197914eb238d3823fe03574dfa832e06732de5ab09c49fd9e
 EBUILD pigpio-76.ebuild 1089 BLAKE2B 6e30c9538c8447e9cd1d4d1970d9c996c644b404f74ea60a0260461f3b97a044deb9557852b313c4c87f13dd2a3c5209193e8470a1b2e5b85d55b80fda13b8af SHA512 2c49811aa1665c0dedeea6fde7f1c3878e9dade693fc246d9817d1af13d8f8e545b523bb2a2b152c849c7f216f7d1030257b9347589772df893fdd4bebbd863f
 MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
diff --git a/dev-libs/pigpio/pigpio-72.ebuild b/dev-libs/pigpio/pigpio-72.ebuild
deleted file mode 100644
index af5f01ca226d..000000000000
--- a/dev-libs/pigpio/pigpio-72.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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"
-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} )"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-70-makefile.patch"
-	eapply_user
-}
-
-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 "${FILESDIR}"/pigpiod.systemd pigpiod.service
-	use python && distutils-r1_src_install
-}
diff --git a/dev-libs/pigpio/pigpio-73.ebuild b/dev-libs/pigpio/pigpio-73.ebuild
deleted file mode 100644
index ca8b1bd2909d..000000000000
--- a/dev-libs/pigpio/pigpio-73.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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"
-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} )"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-70-makefile.patch"
-	eapply_user
-}
-
-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 "${FILESDIR}"/pigpiod.systemd pigpiod.service
-	use python && distutils-r1_src_install
-}
diff --git a/dev-libs/pigpio/pigpio-74.ebuild b/dev-libs/pigpio/pigpio-74.ebuild
deleted file mode 100644
index 738bf586aaa1..000000000000
--- a/dev-libs/pigpio/pigpio-74.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/plasma-wayland-protocols/Manifest b/dev-libs/plasma-wayland-protocols/Manifest
index b92bd3ca2e94..ba06b5b846ee 100644
--- a/dev-libs/plasma-wayland-protocols/Manifest
+++ b/dev-libs/plasma-wayland-protocols/Manifest
@@ -1,3 +1,3 @@
 DIST plasma-wayland-protocols-1.0.tar.xz 38020 BLAKE2B 8064a526d3e3e4b36f7c612744285181ba96bdf4c0992ba7d164ea98e629b3456c7efedd2e3dbbf76a3cbd42664d91eea3e485bd67303e1db02964c7fc6158db SHA512 30ecbf9fbf9de7ee1d323fb43b0f4a05586e0f7d2c4d510e2300828e7a6a16e8907d8d2a835d4ecbb2d4d532641ea722ff6572403f767e0ac878b7fdb0897b08
-EBUILD plasma-wayland-protocols-1.0.ebuild 426 BLAKE2B 1dea46fd71017d3ca2559dc895b00c10b2e39e444f3ffa2d97e08203b24e585afa1b4aff35321a50062c22744416f2a70e786d63553e4d1e38aae80a3e7f79c0 SHA512 ceb58a023303995377200c77c9ef18552902c744bbfd8a91ed98f8607099662f27fb920c3d57f6abaf77cc2394a2c6ec94a2f6a2a53b2a5d603556f2195fb2e1
+EBUILD plasma-wayland-protocols-1.0.ebuild 441 BLAKE2B 593b18824f771d1ef2660629594892b7a628fc4833fa57ab1e0cc5f87c7982d362eb61525713442a1f364b59f135693b2226649e29fece0f6abd025500774a8e SHA512 4b0e8b9db1c94455720509cb2454a2f0cc29ba8a999fb2f58a940f72fa19284c45846b5c2fac06c7762344626c92cee6aa209c9b5e9a7a2bad8320d6e503b357
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild
index e3af96585cc1..e4bd9fe14bd9 100644
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild
@@ -8,11 +8,11 @@ KFMIN=5.69.0
 inherit ecm kde.org
 
 DESCRIPTION="Plasma Specific Protocols for Wayland"
-HOMEPAGE="https://cgit.kde.org/plasma-wayland-protocols.git"
+HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index f9fdd1c661bb..e2b106019631 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -1,4 +1,4 @@
 AUX protobuf-c-1.3.0-no-build-tests.patch 1020 BLAKE2B adda0e4764283d00093709bc97500187521c1d099c6a057513cd4c4ab3b595479f62e7f90bc28ee062f7cae8a760445c78334468f25291320b74d46a5bb454cc SHA512 c6b6f37d8d0fb1ac14e650cc521034267b0af06525249078cc81fc8a3d551dc446bb5285228ca349ce18581979ea88eb9765233154cfbbedd8c4a937987d2684
 DIST protobuf-c-1.3.2.tar.gz 500100 BLAKE2B b8bcd4ad6f9ddc05f28526f7cc58778b21a34fc18c7c7aa2a5bb45ae7fdc7c5d8957f989fe1bbfe353214ca87b02afed8cf0ad43c0f0e39f7e13059a5dfd6b7d SHA512 d94d2c6f11b3e482fd3d1b8cef5b2d896ad37a679068f393d29916311deadc5b6b86f946b046d7ee49260b0223e3128e052dc76324b4a8cd6ea184d566ad9aa6
-EBUILD protobuf-c-1.3.2.ebuild 987 BLAKE2B b404390e96473fdfb53e849ed0bde223f771630fb1454d51d37d4faa9e278b5b986aac29c9e5df266bc4106ceab4d075b64dd57aa7c4c69e37e212be627a886c SHA512 404c477de52e19e8591d0875f2489bff5ffbfe2fb766725b14fa5da1709c6d0e24cbb44f16a3c56d25fac69ceb06a396f5782901329f5e835e4584ed19e17d41
+EBUILD protobuf-c-1.3.2.ebuild 995 BLAKE2B 10fade976f873f05fcee51121b2721ca73d54235739842fa9af74bc483f95fa6d75ae42c766192066edf411410665283cb71a214c837ae6dc219b6f0cc2cd24e SHA512 1cd9dbd58604c8fbb4670e6035f3d10700a6b8b61b032bac4a16f8daa8bda6dca4e958094ca146fcb75bba50ee2573ee9f617b9c7ee6d7e0c3105c49981a95d8
 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 d6909a46a388..3c3dc101011b 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
@@ -19,9 +19,9 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="dev-libs/protobuf:0
+BDEPEND=">=dev-libs/protobuf-3:0
 	virtual/pkgconfig[${MULTILIB_USEDEP}]"
-DEPEND="dev-libs/protobuf:0=[${MULTILIB_USEDEP}]"
+DEPEND=">=dev-libs/protobuf-3:0=[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/ptexenc/Manifest b/dev-libs/ptexenc/Manifest
index 175aaf1d28c3..194105e671de 100644
--- a/dev-libs/ptexenc/Manifest
+++ b/dev-libs/ptexenc/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
 EBUILD ptexenc-1.3.7_p20190410.ebuild 1285 BLAKE2B 7959ff8d6c6bf357f94151d1201e18c6f92f936671f06f7ab115e10f17298309d85609948658c856aa4faf4a31c5e9b03a374afd1e67773ee8e955ac9c1230be SHA512 a645c62cda7ec23a5741ee3e0a0f73af489e910a8db537d4c19f1f7df374f872b7311e1a4c81273357584226aed8477af19138e2f24d5fce2b34e622f391dba2
-EBUILD ptexenc-1.3.8_p20200406.ebuild 1328 BLAKE2B 7da6a54ad3557a28b50f692559afd0d74c33ea58b6121409c1318ff15d09244e106179cac00a700085029d82ab8ee57a21a64907e79baf34286f7be45ab2e7e6 SHA512 1c43c9983bc4766a5e5d7b595e8ee452aaa2988f23c87675ed6a3705b7b9b65a5667bf194c3cb672e5abf9594cbc36ca5ae66ed013c2f65ff74fb352b403a002
+EBUILD ptexenc-1.3.8_p20200406.ebuild 1323 BLAKE2B 1217acf92cb1957366de7e2a36db5f72a7255b1a02123235ab8b015cc521e3f10fde6643dc5a3682db815fb15a953d028447ca7daa0357dc8a0aba17d5a60752 SHA512 87fa7a7d99318dec4da98844f75406ae8047af7169868c7983c6f663f96160a9ae4753cb98872d3f1d8983da78cc7c1abbd509a0239960dbd280e7fe99d02c87
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild b/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild
index 916edfaaf400..2204855b7d3c 100644
--- a/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.3.8_p20200406.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="iconv static-libs"
 
 DEPEND="iconv? ( virtual/libiconv )
diff --git a/dev-libs/qcustomplot/Manifest b/dev-libs/qcustomplot/Manifest
index 115739d48f64..4b12558352ad 100644
--- a/dev-libs/qcustomplot/Manifest
+++ b/dev-libs/qcustomplot/Manifest
@@ -3,5 +3,5 @@ DIST qcustomplot-sharedlib-2.0.1.tar.gz 1963 BLAKE2B 294877d929564767009a8a44091
 DIST qcustomplot-source-2.0.0.tar.gz 317398 BLAKE2B c2d587e06026789a164f16ffdd00d324172654b6953ace637815b022dc14cc96362cf4022512ec3feea3725a651c1af0f50f09d0ca1c5e86ebcfbe3f50aa3ff2 SHA512 66c648877ed0a14cf527ac8526788065f494119cc61993d20268a0046c8e6c5a1c73a61f50a73e6a39ec55435bc5f74c613ee21254293ddab34ba7c2484c4f5a
 DIST qcustomplot-source-2.0.1.tar.gz 319140 BLAKE2B 868133f5126eea0aa8f80d34272f854de93b60575e3eed1b52211bec5ed96886503ba5c7f15c6f0ff15f3f67e35db6e5333adfc7465cee40768a65ed1b7275da SHA512 b44abbd8fd95970a829bbb6e7becc0765e24bd8f05958c8c1223303b68fb4c0a64f503cf0a2fe4fc53957e6e61a6618500475cff3e81ed0ab387a9eada2c83a3
 EBUILD qcustomplot-2.0.0.ebuild 973 BLAKE2B 27dedecc5719cf8c77e74d5a9f027ef2d5d81f9b49ebe6abb1ccf57d93f7822e3a2b9066d67a8fc6fd613e1a441dd9ac827137d98f9c3660a63f56345eed723c SHA512 407df97d2c3b82b7acbebf705cef7b0d9d8ecc7f445652ddcd94d358d165873bce011823632786501aefa040fe8ed6834e3f8d78a0bee8ff615a93f4114138d9
-EBUILD qcustomplot-2.0.1.ebuild 975 BLAKE2B 7907810de5c2a6bb5b2822fd826f0cb0da4b5a9fc9c00f37e97298dd8265016bf213a6ef89c85448ddb30cd5af9b7a9d888edf781cf6239d1b5ec63bd2a481c3 SHA512 c518e1c1a0b3726685eed1b4ed5313cd761ffa5ce437190e60204d3149e30311235b2768ae62a1e4535ad1dcb86e0a4459152f645ab4da3336d28dbda97b07bc
+EBUILD qcustomplot-2.0.1.ebuild 974 BLAKE2B e4161a42359bd84dcc7b887f8d7f64a5d0f9f7f70d3ca57e7c979e3b38b2897564db7611ea80491e6e7144e7aadfc6626b6bdbeb63c7d3d121756c6af6dc5092 SHA512 eb06c69a58da18c97457401dd2f668cbbd23baddce52c7c57b1e299f48f085501d6e567f0276dbe461b86398fd6823ebf7e0fe47a112d59b4e5f578837797749
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild b/dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild
index 51051c6445ad..aef8de80ade5 100644
--- a/dev-libs/qcustomplot/qcustomplot-2.0.1.ebuild
+++ b/dev-libs/qcustomplot/qcustomplot-2.0.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
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-libs/qoauth/Manifest b/dev-libs/qoauth/Manifest
index 53c600e343d7..89ac9cfa37d6 100644
--- a/dev-libs/qoauth/Manifest
+++ b/dev-libs/qoauth/Manifest
@@ -1,5 +1,5 @@
 AUX qoauth-1.0.1-disable-ft.patch 629 BLAKE2B c466bf98a007c645b4b38e804dce9454954b92307c268d96ac2d8db3991d70eda2b41a44628533c7191df5f1c11c2e363e78f522b535a9921d32fce5733b4080 SHA512 04d06d1989866e208510f9c726fb3a447df2020ba0c7ec169534b39075343c03e05f2dc854696c87cd007ce980dc747f0658d8e88d0ef96b77dc0c70dae923d7
 AUX qoauth-2.0.1_pre20160315-prf.patch 312 BLAKE2B 06da99ad51db25d6ff8069bb9e202cb7997b1fc7ee1d657386ccafba26d57b35b4ae22272e31ab5f71b615d4cd8ab7824be01f795e52a3dec5b82a039fc97758 SHA512 2bdd73d0b43325359edcff59d717ec18b2fc87d720d068cc8e8d04ef25eeb213050ab5ebc7991ec59c91299a5c49a2b727a5e5ad11677641b17cbd424092753f
 DIST qoauth-2.0.1_pre20160315.tar.xz 45604 BLAKE2B 290d768e8661c6e8f9ae8094ec140da22f00c53cbfd9ed6ebab1f159ae82c2a0a111a9306eeab0c08ea5b0a349e07d9b7f402f14812a5688ba9860832991494c SHA512 ec44c597c7b9729645ab98e2c71c805d01eab4c0684b7ea0da6b015a052b0ad6e3aa9352ef53e36a67ff99b9f75fb9b89156ca8b23c639a70cc49aab656366c3
-EBUILD qoauth-2.0.1_pre20160315-r3.ebuild 1349 BLAKE2B 58e487b57f5542175b718e4109e4bc28aa7b97762dbc445e34c4b8b09d3815551b2bf21e5d9c3aaaae477fdb83e9de4d409074af6265440e1d944c3745875d61 SHA512 10ad4fad328f898452b7d5dfa1f8a36020c9b5e7f0a215304fa2e81cf943b65a11fd3a72d0dd7d8a4c896f125f57bc2da8866c03c2ec2b70675cd2b588cae911
+EBUILD qoauth-2.0.1_pre20160315-r3.ebuild 1368 BLAKE2B 3d00d887345656d3e1392b40402e53c69f19af1e82ad432b3483853a9acab2e240a943276a96e254819106442b229278b609a208b40e2f1a3598b47dbe6f02ca SHA512 fb8b14b2023ed8a20fbe9dd850a4baca8eeb8b986e9146be3f62d88ebb732a0e092411a131bc496f4a4dbd596f318391d550c47a6786734ca774d97495544642
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-libs/qoauth/qoauth-2.0.1_pre20160315-r3.ebuild b/dev-libs/qoauth/qoauth-2.0.1_pre20160315-r3.ebuild
index cfb89ca9cbaf..06dc6eaaa41c 100644
--- a/dev-libs/qoauth/qoauth-2.0.1_pre20160315-r3.ebuild
+++ b/dev-libs/qoauth/qoauth-2.0.1_pre20160315-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
@@ -13,14 +13,17 @@ LICENSE="LGPL-2.1"
 SLOT="5"
 KEYWORDS="amd64 ~ppc64 x86"
 IUSE="debug doc test"
+
 RESTRICT="!test? ( test )"
 
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
 COMMON_DEPEND="
 	app-crypt/qca:2[debug?,qt5(+)]
 	dev-qt/qtnetwork:5
 "
 DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
 	test? ( dev-qt/qttest:5 )
 "
 RDEPEND="${COMMON_DEPEND}
@@ -57,7 +60,7 @@ src_configure() {
 src_install() {
 	if use doc; then
 		doxygen "${S}"/Doxyfile || die "failed to generate documentation"
-		HTML_DOCS=( "${S}"/doc/html/. )
+		local HTML_DOCS=( "${S}"/doc/html/. )
 	fi
 
 	INSTALL_ROOT="${D}" default
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index d6f01ecc87d1..51c956c52df4 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,7 +1,8 @@
+AUX 0.2020.05.01-test-memory-budget.patch 1104 BLAKE2B 0f661f83d0adbe9c0932f01f6751ed64a00e4669e6c4a865a52484b85fff352b000cfcf798147fbe9c950f8792381b93f40c7913fde824b0bde8596ccfd2ed8b SHA512 28cb8aba6e9d74e8e63e93e4d76f85f0580ca87d70e45f15f8fa7f4fd06523c0c41b7fb50523c69c4f0fdd3691cbffb0683787cac902c1f39350c0f62ec48da2
 DIST re2-2019-12-01.tar.gz 391450 BLAKE2B 2069b496d494771d09d2ce289cc3cd45ea99fda17ca044f09ebeddae85c6fb2cabcb34403a8364d179591f7f3d8ad4e39191c1034aa70c8a16f5d439357330ba SHA512 cfbce00a8462644177c2792cdcd1115fdd17dae9454f6148764bf22c4f364002c6d561f4f407564f6925b78fa8a252d6a3b02bfa8a63f347e6b3d33034ec2d77
 DIST re2-2020-04-01.tar.gz 402511 BLAKE2B ce3f17037a3a09867036e651d62bd9f004b7ed7c6813b4530059659e794a7a7a3ad17d6ee35b5456302d627a0524fc78151b60ed9c546c1baab699231554a0dd SHA512 b3f2ec675fbc2ab18fc4de7b8c077f110010fd4a7502eea3d802d3706681b523db551edd80c2ff188457169471899084a6b21937154ab2288ee9ac123a2b7014
 DIST re2-2020-05-01.tar.gz 402569 BLAKE2B da94442ad8fa965ce8e38f19184579a033a65fd2cdd7769e2e2f2fdb590cd79adf275e94a8aa4ca6924c4b7879441ba7632cc492daa67d41cebeead67af6fc65 SHA512 76ab9b63a7de3de1dbde599e9fd35cf94de26f2f3c2a85e3befa0026decc95620fac65c7bcbfa3729efbfe6b1b418d77d733bd27496b54c649ac2918652aaaac
 EBUILD re2-0.2019.12.01.ebuild 1352 BLAKE2B 4e8b259399c02b16f7cb0ba21aba52e43c629362846f2dba1cd47cb18006938cd1b1e6943c29b64cc19581f4b0607f2478700939eb0caa0573471b3fe8db1180 SHA512 93e6743627fe5aeb06b6dbfeae132237ffd32a40c1eb1532f21dc500206f49e1620aa7a3cbd887b4e70c4023535639ada9a638d2f6c68656725dacfbeca8d932
 EBUILD re2-0.2020.04.01.ebuild 1339 BLAKE2B 5809792c1217f49d50811a794686b0bb74faa93933dfad7a19067595434457e1fed2809414011b8d7039ec1768318a6c43a7f70e9eb1d1c23208f1874f9d0164 SHA512 98ab674b62c8b9a8389d39d9fde1d97de275a5b64b868b33ac0b49023d7351a9b5ca39280fb1b2a318aa01cbbc4aaa8db17f4d760223d7c471bb3b8f36ab9c14
-EBUILD re2-0.2020.05.01.ebuild 1339 BLAKE2B a9b55f36f3b198519e97d943f4401de1ae3f6db40d298cd03c40b357c518d270c101189ab390d8ef17b56d1299fcc531cfd304d2a5eedde26510745676c7492d SHA512 7f3e82732ba7cbcfd3f99a36ca3d3b998b437e9cc1d0961d81fcdc69e36b0c3e7049dd00d689734ce63ee8e504e6aa72d28505565c41f8350b2b74aa947d89d3
+EBUILD re2-0.2020.05.01.ebuild 1411 BLAKE2B 6d6a4909f6ce27caf58923aaa7902bfa523aba47a7a47fbcac89cbe63442cc8767f422ea9dbdd31cc9a0d117a714e2bf55cad249327758c9467caf7e2ccef197 SHA512 f7cab9684154ddf8430864de4236524f3ed117d91759df3e141fe12277241f91655012dfc394e001f209213918b57b26472f88aa30ac29b778f042e5529c924a
 MISC metadata.xml 471 BLAKE2B d5263d5aa06995cb4abacde849d1f7d970a7c365654fc25c4e4fd9c423f9a99f21e86f60abd8bb50bcba08aed799f510353e6baf23b42299c294b77f95d657fd SHA512 7534d637458ea189e20f259c9f039629f9b5fc738750d8d6e1050163aa147ec447d38ed93df98cedc71510be3fc5949c9084f63da86c12bdfd0c109122a001a8
diff --git a/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch b/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch
new file mode 100644
index 000000000000..3e62934153c1
--- /dev/null
+++ b/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch
@@ -0,0 +1,27 @@
+From bde1ea09550a61b4a092cdf0e3ba8dca4200947a Mon Sep 17 00:00:00 2001
+From: Paul Wankadia <junyer@google.com>
+Date: Sun, 10 May 2020 07:12:35 -0700
+Subject: [PATCH] Lower the memory budget in TestCompile.InsufficientMemory.
+
+Fixes #256.
+
+Change-Id: I975c5f6f7a12dc86fedc0f3ab35f16295c18a7e8
+Reviewed-on: https://code-review.googlesource.com/c/re2/+/56150
+Reviewed-by: Paul Wankadia <junyer@google.com>
+---
+ re2/testing/compile_test.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/re2/testing/compile_test.cc b/re2/testing/compile_test.cc
+index 4598aa64..2096e2f0 100644
+--- a/re2/testing/compile_test.cc
++++ b/re2/testing/compile_test.cc
+@@ -236,7 +236,7 @@ TEST(TestCompile, InsufficientMemory) {
+       "^(?P<name1>[^\\s]+)\\s+(?P<name2>[^\\s]+)\\s+(?P<name3>.+)$",
+       Regexp::LikePerl, NULL);
+   EXPECT_TRUE(re != NULL);
+-  Prog* prog = re->CompileToProg(920);
++  Prog* prog = re->CompileToProg(850);
+   // If the memory budget has been exhausted, compilation should fail
+   // and return NULL instead of trying to do anything with NoMatch().
+   EXPECT_TRUE(prog == NULL);
diff --git a/dev-libs/re2/re2-0.2020.05.01.ebuild b/dev-libs/re2/re2-0.2020.05.01.ebuild
index c0c9da9e15fc..b4218b133025 100644
--- a/dev-libs/re2/re2-0.2020.05.01.ebuild
+++ b/dev-libs/re2/re2-0.2020.05.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="7"
 SLOT="0/${SONAME}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="icu"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
@@ -31,6 +31,9 @@ DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
 HTML_DOCS=( doc/syntax.html )
 
 src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/0.2020.05.01-test-memory-budget.patch
+	)
 	default
 	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
 	if use icu; then
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index 9799f96a493f..cde1f03447a4 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1,8 +1,10 @@
 DIST roct-thunk-interface-3.0.0.tar.gz 2685769 BLAKE2B d8ecf26113357a2a400bc1f2d4b40e38f2bd1bd5ac2c77c189490df9bcc7864f8357c262ad62d6cbf0f62f41edd9e09f5b75ce1e66f3a589d143a3883942a12d SHA512 18756a626d57255cfdd03b38dbc56769e4e28dbe1b00cc1e3d99a39dcd943bafebedc1774c76a191cdaf83b2bce4ac464dc97cbd088894447afddcca50447e9f
 DIST roct-thunk-interface-3.1.0.tar.gz 2688973 BLAKE2B b372e12ba5795a0f1e85f7c904059fbe71e147051f287939aacb165c6ca3068e59694c891e3ebdec945e494df4134ca6e4595e7b00893479387d2326b9af5b13 SHA512 dd63d097a42c8751846a1c5649a9c35c0d5e5dc68b1e8080cb6e333f787851ebc649c36d952aefbefbf9558c914d55c612800e85620b24676d7d2d7454bb3490
 DIST roct-thunk-interface-3.3.0.tar.gz 2689906 BLAKE2B 0eee8be65b0be8136dc0091cbc5534b89d630b9ffc1af1d6bdbf98671e141f524b3789153da673ed27dc3810d73e6ea8afb2fed776aa8df83e3c613b3776f81c SHA512 6ee02e5a9ef04ff9f873f762a78dcab93e45a98793545a882839fc2c890ea13030038130b1de266422eea58681e9fffa119e54b8d2f980c3a09c92b692d5cf3e
+DIST roct-thunk-interface-3.5.0.tar.gz 2694261 BLAKE2B 57beccb18bfcea9f99704e21610d62e922feee772d912a8e3e4b0618e309a0fd0983bc62f7476511d1c94dc1f7fbb95d2a7da8205ba735833bcc0846dca13e3a SHA512 aeeb066924d0b20aadf1e2ea6f752d4de1e579fcf245b8866d2856a8d0ca12c907234d97e986512c7c6fa58460937aa5fb574485fbc7975baae4c2fcef519d6c
 EBUILD roct-thunk-interface-3.0.0.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224
 EBUILD roct-thunk-interface-3.1.0.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224
 EBUILD roct-thunk-interface-3.3.0.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224
-EBUILD roct-thunk-interface-9999.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224
+EBUILD roct-thunk-interface-3.5.0.ebuild 1097 BLAKE2B 7b5d1733e8464d3a242e59e517edbe17da86de3ea5815f4b8403b462ee999d6c42b7f37adf2eb7f5173d62f9f087659b39c2bdb0dc6728f770bd84138bf176e3 SHA512 5f7922ae5a9d86faaf621a8efa74108b33fffe5a73bc9b169ecc2016c2b5a948f583ddcfcf008c44e3ed1bff040dda395089ba1e68a87d27c14967b145fd8a4a
+EBUILD roct-thunk-interface-9999.ebuild 1097 BLAKE2B 7b5d1733e8464d3a242e59e517edbe17da86de3ea5815f4b8403b462ee999d6c42b7f37adf2eb7f5173d62f9f087659b39c2bdb0dc6728f770bd84138bf176e3 SHA512 5f7922ae5a9d86faaf621a8efa74108b33fffe5a73bc9b169ecc2016c2b5a948f583ddcfcf008c44e3ed1bff040dda395089ba1e68a87d27c14967b145fd8a4a
 MISC metadata.xml 742 BLAKE2B e4bf5b17c7add51f1fce354e5b68d874808e680e3dce8e514da738a0fdfb8a26076f76cfc5c8091bd11f7ef4576e2d45334590f20f899865b8c984406892b1a0 SHA512 7d0b104b201778561f5e0566c28f593abd8a9c05ea1154a7d58bebb135f15e86cf6dd7f98f9fd5059b054ffac1d64a86404743f7c9bb1a619431f5e911a233cf
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.5.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.5.0.ebuild
new file mode 100644
index 000000000000..973e79e665c8
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
+CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl
+	sys-apps/pciutils"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	cmake_src_prepare
+}
+src_configure() {
+	local mycmakeargs=(
+		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
+	)
+	cmake_src_configure
+}
+src_compile() {
+	cmake_src_compile build-dev
+}
+src_install() {
+	cmake_src_install install-dev
+}
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
index 9ec113c78ebe..973e79e665c8 100644
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
@@ -9,8 +9,8 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCT-Thunk-Interface-rocm-${PV}"
 	KEYWORDS="~amd64"
 fi
 
diff --git a/dev-libs/sdformat/Manifest b/dev-libs/sdformat/Manifest
index 8196494dde5c..adc8c3b3000c 100644
--- a/dev-libs/sdformat/Manifest
+++ b/dev-libs/sdformat/Manifest
@@ -1,7 +1,5 @@
-DIST sdformat-6.0.0.tar.bz2 473765 BLAKE2B af3ed14323c2bed8ee5a22580dcb6d73a5e5c772f39ad7f806bf2cdb88d6f2c885585f36a666f2ec711dbd7ad6051ba69d79d2a9f0af7ad3b3681543b9feafe7 SHA512 2188de97cb1eb1117a694d54a0a42112bd7e5b5a4b00c04e049de73a10947904940565e36df93ca08ea5910e628983e234d07c57694c463e0794c48e20cedb21
-DIST sdformat-6.1.0.tar.bz2 465231 BLAKE2B 5b12c4974662245ecb01e342632e274b58512dd2c223dfbf8e1ef9bb2ba267f16bc130b62367b09a9cac9e2ccbd2829439d055f2fa062f34df9f4a6ceb1a571e SHA512 6c5a03e877cba3b734f1cb132582274249bd0cb3a8d463be9077519d8ad126bb15650947b5455b3cdd1abea727918b21369b40a12de4fc5d6806880fd8686b97
 DIST sdformat-6.2.0.tar.bz2 466373 BLAKE2B 67bbe429cbd9871493c29379563f0704b8a050eb8e80645d92a6dea47321e0853bfd4b8442893792a47d743d7b701add21b45fcb7dfd21b2747d43f3f4d19f68 SHA512 e81f0f73e628155ef929c6d7930611f02009a8a217a043e127506c1310ae892b846a8080906feb0932108e9cfa280f473573a5af5096b55b66619b2ac794b0d5
-EBUILD sdformat-6.0.0.ebuild 944 BLAKE2B 1f9dd5d2c061f0964e8e3314d0cc68e09c5cee6861418eac1578f002ec016119000e5e2b7b516da129b7ee57c3399de75adc7355651ff5954a80f1a28c776226 SHA512 0d3563149ef99bb6805f02c71365378ffd7ea630251d52d8e7b818070ecc87c581d3a792b347c345955845e07e7ebfda08c79fe26ad23251bdb925e26e252e83
-EBUILD sdformat-6.1.0.ebuild 941 BLAKE2B 0fe4f1798fb5dd32f9b156ae629d37a30581018f31699e33144098e76152ba05d61fe8e01d604b2f1f183fd65dca5d3a62147a97a4af667b33187b03d00d368a SHA512 a5d7d31c0d4dd7d05d08737382b8b96e22d875ce28462a06300fc6db8063617b2c65fc8645b5f94053bb37a917f03057ecdcf621cba3303bb519d0f3d4339a77
+DIST sdformat-9.2.0.tar.bz2 644484 BLAKE2B 2f6382414bd7d47bfafb66c8352e5a90cd236bdfcfc7c3119eab154b8d0bb5fddf2127b16e222bb90326dbf91f95b111643eede17ebe38f27bb164cf31d7f263 SHA512 bc9422207f56d7fd5f53249f856be5fe00f078e168d7e93ab10f5544e4963888cb7c0a1b1f449739e2490b0d5aad3c5a72d8408333dd6ae550b5d66f6bcde42a
 EBUILD sdformat-6.2.0.ebuild 941 BLAKE2B 859761977cd44f2fdceeccc87026550ac66f114bb56116420cdd44f15c0b93dc90e34ca8bc7de95bb621d20bd6fb7eac5839ea7265f3be7d0bd598d9241aaf3c SHA512 7741cb4fb2b74ad2da944d03d71dfee65ecc5e677cd6f52827abbde8d2e628546d5fe35e3b0542f225eda5b448bdf0b13507c90c433f087772038ed869280031
+EBUILD sdformat-9.2.0.ebuild 952 BLAKE2B 6f46f1735ee83f84243dfd9332cd394726bea3013373c59511838e83f4125bb488eb27046ee367daea372be35c1e25d30dffbd4a3d0dfe61979290c99fdf48b6 SHA512 1f7e0a34746133bc8faaa549d462b4f2d1027a3fc89773183a9beed1f39c67211e6f6c503408e3b9fea343a364730ad01f47afa8a01547b48badb8ed402800f0
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/dev-libs/sdformat/sdformat-6.0.0.ebuild b/dev-libs/sdformat/sdformat-6.0.0.ebuild
deleted file mode 100644
index 559a61abd081..000000000000
--- a/dev-libs/sdformat/sdformat-6.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Simulation Description Format (SDF) parser"
-HOMEPAGE="http://sdformat.org/"
-SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# subslot = libsdformat major
-SLOT="0/6"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/urdfdom-1:=
-	dev-libs/tinyxml
-	dev-libs/boost:=
-	sci-libs/ignition-math:4=
-"
-DEPEND="${RDEPEND}
-	dev-lang/ruby:*
-	virtual/pkgconfig
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_configure() {
-	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
-	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
-	local mycmakeargs=(
-		"-DUSE_INTERNAL_URDF=OFF"
-		"-DUSE_EXTERNAL_TINYXML=ON"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/sdformat/sdformat-6.1.0.ebuild b/dev-libs/sdformat/sdformat-9.2.0.ebuild
index bc8209246277..2e44e5b271f2 100644
--- a/dev-libs/sdformat/sdformat-6.1.0.ebuild
+++ b/dev-libs/sdformat/sdformat-9.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit cmake-utils
 
@@ -11,7 +11,7 @@ SRC_URI="http://osrf-distributions.s3.amazonaws.com/sdformat/releases/${P}.tar.b
 
 LICENSE="Apache-2.0"
 # subslot = libsdformat major
-SLOT="0/6"
+SLOT="0/9"
 KEYWORDS="~amd64"
 IUSE=""
 
@@ -19,9 +19,10 @@ RDEPEND="
 	>=dev-libs/urdfdom-1:=
 	dev-libs/tinyxml
 	dev-libs/boost:=
-	sci-libs/ignition-math:4=
+	sci-libs/ignition-math:6=
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-lang/ruby:*
 	virtual/pkgconfig
 "
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index 79e2dca08536..6ed1b1ea8999 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -12,4 +12,4 @@ EBUILD skalibs-2.6.4.0.ebuild 1102 BLAKE2B 2d4988f73abf3a62aba25acf172225fb040f0
 EBUILD skalibs-2.7.0.0.ebuild 962 BLAKE2B 9021ed99abba3ade6a91c7114f82dbbbd67d74e0fe6a25d161899e15c8a3633bb51221dd8a23ee3c71047d006333f8cc2322a01a91ed0bb8ca5525cc0d71bbdf SHA512 99aba2aea0c3160111ad3e405df848f77862a13caa96c654ddfc8a803190ffc8662e064f7a64096a0d3dd41a78f049e9a55265f5e98dcd55043aa6c958e18710
 EBUILD skalibs-2.8.1.0.ebuild 882 BLAKE2B f3740ba8bc67c046903273f9afb3694f8333df95da37fe23a1a52143a0b1b7ebd803d7f42c0adda6ed6271c5782fa4da54e17eb1647df86818c1712a43ff4938 SHA512 4d7e3cf600955a6e34b9c540c24d54ef6de8094cf6ec2082064f1802e7f2adb3d29dbff2cf67674ac743c526b0cdb614053f42c6e49f35f21c00b676a2678f05
 EBUILD skalibs-2.9.1.0.ebuild 860 BLAKE2B 65d7eefa6cadf7f8681efe4a6fc40f3644bae136b839a3f8817e38a576aaae1a22404c0b95a0139bb4bab3ae84756cd888099a17f9fc6c3ffd769acc3af09dfc SHA512 1e5af656751aff2ecb1dd09a81b5208959f0ae80511ff30eb2984680bd337b45a9bd1d16a4e4d949dd4182f6b6ce5aa790525658b5ed773db592f61d805c345e
-MISC metadata.xml 475 BLAKE2B 14654721ef2c40091ee85f1789ac8601d271a2411f5feb4ec4c0cc99cc26e4e2e3e91cd96372320f717d43ad6d02aeb0a393ca9ea77d3c1f37a528f312fb1f9b SHA512 72c5fe49b31579d39247e67b0d1004263462e9d2240d180dd10b1dd9dc139daa3c148b15a8490ec9d2c5865acd67270729354a1dbdd4b8919fa72a6ce72ac521
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-libs/skalibs/metadata.xml b/dev-libs/skalibs/metadata.xml
index d591c754323a..c36c37139fad 100644
--- a/dev-libs/skalibs/metadata.xml
+++ b/dev-libs/skalibs/metadata.xml
@@ -5,12 +5,4 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>samuel@sholland.org</email>
-		<name>Samuel Holland</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 973c8b2bed22..a76b2d6f87f6 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,4 +1,4 @@
 DIST spdlog-1.5.0.tar.gz 270416 BLAKE2B bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28 SHA512 78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34
-EBUILD spdlog-1.5.0.ebuild 941 BLAKE2B f70b860f6c8f28b203bb96c7bf9ec0e067feeb0629447ab580b7a17a2635bb855a66b12a71b42b39a4f495331baaa51c0932f721d7c088a6d7b6d875eb23be0f SHA512 437af08057c0023a43473cf1d046d92dc0e8335cf387e8dad7b58d77ccf068fb57a89747e28de348f4c21d5623bc2b002438d8addd1b94e3a4a20e80a6d85444
+EBUILD spdlog-1.5.0.ebuild 939 BLAKE2B 62f0ac8f25a8bd2bf3023c4fe9c463e0e13a1919a88ad8b7ad9824e92083213ed1f4b52802d72abb90a989fc52b89554687dbb593597ad86e57c27c3139ef153 SHA512 ae411712d31da70eb2456cf5e3bfeffcef676ca270e22636499c4bba8b2bc9299b376c4c691c6323577f3b3ea544e8ca0f349cd1c4fdd969052191114c836889
 EBUILD spdlog-9999.ebuild 913 BLAKE2B 1f0b536a67333e5d86ad9434c66323f5571e150b232c862a0768b32aa1da731ca58931cb1d548e86c3c52ac11feda5cbe4bec3a93b6850a4acf0b7a2694dad9d SHA512 3c8870bc75eec1f8e9378cea9ea6f8fbef529d50a5a84e1c52a82312b5d92af97f51d6fce683aba4fffd54620a387483e50e473b2368cad69431427ac556334b
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.5.0.ebuild b/dev-libs/spdlog/spdlog-1.5.0.ebuild
index ad9da48dcf3a..a74feac620cf 100644
--- a/dev-libs/spdlog/spdlog-1.5.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.5.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gabime/${PN}"
 else
 	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index a43aa10bfd1f..4fdae32f4c21 100644
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -2,5 +2,6 @@ AUX stfl-0.21-python.patch 1936 BLAKE2B fc0a8f02eaa30b900652304e34f383a6587769f4
 AUX stfl-0.22-ruby-sharedlib.patch 735 BLAKE2B 6b2b9e835f57f62ff1e1ff871103bc0b1106329916fc1be75eb22e550c9ff8abd007bbc201c66e15ce16a4697c0bbe0850b56ff41f666dd7006028432b1f77e5 SHA512 73a1b7aa7147100ab2f06264303c0a30463deb8bd0ce9e4111737393d07c4fb06174c5022c1dae8c7fd2688d1b544a4ab8c8ee5495f46e2bbc33ce89a7e46de7
 AUX stfl-0.22-soname-symlink.patch 444 BLAKE2B 9aa44343a18a8d7fb2f75a60ae94c30ef92b6f02190cefbefedacd9f8d5c877ac71b83c41b008bfd46a4d5ffe04f91f03f898e27ef098162d0b43f274ccff298 SHA512 e85c6f96edd8cd08d3408f976fff5f9fbcdc9892109233e78d932eb07502b00d3a0b52393542de8af5b2d26808b3574736f78b7ef9c7bdd0abffa3901fc55dab
 DIST stfl-0.24.tar.gz 45585 BLAKE2B a601f373f19baa3a11fb823852ada19ab824828935240280c74ff442a1e5c4abdf0abe56e445869e43785df3940a8c7269bc16457436abbe5e2853f907071059 SHA512 95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0
+EBUILD stfl-0.24-r2.ebuild 3046 BLAKE2B 2b7bacdfb00882676a843164fbc6056d9def35ed5038eb41126d38027b5ef486c66eec92bade8b80dddbd736ead4574c2ea996fb9fa1d190b95bef8725d0e2fe SHA512 ff46e93c7d3dcd83f9667a8959437fa419bcc55383e37b0d37aecc5832fe8e13e3b0dc11d74582c9ff7c98a1496bbc472df2dc4361f3bdbe1cc48ddfffccf307
 EBUILD stfl-0.24.ebuild 2936 BLAKE2B fbdb5050f522b948cabd864be4aa4ac404b6139ac546d4a2e35a37c77f0ca955b4030528d2bd12c217569bf3d95664c1f88f5d484a62e0e351b3869906bc0201 SHA512 3751c26c9b9341b53b2120540bea6b66434b37e55cb4b26f3c833e580a060f77590ae1fae7b187eb382b65a7208fecf00d016f1ff0f2afdf6482b760046b4b9d
 MISC metadata.xml 883 BLAKE2B 57005ad40d9e2a363fd5487e77c77917c85b45c9b0ade87de3cdef7aa59af6ba674cd586b736bd46b0763d1bb60f2b14b0470551bf422df030b4ee285dd8e14b SHA512 e0aaa92e248cd4670280040affa1afca918e41c5db47b77edde1f438e20d4ef3a440ab79c8d1c610e7445fc5f99feca02a7fa055cf201cc50e7b581b0c897b0d
diff --git a/dev-libs/stfl/stfl-0.24-r2.ebuild b/dev-libs/stfl/stfl-0.24-r2.ebuild
new file mode 100644
index 000000000000..97e5592ed6e7
--- /dev/null
+++ b/dev-libs/stfl/stfl-0.24-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..8} )
+GENTOO_DEPEND_ON_PERL=no
+inherit eutils multilib perl-module python-r1 toolchain-funcs
+
+DESCRIPTION="A library which implements a curses-based widget set for text terminals"
+HOMEPAGE="http://www.clifford.at/stfl/"
+SRC_URI="http://www.clifford.at/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="examples perl python ruby static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	sys-libs/ncurses:0=[unicode]
+	perl? ( dev-lang/perl:= )
+	ruby? ( dev-lang/ruby:* )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	perl? ( dev-lang/swig )
+	python? ( >=dev-lang/swig-1.3.40 )
+	ruby? ( dev-lang/swig )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.21-python.patch"
+	"${FILESDIR}/${PN}-0.22-soname-symlink.patch"
+	"${FILESDIR}/${PN}-0.22-ruby-sharedlib.patch"
+)
+
+src_prepare() {
+	default_src_prepare
+	sed -i \
+		-e 's/-Os -ggdb//' \
+		-e 's/^\(all:.*\) example/\1/' \
+		-e 's/$(CC) -shared/$(CC) $(LDFLAGS) -shared/' \
+		-e 's/ -o $@ $(LDLIBS) $^/ $^ $(LDLIBS) -o $@/' \
+		-e 's/-lncursesw/-lncursesw -pthread/' \
+		-e 's/\<ar\>/$(AR)/' \
+		-e 's/\<ranlib\>/$(RANLIB)/' \
+		Makefile || die "sed failed"
+
+	if ! use static-libs ; then
+		sed -i -e "/install .* libstfl.a/d" Makefile || die
+	fi
+
+	if use perl ; then
+		echo "FOUND_PERL5=1" >> Makefile.cfg
+	else
+		echo "FOUND_PERL5=0" >> Makefile.cfg
+	fi
+
+	if use ruby ; then
+		echo "FOUND_RUBY=1" >> Makefile.cfg
+	else
+		echo "FOUND_RUBY=0" >> Makefile.cfg
+	fi
+
+	echo "FOUND_PYTHON=0" >> Makefile.cfg
+}
+
+src_configure() { :; }
+
+src_compile() {
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+
+	if use python ; then
+		local BUILD_DIR="${S}/python"
+		python_copy_sources
+
+		# Based on code from python/Makefile.snippet.
+		building() {
+			pushd "${BUILD_DIR}" &>/dev/null || die
+			echo swig -python -threads stfl.i
+			swig -python -threads stfl.i || die
+			echo "$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -shared -pthread -fPIC stfl_wrap.c -I$(python_get_includedir) -I.. ../libstfl.so.${PV} -lncursesw -o _stfl.so
+			"$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -shared -pthread -fPIC stfl_wrap.c -I$(python_get_includedir) -I.. ../libstfl.so.${PV} -lncursesw -o _stfl.so || die
+			popd &>/dev/null || die
+		}
+		python_foreach_impl building
+	fi
+}
+
+src_install() {
+	emake prefix="/usr" DESTDIR="${D}" libdir="$(get_libdir)" install
+
+	if use python ; then
+		local BUILD_DIR="${S}/python"
+
+		installation() {
+			pushd "${BUILD_DIR}" &>/dev/null || die
+			python_domodule stfl.py _stfl.so
+			popd &>/dev/null || die
+		}
+		python_foreach_impl installation
+	fi
+
+	dodoc README
+
+	local exdir="/usr/share/doc/${PF}/examples"
+	if use examples ; then
+		insinto ${exdir}
+		doins example.{c,stfl}
+		insinto ${exdir}/python
+		doins python/example.py
+		if use perl ; then
+			insinto ${exdir}/perl
+			doins perl5/example.pl
+		fi
+		if use ruby ; then
+			insinto ${exdir}/ruby
+			doins ruby/example.rb
+		fi
+	fi
+
+	perl_delete_localpod
+}
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index 1240deb0e081..1d60a248bdd1 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,3 +1,5 @@
 DIST tinyxml2-7.1.0.tar.gz 592717 BLAKE2B 5936356d472b8642bebb9f02579e6beda14446d57749f1e7a869ff941a03a5ad30624c4db4b2eaaaca48d7f339e3100fddfd58f96bbcfc22737a23d9c9198c9a SHA512 09d5f37018f79a593ff35e33d4296c9ec643a22e83c0cee4c37949300f86201eee07e9b7e6ba55044d8abb438d5d21b70d5843a96ae4652389bb164047ec31e1
+DIST tinyxml2-8.0.0.tar.gz 593833 BLAKE2B afc21220e28a1c139b1abd89e67f8e64980d2ba9bc6f60a33d435a4a02cb40ecacc27ac28bd9702ac3a435f66764ebb752b597a1b1e178d0b549e366d5b669dd SHA512 bcbb065c2af34ea681ec556377fd22e720b6f5d4caa73f432b1e34e08603a96f2233763f0ec5ae86b9ee71ddbe3062f58d3794cd3a162ce6903435530de0bba6
 EBUILD tinyxml2-7.1.0.ebuild 606 BLAKE2B 7980b36673f2a60aad432f55140272d670894ad51c50256d14559a6f54f6224cd6df4a7bf668c64a2d26fa8a9f141cbd6dee2b4eea81390b694a34fe5163f664 SHA512 8352ffc9ce6d44da1703252801c86b03dfbe93952c601932892d25759bc28f36ce29e24abe2391d8cff778a09cd7690a1774903ec8b72ad9833b71357f460cb8
+EBUILD tinyxml2-8.0.0.ebuild 612 BLAKE2B 5c0539f1e15338342806cde79e5e7e3a94cfd58d47f16c7c2f81ccc6dfe2e49efe64e00157a72b1b533ee0814bf5a3d3cd4677f845a148cc69acb3812fca1158 SHA512 3621df8001f4c76bde1662657b3c0f078a5fbeba02ca5bbedbd7c87e86d044a73b65bc31ff67af12e5657a686725a35f16cb55ed9923b97f9d077637b707c85c
 MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild
new file mode 100644
index 000000000000..7dd8bbfaa182
--- /dev/null
+++ b/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="A simple, small, efficient, C++ XML parser"
+HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
+SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/8"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
+	cmake_src_configure
+}
diff --git a/dev-libs/tomsfastmath/Manifest b/dev-libs/tomsfastmath/Manifest
new file mode 100644
index 000000000000..3ac6240066ad
--- /dev/null
+++ b/dev-libs/tomsfastmath/Manifest
@@ -0,0 +1,4 @@
+AUX tomsfastmath-0.13.1-makefile-fix.patch 1703 BLAKE2B 2182f88b8569fac105eb179fdc7c10a7c9b7b17619a725c30d8374a2589f048e0ca0fe71ffb2431e058a264b104bc091deb800215a490399e722055b39adee0e SHA512 f5e5df821ecc7beb8684116294322dae8bf166bfbc7cf3d5262534e036f1d486854e58ad2c2da382b8f08aa6b9db71d91607289587c4247837bdfc3313ad5cff
+DIST tfm-0.13.1.tar.xz 322684 BLAKE2B 393c0e0e018b199c9fc975ab3013466399ea337f520f4634649a9e61b2218b9a6b218d11212b535fc8bbd2bf40d8722fc413dc60756f1b8ff7c78da049765083 SHA512 84225fe81bbcd1df7e40ed0b8c8077d60612246a76f3149b672dfd1066eb0179262fa4f5a42ffd2034e60cb74cfd86e0b49139371971ebbb4f41a4ecebca2111
+EBUILD tomsfastmath-0.13.1.ebuild 1608 BLAKE2B a521fe64f738dabd670f9bfd18b8b11812de11d1eee3a4779112fb3289d11716bd38da89faff726e512539a8bf1da55b577e9134c8a425d8023f1a40d2033a81 SHA512 c413b76ce2498416d5d74696243adaac05938c09cf571d701bd16b9117c85da49774dd953831df5def71b4fe6e27680521ad6dee84b0863db56d893b8ead410a
+MISC metadata.xml 481 BLAKE2B a61b20b9947cf71dcc385a04643a32c161c3314a65210f3d18d0743611890a066b9f9e7ddebb02c9ba39e6c6e82058dd78c796903357c432813f4e4323c06038 SHA512 1235eb2954bd7b7ea6e0ce326e50003255a49f558c7e2c08f40f2f7db71532643f1abd3ef28aaf3fa0c2f3e32d57ae07af7f9d49338bbe35bf9d690a023c5655
diff --git a/dev-libs/tomsfastmath/files/tomsfastmath-0.13.1-makefile-fix.patch b/dev-libs/tomsfastmath/files/tomsfastmath-0.13.1-makefile-fix.patch
new file mode 100644
index 000000000000..7239178e5dde
--- /dev/null
+++ b/dev-libs/tomsfastmath/files/tomsfastmath-0.13.1-makefile-fix.patch
@@ -0,0 +1,45 @@
+diff --git a/makefile.shared b/makefile.shared
+index 47c35d9..cebaa04 100644
+--- a/makefile.shared
++++ b/makefile.shared
+@@ -1,7 +1,8 @@
+ #makefile for TomsFastMath
+ #
+ #
+-VERSION=1:0:0
++VERSION=0.13.1
++VERSION_LIB=1:0:0
+ 
+ LT  ?= libtool
+ LTCOMPILE = $(LT) --mode=compile --tag=CC $(CC)
+@@ -89,13 +90,16 @@ $(OBJECTS): $(HEADERS)
+ 	$(LTCOMPILE) $(CFLAGS) $(LDFLAGS) -o $@ -c $<
+ 
+ $(LIBNAME): $(OBJECTS)
+-	libtool --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) `find . -type f | LC_ALL=C sort | grep "[.]lo" | xargs` -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION) -export-symbols libtfm.symbols
++	libtool --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) `find . -type f | LC_ALL=C sort | grep "[.]lo" | xargs` -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION_LIB) -export-symbols libtfm.symbols
+ 
+ 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_PUB) $(DESTDIR)$(INCPATH)
++	sed -e 's,^Version:.*,Version: $(VERSION),' tomsfastmath.pc.in > tomsfastmath.pc
++	install -d $(DESTDIR)$(LIBPATH)/pkgconfig
++	install -m 644 tomsfastmath.pc $(DESTDIR)$(LIBPATH)/pkgconfig/
+ 
+ HEADER_FILES=$(notdir $(HEADERS_PUB))
+ uninstall:
+diff --git a/tomsfastmath.pc.in b/tomsfastmath.pc.in
+new file mode 100644
+index 0000000..a0275ab
+--- /dev/null
++++ b/tomsfastmath.pc.in
+@@ -0,0 +1,7 @@
++# TomsFastMath, a fast ISO C bignum library. -- Tom St Denis
++# SPDX-License-Identifier: Unlicense
++
++Name: TomFastMath
++Description: Fast multiple-precision integer library
++Version: @VERSION@
++Libs: -ltfm
diff --git a/dev-libs/tomsfastmath/metadata.xml b/dev-libs/tomsfastmath/metadata.xml
new file mode 100644
index 000000000000..dfaf4142e2c6
--- /dev/null
+++ b/dev-libs/tomsfastmath/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>sam@cmpct.info</email>
+    <name>Sam James</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
new file mode 100644
index 000000000000..f76f0fec6aad
--- /dev/null
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Fast public domain large integer arithmetic library"
+HOMEPAGE="https://www.libtom.net/TomsFastMath/
+	https://github.com/libtom/tomsfastmath"
+SRC_URI="https://github.com/libtom/tomsfastmath/releases/download/v${PV}/tfm-${PV}.tar.xz"
+LICENSE="Unlicense"
+
+# Current SONAME is 1
+# Please bump when the ABI changes upstream
+# Helpful site:
+# https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath
+SLOT="0/1"
+
+KEYWORDS="~amd64 ~arm64 ~sparc"
+
+PATCHES=(
+	"${FILESDIR}/${P}-makefile-fix.patch"
+)
+
+_emake() {
+	# Standard boilerplate
+	# Upstream use homebrewed makefiles
+	# Best to use same args for all, for consistency,
+	# in case behaviour changes (v possible).
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		DESTDIR="${ED}" \
+		LIBPATH="/usr/$(get_libdir)" \
+		IGNORE_SPEED=1 \
+		"$@"
+}
+
+src_compile() {
+	_emake -f makefile.shared
+}
+
+src_test() {
+	_emake test_standalone stest rsatest
+
+	# We choose to be verbose during the test process
+	# because the output is quite repetitive with no
+	# clear demarcation b/t tests
+	local tests=( "test" "stest" "rsatest" )
+
+	local test
+	for test in "${tests[@]}"; do
+		einfo "Running test (${test})"
+		./${test} || die "Test (${test}) failed"
+		einfo "Completed test (${test})"
+	done
+}
+
+src_install() {
+	_emake -f makefile.shared install
+
+	# Remove unnecessary .la files
+	find "${ED}" -name '*.la' -delete || die
+	# Same for static libs
+	find "${ED}" -name "*.a" -delete || die
+}
diff --git a/dev-libs/zlog/Manifest b/dev-libs/zlog/Manifest
index 3ef46b02d4eb..5863c2ed388c 100644
--- a/dev-libs/zlog/Manifest
+++ b/dev-libs/zlog/Manifest
@@ -1,6 +1,3 @@
-AUX zlog-testsuite-flags.patch 599 BLAKE2B d94678371fb64eaf64d48c0d6980cde20bc9ccd3f0865a02c8f0374af553ff8db25601c5bd548e8f83bea1be80f8da2444669be621a4546710643c9d70e326ad SHA512 003c62b10274102dcec16c4064ff8cd93767bd34ac8c56e71cc07dec7d24a07e380341324f6d19141f43e6d8bffc3f4678a7b7ac493341e83bc237ab069ff164
-AUX zlog_no_werr.patch 497 BLAKE2B 506c3709043fa5d64475011dac251598d3d153bfdeb61947badc2d0937bbf62342370df3afba8e86a536ceb395376b311c7f5ea4f625ad24c2ef5b5c510492cd SHA512 5f5d343824a4d8ba02ce7e588b5e6a7aaf5465c1e76d1b26aa4f412d34d5a61d33a307d4d0521220267eaf883cb90ac382fb849fe406375f04c2a1ae9050c77f
-DIST zlog-v1.2.12.tar.gz 120048 BLAKE2B e9f48d8ee3e0bfc14674e96426f9343c27e0f666541b017a438800a6707bb158ca79f564e6cb10d953e4bff6dc839d76a3d3fc0f54c128bfb4b00e5fc86dbecf SHA512 4e1d773f33f9202702bb5e80f4dcc6f8ab28480a8515ad8b9562ee68703c065c2f18113124535c7163e240013ad121a6ce311a0fc04ac6c32971509ec33615ec
-EBUILD zlog-1.2.12-r1.ebuild 719 BLAKE2B da0b3b6266786d15f0fef4a873a9391659df3a17707dac82549e9b8014154f03e5c8dc6b3ef1df8de11bff39bba1a527b4b1aa18d74f44c4ba9507127021eb82 SHA512 0be10099b28d0766e66d4ccc368d92d0fa76668b57ddcbe0e6f033e6dde53790c13f12b7a4468e1b6dfbcf64c25b091e3e99b6bb6fca25c7d0f2380a0bf6c95b
-EBUILD zlog-1.2.12.ebuild 625 BLAKE2B 7fdb101df894a485214f5efbdba5d7ed9055bb68872f26aace9a130934b9b4b0c957c0ff91d2cac780b159d61442c73e699132e7df7dea1cb56f21867083adfb SHA512 b04f73ec3974de6f045397c3b79f900cb68bd08b40da2c06e1556cd882d1ae514f966b3672dc60855da09feda1e4ca732ec7598817afdea93797541635b02913
+DIST zlog-v1.2.14.tar.gz 123729 BLAKE2B 6985898af81ecb3b86c941dea1402dc03c80a773b2791d56228b4627f6e6ea62f27442536e5126169b5f3f77425cba49bd3b50dc0d7ffc5ac3d88f5001afc3e2 SHA512 e16524e8caa8a3c79ce95074387b87a0025e0fd9a7e35a09ddf49a41839e36a3fe42f5ad785ec786573b6c4c633f493845c7d5cbf0b03717affe4659ea1d53ef
+EBUILD zlog-1.2.14.ebuild 630 BLAKE2B 9214e1bec48b302cfe4129f31102e903bc6a4da626d2877df0946593d7c02dc1d403b730d28bd1189f875138e036ce11b56834bf0aa153c22ed4cc047590fa86 SHA512 e59cb6eb13a0939e634f2146084b8b169800f412b44cc5baba7e50a5fc8bd6be139ac1de14fbf9adf5363aaf2ee6c030f6df87c17a5ee781711416f1d6d07d13
 MISC metadata.xml 343 BLAKE2B cacb9dd07a85e4fa26b7fa703ea340117be968590c91b6e243d34642a38e6af506cc9d6d39c48250ffd288fa8dce7296cd02d37b7d5620af4d8d1edc74806af9 SHA512 1332dbac3769edb28e8c4241821fe5977619ae93b7fe29c58759ed4305b1a28cd51dd4a4d74b4d7db086bf6383e2f771b0e79804434ccd5ff6353e0d1b8d0f61
diff --git a/dev-libs/zlog/files/zlog-testsuite-flags.patch b/dev-libs/zlog/files/zlog-testsuite-flags.patch
deleted file mode 100644
index 4ce0a4b6d16c..000000000000
--- a/dev-libs/zlog/files/zlog-testsuite-flags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- zlog-1.2.12.orig/test/makefile	2013-09-25 04:38:42.000000000 -0700
-+++ zlog-1.2.12/test/makefile	2018-02-13 16:59:33.812131188 -0800
-@@ -1,3 +1,6 @@
-+CFLAGS := -O2 -g
-+CC := gcc
-+
- exe = 		\
- 	test_tmp	\
- 	test_buf	\
-@@ -24,10 +27,10 @@
- all     :       $(exe)
- 
- $(exe)  :       %:%.o
--	gcc -O2 -g -o $@ $^ -L../src -lzlog -lpthread -Wl,-rpath ../src
-+	$(CC) $(CFLAGS) -o $@ $^ -L../src -lzlog -lpthread -Wl,-rpath ../src
- 
- .c.o	:
--	gcc -O2 -g -Wall -D_GNU_SOURCE -o $@ -c $< -I. -I../src
-+	$(CC) $(CLFAGS) -Wall -D_GNU_SOURCE -o $@ -c $< -I. -I../src
- 
- clean	:
- 	rm -f press.log* *.o $(exe)
diff --git a/dev-libs/zlog/files/zlog_no_werr.patch b/dev-libs/zlog/files/zlog_no_werr.patch
deleted file mode 100644
index b01325db09d0..000000000000
--- a/dev-libs/zlog/files/zlog_no_werr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/makefile	2016-08-11 10:40:49.466873499 +0200
-+++ b/src/makefile	2016-08-11 10:40:59.626762850 +0200
-@@ -32,7 +32,7 @@
- # Fallback to gcc when $CC is not in $PATH.
- CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
- OPTIMIZATION?=-O2
--WARNINGS=-Wall -Werror -Wstrict-prototypes -fwrapv
-+WARNINGS=-Wall -Wstrict-prototypes -fwrapv
- DEBUG?= -g -ggdb
- REAL_CFLAGS=$(OPTIMIZATION) -fPIC -pthread $(CFLAGS) $(WARNINGS) $(DEBUG)
- REAL_LDFLAGS=$(LDFLAGS) -pthread
diff --git a/dev-libs/zlog/zlog-1.2.12.ebuild b/dev-libs/zlog/zlog-1.2.12.ebuild
deleted file mode 100644
index 6e6621253781..000000000000
--- a/dev-libs/zlog/zlog-1.2.12.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="A reliable, thread safe, clear-model, pure C logging library."
-HOMEPAGE="http://hardysimpson.github.io/zlog/"
-SRC_URI="https://github.com/HardySimpson/${PN}/archive/${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default_src_prepare
-	epatch "${FILESDIR}/zlog_no_werr.patch"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install
-}
diff --git a/dev-libs/zlog/zlog-1.2.12-r1.ebuild b/dev-libs/zlog/zlog-1.2.14.ebuild
index 2dcde049b63d..66b2ba8509c2 100644
--- a/dev-libs/zlog/zlog-1.2.12-r1.ebuild
+++ b/dev-libs/zlog/zlog-1.2.14.ebuild
@@ -15,11 +15,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-PATCHES=(
-	"${FILESDIR}/zlog_no_werr.patch"
-	"${FILESDIR}/zlog-testsuite-flags.patch"
-)
-
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
commit	f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree	8bfecb640b7b6403d7a3d662d923eed630033da7 /dev-libs
parent	1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)