gentoo resync : 23.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
commit: 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree: 230f3135ceaace633cf93e9838b185c4a6664c2e /dev-libs
parent: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)
136 files changed, 1187 insertions, 1966 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 61ac1b832776..6590334670af 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index d9452fc08802..ca3c8babdcde 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -2,5 +2,5 @@ AUX 0.7.16-fix-tests-run-in-2020.patch 1506 BLAKE2B 344cd06a1070f7d36fa6653d9a20
 DIST appstream-glib-0.7.16.tar.xz 2243684 BLAKE2B 101a964822cc2421608e04a342b89248d16fff006c1843433f5db11703533fb7d0b2cb390d1e2f85274c51d0bd989502fc453700dfb9c32005a7b7c64cb59348 SHA512 a2991dbd26deeb1fb1daef1811c38ff5b55b2fae0bf2d8cc612c2e370613cb6b0468cf287ab3b575f6e6e3203aabcca12dd95474f70a54d6052a34dcb27b951b
 DIST appstream-glib-0.7.17.tar.xz 2245372 BLAKE2B 88173b209b275962ecd4b0a5d3cc344b317dec39a57cb6ebcdbc1c4447017b69c8e68ae19e336b1780477120269deda28b7e53d935a057fac193f123d91013d0 SHA512 72eae6057a4b18b6eca34c795c2bfd982fd7a31500b70beb9553bdf8a7617a03319a2813eb93af20f2e39678ef6ee524dee48b2cbcccde0736f9d10a547ca223
 EBUILD appstream-glib-0.7.16.ebuild 1701 BLAKE2B 7fea4d96b083a99439e2fe5e98e6f76d80ec4a9dd2233c82d12344119388364725c614dc89451e1d763162498db82226badf603c88529bddc52ea62a4cd6417f SHA512 ccfff59f9b7f034d63eda0ee1ed099b5073f6aac2a11d0d3485b38bcadf55cba34e025d72151817c4d88ebbc7cba06dc88f66ee7e924b4705dd35577bcf20d95
-EBUILD appstream-glib-0.7.17.ebuild 1641 BLAKE2B 1451d124e24eebd85d0fd844022faec3813b56c4ac5cf70a643902e5bb2740ac840a81cee59012175f00b1dce1341858c7c15044062f5215633d44be65595306 SHA512 01c1fcdafb448458caf691c15ada24b4e3a9516e67a499477a1f80a39ac911b7d4fb26fd0fd35367faf0e11acba3b4ccdebde9602410b897e91bf54ba1d1f820
+EBUILD appstream-glib-0.7.17.ebuild 1639 BLAKE2B 06ee555221d3968246d134763c936a989c51596617e78f65e56a623c8fdae014e54f1c52eee24a81b2ece1f6e593f466d65b091c5703122c6666985c27e48bf8 SHA512 f28cc553a899eb4a26356053c79be6eebde61123e0ca9043447ea4ae2799bd098d6fc4b79e8eb2967fc6afb5fbbfaae65a1a6ce8aba0cebb08067bb26577b2b6
 MISC metadata.xml 422 BLAKE2B 2e5bf4c5c2d13bf78b471e1dd96805a9ccfe89dc4c9d0e580d8248f2217516c661c150589d810ed63a5d157188adfbddd0e14aff27066c30abf3b890a40fea39 SHA512 c4466112e9b673bab1ddd4787d13b39bb12be7c646a801f5583ffbf8edee2010b0309e6dd2e0cc65cc127a2c4fa7c2182a4c7cbaa5a7011e569d31ca2d1217ca
diff --git a/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild b/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild
index 0ecb78c0317f..6710f44c42ce 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.7.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="gtk-doc fonts +introspection stemmer"
 
 RDEPEND="
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index ebec3812af55..35844cca6181 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,5 +2,5 @@ AUX botan-2.14.0-bindist-test-fix.patch 3167 BLAKE2B bb94b4081469c8cfcfff5a18715
 DIST Botan-2.14.0.tar.xz 5958948 BLAKE2B 90e73945b22f6e4e8d6163bfb45eca153eb1495448f8bf35514b780fd12bb1b81c822314e1f598c7625277f1e9cf7a6265387cca80ffd4c2664c681b9d4807fd SHA512 ee15928ecdb0127720b444b0207d46fd68fe3007125b0deb8bdd32f96e9befb684ad54009354da4f6a3c48b9698693b46223710a47fd644da8760dda53d40d34
 DIST Botan-2.15.0.tar.xz 5920688 BLAKE2B 1bbb9cadb0f754194851bddf8b14dbcd291285c5f3fbaad35920277a11c3d9e1b1e5cc484c0d37b1c7999b3084a1c90da56631df0b07e788372b95aff5197031 SHA512 0965a0a6141df44e38bd7da038b89dd2b3808ed9a4ebaafbf089abf60718e62cba78d7b64eaf272b5df8c5a489222e4cad4fb511cde38e76cdaed87f35896c18
 EBUILD botan-2.14.0-r1.ebuild 2708 BLAKE2B 5ef16c8ccbb43488a9e06641f9aff6d9b7ab6f8265c2c4a007325181a6a01c1ad9553ecc70b646273bcbf7680640013e692ccbfcb80d037d3b52d2a9d2ed8f24 SHA512 0b57b3c3550c02ee0d4c3deb8ef70f68e202c04811235de8a8ab92d55eee2d548d041f0b1971d68e039a2dfab3c49273d545e0a42a7203121b48856d53af6241
-EBUILD botan-2.15.0.ebuild 3092 BLAKE2B 5bf774c5c31f0905ecaaac36227d19276437067d40a759174949777470715d1625ee7991b3b15ab6f83cf3cd378b72ef40c073ad3ea68b192037204925e4c856 SHA512 3c2b6408d8432d68587fbad3130b8d03d7c84e5c307aed8dab41ea755e65ba13c9ec5566a2f779b2f491e7ee92d233e67d0f7c162ebc09ec601578fe2d279654
+EBUILD botan-2.15.0.ebuild 3091 BLAKE2B 2da5cfb879e65537227b0a6d524c30f7ec186a41a3e71797c4a57dd3b85013c10ddb60d8f5ddcadc02418978292be393d71b8fd2bd8521f13578c0234964768d SHA512 6f1bf731cb1a704cf6e40d5bd7fe36ebeb7a3690303f10dde754ffcb3eb0ab47dd2ca04df8d114662df5e35a55cd2292f5d061463d707c38052d3db6e6ecb1ec
 MISC metadata.xml 518 BLAKE2B e3816e408031bfaa81f090f9c4d47027827a5b89ccde82cde859efb76200ae443f4c71b83d548fbe9329bbae620112ee59d6882a41df7eb60361f6de1085346b SHA512 ec0f64495b54f912e44a0a2cfda063a136452e0fba33268d645fbafedb4fba41713debc0219d2c68eeffde27fd0b74580465e50d160187e417defc36b61033a3
diff --git a/dev-libs/botan/botan-2.15.0.ebuild b/dev-libs/botan/botan-2.15.0.ebuild
index 5f9c7a702b9c..b0108d71ae26 100644
--- a/dev-libs/botan/botan-2.15.0.ebuild
+++ b/dev-libs/botan/botan-2.15.0.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD-2"
 
 SLOT="2/$(ver_cut 1-2)" # soname version
 
-KEYWORDS="amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~ppc-macos"
+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} )"
 
diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 66b7c90f1a05..bfd892912ab9 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,11 +1,5 @@
-AUX c-blosc-1.11.2-fix-build-system.patch 803 BLAKE2B 1472877db42d6a952b8f91a75ba437c6693701cc255a44638c5035d4f723563a5c0dfb5baee73ce0eb061bbaf45c8a49988ba799f35ff3d8b79159e73ea15afe SHA512 3064040af07acc445e4c7a9e962939eafa02d75366e6eee2ce12f15cc5846fbb4214a17d27f9366e8c08b69a3565cb04910008b1e4bd62d6ded3087e1a27124b
-AUX c-blosc-1.19.0-xgetbv.patch 1088 BLAKE2B 45e9d6c0e3a166d7c2cb41381fa9c75ca197cc5fb3d9ff51facbad0e62f2a408af92fcb40959bf2b49d3c406664d0f2c8bc58f4bbc435591e96553b4514307cd SHA512 33e6c674fee03e8c95fb0a90e04af2c29e12489b50c365a899d00ec689e1cf9c803e50234027df89b57820055cef41b487029e65cb16e6996549e2e5a761c627
-DIST c-blosc-1.11.2.tar.gz 633280 BLAKE2B 426de12ffa0db784fc26316e5758836517f3b3498111cfea64ebd2bc4582ebc6236f64845d41e75db272d3741ab8a7f22a12e0847fb7c98ba10a3ae2c2906e22 SHA512 c1282f60f4ef9d24844be225587e7f46c43ba8a5071f5ee49a7326bce9e84b65312c4f9606e78fd3d1209a4ca50f1c31312a7c377caf9522c9915177c92a4d7b
-DIST c-blosc-1.19.0.tar.gz 875356 BLAKE2B 046134e10fec639f1271d9c7cc15dcd239f9f0875f7ad324144338072e6fa006612f7d154ccde11a5dd7ee60471380aab4a60ae332cf1de4a7b773ae354c494a SHA512 15bc009f8880630c531ccd36544869d59b69d21f10c08eebf3c2983d203697429649a1b56b044e28342ec620c6f5850ee9da783005ce83f23e783f091289498c
 DIST c-blosc-1.20.0.tar.gz 878891 BLAKE2B 742619a5de9696646f8c434f25e736dc3662b8215c6397d9e23f7f86ae6df78c014c8b23bfa1cada72f31b99d81b6c9d99eeb28189c529fe692b88f95da1d67a SHA512 b3da9970542c389fce4acb6ffb866c066dfbf542fadb21ed3d6a7688f9cccf89425ccdc9253a1f7172eced224ff27b78be0c9ce111b4b69ec303a61fb7c1bc10
 DIST c-blosc-1.20.1.tar.gz 878895 BLAKE2B 54f91ffc0b270f8bc8ace8893c01ab6847096397f76b31c5adf0516903cee29d867973317de5d016807837ac098b170542c0b8e702d386bf9166de31863f6eab SHA512 59f83dfb3f0db6530daeae699f0915d6c8a7186cea1fe2face7110f5c94c2e8ccc12eb0078de968552b6ac32163b2ec6fb19b79966d2c85574a2676b454f5475
-EBUILD c-blosc-1.11.2.ebuild 1320 BLAKE2B b1b00873c35709d160a8b4af70c53aa1db292d114e85367840666a54af0b0f09f0e4e2b4c19960f30b1d50278c87909495ff202866b233fc28c8be231ea5048d SHA512 10b361c01cb2dedfc5889d37e4043d9b2aa2f911057a60560014b3823df73d59afee2aadc5c07452e9e0e75426d8c1d8007b9df3e020acdda7a3162ce0c3f43e
-EBUILD c-blosc-1.19.0.ebuild 1133 BLAKE2B f58035bf0c85812a52ba2ecd64372571021849a72a4efb8ffb6d7cd8a8243757091dfb1b73a7ef58546c23fbe7bfc1ebd5cc697fc1c74cfc775d53eff2ed1669 SHA512 29b1bb97a257994bda228fa6528d5a85c5ecf83495b6d30cc0696c08837dc85071260df6d78e25c92d50752a7d72288b9723e9261cbba139b1353a51c2d2fcc2
-EBUILD c-blosc-1.20.0.ebuild 1111 BLAKE2B 02c95c9a3f3d5be967b2125a890af0038fe2e316150742d073a63db2bfca5ef2ce1521028e7501deb7c5d11d6a12d0eb54e7c59f90e9227806a4a7b44df9b350 SHA512 23dfadf363e3b4c667e5245bcf805d4d2758c21e945f76a353c15239c8edd62cff8554675d6adbf94791530208b62450e0558a31c9e038fcda50bc1ad0406a54
+EBUILD c-blosc-1.20.0.ebuild 1109 BLAKE2B c8e687c306f166ef06a1af3035e0e6557d05856d578446481dc6a0c1f47943a2123e21ac84ec3b0a4a89a5eaf08e74c7a98bf45c8063dbea7019522956f12970 SHA512 e8a3c7df73f5658c0b56c6ed7f71049ee889ed79ac7d2175c9790c8402712b1d25535fffc3894161e8729ae441b355f28c124cedcecbf14820287ec425c1b3cc
 EBUILD c-blosc-1.20.1.ebuild 1111 BLAKE2B 02c95c9a3f3d5be967b2125a890af0038fe2e316150742d073a63db2bfca5ef2ce1521028e7501deb7c5d11d6a12d0eb54e7c59f90e9227806a4a7b44df9b350 SHA512 23dfadf363e3b4c667e5245bcf805d4d2758c21e945f76a353c15239c8edd62cff8554675d6adbf94791530208b62450e0558a31c9e038fcda50bc1ad0406a54
 MISC metadata.xml 838 BLAKE2B 3dadd7fc571618d6b398e434354b65a7c59dbe07d2530069ac9ab7f879cc5b16407079a4e1fdbd54110b3be9a0bf25c13512c2030fc9042cbd105d9b294dd279 SHA512 5c1f4bd8e4ef92dbef6d9a6418fbdab91c377c275eeb572a0c0e785a25f342be0dd032ad14106b9139fb7208064f16fb428ebd7b65d50d35b87089244b026654
diff --git a/dev-libs/c-blosc/c-blosc-1.11.2.ebuild b/dev-libs/c-blosc/c-blosc-1.11.2.ebuild
deleted file mode 100644
index 2dbf5d282b31..000000000000
--- a/dev-libs/c-blosc/c-blosc-1.11.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="https://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0/1"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="cpu_flags_x86_avx2 +lz4 +snappy static-libs test zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	lz4? ( >=app-arch/lz4-1.7.5:= )
-	snappy? ( app-arch/snappy )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.rst RELEASE_NOTES.rst THOUGHTS_FOR_2.0.txt ANNOUNCE.rst )
-PATCHES=( "${FILESDIR}/${PN}-1.11.2-fix-build-system.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# remove bundled libs
-	rm -rf internal-complibs || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC=$(usex static-libs)
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_BENCHMARKS=OFF
-		-DDEACTIVATE_AVX2=$(usex !cpu_flags_x86_avx2)
-		-DDEACTIVATE_LZ4=$(usex !lz4)
-		-DDEACTIVATE_SNAPPY=$(usex !snappy)
-		-DDEACTIVATE_ZLIB=$(usex !zlib)
-		-DDEACTIVATE_ZSTD=$(usex !zstd)
-		-DPREFER_EXTERNAL_LZ4=ON
-		-DPREFER_EXTERNAL_SNAPPY=ON
-		-DPREFER_EXTERNAL_ZLIB=ON
-		-DPREFER_EXTERNAL_ZSTD=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/c-blosc/c-blosc-1.19.0.ebuild b/dev-libs/c-blosc/c-blosc-1.19.0.ebuild
deleted file mode 100644
index 671a429da437..000000000000
--- a/dev-libs/c-blosc/c-blosc-1.19.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="https://www.blosc.org/"
-SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="+lz4 +snappy test zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	lz4? ( >=app-arch/lz4-1.7.5:= )
-	snappy? ( app-arch/snappy )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-xgetbv.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# remove bundled libs
-	rm -rf internal-complibs || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC=OFF
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_BENCHMARKS=OFF
-		-DDEACTIVATE_LZ4=$(usex !lz4)
-		-DDEACTIVATE_SNAPPY=$(usex !snappy)
-		-DDEACTIVATE_ZLIB=$(usex !zlib)
-		-DDEACTIVATE_ZSTD=$(usex !zstd)
-		-DPREFER_EXTERNAL_LZ4=ON
-		# snappy is always external
-		-DPREFER_EXTERNAL_ZLIB=ON
-		-DPREFER_EXTERNAL_ZSTD=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/c-blosc/c-blosc-1.20.0.ebuild b/dev-libs/c-blosc/c-blosc-1.20.0.ebuild
index 894b71680371..6cb8f5af1a3e 100644
--- a/dev-libs/c-blosc/c-blosc-1.20.0.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.20.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="+lz4 +snappy test zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/c-blosc/files/c-blosc-1.11.2-fix-build-system.patch b/dev-libs/c-blosc/files/c-blosc-1.11.2-fix-build-system.patch
deleted file mode 100644
index d385d5263710..000000000000
--- a/dev-libs/c-blosc/files/c-blosc-1.11.2-fix-build-system.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Make the build system respect CFLAGS
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,16 +244,6 @@
- endif()
- 
- # flags
--# @TODO: set -Wall
--# @NOTE: -O3 is enabled in Release mode (CMAKE_BUILD_TYPE="Release")
--
--# Set the "-msse2" build flag only if the CMAKE_C_FLAGS is not already set.
--# Probably "-msse2" should be appended to CMAKE_C_FLAGS_RELEASE.
--if(CMAKE_C_COMPILER_ID STREQUAL GNU OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL Intel)
--     if(NOT CMAKE_C_FLAGS AND COMPILER_SUPPORT_SSE2)
--         set(CMAKE_C_FLAGS -msse2 CACHE STRING "C flags." FORCE)
--     endif(NOT CMAKE_C_FLAGS AND COMPILER_SUPPORT_SSE2)
--endif(CMAKE_C_COMPILER_ID STREQUAL GNU OR CMAKE_C_COMPILER_ID STREQUAL Clang OR CMAKE_C_COMPILER_ID STREQUAL Intel)
- 
- if(MSVC)
-     if(NOT CMAKE_C_FLAGS)
diff --git a/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch b/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch
deleted file mode 100644
index 045a234028be..000000000000
--- a/dev-libs/c-blosc/files/c-blosc-1.19.0-xgetbv.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 14d2d561795c276fc33c8cb54781dff76b398906 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 10 Jun 2020 12:13:39 +0200
-Subject: [PATCH] Redefine blosc_internal_xgetbv for platforms with immintrin.h
-
-Commit 2f2d876 renamed _xgetbv to blosc_internal_xgetbv.  Commit 0b8608b
-made it conditional to immintrin.h not being included, apparently
-in order to prevent _xgetbv collision.  However, since the block
-no longer defined _xgetbv but blosc_internal_xgetbv, it means that
-the latter is not defined if the condition is false.  #define it to
-_xgetbv to fix missing symbol.
----
- blosc/shuffle.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/blosc/shuffle.c b/blosc/shuffle.c
-index fc2ca64..7a03bf1 100644
---- a/blosc/shuffle.c
-+++ b/blosc/shuffle.c
-@@ -195,6 +195,10 @@ blosc_internal_xgetbv(uint32_t xcr) {
-   return ((uint64_t)edx << 32) | eax;
- }
- 
-+#else
-+
-+#define blosc_internal_xgetbv _xgetbv
-+
- #endif  // !(defined(_IMMINTRIN_H_INCLUDED) && (BLOSC_GCC_VERSION >= 900))
- #endif  /* defined(_MSC_FULL_VER) */
- 
--- 
-2.27.0
-
diff --git a/dev-libs/capnproto/Manifest b/dev-libs/capnproto/Manifest
index d2d26f4396da..f06b7fc493e0 100644
--- a/dev-libs/capnproto/Manifest
+++ b/dev-libs/capnproto/Manifest
@@ -5,5 +5,5 @@ DIST capnproto-0.8.0.tar.gz 2121249 BLAKE2B 6d4ef9adb026a8ea8bc558bed1f8ce910e9c
 EBUILD capnproto-0.6.0.ebuild 815 BLAKE2B c568f71f4e6be421b7cc1c2c0cf5746c53f1ec0974efe46533441840ba0972b2431e42a65d3d78e49bc6dd3c7e19fa81fbda7b992855eb35460e0659134fa947 SHA512 65b75863b45e512e9dd073e55b3dd4ca8d1b8d2285df8d9d7f7f7cdafec970497ae00b78e2f72a359679db821a766e0dda4056c6fcf6184f8e1107887877da10
 EBUILD capnproto-0.6.1.ebuild 815 BLAKE2B e05f98460b1d6f3cfdf5cc046c555756e579f41ba887b42942230c7e185c0269f43bd9dc0ce10ee34b5c46c1d7999f78b5805523efb61560fea2c8837dccf68c SHA512 1b53b7a5505fdffb6ace4b7075f1abf8cfa3f67c0bf8fa532bfddcbcab7420208cfeb637e36e163a641114a68663f8cde39cc43bd9348af95e9b6cd058031c8f
 EBUILD capnproto-0.7.0.ebuild 894 BLAKE2B 64ad5fe9cf2e65bfefe4e3060ea938e1b7e3d446a9757c4d8fb32622765c7e1ea9ec2b291491de7ba8180c4ce944291cf6b77ef32e1c9f641a67d6f593b9f30f SHA512 1fbddd46b4ad600802041181414d73100b5c75965254993a2bdb840718b9e6f0c1ababae50744e185f42597bf43766941cf5c9ae40eda7d61e45eb52c4550679
-EBUILD capnproto-0.8.0.ebuild 953 BLAKE2B a5d737000df9ff65d42d59d83e48a2e3fde0dc0a80102b4b2b85deceded323bbb0e5190e47af968ee6cb4734a5fc355b1d016a28af86164e1d0f22c548ba2fe8 SHA512 7398cc3f4a5cd936e72e070b2e40e56213993012e7f37ca70efd50f09d7452005993065ec40538eb6939a2881d891f0ee101b3abbe5f4496f4c557ab72a0ee63
+EBUILD capnproto-0.8.0.ebuild 1017 BLAKE2B f5e100336fe454b558167748b3d9a3414119e3a2d832214f61e0f8b16773c95c4722e2c7b72a0707d0ce67f4eeab202225ab65c83fd227a719033ebd713af40a SHA512 0932f147cf4fc23d8d7bbc44038b2e5f36bac217a9ae009a99f3c1afd97ff68e22889d96533a194fc8bd258682ab38cf21d66bf694376b762727bdc3dbd92ad1
 MISC metadata.xml 346 BLAKE2B eab1f05d43ea625945b539ea49039ac08905f9b4e0d6b85ace2c1c31cc7aa6719b15697e75d472afb2900e3810c19c091fee57f900f8688cc3586d713ec4206f SHA512 c3c8f965d691c76d1f31fd9d8edcb1c623eac59b81caf4bbd51a184a6b7f8c74b1c1459c15957341700fe443c18946fbaac0a28b46976fa23cd55c9e57a03879
diff --git a/dev-libs/capnproto/capnproto-0.8.0.ebuild b/dev-libs/capnproto/capnproto-0.8.0.ebuild
index 2905a51fc563..7a3fb3d64f2b 100644
--- a/dev-libs/capnproto/capnproto-0.8.0.ebuild
+++ b/dev-libs/capnproto/capnproto-0.8.0.ebuild
@@ -12,11 +12,14 @@ SRC_URI="https://github.com/sandstorm-io/capnproto/archive/v${PV}.tar.gz -> ${P}
 LICENSE="MIT"
 SLOT="0/080"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+ssl static-libs test zlib"
+IUSE="libressl +ssl static-libs test zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	zlib? ( sys-libs/zlib:0= )
 "
 DEPEND="${RDEPEND} test? ( dev-cpp/gtest )"
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 95bc0a926c30..60c8fd3edebc 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -2,5 +2,5 @@ AUX check-0.14.0-r2-disable-automagic-dep.patch 769 BLAKE2B 286eeaa0e45e524c400f
 DIST check-0.15.0.tar.gz 306428 BLAKE2B fea2a169b86248a6657f890469f41cd699dd95efb91e311ccf188548a6c8c28568decf0b5f03b08aed31e14c69d50707b418e1e71c6db7e1b7938ee36aa19cd8 SHA512 efde93977a38520b3b83a9e2f678d07b916fc27e41cf839a663900c4153d645fe4274ec3b7e2dabf475457f909f61734632c97b7257c49f5853fd11d920b0c84
 DIST check-0.15.2.tar.gz 306136 BLAKE2B e93755b58ddfea7ecc013e5449806611baedb91b362e573d4e3b6f716feeb0012cceec80f7109e44b2808deb980300c4f7825919b97878b160a1bf884357bde3 SHA512 cf81ca63142f33779df2e3542e049b9034d30bc502a663a4379bbfe85c7ee8fd80ce382583e781651d99fe830895122dab5b6793f87425b571c3927f0ba3b60e
 EBUILD check-0.15.0.ebuild 1498 BLAKE2B f3e01f34d5ae27733a0e281cfb3f95a6f44617cef468dc62bdb00b9db72a9dd555ab3c7adf016edffa962031c9994150f1c1b4ba0f00e96d0f68b3bc33e480ce SHA512 fb817b17ec6039b0b1d52d36454ebd5ca8f6fd590084ad41f168f1300b899197b6e8ff231f9f175bf162eb0d7b576ab62a2458b97c2b6f78c45cb1aaa1fc1c15
-EBUILD check-0.15.2.ebuild 1580 BLAKE2B c63410b5a9af557a974cc1e13363e5288281e4194b4acf2564ab8f1d2e91d6beca749344c8416ce7bd25e8c095bf67993d1e5cead6dacbaba17c77defad6e80e SHA512 00711d106c35f653d5415952a629432c54731792ed95e090069ecc41f29959d4ed2989acd08dfffe7b0604925a6c5ca0b320e49679ed0c81ec0cb19de4723174
+EBUILD check-0.15.2.ebuild 1579 BLAKE2B 6887123d2d16ae72e2145d73bf9bf09c7d42ee597042d10030d724938ab1935b31c8cf7832d44cbcc8d1d486247b7a82cf308844d67b6fb02db442c40d5840f1 SHA512 1d0d113035fc6488f240512ece6d39c0d4ac5a278fd9fa9936b9086a955ec52b35e3145f25cf2760c7fdfdc7b1d4a60a485a05f0d4769cf31882a1cbbf14c3fd
 MISC metadata.xml 488 BLAKE2B 27eb0323a4d7cac50b2f4ee935c75e7a35c34066a0dbc5bf21f8b4fb93abe82aa79a5fa1fafed0e623417ceaa553dc8395f201a24c3e0123df3104be44106bb7 SHA512 4b69b4b1ca91bfe4b04d03935d3d6e9b8ca10ecaa538884834f357708db5380a90e9cf1fdcef7996b7c4d8a23c0cb8e1d9eb9d34faa584637804ebc67657be69
diff --git a/dev-libs/check/check-0.15.2.ebuild b/dev-libs/check/check-0.15.2.ebuild
index bcc597697139..d5a8719402fd 100644
--- a/dev-libs/check/check-0.15.2.ebuild
+++ b/dev-libs/check/check-0.15.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libcheck/check/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"
 
 # Tests seem to timeout on ppc* systems, #736661
diff --git a/dev-libs/clipper/Manifest b/dev-libs/clipper/Manifest
index 68c597144650..7fdf235e1a48 100644
--- a/dev-libs/clipper/Manifest
+++ b/dev-libs/clipper/Manifest
@@ -1,3 +1,3 @@
 DIST clipper-6.4.2.zip 2535706 BLAKE2B 755dcfd759888bda7114af784d9e684f36ce8f6e43dcadf07f5797e3723d392aab2ea9b80cb212b7eb3177bfb306ca20a797546cb2c382132887e62fa0dffd93 SHA512 ffc88818c44a38aa278d5010db6cfd505796f39664919f1e48c7fa9267563f62135868993e88f7246dcd688241d1172878e4a008a390648acb99738452e3e5dd
-EBUILD clipper-6.4.2.ebuild 621 BLAKE2B 7b93470d7ab61f5dec552a066d3feddc5d8ee90ba0ff162502b70c2216a04b7e98fbd35ba727fdcdf0ec05536ec094d73518a79dcbf7f6c29dbfa730bfe5c196 SHA512 c1abeb8e96b69ca0d0858750b3ccfc9a56c50fe1fff2dac306824f328784e4cacec54e4573963097919dfbe2bbda4ff5909d166bffb7a62323cdd03e185545a3
+EBUILD clipper-6.4.2.ebuild 628 BLAKE2B 81cfa0859a48748f8787120ed00633d9367f1b28c128b6f1f9bb68ad84ad92886933f044b6fa3e2a792ac08efb471ac87a63e459ce79ce3032cca0d2e9e3e519 SHA512 97339d7f81f0a44ae3c3d83072a0cffcd3f7b0d238aff1e58b89a4f881c28a4bc31297d770b38171d5b8b80b04156c54bdd0a9e6cda23ca395f659089676e516
 MISC metadata.xml 631 BLAKE2B 2f873cd0220e6fcb0404b0ceeefafa2acf4418bc23a29e2eb249341a4c3b4698d77efdd30deede7a4427fc228213d67c034e43237c60e91679a7c05be5b664a9 SHA512 06e5eb63edca0e93a95de200775f51919583dea253fa4eb59eca5bc0c4a5a96c2eab59b746f43002c71ae992ceafa99ef84fe1f02267bdac40853f2f0c4e1081
diff --git a/dev-libs/clipper/clipper-6.4.2.ebuild b/dev-libs/clipper/clipper-6.4.2.ebuild
index bf08e2705120..da55f29d7429 100644
--- a/dev-libs/clipper/clipper-6.4.2.ebuild
+++ b/dev-libs/clipper/clipper-6.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/project/polyclipping/${MY_P}.zip -> ${P}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 IUSE=""
 
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index e5e08562813a..6e98be03bf49 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,3 +1,4 @@
 DIST efl-1.24.3.tar.xz 72278592 BLAKE2B c5d07e947139087976a0a974c3129ea31211be4c235e94d6fc3c2b9c7ec0be97b78fcf6a18aebd4b4d476224c9e6f5a29ad41d93e6c10065ff7591c2792b8481 SHA512 3791955c588bc1b2ca55caa19dc0fb351c9f6c681791bfe76a435255edd55257c9c5ab2f16d0d91ec2d55113bd9d24d45c0f9026ae72d9f6afbddfd093975089
+EBUILD efl-1.24.3-r1.ebuild 7343 BLAKE2B ada5159b715e503b410a0db611728aae02464bcd6c396fa80850ce74f6b819d3033f6ac705e51f82f096ef52d18fafb66fb7f957c0a31f1c30508e08880e96f2 SHA512 a7bed9390fce3368c3bd50c36e6d9989307c519612ff093e1c0ac4a4dceaf6536bbfcb2940e7e44a99f2471d320837c5bd8501148cfc0847a32d1fd3797d988f
 EBUILD efl-1.24.3.ebuild 7102 BLAKE2B 363fdf6553532a47fc4d6b95c8d28a32fbd53e8b8b632567a690e96b59ecbd2fce9e0808c88b6041a3e537a57203c4b964786a708b21b401072c31f592d3c2ba SHA512 f423decb04ef2dd4ac64f127ab9f4ebaed1030aa71803aa2e7579edd8662db51322d0c5239572803713bd1276d56a01b6c2ce3efa1c5a5abaf22e1f39d9b6ef7
 MISC metadata.xml 1848 BLAKE2B cfa648855219a0f184807fd42c45d17952c60fb4821610c78d7eb3bc67b54301f9d6f3c6c28d84cbfa7232858a2c3cbe980f8d96d27394692c9d5dd955fced27 SHA512 a97532e124d899699418ac48cdeadda93f2cd2c0d3bf989ad17fd0acc3ab6050e2fc2b06d9866f97fe85f821bc52918047c230f400f8b8e6acce3fd84e83644d
diff --git a/dev-libs/efl/efl-1.24.3-r1.ebuild b/dev-libs/efl/efl-1.24.3-r1.ebuild
new file mode 100644
index 000000000000..f7493cc7904a
--- /dev/null
+++ b/dev-libs/efl/efl-1.24.3-r1.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+HOMEPAGE="https://www.enlightenment.org"
+SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+X bmp connman cpu_flags_arm_neon dds debug doc drm +eet elogind examples
+	fbcon +fontconfig fribidi gif gles2-only 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 tslib unwind v4l vnc wayland webp xcf xim
+	xpm xpresent zeroconf"
+
+REQUIRED_USE="
+	?? ( elogind systemd )
+	?? ( gles2-only opengl )
+	^^ ( lua luajit )
+	ssl
+	drm? ( gles2-only )
+	examples? ( eet svg )
+	gles2-only? ( || ( wayland X ) )
+	pulseaudio? ( sound )
+	wayland? ( gles2-only !opengl )
+	xim? ( X )
+	xpresent? ( X )
+"
+
+# Requires everything to be enabled unconditionally.
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/check
+	net-misc/curl
+	media-libs/giflib:=
+	media-libs/libpng:0=
+	sys-apps/dbus
+	sys-libs/zlib
+	virtual/jpeg:0=
+	X? (
+		media-libs/freetype
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+		wayland? ( x11-libs/libxkbcommon[X] )
+	)
+	connman? ( net-misc/connman )
+	drm? (
+		dev-libs/libinput
+		dev-libs/wayland
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+		x11-libs/libxkbcommon
+	)
+	elogind? (
+		sys-auth/elogind
+		virtual/libudev
+	)
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gles2-only? (
+		media-libs/mesa[egl,gles2]
+		virtual/opengl
+	)
+	glib? ( dev-libs/glib:2 )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	hyphen? ( dev-libs/hyphen )
+	ibus? ( app-i18n/ibus )
+	jpeg2k? ( media-libs/openjpeg:= )
+	json? ( >=media-libs/rlottie-0.0.1_pre20200424:= )
+	lua? ( dev-lang/lua:* )
+	luajit? ( dev-lang/luajit:* )
+	mono? ( dev-lang/mono )
+	opengl? ( virtual/opengl )
+	pdf? ( app-text/poppler:=[cxx] )
+	physics? ( sci-physics/bullet:= )
+	postscript? ( app-text/libspectre )
+	pulseaudio? ( media-sound/pulseaudio )
+	raw? ( media-libs/libraw:= )
+	scim? ( app-i18n/scim )
+	sdl? ( media-libs/libsdl2 )
+	sound? ( media-libs/libsndfile )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	svg? ( gnome-base/librsvg )
+	system-lz4? ( app-arch/lz4 )
+	systemd? ( sys-apps/systemd:= )
+	tiff? ( media-libs/tiff:0= )
+	tslib? ( x11-libs/tslib:= )
+	unwind? ( sys-libs/libunwind )
+	v4l? ( media-libs/libv4l )
+	vnc? ( net-libs/libvncserver )
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[gles2,wayland]
+		x11-libs/libxkbcommon
+	)
+	webp? ( media-libs/libwebp:= )
+	xpm? ( x11-libs/libXpm )
+	xpresent? ( x11-libs/libXpresent )
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	# Remove automagic unwind configure option, #743154
+	if ! use unwind; then
+		sed -i "/config_h.set('HAVE_UNWIND/,/eina_deps += unwind/d" src/lib/eina/meson.build ||
+			die "Failed to remove libunwind dep"
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		--buildtype=release
+
+		-D buffer=false
+		-D cocoa=false
+		-D drm-deprecated=false
+		-D g-mainloop=false
+		-D install-eo-files=true
+		-D mono-beta=false
+		-D dotnet=false
+		-D pixman=false
+		-D wl-deprecated=false
+		-D dotnet-stylecop-severity=Warning
+
+		-D edje-sound-and-video=true
+		-D eeze=true
+		-D libmount=true
+		-D native-arch-optimization=true
+		-D xinput2=true
+		-D xinput22=true
+
+		$(meson_use X x11)
+		$(meson_use debug debug-threads)
+		$(meson_use drm)
+		$(meson_use elogind)
+		$(meson_use examples build-examples)
+		$(meson_use fbcon fb)
+		$(meson_use fontconfig)
+		$(meson_use fribidi)
+		$(meson_use glib)
+		$(meson_use gstreamer)
+		$(meson_use harfbuzz)
+		$(meson_use hyphen)
+		$(meson_use luajit elua)
+		$(meson_use nls)
+		$(meson_use physics)
+		$(meson_use pulseaudio)
+		$(meson_use sdl)
+		$(meson_use sound audio)
+		$(meson_use systemd)
+		$(meson_use tslib)
+		$(meson_use v4l v4l2)
+		$(meson_use vnc vnc-server)
+		$(meson_use wayland wl)
+		$(meson_use xpresent)
+		$(meson_use zeroconf avahi)
+
+		$(meson_use !system-lz4 embedded-lz4)
+	)
+
+	if use opengl; then
+		emesonargs+=( -D opengl=full )
+	elif use gles2-only; then
+		emesonargs+=( -D opengl=es-egl )
+	else
+		emesonargs+=( -D opengl=none )
+	fi
+
+	if use gnutls; then
+		emesonargs+=( -D crypto=gnutls )
+	else
+		emesonargs+=( -D crypto=openssl )
+	fi
+
+	if use connman; then
+		emesonargs+=( -D network-backend=connman )
+	else
+		emesonargs+=( -D network-backend=none )
+	fi
+
+	local disabledEvasLoaders=""
+	! use bmp && disabledEvasLoaders+="bmp,wbmp,"
+	! use dds && disabledEvasLoaders+="dds,"
+	! use eet && disabledEvasLoaders+="eet,"
+	! use gstreamer && disabledEvasLoaders+="gst,"
+	! use ico && disabledEvasLoaders+="ico,"
+	! use jpeg2k && disabledEvasLoaders+="jp2k,"
+	! use json && disabledEvasLoaders+="json,"
+	! use pdf && disabledEvasLoaders+="pdf,"
+	! use pmaps && disabledEvasLoaders+="pmaps,"
+	! use postscript && disabledEvasLoaders+="ps,"
+	! use psd && disabledEvasLoaders+="psd,"
+	! use raw && disabledEvasLoaders+="raw,"
+	! use svg && disabledEvasLoaders+="rsvg,svg,"
+	! use tga && disabledEvasLoaders+="tga,"
+	! use tgv && disabledEvasLoaders+="tgv,"
+	! use tiff && disabledEvasLoaders+="tiff,"
+	! use webp && disabledEvasLoaders+="webp,"
+	! use xcf && disabledEvasLoaders+="xcf,"
+	! use xpm && disabledEvasLoaders+="xpm,"
+	[[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
+	emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
+
+	local disabledImfLoaders=""
+	! use ibus && disabledImfLoaders+="ibus,"
+	! use scim && disabledImfLoaders+="scim,"
+	! use xim && disabledImfLoaders+="xim,"
+	[[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
+	emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
+
+	local bindingsList="cxx,"
+	use luajit && bindingsList+="luajit,"
+	use mono && bindingsList+="mono,"
+	[[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
+	emesonargs+=( -D bindings="${bindingsList}" )
+
+	local luaChoice=""
+	if use luajit; then
+		luaChoice+="luajit"
+	else
+		luaChoice+="lua"
+	fi
+	emesonargs+=( -D lua-interpreter="${luaChoice}" )
+
+	# Not all arm CPU's have neon instruction set, #722552
+	if use arm && ! use cpu_flags_arm_neon; then
+		emesonargs+=( -D native-arch-optimization=false )
+	fi
+
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	if use doc; then
+		cd doc/ || die "Failed to switch into doc/ dir."
+		doxygen . || die "Doxygen failed to run."
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${S}"/doc/html/. )
+	meson_src_install
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples/
+		dodoc -r "${BUILD_DIR}"/src/examples/
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index b9c76bd86210..13162161d872 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -2,7 +2,7 @@ DIST girara-0.3.3.tar.gz 72372 BLAKE2B 59171e104f1558ed794e1bb623bb5121007af0cf8
 DIST girara-0.3.4.tar.gz 72981 BLAKE2B 690b8de0e906e43e32b7a1009a04d4bb1d5b029924ea5b85491ec740ba4b4363f8729bd9b8498f1f25309e2eabde6868f41a689ed06dfb6aa36b081676232624 SHA512 1eca68f4f28505d897c2f7cfb8804e67591e8327feb347c66da216d8f764cb0c88028d1c4c162579a882df7db1883b834c97d8488296ea5c0a8f709dfcea1f1a
 DIST girara-0.3.5.tar.xz 60488 BLAKE2B 2d0f2f0635e8e8906810b1425191f5d70b7f9af0985c461bd90654e83d87ad698da225d70064438fed4473295aca8dbd26c4ce1efd96f8a7399e7145b1f8c111 SHA512 e7c5bf887b29767878502224ad45d62e43b3da91bd8e754603256550d4f0126f1493f0fb7473a4ebb8cc5909306564249c6a60e99eba2b0b417b98c728fcdc84
 EBUILD girara-0.3.3.ebuild 1092 BLAKE2B 4799df2f151ed1189ec9595863cf32f753d3855e218d1fa2f4ce4d26538c1397743320f772fa0a9db842b773fb644d7e7654eb8be4c7d8b4e26f1d6b05971cb8 SHA512 91f1a78a23a4685d54d8ece01d4562be77817e3d43b67d0856f32a768c38943399622479cedf39d3791833d6247df8fd144ad94db9a6ce3beaea094270e6656d
-EBUILD girara-0.3.4.ebuild 1095 BLAKE2B 698754899258090e0656a5509610de9b1157ce838dfabd7c03ae6163b0082a12fac3ec53efc14214a583e81ded8285fea701c3f41031859f2d95f050f912ff4e SHA512 893ae83c2331343b541c832fbdf281af219ca2ca6172ed7efaf4b558ca1e4f4d0553a29f03d3b405165b4174460bf2d1f876d39a4477437a8ae3cfeb5d45d3c7
+EBUILD girara-0.3.4.ebuild 1092 BLAKE2B 4799df2f151ed1189ec9595863cf32f753d3855e218d1fa2f4ce4d26538c1397743320f772fa0a9db842b773fb644d7e7654eb8be4c7d8b4e26f1d6b05971cb8 SHA512 91f1a78a23a4685d54d8ece01d4562be77817e3d43b67d0856f32a768c38943399622479cedf39d3791833d6247df8fd144ad94db9a6ce3beaea094270e6656d
 EBUILD girara-0.3.5.ebuild 960 BLAKE2B 6ed5898d8a4e40ee3561f39334d1b1a9c3bc730ccdadd11981e05dfed35c536cc9588011d71c1824bbe9d94af985eecfe57944cd23f6fc6d06de8705f40e5fef SHA512 d955549560648356a68bfc129044b25b246f49de120ba46ae914cac6316ec1810b199e0f513d3c9e4ae93fc41d1c5368fde5aacba835b9be5db33b9d557a4d99
 EBUILD girara-9999.ebuild 1095 BLAKE2B 698754899258090e0656a5509610de9b1157ce838dfabd7c03ae6163b0082a12fac3ec53efc14214a583e81ded8285fea701c3f41031859f2d95f050f912ff4e SHA512 893ae83c2331343b541c832fbdf281af219ca2ca6172ed7efaf4b558ca1e4f4d0553a29f03d3b405165b4174460bf2d1f876d39a4477437a8ae3cfeb5d45d3c7
 MISC metadata.xml 581 BLAKE2B 25933546f3727c17b48e8bde4136825202d34300d2a3049ceba68afeb7f2b88ea5430240fdbf118229751229c06d31aef3cf28c7e13182d008e56161eff133f2 SHA512 2b6f1590cc60c44d13394afb5c3815c227aff680f94510e5202d2b41614b6854effe32d4ade6ab4b2d36595d36fa636520e88ea514078c23ca881e00d3d7797f
diff --git a/dev-libs/girara/girara-0.3.4.ebuild b/dev-libs/girara/girara-0.3.4.ebuild
index 773853805306..e77e4d1de042 100644
--- a/dev-libs/girara/girara-0.3.4.ebuild
+++ b/dev-libs/girara/girara-0.3.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://github.com/pwmt/girara/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index ab33f8b87464..5dc3df970396 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -2,6 +2,6 @@ DIST gjs-1.58.6.tar.xz 637972 BLAKE2B 553f29808723e48cee39c62e260d9c09f5db160756
 DIST gjs-1.58.8.tar.xz 639372 BLAKE2B 53be0d5353213e7fdc6009aeed16db79f61ee5b800d66cd79f87e577b44adbb05ae741d73550237027a902d2e038c8e8247d3269bf058b64622a1a261f5a2501 SHA512 373b400b884096b6746c1ac7f2c2915857aa888dfb8bbf19bb8469fb75e081e4df36dcab06723f03654c34354a5a69a7865727ab9e36d3fb0d2b2652713e5cd6
 DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42
 EBUILD gjs-1.58.6.ebuild 1606 BLAKE2B 2f10f926af7b704a16765b7cadd0ceee510b0f996ef160338abe019483384b4682a7fb89ec50d8958b0fb504be30574dd04ff7493af23df9bd44d8dbe071ca7b SHA512 e72901d389173016cab161a5126d3fd82a0dfa6a4d7fd6c21a381b73868ac2db891418742c88acdfd8769b8a13f01552173c19c31af39a47178681f870269490
-EBUILD gjs-1.58.8.ebuild 1608 BLAKE2B 157415b6171cacd2d7c08c9426227f551ce60441fbec98873149b2d80b082cacf068757fb7dd62e47fa2a2aa098f200b5330ad700e1b716e5e310ef2d92c145c SHA512 9de69d57a9795771dae2c4d828f23ae2a269d80dbe153c0830978b083b39cd4188bf5b37097529dc986b62534c996a1d9ca392cf692f62edcdfd676ccb9c5ddc
+EBUILD gjs-1.58.8.ebuild 1606 BLAKE2B 2f10f926af7b704a16765b7cadd0ceee510b0f996ef160338abe019483384b4682a7fb89ec50d8958b0fb504be30574dd04ff7493af23df9bd44d8dbe071ca7b SHA512 e72901d389173016cab161a5126d3fd82a0dfa6a4d7fd6c21a381b73868ac2db891418742c88acdfd8769b8a13f01552173c19c31af39a47178681f870269490
 EBUILD gjs-1.64.4.ebuild 1124 BLAKE2B 8a31589c2645c762e70f19fc6987d8b1cc07b8fa6531c3f4bd15ffdf339ddd54c4f2d9a03746a34ab4c559f05d486467857f26842c9fcc6bfa5db4997eca7e97 SHA512 1a4648b0fdc426c8cf4a43110c470667e287f9d6fe446b546c70495d4ecb4511395fc1e7e37f14edf05f53580eafc6d30742b78142d065e3c4967c16c2ed3f51
 MISC metadata.xml 388 BLAKE2B 9b4ab74929619cfb6c4405385667aa00521f59865df8338e9078286f2efa593dc49412153bd5b45e4fc4cbcd4c13a75c4743cd4381f05b07bed92cde09bf28fe SHA512 8aaf5f422cd8b63a71aa7773690607fb2d8ad6e6a7e350686da8e26ff4e6856c7f352ab02a79a7f2917b28758ff523a6aa6ddcfb2a1ad876aac94e6b2bd48072
diff --git a/dev-libs/gjs/gjs-1.58.8.ebuild b/dev-libs/gjs/gjs-1.58.8.ebuild
index ff08567af5e2..2f256eb68f48 100644
--- a/dev-libs/gjs/gjs-1.58.8.ebuild
+++ b/dev-libs/gjs/gjs-1.58.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline +sysprof test"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.58.0
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index f1520bf58af6..564435a2995b 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -4,5 +4,5 @@ AUX iniparser-4.0-out-of-bounds-read.patch 330 BLAKE2B b60d6a3a514d5e5704e2a97c6
 DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86
 DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968
 EBUILD iniparser-3.1-r2.ebuild 1282 BLAKE2B b437ffcd1d48a77053cb1c75dd387769df7c0ab03e7b63185f3a455e56c0cad54f0ecb098fc8fe3c703d32e150d15b7e58d9d6e0920554381a8f568df265d89d SHA512 8e6de570ff690a11bd91fa35473a674ef61a92686e50a18ab3d9e9934d88f010b06cef725f15a82257ddca87368b83307b68a5b27b864b3ad194fb605965060d
-EBUILD iniparser-4.1.ebuild 1548 BLAKE2B 030c497cf62fad931f6cdc9f60b1c3df9c9bfc057f76b032e4cb6db3919d68693506a90456d9aebfa4c08cd1e943cb793eafe0eb72b61d75eccac4b933ee408a SHA512 0ea5fa4e62218420a357648610ee18129da9378fc8a1c942055f6e1af043a41b8155a1580be9087b1819e2b55a8d25f42f2b7c1d8205b2014704067f55c69886
+EBUILD iniparser-4.1.ebuild 1547 BLAKE2B cf44db10df056fb24b2168f93f0fc59983cc0c476fe917d30374dbdce82cabe30f42ed5a813ae743ba7979db702eb2915fa6bddc55301a3ec0daae699c62b829 SHA512 cffa4d34f706eab8ef1ad5dabb3cb603e35b6747b9feb9a259c514a1706e6add6382c032e8c0ea8cbba62007a277731ac7eff0a5f131c6a858e8d079a9dd0913
 MISC metadata.xml 435 BLAKE2B 788d24983bfab5491f783ec20479370e6e01686d0f5a379c490a0b93d8379a3062e46b497cb911298df3d0de7f0eaaf1606e11a365e92ca5b93041dc935fc9ad SHA512 452ccec03580def2966c0eb2f50af057776387e01819e1ce5226e628204ea94554658309dfb0c54d413f95ed588f44b84133526b164ae557ad6ac7926aa51a51
diff --git a/dev-libs/iniparser/iniparser-4.1.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild
index 766b3da5182c..d3af126dfbf7 100644
--- a/dev-libs/iniparser/iniparser-4.1.ebuild
+++ b/dev-libs/iniparser/iniparser-4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="4"
-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"
+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="doc examples"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index c2246bebd009..fb32bb9bb155 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -1,5 +1,7 @@
 DIST intel-neo-20.16.16582.tar.gz 3042531 BLAKE2B adfc0aee2a315e67ccb3e4fe39ab09b618930607d3de931d1367881642d8e542385589299f593d3ab1cd6e16de7a8fce7b55fa1b4259097e15da7e55034d344b SHA512 700bee3ccf72c2bc89f5c8a75591de9dafbfe0a6480e3216258842c6b68ce1b527569d5fe1327a0a80cfbf79dca1d956820f060b602feefa83fc9b47cb46d7d0
 DIST intel-neo-20.36.17813.tar.gz 3459305 BLAKE2B 81996bb5946ff6334dc06aceed7e5f01f1ec1e417de7a600d41af43e0f74e3003b293f2981ad742e4f9df630aa81e9a21f6a0a04e9615ee4caa97fae4fe682bf SHA512 366120e785e068393bc0b1c2345eb3d2eca46d6c7485736d7e2aeece91d404f9b802230873b6f868fdd9d7a9852112a8aa216cde1210ab51d430dcef9601d968
+DIST intel-neo-20.37.17906.tar.gz 3492080 BLAKE2B e133dde18c67e5b50dc65372faeaf78ee2512adf80f6869e9a99ff18aba5463b2c47e62cac3122eb899c644f5bbea6dd3205d348d071ea8854e3271b9e25fb34 SHA512 3db9b05dbfc05de8e5aad4eac631320642ff03444ff3eafe0f9cf72897e2dfb723563ad9f953a900a19511cc8affd3832d3f3fa966d9388714c326c71180e8f6
 EBUILD intel-neo-20.16.16582.ebuild 1197 BLAKE2B 480adbc18a35ac51f842cb996f32abce6006a15907d96fc91c900a5acb053b105b8111c3bef818ca3f8d87822123fd703cf57b01fe8694706c01bbc873116441 SHA512 5eaf2f8757db684c8cc7eeca9de1446a3d15761c69cb58888ff46862d51204a5f5a8ff350a89bd80c3bcbcd969856f5d796081ca658b72b83bd821f0da63f299
 EBUILD intel-neo-20.36.17813.ebuild 1198 BLAKE2B 190a825c85eac774f52eed0205e6f758c4a071cfa19e39fa30a4569b046531481b07d1cf22d630e6c9af5c9fb133b6fdd106ae17f51987b2020b2c1a247cf00c SHA512 9876ce22eaa6685a9623e3653fde979f6450fdfe93b58e9c1dde104f64c182059c9ae9cbf52e7dc3951077030022b92f063afc0905ec265e15835bd9e96ebc8f
+EBUILD intel-neo-20.37.17906.ebuild 1198 BLAKE2B 60f0e920cb2b2f0f779726107d99ac7f2ea6720717093beb8d2f779794de35405e5aa514cb44492d27b3cee459c37bcfb6b70d7f7de219e241abb6eb3888c198 SHA512 e23cbc54ee00785599fc35375f44978e72a3d3deab9e264be68b7c29ccd4497aa00cd95802cb92362a505b5877719dd72f8d98c3224b3dd6e3b4bf3ba8b6f625
 MISC metadata.xml 1173 BLAKE2B 60913d5c1e3b546b4a9a8f35341761a89a4c8e1a7ed3c63ba992eabfc28c01f790f1eb006220ccb3c764a0b6325e6e8f56186a058ec9387226eb2a911c9b73c2 SHA512 f2b373b08f2b599a1dcaef3ea32157a7278c8088a247d8275f68a35730ee28d065acdf8e99287a853a0a761bc497a5e48c72c3352a8f8cdbc9828134bab6c602
diff --git a/dev-libs/intel-neo/intel-neo-20.37.17906.ebuild b/dev-libs/intel-neo/intel-neo-20.37.17906.ebuild
new file mode 100644
index 000000000000..d5b0ed670f89
--- /dev/null
+++ b/dev-libs/intel-neo/intel-neo-20.37.17906.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_PN="compute-runtime"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Intel Graphics Compute Runtime for L0 and OpenCL, for Broadwell and beyond"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="l0 vaapi"
+
+BDEPEND="virtual/pkgconfig"
+COMMON=">=virtual/opencl-3
+	>=dev-util/intel-graphics-compiler-1.0.4944
+	>=media-libs/gmmlib-20.2.5
+	l0? ( >=dev-libs/level-zero-1.0.0 )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)"
+DEPEND="${COMMON}
+	media-libs/mesa"	# for Khronos OpenGL headers
+RDEPEND="${COMMON}"
+
+DOCS=(
+	README.md
+	FAQ.md
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKHRONOS_GL_HEADERS_DIR="${EPREFIX}/usr/include"
+		-DBUILD_WITH_L0=$(usex l0)
+		-DDISABLE_LIBVA=$(usex vaapi "no" "yes")
+		# If enabled, tests are automatically run during the compile phase
+		# - and we cannot run them because they require permissions to access
+		# the hardware.
+		-DSKIP_UNIT_TESTS=ON
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 65a74943ee36..b802d569cb50 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -4,6 +4,6 @@ AUX json-c-0.14-security-fix.patch 4830 BLAKE2B a8df7709bd2924946b038ed724a2e764
 DIST json-c-0.14.tar.gz 321677 BLAKE2B 39325988dd58dad589fc0f036c17b2337c81cf7aab8ecb2232f8d59fef9d38df28e096f8d22320e0003799d477debddc4926eaa7a170954263c6b303c1fa056e SHA512 75537c61d0632a01f94d2394d7a4387ef1eca0b68aa56c495d3d96dd29b38ed20eb0cc3f6e5e24dc6660c8939669f8954005d9c3ba20437f3fcc9f9dd896b00d
 DIST json-c-0.15.tar.gz 361488 BLAKE2B ae34f6dd45ebee55e6413ecb234e48fa5ae1c17e6fa12462aaaa04e8801457060e176abe90d76d04ad0ee9b903ff467bc3b8ed5816792da175aad8862b9d168e SHA512 dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34
 EBUILD json-c-0.14-r3.ebuild 1246 BLAKE2B c06d68d6aaa52c0281841ab0de9d58923da4b1dc5c1c6ecbaa633cfce307ced0da8e2d0e2800cc20eb2fd9dfdb93e5d6ffcc5acb474d6a7c3f7e394bada5ecde SHA512 14e8374030a30f813395ce4454ce4a1e218c3c7da33ef9f5970e2b6718dbd034a2d4bcbd058989fb559a7f1f2418bfca091f50b5e5422bb9ee286f18fc910d50
-EBUILD json-c-0.15.ebuild 1088 BLAKE2B 35163236be8dd02be52b2adfcfe667774f7cc7ab778f512782e670e1bed1dc13a7fd1122a06fa1540eae8edef25ba4060bfc2d1b5c7e2f54f18f4a5befc4cdac SHA512 a70cf49c56264f735cc7dd9611e9bf84d4ac128d79591150418c45f2890771adb5694064428a3b67c6682b4fa75cc8ded96ac1ea780cd6a0c14bfc1f7ba16f47
+EBUILD json-c-0.15.ebuild 1085 BLAKE2B 8bea9975427aef1949cd491bb742c3c76d0d2ec2cba6aad7960d13b79bff0a6572ca8921700f3f2313ddfb6af4977e742f1b4d03701e54f560393595e9a57552 SHA512 15d69aff34c431107940a7fe6bd0604749230ace47df22f616bd430ad8ec44f5f5ea40edb36449977064c1132e268427e04138fe002567722733c3201f0f7290
 EBUILD json-c-9999.ebuild 1015 BLAKE2B 4d5baa21396b2dba874146c9d8bba5bfbbd69174f7a5fa0a2f2f298c1a7118a72ba3a9f73470b697b20e6fb922dc84933b7aceaf471c2ce6ac20dd0d701b0a15 SHA512 28b3443e3b9bc50d0bb36c6fe1b98d68cc00899f5facbeb421c2e98178255d9d61e105731837ff21cd05f725095b34963121dc09e1147ec08480d30ca8fe4aaa
 MISC metadata.xml 984 BLAKE2B 392320cc8a02c2d1cd3190d7f0631771d6be73a131a68602c4f25a22fd6e22e00e491415a36708a739363de526b5497517544f95582f69fbe2dfd8ae89f308f7 SHA512 207f7d87d807b29467e23f7609a2a041eac3a9444d93b23d8950605cc7230212ee44f4e20dffb90d843937876fba63f4b477bc35e5a2cd3118adbc1ce3cc6e05
diff --git a/dev-libs/json-c/json-c-0.15.ebuild b/dev-libs/json-c/json-c-0.15.ebuild
index 1aeea78bc685..dcdc8fd0cc0c 100644
--- a/dev-libs/json-c/json-c-0.15.ebuild
+++ b/dev-libs/json-c/json-c-0.15.ebuild
@@ -12,7 +12,7 @@ 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cpu_flags_x86_rdrand doc static-libs threads"
 
 BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )"
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index fb7f0b709573..5d925f5d4c5a 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -1,16 +1,6 @@
-AUX libaio-0.3.109-install.patch 1506 BLAKE2B 733b48b124716e3e6af3d383995c5d5b22ebb9ed9c0b732a1615694ee7220d4effb3889c11a2d0089d24d3f3d1a43a94cfc0101dce7d2256bb4084e92d3e5931 SHA512 67c7813c573637fb16f930a4a5eed53c04b520356caa809ec3cdfd1ea587d09a30024f41d03264a31e3ae4410b01193f87e14a40b85a93591573516905abd79e
-AUX libaio-0.3.109-testcase-8.patch 579 BLAKE2B 4abbd4d6ef0f4e3f1fdb07802123431128d828a1b05998388fa701b0ecd1f79ab91f2c4aebc4e21beabd4fe1e20be5b28b3d49ccdcd1b70df2d61222c2bae117 SHA512 e39ea546c9035d064f18845ffd2987254eb0205bfe220639df295498aea8a1003d83142c0a8de3d73c7178ad2ccb784e898c5586083ea2b2193d480948828a3c
-AUX libaio-0.3.109-x32.patch 2122 BLAKE2B 45d7487af74f14cb5212cdd87137de0714a91ddb123492e7bb7a9dce6b5d0e2a2233809bcd12ddd622c348677eefaeafa26a7423e419a67c5d447d600cb30a92 SHA512 0de645aa290919de0c82c26a0ecbed1d27dc3fdeeb909a86f36ee875afae2803ce97e0088c75e47a1de1cef99527659da75b9e17e5c310a1a518eb02a948a0b2
-AUX libaio-0.3.110-cppflags.patch 629 BLAKE2B 0fb7bee48ba36c68aad96f76254fb7efaa158158f7b786bc4e3b92fefb01cde79363b1ee9898d4b0a9b8637d32d7b0148b217291f3ea493c45fb29539e0e647e SHA512 b39fabcb37e75ab9300d78476a7468359efa883a49822db28d11d305d557f835ac9245b9c8c3e0a8ff6c7fd70125c841056f1e22175025d16a99ce94f849f80c
-AUX libaio-0.3.110-link-stdlib.patch 731 BLAKE2B 9599f75d405de3c1fd38c15cdcac6c65e624674d0be01982d13480fa0fe4020ebfebf0d22b1614cb70d4533f93d1dd58f293aff314a414d84c94fbab499db3da SHA512 b434da8190ca145fcdd64aa788be5d8bd1b44c112e117bfb8583cce91cfdcfb52038189bd9c92d690286e6576d82e74e62b465585f6333f1a920769ddbe29c32
-AUX libaio-0.3.110-optional-werror.patch 832 BLAKE2B d732c6c15247a6b601e4296acfe9733109360dc57f4397f7ae35a207b5c98e652d9c9dd67d52bf4997a26498a58722a77dcceb01df9b0b39289f51596e39aa2d SHA512 14b73acded7f67d01e199c411f2ea090b1d0d666521233d3829ca76572d6962f5dc3560096dc10e13c342eed046fb47a6e370e57fceab457696fad6c888a5067
 AUX libaio-0.3.111-optional-werror.patch 911 BLAKE2B f6ce9b16bfe7d3fe3fde520c4e6438b534b1ea54561faf94229cbdaa2cae40ee6e6ab0e9a689f08f7e43442d1b863bdf2c42e784774cca89003feb5dbbffd63b SHA512 8315c9ca018578d4b8e81b87ce155d8ebfc586be68f24659a91f027449cd27a9660b2cf33ce47fcf240ce44f2b7f1095e8d5996ad08782d91392f6dd8fafa5a8
 AUX libaio-0.3.112-cppflags.patch 350 BLAKE2B 8c2d0706f92a47dffff6465712588b525b89ff223019cf3ec759beca14ff2ef9515d4b3697ca64931c2d86969a40ad74642aa06544cc2671906e5b49d2e10352 SHA512 7386d741658af265cc4f156d4cc8518a7ec9abc15e8738cb13c2e2c3827b284cf8f8ee07c4a16dd0b7ae424cf87e9aad438389f0a832dac2e49ef945e3829374
-DIST libaio-0.3.110.tar.gz 42270 BLAKE2B e774e5888106ffcf4db08569a8b3dc6722f4e0e8278e9f2fafe865e282c0568059e8dbb37aab7a33719ab4d80f42404bfb1d4ab03f5c066d9eb75301676f525e SHA512 664295d330d6e9adc005e2331e77582619625b479ffc2b81728ba6a682487380ee936079c4a69d35144b458bbe35c612f4ed9b32e913bd7e109b824345763eb3
-DIST libaio-0.3.111.tar.gz 44557 BLAKE2B dc2f44599218de0ca80cfc17f604eb85c9b1241ce7221f49f1a4ee8c5bd3fa135c29ac8d97f6f97550a508e27b0dc92eb709256ffd803c1feca255016a4d674d SHA512 259b89647e22ba47edd4076b8d6aa8ab89af197b64930aa5b01b69fc1969b13b4a5e91c449ccdc9b2746c9eae3160211ce1fe110d252efeca5f2c56d0ea66e2e
 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
-EBUILD libaio-0.3.110.ebuild 2250 BLAKE2B a1f396b417bb1b8c2579e3ca589d9e6df24818b13084d09fd480a8f64ab19eef5aa2a543f7e467786ef4177ebce3bf60b8f893b21ddcdc529e0026f14a1f6c74 SHA512 569e5ec134506b4e20f4eeb586dd88e3f2bdefcb737300fb4c6f103876207d1bd60fdb76f2e3b1b4d4ca4984a96efb1ee924d16547e1faf36dbeca28507c12b0
-EBUILD libaio-0.3.111.ebuild 2232 BLAKE2B 81065497e191a4e62b17d61df604b073522dbe9ced1ebd162081fca73765fcec638cc2d40ddf70daa11480c75ea51ef3197fc4905791721db96a7cb5721c4a82 SHA512 0f374c61ef9f6567739b5d948749184ef8e60ab5c9bf005f20339ed5199a954a64816998fcc060bd7b953fc17db02bca4654f8d426c2c088f07437e1fcb4797d
-EBUILD libaio-0.3.112.ebuild 2125 BLAKE2B ac8267b79002054a25bcbea0ee87bd181a5a5ad02477c580b02545fb258be3e31bcf40277dbde435f747c0e8148444ddd0d98636f66e047796b876f88ed8b847 SHA512 baf0dd21b9fa63ff80a80080afa387f359414017fd2741c0ce514096158b9135e95a0e39951f96ad8ff829c954674d2db3e136ca93a5a698b2eca9f04d7a19ed
+EBUILD libaio-0.3.112.ebuild 2124 BLAKE2B b3016e52def118b2b7d7b7bb8d4f1d9d1439497c91b1116245d6a82729077ae41832700cc00d3ca8e3d8f3fc09f3a9e5de55f959e1af310497cfb2d2187edecc SHA512 55aaef6e962dc5aeb65da6922988d4c3aa18724b5c75d2aa2f39700ad7efcc7724e13d3d5feaaacefb539a3081041e708514ae14e24df8d7719c4d7979fc7c7b
 EBUILD libaio-9999.ebuild 2133 BLAKE2B fe7d9b4ce5833f1c69d3a8fd96ca96fbed6a6a3c258c11ede1cced85ea0bea6bdcf69fc0465ba34807a40e18a7e2969dabe7b7b40ad68edce4e20c80adb0ee1b SHA512 b66c4a780ba95d16eb7e0c9f8bd7d432c864a22bcfa3d06d6954de02e95c891a1dda29893da944ebd1b817ac83afdbc351ede92f065059c50861c7a17d100232
 MISC metadata.xml 414 BLAKE2B 291cfb45ed8ed29e916e1873b00685eb32f2cfdca2f225176028fda48335bff8369d1084565acc79d58bcf1c69af752efc0f7d30fa775406be03ce432c56c5df SHA512 31c76d1e4bb0c87402c00bdef098bf930b273cdf6c631a704fb02f925a3cdfebcded9d33d31f10cdd8c9ae2ab9bb71dd2cd0113029df501ad83a5a92b611b7c8
diff --git a/dev-libs/libaio/files/libaio-0.3.109-install.patch b/dev-libs/libaio/files/libaio-0.3.109-install.patch
deleted file mode 100644
index 9c049fcbf5cd..000000000000
--- a/dev-libs/libaio/files/libaio-0.3.109-install.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2e34caef82a2367a85de4f06daf5e5a92f61e845 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 17 Jan 2010 17:10:14 -0500
-Subject: [PATCH] fix up install paths
-
-This is similar to the Fedora patch, but this uses more common conventions
-like "DESTDIR" instead of "destdir".
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- src/Makefile |   11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 687c7be..ee431a1 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,6 +1,7 @@
- prefix=/usr
- includedir=$(prefix)/include
- libdir=$(prefix)/lib
-+usrlibdir=$(libdir)
- 
- CFLAGS ?= -g -fomit-frame-pointer -O2
- CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC
-@@ -53,11 +54,11 @@ $(libname): $(libaio_sobjs) libaio.map
- 	$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname,$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
- 
- install: $(all_targets)
--	install -D -m 644 libaio.h $(includedir)/libaio.h
--	install -D -m 644 libaio.a $(libdir)/libaio.a
--	install -D -m 755 $(libname) $(libdir)/$(libname)
--	ln -sf $(libname) $(libdir)/$(soname)
--	ln -sf $(libname) $(libdir)/libaio.so
-+	install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h
-+	install -D -m 644 libaio.a $(DESTDIR)$(usrlibdir)/libaio.a
-+	install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname)
-+	ln -sf $(libname) $(DESTDIR)$(usrlibdir)/$(soname)
-+	ln -sf $(libname) $(DESTDIR)$(usrlibdir)/libaio.so
- 
- $(libaio_objs): libaio.h
- 
--- 
-1.7.3.1
-
diff --git a/dev-libs/libaio/files/libaio-0.3.109-testcase-8.patch b/dev-libs/libaio/files/libaio-0.3.109-testcase-8.patch
deleted file mode 100644
index de66f2110f22..000000000000
--- a/dev-libs/libaio/files/libaio-0.3.109-testcase-8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Do not ignore return value of ftruncate(): testcases are compiled with -Werror,
-and ftruncate is declared with attribute warn_unused_result.
---- harness/cases/8.t.orig	2012-03-09 16:40:04.074168070 +0100
-+++ harness/cases/8.t	2012-03-09 16:40:57.777278646 +0100
-@@ -9,12 +9,13 @@
- {
- 	long long min = 0, max = 9223372036854775807LL;
- 	char c = 0;
-+	int ret;
- 
- 	while (max - min > 1) {
- 		if (pwrite64(fd, &c, 1, (min + max) / 2) == -1)
- 			max = (min + max) / 2;
- 		else {
--			ftruncate(fd, 0);
-+			ret = ftruncate(fd, 0);		assert(ret == 0);
- 			min = (min + max) / 2;
- 		}
- 	}
diff --git a/dev-libs/libaio/files/libaio-0.3.109-x32.patch b/dev-libs/libaio/files/libaio-0.3.109-x32.patch
deleted file mode 100644
index 1d2c2a9050fa..000000000000
--- a/dev-libs/libaio/files/libaio-0.3.109-x32.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=f5c071d93c9e6f57930bce56b1e4f009c160a826
-
-Upstream-Status: Pending
-
-Properly load arguments 5 an 6 for x86-64 syscall
-Use asm ("r10") and asm ("r8") to load arguments 5 an 6 for x86-64
-syscall so that it works with both x32 and x86-64.
-
-Received this patch from H.J. Lu <hjl.tools@gmail.com>
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-2011/12/02
-
---- libaio-0.3.109/src/syscall-x86_64.h.x32	2009-10-09 11:17:02.000000000 -0700
-+++ libaio-0.3.109/src/syscall-x86_64.h	2011-12-02 09:09:07.537603224 -0800
-@@ -1,8 +1,18 @@
-+#ifndef __NR_io_setup
- #define __NR_io_setup		206
-+#endif
-+#ifndef __NR_io_destroy
- #define __NR_io_destroy		207
-+#endif
-+#ifndef __NR_io_getevents
- #define __NR_io_getevents	208
-+#endif
-+#ifndef __NR_io_submit
- #define __NR_io_submit		209
-+#endif
-+#ifndef __NR_io_cancel
- #define __NR_io_cancel		210
-+#endif
- 
- #define __syscall_clobber "r11","rcx","memory" 
- #define __syscall "syscall"
-@@ -42,10 +52,11 @@ return __res;								\
- type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4)		\
- {									\
- long __res;								\
--__asm__ volatile ("movq %5,%%r10 ;" __syscall				\
-+register long __a4 asm ("r10") = (long) arg4;				\
-+__asm__ volatile (__syscall						\
- 	: "=a" (__res)							\
- 	: "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)),	\
--	  "d" ((long)(arg3)),"g" ((long)(arg4)) : __syscall_clobber,"r10" ); \
-+	  "d" ((long)(arg3)),"r" (__a4)); \
- return __res;								\
- } 
- 
-@@ -54,10 +65,11 @@ return __res;								\
- type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5)	\
- {									\
- long __res;								\
--__asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; " __syscall		\
-+register long __a4 asm ("r10") = (long) arg4;				\
-+register long __a5 asm ("r8") = (long) arg5;				\
-+__asm__ volatile ( __syscall						\
- 	: "=a" (__res)							\
- 	: "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)),	\
--	  "d" ((long)(arg3)),"g" ((long)(arg4)),"g" ((long)(arg5)) :	\
--	__syscall_clobber,"r8","r10" );					\
-+	  "d" ((long)(arg3)),"r" (__a4),"r" (__a5));			\
- return __res;								\
- }
diff --git a/dev-libs/libaio/files/libaio-0.3.110-cppflags.patch b/dev-libs/libaio/files/libaio-0.3.110-cppflags.patch
deleted file mode 100644
index 4567ac946681..000000000000
--- a/dev-libs/libaio/files/libaio-0.3.110-cppflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3bf96bb62370035dba18d4b25459406b32365cfc Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 26 Mar 2014 23:10:18 -0400
-Subject: [PATCH] respect env CPPFLAGS
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- src/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Makefile b/src/Makefile
-index 49f448f..b918c8b 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -5,6 +5,7 @@ usrlibdir=$(libdir)
- 
- CFLAGS ?= -g -fomit-frame-pointer -O2
- CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC
-+CFLAGS += $(CPPFLAGS)
- SO_CFLAGS=-shared $(CFLAGS)
- L_CFLAGS=$(CFLAGS)
- LINK_FLAGS=
--- 
-1.9.1
-
diff --git a/dev-libs/libaio/files/libaio-0.3.110-link-stdlib.patch b/dev-libs/libaio/files/libaio-0.3.110-link-stdlib.patch
deleted file mode 100644
index 696a928f24d8..000000000000
--- a/dev-libs/libaio/files/libaio-0.3.110-link-stdlib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Gokturk Yuksek <gokturk@binghamton.edu>
-Subject: [PATCH] Link against stdlib to resolve fortified functions
-
-When '-fstack-protector-strong' is included in CFLAGS, the function
-'__stack_chk_fail_local' needs to be pulled from libc. However, upstream
-uses '-nostdlib' to avoid linking against any C library or gcc libs. Remove
-'-nostdlib' and '-nostartfiles' to pull the required symbols from libc.
-
-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=558406
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -4,7 +4,7 @@
- usrlibdir=$(libdir)
- 
- CFLAGS ?= -g -fomit-frame-pointer -O2
--CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC
-+CFLAGS += -Wall -I. -fPIC
- CFLAGS += $(CPPFLAGS)
- SO_CFLAGS=-shared $(CFLAGS)
- L_CFLAGS=$(CFLAGS)
diff --git a/dev-libs/libaio/files/libaio-0.3.110-optional-werror.patch b/dev-libs/libaio/files/libaio-0.3.110-optional-werror.patch
deleted file mode 100644
index 2933cf5244bc..000000000000
--- a/dev-libs/libaio/files/libaio-0.3.110-optional-werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0cc7dc108d0b2288b40d82bb2fd1fd8bdc08f764 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 26 Mar 2014 23:07:58 -0400
-Subject: [PATCH] make -Werror into an optional flag
-
-This lets distros disable the flag as random errors might come up with
-different compiler flags and older/newer toolchain versions.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- harness/Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/harness/Makefile b/harness/Makefile
-index 2a88e71..cf8c90d 100644
---- a/harness/Makefile
-+++ b/harness/Makefile
-@@ -6,7 +6,8 @@ PROGS:=$(PARTPROGS) $(EXTRAPROGS)
- HARNESS_SRCS:=main.c
- # io_queue.c
- 
--CFLAGS+=-Wall -Werror -I../src -g -O
-+CFLAGS_WERROR?=-Werror
-+CFLAGS+=-Wall $(CFLAGS_WERROR) -I../src -g -O
- #-lpthread -lrt
- 
- all: $(PROGS)
--- 
-1.9.1
-
diff --git a/dev-libs/libaio/libaio-0.3.110.ebuild b/dev-libs/libaio/libaio-0.3.110.ebuild
deleted file mode 100644
index 0fc7844e2691..000000000000
--- a/dev-libs/libaio/libaio-0.3.110.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib-minimal toolchain-funcs flag-o-matic usr-ldscript
-
-DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
-HOMEPAGE="http://lse.sourceforge.net/io/aio.html"
-SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.3.109-install.patch \
-		"${FILESDIR}"/${PN}-0.3.109-x32.patch \
-		"${FILESDIR}"/${PN}-0.3.109-testcase-8.patch \
-		"${FILESDIR}"/${PN}-0.3.110-cppflags.patch \
-		"${FILESDIR}"/${PN}-0.3.110-optional-werror.patch \
-		"${FILESDIR}"/${PN}-0.3.110-link-stdlib.patch #558406
-
-	local sed_args=(
-		-e "/^prefix=/s:/usr:${EPREFIX}/usr:"
-		-e '/^libdir=/s:lib$:$(ABI_LIBDIR):'
-	)
-	if ! use static-libs; then
-		sed_args+=( -e '/\tinstall .*\/libaio.a/d' )
-		# Tests require the static library to be built.
-		use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' )
-	fi
-	sed -i "${sed_args[@]}" src/Makefile Makefile || die
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	if use arm ; then
-		# When building for thumb, we can't allow frame pointers.
-		# http://crbug.com/464517
-		if $(tc-getCPP) ${CFLAGS} ${CPPFLAGS} - <<<$'#ifndef __thumb__\n#error\n#endif' >&/dev/null ; then
-			append-flags -fomit-frame-pointer
-		fi
-	fi
-}
-
-_emake() {
-	CC=$(tc-getCC) \
-	AR=$(tc-getAR) \
-	RANLIB=$(tc-getRANLIB) \
-	ABI_LIBDIR=$(get_libdir) \
-	CFLAGS_WERROR= \
-	emake "$@"
-}
-
-multilib_src_compile() {
-	_emake
-}
-
-multilib_src_test() {
-	mkdir -p testdir || die
-	# 'make check' breaks with sandbox, 'make partcheck' works
-	_emake partcheck prefix="${S}/src" libdir="${S}/src"
-}
-
-multilib_src_install() {
-	_emake install DESTDIR="${D}"
-}
-
-multilib_src_install_all() {
-	doman man/*
-	dodoc ChangeLog TODO
-
-	# move crap to / for multipath-tools #325355
-	gen_usr_ldscript -a aio
-
-	# This lib is a bare minimal shim on top of kernel syscalls.
-	export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n')
-}
diff --git a/dev-libs/libaio/libaio-0.3.111.ebuild b/dev-libs/libaio/libaio-0.3.111.ebuild
deleted file mode 100644
index 904ebacb9c98..000000000000
--- a/dev-libs/libaio/libaio-0.3.111.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs flag-o-matic usr-ldscript
-
-DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
-HOMEPAGE="https://pagure.io/libaio"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://pagure.io/libaio.git"
-else
-	SRC_URI="https://pagure.io/${PN}/archive/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.109-install.patch
-	"${FILESDIR}"/${PN}-0.3.110-cppflags.patch
-	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
-	"${FILESDIR}"/${PN}-0.3.110-link-stdlib.patch #558406
-)
-
-src_prepare() {
-	default
-
-	local sed_args=(
-		-e "/^prefix=/s:/usr:${EPREFIX}/usr:"
-		-e '/^libdir=/s:lib$:$(ABI_LIBDIR):'
-	)
-	if ! use static-libs; then
-		sed_args+=( -e '/\tinstall .*\/libaio.a/d' )
-		# Tests require the static library to be built.
-		use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' )
-	fi
-	sed -i "${sed_args[@]}" src/Makefile Makefile || die
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	if use arm ; then
-		# When building for thumb, we can't allow frame pointers.
-		# http://crbug.com/464517
-		if $(tc-getCPP) ${CFLAGS} ${CPPFLAGS} - <<<$'#ifndef __thumb__\n#error\n#endif' >&/dev/null ; then
-			append-flags -fomit-frame-pointer
-		fi
-	fi
-}
-
-_emake() {
-	CC=$(tc-getCC) \
-	AR=$(tc-getAR) \
-	RANLIB=$(tc-getRANLIB) \
-	ABI_LIBDIR=$(get_libdir) \
-	CFLAGS_WERROR= \
-	emake "$@"
-}
-
-multilib_src_compile() {
-	_emake
-}
-
-multilib_src_test() {
-	mkdir -p testdir || die
-	# 'make check' breaks with sandbox, 'make partcheck' works
-	_emake partcheck prefix="${S}/src" libdir="${S}/src"
-}
-
-multilib_src_install() {
-	_emake install DESTDIR="${D}"
-}
-
-multilib_src_install_all() {
-	doman man/*
-	dodoc ChangeLog TODO
-
-	# move crap to / for multipath-tools #325355
-	gen_usr_ldscript -a aio
-
-	# This lib is a bare minimal shim on top of kernel syscalls.
-	export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n')
-}
diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
index f8b29796145c..4795bb4a812b 100644
--- a/dev-libs/libaio/libaio-0.3.112.ebuild
+++ b/dev-libs/libaio/libaio-0.3.112.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://pagure.io/libaio.git"
 else
 	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index c2ac3df21866..1289eecee3de 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -9,5 +9,5 @@ EBUILD libarcus-3.6.0.ebuild 1121 BLAKE2B 060bf6c289603efb42deec75419d01ca4e566f
 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
-EBUILD libarcus-4.7.0.ebuild 1289 BLAKE2B 1e84873d98a85133a6432e9b46fb89591a0a59c2c36dab0f151836af095943d6268e39d50051d681af2eb55cc83fe1baea152ee8c317147ccabb279b4f897f84 SHA512 f41d1a13f6f308b11578dcba651f291231ef42a6a349d34f1c9f4ce48305f1a30a2870458f170cc276fb333954ee7a58ee366e1e4a39327caee6fb595277a187
+EBUILD libarcus-4.7.0.ebuild 1296 BLAKE2B 46122f8ecd8ca43cdec1a249d01198b5e5d72257d69c42a11ab3fe3bc8b555e68cbbafe548f6cd30bb53573b5fd5379208cc90c37378393eef177618152aecfa SHA512 4575ab25cd24d8745f8a19ccee7fd0157e4fcdf7cf2ea74db4cf1e96cfd941436351117b6f3d50641b9cbbe669b7289628d0d3df4dfd9d1a0c5a54da0802a928
 MISC metadata.xml 1175 BLAKE2B 61f841d29c806ed268ad8012ec6207ad00e404d31ce17ab6a94a72a5b14bf4f7c4220ad95ba527f4004f04fdfce7fa6aa868297bae1842467c7e8bfd022977c8 SHA512 7d2add76530f8977dc69996c7e627e7ecb7f875b4d048b866f2a61c198b457a672bea2173a3bfdc32a68e6f455d484c3a884683a01d785c1fed3d2741d61ac49
diff --git a/dev-libs/libarcus/libarcus-4.7.0.ebuild b/dev-libs/libarcus/libarcus-4.7.0.ebuild
index a3f66acd8767..206f0bdccb7e 100644
--- a/dev-libs/libarcus/libarcus-4.7.0.ebuild
+++ b/dev-libs/libarcus/libarcus-4.7.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-3"
 SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="examples +python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 9cf55f52bb10..99ff2f7ea6a9 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,6 +1,3 @@
-DIST libassuan-2.5.1.tar.bz2 564857 BLAKE2B dc046b9551183ec543d2a186c3c593471c80445b48aec1366d0b997386c57187f9b7a848973d0930ca8d2be3f138e83c22ef9292e4c8bf5614a99ea3065c7827 SHA512 c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d
 DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a SHA512 e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617
-EBUILD libassuan-2.5.1-r1.ebuild 1258 BLAKE2B efa52147c6b3c42086196503ff9d516bb9a9fbede7d648ed36fa98a4a056dc6382428838abcb50e7fad34db24a0ad68a002d33e9b447cf34c61032b987be8f90 SHA512 d24e6d34d0c198bc52d6370c54f764ffa1c4ea20cc49badeebfa879639ac8d4c4d0ad354b2eb1a229e501986390983d02d80d9a6babfd03ecace44d24600c116
-EBUILD libassuan-2.5.1.ebuild 1060 BLAKE2B 00418cde3ff85a1d9d35a248dbada254770b7537198ca794d77186d748114c70efb25ff07bb0e501328800543406d8881f3e1b188f3f086a14ca384b62cfb784 SHA512 13faafbcaffa9da2e873816478b2d5f0411596c34503667a27ba9c8aa5c5b024453d0d070f57054fef72023a7d818cbfbaa51daece2f436187b8e8fe5bdf88ee
-EBUILD libassuan-2.5.3.ebuild 1258 BLAKE2B 76494ac9a7bf2561a31f4c15352a8e240d3f0044918fedcf3479d451bb1b1d1d7ffd8689d8f40efa234f8dcf9b4840830698b1e2dd024e1b2b94e42563c40928 SHA512 a76496460ffd556e810693a904be16a56bde374775f7e25eee9e264151087c4827301d505c9319dd7f5fde49c62a15e469618e68f728097de1045e2084598011
+EBUILD libassuan-2.5.3.ebuild 1223 BLAKE2B cf011f69d8ed47b936561330c6401a660314364b813abfd67b59c08004512406b6526fab81004410b666cf4a8e0afba337cf9fe64e32136199b2e195d08bcda6 SHA512 6f1b1d362c384699a31074f266d25bcb011cd5400bceb7462294bfe343b6f6a6ad64fd4c66384d6c5604569e5bd07df0e57bc421ae8532059c16057033bb2d6b
 MISC metadata.xml 869 BLAKE2B 0553da6ce347ea1413910cd3dc422a28201982403a08bdc4725c35c764b97e488fdb361980a6759d7545e474291fd26ede24883875f2feff39ff555ed63dfe9e SHA512 b9561c267faae23ed753f61024c97b2da74c48682183ad4c2291910073530a389f6b416c5ecfae9b28b593d1b48b92802d64f4c5fcc917cd6d70818e0c5e080a
diff --git a/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild b/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
deleted file mode 100644
index 640a53fdf86d..000000000000
--- a/dev-libs/libassuan/libassuan-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool
-
-DESCRIPTION="IPC library used by GnuPG and GPGME"
-HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-2.1"
-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}"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		elibtoolize
-
-		# fix standards conflict
-		sed -i \
-			-e '/_XOPEN_SOURCE/s/500/600/' \
-			-e 's/_XOPEN_SOURCE_EXTENDED/_NO&/' \
-			-e 's/__EXTENSIONS__/_NO&/' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# ppl need to use libassuan-config for --cflags and --libs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libassuan/libassuan-2.5.1.ebuild b/dev-libs/libassuan/libassuan-2.5.1.ebuild
deleted file mode 100644
index a3f9a416bbcf..000000000000
--- a/dev-libs/libassuan/libassuan-2.5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune
-
-DESCRIPTION="IPC library used by GnuPG and GPGME"
-HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 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}"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		elibtoolize
-
-		# fix standards conflict
-		sed -i \
-			-e '/_XOPEN_SOURCE/s/500/600/' \
-			-e 's/_XOPEN_SOURCE_EXTENDED/_NO&/' \
-			-e 's/__EXTENSIONS__/_NO&/' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	# ppl need to use libassuan-config for --cflags and --libs
-	prune_libtool_files
-}
diff --git a/dev-libs/libassuan/libassuan-2.5.3.ebuild b/dev-libs/libassuan/libassuan-2.5.3.ebuild
index 68a274079307..c712d1fa6158 100644
--- a/dev-libs/libassuan/libassuan-2.5.3.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.3.ebuild
@@ -12,7 +12,6 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-2.1"
 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}"
@@ -34,7 +33,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		$(use_enable static-libs static)
+		--disable-static
 		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
 	)
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index c8a520ff3545..ee91b0827073 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -2,8 +2,10 @@ DIST libcbor-0.5.0.tar.gz 719348 BLAKE2B 57e15e648159e7858d9d57a8b4cb7f3682f8153
 DIST libcbor-0.6.0.tar.gz 262622 BLAKE2B 2d3bc10bdb69c9205430718a8f2652672a8fa580ba7951c4012bdc8b502a9d6dcb26f398740f5fd35dfe0634f8e3d8ddf7eff5b9ec35c95cdc5383e2dce9f0ab SHA512 6adbb32780d428140388295c5d740bd77b0ae7b21e3f73629ba56a3aa4e4ee5dbb715454061b0f6f67f2b19ea8366e0e5c24f4ffb1ba629afcb7a776a15045f7
 DIST libcbor-0.6.1.tar.gz 263486 BLAKE2B 9a2415c1dde7ed611075c3b03ea1d8ab63bcb00dfc0cae3d7a3bb225b6fbee2a8f576b1f0f97eb6f0cf14c1a6e9df1c77f69320bac041287b0dec37c073f8b85 SHA512 dc9bb7d18b934fe33faabe30010425cb272d7e135f3bf233554bc934b1701f85c7b662e0d5a6a1921c21cd46acb4393600e9adc05b09d1b2a8e3c92ca9d7e4e8
 DIST libcbor-0.7.0.tar.gz 266323 BLAKE2B 76f93d3199e703c4167aeed262da7ba78d1df82e081754609391572b89f216efba0c54511d4021049fc6c62ab01b08835f02a58bbf226d973174b37eff087761 SHA512 4e2ed55ef17b8b77f82d780b1ee998d0342b67e6beabc24795117e5e222549640fe7fd261c8e78524d6489d03f7f5aa46b987709790a81f93e4d7409c32fecda
+DIST libcbor-0.8.0.tar.gz 267044 BLAKE2B e8548e7351984ebdcbeb5f13a7ca35412c3f3f05e2a44a5438d57b90bdcdc51f5265953163106f90ade911a96af665956ebeba7ed1c48cf207acf6d683af5606 SHA512 694d2d3a78d80072f96e0afb73590ca1f3572e41d2117330ef4313ed06271743b048d3ba3259c6ffe9a802d5e441379d0e54787d1d42fed08dc81ac4f06c6dbc
 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 1351 BLAKE2B 7744c2f1ce576b2de409979f5292411163d881e73217f09c9415310e69303aff380b58d97538dd4ba7259c3eeafee23c0efca26d32130d47d4bc12ab111f15ea SHA512 ebc838adb4ec17b9620a8b6011336dacac5af031fcaac37db3c9c7e55d3ae52d7d68700327d196a078a77ad63df31d1ea752779bd17c89b043eccd5ae28d0e4e
+EBUILD libcbor-0.8.0.ebuild 1360 BLAKE2B 20e3b784dfea24416c2d462917488f55b1ed0c813100c9f0366325b64fa22b501f7ab08d8577af1888bc494162cec18917ab1639dae7c908a4229bdeaaf9a27f SHA512 3c8721b654c33a57a0a06454e46c58b021698c0a648374a2dcd20743cb1751484717d300fa3c7f3e938ffad1624b8642b2ceca3e4a7c84c6c3e55d8aab59df4a
 MISC metadata.xml 353 BLAKE2B ac88c66fa58046797dba48cfe47fc42a3aaf8d8a256fab563def54d126c7ad903bc2d47095ca7221b84f0fd59bcbb6677ffaef9062c9c662ef95b02bf3563b99 SHA512 56f76a4b80d8cf12f854022c2c7353119b11052bf6d454b5d2f6427a02ab64176d2d7ecfadecabafceac6b7aa5ec066145a62831d33f09a829b37cdb8bec64cf
diff --git a/dev-libs/libcbor/libcbor-0.8.0.ebuild b/dev-libs/libcbor/libcbor-0.8.0.ebuild
new file mode 100644
index 000000000000..07dbf2319eae
--- /dev/null
+++ b/dev-libs/libcbor/libcbor-0.8.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-any-r1 cmake-utils
+
+DESCRIPTION="CBOR protocol implementation for C and others"
+HOMEPAGE="https://github.com/pjk/libcbor"
+SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+custom-alloc doc test"
+
+BDEPEND="
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/breathe[${PYTHON_USEDEP}]
+		')
+	)
+	test? ( dev-util/cmocka )
+"
+
+RESTRICT="!test? ( test )"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+python_check_deps() {
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/breathe[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DCBOR_CUSTOM_ALLOC=$(usex custom-alloc 'ON' 'OFF')
+		-DWITH_TESTS=$(usex test 'ON' 'OFF')
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		pushd doc >/dev/null || die
+		emake html man
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc; then
+		dodoc -r doc/build/html
+		doman doc/build/man/*
+	fi
+}
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index 4405b6a935b9..f53fda8a8225 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -9,5 +9,5 @@ EBUILD libcharon-3.6.0-r1.ebuild 583 BLAKE2B f8fcd59c85371cf9b74c0425b00bb84472f
 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
-EBUILD libcharon-4.7.0.ebuild 1773 BLAKE2B 4e4a5ee42866a68e96afae8329266ac7d6f70e627e22d971ebb73ac646accbeee79182e6c39cea761d2cbb84a97b7497a8f70e76213e1c189cb2c09882fa9309 SHA512 611e66601a587e243a57bd6ef286701e5b0ce484c306eff0f19ec5050c7ccdc7b11c2291899caeb2f820e047b635f0476727ba45e6923409732427fc736db681
+EBUILD libcharon-4.7.0.ebuild 1780 BLAKE2B a042010ac83d21edf3a2c7f03d8bc16d0e876f2182cde29975b62b84dc2caa1b4779620424b51165db5e74352f5f23207cef135c24448b7daff40ea24c158302 SHA512 0fb259054a968f0d3bd3cb36dfe425389393328611a6cc20fbd2c5c46091e791d0108e44fab1a679df3c42df49bccab11867aee4a55a0cc0924bab039d34966a
 MISC metadata.xml 1098 BLAKE2B 6167df47c3514dfd94d9e8d9046167ec1af4b02a224428671f3a3a70471f4fa81805ceb18c9ef85fa687e74c8229c2ee0d1601c9203c329b89644ad300611b30 SHA512 a41c8b8bf3904242479f66cae5875fe9991e8ad1b7cd706393570218c223985c15cce9701b4c4191a6b5b2d15d72a45e3743bfe4c6d985ee6861483ffa24b358
diff --git a/dev-libs/libcharon/libcharon-4.7.0.ebuild b/dev-libs/libcharon/libcharon-4.7.0.ebuild
index 5ebb18cff1f3..8d711b6d6bd4 100644
--- a/dev-libs/libcharon/libcharon-4.7.0.ebuild
+++ b/dev-libs/libcharon/libcharon-4.7.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-3"
 SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 IUSE="+client +dbus test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index e8fc6b09d9a2..fc23db0f7c0a 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -4,6 +4,6 @@ DIST libdnet-1.12.tgz 970125 BLAKE2B 74be00b6fe1c7848010a7044628a6ad8f4b2f2c4f96
 DIST libdnet-1.14.tar.gz 520833 BLAKE2B 97e241fc374fc9489e70d440db5e19199f4e653650af85e24af56bbbc0167db1c451349c43fcb630a26c61f8ca15c58f5c879e0d82654e275189ca3e140bb22a SHA512 ce8d95228f5175e4d9a8ff71bb99eb1ccc3ccd599a85dd07adbfd9842fc54066235d362c8060828fb3ba8129d0e1e8e071e93d60d69c6d03be310c80e61cea93
 EBUILD libdnet-1.12-r1.ebuild 1552 BLAKE2B 76c2f623188831fc9cbd7273ce90bb58eb2e35b19f9602a9ada16b533db237401f21bf2fc569a5a785f7d2e13057a78811a3a03d86ff1268237d3f9cc01cc38b SHA512 b8648b062ef377e0431210776add07d00dfd9647b801ad3b4a4d0a32cbdfa3a065706a66be71d137445887ba97d3588790b15b027a96e22596924bf7f01a8de5
 EBUILD libdnet-1.12.ebuild 1520 BLAKE2B ce48aaf6543ede9d1db165aee357c37447b1a75e48b23439ad2fb8b848edd003b6a1457b1407cbe6962759fc2ab20a1bf3f3ed9b70fa711b1ad28dad851f91b7 SHA512 7c7392c123fa430c97015eaf6d926a525791f0bcc51bda4c95cadc17267f52f99fd22d747b42060b9307324a601ec1d83b91399233991e87597f5bbc59038afd
-EBUILD libdnet-1.14.ebuild 1393 BLAKE2B a54414e2785c4a252a7d1a5115c02a2b1dfa70db2514ef11cad1763e5385123517595c2c8af4c71b71fb0d4251e23eafe9a6e48f050a49e89ae41665b7469335 SHA512 1bbad590fca8993856b27d043af0400c0e6363f129572c157c83f8f085bdc34a0ecc9d14360bad5768f36e7d645d259a5464fbab2f6b7f7169c224f3305b4a6e
+EBUILD libdnet-1.14.ebuild 1392 BLAKE2B 7f4c0e474d95df9dd74656d0eed6ead79c49c3f3acd3e2a814402973551367671e004c0d54c107411ab7b2211c9fae3497d403b2dc0cbff5c8a2876560515817 SHA512 38aeee160beebbd7302060171aa149ff456fd13482f8192beadbe240685785fe0410c189a15c3b2678bb2c9541fef3c8b850efa8b4bfe7ddae3bfe730eee57d8
 EBUILD libdnet-9999.ebuild 1304 BLAKE2B 42da11f210ae69feadac13950baa8194a817784c0c0e8bb31befc07f20bd842d81348b623137a4b8ca6b857cd45246e23d75db6a807e5710f70574cd4c61484a SHA512 9e432bb2bcee9baef6fbe8428da44455fb02e8e4b14fe3575194f2e1c1f9e5a38f8c57280350c1fc570f03753c5fe121a2e37580812d6e92af1a2e98cbf3513f
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/libdnet-1.14.ebuild b/dev-libs/libdnet/libdnet-1.14.ebuild
index 1208fdd5df3b..5fa7c8df3542 100644
--- a/dev-libs/libdnet/libdnet-1.14.ebuild
+++ b/dev-libs/libdnet/libdnet-1.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ofalk/${PN}/archive/${P}.tar.gz"
 LICENSE="LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="python static-libs test"
 
 DEPEND="
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 19999855b003..c208b5775873 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,6 @@
 DIST libevdev-1.9.0.tar.xz 443208 BLAKE2B 858567ec82f20d567f66d0c41bd1519ffd023a0374e346cff270a0bae0b5136a469a4fd56fcbd3d53b2a2ace6166821ec5e75c90e08eb347331e7974865ceda7 SHA512 6e7589b5776437ac23fbf65b3194fb1dd3a68a294696145060cdd97bcdeb9b04f355f2be028dc1a5efe98ef2cafca15e4f61115edf5d62591e3a8944dc95942a
 DIST libevdev-1.9.1.tar.xz 442740 BLAKE2B 8a0e6c555ffa09890556c33e346e03b878eb0dac8585164d7561b6e20e5795c39299508f761a1fa15737d0802e362ba5c9d17de89d96fb79f1bfa1afa28423ab SHA512 7d845ce2279d2e2ef12437f6218550265ea0c85e5b6c0d116aff09787b73626b338fe3084baff060085d393688b5ae3d33772689e0581684eff257af01c4c645
 EBUILD libevdev-1.9.0.ebuild 1198 BLAKE2B cb04493b3395c2936a7d7ae12a83fa2af05d3642c7751440087e978ab483d93feef05a8d1b951ad43a007b6481f8abfcb9f957811918682867e094ff8c51c1fc SHA512 eefca4687835e7d811fc7e4eaa73376989103b80f0aa32aa4c152133aaff001772fdf1de9adff315a25a99d8da7ce29e533de6439595bd4fd7a03beb0ebc777c
-EBUILD libevdev-1.9.1.ebuild 1206 BLAKE2B 6a612525acd49ad28d40e74e5e5f30c02e510fb9759d176ee4921b30d99380394af7e9ba44924d2096759710c2a50d34a6f122ab9c7a84619cfaa567206ed131 SHA512 f93d55cd425efeb3d1bed7cf9b28f369be35697db681c291b910733dffd1767cf904a88aec03666d3c4a0681b092f85bab68f57136ccb7e2d925bdae7856d9d2
+EBUILD libevdev-1.9.1.ebuild 1201 BLAKE2B 1b7f26a8cfef1dbb3020a3c4fbee8cd3a1bd1c596dbcad177015f644268de275b5d2d780cac4bbbab270fe78f10aea7c92030544c97faa9e5033cd99494234c4 SHA512 821d8608a6b206e423592bcff85c37dd612689e9b0c7d0a59b40d4ee2477271ad83d0c2268c9adf3583877395b0cef76a8f6495a8c79e6d2fcaa904f5fa99e2d
 EBUILD libevdev-9999.ebuild 1209 BLAKE2B 07dbb14d5f73ef70b6d919c3c6ec4e4022b1f89ff3c7c0260eea80129c581e0c785648b4050dba02b3961c50e677c3d149883e3c301627f1fe5be33519a93d64 SHA512 0fa7f48f6d8cd9d14354aa630626d4a5fbafe038aaefac78c2f031891fceea8448e89a78f35045ffabd324788b12960e620f85ee62d7461f51c1eba2cf13e28d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.9.1.ebuild b/dev-libs/libevdev/libevdev-1.9.1.ebuild
index 4396ffd27b3f..2a19758515cf 100644
--- a/dev-libs/libevdev/libevdev-1.9.1.ebuild
+++ b/dev-libs/libevdev/libevdev-1.9.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index 52f18afb5714..f963a43a6594 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -3,7 +3,6 @@ AUX libgamin-0.1.10-armel-features.patch 1490 BLAKE2B 5fa50ed67cd357e5108db27e29
 AUX libgamin-0.1.10-compilewarnings.patch 526 BLAKE2B d070507a937b3d94e7cf276983134b2b4822bf7cfc62176d69f5075bd78602802839326c6e7b22a95232ab18783ffd00ef3531ad834319e1f2ecaf3fe605f91b SHA512 f413fbd5db1e0412d1fabe6b46e049d347735cf6db7a7ca1eecc9ede1b299a7e622be3c508df40990159e05470d285069a0fa4e2cfcf6fd80378d0aa2b69fd0f
 AUX libgamin-0.1.10-crosscompile-fix.patch 764 BLAKE2B 7302b238724927ace5753b5103434533e60563e1d74d9ee9762b961d8e36ace465cb081639585dc7124be5bb0fb5c9f80832d1bfc09a3bb61869acec5abdbfca SHA512 11aca975f98d9364bfdd8e28162f922a96493012fb3c6c704115d33155b2a2e9bbd20aba64354db922f16c3589b88a07091590a5bd6aa806582b9b7875ba8e23
 AUX libgamin-0.1.10-deadlock.patch 2090 BLAKE2B 252b7551ca9ec48af631765ac0413c81c280c478cb9ed5b23efafc07f8c1dccd26305f4688842eed3e587c6bdc19b57c045922158026335e9c6af4abafc57287 SHA512 c0a4a318eb78b9666930e9d1a6fac5e7762f38796e5892d849c893df524310408020ea75fb02a4d79000be3440435ae640340cf2a3dd43fa031df5787762f8de
-AUX libgamin-0.1.10-disable_python_static_library.patch 340 BLAKE2B ee1f0fc3ff33594a13603a0912d3b931eaa1d80957751ed60c94db66ef689ca6d75d64c62427371342938d3fdda00c2b7605966fe329a8bf97d4d79f1f021a8f SHA512 8d11f4b891bfc9e1aa6ba99aa485279b29c0a0f154742349035032c5122ae6ef29da5e5f0482791a7b1f7bceebd2bc871f14c3eb96f1947ad791b8036e488b00
 AUX libgamin-0.1.10-noinst-lib.patch 2207 BLAKE2B 28ebca731a16fb10c0f186c3eb75d731a18fd72c239a380a7bf97afacab65792003b433c9030e06c8d7748c0dabe84a92bbad8221d40c9fa9d33c6c00b0dd40d SHA512 ba7ce391f4da1a6b4c75941b8440a72f483b6f2597592f64ddca720bf46b1269e64a20a27da9c35b134100a121990d84e28ac737cffef48e90974a017ba3a4cb
 DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fbab69f2417cc089b050a7e245d89701b0703a0916d6dc08a706785ee509ee4feed0375107f777fdf4248ff5f93b SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch b/dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch
deleted file mode 100644
index 562fc071eac7..000000000000
--- a/dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- python/Makefile.am
-+++ python/Makefile.am
-@@ -10,8 +10,9 @@
- python_LTLIBRARIES = _gamin.la
- 
- _gamin_la_SOURCES = gamin.c
-+_gamin_la_CFLAGS = -shared
- _gamin_la_LIBADD = $(top_builddir)/libgamin/libgamin-1.la
--_gamin_la_LDFLAGS = -module -avoid-version
-+_gamin_la_LDFLAGS = -module -avoid-version -shared
- 
- python_PYTHON = gamin.py
- 
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 74669641e384..6919ce47025a 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,7 +1,5 @@
 AUX libgcrypt-1.6.1-uscore.patch 843 BLAKE2B a1023bf915e342dd52d07d4c497d3e514c8c4b6c621e4f8704c4841fd95d48773f0af850a456c6f80b80deed878be1334f08f8181f97dce64ed9e61f5cb1bae5 SHA512 971814ac34f17464a96fbc110fe995923d873981949a0126e50c206d39499d6146fd00414e837774e6932e4b491cc68c4147278d6216dda630fb876bc8f61791
 AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc9f38e50117cef34bc92ce37a296c3e31017c0190923ea992f51706c55a63c6f75b1d9fc7d8d40930707486f419e1795c4 SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc
-DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02add413f633d96cc95513daa6e6b0e098fe803bb6a0e405a241fddc5ce0cfad61658d57c27bd724eecd32fd862af4c99 SHA512 b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89
 DIST libgcrypt-1.8.6.tar.bz2 2997781 BLAKE2B 90ecacae75633dfff248b9c07a72126aaa4a5c285141f89c42237326ae3bfb99c937eef05d87b466c3d8f5cf022725ccee5c0dbc74d4eb57523a8a2892864b65 SHA512 28a26f665b7e327b79815849ee6e84ab384ee9105d81d4d06e4feeea07d986f940cbbb9faaae8712068cace45b4110a62965a93201da0e1ad008b65808b2b29b
-EBUILD libgcrypt-1.8.5.ebuild 2303 BLAKE2B 6a53021a185faa4382b2e2285fa5c2d11dd22fe58dc96997d57ecc488a147901fdf284980b817832ab74479213140f41403f0ba04f6de8a9091bfd15f502e0fd SHA512 d6a9b8a2fef2dcb37f7ce86247b2147fb3bd35d320c21e2973f73edff7c48fe7a742c6fdf54e4f884767dc5603c5fa470d7da44a6511257f2e1ed2b9327a5eed
-EBUILD libgcrypt-1.8.6.ebuild 2280 BLAKE2B 998db4aa411fd93ec925e9a175d1b6f127c337883119ab727640ed096196b929b8822a4d56489513c3293e64e8c701b78653fccdb5e4ba60a00301b7232761e7 SHA512 11f08c192981573c502c81dfb7c2f396639e48904a523cbf5b0a072c1aecff2c60bfdaaed400c69f73ba17459575a69df5711ce66d0018fe755c4278d09b20d6
+EBUILD libgcrypt-1.8.6.ebuild 2252 BLAKE2B 282625b77faf7a06d9ed5b33e96d163254af1c0b1edcdaec38ed4a882b1a623cb7ade5a482987430fd59f0b2688f2cebbbf50435a59471b13e0a56005a9cd181 SHA512 a656809c97a012245ece9578eeaec9e1d8b1d2cf12b307762d28c2ac9fa9f8abcb38dcad676e79990feeca10840138cf5134b8fa15920316b43f541fe6c82a33
 MISC metadata.xml 425 BLAKE2B c695b3057b3db22d3daf36a70b3d6000b55dc9c7fd4ca3a6274dde8a03c15976152bb7c44e6c4f01c11a98122f646c9660fd6d9e8d5b36041b02d63b27c97d0d SHA512 5d7c60f28eb813fc9f758cc6aaa07fb3a1e3ebe77ce89dba2f8fc56907a6d17affa252e92a2c2edd302ffa83d8d54f64f1b002411c418aae8e9cd3de19458c14
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
deleted file mode 100644
index 5fbc1de87647..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc o-flag-munging static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( virtual/texi2dvi )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
-	"${FILESDIR}"/${PN}-multilib-syspath.patch
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/libgcrypt-config
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	if [[ ${CHOST} == *86*-solaris* ]] ; then
-		# ASM code uses GNU ELF syntax, divide in particular, we need to
-		# allow this via ASFLAGS, since we don't have a flag-o-matic
-		# function for that, we'll have to abuse cflags for this
-		append-cflags -Wa,--divide
-	fi
-	local myeconfargs=(
-		CC_FOR_BUILD=$(tc-getBUILD_CC)
-		--enable-noexecstack
-		$(use_enable o-flag-munging O-flag-munging)
-		$(use_enable static-libs static)
-
-		# disabled due to various applications requiring privileges
-		# after libgcrypt drops them (bug #468616)
-		--without-capabilities
-
-		# http://trac.videolan.org/vlc/ticket/620
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
-
-		GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config"
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
-}
-
-multilib_src_install_all() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
index c8e40f012825..5b264afc9cdf 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc o-flag-munging static-libs"
+IUSE="doc o-flag-munging"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
@@ -42,8 +42,8 @@ multilib_src_configure() {
 	local myeconfargs=(
 		CC_FOR_BUILD=$(tc-getBUILD_CC)
 		--enable-noexecstack
+		--disable-static
 		$(use_enable o-flag-munging O-flag-munging)
-		$(use_enable static-libs static)
 
 		# disabled due to various applications requiring privileges
 		# after libgcrypt drops them (bug #468616)
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index ec295f38a5c6..216e21286067 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,7 +1,4 @@
 AUX libgit2-glib-0.99.0.1-vapilink.patch 848 BLAKE2B f37a6220afa807eb45c5e0fa45792c863c2b64d6217f40466f72771e0ff708b9952316c2f354d0d0b303cbf26615155d5ef75e494d9e92d6b1e93ffcfc61dcfb SHA512 86ba5754300ec4852aa09f475e6ad29fb8dcadb7634a919d14c88525b8299e0af6fd2a5640feff6c07ae94f2116584933e58466dd5ebc6bae09c17e58b3e0e34
-DIST libgit2-glib-0.28.0.1.tar.xz 138928 BLAKE2B 708523bb5a723f59e51501675c046da072bcdf18b3ded94920ce9eb181854780d6b44759531c8e949199a889578515994299facd14d10a07958019f6af0b6aba SHA512 6ae88bb56052461a9531016140edbd8517db8d5c0e5c217b4e8918ffef70b92652e4a95493c4290112068d0b793bff2b894f136b79929924fb7347926e3a8f51
 DIST libgit2-glib-0.99.0.1.tar.xz 140996 BLAKE2B 0c163467ea43ab236b2c856416940b1ed7c93e6ed8ce9980d2d146f0633830ab3765d8bd34bdaab31efdb4096e88e0513c9585b9e06a3efc800d5c32a0d29479 SHA512 48b34ba84b5315d23d0429a684753c3a64c62086d70a67fdb4dfbf8f2ee883f5a90d7e59cfcfd229682794c455b668eb9bd7bf6159d6bfa45a99ddc2461d7c25
-EBUILD libgit2-glib-0.28.0.1-r1.ebuild 1327 BLAKE2B a7c182d2f1d5fad28b81bbbddade798e41f5a4a555b86c505819833024971e744b06a2901d67862e3feb62201e9fd077a7f470cdc137a36df333f881d12750ea SHA512 1e9cf655d40b85038309cfc2d943e0e1a0f6a83ba796ca3a92e8ab6a4d03e17ccd73d3e959006d32767aa4ae7b93e8baf43ca0f9db8278f602f770cbf43ada0f
-EBUILD libgit2-glib-0.28.0.1.ebuild 1256 BLAKE2B 7246cecc6ae927178611caab2ade6d38a954b041f55c4486e62b2846ad7978a9ce7ebfac2f6b49feb53f771e48813bef38a3a1bcf7b8b31b28ece90ceceb4019 SHA512 b330da636839cc73691f0a33c778dd37c3d9318e470ce90210333235601c030ccac76b81914c02ea4291649392cd52607003aeae1b4b8dafb1e519cf2e21e600
 EBUILD libgit2-glib-0.99.0.1-r1.ebuild 1326 BLAKE2B e08dae84a9c13cd52b37f0ec9db186f0f41f9dc4e9b04720365297576445cb28c0c29fa5394f9c03259a060648f68516eb76ca5a6095ae9e8e13d1595ee938a5 SHA512 8e89fc44aca4e6448490e31e0e71d19f55036333f6d6ede90069df648c909d5d37f06a8dd461433bb7aab6a3e14259a8783df72216cef08ba63a2382b2d32e5a
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1-r1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1-r1.ebuild
deleted file mode 100644
index 7c5113f4ed2d..000000000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson python-r1 vala xdg
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk-doc python +ssh +vala"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# libgit2-glib is now compatible with SOVERSION 26..28 of libgit2.
-RDEPEND="
-	>=dev-libs/gobject-introspection-1.54:=
-	>=dev-libs/glib-2.44.0:2
-	<dev-libs/libgit2-0.29:0=[ssh?]
-	>=dev-libs/libgit2-0.26.0:0
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-		-Dintrospection=true
-		-Dpython=false # we install python scripts manually
-		$(meson_use ssh)
-		$(meson_use vala vapi)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use python ; then
-		python_moduleinto gi.overrides
-		python_foreach_impl python_domodule libgit2-glib/Ggit.py
-	fi
-}
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild
deleted file mode 100644
index 85e90809073c..000000000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.28.0.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson python-r1 vala
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python +ssh +vala"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# libgit2-glib is now compatible with SOVERSION 26..28 of libgit2.
-RDEPEND="
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=dev-libs/glib-2.44.0:2
-	<dev-libs/libgit2-0.29:0=[ssh?]
-	>=dev-libs/libgit2-0.26.0:0
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		# apparently broken; fails to build
-		-Dgtk_doc=false
-		# we install python scripts manually
-		-Dpython=false
-		-Dssh=$(usex ssh true false)
-		-Dvapi=$(usex vala true false)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use python ; then
-		python_moduleinto gi.overrides
-		python_foreach_impl python_domodule libgit2-glib/Ggit.py
-	fi
-}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 8fee5219dcb9..114b325a18dd 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,5 +1,3 @@
-DIST libgit2-0.28.5.tar.gz 4998481 BLAKE2B 71a3502af125a3d1c91700539d5e235a62922b32ca5e62288581b496f4cb680c01bfe70ae092ab730fc45df1dd96c2c9167f51d551a50acd57c857b4ea07634d SHA512 abfea885f46444b0304ae57c32c06f4252afb0093c924da5e1ba10aaed952824d1b84036adb79b5b8ad8bea56a6331a51c62f3b9839aead16c7b26cb4554b53a
 DIST libgit2-1.0.1.tar.gz 5312878 BLAKE2B 7eb97bb97d66240ce135e21d348f6dea0c5626992b608f8944b75f9bae5de933fffa07edd536c0353841f8d02c950feec1451008003e35f53554f3c59b069a7f SHA512 7c307822b22e3771e5e908b115600310f7901b3250287532c498003b25a5b1e007bfa23592f16ec4d83c1567a9213710526f78cab7c120316e9a8fc74c5e57a9
-EBUILD libgit2-0.28.5.ebuild 1650 BLAKE2B 859432292f7c913953d0c23454dd1c463e44e2696308b29292a4e9b26876c261150d8cc36da549769b1384e8d39eadb1ba11f8abebf20876dd190e72282abcab SHA512 64648a55fe4c25d46fcc99dce81012b3ee586202ae1925a0704b052d73985cd14ceaa0b06988ae2a320fd32c971667caec06013cb03cf25c7ff34b47c7fa235a
 EBUILD libgit2-1.0.1.ebuild 1701 BLAKE2B df293ea3fae126e98feaa885df36fa4cfc249d1645e77672bd23b425302a62515abad2a1a48f7f7ce3c01d357c76bb8bf5dc6e7d3312e5fa6d890227adbfb22d SHA512 0fd2c229b1a21be488e7d9786cc59492257ef8e1f51156aeb7ce78e5e3a8f99bbff1c61145becd5c5b4c0c28fb2bf6a31ffd44059fa1201397afd996bf4c9b5b
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-0.28.5.ebuild b/dev-libs/libgit2/libgit2-0.28.5.ebuild
deleted file mode 100644
index 567e2678a2d7..000000000000
--- a/dev-libs/libgit2/libgit2-0.28.5.ebuild
+++ /dev/null
@@ -1,72 +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 cmake python-any-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.org"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/28"
-IUSE="examples gssapi libressl +ssh test +threads trace"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib
-	net-libs/http-parser:=
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${P/_/-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DBUILD_CLAR=$(usex test)
-		-DENABLE_TRACE=$(usex trace)
-		-DUSE_GSSAPI=$(usex gssapi)
-		-DUSE_SSH=$(usex ssh)
-		-DTHREADSAFE=$(usex threads)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake_src_test -R offline
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	dodoc docs/*.{md,txt}
-
-	if use examples ; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index b5be1bfab10c..10a1a4d95934 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,13 +1,8 @@
-AUX libgpg-error-1.36-gawk5-support.patch 4306 BLAKE2B 60bca612d1ce3b69facd0d27daac6275ad1f33ea1a514c762fdd4ff28c55a5e9725c2cd83429e1c2368b42fa6e9850400ffa668a6ce160cdbbc289e421d53c02 SHA512 69cd5219f47193a4b350661fde2d3dcf639ac38dacb6e076ae1d49bd1989562e034f5a238db3fa8af6fb1b80c22d5a6a7fa3f20a2fed95fe756e1a7840a1d886
 AUX libgpg-error-1.37-remove_broken_check.patch 786 BLAKE2B 38c3b7039d17de117ba876c11377fe765e39a4630d2dbda21d07aa6a0e027b5ee0e4f2da225d7d6847b5086c7f4aebe378c82a259ec9d82e7ecaac1f77413959 SHA512 6b9087cfa21d844f2306aca0e5575a03b9409ae8e5ea55158734560abd135af265512bec3de8c943210ade60b6334ea1798aa517ba5738cb9fe6720b3cb3c68f
 AUX libgpg-error-1.38-cross_compile.patch 1415 BLAKE2B 6cd0453ef8bd77bf945600c738aec60e3c271109fcbf85af95eaeec372d3a5295dbaa46a28c9d02bde9a9340885a710baaf52b3c76d60fecd0f4ae79118020fd SHA512 99b9ade767fd02bce4f7388d1a4c615ed1b959fe0416d1d49880ae3708482144de7219fed4aa5ef4f7ef18ec7fa047e05da6da53a13a2cab8a42f8298600b061
 DIST gen-lock-obj-1.38.sh 2643 BLAKE2B 5040b027a95f10bac4a0ba463c8bb8387514ca9136e019fc647183456593df27473eb79af1d79e803984dd2b93166c286809b376968584cc320679de95fcfbba SHA512 d60999a08f70f5bcf1b66099c5d7b5f715dbd881bd0d75dbdde3a8932e9b064166f0524a45ae88b5b182c620aee526e14095ffdee68403b5d3b087b4dc4c0c2c
-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
 DIST libgpg-error-1.39.tar.bz2 961676 BLAKE2B 8753a9295ca57ba79142ffbc7fa01a986addcdd6a8860cf80c9e1bf9f6f9dfce874f804205a5cdd956e026eb006f2662110c63e7ed52c7a42ee0c45923ae52be SHA512 b28be183ac3d3920363558c4b5b2c24f9074a302799915cc076674bb349dcfb6f09160bec1d3fb62e04047c3ce432d345f36b0905100a88cc730b53d4eb78e42
-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 2126 BLAKE2B 329bb8c7fec4cef54411ca382cfbfd26f621f88f6ed95ff471caa0ddab6967ad7db1d092ec443f1143c9b0fda08b34f892b4d0435f74600a632719ae0650d1e3 SHA512 c5a2d97ea0d7f038fcd9e68d1d72488469bac07015752133fed29d0c7eb7d897a2a8185dc965599b9010c2d87ce7d0236d1651a47266b67968f688502da91133
-EBUILD libgpg-error-1.39.ebuild 1698 BLAKE2B 8350db5f7f474cdc2720f9dcca24526f46b84adeacf00d5efbc4d8ebf7aca1ef9a9d5949920c3705a19d4e34b39f73aaaabdfa84854982345b12168d3c7e6192 SHA512 9ee2c9b4bf5cb08c08238d3a6e2cd54431efe85dfabfc8b78dbbb1c504900eb29e9a0db15e098660ff4382dcb39d80a6fee1e5e94ff6acc5b8eb906ac0b8e853
+EBUILD libgpg-error-1.38.ebuild 2098 BLAKE2B e6fe3a7061d14093f0a4d40bb5b52c09f7deda0c0a9c0b99995830f4438f9b16c646208db39cc775851f68407582fc4615e784182bfbd3f68d7d4647cc681eb7 SHA512 1bd54aa4ce63b8fd33d21276bcd64305bcd7c3c152475bdde036cafe43d053dea509a4bd56acc41188b07ba6458fb78dbfcd7c13e4ccb4f7e5e2d6e0ec0f55c8
+EBUILD libgpg-error-1.39.ebuild 1670 BLAKE2B 190511d2ebedc9abf79b1a52cae589963fb147ceb790f71584ca8f8d9ffa0282c83f814947dced30d179a6ffe5a7d974f9fd6179b18ea76e70aa05fee9c4bf9e SHA512 a41a686a938549a108ec2bf59a36e1813d5fddb0e35e25b10eafbe13371496ce94bf8f721f9ba58485a629afcfdf7a7f42640996e5c739d11f4a4dcc04a63c74
 MISC metadata.xml 413 BLAKE2B 52ac9e1edfca8673904a9c73c51f1d46bc844db1cd320291f90dc53c89aedb24a4e1a27f01b1fe0b517cd00468300e54aec95632b453c0cb52a54ddfb5bf55d9 SHA512 6334af8e8e833c43414adb35635f42163d9f87e7a0659b03e5a51c8250ec8a1f1b72c13617050ab75e9eac0ed0377919424aec0c3bc13cc5efac32cf863f8948
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch b/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch
deleted file mode 100644
index 17e88164537a..000000000000
--- a/dev-libs/libgpg-error/files/libgpg-error-1.36-gawk5-support.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe@fsij.org>
-Date: Mon, 15 Apr 2019 15:10:44 +0900
-Subject: [PATCH] awk: Prepare for Gawk 5.0.
-
-* src/Makefile.am: Use pkg_namespace (instead of namespace).
-* src/mkerrnos.awk: Likewise.
-* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
-* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
-
---
-
-In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
-which only allows escaping specific characters.
-
-GnuPG-bug-id: 4459
-Reported-by: Marius Schamschula
-Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
----
- lang/cl/mkerrcodes.awk |  2 +-
- src/Makefile.am        |  2 +-
- src/mkerrcodes.awk     |  2 +-
- src/mkerrcodes1.awk    |  2 +-
- src/mkerrcodes2.awk    |  2 +-
- src/mkerrnos.awk       |  2 +-
- src/mkstrtable.awk     | 10 +++++-----
- 7 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
-index ae29043..9a1fc18 100644
---- a/lang/cl/mkerrcodes.awk
-+++ b/lang/cl/mkerrcodes.awk
-@@ -122,7 +122,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
-diff --git a/src/Makefile.am b/src/Makefile.am
-index ce1b882..f2590cb 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile
- 
- errnos-sym.h: Makefile mkstrtable.awk errnos.in
- 	$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
--		-v prefix=GPG_ERR_ -v namespace=errnos_ \
-+		-v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
- 		$(srcdir)/errnos.in >$@
- 
- 
-diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
-index 46d436c..e9c857c 100644
---- a/src/mkerrcodes.awk
-+++ b/src/mkerrcodes.awk
-@@ -85,7 +85,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
-diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
-index a771a73..4578e29 100644
---- a/src/mkerrcodes1.awk
-+++ b/src/mkerrcodes1.awk
-@@ -81,7 +81,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
-diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
-index ea58503..188f7a4 100644
---- a/src/mkerrcodes2.awk
-+++ b/src/mkerrcodes2.awk
-@@ -91,7 +91,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
-diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
-index f79df66..15b1aad 100644
---- a/src/mkerrnos.awk
-+++ b/src/mkerrnos.awk
-@@ -83,7 +83,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
-diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
-index c9de9c1..285e45f 100644
---- a/src/mkstrtable.awk
-+++ b/src/mkstrtable.awk
-@@ -77,7 +77,7 @@
- #
- # The variable prefix can be used to prepend a string to each message.
- #
--# The variable namespace can be used to prepend a string to each
-+# The variable pkg_namespace can be used to prepend a string to each
- # variable and macro name.
- 
- BEGIN {
-@@ -102,7 +102,7 @@ header {
-       print "/* The purpose of this complex string table is to produce";
-       print "   optimal code with a minimum of relocations.  */";
-       print "";
--      print "static const char " namespace "msgstr[] = ";
-+      print "static const char " pkg_namespace "msgstr[] = ";
-       header = 0;
-     }
-   else
-@@ -110,7 +110,7 @@ header {
- }
- 
- !header {
--  sub (/\#.+/, "");
-+  sub (/#.+/, "");
-   sub (/[ 	]+$/, ""); # Strip trailing space and tab characters.
- 
-   if (/^$/)
-@@ -150,7 +150,7 @@ END {
-   else
-     print "  gettext_noop (\"" last_msgstr "\");";
-   print "";
--  print "static const int " namespace "msgidx[] =";
-+  print "static const int " pkg_namespace "msgidx[] =";
-   print "  {";
-   for (i = 0; i < coded_msgs; i++)
-     print "    " pos[i] ",";
-@@ -158,7 +158,7 @@ END {
-   print "  };";
-   print "";
-   print "static GPG_ERR_INLINE int";
--  print namespace "msgidxof (int code)";
-+  print pkg_namespace "msgidxof (int code)";
-   print "{";
-   print "  return (0 ? 0";
- 
--- 
-2.21.0
-
diff --git a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
deleted file mode 100644
index 12c45d3dbcf4..000000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.36-gawk5-support.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/libgpg-error/libgpg-error-1.37.ebuild b/dev-libs/libgpg-error/libgpg-error-1.37.ebuild
deleted file mode 100644
index f6fa282fbe08..000000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.37.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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/libgpg-error/libgpg-error-1.38.ebuild b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
index 28f7ae4c7ad6..4baca344efba 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
@@ -13,7 +13,7 @@ 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"
+IUSE="common-lisp nls"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
@@ -53,7 +53,7 @@ multilib_src_configure() {
 		$(multilib_is_native_abi || echo --disable-languages)
 		$(use_enable common-lisp languages)
 		$(use_enable nls)
-		$(use_enable static-libs static)
+		--disable-static
 		--enable-threads
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
diff --git a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild b/dev-libs/libgpg-error/libgpg-error-1.39.ebuild
index 76085d0b7920..dcb9068911b4 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.39.ebuild
@@ -12,7 +12,7 @@ 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"
+IUSE="common-lisp nls"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
@@ -44,7 +44,7 @@ multilib_src_configure() {
 		$(multilib_is_native_abi || echo --disable-languages)
 		$(use_enable common-lisp languages)
 		$(use_enable nls)
-		$(use_enable static-libs static)
+		--disable-static
 		--enable-threads
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
diff --git a/dev-libs/libhid/Manifest b/dev-libs/libhid/Manifest
index ab9134333d62..1584929acc60 100644
--- a/dev-libs/libhid/Manifest
+++ b/dev-libs/libhid/Manifest
@@ -1,10 +1,5 @@
-AUX libhid-0.2.16-gentoo.patch 628 BLAKE2B 6c2a25cb230a50c5eceff0229d9d6bf3860c5ff4c4c5075d6dd062cdb600dd2dda70979303ef62422fb65e3a441fa4e1487ee173c78343d4bcca4b061f5bd0b0 SHA512 a756d99b115e1903ff633e511c8b9c2de1743b9d8c5050ba422281aea6c4d330b70632e45f688177d8d06ba4077574193e7e378f0e0a79924d2463f5e1584d40
-AUX libhid-0.2.16-libusb.patch 421 BLAKE2B 8b3283ddf9ca120bb77af75fb5aae88ca6d45904a425fdc90f4ca7fda8bd111f37deea5454d692499156337f473bdbd3731d7bf45ea7b80af5c359478cb96c69 SHA512 0fa3be119d1ab3efa428c81b96709a0cee4fd40fa4515d255a64be095a4e26f68a2c8175beda6615c720aaa593edc5aaaa2909bfc5ab9e7f9b818d8c507b9fde
-AUX libhid-0.2.16-swig.patch 1424 BLAKE2B afc3bbaedcd83c87b3186742872681a7a74780873d7aea8fe5fb1df9c69aa66e8265af58200476a2c85f7c0f7abc8036cd569e8827cfb239cb60262758618784 SHA512 62ff58921aa99947f8b33b0d1c02cf30f19fd3f75393cbb681846266b67af49bf6a2e70a995c9a7252b27c67e573e2c198b366830c15ca3c5e87a93325a849cb
 AUX libhid-0.2.17-configure.patch 651 BLAKE2B 734aec3525837a5179fe75057628fa5c9276603b62d5075a95f49c1813f2bbff94dde8a538fe82a25c07a0b101a6ace518e5f496b261c8b9d8063bedea001766 SHA512 da06305f3846c24e5faac1bd3f69f2527801a0e2bff127414fecd78ff658a6c25221441a61c24a97d465523b44bd8c8d7e3396fe20b11ad6ff3a5b96902740fb
 AUX libhid-0.2.17-man.patch 500 BLAKE2B 404b7163651258a28369458a76cdcc591ebc8285b53b60e84c41f899d3449e6493b191ff6411668ad168a9ea91b024b5c6d738ca86c91a49f115ba58bf7b01c0 SHA512 de3364eeff10e5e0dc287b4c04bc680ab44c487cd539d3642ef72ebc11384713021bff750f6bf1a46819e59842ad51c37e2eec0d0d9e20afb8a194b5844fe1ce
-DIST libhid-0.2.16.tar.gz 435245 BLAKE2B 9bd06b226e42ed0dbbf4395824636dbfaa796ce9c0170ad7af561741ec3f494b92ec09c548f3bc7c698a32aa78d82d4da4094231fbb810de5a67d3066947fd97 SHA512 3c9348f9d63e0e1577e983c65ff8e6acbaee0d5f43ecb29b7004654a7e9d14a94176aa029f259e0b8576fc30e8a9af6d1df34912dd582bfadc2b29f9b87eb52b
 DIST libhid-0.2.17.tar.gz 218501 BLAKE2B d7110dc1854829023531f1fd58fd6668f5d15dc3b98f9a6c799b3bc4725ded907de645921d17161a37cde8d9759ec371f96caf4fbb8d6f7bd480dfe2a352b399 SHA512 d82ef95871460e22e26f4fddb88edb83c262a8d0cd70beb7e65cacb443bfc21e12f868d50b8b4ea0ee00acce7c2d0f5bd06437b69cf89ef39dd118c21c73b977
-EBUILD libhid-0.2.16-r4.ebuild 1254 BLAKE2B 169b8bad85fac93966d558c789456389e8451f409a216fd953f081fccbe30c2fe1d35e8cd990ede83ff8f0fd9ee43e686bcb549fe8a330f5e030374ede5c86e2 SHA512 12547eb12fc9ef71b81d0733386cf1ef9aaea9d685c6971c69a7653dc0bdf92e96f78ce4aabc8d553f0d9f7c026fd736a4210224506787310491d1ef092d88b9
-EBUILD libhid-0.2.17.ebuild 1026 BLAKE2B c5d659a89affd44286f3dc200d5cac4c4947732bc3eb8cbe8bbe05e76952acff8e1004a831328fbb97a07695e58b03c194081759a172e5f7e3400d9e409af639 SHA512 d9419ed0dbf1eed9dae9e45c2c60ea3789303f07823d2d49ed78d25e726fb7225c032176b6ab19c7764b3c6c10877aa82002fb0eeba8c2d0d8c47d12b8cc7f70
+EBUILD libhid-0.2.17.ebuild 1024 BLAKE2B cdeb236a4725dca98dfa3f6f95cefc6f9607f553aa237c68c0170d21308f45a149fa6377c500b1bad6695e40303e1b5dc717a8494198137f7f5db674d94d5d44 SHA512 1f9340e799f490c16d1b24cc56ac3d6f032875a0bb88ac76510162715f1e6cf04ccee418068d953da7e6da5f8d984de6dd2d49f084fdc8d538ab4fdd3db776e5
 MISC metadata.xml 579 BLAKE2B c06739bd7822f74c3721fb2848c6b91e2904a2731478bbdda4b7500dff9882d2d885983ad017191bf9ac3217ce1e200db82663c3dec29777f995358dc6bcab28 SHA512 5ee3274cd0351f5d4a7853a1392bc538c85b9539b1964cf420b00c7e9dcbcb20534b74b641e7c4ed7ccb2218ffea9ef42b06d6ffebf1c1402337c66a8c9c7bce
diff --git a/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch b/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch
deleted file mode 100644
index b5960af5d7d6..000000000000
--- a/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -78,7 +78,6 @@
- AC_C_BIGENDIAN
- AC_C_STRINGIZE
- 
--MD_CONF_DEBUGGING
- MD_CONF_COMPILER
- AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "linux")
- AM_CONDITIONAL(OS_BSD, test "$MD_OS" = "bsd")
---- a/m4/md_check_gcc3.m4
-+++ b/m4/md_check_gcc3.m4
-@@ -1,7 +1,7 @@
- AC_DEFUN([MD_CHECK_GCC3],
-   [
-     if [[ "$GCC" = "yes" ]]; then
--      ver=$(gcc -dD -E - < /dev/null | sed -ne 's,.*__GNUC__ ,,p')
-+      ver=$(${CC} -dD -E - < /dev/null | sed -ne 's,.*__GNUC__ ,,p')
-       case $ver in
-         *[[^[:digit:]]]*)
-           AC_MSG_WARN([Could not determine compiler version. Trying our luck...])
diff --git a/dev-libs/libhid/files/libhid-0.2.16-libusb.patch b/dev-libs/libhid/files/libhid-0.2.16-libusb.patch
deleted file mode 100644
index aa49205ec75d..000000000000
--- a/dev-libs/libhid/files/libhid-0.2.16-libusb.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -59,6 +59,8 @@
- MD_CHECK_OS
- 
- MD_CHECK_LIBUSB018B
-+LIBS="$LIBS $LIBUSB_LIBS"
-+INCLUDES="$INCLUDES $LIBUSB_CFLAGS"
- 
- AC_PROG_CC
- MD_CHECK_GCC3
-@@ -97,13 +99,6 @@
- 
- MD_CHECK_DOXYGEN
- 
--MD_CONF_FLAGS(
--  [],
--  [$OS_CFLAGS $LIBUSB_CFLAGS],
--  [],
--  [$OS_LDFLAGS $LIBUSB_LIBS]
--)
--
- MD_CONF_DB2MAN
- 
- ##### OUTPUT #################################################################
diff --git a/dev-libs/libhid/files/libhid-0.2.16-swig.patch b/dev-libs/libhid/files/libhid-0.2.16-swig.patch
deleted file mode 100644
index ce5dae7481b9..000000000000
--- a/dev-libs/libhid/files/libhid-0.2.16-swig.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -88,8 +87,8 @@
- if test "${ac_cv_enable_swig}" = "no" ; then
-   AM_CONDITIONAL(HAVE_SWIG, false)
- else
--  AC_PROG_SWIG(1.3)
--  AM_CONDITIONAL(HAVE_SWIG, "$SWIG" -version)
-+  AC_CHECK_PROG(SWIG,swig,swig,false)
-+  AM_CONDITIONAL(HAVE_SWIG, "$ac_cv_prog_SWIG" -version)
-   if test -z "${HAVE_SWIG_TRUE}" ; then
-     AM_PATH_PYTHON
-     SWIG_PYTHON
---- a/swig/Makefile.am
-+++ b/swig/Makefile.am
-@@ -1,7 +1,7 @@
- # AM_MAKEFLAGS = @MAKEFLAGS@
- ACLOCAL_AMFLAGS = -I m4
- 
--AM_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/hidparser -DHID_INTERNAL -DSWIG
-+AM_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -iquote$(top_srcdir)/include -I$(top_srcdir)/hidparser -DHID_INTERNAL -DSWIG
- AM_CFLAGS = -fPIC -fno-strict-aliasing
- AM_LDFLAGS = -shared ../src/libhid.la -lusb
- 
-@@ -29,7 +29,7 @@ __init__.py: hid.py
- 
- %_wrap.c %.py: %.i $(top_srcdir)/include/hid.h
- 	$(SWIG) $(SWIG_PYTHON_OPT) $(SWIG_INC) -o $@ $<
--	echo '#include <compiler.h>' > tmp.c
-+	echo '#include "compiler.h"' > tmp.c
- 	sed -e 's/PyObject \*self/& UNUSED/' \
- 	    -e 's/int flags)/int flags UNUSED)/' < $@ >> tmp.c \
- 	&& mv tmp.c $@
---- a/swig/hid.i
-+++ b/swig/hid.i
-@@ -1,7 +1,7 @@
- %module(docstring="libhid is a user-space USB HID access library built on libusb.", "threads"=1) hid 
- %{
--#include <compiler.h>
--#include <hid.h>
-+#include "compiler.h"
-+#include "hid.h"
- %}
- 
- %feature("autodoc","0");
diff --git a/dev-libs/libhid/libhid-0.2.16-r4.ebuild b/dev-libs/libhid/libhid-0.2.16-r4.ebuild
deleted file mode 100644
index 4f67990368ad..000000000000
--- a/dev-libs/libhid/libhid-0.2.16-r4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils ltprune python-single-r1
-
-DESCRIPTION="Provides a generic and flexible way to access and interact with USB HID devices"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="doc python static-libs"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	virtual/libusb:0
-"
-
-DEPEND="
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-	python? ( dev-lang/swig )
-"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-swig.patch
-	epatch "${FILESDIR}"/${P}-libusb.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	export OS_LDFLAGS="${LDFLAGS}"
-	use python && export PYTHON_LDFLAGS=$(${EPYTHON}-config --ldflags)
-
-	econf \
-		$(use_enable python swig) \
-		$(use_enable static-libs static) \
-		$(use_with doc doxygen) \
-		--disable-debug \
-		--disable-werror
-}
-
-DOCS=( AUTHORS ChangeLog NEWS README README.licence TODO )
-
-src_install() {
-	default
-
-	use doc && dohtml -r doc/html/*
-
-	prune_libtool_files
-}
diff --git a/dev-libs/libhid/libhid-0.2.17.ebuild b/dev-libs/libhid/libhid-0.2.17.ebuild
index 02407fa58f13..ee87c17c2674 100644
--- a/dev-libs/libhid/libhid-0.2.17.ebuild
+++ b/dev-libs/libhid/libhid-0.2.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc"
 
 RDEPEND="virtual/libusb:0="
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index d96034f99810..c2d24f61f25c 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -1,6 +1,7 @@
 AUX libnl-1.1-flags.patch 441 BLAKE2B b07df1490a4485468aadbe7dc3aa025fa2514c36116788e517840370952c85e7cc8173b4fec532ddcb405eef9b9df813090c531df1834ad8e7d3644c93247f08 SHA512 1f97dc181118368977ebc7bc6134c7e9fb6acd083721f1c857fca9e3a2cc242e03cbd198a0fb12a05597765a732d9a9384a75f46d1f023f6d5160631a29a9947
 AUX libnl-1.1-vlan-header.patch 2378 BLAKE2B c6d72cb5c7437bc6600e2c34eb6f17fd22df4338c37cee53f0112d3824bf2e940c9166f233fe32df3d451ea37fee2c08db27db7f46d7522f5d04169abdecd28c SHA512 ea45d780b16e6045735aaf2e3febf19ddccab4ca0e03710aebfe51655adc50177aefa3bd4d06e0ccce0160f4c6db73cfa4eb7cebe53b3e15c1807c3b00dc1c9c
 AUX libnl-1.1.3-offsetof.patch 320 BLAKE2B 5edb7d935321ae40784d16fdf289470deee86921f2372d200468206ab06cb391a3fce01998d7e4924fd6d235e9292bbbd6134dbc87aa3ebc3dafd16610b4a2a1 SHA512 fe625a9ac6ea8776c8f7ef3d7e3553651c0244e830883587bd7e86490e0ec6e8b29865e172a0e39947e213b910a4279202eabfdd5d7f08e835f5be91d4ff9d6b
+AUX libnl-99999999-2to3.patch 1082 BLAKE2B d3749aa9cf5fd7a2e255ebf6e7ab6c59c81da86fe419ef36b58a9fb14173a9944e7252e64c1a72ccbf9ca9a42f558642548e5247f900344df1bf2f2d54ebac86 SHA512 75796506b16e0953d7fb22d600b747eb48c900badacda665740302002ce112e1cbebd44061158e0557e829c3c16a06917d2acfdb2f450211834de14643112a66
 DIST libnl-1.1.4.tar.gz 1174974 BLAKE2B e6466e15db17fe4725674d77c6cdcefac73e51346f6f4378bc3ea8409c1534519cc28f1123c8201e78f6b95254701a2f9591f907b3cc597ac1210fd3f8b832ea SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4
 DIST libnl-3.4.0.tar.gz 933443 BLAKE2B 735da9f800277c48a5deceb78084f510f56f7017b1184e91b2bb45ba61a2e95355e7a3f5d0a74bdaf7ae003393a6c7556d5b201d0d0052dfc66042aa9e137986 SHA512 6336e5c55c79ff2638de9c812cc1842871769236bad7f65c547dec35fafd91988b257fceab144a0cc133c4b29f61172f6552c53aa9fc723bdc783079c2b1851e
 DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c53a078ee55a2888bd8439e1ae6db8886c9c4f937297962faac6873b4cf5211ee3d1e5354d96b5dc545a6fc2d SHA512 9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c
@@ -8,6 +9,6 @@ EBUILD libnl-1.1.4-r1.ebuild 1151 BLAKE2B 4f0985dfaccfe22881176666c5d0c0226e3615
 EBUILD libnl-1.1.4.ebuild 1130 BLAKE2B f82bb5df7f1a038dbcd7fce4ba45647b7977b6afbaf72a607dfa1f45b2d4d3e7f922af597d03f5f6ede83c2b041228b723f1a8b1b629f6ea566cfb1c56cd433b SHA512 3e1b6edc66c242d55914af818ed8f6177282cbce83287d92deedc9a4f3273c3542e185137559bf3ae88dd9c399a2bcf6e38220e15b302c6be63c521617527e51
 EBUILD libnl-1.1.9999.ebuild 1055 BLAKE2B 89c39a6ec77da02bd2adf5aa55116bdd6a9c12771502bb5a7ae922ea58f6e6aa240e98332cc037d1320f30383488415e5edbc1ac45164382567c9160e70d6194 SHA512 c1648b9fd4003454d9bf54e5c5af1deb68eff4d048f450180675870cedb915f9e54350c6bba9649289e10aec654d2f2e8025e0fde72240394e9f2bed2e055738
 EBUILD libnl-3.4.0.ebuild 2374 BLAKE2B 244a5c7ab75393db34b8511ad0d694f89d5be5dd00c1cf9b3efdd2754f7d69029cd27df0cc1f1d76a7c19fe4e22cf8a807b39307842ccdb214be341773dedb97 SHA512 e475e155734081f30024553190903e2f158fbe7103508ccfcc1a2241dd3aa6758e56ca0414cf002def4e639795fabf847b512d413aa4fae7f6b64cc8f4b108ad
-EBUILD libnl-3.5.0.ebuild 2395 BLAKE2B 8d2315fe9b1872ffdc09a21cd49ac8bf782c2a860381115c52992452e806e0f065f7d42bfc3302e40238a992a54558c1a6671d838cd1fc71d4d65e29cf67085b SHA512 c303f495df5d8becdc2aaead9b094fe63368ce7a0292265617fe3eca3b2b4d202d6c291a620a09507faaaf22cce9f6d7054b9d67da0002b959656a07b2af113f
-EBUILD libnl-99999999.ebuild 2156 BLAKE2B a8285f3893c4b5587d8b2ba61202dfd05e383189b88d65da097a0007f3a4f4925ca0939d774a7597ece4a0f76dca873dd88edcd139c94620ec4a8f577e0c9938 SHA512 5e1968443ecc4b2344428c182d3d5193a4707a042ca3ecd7ca522c1360f8f8841d4af068f37aad6d405e2d09f09b109c2266fd3595c13850b0cda81092fb40ed
+EBUILD libnl-3.5.0.ebuild 2393 BLAKE2B 70f8bf78656a957edf3ca6f3c3b0fe1283f402d7ef00e33c72809d3bf0ebde5226c2716b12679d0210db9207d0a50520949895b7b7d432ccd60869d7ade43a61 SHA512 5a0bc363b46eb54963c361e2473a8ce602724ba2b1e37dd20b76f82b418baa562ad67bb9e1410337217105a1ce66e6bfeab2217da1f4bc04c0ae07123da05417
+EBUILD libnl-99999999.ebuild 2429 BLAKE2B 2eca6e27b7712ffd35e72df536ddf2740ef67f4af222d55f8db5fdcb4ac9046ff7545207869b71754d17e9302e0f3c8f59a61bb5f54ecd4d26bfb8319975a647 SHA512 72d03036db53aefcc25ff84ec27dc1f83f5f703f2f80196c45ab0d60a164f088c5a1bfe024404620739ae7b1e2270ee9b27db6ca8b4960f3b3eef73d7eb7f736
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/files/libnl-99999999-2to3.patch b/dev-libs/libnl/files/libnl-99999999-2to3.patch
new file mode 100644
index 000000000000..66a16406d780
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-99999999-2to3.patch
@@ -0,0 +1,42 @@
+--- a/python/netlink/route/links/bridge.py
++++ b/python/netlink/route/links/bridge.py
+@@ -6,7 +6,7 @@
+ 
+ """
+ 
+-from __future__ import absolute_import
++
+ 
+ from ... import core as netlink
+ from ..  import capi as capi
+@@ -19,10 +19,10 @@
+ 
+     def bridge_assert_ext_info(self):
+         if self._has_ext_info == False:
+-            print """
++            print("""
+             Please update your kernel to be able to call this method.
+             Your current kernel bridge version is too old to support this extention.
+-            """
++            """)
+             raise RuntimeWarning()
+ 
+     def port_state2str(self, state):
+--- a/doc/resolve-asciidoc-refs.py
++++ b/doc/resolve-asciidoc-refs.py
+@@ -22,4 +22,4 @@
+ 
+ rc = re.compile('|'.join(map(re.escape, sorted(refs, reverse=True))))
+ for line in open(sys.argv[1], 'r'):
+-	print rc.sub(translate, line),
++	print(rc.sub(translate, line), end=' ')
+--- a/doc/doxygen-link.py
++++ b/doc/doxygen-link.py
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env python
+ 
+-from __future__ import print_function
++
+ import fileinput
+ import re
+ import sys
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index d9edacc58f93..8a01b4c01914 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 "
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+debug static-libs python +threads utils"
 
 RDEPEND="
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index 52f318b2f912..cf078de887a5 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-99999999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
-inherit autotools distutils-r1 git-r3 libtool multilib multilib-minimal
+inherit autotools distutils-r1 git-r3 multilib-minimal
 
 DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
 HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
@@ -23,19 +23,16 @@ DEPEND="
 "
 BDEPEND="
 	${RDEPEND}
-	python? ( dev-lang/swig )
 	sys-devel/bison
 	sys-devel/flex
+	python? ( dev-lang/swig )
 "
-
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
-
 DOCS=(
 	ChangeLog
 )
-
 MULTILIB_WRAPPED_HEADERS=(
 	# we do not install CLI stuff for non-native
 	/usr/include/libnl3/netlink/cli/addr.h
@@ -51,6 +48,9 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libnl3/netlink/cli/tc.h
 	/usr/include/libnl3/netlink/cli/utils.h
 )
+PATCHES=(
+	"${FILESDIR}"/${PN}-99999999-2to3.patch
+)
 
 src_prepare() {
 	default
@@ -58,8 +58,9 @@ src_prepare() {
 	eautoreconf
 
 	if use python; then
-		cd "${S}"/python || die
+		pushd "${S}"/python > /dev/null || die
 		distutils-r1_src_prepare
+		popd > /dev/null || die
 	fi
 
 	# out-of-source build broken
@@ -72,15 +73,17 @@ multilib_src_configure() {
 		$(multilib_native_use_enable utils cli) \
 		$(use_enable debug) \
 		$(use_enable static-libs static) \
-		$(use_enable threads)
+		$(use_enable threads) \
+		--disable-doc
 }
 
 multilib_src_compile() {
 	default
 
 	if multilib_is_native_abi && use python; then
-		cd python || die
+		pushd python > /dev/null || die
 		distutils-r1_src_compile
+		popd > /dev/null || die
 	fi
 }
 
@@ -90,8 +93,15 @@ multilib_src_install() {
 	if multilib_is_native_abi && use python; then
 		# Unset DOCS= since distutils-r1.eclass interferes
 		local DOCS=()
-		cd python || die
+
+		pushd python > /dev/null || die
+
 		distutils-r1_src_install
+
+		# For no obvious reason this is not done automatically
+		python_foreach_impl python_optimize
+
+		popd > /dev/null || die
 	fi
 }
 
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 952bf0c27d71..4a75fe027e55 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,8 +1,4 @@
 AUX libpcre-8.41-fix-stack-size-detection.patch 569 BLAKE2B 68f685ccd9ebe0a256f829ff2086d93041dfc872e301a19a234c8da3b834fb5c0da3b510b0f63fff7fc07c1d6680ebfb964ba3dbf1a58b302abb14a393da36a4 SHA512 ac9f6155d055b25bcde26bf11450cb07618d7194e0a2c28e0c38dca4190b3319fbfdb85c97f01210dc7540a708fd4f8879853350d66ae382b54c4704e2e7028b
-DIST pcre-8.42.tar.bz2 1570171 BLAKE2B f68bac3cf8ff5a81ccba31fd4d8926e05143a25a756e7daba9793467cec9cd8a4766f394f958ffca088b472463a43a31ea77014f2d4505082c1f366a18f30c7a SHA512 b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d
-DIST pcre-8.43.tar.bz2 1576584 BLAKE2B 12c2117fc5d242ada44884df279f7f8b4c680fa1623ddc131c0adca1740ec47614ac6af20fc60b0c516d9d7b66488ba8a4e5efa5fc8a0a70aacb02bb3d38ee53 SHA512 3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7
 DIST pcre-8.44.tar.bz2 1577611 BLAKE2B ef8d5737ca1f4c72f12c8726956ce5d3bad13aa8303b7c3b5d25499e3027ddc2edcdb937d9ad2bdd437a8885f1af8757ba194aa0b2f236b6e6a3a18d2ec8f138 SHA512 f26d850aab5228799e58ac8c2306fb313889332c39e29b118ef1de57677c5c90f970d68d3f475cabc64f8b982a77f04eca990ff1057f3ccf5e19bd137997c4ac
-EBUILD libpcre-8.42.ebuild 2569 BLAKE2B f0dfd202675e5f247d830162967a57692b10a85370e77303bab3f7e0f4a18912a4ae35a0fc017447d2b264d093ebd72477a62b50a9084a251f595c1ee2be5e37 SHA512 a843f1750600b74cc6760dbe9de5acd43161cba91aa17b11ebb99df9f6a6e5f6d025e4987b4f982b1b6200bc226e5746f87332196bedde01e58d8fb7144d95a1
-EBUILD libpcre-8.43.ebuild 2587 BLAKE2B 8b46e88fb2df8c2baca19db226d61d7dfb50ff13a5184e8f077e7c92de1840f6f559907fb1de0e08d52e4e00c9fc10ae405577fd5ce9314465cf174d3106c5ce SHA512 c8862ad1f85b3d0a4e5a36050987554efcc0c5011c22e0fe19ed9de98bcaf928968a82bd55bbea2d5a177ed133074e377f8e6099e888a4a39167003b2ff1c69e
-EBUILD libpcre-8.44.ebuild 2605 BLAKE2B 14d33e43325e2015d6256e73738a30f90c76543771d9e1b5eb829163ed81d1391a03bd3322ccb3684fee6fa128daf225164a7e5eafda570796f63da87cbdeb65 SHA512 ba2cc8b95510c5ef477d1cd55b4812ee379d8db1b93b0e5280c8ddfff19e1469464791b340ec300e2a7221fb5f207dc5320e49fa7c870efe62ba4c3e904b83df
+EBUILD libpcre-8.44.ebuild 2604 BLAKE2B 08d15a211ab7fe13bbd54169b38aed22d5fabcda04e8c438d862ef6ebe7d94cd4aee9e194208874e1a6089c80ede92da2caa8a639df8d8ebf27ed907c165ca78 SHA512 e17a2ca257f39192453b693090590a7c824f1490a23922a288bda28da26eab84f2c522440380e10d8682520f71c87596bb84352176520c5fe17e9c33502d5148
 MISC metadata.xml 1112 BLAKE2B 640e6cc2fe53eaa86b6e6cdd72d45398c880a27d027441447b6162c70fa30fafe818cae8c08614333b866cfb1176feae365996386a72200232a738d99b592b83 SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b
diff --git a/dev-libs/libpcre/libpcre-8.42.ebuild b/dev-libs/libpcre/libpcre-8.42.ebuild
deleted file mode 100644
index 0c2110d64d2c..000000000000
--- a/dev-libs/libpcre/libpcre-8.42.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib libtool flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-MY_P="pcre-${PV/_rc/-RC}"
-if [[ ${PV} != *_rc* ]] ; then
-	# Only the final releases are available here.
-	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
-		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
-else
-	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
-fi
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
-REQUIRED_USE="readline? ( !libedit )
-	libedit? ( !readline )"
-
-RDEPEND="
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	libedit? ( dev-libs/libedit )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pcre-config
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.41-fix-stack-size-detection.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT)
-		$(multilib_native_use_enable bzip2 pcregrep-libbz2)
-		$(use_enable cxx cpp)
-		$(use_enable jit)
-		$(use_enable jit pcregrep-jit)
-		$(use_enable pcre16)
-		$(use_enable pcre32)
-		$(multilib_native_use_enable libedit pcretest-libedit)
-		$(multilib_native_use_enable readline pcretest-libreadline)
-		$(use_enable static-libs static)
-		$(use_enable unicode utf)
-		$(use_enable unicode unicode-properties)
-		$(multilib_native_use_enable zlib pcregrep-libz)
-		--enable-pcre8
-		--enable-shared
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
-		install
-	gen_usr_ldscript -a pcre
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-}
-
-pkg_preinst() {
-	preserve_old_lib /$(get_libdir)/libpcre.so.0
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/libpcre.so.0
-}
diff --git a/dev-libs/libpcre/libpcre-8.43.ebuild b/dev-libs/libpcre/libpcre-8.43.ebuild
deleted file mode 100644
index 72208bf391f5..000000000000
--- a/dev-libs/libpcre/libpcre-8.43.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib libtool flag-o-matic toolchain-funcs multilib-minimal preserve-libs usr-ldscript
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-MY_P="pcre-${PV/_rc/-RC}"
-if [[ ${PV} != *_rc* ]] ; then
-	# Only the final releases are available here.
-	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
-		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
-else
-	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
-fi
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
-REQUIRED_USE="readline? ( !libedit )
-	libedit? ( !readline )"
-
-RDEPEND="
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	libedit? ( dev-libs/libedit )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pcre-config
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.41-fix-stack-size-detection.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT)
-		$(multilib_native_use_enable bzip2 pcregrep-libbz2)
-		$(use_enable cxx cpp)
-		$(use_enable jit)
-		$(use_enable jit pcregrep-jit)
-		$(use_enable pcre16)
-		$(use_enable pcre32)
-		$(multilib_native_use_enable libedit pcretest-libedit)
-		$(multilib_native_use_enable readline pcretest-libreadline)
-		$(use_enable static-libs static)
-		$(use_enable unicode utf)
-		$(use_enable unicode unicode-properties)
-		$(multilib_native_use_enable zlib pcregrep-libz)
-		--enable-pcre8
-		--enable-shared
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
-		install
-	gen_usr_ldscript -a pcre
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-}
-
-pkg_preinst() {
-	preserve_old_lib /$(get_libdir)/libpcre.so.0
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/libpcre.so.0
-}
diff --git a/dev-libs/libpcre/libpcre-8.44.ebuild b/dev-libs/libpcre/libpcre-8.44.ebuild
index 4414fde35e73..737d3c29e1da 100644
--- a/dev-libs/libpcre/libpcre-8.44.ebuild
+++ b/dev-libs/libpcre/libpcre-8.44.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 9adde6e2e744..f8cd7f829830 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,5 +1,5 @@
 DIST libpqxx-6.4.5.tar.gz 715081 BLAKE2B 4f1356dc5fc9baddd8fdea6095541f4d90657ef0211edec7796ddd3693933b8d37d5bb14e19249a2e4627b85aef11c582b0ffac0226c8e99a70af1d2b0396e5c SHA512 b6f79c4af93876eaf859626c2deae3b23bd4fa1a438390bc01513ccc48b90565d59588f6977e7475bb7b8dbeb8b1c8ef2a4737d8eb4d15682531fbf78590ed5e
 DIST libpqxx-7.1.2.tar.gz 693152 BLAKE2B da28d0041fc345eb7774eadf0a886e2a89692ac47d870120991aa97328a6be7d10e8cb2d6deb9e056dc7e05b04fd317d9d0fe4dcf8eab901114b27cd64bf4ff6 SHA512 a4a76c62f6115f5898e4c4bb1c6f095284bdb7ae6a1efa45add9efd422d2a8280d1698caa2469acbb087168208ae0fd8efa36c8735a8ce30e58853e27acd4161
 EBUILD libpqxx-6.4.5.ebuild 2160 BLAKE2B 33eead22f70496238c3a6f8b090545558ce421d3d1fb4bf64ffbf7baa316f1788c41d54e59144531d7fd018c45c0ece349086601319105c0d8e422a003a2eba1 SHA512 e9c95b7fa3251f5806c402ae61893bb35f8269f14b1f02f3a89d3da408fddd0825d8ed1166ae1780c3fa5031a2e99743cf554ee81869abf2214c977314e1a08f
-EBUILD libpqxx-7.1.2.ebuild 2026 BLAKE2B b3c4317cebc6332b23c211b89bf06ddfd1e35d516c1e5b29bbc32bf9c1da073dd091f524e8e8da1eb7ae57a3b31331bd1f1b632f1aeb97b0f51f788b5fb773ed SHA512 67049bd0e8fa1af1566294312e3f75f5ce8adcaab0e53f0c9655c4b9571c17e3c85d6d3b3135616f85d89bfc6faf8afff8d87f1fbf91d87e6b07e8a2e0ba61f0
+EBUILD libpqxx-7.1.2.ebuild 2024 BLAKE2B 621549d79c7cc9da9dac463fa6be48af6a1d687ddc8368d0fa67fba5c2978a9cd036db4927cac5c64545020333b07c79206e1ff382fa43b7f7da890f0fcdac00 SHA512 15a9a65617d82b0e6d146eb0497ff669ed8d11bf86b5aa688f186ca93dd0d5cd6c734f99d3e786865dd71f8cf614b7908c87d21af0bfd978103a5dfe2e9aa2d7
 MISC metadata.xml 611 BLAKE2B 1960af3cc6dc4e15de110c38b2ca41ca94355054539cf28169de54c952726e96327ce21c82dcc0e439d997fd52a8deb825a9f6bc921e727636a9edb9a3ce176b SHA512 2cc8f173d0f1e390e212741307420722c6a8fa8b5afe60ff6a706d4cec17086c88e84ce5f3ed265a0d8d8699de8fffa83c10fb7e1e700370f1eef1d6c3ba4bd3
diff --git a/dev-libs/libpqxx/libpqxx-7.1.2.ebuild b/dev-libs/libpqxx/libpqxx-7.1.2.ebuild
index 77dcda1c600b..4460810bab39 100644
--- a/dev-libs/libpqxx/libpqxx-7.1.2.ebuild
+++ b/dev-libs/libpqxx/libpqxx-7.1.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 inherit python-any-r1
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
 SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 65a1265ad6fd..5b7821d02b84 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -13,5 +13,5 @@ EBUILD libsavitar-3.6.0.ebuild 1068 BLAKE2B f68d50b167fe7c07c7cea56efd8638d8fddb
 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
-EBUILD libsavitar-4.7.0.ebuild 1746 BLAKE2B fcc6adea25485c30ecf0a9ef24a7c61a409761ab513a41137d965682ddf9a09928614df78396e467b5119150dccb4379d6ddcff7337f62da1e57bf7f9d8fb200 SHA512 edd4574147cb9663f7185e9408e4fb7981d9c57af053ec5277232c92ed41b89e55ca58fbd30a501ea773562d028d0d7121ea8c7128c1e6502cc89428d5cff119
+EBUILD libsavitar-4.7.0.ebuild 1753 BLAKE2B 83e91f17eacb614bdfc25f75bfc3bf25fb79e5bf332aa3246c161beaf0894feb9d8990ffd4a5361b7f1b1a359351d2321f2f90a31fe982a6f6bcd0f8ac5297b2 SHA512 313398f3ee57a42ed7e572d6befe1f5b7da862ae8b51b88cf95cbda95f00b8bdb10609f7c507fda8a8a7198c16138489cbc4b59166d578f6c8b35d1bc70ed493
 MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304
diff --git a/dev-libs/libsavitar/libsavitar-4.7.0.ebuild b/dev-libs/libsavitar/libsavitar-4.7.0.ebuild
index 485ab1b9b939..3afa1673bb74 100644
--- a/dev-libs/libsavitar/libsavitar-4.7.0.ebuild
+++ b/dev-libs/libsavitar/libsavitar-4.7.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-3"
 SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 IUSE="+python static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index a7cb9648f80c..ad4beee19dfc 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -2,7 +2,7 @@ AUX libsigc++-1.2.7-fix-install.patch 457 BLAKE2B 70e53fc5931a8f11390da226297edf
 DIST libsigc++-1.2.7.tar.bz2 326205 BLAKE2B b316460178224c0b8177ce9a236c69a8b737bf7356b290b59eaeb60b09285c61d113bfc7de89bd712c3c049a492f5cc36d205ac77816aff73e587e8a42ade520 SHA512 79fd9657219459bce64fc069dbcb054959e324b5d546b5f11acaae5e5bedcc4dca699a21c949e3f6b2ec0dbe1c3dba3981158e5950d0aaba5028445b2ad5740f
 DIST libsigc++-2.10.1.tar.xz 4062388 BLAKE2B 3bd988acae78b7d463c966fa5c8da68b35d8a0b0bf4762811b7a9fdf82357b29aaa48d64e19f4cb6bd0f42ee70ad77a64a4905d1ad609dbe11ca8ff7596527c6 SHA512 e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2
 DIST libsigc++-2.10.3.tar.xz 4558428 BLAKE2B fcaaae7bf3a3aea30c0b8b63d7a7c5fa137d16128ef9652b611613118e323f7bcabafe28d42407df0e08c323c540143c152ac91e04e9f101c1971ddaf0f9144c SHA512 3c7f90be84724e39073c05624ad2bee6a5835e2c6cb6cf9e605edc6574eb7cd99ec153aaca6e8fcf7e3a6c031c4e9c334da32d04177d36788e64a17667c70b4e
-EBUILD libsigc++-1.2.7.ebuild 949 BLAKE2B aee7ea02cc434e79e0ac7e5fb26a1c683c2a045c29ea44d689b2a24802811ae5bd00f30d1519cdfb20d323b9126018c98f4d3150990aa872f72f5597a40541c3 SHA512 0cdd9c8a8a3ba22d6acad0b24b4cddc00bbd934e320f0cd40811aab2b09dffed39a7f27cd3a824d54403b8e9b317579dfd67dbd4424fce4c47d29e474027f28d
-EBUILD libsigc++-2.10.1.ebuild 1524 BLAKE2B 8958c575e619e0639628cff6650aa5fa5e1a70f3a656044e3690a9420e11a2d46077e70783873d224df738be64ca0ecb5480f74a5d02f281da0a2cb4a8721a39 SHA512 618f3427ff9f4209179320aad14cf2a6837034ca978395f33bcaf3c402071b9371d3a8b22c5105622394447417b68b3a99bb23930d37d238934bfbf4b91073aa
-EBUILD libsigc++-2.10.3.ebuild 1527 BLAKE2B 1be044b6710b467286f25d4e68a0d26799ed4af32991aaec11b0ab7bf4bec0732c1acc5f78e9cfd8e09fcfff6d81e71d5e331d4458df32f75c300b93a6d41d8e SHA512 229176649df9cfb62126822c99975e8d508ccb65e8750b45a619e834a8d2223814084e102c71d9ae9f481ff5ecc4303b9a26450cf395992a56d7b043a1e575cd
+EBUILD libsigc++-1.2.7.ebuild 1020 BLAKE2B 4a0e128fe3c38b560a9b0dfaae0c7082de216812457bbb2353c8fb41751e098cae3c49207899428f30a780aacdf40b9177a99ec193ae8bb45a6f396e919a8e6d SHA512 d1a6143530faa508319b099b2e862f9212fc9e091c83f5e23f400aff4249a674f6251aaeedf4876a8e3242905820f07e67d00521d852d71cf0707d0abbb45239
+EBUILD libsigc++-2.10.1.ebuild 1595 BLAKE2B 8476d67d22ba99a8c6b66a44ba841d2066a4ea6e1c5894cbea1e393f42e0fa03a29f72d0419f5f4db13f582cef1a5ea7ff2116ee62b8e7e9f587495da311895e SHA512 b797be5a64fefbc7438f838b4d6957f407ea1d8ecfbe9ce6e96679de449fe7ce6278f4ab90591810be082452c10deb0eea50780219a20ea46faf58e731be3fa8
+EBUILD libsigc++-2.10.3.ebuild 1596 BLAKE2B e38f5a9fe49ac25f0d5b169c31a742961cf2f5cd096ae950a4f9aef13c1e0f8896b67fe38da650d8fea5ae78c3a5d0b414a0ad85f0711e8a239fa04868a407ca SHA512 ca2ac8b4258bebfaa727758ba92ded9393dba38a15e8b6ec9ac6fc927af4a993cf648f62ce762367cc4edd7d0b8dde265b3ee3575463e561f07bc76fa8ab237c
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
index 5072a37204b6..343cc0cc0674 100644
--- a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
+++ b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
@@ -8,7 +8,8 @@ GNOME_TARBALL_SUFFIX="bz2"
 inherit autotools gnome2 eutils
 
 DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="http://libsigc.sourceforge.net/"
+HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
+	https://github.com/libsigcplusplus/libsigcplusplus"
 
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="1.2"
diff --git a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
index 21fef39f8be5..ae83beb1b896 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.1.ebuild
@@ -5,7 +5,8 @@ EAPI=6
 inherit gnome2 flag-o-matic multilib-minimal
 
 DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="http://libsigc.sourceforge.net/"
+HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
+	https://github.com/libsigcplusplus/libsigcplusplus"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
diff --git a/dev-libs/libsigc++/libsigc++-2.10.3.ebuild b/dev-libs/libsigc++/libsigc++-2.10.3.ebuild
index 5cdeef64138e..f9366ae1ce03 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.3.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.3.ebuild
@@ -5,11 +5,12 @@ EAPI=6
 inherit gnome2 flag-o-matic multilib-minimal
 
 DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="http://libsigc.sourceforge.net/"
+HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
+	https://github.com/libsigcplusplus/libsigcplusplus"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index 48b79968a9b1..05eba456d42d 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1,6 +1,8 @@
 AUX libstrophe-0.9.2-libressl.patch 843 BLAKE2B f979127225535d271dafdb379d9e07bdfd06cd5684c07fe2a8a466698109dd68c0626615d20636d230858e5a2868dd450b5fabcbb4482e6814a2b3d032bd89f8 SHA512 6a6321955805eb1b80a7dc6baa528a9594f2d37a640e4166839fa9db9d0e2113a64dd33f08682c03a1a840836c76a4e62e384c9cfdd798442ee024ff88c1d8e6
+DIST libstrophe-0.10.0.tar.gz 520645 BLAKE2B 85998ffa7d2051bf3372842a0bc6d5404932c41853609943ae0420760e0434a74b711bd5f23657f061f1227647247b1989833c54c11a88490fe7617459687818 SHA512 9d2e8f95ab5f9611529e18b0130322a196d4b59aae69c931a6d7dc462d4a6a4fa395d6fbca56d9f329fc943e3de005b570ea34629a504175f3f2ec91f85bf40a
 DIST libstrophe-0.9.2.tar.gz 500459 BLAKE2B 0b1f6f1daac1215bcdcbde0e54264b98f5a863de339500826f625f8c5e8143ce7200fb251d04248715e9a8b6621a4360e7ca2780bf4684d916ec13361b5f6fcc SHA512 a0129c49ca574afaefa77c412143571af2eb1100c7d737d497b65d44680d35e2404ee2d4d4e1378b06ac1bcc5c587f505f79fea9251af1cbb36afd990d48570d
 DIST libstrophe-0.9.3.tar.gz 502449 BLAKE2B 662b0c329b0bf7d7f34fc80bf0608b921fa1ad54c8277e88f23f3ed17d0892dc7e3d9bcaaa9707306801e9254bba4a127390025ab95e1d9d850c299a7b26d980 SHA512 9c8ba980f532c5576c2c5a9e3cdca9f833ec78debcb06b17e2f534de0e710ec416b997b0498be77a89fa7f57187456edb1d602993c695a5e738718ea593697a5
-EBUILD libstrophe-0.9.2.ebuild 982 BLAKE2B d5069f4bd65399c4fb4bfeb3a393cdde866bb1220b90bef7e8049a2a18222eba8f5cee1188e2272a3d868adbc73cb9f5ab11e60f275fe89bafeb748403c74df8 SHA512 fa67f32a81ac19b5a00cc51c53eda54851125831206adbbb2ce9ca8a6ee8c92b12afe70b54aad4a4fb444783df00a66c7a65e01fde1a1f510a64bf65651039bb
-EBUILD libstrophe-0.9.3.ebuild 924 BLAKE2B d6b237fec388f2987de089ff5bf74f36fee76a76dc0387b21e9f771dea7e55c0e0dbb3193224fbae83c308e65c2432c181ca7e4603b465de65eae29cf98ff5e1 SHA512 8ed6bf67e275b2af4b151c3a3fd0a3732d44cacdd4a827173ff0b0d475e8eca7438c1e125820710bd94b90093674e1cba6c7e5ff477c4cb26c7d27b07c2bdce8
+EBUILD libstrophe-0.10.0.ebuild 939 BLAKE2B bf7d1b2bc28e0b84526a24b40421da03a4c1cf3a9921404dcf7c2944b7d29bf4d8956786f69d698fa85cccb7e7651418f63d76acc67d0464de662dbcaa0a271e SHA512 4bb5bced839555972d3b6cc73cb18eec6e1a86e3464e9c21a840c7f66e50c206e96511bc8db746e87998c8add26b707c44dfec896107c81504c8529ea8af5838
+EBUILD libstrophe-0.9.2.ebuild 997 BLAKE2B cccba2a7f657e6a37789e4f914e40c73205feb81929b0c6ee67dbe2c3009dacf2bd436dcfd0991726ed0e3fa687af65fd4af6f15718cc91c6e4ebe288ddbcd03 SHA512 a7bc876d1788aa24210548f8c92dd26648841db64eb672123d2684769110715dbc1b3c1b6601a34e1688bb83f0fd8b32287d19333c1018f275a5b50a458b4bf2
+EBUILD libstrophe-0.9.3.ebuild 939 BLAKE2B bf7d1b2bc28e0b84526a24b40421da03a4c1cf3a9921404dcf7c2944b7d29bf4d8956786f69d698fa85cccb7e7651418f63d76acc67d0464de662dbcaa0a271e SHA512 4bb5bced839555972d3b6cc73cb18eec6e1a86e3464e9c21a840c7f66e50c206e96511bc8db746e87998c8add26b707c44dfec896107c81504c8529ea8af5838
 MISC metadata.xml 591 BLAKE2B 0706dfaeb6ebcf44525e7ecfe772c8496020da59ed5b3024775e41a79ec0ac5861d118e136d45187f819e70ac7e2bf360bf210d159167aeb1eccaa75747353fd SHA512 d05b0612eae08214749144fdca408ae9b630cd9763762fec74b46639d7faed460c2c4cc07e278453c637376e78aa50eafdf137a6143f7ded355358ffb292fd60
diff --git a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
new file mode 100644
index 000000000000..be09401f2e96
--- /dev/null
+++ b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
+HOMEPAGE="http://strophe.im/libstrophe/"
+SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.gz"
+LICENSE="|| ( MIT GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc expat libressl"
+
+RDEPEND="
+	expat? ( dev-libs/expat )
+	!expat? ( dev-libs/libxml2:2 )
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=( ChangeLog )
+
+src_configure() {
+	# shellcheck disable=SC2207
+	local myeconf=(
+		--enable-tls
+		$(use_with !expat libxml2)
+	)
+	econf "${myeconf[@]}"
+}
+src_compile() {
+	default
+	if use doc; then
+		doxygen || die
+		HTML_DOCS=( docs/html/* )
+	fi
+}
+
+src_install() {
+	default
+	use doc && dodoc -r examples
+	find "${D}" -name '*.la' -o -name '*.a' -delete || die
+}
diff --git a/dev-libs/libstrophe/libstrophe-0.9.2.ebuild b/dev-libs/libstrophe/libstrophe-0.9.2.ebuild
index f95cbfb67f5e..e370927cb139 100644
--- a/dev-libs/libstrophe/libstrophe-0.9.2.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.9.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
@@ -42,5 +42,5 @@ src_compile() {
 src_install() {
 	default
 	use doc && dodoc -r examples
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -o -name '*.a' -delete || die
 }
diff --git a/dev-libs/libstrophe/libstrophe-0.9.3.ebuild b/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
index 5323315dc71e..be09401f2e96 100644
--- a/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,5 +41,5 @@ src_compile() {
 src_install() {
 	default
 	use doc && dodoc -r examples
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -o -name '*.a' -delete || die
 }
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 51e1cdaef509..48df1b0cc272 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -7,6 +7,6 @@ EBUILD libuv-1.35.0.ebuild 1218 BLAKE2B 6ba8895dd19c83b5721e075b13ccca6d46cf9a86
 EBUILD libuv-1.37.0.ebuild 1218 BLAKE2B 6ba8895dd19c83b5721e075b13ccca6d46cf9a865238be1371ba2808865636eb5b8b15ba4a095c1ff9f2c3fb40bea59bb9f6b3505125a12f0309ebae15f583f9 SHA512 d655d1ae4865f61998b70de2de05bebed3a25b93a3db410c38423974424e44dfc659c64e3a39170b4a62552f25e4c0a76d67a424dbcdc29b1ae2e4414410b154
 EBUILD libuv-1.38.0-r1.ebuild 1231 BLAKE2B 07bbc6b09e38c9afb4fa929b74b636905c6e4eccaa14a594d68ff189f3523a4c5e1e0bc14c4244e21d95f49e8943a24d88ab9e818ee78ce0b3bff4f8b532ec2f SHA512 ec0b799dd24416c8b70112f745ac2604010f9f809d8dc385341aaf1ef825eecf111bfec1ab68372428a71e85b5973549bd5128ef6d256a8279b36d08a3343c37
 EBUILD libuv-1.38.1.ebuild 1231 BLAKE2B 07bbc6b09e38c9afb4fa929b74b636905c6e4eccaa14a594d68ff189f3523a4c5e1e0bc14c4244e21d95f49e8943a24d88ab9e818ee78ce0b3bff4f8b532ec2f SHA512 ec0b799dd24416c8b70112f745ac2604010f9f809d8dc385341aaf1ef825eecf111bfec1ab68372428a71e85b5973549bd5128ef6d256a8279b36d08a3343c37
-EBUILD libuv-1.39.0.ebuild 1231 BLAKE2B 07bbc6b09e38c9afb4fa929b74b636905c6e4eccaa14a594d68ff189f3523a4c5e1e0bc14c4244e21d95f49e8943a24d88ab9e818ee78ce0b3bff4f8b532ec2f SHA512 ec0b799dd24416c8b70112f745ac2604010f9f809d8dc385341aaf1ef825eecf111bfec1ab68372428a71e85b5973549bd5128ef6d256a8279b36d08a3343c37
+EBUILD libuv-1.39.0.ebuild 1225 BLAKE2B d32cd7e81223453ef62afe2ce634ca141963635b3b32726ac9c66a87355faf49bbe86126d5007b59edc1b81d58233424deb78490377e1685bff1e980c6491d24 SHA512 49afc14d90d43e24f8703870a67c385d71a601bbee8d57d002d2e4a9a9410c9f8610f2881e270f265748b2ea884cf982fe370341f415b4d9384c94e6bd19d3be
 EBUILD libuv-9999.ebuild 1000 BLAKE2B 39cca04aa13e367adbbe3aaab32e0eb2edd1d7966b6f81ea5a8b7772fb6e590aebb06da9ede6782ce9e4806737251d970992f2c4d56726469b11815ed58ee3e4 SHA512 170a10be4f9b177894113114b28f3932836a943a29dfe8c2ea12213421ea96c0d66b65039fa3ad60a208a30786ead3faabeda532433e741bb6d8f7b44f9dc21e
 MISC metadata.xml 1392 BLAKE2B e4e8980feed751a6ddc0284d1bc0e56635707adad5ccedea3a78c9a22b0ef700f7554a62d7edc5a2d824dfd66036937e9056bd9db7cd302c5028469bbebbd3e9 SHA512 d2d709b7c1cfa4d83957365d62bf7fb95e1948129f499a907718228c067d871212c9b16f8272f000db92aad8eeb35505dd50a08357b8ae07dbbc9a4fe8534b3b
diff --git a/dev-libs/libuv/libuv-1.39.0.ebuild b/dev-libs/libuv/libuv-1.39.0.ebuild
index a9a8ca340c4c..17400aab2d39 100644
--- a/dev-libs/libuv/libuv-1.39.0.ebuild
+++ b/dev-libs/libuv/libuv-1.39.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/mpc/Manifest b/dev-libs/mpc/Manifest
index 19d6a5fa01a4..91aeb758b093 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,5 +1,5 @@
 DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628
 DIST mpc-1.2.0.tar.gz 840711 BLAKE2B 3609d299623a722ca90d4b04ff64becaaa399a5fa40fbc43a1d027692d8fbe6f4ebd24a3c8ea963963977952d130cd3993887da7b0b0c1613a27a24dd37e5831 SHA512 84fa3338f51d369111456a63ad040256a1beb70699e21e2a932c779aa1c3bd08b201412c1659ecbb58403ea0548faacc35996d94f88f0639549269b7563c61b7
 EBUILD mpc-1.1.0-r1.ebuild 911 BLAKE2B a4f737a415faf743345c5f01a63e97ee130b0bc01f4773c60688b64111886e365f61807b173fa5090474cc6d522c918655793e63668a05827ccad3f0f7ec6900 SHA512 9be5809d00f2c567c2ce0c422479825685aec708bd3bc1a12656bb0872de11e1695872fca17d0949a4b48e4e16cd6179371e682cf2564a98c9208e486f610f0d
-EBUILD mpc-1.2.0.ebuild 934 BLAKE2B e4765161a8e158fa072d76805adc7ad49d142265ebfde65b2c8616c7ddf2fa90d34dea798f549bd4266b7f91067f0f60760d2536f9d647179a8587170d4b8ef9 SHA512 45cb962e1ec46d559fa368688da6100b299ef6afec4684c6e5a4e4aebcfee8d9e53a00e83a51cfeb7560b09f57c164d08bc2ae832d8e9238a8a1d882151eb7b0
+EBUILD mpc-1.2.0.ebuild 928 BLAKE2B c1e98b0448817c63fe6c878d0216b486fb1766836d3f03faee19f547a57b9a6205adc72d556987fb709c1a18f6a207d672faad5225ce7634bfaa4aa4f8360af6 SHA512 89d6449b1177af524e9892c6827a25477bf8de71e45d09eba706ba39e98f66f518172cc9a176b59faca11a08ead524e3ee4cadc5b0056e39867a923a59bc4e42
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.2.0.ebuild b/dev-libs/mpc/mpc-1.2.0.ebuild
index 1bdc785c2c6a..4f8f43991b85 100644
--- a/dev-libs/mpc/mpc-1.2.0.ebuild
+++ b/dev-libs/mpc/mpc-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3" # libmpc.so.3
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index bdbf64722b6d..927c755abd99 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -10,7 +10,9 @@ DIST openssl-1.1.0l-bindist-1.0.tar.xz 13184 BLAKE2B c09e023458faff17b10d6f20c28
 DIST openssl-1.1.0l.tar.gz 5294857 BLAKE2B 0e4f30f9e8a22414325bd780dc4e875e962487fbe72967f0392ace959955429192541881a98d097d7bb75ed7238b1817b0c3c2c4da04421512bd538f2b07cdd7 SHA512 81b74149f40ea7d9f7e235820a4f977844653ad1e2b302e65e712c12193f47542fe7e3385fd1e25e3dd074e4e6d04199836cbc492656f5a7692edab5e234f4ad
 DIST openssl-1.1.1e-bindist-1.0.tar.xz 16948 BLAKE2B 78e034f1d263cbf5e57c92393f72acd07e86e39a5511a8852bad151371430954e07d787fd82cca55b373d1579bb22b9d29c9d677104ed68291a9d2dffe3ffbbb SHA512 0dbfb378b8f2724db82915e17fd4e43977e3e45030db25cdb9241c0ab842e41ef3d597ef71c4db5103635752dc2059ea6022597511a440f55fb56a5a52d3ccea
 DIST openssl-1.1.1g.tar.gz 9801502 BLAKE2B 5e3dd4725ff89b959a5436d64b521317c6ffeb377418cc24c6d1927fab923423cb5f5fce2f9c2cdee597041c7be156d09668a5fd13dc6ff06d235a83db94cf19 SHA512 01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab
+DIST openssl-1.1.1h.tar.gz 9810045 BLAKE2B ac9ba6fb0c4da0a761e8655b6907634365ddb114216acfcfc981e13c211577b6bd23ea8d2ad0999c0960b039f5d3dead5733e6dc07c5231ab953307a9015cd36 SHA512 da50fd99325841ed7a4367d9251c771ce505a443a73b327d8a46b2c6a7d2ea99e43551a164efc86f8743b22c2bdb0020bf24a9cbd445e9d68868b2dc1d34033a
 EBUILD openssl-1.0.2u.ebuild 9865 BLAKE2B f0b332d3fc6d45583b2cee5dbfc1c64f97087805e9e240ad2b6495d69f0139a92db49dd6ea7bc1fed9e84387dac85d9ba0be7a5578e25242c7b668d1c44b680b SHA512 93e899d27f034ac18f5c4425f0a2c3c9b1aaeeb21adddbe60573ab3ba1e3cab68b8acf204d4ef956f1039c6e8646750c6abb7a42d11e8e50fbc948132a907c47
 EBUILD openssl-1.1.0l.ebuild 9592 BLAKE2B 8778c7cff0b81a5bfc1b8161b45c7a5a4f89cc7bb07e9c8e213a034a651d80ac3acd0939fd9eb986f1965119e399868c3106a4ce3c58b637e2289582543d6105 SHA512 691be7e7221f7bfc7e95e1d118f8d32b40e45afe5b213c342a40f610088cb3e5a7acc1351f27330653775a5f773cbc16e5531302c343af768b2d385967983970
 EBUILD openssl-1.1.1g.ebuild 10192 BLAKE2B e52c4546f93268a03098ec24f91d29bfeae5c0705319379194973f91e50ca3b7977ab8c6942b9e7364b910d0709c16477740b046a236dd7d2859f3b038cb16ab SHA512 bc36994596f5e67bcd7e3fac1bb43ec628880497299cc4b5e0e596f08de24eca47abefb6958c73e297168830f67b3ede49ea8795a5de02305af2f5fa9ada4672
+EBUILD openssl-1.1.1h.ebuild 10201 BLAKE2B 8f7f18543c3ac4165a9bc93b7872228bd7bd48774d48c848557300cd52140b467488645ebd7d307e34b6e837342de8b406eb9c5a08ec6ca7912899192d5db12c SHA512 ce7a57a1eee4a045afdbc288a3087261901c3b9da9a404b1d3bd6d975e4b377106f05f471377a93e8f8c9c141f70f985981245a489d569e744977894c5bbe254
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/openssl-1.1.1h.ebuild b/dev-libs/openssl/openssl-1.1.1h.ebuild
new file mode 100644
index 000000000000..ccc0cbc5d585
--- /dev/null
+++ b/dev-libs/openssl/openssl-1.1.1h.ebuild
@@ -0,0 +1,324 @@
+# 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
+
+MY_P=${P/_/-}
+
+# This patch set is based on the following files from Fedora 31,
+# see https://src.fedoraproject.org/rpms/openssl/blob/f31/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.1.1e-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}
+	)"
+
+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"
+IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+RDEPEND=">=app-misc/c_rehash-1.7-r1
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/perl-5
+	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
+	test? (
+		sys-apps/diffutils
+		sys-devel/bc
+		sys-process/procps
+	)"
+PDEPEND="app-misc/ca-certificates"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602
+)
+
+S="${WORKDIR}/${MY_P}"
+
+# force upgrade to prevent broken login, bug 696950
+RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
+
+MULTILIB_WRAPPED_HEADERS=(
+	usr/include/openssl/opensslconf.h
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	# must check in pkg_setup; sysctl don't work with userpriv!
+	if has test ${FEATURES} && use sctp; then
+		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
+		# if sctp.auth_enable is not enabled.
+		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
+		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then
+			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
+		fi
+	fi
+}
+
+src_prepare() {
+	# allow openssl to be cross-compiled
+	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
+	chmod a+rx gentoo.config || die
+
+	if use bindist; then
+		mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die
+		bash "${WORKDIR}"/hobble-openssl || die
+
+		cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die
+		cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die
+
+		eapply "${WORKDIR}"/bindist-patches/ec-curves.patch
+
+		local known_failing_test
+		for known_failing_test in \
+			30-test_evp_extra.t \
+			80-test_ssl_new.t \
+		; do
+			ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist"
+			rm test/recipes/${known_failing_test} || die
+			eend $?
+		done
+
+		# Also see the configure parts below:
+		# enable-ec \
+		# $(use_ssl !bindist ec2m) \
+	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
+		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
+			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
+		fi
+	fi
+
+	eapply_user #332661
+
+	if has test ${FEATURES} && use sctp && has network-sandbox ${FEATURES}; then
+		ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox"
+		rm test/recipes/80-test_ssl_new.t || die
+		eend $?
+	fi
+
+	# make sure the man pages are suffixed #302165
+	# don't bother building man pages if they're disabled
+	# Make DOCDIR Gentoo compliant
+	sed -i \
+		-e '/^MANSUFFIX/s:=.*:=ssl:' \
+		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
+		-e $(has noman FEATURES \
+			&& echo '/^install:/s:install_docs::' \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
+		Configurations/unix-Makefile.tmpl \
+		|| 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
+
+	append-flags -fno-strict-aliasing
+	append-flags $(test-flags-CC -Wa,--noexecstack)
+	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
+
+	# Prefixify Configure shebang (#141906)
+	sed \
+		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-i Configure || die
+	# Remove test target when FEATURES=test isn't set
+	if ! use test ; then
+		sed \
+			-e '/^$config{dirs}/s@ "test",@@' \
+			-i Configure || die
+	fi
+	# 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
+
+	local sslout=$(./gentoo.config)
+	einfo "Use configuration ${sslout:-(openssl knows best)}"
+	local config="Configure"
+	[[ -z ${sslout} ]] && config="config"
+
+	# Fedora hobbled-EC needs 'no-ec2m'
+	# 'srp' was restricted until early 2017 as well.
+	# "disable-deprecated" option breaks too many consumers.
+	# Don't set it without thorough revdeps testing.
+	# 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) \
+		enable-srp \
+		$(use elibc_musl && echo "no-async") \
+		${ec_nistp_64_gcc_128} \
+		enable-idea \
+		enable-mdc2 \
+		enable-rc5 \
+		$(use_ssl sslv3 ssl3) \
+		$(use_ssl sslv3 ssl3-method) \
+		$(use_ssl asm) \
+		$(use_ssl rfc3779) \
+		$(use_ssl sctp) \
+		$(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 ^CFLAGS= Makefile | LC_ALL=C sed \
+		-e 's:^CFLAGS=::' \
+		-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 "/^CFLAGS=/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 depend
+	emake all
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED}"/usr || die
+	fi
+
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	# openssl installs perl version of c_rehash by default, but
+	# we provide a shell version via app-misc/c_rehash
+	rm "${ED}"/usr/bin/c_rehash || die
+
+	dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el
+
+	# This is crappy in that the static archives are still built even
+	# when USE=static-libs.  But this is due to a failing in the openssl
+	# build system: the static archives are built as PIC all the time.
+	# Only way around this would be to manually configure+compile openssl
+	# twice; once with shared lib support enabled and once without.
+	use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
+
+	# create the certs directory
+	keepdir ${SSL_CNF_DIR}/certs
+
+	# Namespace openssl programs to prevent conflicts with other man pages
+	cd "${ED}"/usr/share/man || die
+	local m d s
+	for m in $(find . -type f | xargs grep -L '#include') ; do
+		d=${m%/*} ; d=${d#./} ; m=${m##*/}
+		[[ ${m} == openssl.1* ]] && continue
+		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
+		mv ${d}/{,ssl-}${m}
+		# fix up references to renamed man pages
+		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
+		ln -s ssl-${m} ${d}/openssl-${m}
+		# locate any symlinks that point to this man page ... we assume
+		# that any broken links are due to the above renaming
+		for s in $(find -L ${d} -type l) ; do
+			s=${s##*/}
+			rm -f ${d}/${s}
+			# We don't want to "|| die" here
+			ln -s ssl-${m} ${d}/ssl-${s}
+			ln -s ssl-${s} ${d}/openssl-${s}
+		done
+	done
+	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
+
+	dodir /etc/sandbox.d #254521
+	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
+
+	diropts -m0700
+	keepdir ${SSL_CNF_DIR}/private
+}
+
+pkg_postinst() {
+	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
+	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
+	eend $?
+}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index a93b6926dd17..f46298843f24 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -19,7 +19,7 @@ DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed9
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
 EBUILD protobuf-3.10.1.ebuild 3030 BLAKE2B e555296b22b00886ca0557dbb90a8ca544fc650895fda3face5e32e886dea426f7c61334fdafaa6fa71a9e47cf675cc0e0f4145e9c57ede5d68fb3597322732d SHA512 18203bed470210102b6e5301a231af2c792ceb14c124a78516dce7a8af564aacbf48a94b67bd1af8b9e93baf3b04dde87021e7d18ac5da92df856e06a5fa4c7d
 EBUILD protobuf-3.11.4.ebuild 3019 BLAKE2B b8efa8797e32842f1009580492a26fb0557a9555713875012d13aa4de247417c81c451ea0c6eeaf8a784a497591a29afa6516422a48c29c87e1e962d4f945617 SHA512 0955a68f5d0aed9a963c43aaf04f649a019dbf2a93f38f3561f7a276dfa8b3877291448dbb3680b89b4643d3ad6b1d3f621504614171c001ca6373eb9bf03cd3
-EBUILD protobuf-3.12.2.ebuild 3028 BLAKE2B 2d35522c78efd3143ad106cd97ca661c421fdd6d6c4fdf78ec8d87837cd42aafba7e320c8d0aa81277db671171342d57cdddcd85658b9b09b26becc27a2ab3ea SHA512 923b5a6fd632b47bc8c5ad30fd555fe4ca3a8e0f8244bd24e6520bc02607f624dfa8018dc6813385020251b4b2621679b02bc99f567c7b492a733644184aeea3
+EBUILD protobuf-3.12.2.ebuild 3026 BLAKE2B 2947ec5816430b051e9d1d279e66057230e371d94e5196aa09349ea1e41d88fb9f07d833cc56a7d8991c3da7260c69450ae7c5047369f85c0020a61e3f72aa72 SHA512 703f0930a9890ca2826783c3676189c55c3fa9bd3827f7b6b5f4b5873bcb3e020b6b7db40676c089728b54d49b7acecd6576d938218afc57e9a3f5209da0f005
 EBUILD protobuf-3.12.4.ebuild 3218 BLAKE2B a201cc755244f015986e90255fbe0d1a95e25d348a851b44c2a14fa1dcf93927f6a8b77822ef2f5bec4971583c115da71e0ff85f3ad5b03b0ef09d58c9a3821e SHA512 8b4931aa05a0571ddcc0944ecf04d2ca8335d09b9bf3f1f7344ee5afb63e7ff63f0981c720f280ef858e63adddc4d1c31de3a81d29155bcfb87e0cbe5bedff8f
 EBUILD protobuf-3.13.0.ebuild 3218 BLAKE2B c3a7389f4da1d9ff6f1628b504897ebc1e72ae02c33d713b7625cbd30ff74e4a5cc8e9823005e6d31512edbe4cb06ab09de35bd9d65b003003fc6437b2cbfab8 SHA512 6462ef2647c0ee9ea3d703afd7402aaf337ec3078fe5fe0219cd7f157101446f3df863063427863604fac0f61f8def5df61255020b095c8ab4aa7b09426f478f
 EBUILD protobuf-9999.ebuild 2672 BLAKE2B 19039df5ff9af194b335978f77c6ac9f8ed3387840e01c449e7661ce628129a1bc9de5938c453a08e21d9ce6e0d734430796aa911135a3c43c84557500da43ad SHA512 32744cffb2e57592c6475845bebc5dc221a8cd933a057699c2203205ed93828041e4b6242aa34c1e07d5f36cb24573a675ef0bbf9ab3fc56e341e3e31acbec47
diff --git a/dev-libs/protobuf/protobuf-3.12.2.ebuild b/dev-libs/protobuf/protobuf-3.12.2.ebuild
index 16f0b7ed8c10..ec32fddd43b9 100644
--- a/dev-libs/protobuf/protobuf-3.12.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.12.2.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/quazip/Manifest b/dev-libs/quazip/Manifest
index f22237befa4e..0a5e85e6f366 100644
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@@ -1,7 +1,5 @@
 AUX quazip-0.9.1-gnuinstalldirs.patch 3853 BLAKE2B cf20bde0e7231a64756d1a05b09f7683c4b4b3e8ff0699b8bfb284cd37b05574244f7d4ec18b6b8df0eae1550fc10f6d99891e8241dfaddeac18080ce8ea11a6 SHA512 b84fdf3d79d47bb18fdafc7652df6f8f705a8bfc63628eb748ee0c94e7ad955074cfdf03c6321d58cd3ef0f04238958cfe24264e785b38f583085cf49042b321
 AUX quazip-0.9.1-no-static-lib.patch 2228 BLAKE2B 7cee7fefbca5696d3862ec475ef34bbd7ae3fca2b3463933b9750081090d0608e1eac095bba53a33a40458fbea6487fb6bde06d652a8417325b2adeb6bed6d76 SHA512 cf9c09b016c3a37158eeb840ef58e1cf65fbc7f98d083489e3dc47b09f22221822c0546341e7410a77428f07ff8d98c168d8ee09d07b8b37c47df6790beeb119
-DIST quazip-0.8.1.tar.gz 150584 BLAKE2B 4a1d61b65b01eee06e1292ee88b543675c77ac922d0fb1726ac0afd447d74e8c8154db82da0ce95c2f2c303c036f2795e8938a412dc22e921ee09a0ef99278f6 SHA512 d65dab16c2cbc4d8bb23dae5b2fdff5ef787aaff2653b8e75c3fc8ba1701f5568a52bdde39009f83c5069a9fe3331cd1a49cf965822c4180e88bbc341faa2bfb
 DIST quazip-0.9.1.tar.gz 155775 BLAKE2B 76710f94d055e86e1885f74b85f3e6b25f053eedbb73b4b11163e243d003ea3bad50cf1568fd2dbd37bc5db05fd0a6f8d49f48bd5df22d30b1aad3747e8ab780 SHA512 db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0
-EBUILD quazip-0.8.1.ebuild 1106 BLAKE2B 7ae5b0f37f840aede6f0d3310d176d5bf45d82ef1821602b3a010cecf21c77e483318a959ba9901f45e2b326c5e4481615d6115a95ceaec0a8067c0492193ac2 SHA512 d9ce0a05b55da4c1317cc380c2d19bb8107ed02cd4aab26149f07c518ed07f8a98e51de7ebb272d789b2e4432cf185f9fb19fab009e06d8208bb508645933560
-EBUILD quazip-0.9.1.ebuild 833 BLAKE2B 2e7158bbb69dc3d08833ccfa6bbf5ce36e99fa4a9f1d6b3125e67ed9265738e9db235d91c35fb63ac05a0897b4e362d0d918eb7c42e57fcc9b9784d7fb1f8faa SHA512 859a988ad5fbd513ee8d5caa44eab0e7cd7f3ddd25837608fac7dce95b765e028401a54da3ae5347bf8053fee9eface64c4f249d4c2e4f181abf14a179e353f9
+EBUILD quazip-0.9.1.ebuild 831 BLAKE2B 7c9fae6be60bbca4abccfaa1f9fe33ae87071e576365ecf9f2197f0cba6d4fa3a134004d93f07cb16ef6a1136d7b39ec61c1c12aaa5e56bcf6f0871a18a9f3e9 SHA512 c2e3152d2f13f9bad676af409ec288ab49771d54f17fd6891effbc025d1cb5aab1c524647817d97bfce1ec766a73813553759669dcc19d5c624722011677b276
 MISC metadata.xml 291 BLAKE2B c82030a8bb517384360ea44225c9c472868d2460ddc9f95f267ef58f8275d7386a87fc7f074995636bf88e056cdf516a3a89500d6d0da09ea97d0d70507eca73 SHA512 4bbb5644633f8430cf5aa8e2e0108154b9480129ebdfcdcd2e3138c550d03d4d4b2d5554ec2a2fcf592375cda4ce4825f59db8921256c491a3216500f8df0a98
diff --git a/dev-libs/quazip/quazip-0.8.1.ebuild b/dev-libs/quazip/quazip-0.8.1.ebuild
deleted file mode 100644
index 8e60145ea615..000000000000
--- a/dev-libs/quazip/quazip-0.8.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic qmake-utils
-
-DESCRIPTION="Simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package"
-HOMEPAGE="https://stachenov.github.io/quazip/"
-SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-	if ! use static-libs ; then
-		sed -e "/^install/ s/quazip_static//" -i quazip/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local -x CXXFLAGS="${CXXFLAGS}"
-	append-cxxflags -std=c++11 -fPIC
-
-	local mycmakeargs=(
-		-DBUILD_WITH_QT4=OFF
-		-DLIB_SUFFIX=${libdir/lib/}
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# compatibility with not yet fixed rdeps (Gentoo bug #598136)
-	dosym libquazip5.so /usr/$(get_libdir)/libquazip.so
-}
diff --git a/dev-libs/quazip/quazip-0.9.1.ebuild b/dev-libs/quazip/quazip-0.9.1.ebuild
index f1c3a647940b..e1cde21e0b7f 100644
--- a/dev-libs/quazip/quazip-0.9.1.ebuild
+++ b/dev-libs/quazip/quazip-0.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 83ea921b2080..3ea96787d7f9 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -3,5 +3,5 @@ DIST re2-2020-07-06.tar.gz 404055 BLAKE2B 1dca93ec928ef508aa30c44889d3f451acdf1f
 DIST re2-2020-08-01.tar.gz 404076 BLAKE2B 063c3e78cf4983d214309a93a234d864d5ad3acc63ca40befb0b78604ea1406676eb85c34489f3baf74afc0f05ea46482bd7400eb485cd1951feaf4c1429b21c SHA512 1ae261155a1eb96606788eb736faa4dc3240d85f47e3b4c412a4f85f7e4cc69f7c7cbab98397aaf725def1cbc9c5da2c679cfb5573a442d60897740766ae2967
 EBUILD re2-0.2020.06.01.ebuild 1345 BLAKE2B ac8742ad050636bcf8ed1cf04f08dedd105db7f28366da9e55976d2935d63544ecf3077f093794670caee6784ed082446f9b032f4a2ae836c92265f9d7fbbff1 SHA512 422480e4547f33c0827f43a248f9ed331f5ad8e7bd7ec60c96f1f396609bf4f6fb4ed8fe4be3eb3b0e687fdb2fdbb3c8d45b13a5400cb91fe79563372533c375
 EBUILD re2-0.2020.07.06.ebuild 1349 BLAKE2B fe65773026c5209e22cd94c9a1c2153ea5cccb39b1343c45471b01d4aac88cb39673a63a99ca1abf9fb9e1bc3859d9815f81a11e583cf64096e754cf1e63bede SHA512 9e646e078f73598a321893431ca6b1c1cb4652ae6d42ffa6da693b964740a0502e0a9d357f1ea1b06d70aa2fbcbb2140a8019253fe9af4bd1b407079d030033d
-EBUILD re2-0.2020.08.01.ebuild 1349 BLAKE2B fe65773026c5209e22cd94c9a1c2153ea5cccb39b1343c45471b01d4aac88cb39673a63a99ca1abf9fb9e1bc3859d9815f81a11e583cf64096e754cf1e63bede SHA512 9e646e078f73598a321893431ca6b1c1cb4652ae6d42ffa6da693b964740a0502e0a9d357f1ea1b06d70aa2fbcbb2140a8019253fe9af4bd1b407079d030033d
+EBUILD re2-0.2020.08.01.ebuild 1347 BLAKE2B bdb9fc615575c109a7ccbc389d2726f8d1f5f183d6d8abe4b1f46bb95f208b3e900d90fd39bf432dc156d662adf51fe7de3056a988b30b05864d3c584e8b9d15 SHA512 df2f0f8eaa7519bb0b92b1f410bc8d1ce7e5c2c27e1bdf6f995868ac3a9c63cd9ccdaf595ccf65aaf5de4d175d2082caa168347b604188fb392aa512feabc68e
 MISC metadata.xml 471 BLAKE2B d5263d5aa06995cb4abacde849d1f7d970a7c365654fc25c4e4fd9c423f9a99f21e86f60abd8bb50bcba08aed799f510353e6baf23b42299c294b77f95d657fd SHA512 7534d637458ea189e20f259c9f039629f9b5fc738750d8d6e1050163aa147ec447d38ed93df98cedc71510be3fc5949c9084f63da86c12bdfd0c109122a001a8
diff --git a/dev-libs/re2/re2-0.2020.08.01.ebuild b/dev-libs/re2/re2-0.2020.08.01.ebuild
index adf595f07b8b..658704eab243 100644
--- a/dev-libs/re2/re2-0.2020.08.01.ebuild
+++ b/dev-libs/re2/re2-0.2020.08.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="8"
 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"
 
 BDEPEND="icu? ( virtual/pkgconfig )"
diff --git a/dev-libs/rocclr/Manifest b/dev-libs/rocclr/Manifest
index 87e15acbbb76..5e845a747e45 100644
--- a/dev-libs/rocclr/Manifest
+++ b/dev-libs/rocclr/Manifest
@@ -1,5 +1,5 @@
 AUX rocclr-3.7.0-cmake-install-destination.patch 1487 BLAKE2B bba1dbe3a029db770c66ec6cb11e2d79e165e98a9a8db1c1aec4abd4b627eb2c6af57d838977e558291c7339d36399d43307a1806604b1c1c87d448433e03eba SHA512 7ba64b84526342c20d9f750c2298d6839c608f83f2b10e63bf5dff610ce8127247b41572c0b14fba84ddf02947ec3f2a7e954e75844105de60329c144ef16ef2
-DIST rocclr-3.7.0.tar.gz 881814 BLAKE2B 5d7c70d52d8c06e421bdf2a02dba35ed70509c9154fbe3b8c3193969b37970d5f52d1a67eff46abe95b8af1932f2c6931b18380d046f633a3870fe95c4bfc651 SHA512 8684cc9b4f9f63ef65bcc286b74c51e3f7d334f0245b5a1fca6d3dfa0bb552fccb6b82419b538aebe1d316aa2c41a28a9a21df459b734aa44923d66d725834e1
-DIST rocm-opencl-runtime-3.7.0.tar.gz 1004361 BLAKE2B 7fa9481c77884dda15a3b0335449b2879fbac000f644fc56bbd8d06c5fd77d8355f159b9b7e8920f06351e388d0df41379b7e1fcff51cf81714a28f902218e42 SHA512 6ea509dde0290f13e66497eaad587099ed6a98df967adce207afc857ecd961b65801332ca74e36173719488639480cfcffc625a007345d0e48c10c8a0efdfa3f
-EBUILD rocclr-3.7.0-r1.ebuild 1125 BLAKE2B 5835e53e68b6cb6300ad505a23963989291740ebb872175c873a66f8d37f618dad954cefb0b29efcd82571b4017dbf92fd808b5b533a5b91844a9797d19ca15b SHA512 27e2425539f6dd0822c747f57ebbb158ca77994ee6b7ba351b771d2ee255a4ef49f9f7d9b3839a9919d1eec9d4271edef6db9260aad15e127b6ed336bed9f286
+DIST rocclr-3.8.0.tar.gz 882055 BLAKE2B 12b62d2316f3f2886f656c8fcca946735e262e850d49ef8cdb21dc984eba121d9c37250209696b2945f80be363c8244a66c3da91bc26f8c65405b27625b9538e SHA512 79bbaa628815620824fdf320451d729f630949a0e7cb35e2eca638a93f4788175759f68666a1cae6c1320458692c145a0c577739386681d2299c887420400edb
+DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
+EBUILD rocclr-3.8.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
 MISC metadata.xml 497 BLAKE2B f21bb8a043e512036294e7af578c86aec248b4d8fd76bbb2c86026d7c1c8cc4e0bdd1725685ea3ff861dc2a63708b740fa45c7e19b95589de0fd6fac4391b3e8 SHA512 5275f1799db5d847e09eae59d624ecf40134513a3c9c370a6ad05ea0808b7f456eae32a37c1501e156d26d155a8f692d4f661757c0a2f0b436cc46666930850d
diff --git a/dev-libs/rocclr/rocclr-3.7.0-r1.ebuild b/dev-libs/rocclr/rocclr-3.8.0.ebuild
index 04b209388e32..ffa5203065d2 100644
--- a/dev-libs/rocclr/rocclr-3.7.0-r1.ebuild
+++ b/dev-libs/rocclr/rocclr-3.8.0.ebuild
@@ -14,7 +14,8 @@ LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64"
 
-RDEPEND=">=dev-libs/rocm-comgr-${PV}"
+RDEPEND=">=dev-libs/rocm-comgr-${PV}
+	>=dev-libs/rocr-runtime-${PV}"
 DEPEND="${RDEPEND}
 	>=dev-libs/rocm-comgr-${PV}
 	virtual/opengl
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 6d88fc2c294b..0c0d3e41869d 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -1,4 +1,6 @@
 AUX rocm-comgr-3.1.0-dependencies.patch 1241 BLAKE2B adaebf5f5da85687b431ff237b9ddd49b1afeccc81f9306b26aa35f2bce5309ec45f1449d464b59f8a63b86cbcd43bd58014733f4ff0e3babad91be966379ed2 SHA512 f6162acd8af142efac6596b8e95199b3b14dc7d3906f30515b10b422a74fdc97fef1563d392e8c67bbec2b7c0ed532690c16f4a3bbfffc1b274e0c86c345bcef
 DIST rocm-comgr-3.7.0.tar.gz 94875 BLAKE2B 0d6b01360cbdb4a40aab9dadcc56389a3edc11380fe1c39a29a9f3c0356708ae95ce8918bf9d4d4fa46c1a077a2daf99c5bad65906d24ea4948de93e1d4d0280 SHA512 62a08b286313234c4c3226872a410afe9818c829fb3424f4c2a464f759d8d3c6a701de4a89ea21fe6ac2b9620cec0a44c04dd5a793ba30a0537ed3ddf86fff46
+DIST rocm-comgr-3.8.0.tar.gz 95949 BLAKE2B af6f4f2961e0476be8aedae14fc7b3406cdd63759f456faa9c608c68a0c9578d5ad356b11713c1f5b943374f17ebfa043ee5294d3fb6f1a0047639136bc8b565 SHA512 5855825b24fffb3b503a0e2b6bd66a159b6b75a32902e9a428a3be0fa01d8b0c0b6e658c3f5b1520bf79e0dfd20cd453afb3d83d9946387f0ec636378f5129c6
 EBUILD rocm-comgr-3.7.0.ebuild 1015 BLAKE2B 6ba2221c6d3e8d2e908b22862c31fd278be6a965e473cc48d8b323d409011bc5f0507fbd0356a8f245ca9345a8e87da0b3bd0ad41ad8f0aadda866a170802ee7 SHA512 336c592a1dfccafef1867420d2809d90b20963819052391d3f48157c4900d238b7a7526cb58c9aa0c7aae6e9563f67a147d555a0626e9bf81832ee597695f988
+EBUILD rocm-comgr-3.8.0.ebuild 1015 BLAKE2B 6ba2221c6d3e8d2e908b22862c31fd278be6a965e473cc48d8b323d409011bc5f0507fbd0356a8f245ca9345a8e87da0b3bd0ad41ad8f0aadda866a170802ee7 SHA512 336c592a1dfccafef1867420d2809d90b20963819052391d3f48157c4900d238b7a7526cb58c9aa0c7aae6e9563f67a147d555a0626e9bf81832ee597695f988
 MISC metadata.xml 381 BLAKE2B 4b222ab97a88e12838ec3e04cf9934f75ced11c57f28d2eb59ab5eb130a63374ab8a6558e969b817ee7c21334de7bd4defc0c47774f71ba511e4b8c05969bc3c SHA512 b35903137fd3eb2a8a23143c2d41c586d086d34bb5611b65a46da4d22719055e918115885be7efae2b7c25d4caee024eccd4472d8b3011e0231ce707e49c530f
diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.8.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.8.0.ebuild
new file mode 100644
index 000000000000..097011983ea2
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-3.8.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/lib/comgr"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr"
+	KEYWORDS="~amd64"
+fi
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.0-dependencies.patch"
+)
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocm-device-libs-${PV}
+	>=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index 6904b1348f3a..f88a1cf8178a 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,4 +1,6 @@
 DIST rocm-device-libs-3.7.0.tar.gz 228752 BLAKE2B e7406fd74b9bdfba5c32259c12761b46dee454e73cf1d6cbb0886c4da7bff7bcd13689e91e2715188fa2fe9d61d9dd9c6c481714cd67bdee11b1825a91c47546 SHA512 94b027aa27866257cf239b6951cbff928122fb7dfb23c81edc5957b30ee5aa64e2a25412a13ea33c249b8bd2d026274dcc276ea0908359b5ed14c75b0e59ff1f
+DIST rocm-device-libs-3.8.0.tar.gz 228737 BLAKE2B bf75c3f50960af55cc743d412259789d283fc8357231c31b7590ad81997b5a4ff195bb3e382641e9eed846c9c258174f1e8d27e6e1f0ae9f174c5c22b85ed2ea SHA512 d565c9bfde5f5f2d533cdd0b41e5c73247f9ca15e07b039c340daf3dece120a301c87b69b737af3d230c6c0a3ae1d6fbd5d1f78fee000a06d4ea7bfda3d8d436
 EBUILD rocm-device-libs-3.7.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7
+EBUILD rocm-device-libs-3.8.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7
 EBUILD rocm-device-libs-9999.ebuild 804 BLAKE2B 89a47136834feb8bebd6487d0fdc7ba0ca921764f01938812959bd6a006df704524acc14ccdb67a7d08bd032403837bfad358c5837bf4e6e8957293c3b159d72 SHA512 e76d6647cf9ecf6beebb15541503955cd469c50f39c462e1c45be51d87072cbff603fddc9979ad795ad5ec746d625485e24eb751d41610522fbefd8aad64496a
 MISC metadata.xml 377 BLAKE2B 70c60c2403ccd85e0aa3ddf762f7b7ac4e4c3f605b02007ec524afec9300c59927916f0169ad9e181bd4ea7491207ee8becde6320663bc5426b255da1941afeb SHA512 8f7ed414a90f2aaf8cf04368c24dc3b1f8360cedbc7474aa1249c29784c6dc8ad350cf47e717ee8c7662f129b8807c627bf825a5ebe8415d665a5bfe8ef15b85
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.8.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.8.0.ebuild
new file mode 100644
index 000000000000..23acf7bb488f
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-3.8.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index b844e341c0e1..b52b81bc1872 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,5 +1,5 @@
 AUX rocr-runtime-3.7.0-cmake-install-paths.patch 4032 BLAKE2B a4252fc7a6740c64a5695ccecc6392f31acf9a341b9886fab37686916c6d0298da8ccd8d723710aaa944f6e2c26afba9b3f0bae84d5a755bf87dc8700c3dd598 SHA512 d29bf929a136dc4f6b0ddc6f2821a3ad73ab31e1c7a265e73344d69712cbe18a0a2a200d23b094fcfdddbcd37275a75d7d6313d163a6994d323a7b7f611a0d75
-DIST rocr-runtime-3.7.0.tar.gz 691234 BLAKE2B b0f3b1ff6c13c132d00bbf30d405746e793aae377aca2279117c7b9dd6fdc1d466ef2076947061c848913378a20ee0dc7e32847c62a7416e4088ab0705d17dfd SHA512 f7fa77524d7f63980194e93a8e3124f1471dcdfec6ede5eb993699083e5d8fba28737fcc63dbd61949e3ce60e9fbd1455ec055a0aa5c7eee724ae6bb61d3b24f
-EBUILD rocr-runtime-3.7.0.ebuild 1446 BLAKE2B 8a637ca2c10a1b742be787e4b5c57192a60c2456934cffe77ec4736b58336fb622b8b4ed99cdf2b9056e81176b7cbeb1756ffba7ff30f920a65c9849ed0ae152 SHA512 694d63a3e83a134298e4c52d922ba400ff79d189c31ed06dd6f59802863e53be89e949da4fc7f2310294632bccde2a044318b458579504d4bb085c5703563bab
-EBUILD rocr-runtime-9999.ebuild 1447 BLAKE2B 413885924a93dbd1886b88c8acaa558facee7292cf6230f6efac558e3cf93eb23b3da479a2ec03022db2cd28ebf09809ce50017bf525db862275d718b5cb5838 SHA512 c0443cc9ea258c4e2571ebedf329aa35c960fad0c5f07f35304a63c14fb45d9fed8a706df66fa936252686a3cea912a268a0a8e271a42008a22d21ae4329fa45
+DIST rocr-runtime-3.8.0.tar.gz 691209 BLAKE2B 0664b099a7ea4105e37cf42ee208c31dc58a1900aa35bbc0295df0cabba25e5352b3def0dbc1a8ea889ad4876321f99a73c4c6c9ec042186efda9b3308583825 SHA512 d968e96cabc98951890435a2b9bfc9943df9435848f0c6026a59953c78ad4c1048e7c532a8093e5f633fdc5d32622fb88ba0212f32f317d5473fd7e957e4dc4c
+EBUILD rocr-runtime-3.8.0.ebuild 1467 BLAKE2B e7f4fc90dca852643f1c0ce52d1ae01f5c3f46e47b36c8a9e126e5d8929eb90dad97a7dd2aad1788acbbc07fe4f8b6630360573ddabef2b0189cd8a3957a8bc7 SHA512 8de0ae9086e20d034574f14a474f64b4fa8a506116f19e457fe149abf98dd3b9ffa1c62e2c02528b1fd0daad447fd1f80cf581b709395c2e52d6bc6470eaf019
+EBUILD rocr-runtime-9999.ebuild 1467 BLAKE2B e7f4fc90dca852643f1c0ce52d1ae01f5c3f46e47b36c8a9e126e5d8929eb90dad97a7dd2aad1788acbbc07fe4f8b6630360573ddabef2b0189cd8a3957a8bc7 SHA512 8de0ae9086e20d034574f14a474f64b4fa8a506116f19e457fe149abf98dd3b9ffa1c62e2c02528b1fd0daad447fd1f80cf581b709395c2e52d6bc6470eaf019
 MISC metadata.xml 500 BLAKE2B f56d759b8a8cf351a26095b51f7c48ebd9fb72d06f0a937aa23ea6c905a04d95c1de31c5ad176f5651a3b4c6a706f22e3ace3f4ec8a99a7f293be82de25b4e2b SHA512 33ee8984ef288b26e1315ccbebb03703e3d1648db220e0b3bbbadaef38ff414c938bf01a04c69ece7672cccb268f445a11b14d15da2939729c798ef8f8801719
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild
index d87d1dd8979f..2a972d7fd3d0 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.8.0.ebuild
@@ -24,7 +24,8 @@ PATCHES=(
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 
-COMMON_DEPEND="sys-process/numactl"
+COMMON_DEPEND="sys-process/numactl
+	dev-libs/elfutils:="
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
index c4474b8a91b2..2a972d7fd3d0 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
@@ -24,12 +24,13 @@ PATCHES=(
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
 
-COMMON_DEPEND="sys-process/numactl"
+COMMON_DEPEND="sys-process/numactl
+	dev-libs/elfutils:="
 RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}
 	>=dev-libs/rocm-device-libs-${PV}"
-BDEPEND="	app-editors/vim-core"
+BDEPEND="app-editors/vim-core"
 	# vim-core is needed for "xxd"
 
 src_prepare() {
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index 03f066d7368b..c4aeefdef4ea 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1,4 +1,6 @@
 DIST roct-thunk-interface-3.7.0.tar.gz 2692297 BLAKE2B 5a060becb1b35e4eb499de5c177b5747789f02036d6e1bbf241a4054430e819bab4c188aa83f1cec0d35c80a3c0af47298fdd1c34d272f693dac9da191d8d111 SHA512 307e88808d3c852837f81c8745181edaa46e0f205fa36b9af531661c9a6a2dee5f360eb14e9f607376f27969e438f075dd44336606803ae2f7ce597f7fe46135
+DIST roct-thunk-interface-3.8.0.tar.gz 2692624 BLAKE2B bb0d288da08081de63f3848987eb86a319c977250052b8bcccdd221b31167d2b344ecd17163aafe1fa5e7a4372248510af77c4ed992c39e71de05452b0b83a8c SHA512 b60461869f916791b702fb7a551978dd741873925154cb5980612f71bb19000f73fda8c1becb5e3482be872790d6cc8c34dfe3484349796c9fab2fedafef525b
 EBUILD roct-thunk-interface-3.7.0.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
+EBUILD roct-thunk-interface-3.8.0.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
 EBUILD roct-thunk-interface-9999.ebuild 982 BLAKE2B 8ca246d82bdbb96edb311725b18cee167f10d46bc2ab2c46e444fc6d8d53586f0cfcde743c3e2b7e36fe5b1aa5be22fa3c9494f578b65c30fe8d8cd0772fdb4a SHA512 d9596f1f3718845c5d579e976174497be0b0bf32388dde26e9ced316ccb0cb0d57dd13c528ff6bd9c648237edad9d59a234151118073b411d25d6ca4cb23a1fa
 MISC metadata.xml 643 BLAKE2B 97a92b285d79397e3b1f8e07d4c9fcea72613261901f70b016104ee7298a62981d2f54d70404bec0397d0e96c11182e5356e64fb6a30625af2ce8fcc1f6c5e3d SHA512 27da5fd910679ae0ba469d556df2110242432726d74ac19742936a3434ea4701b04bf920e5ee42f5a2154d44c76201c5369b0d4afb2c954efb2e49e08c872c18
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.8.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.8.0.ebuild
new file mode 100644
index 000000000000..ee5be506ed83
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.8.0.ebuild
@@ -0,0 +1,35 @@
+# 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"
+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
+}
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index bb680247daa3..05ecb1b2f819 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,5 +1,8 @@
 AUX sord-0.16.4-gcc10.patch 673 BLAKE2B 533d63588474664a07eadeb252db0381c6001ccd73fb47aeb02928512b680e2f63b48ebe0c74f44b01343e555fbced59f935ea27352cffc16561dffd2c51adc7 SHA512 8011d15764488781d89b3ca6d34769791316cee1047f09a5f6239ad22b96d35682568cb98e94ee9143d0d4011e6b9748b1561518696dd1cedde682ea1441dbf3
+DIST drobilla-autowaf-6c6c1d29bfe4c28dd26b5cde7ea4a1a148ee700d.tar.gz 384589 BLAKE2B d643df2e133c2b70e00d85562d1c30f8a01190b4c1e1a512b732d016db3ae77ff543d4acafc00309edb173e7bbaaf17b0c2844bef2ffe786c02a51930f03f29a SHA512 50b2d063866630c7c566af9da07c9ac0da2cf86e70f76ad6af57973ae0b346d4687c0b4263cefa90f0c0ba9e853a60583457c9f8b1313db3f4298ca2f0cfc4d3
 DIST sord-0.16.4.tar.bz2 510920 BLAKE2B e52b659e8070dc63188225741d1bfa31480214e47b53b4834dd0bccc5dcd688b93fc65c894b25540d89dbb20b04d8fd1952dcc65999c2ae7b650065c80b387dc SHA512 98bb102cff5ab38d999c2f966597508076ccce54583a739810b0c28b4f3d570b2ef414605fc08361ecb11ac3184d3176f2f50c7c59c06cc50c3d522e26ed5576
+DIST sord-81e138633076c2d7ef7e1691845757208d02f478.tar.gz 293332 BLAKE2B 794aed020b14f0cd4bae851de12f24fe54c87202b69c3f21cc26a86f0da092b05ea2244279be16ab3231431a8a5fb0cbab7236c2e761715e9a1759bb5b3ab54b SHA512 ba0dd8a8434a04be3548b959789b5b81491cd2f91f6125d3620fa17d4d38ae18015db7cd72af71900a0a17331c6b5400756719a25e09e596590ff943798a5991
 EBUILD sord-0.16.4-r1.ebuild 1217 BLAKE2B 9fa9b0ee91d3065538178fcea4bbe730e457b551dccf5e219a0c46b5501bad601a0e5ae8e751025dfa0f9a85e8451ad1fead5658fbdba251a9f341321c326fe4 SHA512 26017a039ce937cd03778db4e141012d3dc4e3239229afb593ae171e0c1bd4b3620e996a66c19302db39422f7a6a97d78c3ba6d06e50de9321b6e1680e12ed21
+EBUILD sord-0.16.4_p20200803.ebuild 1586 BLAKE2B bec8eb4de57d9457c3292ec8bf05337d1ae36b3681091ea44b3ed67e0319d60dedadcf47d5ee16411b991d639dc7d4e6ca8f2c916879ca180f4a56d0b01c656a SHA512 7a03623a3ccf67848790d90d1f74e79dc5f3b7995be7bb4f1ab412d23d3c6974a6d6d28a16af9e9a63f9eb7f1c88e5c1d1c532bf40697ea997d5d5c9766a6056
 EBUILD sord-9999.ebuild 1125 BLAKE2B 39b455cafddea954aefad917eb782504eaa38f5cf5a07abdd56d5b0dc06227464c0d3dd3c2e64519cad415d6278ac4f0cf16b48ba7023b5df759dc3d39522952 SHA512 11739648e64dbdb746d2774a2632a9fd54b36af4ec147b71166ad006ef438b62618a588b9a69ac5e08b152d2644783f49773ec314da2fd4664d508e9489e2cc0
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.4_p20200803.ebuild b/dev-libs/sord/sord-0.16.4_p20200803.ebuild
new file mode 100644
index 000000000000..b415f7c9ee59
--- /dev/null
+++ b/dev-libs/sord/sord-0.16.4_p20200803.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for storing RDF data in memory"
+HOMEPAGE="http://drobilla.net/software/sord/"
+COMMIT="81e138633076c2d7ef7e1691845757208d02f478"
+COMMIT_AUTOWAF="6c6c1d29bfe4c28dd26b5cde7ea4a1a148ee700d"
+SRC_URI="https://gitlab.com/drobilla/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.gz
+	https://github.com/drobilla/autowaf/archive/${COMMIT_AUTOWAF}.tar.gz -> drobilla-autowaf-${COMMIT_AUTOWAF}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libpcre
+	>=dev-libs/serd-0.30.0
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+DOCS=( "AUTHORS" "NEWS" "README.md" )
+
+src_prepare() {
+	# link in downloaded waf
+	rm -r "${S}/waflib" || die
+	ln -s "${WORKDIR}/autowaf-${COMMIT_AUTOWAF}" "${S}/waflib" || die
+
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index 6a6d2058703c..cae7e200abcb 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -1,3 +1,3 @@
 DIST starpu-1.2.6.tar.gz 8911397 BLAKE2B a73cb3b230282b0b828fdaeb65f5491928fde1b2e5797f739a99c87318fa29511196f7121a72ff91bf0d663938b50f200d108fdce2726eb7ea8c7e997156dc13 SHA512 5971f8875dd54c73486583456bd0bc81c2865cb5b8bba6d47a5085d76fa6294c869efdd1c1d14144d08e6c14cbbea3a773474d46aa827ca24f58d9fb57ccbed7
-EBUILD starpu-1.2.6.ebuild 2262 BLAKE2B 42773abcbc02491fc31e0a39f0fa3336beb52eb3c473fd9f76dc17f9aa8334faa2237ebf77cab29b184816a81cf4bd65690d6a0e8d758d48134fd5435f016416 SHA512 eed8587eb0b65b4511c967442007c800ad14593ef8917d01bb0f4a22fdd76aa5c147dcfe18e8bf59db1ca2dcba15d40b353a31ffb2a8874adb56b5ac5cbc7eb1
+EBUILD starpu-1.2.6-r1.ebuild 2213 BLAKE2B b20a17ccca2213f77c03fb7f455a86422fa34c1f4f55e5eb3a29a1162ca21e33d5a27c7d3193bfcabc6fac6303547d39e54d6ffe9ab8cd0554ab839e7e0ad76d SHA512 0d4e34efb9ed2eac58b0de014ea8f11de63cebfe5599db91b9adb7a5c808aa43b1d89f9b543b5781145bdb35a134836aa52eb67debfda8ecafa3c52e0fe74f88
 MISC metadata.xml 987 BLAKE2B 7b8a207da7c02ecbc5e1daab83666d19d8c1128c6e05376167707ea6b411b4bed2673d9f0c9840284ab5c6f684bed3a67fddb8fc6f25289799470a4e33792e11 SHA512 97e9412721fcec2cdee55d75ce4d8c6eb20af75adfc21bcd556a336a8ee57c138be47afb881fa77180cdc4c27975d000be965f2170f7f29db85056bfbb01cee9
diff --git a/dev-libs/starpu/starpu-1.2.6.ebuild b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
index 122963958bfa..171c28305eb8 100644
--- a/dev-libs/starpu/starpu-1.2.6.ebuild
+++ b/dev-libs/starpu/starpu-1.2.6-r1.ebuild
@@ -25,8 +25,7 @@ RDEPEND="
 	sys-apps/hwloc:0=
 	blas? ( virtual/blas )
 	cuda? ( dev-util/nvidia-cuda-toolkit
-			x11-drivers/nvidia-drivers
-			blas? ( sci-libs/magma ) )
+			x11-drivers/nvidia-drivers )
 	fftw? ( sci-libs/fftw:3.0= )
 	mpi? ( virtual/mpi )
 	opencl? ( virtual/opencl )
@@ -55,7 +54,7 @@ src_configure() {
 	use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
 
 	econf \
-		$(use cuda && use_enable blas magma) \
+		--disable-magma \
 		$(use mpi && use_enable test mpi-check) \
 		$(use_enable cuda) \
 		$(use_enable doc build-doc) \
diff --git a/dev-libs/stb/Manifest b/dev-libs/stb/Manifest
index a9899c688255..7e012ecd54a6 100644
--- a/dev-libs/stb/Manifest
+++ b/dev-libs/stb/Manifest
@@ -1,5 +1,3 @@
-DIST stb-20180211.tar.gz 1327803 BLAKE2B a910ac78c5e3760a3e4c74e033d15230c39abd89aeb083ba6c7cd23f8339926e8ab82fde1b6f4fe7a1a312023979a74b961abe263c40b18b3bb8239cbdfa204e SHA512 232ef301d4d6c82c7c5f0e4234b9160cc815f3b6bcc35d341cdf8738646f2f0887ee9838680699f4c9f4274b1390036b2c4fb3ebc2d663af8ff888114dc9f04b
 DIST stb-20200205.tar.gz 1375616 BLAKE2B 11acfb4b1938e75c388b426e4b568c2976566259469716514d0ac8c97ab23d45f51fed1dcf458ca8f07e51d88d90708b33d66d545ed1aa09cd96fea46b9eb738 SHA512 31f945de8b642a359363c81e67f09b71aa663eacd68f5ec602eed40987f2d953943871af3b408d1e948a9e5c953098fca34b9e971fdeed92b734bb0c79c79a42
-EBUILD stb-20180211.ebuild 710 BLAKE2B 75034d290f674ae8f7e893bd425f7d4a7914e00b953e584e19a4aa7c6ebfe7e15d0e0c1568360f0d60807ab7d7c1bead724a00f27f4f06f1f7b24f5c6c6334aa SHA512 fc6da46ae51d2941d8d944aa43cfbb1b6f25172055e305de2be331100b2e41500f3f6f27753577e51d98ecf02979e640e5afd663b58da284306b63f861f5f2ab
-EBUILD stb-20200205.ebuild 712 BLAKE2B 4b57dcb0aa01164d60a3190ce3ce65c77e2dbc8c045eeaaa671ae35da9152c658fabb7506f03e4d50ae7463c440efadfc32e1aaa28b573e477fe22c36db1805d SHA512 873e2cf4ff92766b51e0343d845266ec65500dde5a49d7e80c44dd1069b5b934397793173b3b1bfba78147cd2d601554fee09d7e666a52da234b12a94d4ab3ff
+EBUILD stb-20200205.ebuild 719 BLAKE2B cfcc051e427552368e023c465f215e3e47b3ef1fff350d52c2383a0fc4a607cbeb7fb19e41c435af726379596dfa2fa83d68685a02315356846166f54c6922f5 SHA512 8316c362c1f0662cb87350de115e15cc852e6d7b0e2109676a7e2de7fa2bec232cd25029a09a1c2138774b0795baed0081fd3968bff7b78341e05a804174dfdf
 MISC metadata.xml 566 BLAKE2B 31083e6f694a1b5f7fff41a5ca5df347107cb75c6a116cae7f8d6652ff55a197539d90cfc77828728f1b10e1ff091e1bf658fa95298de1da3415472fbb837fd8 SHA512 d6db1290da820060b19a4cee9536caf912eda54a4e11a8ef21ef4e74e60cb1580a1ba320803f0c5b815a77a6b906c9c3d11c6193443ae4abc451c8b5c978fae3
diff --git a/dev-libs/stb/stb-20180211.ebuild b/dev-libs/stb/stb-20180211.ebuild
deleted file mode 100644
index 6efc838e61bb..000000000000
--- a/dev-libs/stb/stb-20180211.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# There are no offical releases
-CHECKSUM="e6afb9cbae4064da8c3e69af3ff5c4629579c1d2"
-
-DESCRIPTION="single-file public domain (or MIT licensed) libraries for C/C++"
-HOMEPAGE="https://github.com/nothings/stb"
-SRC_URI="https://github.com/nothings/stb/archive/${CHECKSUM}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( MIT Unlicense )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-S="${WORKDIR}/${PN}-${CHECKSUM}"
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	default
-
-	# Move the header files in a folder so they don't pollute the include dir
-	mkdir stb || die
-	mv *.h stb/ || die
-}
-
-src_install() {
-	doheader -r stb
-}
diff --git a/dev-libs/stb/stb-20200205.ebuild b/dev-libs/stb/stb-20200205.ebuild
index 78f6c462e4c5..c89c8af062f3 100644
--- a/dev-libs/stb/stb-20200205.ebuild
+++ b/dev-libs/stb/stb-20200205.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nothings/stb/archive/${CHECKSUM}.tar.gz -> ${P}.tar.
 
 LICENSE="|| ( MIT Unlicense )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 IUSE=""
 
diff --git a/dev-libs/stp/Manifest b/dev-libs/stp/Manifest
index d44eaf2fcbb9..3328be554928 100644
--- a/dev-libs/stp/Manifest
+++ b/dev-libs/stp/Manifest
@@ -1,3 +1,3 @@
 DIST stp-2.3.3.tar.gz 2577550 BLAKE2B 9ebedf3cb8e6b50d037cfacbc14826bd4e6505d29a53b1fcc6580749f0637fe5f96619c166babdb3a52b18fb6337e49c02f5693e233effe84d0131d0e7402381 SHA512 a0b1bf419d8230e40ce0aee90d9c8c9d814aca300831c24b3576c75623362942abf20673c419f9f0ea1e0505bfae000dc65fdd818179f5759879b0b255f1b99a
-EBUILD stp-2.3.3.ebuild 978 BLAKE2B 78cbcab6fce1affe803da0f541c12554a671b2e21e6a92190c0ca8bb7b80e4e766d11dd607756a323cfb849881e3a3678bff5b258f3195c5b2c98dc1eeb7fff3 SHA512 e24da9013e8ffda8f8d7279fb300e27e16e907ed6f1925b0d3642079b6a01ee13861ec32703d7f5506d71f3e99294b125843ace67760181f8a30253623668de5
+EBUILD stp-2.3.3.ebuild 954 BLAKE2B 5651116f8a31248a8f99c733149d1f637b2270fbfaf42490cd540b6d9da83f5ca99acea1ae8851f43b70594e39f8ea420c2df0320ba47854415c99677473a65d SHA512 d65df738ad4177802c142e1b91c445512e2477bbe2aa0ebde34c70132c29bb1b71beec6a1ac1a09fa4ea523000544cea146e10ecf22a03f91d1aefe197a4a829
 MISC metadata.xml 881 BLAKE2B bb604f1cf823b06a4d7bff96ec805bc2418dfcdeeaa17ca88f98c509b687b7467f7c6864d25294d8f1f1e4cbaf0e7d99b82edd27fcdc552353fe5510d1fbe375 SHA512 4b3e243ae419cb974f49b6d37e3e807f5ff0676cd989dc145fcd716c23bd2292177935658ea899afd9fc37a18dffc8c0949dee4a25b2e493db0f3713703ad2cb
diff --git a/dev-libs/stp/stp-2.3.3.ebuild b/dev-libs/stp/stp-2.3.3.ebuild
index 69e3d1b92d74..c88151911bae 100644
--- a/dev-libs/stp/stp-2.3.3.ebuild
+++ b/dev-libs/stp/stp-2.3.3.ebuild
@@ -11,10 +11,11 @@ SRC_URI="https://github.com/stp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+ MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="python static test"
+IUSE="python test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
+	dev-libs/boost:=
 	sci-mathematics/minisat
 "
 RDEPEND="${DEPEND}"
@@ -31,7 +32,6 @@ src_configure() {
 		-DENABLE_ASSERTIONS="$(usex test)"
 		-DENABLE_TESTING="$(usex test)"
 		-DENABLE_PYTHON_INTERFACE="$(usex python)"
-		-DSTATICCOMPILE="$(usex static)"
 	)
 	cmake_src_configure
 }
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 00fbfcc4605c..20ec133c4d0c 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -7,7 +7,7 @@ DIST vala-0.48.9.tar.xz 3472540 BLAKE2B 1c85b5d9a1f3819d5b26b521c7da423adee313b2
 DIST vala-0.49.91.tar.xz 3506404 BLAKE2B 77a4e88d6718112747d6ceb0d70712db818fc175c2c4ef5755bc2c091469e32028d73467a7fda84748b3d29f87fc2f5af9601df8f59d96bcc55ce1bf01b25c7c SHA512 15817b032cce95a360b28a51509259b88e070a7ec6fd7a82452717ef98cd14b1fb60307a5bdd7f4b0627e59575a64c44fb41dad25327cecf8d9a56dbde01a820
 EBUILD vala-common-0.46.10.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 EBUILD vala-common-0.46.7.ebuild 645 BLAKE2B 5a40dd45432a9ba163abe1b2749d1ec4dd46b2dec2f8c343d548a13cffe1a9364f0fc5675944540cd3b5b0dfa03e7660a7c572a81462366416a7227c9b2da18d SHA512 2dd63a63255cb20f3fc7fab488f9ea2a15dcfd20723bfdbe190dac19b2d706cdd388343d39045aaaca06f7b5d148050cf3860eac74a658227ed6191f00304d33
-EBUILD vala-common-0.48.6.ebuild 648 BLAKE2B bd688604d8e7bf65b8a902423acbe2e469a81e57fe78171c9f77905190eca95b02b16c52f7ca8b3062e2aca8c94b4e5454e82bc6fa04dbba8484f9d38d526e4d SHA512 00fd28246c4cdebdfb455d08030eed513d649ba2bc0adf48f3bf27f1de140e3d9d2413c45a49dca55baf399d5a9c501d2d110c95f4c3fc8e8bf81bcbd75ea22f
+EBUILD vala-common-0.48.6.ebuild 646 BLAKE2B d84fa9f606e5cba0763ee49202cf16f5cd01520dad44abdc02e089fd9890f3179c4a02fc33782d028b5d3a405135491309f5823004905d394eaa04b4b656dfb0 SHA512 443f71539e0605f9cfceb6b5c76792590dd36e4e51465f1848954f676e69dda63943c8e5ed9be4a7519f1ba9500f05d43ea275209677a9b2eb53434e9c304725
 EBUILD vala-common-0.48.7.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 EBUILD vala-common-0.48.8.ebuild 654 BLAKE2B 9655a0cc53404cbbe4a7239781515de3ac2832b1466976cbc9bdc4034b432d3cfe5d355a4c707c60eaee7de44ac14b9a8d158b9cbfc03b39c2e9f8f5c7d983fc SHA512 858a0d13a2f352081c0ca2ee1a190867bc1f066e5c33502b04ac7d812a2bc03b6908b43b21ea6915bfd92abc361df21b583ac2c380dee9c6206eb2d81455cf13
 EBUILD vala-common-0.48.9.ebuild 649 BLAKE2B 55d9b57e96bbbb1b815f516190f292b443baef2ba5e361d0cc69ce60fe178575d73a4dbf4f5f4ae2104bb6c18f9d04ba3a510087f0f21303cd03ab66ffa023e4 SHA512 5346d8890d211752b9dba04e300340b69961b2dbdc66e30a92db618d9b008f7a8664f6c276c78705ace54483c46abe9dcb5e0dabece9c8eb232c3bf784445ed7
diff --git a/dev-libs/vala-common/vala-common-0.48.6.ebuild b/dev-libs/vala-common/vala-common-0.48.6.ebuild
index 3d68342f2952..580d77e0c60c 100644
--- a/dev-libs/vala-common/vala-common-0.48.6.ebuild
+++ b/dev-libs/vala-common/vala-common-0.48.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 99e865a863b6..5761b3b07175 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,9 +1,7 @@
-DIST xapian-bindings-1.2.25.tar.xz 1711860 BLAKE2B 66367dbc503333c4f59da8bb5bd4885fe9678aace45365573bac8e0e8e2c712795af2021ff52de9eeabb91f65a2f0447d1963424b1ae6558be95b737d1279e98 SHA512 5d27b2ae2722409ea99a1b9e6bf3f5c61ed9195b67121c090f1533340d3b11c546014985d0989a0725b60a07b392b9705bce054495f423bd3a7c99835aa336c7
 DIST xapian-bindings-1.4.14.tar.xz 1132008 BLAKE2B 3057f8f98cfd11e82555df4b554ad1ffed793ea92bf0f077ef4a495d09250da47116d76ded0deb07621f3b14ddd7f653aa0bb19add01d88fe077e637bee21ec4 SHA512 6d35c6c011c6d841254934f4dd59f4a2b842fe826af108e526cde9acbccec67b43517974331b21cbee5e828d0743aa5b9b973a96e1940065fbcfc342b8f23ead
 DIST xapian-bindings-1.4.15.tar.xz 1132248 BLAKE2B ba9f60263881ca558f9d3deab09bd07271e6f54e06a13d09bcb59bfaf9a637e959b3a62a9e9db0724ae2262e605fc3fd2160559d53702b2af5012f47177ea66a SHA512 dec8a0431c9070fc70d79b67bddc2e0adb10ef5366c4b9d7a135365ea6c6680d2e7682dbfd60c29eca51da48eaa0715509e30b13d5482d5a38bfd0d0156c43f9
 DIST xapian-bindings-1.4.16.tar.xz 1133900 BLAKE2B cea310cea777f665feac3b0cac7189da66e596d245af0a3a6cc40d01e6b9862bae2b61d5b21e7d742c1e0eb1424603a47c44a4fab9d17125820ab793360a85f9 SHA512 afdc4379c8dc8381813eefcaf761ea560a23ba6718a54c61874c0d29786b9f49dd548ed3854fee38689c273acebb4637833b8cf5c75d0c2ed05df83384e59113
 DIST xapian-bindings-1.4.17.tar.xz 1135100 BLAKE2B 8c45322725c341f6e6484e0aa8716798aa5b31e5bbc795d0f5c631022c69e96f472b3fd76609116a196431e5b069a710c3ebbfc989de8fb57d5e2d081008b89c SHA512 9cfd9809b8b13d47a7b50950c19b821d4ae902611eed3972d93cccda82d07d5858e37989bb9de31ede082c2574487e0bcd8c1e5f30f1479d47f4c28200ff76e7
-EBUILD xapian-bindings-1.2.25.ebuild 5545 BLAKE2B 971788479ed9732f0cd64fbba81c1b30db4cc1ab606dcd7ff3389dc30d88c9f46d40fb0446f8eab106194e0b718140bb2dead274988f2ba33eae4fdd449b727b SHA512 6f6dc696c2af464df8c2d675fc3ac28c81b77ef209239e2d91d24b23ef902611bcd61214d1536a8655612f01c20ff7bcd20e8f09b11614517aa7067ae57c674f
 EBUILD xapian-bindings-1.4.14.ebuild 6446 BLAKE2B 2b98e0f1095d527c021792c20b7c5d6977025d16001ec1a82bbff83164adc9af27a8aa04f7b80ae7571bac2fe43bb248ad063e9ca4c28109408e5a562e35e3dd SHA512 ecf37332ea6f17c243447d81425389549a9549afc62e79602aaf9a51a96a2441d92848d85a7e63907af143b871b14f4f77470a7f0760f2a37a0752bdb10f07db
 EBUILD xapian-bindings-1.4.15.ebuild 6447 BLAKE2B 8cc17f4428e0c6376321a1d7fc0c79a1e9f9c0fa9c94d207587942a9909183d3b23f0a6189f3e79730c96082744b2f3d6d38e273c2be80bf9b63b6e5620a013d SHA512 dd19b3ddca4556c13023d6e749eeac696f87162410c192b3c15bff8636eade45ee9b110e0ad857f4f56e36ec620c3eeffd264331ad1c3dd564d15afa7902d8dd
 EBUILD xapian-bindings-1.4.16.ebuild 6447 BLAKE2B 8cc17f4428e0c6376321a1d7fc0c79a1e9f9c0fa9c94d207587942a9909183d3b23f0a6189f3e79730c96082744b2f3d6d38e273c2be80bf9b63b6e5620a013d SHA512 dd19b3ddca4556c13023d6e749eeac696f87162410c192b3c15bff8636eade45ee9b110e0ad857f4f56e36ec620c3eeffd264331ad1c3dd564d15afa7902d8dd
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.25.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.25.ebuild
deleted file mode 100644
index 909886d6349d..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.25.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-USE_PHP="php5-6"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-#mono violates sandbox, we disable it until we figure this out
-#inherit java-pkg-opt-2 mono-env php-ext-source-r3 python
-inherit java-pkg-opt-2 php-ext-source-r3 python-r1 toolchain-funcs
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
-#IUSE="java lua mono perl php python ruby tcl"
-#REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
-IUSE="java lua perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua perl php python ruby tcl ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMONDEPEND="dev-libs/xapian:0/1.2.22
-	lua? ( dev-lang/lua:0 )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:= )
-	tcl? ( >=dev-lang/tcl-8.1:0= )"
-#	mono? ( >=dev-lang/mono-1.0.8 )
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.3 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.3 )"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-	if use java; then
-		sed \
-			-e 's/$(JAVAC)/$(JAVAC) $(JAVACFLAGS)/' \
-			-i java{/,/org/xapian/errors/,/org/xapian/}Makefile.in || die "sed failed"
-	fi
-
-	if use python; then
-		sed \
-			-e 's:\(^pkgpylib_DATA = xapian/__init__.py\).*:\1:' \
-			-e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian.so|' \
-			-i python/Makefile.in || die "sed failed"
-	fi
-}
-
-src_configure() {
-	if use java; then
-		CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-	fi
-
-	if use perl; then
-		export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-		export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-	fi
-
-	if use lua; then
-		export LUA_LIB="$($(tc-getPKG_CONFIG) --variable=INSTALL_CMOD lua)"
-	fi
-
-	econf \
-		$(use_with java) \
-		$(use_with lua) \
-		$(use_with perl) \
-		$(use_with php) \
-		$(use_with python) \
-		$(use_with ruby) \
-		$(use_with tcl)
-#		$(use_with mono csharp) \
-
-	# PHP and Python bindings are built/tested/installed manually.
-	sed -e "/SUBDIRS =/s/ php//" -i Makefile || die "sed Makefile"
-	sed -e "/SUBDIRS =/s/ python//" -i Makefile || die "sed Makefile"
-}
-
-src_compile() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			cp -r php php-${php_slot}
-			emake -C php-${php_slot} \
-				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
-				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
-				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
-				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)"
-		done
-	fi
-
-	if use python; then
-		python_copy_sources
-#		building() {
-#			emake -C python \
-#				PYTHON="$(PYTHON)" \
-#				PYTHON_INC="$(python_get_includedir)" \
-#				PYTHON_LIB="$(python_get_libdir)" \
-#				PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
-#				pkgpylibdir="$(python_get_sitedir)/xapian"
-#		}
-		building() {
-			emake -C python \
-				PYTHON_INC="$(python_get_includedir)" \
-				pkgpylibdir="$(python_get_sitedir)/xapian"
-				VERBOSE="1"
-		}
-		python_foreach_impl building
-	fi
-}
-
-src_test() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			emake -C php-${php_slot} \
-				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
-				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
-				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
-				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" \
-				check
-		done
-	fi
-
-	if use python; then
-		testing() {
-			emake -C python \
-				PYTHON_INC="$(python_get_includedir)" \
-				pkgpylibdir="$(python_get_sitedir)/xapian" \
-				VERBOSE="1" \
-				check
-		}
-		python_foreach_impl testing
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use java; then
-		java-pkg_dojar java/built/xapian_jni.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
-		rm "${D}/${S}/java/built/libxapian_jni.so"
-		rmdir -p "${D}/${S}/java/built"
-		rmdir -p "${D}/${S}/java/native"
-	fi
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			emake DESTDIR="${D}" -C php-${php_slot} \
-				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
-				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
-				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
-				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" \
-				install
-		done
-
-		php-ext-source-r3_createinifiles
-	fi
-
-	if use python; then
-		installation() {
-			emake -C python \
-				DESTDIR="${D}" \
-				PYTHON_INC="$(python_get_includedir)" \
-				pkgpylibdir="$(python_get_sitedir)/xapian" \
-				VERBOSE="1" \
-				install
-		}
-		python_foreach_impl installation
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}"
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index ad580b6ac819..bd23e08d4a18 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,11 +1,11 @@
 AUX zziplib-0.13.69-009-perror.patch 499 BLAKE2B ffbf0a74204a575068843c55a538dd858a76bd3e7592fbc0860f7201877c9aebfcbf14ca2cb42274b71843acceceb9b3240d34423639f7f4835641ad5a95a86c SHA512 10720e172c1482e7d2f1241dffaef2f4f41ae94724cd3617c9b39e2ada558a173eb4e262121f49661e9101d260f429aad6c94c9e7c1eb6dfe56aa807e87d6510
 AUX zziplib-0.13.71-find-bash.patch 1758 BLAKE2B d4d98b1886a67867de90fc303f2bc6aab07e1c27fd8fc1827ddd30b8d8427938c4bccff14359de683585aa8ebfbc4a675ad98acf6e6fa982bb1254e4aac8eb1e SHA512 e939072da1e27008f0d23145e74cd37574426a6d4b2d578bc0a8e880054b89580bf4a48c81b70f6232251216d2f73cf5c071dfd0cb7bfd2f6f1f5dd09738efc7
-AUX zziplib-0.13.71-installing-man3-pages.patch 654 BLAKE2B c9a990258795e997c99642ba1c3489a097d07d7c90663d6205accccc87728d6861db446407f0457711bddd997bad29c82b25412286e3e52380c03bd5e4f7f101 SHA512 65cdfea81902f38af24dea828caf3bc562471ca0ee5e711b4ab6c1f344c9cf63efc09b3fc038fe971b3a2e3933fb411dbb0af65b37b5b76f75e56704d07dfb36
+AUX zziplib-0.13.71-installing-man3-pages.patch 1588 BLAKE2B f2b00692d7a1c06cee51748242211c220e9a16da8f21cf33c26a2c2b8f708faa171e63218c8bc7d789794bea6fafe198e0f713400589524f0cd9bb7e49640589 SHA512 213732d9a6b0cb9bd20ffd7563fd9b0fe2f673ad44888b4c393afc8b37e5e207cedce8d71bb776a91089f61ca084917797b9e3206f0ee32cf443d9ee4abb62a2
 AUX zziplib-0.13.71-join-paths-pc-zzipsdldir.patch 1250 BLAKE2B 77ba09afa144ac5aaf1393d1bd612590e664d0885eb34354f2fa8cfd28005d225d1960f25d4b56d32956c13e99315e3e067a83b8f7f2c84703dff1e718f8dff1 SHA512 b81b34885aa1017b0f0d834565818b2464e0c827b2c428c14442b4d741bfa91c90e5915af98cf4fcbeababf29bb89a13f76efa98b4de1a88ac3659f666069110
 AUX zziplib-0.13.71-shell-DESTDIR.patch 3206 BLAKE2B 4f542e0f26ce332e75f341dfdd84b9907cf1e1c67f259d3626e34284991421e1931ee2f896d36dc444b37d7873269a21e780992e25b689f8ca57e5def9ae27fe SHA512 427a633de7b5928fe6150d8e5a711bc48c3d68978344ae840da512919c8151215bcc2b29f025cabd5204db9561d71d1925394f7695ddfbd9b4137c53d52b32da
 AUX zziplib-0.13.71-testbuilds-opensuse15-ninja-sdl2.patch 5840 BLAKE2B fac60aa6271dd189198ea7b9640567378def938a09d2362acf60a4aeb2a3787121f644685fb4f1310459eb665b509951c02ad7a40a78a216b9778e7599dd764f SHA512 ed6d3101587d6d0088bffb1bb1483cffe1629d2ff5301e88cdab8e654bac79f84534012e129d7c17ff23beb19ca46a96598894cd383040d41993732ff62ab05d
 DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
 DIST zziplib-0.13.71_p20200419.tar.gz 1153032 BLAKE2B 34aa38fde43805636a83f34c064ab09880b7200c414d3666786b7d750a26d8f39dbb431dde7cb81e785cd20a0d444e2a7308b5c79eb71bf0e9f52a051fe01883 SHA512 7f94524ddd745d81656ea9b0314db791e636ed9a8305c4fde7f88572b0302bff4c7f8fa76ccf368b7b8b1c8062a4ad85dfab8f30cdf6ee37f835ff5758751222
-EBUILD zziplib-0.13.71-r2.ebuild 1697 BLAKE2B e0bd52b503282616a25e68ea19c97710dc125a7f7d425ac8e856a861cbdfe6f861364984bd89f6893ff4cc549c7014606e02f87c44133c2c4486e8c6172cbb8c SHA512 6ea9b49bf19412a20a952242ff56aa7a3d5148552e92d168ca4d61507ccdea9b2480c07afe773ef4b6ab103873a8de9e43e137fb5e6e4ef03c671e2c06ac4c26
-EBUILD zziplib-0.13.71_p20200419.ebuild 1424 BLAKE2B 3aed19e9f270d72517f7267bec8c0e85f4682578ec5a60e4ae03ddefa76adc11d1cadf0d07174013deb98e9d9f1cc33188f8071e6fb67400bb0309158a00dd92 SHA512 f3ff2dfa70c3c059c55ff6b5a1e4ef6b6102ce9ce46ac053da6c4760001c9ec0405e7b15887b008d2095334245167037bc52c5e9027ec5fe376b994d8dc807e3
+EBUILD zziplib-0.13.71-r2.ebuild 1700 BLAKE2B cfeba81175ad06f4ba3caafe065fd9e7922759338c6de1fe00553f13150737ff91278ef7bfc6745646720d94dd8667222e7b32abdb522129d63e345494305699 SHA512 eff9630a050fb3d492e44339e6109a57ce065bdca8a2084199803673c6d5781f37b1f99a9a5e7ae09771032daac7671be420e4668a842f2dd432b5ef3f2657bb
+EBUILD zziplib-0.13.71_p20200419.ebuild 1878 BLAKE2B 8a81295a1c2161b049b97eb379d0629ed5e01d3e1f975aac59af75dc3490551c1316cf9314b208d70de5c07e13a4a6502014c8f5aacc7e0b0c9f64263ab8c411 SHA512 4a240b12ac796847d985d5bc2fb50105ac251d63006e5e18646afc335262199744d6816ee5e8c9bf19d771cf537891eb1cb3d7c9d79344f0b6f8e189ee093c43
 MISC metadata.xml 504 BLAKE2B 406cd214aabfba1e0061bab2db1f297ad2e20df92d9ab4f381153a1e5434fb6138565949e2356ed79579df98343c5300c516c9bb0c0883eb026e144181d52b18 SHA512 a7b627e728607f9902420489fe7f3bdca2a5f165f25b1bf5d1a361e92ab40a1b70b212e97bed6c70793210103c6f45407d02faa3990237272373d40942aa11a9
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch b/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
index 08130f958dda..55fb4be7a51c 100644
--- a/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
@@ -1,9 +1,28 @@
-# https://github.com/gdraheim/zziplib/issues/93
 diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index b679f7b..e2887ee 100644
+index b679f7b..cafa6b4 100644
 --- a/docs/CMakeLists.txt
 +++ b/docs/CMakeLists.txt
-@@ -190,7 +190,7 @@ add_custom_target(install-manpages
+@@ -126,9 +126,10 @@ add_custom_command(OUTPUT manpages.tar
+     COMMAND ${BASH} -c "test -d man3/man3 && mv man3 man3_; test -d man3_/man3 && mv man3_/man3 .; rm -rf man3_"
+     COMMAND ${BASH} -c "chmod 664 man3/*.3"
+     COMMAND ${BASH} -c "tar cf manpages.tar man3"
+-    COMMAND ${BASH} -c "ls -l `pwd`/manpages.tar `pwd`/htmpages.tar >&2 || true"
++    COMMAND ${BASH} -c "ls -l `pwd`/manpages.tar >&2 || true"
+     DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml
+     VERBATIM)
++if(ZZIP_HTMPAGES)
+ add_custom_command(OUTPUT htmpages.tar
+     COMMAND ${BASH} -c "test -d html && rm -rf html; mkdir html"
+     COMMAND ${PY} ${srcdir}/dbk2man.py -o html html zziplib.xml
+@@ -139,6 +140,7 @@ add_custom_command(OUTPUT htmpages.tar
+     COMMAND ${BASH} -c "ls -l `pwd`/htmpages.tar `pwd`/manpages.tar >&2 || true"
+     DEPENDS zziplib.xml zzipmmapped.xml zzipfseeko.xml
+     VERBATIM)
++endif()
+ 
+ add_custom_target(manpages DEPENDS manpages.tar)
+ add_custom_target(htmpages DEPENDS htmpages.tar)
+@@ -190,7 +192,7 @@ if(ZZIP_HTMPAGES)
  endif()
  if(ZZIP_MANPAGES)
     install(CODE "message(STATUS \"Installing: man3 pages to ${mandir}/man3\")")
diff --git a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
index 20fc04ec8876..8cea5e4c9cc0 100644
--- a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
 inherit cmake flag-o-matic python-any-r1
 
 DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
diff --git a/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
index cc20d2152c50..ffa83af37362 100644
--- a/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
 inherit cmake flag-o-matic python-any-r1
 
 MY_COMMIT="223930775aa5b325f04cec01f0b18726a7918821"
-
 DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
 HOMEPAGE="https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/"
 SRC_URI="https://github.com/gdraheim/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
@@ -16,8 +16,11 @@ LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0/13"
 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="sdl static-libs test"
-
-RESTRICT="!test? ( test )"
+# Tests fail for now, only recently added.
+# Restricted to avoid blocking stabilisations.
+# https://github.com/gdraheim/zziplib/issues/97
+RESTRICT="test"
+#RESTRICT="!test? ( test )"
 
 BDEPEND="
 	${PYTHON_DEPS}
@@ -40,6 +43,14 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	sed -e "/^topsrcdir/s:..\/..::" \
+		-e "/^bindir/s:\.\.:${WORKDIR}/${P}_build:" \
+		-e 's:\(..\/\)\+{exe}:{exe}:' \
+		-i test/zziptests.py || die
+	cmake_src_prepare
+}
+
 src_configure() {
 	append-flags -fno-strict-aliasing # bug reported upstream
 
@@ -54,3 +65,8 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+src_test() {
+	cd "$S"/test/ || die
+	"${EPYTHON}" "$S"/test/zziptests.py || die "Tests failed with ${EPYTHON}"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
commit	8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree	230f3135ceaace633cf93e9838b185c4a6664c2e /dev-libs
parent	9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)