gentoo resync : 30.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-30 17:27:54 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-30 17:27:54 +0100
commit: f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
tree: e907cb121b30e3c1df1710719c0ddf4029597a47 /dev-libs
parent: db063b515939ab15261136b24e4bc44386335c0c (diff)
115 files changed, 1898 insertions, 1455 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7ee1f201d664..e9167d485a8b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/aws-c-common/Manifest b/dev-libs/aws-c-common/Manifest
index 507afa7f9e56..2cf0403c97ba 100644
--- a/dev-libs/aws-c-common/Manifest
+++ b/dev-libs/aws-c-common/Manifest
@@ -1,3 +1,4 @@
-DIST aws-c-common-0.4.11.tar.gz 306933 BLAKE2B 5a2370a3696e4d90b67bc03fbf88f152e1a2d6e4d4a9ff2a9423a2cf18c14a1e3b6d978250c3359f4ebb2cf5e524e416b11604dc09dc45f5c8a5a6f982b344a7 SHA512 1e00f6aa025578978551fc8ca1bc09b448f79ac28bdc969af4312569ffca035d656dc68825da15ad8f4f890bbdb03327c624147dded1ce402e9dab1726290890
-EBUILD aws-c-common-0.4.11.ebuild 499 BLAKE2B 651345b7c6e7cb6ae4e285ea5028fcba4431865d13599fb3409783be631a091ac6681cb9a81a1b1e6011dc78ceb32eeb9ac8824dc4e59f1be2c43cfe6d04b7ad SHA512 d06cccb62a6d66f81d45537be0ecc6eeb14c926df935eef5d955e9aa6a12f6e3967e3df1a2af304094146d04261fb6f5f155329bd76fd406b0c05688d7e59562
-MISC metadata.xml 334 BLAKE2B c8226dcaf19a3265fdc804e29bdc44227eba6e8ad6202bda3e78a1441be5f12204c3fbfbf6de2c17b4ac8aaf12f0ac14b95dd9fc93340f4a52b5236706830a18 SHA512 60907b2d5f02cdf8e10e7bf1fa44bf3a74109f71894933c00f3e9aa688651721342b8fa69a076950ec66dbe667da1ac01074ffdd632858b90c69a72841321265
+AUX aws-c-common-0.4.57-remove-Werror-CFLAG.patch 424 BLAKE2B 211f9b23c979b6c6d867d66a8a6c5ab023229f4fd90affd147c319ba5baeb5cf90cb1aeb8c42066b5de698ed5fa6a7513645e24b61ead58e5c6dda8b45f3c8ce SHA512 39264f91b5ce4ac506d771a97b7403503009f5d6616d8e0ad440574cffa1c18e1f6970fee75f712ec2e514d54885d37e9f157ac1160575af0883a6e56ad0b0c5
+DIST aws-c-common-0.4.57.tar.gz 418954 BLAKE2B cfb268d92e90343e01756b571d0d7fa1269a144b933b5dfae6e5fb92a2b384ff73bf14ad830b53427ad37e9dbd9a0afff5b571108869a69a8d466982a2e6c6ef SHA512 77a9110a067e3057ae3cb90ee0b1fa42e18595e476b803f83711ecc164053db73683df2fccf75ad992b7d08e142cb31d6a70f87ce2f3b87ce28ee1e8151b3c62
+EBUILD aws-c-common-0.4.57-r1.ebuild 613 BLAKE2B c125ea227cba881411af3c5614ffa4392061f898e547f92eb4ae70bd1674fc9415287114698b5a6ebae621547594575c543da0d1ac9c19bcc2afa768813cb04e SHA512 81efd0f3d3529d8804ba5401da09e9c8212a8e6702fc7347b4907b2bb6c14673bb90cd99d07e164e72eb8d1d0b5ad42f6437f83efc8256bedb14a83f79bb42c7
+MISC metadata.xml 532 BLAKE2B 30b517d35fb386776dfb24dab54c359e4edeac3fe3ba5a0c54ef09f0542c05bb91cf7e38c9bab3e0939ead184351326bb1eaaaae17c2f71b3cd7264c1091cd46 SHA512 19b51c483bc90b059d6b8b5282289239140b361362142c3a8252bae3d4dfc57098b2b7869f4440c5312db136b801d2c9d725ec64709fa4a0c46c04a6c640b9f2
diff --git a/dev-libs/aws-c-common/aws-c-common-0.4.11.ebuild b/dev-libs/aws-c-common/aws-c-common-0.4.57-r1.ebuild
index f0198268ad0d..120faea56d6a 100644
--- a/dev-libs/aws-c-common/aws-c-common-0.4.11.ebuild
+++ b/dev-libs/aws-c-common/aws-c-common-0.4.57-r1.ebuild
@@ -12,12 +12,17 @@ SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-Werror-CFLAG.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
 		-DBUILD_TESTING=$(usex test)
 	)
 	cmake_src_configure
diff --git a/dev-libs/aws-c-common/files/aws-c-common-0.4.57-remove-Werror-CFLAG.patch b/dev-libs/aws-c-common/files/aws-c-common-0.4.57-remove-Werror-CFLAG.patch
new file mode 100644
index 000000000000..767407062453
--- /dev/null
+++ b/dev-libs/aws-c-common/files/aws-c-common-0.4.57-remove-Werror-CFLAG.patch
@@ -0,0 +1,11 @@
+--- a/cmake/AwsCFlags.cmake	2020-09-29 09:19:28.820584526 +0200
++++ b/cmake/AwsCFlags.cmake	2020-09-29 09:19:36.068584784 +0200
+@@ -48,7 +48,7 @@
+         list(APPEND AWS_C_FLAGS "${_FLAGS}")
+ 
+     else()
+-        list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
++        list(APPEND AWS_C_FLAGS -Wall -Wstrict-prototypes)
+ 
+         if(NOT SET_PROPERTIES_NO_WEXTRA)
+             list(APPEND AWS_C_FLAGS -Wextra)
diff --git a/dev-libs/aws-c-common/metadata.xml b/dev-libs/aws-c-common/metadata.xml
index 88030cf0f62e..e3151ef13d4c 100644
--- a/dev-libs/aws-c-common/metadata.xml
+++ b/dev-libs/aws-c-common/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sven.eden@prydeworx.com</email>
+		<name>Sven Eden</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Core c99 package for AWS SDK for C. Includes cross-platform primitives,
 		configuration, data structures, and error handling.
diff --git a/dev-libs/aws-c-event-stream/Manifest b/dev-libs/aws-c-event-stream/Manifest
index 92a4ae48aa9b..d3e1457b9c09 100644
--- a/dev-libs/aws-c-event-stream/Manifest
+++ b/dev-libs/aws-c-event-stream/Manifest
@@ -1,4 +1,4 @@
 AUX 0.1.3-add_missing_cmake_install_prefix.patch 566 BLAKE2B 1e638a3fc81c27addf3fba53173584b379b271a357246f448d5df0dd34dbcea42f698c4e5be87937070d5274940e25c1dc893c2af621b999405925cd57471c70 SHA512 872305633d8f3129280d3252632dbc07d24ee666f236f02e568e27153dd69657a2cdfdb2d594d9a86816f09923fba5b0e9cb2bd3eb0198b2a9077e02082ff54a
-DIST aws-c-event-stream-0.1.3.tar.gz 27945 BLAKE2B 1e6944006d4da339726a4a4f292af5c0a9a31dcb907ff01cfb63f2efbcda0466fc42b770936704e3c8d49f00b1ba9e180726ed0de9acc38c3fb23553395da1b7 SHA512 d8959b8b30795a62fe5f15d95ccc81a705e9ba8f4e5f6a05e5a965bf705877992df5660d91fde3499fd3087405018e3207e0991fba214c1362d78ee824f4cca9
-EBUILD aws-c-event-stream-0.1.3.ebuild 664 BLAKE2B 1ce8ccef25923dcfed76f6ed79458ea2c2570939edd450d83033b543c9e36b1095daa02a79d1f899115f1ade5467b9f1ccde604df55c285ea30cb6b8c1a63f7a SHA512 19e3c1e9a6df30c7b9cfe77951517bc41b5a547e9dbe212dc8472893dd2c96f8f4524934420b47a7b627d5e629431efadfb5d378c1f9535ad8cce6ab56c128e3
-MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
+DIST aws-c-event-stream-0.1.6.tar.gz 26952 BLAKE2B 0edebb4c290d7e33d06dcba64a339bb3f4c60aa8b9455d8d519b41c7cab7eae3ac80e3545219ce87174de8ca47be4c4cd88d7cf21deff87a10f4d121ca66d3bb SHA512 2eca4176d9429de2741e9650f84b726a9979842e729fd0d900c1265ff89886dd7e12f72b61fc3af7c3282ec9357b8f6290c92713cef68e474150c947a5773421
+EBUILD aws-c-event-stream-0.1.6-r1.ebuild 768 BLAKE2B 34acc6016b79fe1b1496ab1c7c5c4fa66048d839e11fec7b1764f31d0ca9ac495612da2858066612c520ed14ebbaf9717b41994ff0c4b551e3bac84d63abc1a3 SHA512 bc586acddbc4f5c8269e6ee25b145775bbaa69aa7253582fa88d24352cfb74b19456277712951d1712fbdcab88f328d093537c75289534d498058186a85856d2
+MISC metadata.xml 365 BLAKE2B 173e5a8de1e8326296f192e96f64828c5148d5a37fc4b02c05507655d045c2e63d32833f148e76354e43d196f7f8305c2e26eb3b138eeee1856de18fa76f4140 SHA512 16a909436dd61400c177a54c56dd1302c6b1c5aa0f2f76fd049c22a124dab0ee9449adffa3631cd7bbe7998c69a349966d5434d57588adf438262326bdb78633
diff --git a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.6-r1.ebuild
index 50dc823f254f..9c59ceb1a5eb 100644
--- a/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.3.ebuild
+++ b/dev-libs/aws-c-event-stream/aws-c-event-stream-0.1.6-r1.ebuild
@@ -12,21 +12,22 @@ SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	dev-libs/aws-c-common
-	dev-libs/aws-checksums
+	>=dev-libs/aws-c-common-0.4.26:=[static-libs=]
+	>=dev-libs/aws-checksums-0.1.9:=[static-libs=]
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PV}-add_missing_cmake_install_prefix.patch
+	"${FILESDIR}"/0.1.3-add_missing_cmake_install_prefix.patch
 )
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
 		-DBUILD_TESTING=$(usex test)
 	)
 	cmake_src_configure
diff --git a/dev-libs/aws-c-event-stream/metadata.xml b/dev-libs/aws-c-event-stream/metadata.xml
index 585b0dc75dda..82d545903897 100644
--- a/dev-libs/aws-c-event-stream/metadata.xml
+++ b/dev-libs/aws-c-event-stream/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	</pkgmetadata>
+	<maintainer type="person">
+		<email>sven.eden@prydeworx.com</email>
+		<name>Sven Eden</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/aws-checksums/Manifest b/dev-libs/aws-checksums/Manifest
index 0f3337293da2..526e9e1b641b 100644
--- a/dev-libs/aws-checksums/Manifest
+++ b/dev-libs/aws-checksums/Manifest
@@ -1,3 +1,4 @@
-DIST aws-checksums-0.1.3.tar.gz 78242 BLAKE2B e78f3bb34e124351ad494e86e579613799afebcfe491fb36b20190121f2bf9de9d96714ad304a7fcd702708f5be417c6dbafe65606b2fe42c340edc796a3ecf3 SHA512 79bf71a6c4c268b27efe8a6a3c4b90281da4ce7f6e4c1c62fce80b11a4756ecfd4dc2b19624ace3f54137113d0cb56a517de0b91dd6338ee8ca069756bca13f4
-EBUILD aws-checksums-0.1.3.ebuild 536 BLAKE2B 2078883a7d3521896f5759b4f240693bb31da6cd1ede0841f5ac4c785bf92b15164f30a7df0df649413a15f421dce0ad8b9688cc040cb1b77d1993c63c880d8a SHA512 32a92b41b5bd40dd2ea80e9442315942e7bb7c9e211edd3e4a766afcb948e342cbd1f95d4ae6635fe2459b6f578891036d5baaf7d323e9f5d67ebf93ae349e9f
-MISC metadata.xml 362 BLAKE2B 5547648b863d8a47ca4fdde628bbb7c4cb7316c8edfb0daa2c9dc79cce94325858c3f26f0bd9cd36ba57851e13c27822005cf3563e175877d06a13c43ceadea7 SHA512 e57176253c813d8e6b37f2f64416e9ef478230013fe39bd057f4af1945c7ac4ed9cf415b30b6c375263e87db11e6279a4ae55a7748b9e0cd1fcfb4d7888c40da
+AUX aws-checksums-0.1.9-cmake-prefix.patch 966 BLAKE2B 5b1db93baf8699786ebb011590dbb5151dcd5210580fa5555b59c7cf28a7ff1336fb308dec393e1fd559d221359550375ec7de820977757495cabbe4aebf1fe2 SHA512 3b436c32ef1fcf1eab933ec4da9eb8952f4f8af9cdd8de4976b142b412bf132b310442e157731fd13ba21cd507ff70c552870e117e1e8a06f5c0830a077f99a8
+DIST aws-checksums-0.1.9.tar.gz 70967 BLAKE2B 2be344e9757236400879de2f946e7d7a41106c9544c1eefda0150bee3e483b909719d4612f4a8bbef1df01a8f5f887332f06e99aa0867f9d0f9b92f76c8badeb SHA512 16d8f1624d4a60c6a285c6212d2cc1bdf081fec4be5034095b89040543a0ccec6a2f22d9bacf156c781e0e06e80935e13f39c3643a77c2186b58211da4ca1207
+EBUILD aws-checksums-0.1.9-r1.ebuild 703 BLAKE2B e60e6a738acf70000c8cded9d9b5142a06f641bfcfe8e53d46446b9cefaa7819a8441af03655f0be3c61caabaae97f4cb60707c35e9c9d74cd89159272eb06db SHA512 20eab09bf6a5d2deedd838c14aba385a88d0739d193bf38da68921ee6a6556a82305d5ae1834711f85cecebeb6bff48f9490260755c90ec3c430bbfae5b73078
+MISC metadata.xml 560 BLAKE2B 9021d243e459572ef30be51e493e325f08cb515dd7484b0bb9268fedb69c11bdf9e4728931bf89ea9ff5250ee51592cdee543c5fe18d65293820ff4b167a0b84 SHA512 3106bc8fad12b73fdd39af5fc38cde0411c0fe24fa07b8b37349bcd4615cef52875595215455dde9db3bb847c65f1bebd79a16cb7d6261c4cec1ecc3d7faed6b
diff --git a/dev-libs/aws-checksums/aws-checksums-0.1.3.ebuild b/dev-libs/aws-checksums/aws-checksums-0.1.9-r1.ebuild
index aaf6a73ee9aa..bda76dac92c3 100644
--- a/dev-libs/aws-checksums/aws-checksums-0.1.3.ebuild
+++ b/dev-libs/aws-checksums/aws-checksums-0.1.9-r1.ebuild
@@ -12,12 +12,21 @@ SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
 
+DEPEND="
+	>=dev-libs/aws-c-common-0.4.26:=[static-libs=]
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake-prefix.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
 		-DBUILD_TESTING=$(usex test)
 	)
 	cmake_src_configure
diff --git a/dev-libs/aws-checksums/files/aws-checksums-0.1.9-cmake-prefix.patch b/dev-libs/aws-checksums/files/aws-checksums-0.1.9-cmake-prefix.patch
new file mode 100644
index 000000000000..9ca2437960fc
--- /dev/null
+++ b/dev-libs/aws-checksums/files/aws-checksums-0.1.9-cmake-prefix.patch
@@ -0,0 +1,26 @@
+From 97b3ba123af200d7dc4fe83e191e77c83ed7aff2 Mon Sep 17 00:00:00 2001
+From: Jakov Smolic <jakov.smolic@sartura.hr>
+Date: Tue, 1 Sep 2020 09:55:46 +0200
+Subject: [PATCH] CMakeLists: Add mising CMAKE_INSTALL_PREFIX
+
+Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 888742b..193a94a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -23,7 +23,7 @@ elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ endif()
+ 
+ # This is required in order to append /lib/cmake to each element in CMAKE_PREFIX_PATH
+-set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
++set(AWS_MODULE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake")
+ string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
+ # Append that generated list to the module search path
+ list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
+-- 
+2.26.2
+
diff --git a/dev-libs/aws-checksums/metadata.xml b/dev-libs/aws-checksums/metadata.xml
index d128563f8d91..43f7aa0e4eba 100644
--- a/dev-libs/aws-checksums/metadata.xml
+++ b/dev-libs/aws-checksums/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sven.eden@prydeworx.com</email>
+		<name>Sven Eden</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Cross-Platform HW accelerated CRC32c and CRC32 with fallback to
 		efficient SW implementations. C interface with language
diff --git a/dev-libs/aws-sdk-cpp/Manifest b/dev-libs/aws-sdk-cpp/Manifest
index 5c743553dead..b5e35fde0bec 100644
--- a/dev-libs/aws-sdk-cpp/Manifest
+++ b/dev-libs/aws-sdk-cpp/Manifest
@@ -1,3 +1,4 @@
+AUX aws-sdk-cpp-1.8.46-remove_Werror_from_FLAGS.patch 1454 BLAKE2B 882ead67d2fa49ba8e44a9d0722912cb1cd7723dee05c03972df8a24ef34621adad3d8c14ddd44236c1afd3132d98367b27132260b8f68f371ed6340de43ef1b SHA512 d3c0c46ef67874980436e1e29e98f39ce0bdbf3d351464d69d99a3ffb0bbfb5055807c99a6f47fec3f26874ac6641d474bcefd354807e7cf36033422f1ebee87
 AUX aws-sdk-cpp-upgrade_CI_ConstructReleaseDoc_py-3.9.patch 256 BLAKE2B 66653717a66f51d8403367b8471eee9022045ce5340a232c0bce9cb47fd5ce1ab58e097155048ec54d2fbdd072ebd9c9eeb63f7c9a194445c8833cffc224fa84 SHA512 2af8fbf593cd2bbd7acbdb18f994f18b516abe58a4bb9ee215a72932ec62e463c33e04733bc9be6a60539e1ac8a3beaf4b0611cf0fca97fea1eddbcaa9315e53
 AUX aws-sdk-cpp-upgrade_CI_ExtractBuildArgs_py-3.9.patch 787 BLAKE2B c7a7a0bf1de4041b64e5afa2073fb426659a82a64b10bfaba05ae1dffd8a4819e073692992c49ed66493569dc33ca736c4a27dac2da07d1235be48cffddca16f SHA512 d3246dbbbf8e7598053933d949a1c43b5c5929049eea12aae0ef00182594aba5dea9a5b3ea22bf795d9ecd2f4a6880bc815b83ed4532c0bc94a901894704e73c
 AUX aws-sdk-cpp-upgrade_CI_handle_release_notification_py-3.9.patch 194 BLAKE2B 7f6d935c5dff0ebb0701003e6daaba0d174cb90c3f39dd6da7dbab5ac5660b4d9685e5a00cfe7977ecbab5f6d27ebb8b3ed05b839a2322a56fb813dda72e02e5 SHA512 7754c2c0a418b8af82129eaea26cea102aa3e529d40d4cecdec2ae5bbf3b7c05ae0dade1d44efd550a8d068db671d15cafb17ced049c430c1589c1cdf8c0ed92
@@ -14,5 +15,5 @@ AUX aws-sdk-cpp-upgrade_scripts_generate_sdks_py-3.9.patch 1243 BLAKE2B f6ecdfae
 AUX aws-sdk-cpp-upgrade_scripts_renew_license_py-3.9.patch 319 BLAKE2B ca9b1664bc74bb4aec09efdfd640deda357c5f10e28ed6a3716096067669643436c35b93db0cab6ac9ff0582d77c548aadddc33dde36fb5759921a93127035be SHA512 3cc6ada02f65d97a2351ea4e9700db7ebe532084cbae5934371685d9a424993cbf60e68e6b64aad0d389c9c8774602cd6132cec351e136b5de8249d00ad32023
 AUX aws-sdk-cpp-upgrade_scripts_run_integration_tests_py-3.9.patch 850 BLAKE2B 9ba442243492283f95d92769541dfcd218120e94cc96d857b10380d9cd6adc876a4b3c962dbc5171776be9a02dd236ae220924be7a481f0793927c16709539c2 SHA512 8975a8ea5162a7253c2b2ce64b47848b5ae566eef95ce432df2e8046ef82b66a78ff292e0fefde07a0a128a864716abcf077a6270abb6314ba0c6bd15fc39f7f
 DIST aws-sdk-cpp-1.8.46.tar.gz 28989406 BLAKE2B 47a72d1e0578ecd28e376f3c6688a997faeeae41ba5e4ab5aeff59a2d8f592fc63746445728ab3236952cfc045dc683c816c77dfb8fbe3d98904e50013201ace SHA512 9fedc9de84721189f001a0a5fb2dd63987a366a37ec6354234b244da39929b420e6289bd319d0f056fa4274b7bc682d1aab2dddd5dc823abdf24b69536610ed4
-EBUILD aws-sdk-cpp-1.8.46.ebuild 8302 BLAKE2B c6fdc9002429aaa8edf45aca9ea01cc01bc3232fd36ac399e6e71485dec5b877d783eb3f10458a8979cda562bdd46687867d4c1759750e901847b8df2e380809 SHA512 892b43a1b5027b7a7b33767d3c8307f395b93b5f13eb8e20f70ffd45a5bf80a6fa280cb22a34fccebf2bbccca90fba87b59effc07ee0f4c7dd97a9fe787978ee
-MISC metadata.xml 23851 BLAKE2B af85a4922358eab81028ad9003a39cca87c981a2068aeb26e2be86d5da5d888e2d2611ad15861a6562cf60294b1902e7026aef2ec4f16d862078926147a2896c SHA512 4cc2bbc93a0c396d77e8b506aa0f575523ab0cee5a786774a617c3156af910e49b06abf41b17314cc32968feff4367755812bb681daa4b399ce6da73929a3877
+EBUILD aws-sdk-cpp-1.8.46-r2.ebuild 8427 BLAKE2B 5d0fdb32e9f035fb77991dc3c31b94ad4dd506e44226d023ab3e7d932b7d6f64575baf3165293b2c964bb63a7517fc81a450dbae940003594fb2404c5b883f73 SHA512 4528cd4e62686d6a54cb96366c6bb1e50e1b1cd9ac34d5a88b7f24ab4e1094bc8df5381264c9f44ee6579f80373b1292e6b2f548ebb7deff8d051fd718dfed48
+MISC metadata.xml 23852 BLAKE2B a36bd66ac6baada3f9cb6926a642fdaae54e2ce1b4f577b4b91913d6d2e0529aceac4801c80a8462aebe72b6750d2d4f4353e979e2f6dfa55a8aee4b871fc10b SHA512 c0ce3534d965630881d4a306dfcb243aa241e1cd6d7fe3f21f062ce2f29222b5bcac20cb50b93b15a5c4cfcdd69c9b5511bf9eeea1b7785ca2dcd9325c57dbab
diff --git a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46.ebuild b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46-r2.ebuild
index 2ac7c4ce7732..a2d30d7fccdd 100644
--- a/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46.ebuild
+++ b/dev-libs/aws-sdk-cpp/aws-sdk-cpp-1.8.46-r2.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86"
 MODULES=(
 	access-management apigateway appconfig backup batch budgets chime cloud-desktop cloud-dev cloud-media
 	cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ebs ec2 ecr ecs eks
-	elasticache elasticbeanstalk elasticinference elasticloadbalancing elasticmapreduce email es events forecast
+	elasticache elasticbeanstalk elastic-inference elasticloadbalancing elasticmapreduce email es events forecast
 	frauddetector fsx globalaccelerator iot kendra kinesis kms lambda lex license-manager lightsail machinelearning
 	macie managedblockchain marketplace networkmanager opsworks organizations other outposts personalize polly qldb
 	queues rds rekognition resource-groups route53 s3 sagemaker secretsmanager securityhub serverlessrepo shield sns
@@ -36,9 +36,9 @@ DEPEND="
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
-	dev-libs/aws-c-common
-	dev-libs/aws-checksums
-	dev-libs/aws-c-event-stream
+	>=dev-libs/aws-c-common-0.4.26:=[static-libs=]
+	>=dev-libs/aws-c-event-stream-0.1.6:=[static-libs=]
+	>=dev-libs/aws-checksums-0.1.9:=[static-libs=]
 	sys-libs/zlib
 "
 RDEPEND="
@@ -62,6 +62,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-upgrade_scripts_generate_sdks_py-3.9.patch
 	"${FILESDIR}"/${PN}-upgrade_scripts_renew_license_py-3.9.patch
 	"${FILESDIR}"/${PN}-upgrade_scripts_run_integration_tests_py-3.9.patch
+	"${FILESDIR}"/${P}-remove_Werror_from_FLAGS.patch
 )
 
 src_configure() {
diff --git a/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.46-remove_Werror_from_FLAGS.patch b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.46-remove_Werror_from_FLAGS.patch
new file mode 100644
index 000000000000..9c8ff79e311e
--- /dev/null
+++ b/dev-libs/aws-sdk-cpp/files/aws-sdk-cpp-1.8.46-remove_Werror_from_FLAGS.patch
@@ -0,0 +1,30 @@
+--- a/cmake/compiler_settings.cmake	2020-09-29 10:15:14.293703615 +0200
++++ b/cmake/compiler_settings.cmake	2020-09-29 10:15:32.173704251 +0200
+@@ -53,7 +53,7 @@
+ endmacro()
+ 
+ macro(set_gcc_warnings)
+-    list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra")
++    list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-pedantic" "-Wextra")
+     if(COMPILER_CLANG)
+         if(PLATFORM_ANDROID)
+             # when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning.
+--- a/cspell.json	2020-09-29 10:19:23.102712472 +0200
++++ b/cspell.json	2020-09-29 10:20:32.195714931 +0200
+@@ -11,7 +11,7 @@
+         // CMake
+         "cmake",
+         // Compiler and linker
+-        "Wpedantic", "Wextra", "Werror", "xldscope", "Wtype", "Wunused",
++        "Wpedantic", "Wextra", "xldscope", "Wtype", "Wunused",
+         // Android NDK
+         "JNIEXPORT", "jint", "JNICALL", "jobject", "jclass", "jmethod", "Ljava",
+         // XML parser
+--- a/CI/install-test/CMakeLists.txt	2020-09-29 10:19:32.094712792 +0200
++++ b/CI/install-test/CMakeLists.txt	2020-09-29 10:19:46.064713289 +0200
+@@ -4,4 +4,4 @@
+ find_package(AWSSDK REQUIRED COMPONENTS s3)
+ add_executable(${PROJECT_NAME} "main.cpp")
+ target_link_libraries(${PROJECT_NAME} ${AWSSDK_LINK_LIBRARIES})
+-target_compile_options(${PROJECT_NAME} PRIVATE "-Wall" "-Werror")
++target_compile_options(${PROJECT_NAME} PRIVATE "-Wall")
diff --git a/dev-libs/aws-sdk-cpp/metadata.xml b/dev-libs/aws-sdk-cpp/metadata.xml
index d9d348be77d8..632e0dfe1944 100644
--- a/dev-libs/aws-sdk-cpp/metadata.xml
+++ b/dev-libs/aws-sdk-cpp/metadata.xml
@@ -206,7 +206,7 @@
 			Set up, manage, and scale distributed in-memory cache environments in the AWS Cloud
 		</flag>
 		<flag name="elasticbeanstalk">Quickly deploy and manage applications in the AWS Cloud.</flag>
-		<flag name="elasticinference">
+		<flag name="elastic-inference">
 			Amazon Elastic Inference is a service that allows you to attach low-cost GPU-powered
 			acceleration to many Amazon machine instances in order to reduce the cost of running deep
 			learning inference by up to 75%. Amazon Elastic Inference supports TensorFlow, Apache MXNet, and
diff --git a/dev-libs/bcm2835/Manifest b/dev-libs/bcm2835/Manifest
index d644ef33b08a..81b77cee86c5 100644
--- a/dev-libs/bcm2835/Manifest
+++ b/dev-libs/bcm2835/Manifest
@@ -1,5 +1,5 @@
-DIST bcm2835-1.52.tar.gz 258007 BLAKE2B b681617352ee0239c9c4effb5a5e161b2c409514d08e0d60d35e9bb58126f2a00bb9ab1a7f767db4c68a28eab4432f1f8908d5a4372b5b1c05f6f979f27c036d SHA512 5a6c608ed10169b0bcf9dab91dc0193b9fd16814c5c6bb18ea242b36ac803e56c49147721ed48c83ff72892683be6032f2e85bcc76dae523e5d79a5ae52f5154
 DIST bcm2835-1.57.tar.gz 262233 BLAKE2B 618a6089f773b874905ba8341eb42b6751355dc8607c51957b6020a0d484734ef5ea4e49a6086ba25cc820c57cb077f292654fdc4eeb1b293746f9cbb83ca462 SHA512 0af59c22869511465a9fdcc384d7456f04bec06a1480e0575b7756628f0ecc72648974a9ace7a46df257b0fd45a117c89c430c3e97d214081d038cbaef398821
-EBUILD bcm2835-1.52.ebuild 579 BLAKE2B 74dc8492eef09b9994152a565eb2169028aece2a11a7d771b6b856d4b1eedff3f5e419ddd6c50be72e61d6b22b5abbd21dbb85c0ab46f387d6cf8f98a6996ac8 SHA512 1d24a860e1051ab855133d7b17f1ebb590b91aaf03078e69dded8c8d51f90c8f9ca66002470081a54d7b7bc4732078845fa04c84186aa8d7ee20c14c30bb5a4e
+DIST bcm2835-1.68.tar.gz 272796 BLAKE2B d848e901b1b3a51712009e3fbf00c43f870fd6c28812be710276620f80c4173e92529891e53ec02e2076069a5da8ba7190f8dcc620ce4a843773cb85622dd830 SHA512 bdc91af8f28755899611d41cf954c9b2ca107befe984b79ee6fe23b66bbb7f50e746e084c3e431b1b0cdf1b0735cec8a54018ebf12b713380e5db97e3564f477
 EBUILD bcm2835-1.57.ebuild 579 BLAKE2B c3c00db822c408dedadf639f05e12bb49b1a935083678f84c4f16a71e42ac9184d934f0c9c38b22078cff55055ac5b1d3b2ab2f77d1e8ee50a0761efa317d772 SHA512 8cd5eb782fd264cf3c2354e7212f1e55196b531c606cf58affb99160de5aeb03b732179d322f5b70f6b24bb702d5bed78f47cf0e0468ac164431235062b3d987
+EBUILD bcm2835-1.68.ebuild 646 BLAKE2B 5b0abd1092a7263cfe9a4d162bb5da182cc6575ac7218b15f47b176115bec876cc80b4c54c679f9c389acb9563e4a972c83c54f46587674d03b29c3be61162ef SHA512 f11a85289aba36e1a4c7098821e27f8f198d02c12b18116ab544311e1acb016b0d1c7d3a03d8df9ac220fd569b538d03fe2854f7e707e2856716d655d6a61786
 MISC metadata.xml 266 BLAKE2B dcea8fa0295f75ca11474aafd9d1b56cf5c6d01fdb4444a82a0b93e818cf8e692076a1f5dc30a5098779afdff5190e2f877836b3ee87cbc1f8a529c32149ea94 SHA512 4da13e3e2134d06372d9bdc1de80cef972ac5db82e7ee8b3cfe620712610fd863c9037a6b8c84ee7a6c8eb8f0cb52568f040474eddb73a7afa07b5a53f512ac5
diff --git a/dev-libs/bcm2835/bcm2835-1.52.ebuild b/dev-libs/bcm2835/bcm2835-1.68.ebuild
index df21044d8808..454774b9bb63 100644
--- a/dev-libs/bcm2835/bcm2835-1.52.ebuild
+++ b/dev-libs/bcm2835/bcm2835-1.68.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
+inherit toolchain-funcs
+
 DESCRIPTION="Provides access to GPIO and other IO functions on the Broadcom BCM2835"
-HOMEPAGE="http://www.airspayce.com/mikem/bcm2835/"
-SRC_URI="http://www.airspayce.com/mikem/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.airspayce.com/mikem/bcm2835/"
+SRC_URI="https://www.airspayce.com/mikem/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,3 +25,7 @@ src_install() {
 	fi
 	default
 }
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 113c54d3c41f..d9be27bb106f 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -11,7 +11,7 @@ AUX boost-1.73-property-tree-include.patch 1832 BLAKE2B 7488cf768209bde32af608f3
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4
-EBUILD boost-1.72.0-r1.ebuild 11337 BLAKE2B bb6e82cc6c0dd49627cbd9841a4e02cf80e5e4dc3588a10c93abe587327bf3ad0d2e427bd3eb4944a8c0dee53c48de617e7305ba80091385e1a448c3e86cb544 SHA512 f07607be1571a204f050a9ae7d8c2994b944259301c1c3cb0bb81d7c84c4721b8baba8bd2795abaf01585e6a36749492527b5c8ce56c2d3fe81ba52590d9e2e0
-EBUILD boost-1.73.0.ebuild 11348 BLAKE2B 25c73b12e45920322fecba41e58217771e85b5963dae04cbeb456fa540be68488f6b7321290e65662cbb1cdd035d7577b63be3d80889ae476224646cf60e535d SHA512 d63b8b5a3ef6b1506159c435d618af77ef601507ad7bbb8393d65b0c6aefa2a2fe380553556733c10a8f21f67be1eb6c1131fa07a9f0dfc5d11edd5f7bdfd806
-EBUILD boost-1.74.0.ebuild 11238 BLAKE2B 7eb2f3f696a01e2a44b9c36dde218d009f0fe980061c72888f8c7ae1acfc174a11ea38dc9f3e12b889b6e942887608ad1fc5f788c98c78988764a82999ae7e0f SHA512 a0c72d4e089bf060a34f1739662a674d2d11310f859d937d94888abde18f78a6ca9608ce494f7ef799da1d7074d2624b0bcd4d25ba37c446a94d0e0c7c4f9fad
+EBUILD boost-1.72.0-r2.ebuild 11331 BLAKE2B f7294b4da3f7ec6e91766f0ca4439ff24b12f7eb16e1875fdb29d276396bd3c48a094d7fd909c49fce9013118f10a13606d9a8da444f1e9268c6bb9a1c12672a SHA512 1662769daf62586acf8894bf46ff506721054001b2f130f3818575c661bd9de10e1b433bae0f35bc4aca8f04ead7a84b5a8c4ac15cda8bee0c7e0829449b1b66
+EBUILD boost-1.73.0-r1.ebuild 11342 BLAKE2B a56c730c06512795c2bab24328c3754b7882db93300cc0e2d67a97b3761749e783454b770a8676deac10a032e7e01c0ea8b02feee1ca5ffcd5bc8bf55714ac46 SHA512 2819b369f167417b2fcc4d66cba8257eb313314ef161800be39be031c56fa8de214a83d27784a2cdbb334202de147f958ea6a08e597efeaf15fff6ecdb8dd94e
+EBUILD boost-1.74.0-r1.ebuild 11232 BLAKE2B 7a4df095b55cd0a76bc0b032e73c5d2628e03aa6e78a387b8805dbabf762a718ea3adefc7d19086cc70f815727294c95c03f2307fdc8bb6d2e20f8076bfbf9f1 SHA512 b85bfd9ad79eef5dbd8dc910f09af8419a9eeb9c52c48be4b80fc7b077474120d42032eefe21fa57a77182aa05d99fa46b07486cbdb845a92dfc4c5426c2817c
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.72.0-r1.ebuild b/dev-libs/boost/boost-1.72.0-r2.ebuild
index c7f52577df42..2556d26576ee 100644
--- a/dev-libs/boost/boost-1.72.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.72.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
 
diff --git a/dev-libs/boost/boost-1.73.0.ebuild b/dev-libs/boost/boost-1.73.0-r1.ebuild
index e5b91ab30530..0e349645c055 100644
--- a/dev-libs/boost/boost-1.73.0.ebuild
+++ b/dev-libs/boost/boost-1.73.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
 
diff --git a/dev-libs/boost/boost-1.74.0.ebuild b/dev-libs/boost/boost-1.74.0-r1.ebuild
index ed0bc9519c89..7c71efd0cdef 100644
--- a/dev-libs/boost/boost-1.74.0.ebuild
+++ b/dev-libs/boost/boost-1.74.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
 
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 60c8fd3edebc..805d7a3bbb57 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,6 +1,4 @@
 AUX check-0.14.0-r2-disable-automagic-dep.patch 769 BLAKE2B 286eeaa0e45e524c400f1967756b2e2912d76826c2fb92d9008afc338f19a4edc55b23e2751ce46f52e2fccc3e091f7143647a42a017c02ee580e138c3a50536 SHA512 4370bb6551c3e2f414b6580f26ed3a7429278139d5835b44c8769f1583363aaf8e25982e6f86bbcf2e7fc06d3c406d9a2af4a47fbb99377c6589f276aa9f29a3
-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 1579 BLAKE2B 6887123d2d16ae72e2145d73bf9bf09c7d42ee597042d10030d724938ab1935b31c8cf7832d44cbcc8d1d486247b7a82cf308844d67b6fb02db442c40d5840f1 SHA512 1d0d113035fc6488f240512ece6d39c0d4ac5a278fd9fa9936b9086a955ec52b35e3145f25cf2760c7fdfdc7b1d4a60a485a05f0d4769cf31882a1cbbf14c3fd
 MISC metadata.xml 488 BLAKE2B 27eb0323a4d7cac50b2f4ee935c75e7a35c34066a0dbc5bf21f8b4fb93abe82aa79a5fa1fafed0e623417ceaa553dc8395f201a24c3e0123df3104be44106bb7 SHA512 4b69b4b1ca91bfe4b04d03935d3d6e9b8ca10ecaa538884834f357708db5380a90e9cf1fdcef7996b7c4d8a23c0cb8e1d9eb9d34faa584637804ebc67657be69
diff --git a/dev-libs/check/check-0.15.0.ebuild b/dev-libs/check/check-0.15.0.ebuild
deleted file mode 100644
index 16d464eda35f..000000000000
--- a/dev-libs/check/check-0.15.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="A unit test framework for C"
-HOMEPAGE="https://libcheck.github.io/check/"
-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"
-IUSE="doc subunit test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="subunit? ( dev-python/subunit[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}/check-0.14.0-r2-disable-automagic-dep.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Fix wrong libdir, probably caused by multilib
-	sed -i "s|\${libdir}|/usr/$(get_libdir)|g" check.pc.in || die "sed .pc failed."
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHECK_ENABLE_SUBUNIT=$(usex subunit ON OFF)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-
-	if use doc && multilib_is_native_abi; then
-		cd "${S}"/doc/ || die "Failed to switch directories."
-		doxygen "." || die "Failed to run doxygen to generate docs."
-	fi
-}
-
-multilib_src_install_all() {
-	use doc && local HTML_DOCS=( "${S}"/doc/html/. )
-	einstalldocs
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 927da9036ff5..94f828357c89 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,6 +1,7 @@
 DIST efl-1.24.3.tar.xz 72278592 BLAKE2B c5d07e947139087976a0a974c3129ea31211be4c235e94d6fc3c2b9c7ec0be97b78fcf6a18aebd4b4d476224c9e6f5a29ad41d93e6c10065ff7591c2792b8481 SHA512 3791955c588bc1b2ca55caa19dc0fb351c9f6c681791bfe76a435255edd55257c9c5ab2f16d0d91ec2d55113bd9d24d45c0f9026ae72d9f6afbddfd093975089
+DIST efl-1.24.4.tar.xz 72283172 BLAKE2B 4e21b21108337fdf3fa7be55e804f25f32dd8dc6a1743819910d83da713bae28cb4771f2f0df5d392a6f542158ed3c48566fef8d8dfaad9c65747f9a8ee1560a SHA512 5796b33152e0375196d54557803db5928bfc45267250b80406043157193773084c39482bca40dc6811f4a3dd53d416b0d3b8317405923add0560debb24a3a385
 DIST efl-1.25.0.tar.xz 72308216 BLAKE2B 11cafe753b28eaf273e5458008bcb027b25b2768952246835d81996ca7e5acf3878e1c80dd1aa47ad2af86da2d7e96c7391120ababf1bfd85ffab83ba4d8cbda SHA512 1362e46399d4f22bd16abd5356fc57da0eb3d92dde36413cf671c1279ca6ff24ba91b358e2cff7158fa0dc9646ed83282f952e2a23e1fd92d3e37c03ba47cf1f
-EBUILD efl-1.24.3-r1.ebuild 7343 BLAKE2B ada5159b715e503b410a0db611728aae02464bcd6c396fa80850ce74f6b819d3033f6ac705e51f82f096ef52d18fafb66fb7f957c0a31f1c30508e08880e96f2 SHA512 a7bed9390fce3368c3bd50c36e6d9989307c519612ff093e1c0ac4a4dceaf6536bbfcb2940e7e44a99f2471d320837c5bd8501148cfc0847a32d1fd3797d988f
 EBUILD efl-1.24.3.ebuild 7102 BLAKE2B 363fdf6553532a47fc4d6b95c8d28a32fbd53e8b8b632567a690e96b59ecbd2fce9e0808c88b6041a3e537a57203c4b964786a708b21b401072c31f592d3c2ba SHA512 f423decb04ef2dd4ac64f127ab9f4ebaed1030aa71803aa2e7579edd8662db51322d0c5239572803713bd1276d56a01b6c2ce3efa1c5a5abaf22e1f39d9b6ef7
-EBUILD efl-1.25.0.ebuild 7654 BLAKE2B c2f8cf5098c82d900c6036b02fe790065ff21adbfd260c4357414bf4d90d861e37a48b7a81b34c4cef398bb63e8ae31c1c3904ebcbd47da2a08a9d8339019bf0 SHA512 fc6efe03cd85a78f53325a634990a20f4ee2759e49e88f4be581b563cb4d37fbcca3f3c7f0c1d920549df4450fc6c1f5feaaed501eb28748d0d74a8a6c50616f
+EBUILD efl-1.24.4.ebuild 7343 BLAKE2B a6730f3d79edc0fcd5d8a913a0c166c36e5f4127dff362d0f43b0013e274cda38a3e1d7bc2280864f54b2f84c13f90b6a77d6ebb47f7827fb97bdb42a815f0f2 SHA512 10b9a2fc8d5caf3cda150c82ea09f30b7d823c691cf0370dea6493e310a4c0ec61475e507bfc1e43ec4f9d29d386d16d5d3288e89f7fa4832ae66bad19610e20
+EBUILD efl-1.25.0-r1.ebuild 7767 BLAKE2B e65c2de696221a73a94f9ea81691ed94418b45a55a46b6163905bc866de409f6ecf35689568f2b6b815089ecbf96fa0067480123c6a70817ca372c6ed4740126 SHA512 e2e3f4bf98d1042a595b4035c8c5bda9997e9ac5c330a86c6d12f3f1ebfbc2bfa610269d80b2cf7fc0e65fdb3aaf81c730e819b5f1bfab6c62ce3a421b6344a7
 MISC metadata.xml 1985 BLAKE2B 5ad17cbfc665a26357c6b8d473d211663224eca97ed9a22c8575122e331b9661118890db1cf4f41e9e0e9b16f157d48da0920026fc83fdf965e4d1bd7c3d1ede SHA512 dbc127099457c88bcc419bd0c415f801765aeb85f010d7de43ea03e9400a7888c33c80f53048bf4edfd34ff95a43ac506026775a7bf11b041adc89acef0ec15d
diff --git a/dev-libs/efl/efl-1.24.3-r1.ebuild b/dev-libs/efl/efl-1.24.4.ebuild
index f7493cc7904a..f9943bbda177 100644
--- a/dev-libs/efl/efl-1.24.3-r1.ebuild
+++ b/dev-libs/efl/efl-1.24.4.ebuild
@@ -148,7 +148,6 @@ src_configure() {
 		-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
@@ -157,6 +156,7 @@ src_configure() {
 
 		-D edje-sound-and-video=true
 		-D eeze=true
+		-D install-eo-files=true
 		-D libmount=true
 		-D native-arch-optimization=true
 		-D xinput2=true
diff --git a/dev-libs/efl/efl-1.25.0.ebuild b/dev-libs/efl/efl-1.25.0-r1.ebuild
index fd0d1587fa97..be750ab8e3a4 100644
--- a/dev-libs/efl/efl-1.25.0.ebuild
+++ b/dev-libs/efl/efl-1.25.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug doc drm +eet efl-one 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
@@ -21,13 +21,14 @@ IUSE="+X avif bmp connman cpu_flags_arm_neon dds debug doc drm +eet efl-one elog
 REQUIRED_USE="
 	?? ( elogind systemd )
 	?? ( gles2-only opengl )
+	?? ( fbcon tslib )
 	^^ ( lua luajit )
 	ssl
 	drm? ( gles2-only )
 	examples? ( eet svg )
 	gles2-only? ( || ( wayland X ) )
 	pulseaudio? ( sound )
-	wayland? ( gles2-only !opengl )
+	wayland? ( gles2-only !opengl || ( elogind systemd ) )
 	xim? ( X )
 	xpresent? ( X )
 "
@@ -154,7 +155,6 @@ src_configure() {
 		-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
@@ -163,6 +163,7 @@ src_configure() {
 
 		-D edje-sound-and-video=true
 		-D eeze=true
+		-D install-eo-files=true
 		-D libmount=true
 		-D native-arch-optimization=true
 		-D xinput2=true
@@ -171,7 +172,6 @@ src_configure() {
 		$(meson_use X x11)
 		$(meson_use debug debug-threads)
 		$(meson_use drm)
-		$(meson_use elogind systemd)
 		$(meson_use examples build-examples)
 		$(meson_use fbcon fb)
 		$(meson_use fontconfig)
@@ -186,7 +186,6 @@ src_configure() {
 		$(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)
@@ -197,6 +196,12 @@ src_configure() {
 		$(meson_use !system-lz4 embedded-lz4)
 	)
 
+	if use elogind || use systemd; then
+		emesonargs+=( -D systemd=true )
+	else
+		emesonargs+=( -D systemd=false )
+	fi
+
 	if use opengl; then
 		emesonargs+=( -D opengl=full )
 	elif use gles2-only; then
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 25d5dc40b090..e9e29a5cc0d2 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -4,5 +4,5 @@ DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db2
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 EBUILD glib-2.62.6.ebuild 9758 BLAKE2B ad374e654c1afbe60c8b65e04cf1934791f8c487a3881b82deb0684f0c903e4d7a4e08c954f325a896a42f935634ecc37d764ad6e16a4fcd6b1a04528aaab378 SHA512 bf35ad4fa21d1d9a7e1bd495a800d67fed2aca2f5002cf8df58523ed980abb05b076d19382274556a99a72fa4bf4a796d693534b19ed4e309fb642e4ed7f0feb
 EBUILD glib-2.64.4.ebuild 10341 BLAKE2B f86bfc8fff0ebc1fd53b89f98a3924cdbf814de9fe2a8cdd0a65aa5cd5a4c24d04b112cde58e1a3b5911d74de8cc65087fd09a88192c9fcbe1ecc8178748052b SHA512 d0b44d65e055f1afc22126675ed54f5168faa3b55aad5f1bf52880d71232f226924c9c888ad3dd969fa010d089dc0634abefb90c16368840ac161435e043d8cf
-EBUILD glib-2.64.5.ebuild 10344 BLAKE2B 41f17b87deb363b16093aa5ee004bd828b1d9d998206db4c30ddb0295a63e321ceef2e6864ff7f842d455b82ec4d4df04154e3492721e75d926aa8bab370677c SHA512 e2c4656c0e1cfc824c1662a7727e00fbab5f874757d32eb2704c60c7a151ea22cc0f8289d1e4dab02e7db1b24b4d89181e10c25c3c67ca2216745839c71687c4
+EBUILD glib-2.64.5.ebuild 10343 BLAKE2B 84d82001f55a173d36d263675f0168a0d8f9cfae88c53358b722ebf9c7a07fe12a10ecde623e3e26423216a08ca74a94037727ac64c8287a3de80334dc8ce4a4 SHA512 a5f70fe09a276c7a1e4ebb6e924995b0e216879ab42fd57dc185716c3985547c1e46aeea2e2798548a33d227afc9c4cfc961fb2e0fca17b156022bc168b341b5
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.64.5.ebuild b/dev-libs/glib/glib-2.64.5.ebuild
index 20eae495eb41..837596c8f777 100644
--- a/dev-libs/glib/glib-2.64.5.ebuild
+++ b/dev-libs/glib/glib-2.64.5.ebuild
@@ -14,7 +14,7 @@ SLOT="2"
 IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # * libelf isn't strictly necessary, but makes gresource tool more useful, and
 # the check is automagic in gio/meson.build. gresource is not a multilib tool
diff --git a/dev-libs/igraph/Manifest b/dev-libs/igraph/Manifest
index 3fcb9eb0ff54..2edd5aa134f0 100644
--- a/dev-libs/igraph/Manifest
+++ b/dev-libs/igraph/Manifest
@@ -1,4 +1,7 @@
 AUX igraph-0.7.1-unbundle.patch 8525 BLAKE2B 716137c2d7b4ffc3e29b484539867216574162dc3c55ea747c57cf24689ef3de032776f9e7f1d76cdb1c0e39bd6afd5fc3cc2e74de4209d632bdd568a8b884a4 SHA512 8b796f95044a231b2695532d158721cf48dfd266f5acfc2eec8a7f3706208190ee07eccaf83823ba9323edaef15afbca60ff7013cf0d9d7fda0ab5b0ee5e0eff
+AUX igraph-0.8.2-unbundle.patch 4755 BLAKE2B da0d8940fdddcffae07332db988a3195e3fb8d8628707191c45d7d1d37828fc4fc7ba3bb86f5fdef3f693e5d50d50e0dc504f2ff6334dd44aacaa32238ee46f8 SHA512 737ca787a729538300058307ee003cbf1b70e93bfc1e4fd5853647d033c61537bb935e6f46c1a689f4f69ad188602c71493693d45216e43f912e5c4c4757ca3c
 DIST igraph-0.7.1.tar.gz 2967134 BLAKE2B 27f0a2f51e561a3ea2e2e6d31853fe10ffd66f9f67603d77f2c0449a4c2bcd4d45c98516b526fb0f23a871ebe3db1fcf0c691551714d044124778faa147bd30f SHA512 ac7d7e3fbc6d27ae69079224881ca03db2c7e0b50d016706f3e167c614e2c9332c675d2fcd3cde12874e13a8fc402d42222308c6195afadee15152cec93f94dd
+DIST igraph-0.8.2.tar.gz 3625308 BLAKE2B b3be5a28b6507c98c88a96c4a14e6b9c45645985f5b16aaae0739412a5f26a1ccdbda3180fac5d12525b4da2f5fc3d6caad3928cd1306b151b89104bbbb5f6e8 SHA512 e1035ed22541c7d253c201da5d2f8c5ceb154a6bf4be1b41981a02d6bbe72038647bf011432e2446307e615c27aa8079d4ef2c4447c2eba3764788e26e8f790b
 EBUILD igraph-0.7.1-r2.ebuild 1021 BLAKE2B f57456480c2b191750bda562f88503df46b4c6adaaa0d70bee3dd570d323eb7d26c355328bf40d896238f90c9b485ac35aad3b059141425f57463a7308f7b911 SHA512 6f852704fa6bcd52ae289f78115d4f21df0c1ff720cd7f5673882f17d34d5d174f8657b461a1543f9a8984b6d100cd91584279e3e3b33fde77b05bd527b65688
-MISC metadata.xml 603 BLAKE2B 996b695aa3f67e6bfbbed5a505c6aa08dd72c68911d3b881cf8d99c20439eabbf4d87fe714e0fb7363ee9870f389005b19943ff1ecf865dfb0f5a8936021850b SHA512 31eb84c71fc2afb1fb804f2fe94eafa4c0e0a37eb933b6c89c530e32bdcfa684512e4aff9c36a58d363df0ce6321eaa298a5d48778f93e8c8ad8fe7e31b5b152
+EBUILD igraph-0.8.2.ebuild 1169 BLAKE2B e15a502fa48ac7f7174103cb76db131333f3635ca55ef838abf1107835d7c8adb5a91244f2a5b34cd129290252416a385259182b3b5167dcab76336acda5a91d SHA512 efa374895127874150b12119c1a81aed2d03be6e5fc9648cb0be1553f7770ab48d34c73aecc2e4fa1e21a892d1501d6e371023b07aca8b520e483d19df527524
+MISC metadata.xml 807 BLAKE2B 9388edde0d01baaedc25d6cdf128e2f4b1df9c9894bb371fe088573bae73da4d572b89aad9dff6e77d080c1e084e31c2d2e7f0cf7c994b2b91e5d00b6ea86850 SHA512 a71270dd5c1a1c99792a623563f5efc70bdc16575f2e83296b6a04f4d2b960a73ffa4c8a696844f38d01b51af4ba0c054d59cb132c6da660dff10cd12e02777a
diff --git a/dev-libs/igraph/files/igraph-0.8.2-unbundle.patch b/dev-libs/igraph/files/igraph-0.8.2-unbundle.patch
new file mode 100644
index 000000000000..859c6387b7f5
--- /dev/null
+++ b/dev-libs/igraph/files/igraph-0.8.2-unbundle.patch
@@ -0,0 +1,150 @@
+diff --git a/configure.ac b/configure.ac
+index b422caf..dae8647 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -333,6 +333,8 @@ else
+   internal_glpk=no
+ fi
+ 
++PKG_CHECK_MODULES([CS],[cxsparse])
++
+ # Link time optimization feature in newer gcc/g++
+ # based on http://svn.r-project.org/R/trunk/configure.ac
+ AC_ARG_ENABLE([lto],
+diff --git a/examples/simple/igraph_sparsemat2.c b/examples/simple/igraph_sparsemat2.c
+index 24877c2..0f4b45c 100644
+--- a/examples/simple/igraph_sparsemat2.c
++++ b/examples/simple/igraph_sparsemat2.c
+@@ -21,7 +21,7 @@
+ 
+ */
+ 
+-#include <cs/cs.h>
++#include <cs.h>
+ #include <igraph.h>
+ #include "igraph_blas_internal.h"
+ #include "igraph_arpack_internal.h"
+diff --git a/examples/simple/igraph_sparsemat3.c b/examples/simple/igraph_sparsemat3.c
+index 09329f0..31d4f1f 100644
+--- a/examples/simple/igraph_sparsemat3.c
++++ b/examples/simple/igraph_sparsemat3.c
+@@ -21,7 +21,7 @@
+ 
+ */
+ 
+-#include <cs/cs.h>
++#include <cs.h>
+ #include <igraph.h>
+ 
+ int permute(const igraph_matrix_t *M,
+diff --git a/examples/simple/igraph_sparsemat4.c b/examples/simple/igraph_sparsemat4.c
+index 3a33979..c0ea489 100644
+--- a/examples/simple/igraph_sparsemat4.c
++++ b/examples/simple/igraph_sparsemat4.c
+@@ -21,7 +21,7 @@
+ 
+ */
+ 
+-#include <cs/cs.h>
++#include <cs.h>
+ #include <igraph.h>
+ 
+ igraph_bool_t check_solution(const igraph_sparsemat_t *A,
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f9d02d2..8ab3385 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -9,9 +9,6 @@ AM_YFLAGS = -d
+ 
+ lib_LTLIBRARIES         = libigraph.la
+ 
+-include lapack/blas.inc
+-include lapack/lapack.inc
+-include lapack/arpack.inc
+ include plfit/plfit.inc
+ 
+ F2C =	f2c/abort_.c	  f2c/dolio.c	    f2c/r_sin.c\
+@@ -99,8 +96,6 @@ if INTERNAL_ARPACK
+   ARPACK_LIB = libarpack.la
+ endif
+ 
+-include ../optional/glpk/glpk.inc
+-
+ if INTERNAL_GLPK
+   libglpk_la_SOURCES = 	$(GLPK)
+   libglpk_la_CFLAGS = -I$(top_srcdir)/optional/glpk
+@@ -365,7 +360,7 @@ SOURCES = 		     basic_query.c games.c cocitation.c iterators.c \
+ 			     drl_layout_3d.cpp drl_graph_3d.cpp \
+ 			     DensityGrid_3d.cpp \
+ 			     foreign-dl-parser.y foreign-dl-lexer.l \
+-			     $(CS) sparsemat.c mixing.c bigint.c bignum.c \
++			     sparsemat.c mixing.c bigint.c bignum.c \
+ 			     version.c optimal_modularity.c \
+ 			     igraph_fixed_vectorlist.c separators.c \
+ 			     igraph_marked_queue.c igraph_estack.c st-cuts.c \
+@@ -408,7 +403,7 @@ libigraph_la_CXXFLAGS	   = -I$(top_srcdir)/include -I$(top_builddir)/include $(W
+ libigraph_la_LDFLAGS       = -no-undefined
+ libigraph_la_LIBADD        = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIB) \
+ 				 $(LAPACK_LIB) $(ARPACK_LIB) $(GLPK_LIB) $(PRPACK_LIB) \
+-				 $(PLFIT_LIB)
++				 $(PLFIT_LIB) $(CS_LIBS)
+ 
+ if INTERNAL_GLPK
+   libigraph_la_CFLAGS   += -I$(top_srcdir)/optional/glpk
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 56703d4..cc30d48 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -2411,7 +2411,7 @@ SOURCES = basic_query.c games.c cocitation.c iterators.c \
+ 	gengraph_powerlaw.cpp gengraph_random.cpp decomposition.c \
+ 	bipartite.c drl_layout_3d.cpp drl_graph_3d.cpp \
+ 	DensityGrid_3d.cpp foreign-dl-parser.y foreign-dl-lexer.l \
+-	$(CS) sparsemat.c mixing.c bigint.c bignum.c version.c \
++	sparsemat.c mixing.c bigint.c bignum.c version.c \
+ 	optimal_modularity.c igraph_fixed_vectorlist.c separators.c \
+ 	igraph_marked_queue.c igraph_estack.c st-cuts.c \
+ 	cohesive_blocks.c statusbar.c lapack.c complex.c eigen.c \
+diff --git a/src/sparsemat.c b/src/sparsemat.c
+index 0ed4678..4fb724d 100644
+--- a/src/sparsemat.c
++++ b/src/sparsemat.c
+@@ -23,7 +23,7 @@
+ 
+ #include "config.h"
+ 
+-#include "cs/cs.h"
++#include <cs.h>
+ 
+ #include "igraph_sparsemat.h"
+ #include "igraph_error.h"
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index d350f11..31a1f5a 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -13,7 +13,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
+ 	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+ 	} >$(srcdir)/package.m4
+ 
+-EXTRA_DIST += package.m4
++#EXTRA_DIST += package.m4
+ 
+ TESTSUITE_AT = \
+ 	testsuite.at \
+diff --git a/tests/mt.at b/tests/mt.at
+index 050974a..b154ce1 100644
+--- a/tests/mt.at
++++ b/tests/mt.at
+@@ -23,11 +23,11 @@ AT_BANNER([[Thread-safety tests]])
+ 
+ AT_SETUP([Simple error handling test :])
+ AT_KEYWORDS([thread-safe])
+-AT_COMPILE_CHECK([simple/tls1.c], [], [], [], [-lpthread])
++AT_COMPILE_CHECK([simple/tls1.c], [], [], [], [-lpthread $(${PKG_CONFIG} --libs arpack)])
+ AT_CLEANUP
+ 
+ AT_SETUP([Thread-safe ARPACK:])
+ AT_KEYWORDS([thread-safe ARPACK])
+ AT_COMPILE_CHECK([simple/tls2.c], [simple/tls2.out], [], [internal], 
+-                 [-lpthread])
++                 [-lpthread $(${PKG_CONFIG} --libs arpack)])
+ AT_CLEANUP
diff --git a/dev-libs/igraph/igraph-0.8.2.ebuild b/dev-libs/igraph/igraph-0.8.2.ebuild
new file mode 100644
index 000000000000..fbacf2931bef
--- /dev/null
+++ b/dev-libs/igraph/igraph-0.8.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Creating and manipulating undirected and directed graphs"
+HOMEPAGE="http://www.igraph.org/"
+SRC_URI="https://github.com/igraph/igraph/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/gmp:0
+	dev-libs/libxml2
+	sci-libs/arpack
+	sci-libs/cxsparse
+	sci-mathematics/glpk
+	virtual/blas
+	virtual/lapack"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
+
+src_prepare() {
+	default
+	rm -r src/lapack optional/glpk src/cs || die
+	eautoreconf
+}
+
+src_configure() {
+	# even with --with-external-f2c
+	# we don't need f2c as none of
+	#    arpack lapack blas
+	# are internal
+	tc-export PKG_CONFIG
+	econf \
+		$(use_enable debug) \
+		--enable-gmp \
+		--disable-static \
+		--disable-tls \
+		--with-external-arpack \
+		--with-external-blas \
+		--with-external-lapack \
+		--with-external-f2c \
+		--with-external-glpk
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/igraph/metadata.xml b/dev-libs/igraph/metadata.xml
index 6ba23eeb564f..91a6671aeaf2 100644
--- a/dev-libs/igraph/metadata.xml
+++ b/dev-libs/igraph/metadata.xml
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
 	<longdescription lang="en">
-igraph is a free software package for creating and manipulating undirected and 
-directed graphs. It includes implementations for classic graph theory problems 
-like minimum spanning trees and network flow, and also implements algorithms for
-some recent network analysis methods, like community structure search.
-</longdescription>
+		igraph is a free software package for creating and manipulating undirected and
+		directed graphs. It includes implementations for classic graph theory problems
+		like minimum spanning trees and network flow, and also implements algorithms for
+		some recent network analysis methods, like community structure search.
+	</longdescription>
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci-biology@gentoo.org</email>
+		<name>Gentoo Biology Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">igraph</remote-id>
 	</upstream>
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
new file mode 100644
index 000000000000..e483b1ed59e1
--- /dev/null
+++ b/dev-libs/inih/Manifest
@@ -0,0 +1,3 @@
+DIST inih-51.tar.gz 16258 BLAKE2B 91a5aee6e0ecadf949fbf0b58bd2596bcb985c76fc9000a671d65cb5325c51dbb8bd945ccd7721b72dafafd11c70a9c84ad910768d0fc479e5491db8b7aacbd8 SHA512 eb2f58979d93e51a09326e6c187828643887ac1a239d4b12205567c7d87a671c9c49ca99db376c031d366bc680e579c30dcea9f3eb130ec802597411b2cb3cf4
+EBUILD inih-51.ebuild 733 BLAKE2B 35c324b1927627143e78e9f18e6121e5092541ac96ff10b17fe7717f546bce6ecbd8e0f0aea086a736543f44b2fcdcc3976b3f1364f8146c39fc279b1c0bc5da SHA512 a7f9767609347bd9618156e41815b13f88551e7531f4c6ba5df58caa362d2395aea12466dc19225e2e320dc893ef17d0b48e0dc7976d36a353a46bdffb616902
+MISC metadata.xml 504 BLAKE2B 9dbb7e8ce4c8524166a60e799e67d972a60297d48aeaaa572797303f23b599168a7d9fa061550287694c0243562ab4139aa48674704e65a5ac50339bfffbb0ba SHA512 bb42c3ff3e4b1ba3b3bc70b2f1d719c3ade733d2f4c8e90d98e20d2fd716a633b22e3a4212a29c56291e7fe6c475f0e540f37454302bc279342bbec95fbd320f
diff --git a/dev-libs/inih/inih-51.ebuild b/dev-libs/inih/inih-51.ebuild
new file mode 100644
index 000000000000..3cbd85dd6604
--- /dev/null
+++ b/dev-libs/inih/inih-51.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit meson multilib-minimal ninja-utils
+
+DESCRIPTION="inih (INI not invented here) simple .INI file parser"
+HOMEPAGE="https://github.com/benhoyt/inih"
+
+SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+
+DOCS=(
+	LICENSE.txt
+	README.md
+)
+
+S="${WORKDIR}/inih-r${PV}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=shared
+		-Ddistro_install=true
+		-Dwith_INIReader=true
+	)
+
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
diff --git a/dev-libs/inih/metadata.xml b/dev-libs/inih/metadata.xml
new file mode 100644
index 000000000000..9aa6590570ff
--- /dev/null
+++ b/dev-libs/inih/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hurikhan77+bgo@gmail.com</email>
+		<name>Kai Krakow</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/benhoyt/inih/issues</bugs-to>
+		<remote-id type="github">benhoyt/inih</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 24a80afc8d6d..d8bae99b4aa0 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,5 +1,5 @@
 DIST jansson-2.12.tar.gz 489154 BLAKE2B cf6bc6d03daba921ec5e033bf57ff0055741cc935adb14d5d4a5f04056fa93c292bf88367db071ef7bb32fbc5d2d6f5f2ce658815a17939bd38ed5c0676ad091 SHA512 e40bdafdfa1fa663f71e00c06d7bfc98cff4ed3581a147894e5272e50fa5f9b9a7af6aaca41ff423a2ddd2554a192b36efcc32f6a3c98c727e9f819b955357cb
 DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192
 EBUILD jansson-2.12.ebuild 817 BLAKE2B e517e55debf4bd3971c2d93b906a1081baa510222deff3e2c8e09388e28af1891c3d0d43b6800abdbc33b6380bdf5627a8409f6da21d2356c146fb6c2155427f SHA512 500d974d2708280e1ae4a157e39034bab3b73ba56e4aad3ed7ed6e9942165b31500fb92fafcf0b94328fa863ef2c01308069fa1f6f13cb32dcd6287913fc3b2e
-EBUILD jansson-2.13.1.ebuild 898 BLAKE2B 6fcf7ab07434b15e1c319084e58a2008e01edbf2e7ae9583c9591a5620404b31359e2e4c4a55032e0ed854b3688babe829d4912245a183aa3a28118580b4f979 SHA512 963d872a5a70c41a06c07bb5ba6542dfdd41ba806638a82ad546ae3dc5d2f905f5edbc3c6a468ba4b9b2dde65f97aeb37951e7ea99461fb8b54b62746dba4678
+EBUILD jansson-2.13.1.ebuild 896 BLAKE2B 3692dfe2b23f2d67914061e0a5a59df63cb6799dadfd6235c02fce77b2f831c98aff1d6b6ccfa1899d2c3794d0e1de5194c87352242587030cb759febe937e28 SHA512 daea0277d404311fb46c0141752ebccb511bc3e052efa3047352cdf0fca26e79e01fe39313e5c37610b013b42f8ec65a49db2a5e6067b4f09d4f782ee5d84520
 MISC metadata.xml 364 BLAKE2B 98019538f02d8e12711b7e2f72036ad32a2f2b8c2b821a2ba4a0fe113653eb565ac7d447a5d2331d22c13f3bb5bff7484e89438ba82abd9b1d226ea1e8288ecf SHA512 414d6b7630f823690c293214be138c5b6f9748e2d80dda57022404d710b0a9ed78c5c9da4a57e2058368caf7caa8a698eacc9ded1cec5577d0799b21b338de59
diff --git a/dev-libs/jansson/jansson-2.13.1.ebuild b/dev-libs/jansson/jansson-2.13.1.ebuild
index d2941ff336ab..830692135c98 100644
--- a/dev-libs/jansson/jansson-2.13.1.ebuild
+++ b/dev-libs/jansson/jansson-2.13.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.digip.org/jansson/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="doc static-libs"
 
 # dev-libs/jansson-2.13.1[doc]: fails to build with >=sphinx-3.0, #731668
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index b27e3ac512bd..0306e0067ae7 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,3 +1,5 @@
 DIST jsoncpp-1.9.3.tar.gz 212922 BLAKE2B 6f89762e899ffe127705a30c1fe86f458d62fa05b8dbde6c465c73b6855d3945f3d739ff0c26e1a6326a211c946277908684ace9363df72ba0f460f66b3e3fd8 SHA512 f1c035d54ed952d8d4e41acab5c3ecf6aa445f348f98aeac2e7c89555ec2f6421d727b3bc4c2f54176afce137c545b20d886562901953ec091f91890e91e8559
+DIST jsoncpp-1.9.4.tar.gz 214057 BLAKE2B 9a8c52e5d0b78f1593c93bc40f48d3789b031ba0da519c99cce17f1f6e104b24e0ffe88138c25da6dfa250586aeb9e98d00fbf74d9fb9309b29a6d4f17762263 SHA512 adfd4afbdf6b79bd37edcf0e248f07864994f1c4bcb7431f3b44102490ce467f72381908066655fa486dec12f467af0a11f42f859bbf719895974c7339db7d22
 EBUILD jsoncpp-1.9.3.ebuild 1026 BLAKE2B ba65cafacac63ce802717de8e05e95108371fb7489ff4bd4a29c4fe098ab8fb50fb559b7b284a6c402f42686ba3db2758d62983f4c86d8f8b67c2ced72b15aa6 SHA512 9d6d9e5fd9e45605a5fe24c5f738c7e3bf7b5b2bdcbb67ad4ff4c2abddef1abfd54c2efe4fd2af0b9d431bd51e6379fa778633b64acbc926101f225d4ae4eee4
+EBUILD jsoncpp-1.9.4.ebuild 1035 BLAKE2B b287b5f7d5ed0d156ad9db401fb6252915783f86a273516b8f2c31938d1a19e29a6cd6ecd774ef50962878a745dbd71f1a2d26ccecd15b0fd3c1db652abf2cbb SHA512 b97101d3c16ed538fa01799c6f1d900b03dc10d5bdddc585b2f004571f61ca0756edcf531c5131bec32ebbf86664855fa2d97443436301c07b968de9a82162d5
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
new file mode 100644
index 000000000000..1d7f0a221b2b
--- /dev/null
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="C++ JSON reader and writer"
+HOMEPAGE="https://github.com/open-source-parsers/jsoncpp"
+SRC_URI="
+	https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="|| ( public-domain MIT )"
+SLOT="0/24"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_configure() {
+	local emesonargs=(
+		# Follow Debian, Ubuntu, Arch convention for headers location
+		# bug #452234
+		--includedir include/jsoncpp
+		-Dtests=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+
+	if use doc; then
+		echo "${PV}" > version || die
+		"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
+		HTML_DOCS=( dist/doxygen/jsoncpp*/. )
+	fi
+}
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index ee91b0827073..29e30e30bca6 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -7,5 +7,5 @@ EBUILD libcbor-0.5.0.ebuild 1308 BLAKE2B 1024113bdbf7409c9e7e6644ca543edc3bb5835
 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
+EBUILD libcbor-0.8.0.ebuild 1366 BLAKE2B e36e0ef84fd7e39f84d9c42cedcf3fa03e68e956ee03264b1f857678a31fe9e20c4c5f769dac4d1b213fb37093a767ffe740acc2f381d17e1a6fdaa22b65e1e6 SHA512 25baff256e22ec98a614fa40a116367e8593febe8036f23363fabf7ca8793c4644413549a8b4f55b4527639ab23c584e55e6dadef90442bb711218dcb17ea811
 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
index 07dbf2319eae..6ddbb366f865 100644
--- a/dev-libs/libcbor/libcbor-0.8.0.ebuild
+++ b/dev-libs/libcbor/libcbor-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="+custom-alloc doc test"
 
 BDEPEND="
diff --git a/dev-libs/libdnet/Manifest b/dev-libs/libdnet/Manifest
index 4884b0a3d975..da4aeb382362 100644
--- a/dev-libs/libdnet/Manifest
+++ b/dev-libs/libdnet/Manifest
@@ -1,9 +1,12 @@
+AUX libdnet-1.14-ndisc.patch 18209 BLAKE2B a295d81c247f884293efdf8d4740e2a4fd80c9febd8a5eed02db725151f886ad32e3a52ee7a62cabd31c0a218b23a9acf7d9c52b48c0d9aa597524886e38cfc4 SHA512 6da36c0f421b58819410df9507a973199fcafebb6447765c5de97fde6bdb16607f32dcb8b86da4216656c4d4ad4d21e153f15906a400249a7d44766d0539ecfb
+AUX libdnet-1.14-strlcpy.patch 233 BLAKE2B fb35015b16a206e55cbc1dc39c032dd43f74cc17e173252227707bef616df827c0ce0d7a7e4349ebc442a9198ee8953c45739b03b306ddc2af2753e31a15ebbd SHA512 8cabaf75382537755d79b588b629978d47a4b8e7c4bda22d7098bba09b5b1fec8dabeacb1727a821df2d29040a3e420803ebfdc66df5824630fae8da1059d164
 DIST libdnet-1.12.ipv6-1.patch.gz 5124 BLAKE2B 674866a441a5907df97942772b1e4b95aee004ddb110204df0580cec6b6bb3ba4074831d83e675e1914f1a29281b02227e95016db6ce6a0e8b99417d1aa6aaab SHA512 fa2380e41548ecdd978722930ecf90dffabd15cf06cbae0e113285072fe98a066f1e686b6d79e2d8b9f8adcf29783f313d61933b9e1e74e71da8dc7d741f815a
 DIST libdnet-1.12.tar.gz 959945 BLAKE2B a19f8c83425861d02f832330cf0eb5bc317eec157737e0eacd48a7827d423c626b24ce833f66429c9f2a0018502cae5426d5cfc1019aed307d63e4fa6b3845c8 SHA512 a2410a98b76d4bccecf7bcb82ff0b6e9fb809b389f7fea938cc42d94e18622cc5f353d2de737121a1990d9e16e9db8cc2f82677c94f78cd03c9227e815eab9e0
 DIST libdnet-1.12.tgz 970125 BLAKE2B 74be00b6fe1c7848010a7044628a6ad8f4b2f2c4f9676066c15e02c7a8b613e26a5e7743df524869fee2eb7d93438bf346f772b8df199b8ec337279dd50d5d77 SHA512 b763d2caa77b8d16b531142a5bce3b862ed20198406a00e1fe7f3b45ce308b97d638b0c7f03bd8593fdd206cc1645952839bc340b77537298a3df88599835bf3
 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 1389 BLAKE2B 115af50d6c17df1bda7923c5468772f0f50ac9f5469ee9323382efd637d1da4d0507b5c8ef6d3621caf7fae00c8c5cbaadf0f35d48062aa3d0c8b88542a6ef12 SHA512 730d4fc6bb732a7f2bb8e9e6039f64ce3f3e900d7dd34580fdd8c752338cad0296f950b771406e063e9ffe4a002e152a5e92cdace2547e97527a0bb86da4e128
-EBUILD libdnet-9999.ebuild 1304 BLAKE2B 42da11f210ae69feadac13950baa8194a817784c0c0e8bb31befc07f20bd842d81348b623137a4b8ca6b857cd45246e23d75db6a807e5710f70574cd4c61484a SHA512 9e432bb2bcee9baef6fbe8428da44455fb02e8e4b14fe3575194f2e1c1f9e5a38f8c57280350c1fc570f03753c5fe121a2e37580812d6e92af1a2e98cbf3513f
+EBUILD libdnet-1.14-r1.ebuild 1483 BLAKE2B 8958077ab8b4c04f6b56cbbb19af258d838e0e973728187b37e827b0e96e36a2a131aac66be1524ac4774d8e384067d1a643f9f8874dbccc5f21c201e9927409 SHA512 d44804937d5fdde9198045f6bd2af607819ab9e078270b90955a589c9d4becfa92e497a911e8cccd6f71bfa038a7aa42bdc2eb65d8fe29ade6e84f1d599fe74e
+EBUILD libdnet-1.14.ebuild 1438 BLAKE2B 26fea0961643486ddba314b80cc9844c262edcfecdfd17d5b31c7b6781b2322d032572a28282811064026874ee6a41cbe14d14397b11c6737ba099a48cc7b438 SHA512 cfebda19c0867bc45b3050e58f7ff113dfc88a6e4a360b82f03497f355b189b559bd62b2fce98c3d116d9b097d24585dd2fdfe03f85991f7866689d57690cab1
+EBUILD libdnet-9999.ebuild 1376 BLAKE2B 9b8e58f34258ff145a513a3758b458e69cf6dce876b9488648c81c75a5ea074044bdec2494b86f40ca1ee8f4738e4a294530e45d61f56b9b3b1037c118287f2f SHA512 8b59231e80d511ff5bb59bdb750daf2713379358889805625a81e06b3481b031586fa2cb4aa7d959a6e75960edb7a4628c9fc833f1d4814b643cc91d62a5637d
 MISC metadata.xml 412 BLAKE2B 31f4ab6e16ecdf55347cc83250bc3ce8afc9305f27b1925fe231cc66945725fd33d8239265e6219caf822ef23501014a85219d2a222f5085881b7ca06dffdafc SHA512 ba32dc96871e434caec3a21dea3c5f005c4aacf122312dcd44a228ae92c02c90c02339761ea091fbcad618b02cd5e4d672914c5b6263ef386d49242e19e1febe
diff --git a/dev-libs/libdnet/files/libdnet-1.14-ndisc.patch b/dev-libs/libdnet/files/libdnet-1.14-ndisc.patch
new file mode 100644
index 000000000000..439ffb7cb927
--- /dev/null
+++ b/dev-libs/libdnet/files/libdnet-1.14-ndisc.patch
@@ -0,0 +1,796 @@
+From 1c324828f4c6c64c9340f169bc059152dba1f998 Mon Sep 17 00:00:00 2001
+From: Stas Grabois <finpushack@gmail.com>
+Date: Sat, 5 Sep 2020 13:15:32 +0300
+Subject: [PATCH] IPv6 support
+
+---
+ configure                |  20 ++++
+ configure.ac             |   7 ++
+ include/dnet.h           |   1 +
+ include/dnet/Makefile.am |   2 +-
+ include/dnet/Makefile.in |   2 +-
+ include/dnet/ip6.h       |   3 +
+ include/dnet/ndisc.h     |  35 +++++++
+ include/dnet/route.h     |   3 +
+ src/Makefile.in          |   2 +-
+ src/intf.c               | 101 +++++++++++++-------
+ src/ip6.c                |  56 +++++++++++
+ src/ndisc-linux.c        | 197 +++++++++++++++++++++++++++++++++++++++
+ src/ndisc-none.c         |  55 +++++++++++
+ src/route-linux.c        |  95 ++++++++++++++++++-
+ 14 files changed, 541 insertions(+), 38 deletions(-)
+ create mode 100644 include/dnet/ndisc.h
+ create mode 100644 src/ndisc-linux.c
+ create mode 100644 src/ndisc-none.c
+
+--- a/configure
++++ b/configure
+@@ -22025,6 +22025,26 @@
+ 
+ fi
+ 
++if test "$ac_cv_dnet_linux_procfs" = yes ; then
++	case $LIBOBJS in
++    "ndisc-linux.$ac_objext"   | \
++  *" ndisc-linux.$ac_objext"   | \
++    "ndisc-linux.$ac_objext "* | \
++  *" ndisc-linux.$ac_objext "* ) ;;
++  *) LIBOBJS="$LIBOBJS ndisc-linux.$ac_objext" ;;
++esac
++
++else
++	case $LIBOBJS in
++    "ndisc-none.$ac_objext"   | \
++  *" ndisc-none.$ac_objext"   | \
++    "ndisc-none.$ac_objext "* | \
++  *" ndisc-none.$ac_objext "* ) ;;
++  *) LIBOBJS="$LIBOBJS ndisc-none.$ac_objext" ;;
++esac
++
++fi
++
+ if test "$ac_cv_header_linux_if_tun_h" = yes ; then
+ 	case $LIBOBJS in
+     "tun-linux.$ac_objext"   | \
+--- a/configure.ac
++++ b/configure.ac
+@@ -303,6 +303,13 @@
+ 	AC_LIBOBJ([route-none])
+ fi
+ 
++dnl Check for ndisc interface.
++if test "$ac_cv_dnet_linux_procfs" = yes ; then
++    AC_LIBOBJ([ndisc-linux])
++else
++    AC_LIBOBJ([ndisc-none])
++fi
++
+ dnl Check for tun interface.
+ if test "$ac_cv_header_linux_if_tun_h" = yes ; then
+ 	AC_LIBOBJ([tun-linux])
+--- a/include/dnet.h
++++ b/include/dnet.h
+@@ -16,6 +16,7 @@
+ #include <dnet/ip6.h>
+ #include <dnet/addr.h>
+ #include <dnet/arp.h>
++#include <dnet/ndisc.h>
+ #include <dnet/icmp.h>
+ #include <dnet/tcp.h>
+ #include <dnet/udp.h>
+--- a/include/dnet/Makefile.am
++++ b/include/dnet/Makefile.am
+@@ -5,4 +5,4 @@
+ dnetincludedir = $(includedir)/dnet
+ 
+ dnetinclude_HEADERS = addr.h arp.h blob.h eth.h fw.h icmp.h intf.h ip.h \
+-	ip6.h os.h rand.h route.h tcp.h tun.h udp.h sctp.h
++	ip6.h os.h rand.h route.h tcp.h tun.h udp.h sctp.h ndisc.h
+--- a/include/dnet/Makefile.in
++++ b/include/dnet/Makefile.in
+@@ -106,7 +106,7 @@
+ dnetincludedir = $(includedir)/dnet
+ 
+ dnetinclude_HEADERS = addr.h arp.h blob.h eth.h fw.h icmp.h intf.h ip.h \
+-	ip6.h os.h rand.h route.h tcp.h tun.h udp.h sctp.h
++	ip6.h os.h rand.h route.h tcp.h tun.h udp.h sctp.h ndisc.h
+ 
+ subdir = include/dnet
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+--- a/include/dnet/ip6.h
++++ b/include/dnet/ip6.h
+@@ -179,6 +179,9 @@
+ char	*ip6_ntoa(const ip6_addr_t *ip6);
+ #define	 ip6_aton ip6_pton
+ 
++ssize_t	 ip6_add_option(void *buf, size_t len,
++           int proto, const void *optbuf, size_t optlen);
++
+ void	 ip6_checksum(void *buf, size_t len);
+ __END_DECLS
+ 
+new file mode 100644
+--- a//dev/null
++++ b/include/dnet/ndisc.h
+@@ -0,0 +1,35 @@
++/*
++ * ndisc.c
++ *
++ * Kernel arp/ndisc table operations.
++ *
++ * Copyright (c) 2000 Dug Song <dugsong@monkey.org>
++ *
++ */
++
++#ifndef DNET_NDISC_H
++#define DNET_NDISC_H
++
++/*
++ * NDISC cache entry
++ */
++struct ndisc_entry {
++    int    intf_index;
++	struct addr	ndisc_pa;			/* protocol address */
++	struct addr	ndisc_ha;			/* hardware address */
++};
++
++typedef struct ndisc_handle ndisc_t;
++
++typedef int (*ndisc_handler)(const struct ndisc_entry *entry, void *arg);
++
++__BEGIN_DECLS
++ndisc_t	*ndisc_open(void);
++int	 ndisc_add(ndisc_t *n, const struct ndisc_entry *entry);
++int	 ndisc_delete(ndisc_t *n, const struct ndisc_entry *entry);
++int	 ndisc_get(ndisc_t *n, struct ndisc_entry *entry);
++int	 ndisc_loop(ndisc_t *n, ndisc_handler callback, void *arg);
++ndisc_t	*ndisc_close(ndisc_t *r);
++__END_DECLS
++
++#endif /* DNET_NDISC_H */
+--- a/include/dnet/route.h
++++ b/include/dnet/route.h
+@@ -26,7 +26,10 @@
+ __BEGIN_DECLS
+ route_t	*route_open(void);
+ int	 route_add(route_t *r, const struct route_entry *entry);
++int	 route_add_dev(route_t *r, const struct route_entry *entry, const char* dev);
++int	 route6_add(route_t *r, const struct route_entry *entry, int intf_index);
+ int	 route_delete(route_t *r, const struct route_entry *entry);
++int	 route6_delete(route_t *r, const struct route_entry *entry, int intf_index);
+ int	 route_get(route_t *r, struct route_entry *entry);
+ int	 route_loop(route_t *r, route_handler callback, void *arg);
+ route_t	*route_close(route_t *r);
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -144,7 +144,7 @@
+ 	intf-win32.c intf.c ip-cooked.c ip-win32.c ip.c memcmp.c \
+ 	route-bsd.c route-hpux.c route-linux.c route-none.c \
+ 	route-win32.c strlcat.c strlcpy.c strsep.c tun-bsd.c \
+-	tun-linux.c tun-none.c tun-solaris.c
++	tun-linux.c tun-none.c tun-solaris.c ndisc-linux.c ndisc-none.c
+ SOURCES = $(libdnet_la_SOURCES)
+ 
+ all: all-am
+--- a/src/intf.c
++++ b/src/intf.c
+@@ -20,6 +20,9 @@
+ # define IP_MULTICAST
+ #endif
+ #include <net/if.h>
++#ifdef HAVE_NET_IF_DL_H
++# include <net/if_dl.h>
++#endif
+ #ifdef HAVE_NET_IF_VAR_H
+ # include <net/if_var.h>
+ #endif
+@@ -79,6 +82,21 @@
+ 	u_char		ifcbuf[4192];
+ };
+ 
++/* TODO: move to .h */
++union sockunion {
++#ifdef HAVE_NET_IF_DL_H
++       struct sockaddr_dl      sdl;
++#endif
++       struct sockaddr_in      sin;
++#ifdef HAVE_SOCKADDR_IN6
++       struct sockaddr_in6     sin6;
++#endif
++       struct sockaddr         sa;
++#ifdef AF_RAW
++       struct sockaddr_raw     sr;
++#endif
++};
++
+ static int
+ intf_flags_to_iff(u_short flags, int iff)
+ {
+@@ -129,14 +147,10 @@
+ 
+ 		setsockopt(intf->fd, SOL_SOCKET, SO_BROADCAST,
+ 						(const char *) &one, sizeof(one));
+-#ifdef SIOCGIFNETMASK_IN6
+ 		if ((intf->fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
+-#  ifdef EPROTONOSUPPORT
+ 			if (errno != EPROTONOSUPPORT)
+-#  endif
+ 				return (intf_close(intf));
+ 		}
+-#endif
+ 	}
+ 	return (intf);
+ }
+@@ -586,34 +600,50 @@
+ 	return (_intf_get_aliases(intf, entry));
+ }
+ 
++static int
++get_max_bits(const struct addr *a)
++{
++	if (a->addr_type == ADDR_TYPE_IP) {
++		return IP_ADDR_BITS;
++	} else if (a->addr_type == ADDR_TYPE_IP6) {
++		return IP6_ADDR_BITS;
++	} else {
++		return 0;
++	}
++}
++
+ static int
+ _match_intf_src(const struct intf_entry *entry, void *arg)
+ {
+-	int matched = 0;
+-	int cnt;
+ 	struct intf_entry *save = (struct intf_entry *)arg;
+-	
+-	if (entry->intf_addr.addr_type == ADDR_TYPE_IP &&
+-		entry->intf_addr.addr_ip == save->intf_addr.addr_ip) {
+-		matched = 1; 
+-	} else {
+-		for (cnt = 0; !matched && cnt < (int) entry->intf_alias_num; cnt++) {
+-			if (entry->intf_alias_addrs[cnt].addr_type != ADDR_TYPE_IP)
+-				continue;
+-			if (entry->intf_alias_addrs[cnt].addr_ip == save->intf_addr.addr_ip)
+-				matched = 1;
+-		}
++	int len = save->intf_len < entry->intf_len ? save->intf_len : entry->intf_len;
++	int i;
++
++	struct addr a, saved_addr;
++
++	saved_addr = save->intf_addr;
++	saved_addr.addr_bits = get_max_bits(&saved_addr);
++
++	a = entry->intf_addr;
++	a.addr_bits = get_max_bits(&a);
++
++	if (addr_cmp(&a, &saved_addr) == 0) {
++		memcpy(save, entry, len);
++		return 1;
+ 	}
+ 
+-	if (matched) {
+-		/* XXX - truncated result if entry is too small. */
+-		if (save->intf_len < entry->intf_len)
+-			memcpy(save, entry, save->intf_len);
+-		else
+-			memcpy(save, entry, entry->intf_len);
+-		return (1);
++	for (i = 0; i < (int)entry->intf_alias_num; i++) {
++		a = entry->intf_alias_addrs[i];
++		a.addr_bits = get_max_bits(&a);
++
++		if (addr_cmp(&a, &saved_addr) == 0) {
++			memcpy(save, entry, len);
++			save->intf_addr = entry->intf_alias_addrs[i];
++			return 1;
++		}
+ 	}
+-	return (0);
++
++	return 0;
+ }
+ 
+ int
+@@ -631,24 +661,27 @@
+ int
+ intf_get_dst(intf_t *intf, struct intf_entry *entry, struct addr *dst)
+ {
+-	struct sockaddr_in sin;
++	union sockunion sun;
+ 	socklen_t n;
+ 
+-	if (dst->addr_type != ADDR_TYPE_IP) {
++	int fd;
++
++	if (dst->addr_type != ADDR_TYPE_IP && dst->addr_type != ADDR_TYPE_IP6) {
+ 		errno = EINVAL;
+ 		return (-1);
+ 	}
+-	addr_ntos(dst, (struct sockaddr *)&sin);
+-	sin.sin_port = htons(666);
+-	
+-	if (connect(intf->fd, (struct sockaddr *)&sin, sizeof(sin)) < 0)
++	addr_ntos(dst, (struct sockaddr *)&sun);
++	sun.sin.sin_port = htons(666);
++
++	fd = dst->addr_type == ADDR_TYPE_IP6 ? intf->fd6 : intf->fd;
++	if (connect(fd, (struct sockaddr *)&sun, sizeof(sun)) < 0)
+ 		return (-1);
+ 	
+-	n = sizeof(sin);
+-	if (getsockname(intf->fd, (struct sockaddr *)&sin, &n) < 0)
++	n = sizeof(sun);
++	if (getsockname(fd, (struct sockaddr *)&sun, &n) < 0)
+ 		return (-1);
+ 	
+-	addr_ston((struct sockaddr *)&sin, &entry->intf_addr);
++	addr_ston((struct sockaddr *)&sun, &entry->intf_addr);
+ 	
+ 	if (intf_loop(intf, _match_intf_src, entry) != 1)
+ 		return (-1);
+--- a/src/ip6.c
++++ b/src/ip6.c
+@@ -9,6 +9,8 @@
+ #include "config.h"
+ 
+ #include "dnet.h"
++#include <string.h>
++#include <errno.h>
+ 
+ #define IP6_IS_EXT(n)	\
+ 	((n) == IP_PROTO_HOPOPTS || (n) == IP_PROTO_DSTOPTS || \
+@@ -70,3 +72,57 @@
+ 		}
+ 	}
+ }
++
++ssize_t
++ip6_add_option(void *buf, size_t len, int proto,
++    const void *optbuf, size_t optlen)
++{
++	struct ip6_hdr *ip6;
++	struct tcp_hdr *tcp = NULL;
++	u_char *p;
++	int hl, datalen, padlen;
++
++	if (proto != IP_PROTO_TCP) {
++		errno = EINVAL;
++		return (-1);
++	}
++
++	ip6 = (struct ip6_hdr *)buf;
++	p = (u_char *)buf + IP6_HDR_LEN;
++
++	tcp = (struct tcp_hdr *)p;
++	hl = tcp->th_off << 2;
++	p = (u_char *)tcp + hl;
++
++	datalen = ntohs(ip6->ip6_plen) + IP6_HDR_LEN - (p - (u_char *)buf);
++
++	/* Compute padding to next word boundary. */
++	if ((padlen = 4 - (optlen % 4)) == 4)
++		padlen = 0;
++
++	/* XXX - IP_HDR_LEN_MAX == TCP_HDR_LEN_MAX */
++	if (hl + optlen + padlen > IP_HDR_LEN_MAX ||
++	    ntohs(ip6->ip6_plen) + IP6_HDR_LEN + optlen + padlen > len) {
++		errno = EINVAL;
++		return (-1);
++	}
++
++	/* Shift any existing data. */
++	if (datalen) {
++		memmove(p + optlen + padlen, p, datalen);
++	}
++	/* XXX - IP_OPT_NOP == TCP_OPT_NOP */
++	if (padlen) {
++		memset(p, IP_OPT_NOP, padlen);
++		p += padlen;
++	}
++	memmove(p, optbuf, optlen);
++	p += optlen;
++	optlen += padlen;
++
++	tcp->th_off = (p - (u_char *)tcp) >> 2;
++
++	ip6->ip6_plen = htons(ntohs(ip6->ip6_plen) + optlen);
++
++	return (optlen);
++}
+new file mode 100644
+--- a//dev/null
++++ b/src/ndisc-linux.c
+@@ -0,0 +1,197 @@
++/*
++ * ndisc-linux.c
++ *
++ * Copyright (c) 2000 Dug Song <dugsong@monkey.org>
++ *
++ */
++
++#include "config.h"
++
++#include <sys/types.h>
++#include <sys/ioctl.h>
++#include <sys/socket.h>
++#include <sys/uio.h>
++
++#include <asm/types.h>
++#include <netinet/in.h>
++#include <linux/netlink.h>
++#include <linux/rtnetlink.h>
++
++#include <net/route.h>
++
++#include <ctype.h>
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++
++#include "dnet.h"
++
++struct ndisc_handle 
++{
++	int nlfd;
++	int seq;
++};
++
++ndisc_t *
++ndisc_open(void)
++{
++	struct sockaddr_nl snl;
++	ndisc_t *n;
++
++	if ((n = calloc(1, sizeof(*n))) != NULL) {
++		n->nlfd = -1;
++
++		if ((n->nlfd = socket(AF_NETLINK, SOCK_RAW,
++			 NETLINK_ROUTE)) < 0)
++			return (ndisc_close(n));
++		
++		memset(&snl, 0, sizeof(snl));
++		snl.nl_family = AF_NETLINK;
++		
++		if (bind(n->nlfd, (struct sockaddr *)&snl, sizeof(snl)) < 0)
++			return (ndisc_close(n));
++	}
++	return (n);
++}
++
++static int
++netlink_addattr(struct nlmsghdr *n, int type, const void *data, int data_len)
++{
++	int len = RTA_LENGTH(data_len);
++	struct rtattr *rta;
++
++	rta = (struct rtattr *)((uint8_t*)n + NLMSG_ALIGN(n->nlmsg_len));
++	rta->rta_type = type;
++	rta->rta_len = len;
++	memcpy(RTA_DATA(rta), data, data_len);
++	n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len);
++	return 0;
++}
++
++int
++ndisc_modify(ndisc_t *n, const struct ndisc_entry *entry, int type, int flags)
++{
++	struct nlmsghdr *nmsg;
++	struct ndmsg *ndm;
++	struct rtattr *rta;
++	struct sockaddr_nl snl;
++	struct iovec iov;
++	struct msghdr msg;
++	u_char buf[512];
++	int i, af, alen;
++
++	switch (entry->ndisc_pa.addr_type) {
++	case ADDR_TYPE_IP:
++		af = AF_INET;
++		alen = IP_ADDR_LEN;
++		break;
++	case ADDR_TYPE_IP6:
++		af = AF_INET6;
++		alen = IP6_ADDR_LEN;
++		break;
++	default:
++		errno = EINVAL;
++		return (-1);
++	}
++	memset(buf, 0, sizeof(buf));
++
++	nmsg = (struct nlmsghdr *)buf;
++	nmsg->nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg));
++	nmsg->nlmsg_flags = NLM_F_REQUEST | flags;
++	nmsg->nlmsg_type = type;
++	nmsg->nlmsg_seq = ++n->seq;
++
++	nmsg->nlmsg_flags |= NLM_F_ACK;
++
++	ndm = (struct ndmsg *)(nmsg + 1);
++	ndm->ndm_family = af;
++	ndm->ndm_state = NUD_PERMANENT; 
++	ndm->ndm_ifindex = entry->intf_index;
++	
++	netlink_addattr(nmsg, NDA_DST, &entry->ndisc_pa.addr_data8[0],
++			alen);
++
++	if (type == RTM_NEWNEIGH) {
++		netlink_addattr(nmsg, NDA_LLADDR, 
++				&entry->ndisc_ha.addr_data8[0], ETH_ADDR_LEN);
++	}
++
++	memset(&snl, 0, sizeof(snl));
++	snl.nl_family = AF_NETLINK;
++
++	iov.iov_base = nmsg;
++	iov.iov_len = nmsg->nlmsg_len;
++	
++	memset(&msg, 0, sizeof(msg));
++	msg.msg_name = &snl;
++	msg.msg_namelen = sizeof(snl);
++	msg.msg_iov = &iov;
++	msg.msg_iovlen = 1;
++	
++	if (sendmsg(n->nlfd, &msg, 0) < 0)
++		return (-1);
++
++	iov.iov_base = buf;
++	iov.iov_len = sizeof(buf);
++	
++	if ((i = recvmsg(n->nlfd, &msg, 0)) <= 0)
++		return (-1);
++
++	if (nmsg->nlmsg_len < (int)sizeof(*nmsg) || nmsg->nlmsg_len > i ||
++	    nmsg->nlmsg_seq != n->seq) {
++		errno = EINVAL;
++		return (-1);
++	}
++	if (nmsg->nlmsg_type == NLMSG_ERROR) {
++		struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(nmsg);
++		errno = -err->error;
++		if (errno == 0) {
++			return 0;
++		}
++
++		return (-1);
++	}
++
++	return (-1);
++}
++
++int
++ndisc_add(ndisc_t *n, const struct ndisc_entry *entry)
++{
++	return ndisc_modify(n, entry, RTM_NEWNEIGH, NLM_F_CREATE | NLM_F_EXCL);
++}
++
++int
++ndisc_delete(ndisc_t *n, const struct ndisc_entry *entry)
++{
++	return ndisc_modify(n, entry, RTM_DELNEIGH, 0);
++}
++
++int
++ndisc_get(ndisc_t *n, struct ndisc_entry *entry)
++{
++	/* TBD */
++	errno = ENOSYS;
++	return (-1);
++}
++
++int
++nsidc_loop(ndisc_t *n, ndisc_handler callback, void *arg)
++{
++	/* TBD */
++	errno = ENOSYS;
++	return (-1);
++}
++
++ndisc_t *
++ndisc_close(ndisc_t *n)
++{
++	if (n != NULL) {
++		if (n->nlfd >= 0)
++			close(n->nlfd);
++		free(n);
++	}
++	return (NULL);
++}
+new file mode 100644
+--- a//dev/null
++++ b/src/ndisc-none.c
+@@ -0,0 +1,55 @@
++/*
++ * ndisc-linux.c
++ *
++ * Copyright (c) 2000 Dug Song <dugsong@monkey.org>
++ *
++ */
++
++#include "config.h"
++
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++#include "dnet.h"
++
++ndisc_t *
++ndisc_open(void)
++{
++	errno = ENOSYS;
++	return (NULL);
++}
++
++int
++ndisc_add(ndisc_t *n, const struct ndisc_entry *entry)
++{
++	errno = ENOSYS;
++	return (-1);
++}
++
++int
++ndisc_delete(ndisc_t *n, const struct ndisc_entry *entry)
++{
++	errno = ENOSYS;
++	return (-1);
++}
++
++int
++ndisc_get(ndisc_t *n, struct ndisc_entry *entry)
++{
++	errno = ENOSYS;
++	return (-1);
++}
++
++int
++nsidc_loop(ndisc_t *n, ndisc_handler callback, void *arg)
++{
++	errno = ENOSYS;
++	return (-1);
++}
++
++ndisc_t *
++ndisc_close(ndisc_t *n)
++{
++	return (NULL);
++}
+--- a/src/route-linux.c
++++ b/src/route-linux.c
+@@ -39,6 +39,7 @@
+ 
+ struct route_handle {
+ 	int	 fd;
++	int	 fd6;
+ 	int	 nlfd;
+ };
+ 
+@@ -49,10 +50,13 @@
+ 	route_t *r;
+ 
+ 	if ((r = calloc(1, sizeof(*r))) != NULL) {
+-		r->fd = r->nlfd = -1;
++		r->fd = r->fd6 = r->nlfd = -1;
+ 		
+ 		if ((r->fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+ 			return (route_close(r));
++
++		if ((r->fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
++			return (route_close(r));
+ 		
+ 		if ((r->nlfd = socket(AF_NETLINK, SOCK_RAW,
+ 			 NETLINK_ROUTE)) < 0)
+@@ -90,6 +94,67 @@
+ 	return (ioctl(r->fd, SIOCADDRT, &rt));
+ }
+ 
++int
++route_add_dev(route_t *r, const struct route_entry *entry, const char* dev)
++{
++	struct rtentry rt;
++	struct addr dst;
++
++	memset(&rt, 0, sizeof(rt));
++	rt.rt_flags = RTF_UP;
++	rt.rt_dev = (char*)dev;
++
++	if (ADDR_ISHOST(&entry->route_dst)) {
++		rt.rt_flags |= RTF_HOST;
++		memcpy(&dst, &entry->route_dst, sizeof(dst));
++	} else
++		addr_net(&entry->route_dst, &dst);
++
++	if (entry->route_gw.addr_ip != 0) {
++		rt.rt_flags |= RTF_GATEWAY;
++	}
++
++	if (addr_ntos(&dst, &rt.rt_dst) < 0 ||
++	    addr_ntos(&entry->route_gw, &rt.rt_gateway) < 0 ||
++	    addr_btos(entry->route_dst.addr_bits, &rt.rt_genmask) < 0)
++		return (-1);
++
++	int ret = (ioctl(r->fd, SIOCADDRT, &rt));
++	return ret;
++}
++
++int
++route6_add(route_t *r, const struct route_entry *entry, int intf_index)
++{
++	struct in6_rtmsg rt;
++	struct addr dst;
++
++	memset(&rt, 0, sizeof(rt));
++	rt.rtmsg_flags = RTF_UP;
++
++	if (ADDR_ISHOST(&entry->route_dst)) {
++		rt.rtmsg_flags |= RTF_HOST;
++		memcpy(&dst, &entry->route_dst, sizeof(dst));
++	} else {
++		addr_net(&entry->route_dst, &dst);
++	}
++
++	rt.rtmsg_dst_len = entry->route_dst.addr_bits;
++	rt.rtmsg_ifindex = intf_index;
++	rt.rtmsg_metric = 1;
++
++	memcpy(&rt.rtmsg_dst, &dst.addr_ip6, sizeof(rt.rtmsg_dst));
++
++	if (!IN6_IS_ADDR_UNSPECIFIED(&entry->route_gw.addr_ip6)) {
++		rt.rtmsg_flags |= RTF_GATEWAY;
++		memcpy(&rt.rtmsg_gateway, &entry->route_gw.addr_ip6,
++				sizeof(rt.rtmsg_gateway));
++	}
++
++	int ret = (ioctl(r->fd6, SIOCADDRT, &rt));
++	return ret;
++}
++
+ int
+ route_delete(route_t *r, const struct route_entry *entry)
+ {
+@@ -112,6 +177,32 @@
+ 	return (ioctl(r->fd, SIOCDELRT, &rt));
+ }
+ 
++int
++route6_delete(route_t *r, const struct route_entry *entry, int intf_index)
++{
++	struct in6_rtmsg rt;
++	struct addr dst;
++
++	memset(&rt, 0, sizeof(rt));
++	rt.rtmsg_flags = RTF_UP;
++
++	if (ADDR_ISHOST(&entry->route_dst)) {
++		rt.rtmsg_flags |= RTF_HOST;
++		memcpy(&dst, &entry->route_dst, sizeof(dst));
++	} else
++		addr_net(&entry->route_dst, &dst);
++
++	rt.rtmsg_dst_len = entry->route_dst.addr_bits;
++	rt.rtmsg_ifindex = intf_index;
++	rt.rtmsg_metric = 1;
++
++	memcpy(&rt.rtmsg_dst, &dst, sizeof(rt.rtmsg_dst));
++	memcpy(&rt.rtmsg_gateway, &entry->route_gw, sizeof(rt.rtmsg_gateway));
++
++	int ret = (ioctl(r->fd6, SIOCDELRT, &rt));
++	return ret;
++}
++
+ int
+ route_get(route_t *r, struct route_entry *entry)
+ {
+@@ -278,6 +369,8 @@
+ 	if (r != NULL) {
+ 		if (r->fd >= 0)
+ 			close(r->fd);
++		if (r->fd6 >= 0)
++			close(r->fd6);
+ 		if (r->nlfd >= 0)
+ 			close(r->nlfd);
+ 		free(r);
diff --git a/dev-libs/libdnet/files/libdnet-1.14-strlcpy.patch b/dev-libs/libdnet/files/libdnet-1.14-strlcpy.patch
new file mode 100644
index 000000000000..abc3a6b0f2d3
--- /dev/null
+++ b/dev-libs/libdnet/files/libdnet-1.14-strlcpy.patch
@@ -0,0 +1,10 @@
+--- a/python/dnet.c
++++ b/python/dnet.c
+@@ -22,6 +22,7 @@
+ #endif
+ __PYX_EXTERN_C double pow(double, double);
+ #include "dnet.h"
++#include "config.h"
+ 
+ 
+ typedef struct {const char *s; const void **p;} __Pyx_CApiTabEntry; /*proto*/
diff --git a/dev-libs/libdnet/libdnet-1.14-r1.ebuild b/dev-libs/libdnet/libdnet-1.14-r1.ebuild
new file mode 100644
index 000000000000..a709c3f636c7
--- /dev/null
+++ b/dev-libs/libdnet/libdnet-1.14-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+AT_M4DIR="config"
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL=1
+inherit autotools distutils-r1
+
+DESCRIPTION="simplified, portable interface to several low-level networking routines"
+HOMEPAGE="https://github.com/ofalk/libdnet"
+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"
+IUSE="python static-libs test"
+
+DEPEND="
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	${DEPEND}
+"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+DOCS=( README.md THANKS TODO )
+S=${WORKDIR}/${PN}-${P}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14-ndisc.patch
+	"${FILESDIR}"/${PN}-1.14-strlcpy.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's/libcheck.a/libcheck.so/g' \
+		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+		configure.ac || die
+	sed -i \
+		-e 's|-L$libdir ||g' \
+		dnet-config.in || die
+	sed -i \
+		-e '/^SUBDIRS/s|python||g' \
+		Makefile.am || die
+
+	eautoreconf
+
+	if use python; then
+		cd python
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_with python) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	if use python; then
+		cd python
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+	if use python; then
+		cd python
+		unset DOCS
+		distutils-r1_src_install
+	fi
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libdnet/libdnet-1.14.ebuild b/dev-libs/libdnet/libdnet-1.14.ebuild
index d44d1d79a672..3c236abaf8f3 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="
@@ -26,6 +26,9 @@ RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 DOCS=( README.md THANKS TODO )
 S=${WORKDIR}/${PN}-${P}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14-strlcpy.patch
+)
 
 src_prepare() {
 	default
diff --git a/dev-libs/libdnet/libdnet-9999.ebuild b/dev-libs/libdnet/libdnet-9999.ebuild
index 3878f74646eb..c1471b35968c 100644
--- a/dev-libs/libdnet/libdnet-9999.ebuild
+++ b/dev-libs/libdnet/libdnet-9999.ebuild
@@ -10,6 +10,7 @@ inherit autotools distutils-r1 git-r3
 DESCRIPTION="simplified, portable interface to several low-level networking routines"
 HOMEPAGE="https://github.com/ofalk/libdnet"
 EGIT_REPO_URI="https://github.com/ofalk/libdnet"
+EGIT_BRANCH="devel"
 LICENSE="LGPL-2"
 
 SLOT="0"
@@ -25,6 +26,9 @@ RDEPEND="
 RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 DOCS=( README.md THANKS TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14-strlcpy.patch
+)
 
 src_prepare() {
 	default
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index 8a5afb039b8b..dab235c0242c 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -7,5 +7,5 @@ DIST libfido2-1.4.0.tar.gz 391439 BLAKE2B d45ff3e1a5605c5ea4c5bddbe423bb69e6237e
 DIST libfido2-1.5.0.tar.gz 407259 BLAKE2B 23a04f9230c45652aa1ac9fd8b3e809096ae31699c65ca0fda27b27b1b47263e375bb99e5b1ebc515b9edfb801bb2fba9c4f50d88e755efe3eaa23463ca01946 SHA512 240e2368e43846fddf5e98bbcc247468833565bcde4ec27976b88c814d787f1a477241a82b064818aa0eb0a98ff46a65d80b8243f4d0bbd763270e42492354e2
 EBUILD libfido2-1.3.1.ebuild 926 BLAKE2B c5f312bba979b24d41a7c62efb6404974e1fffdce9f83dee419ced2afdc98c8039b477eba994c6205d4b25826eb7b048d2f6489bacae158d5261d20485eca663 SHA512 0d108575faaf6af6adb53812b72dc2479068f7be72bded5564dd2f54a6545e7ceed12bbe7fae70530e49c8fd7c5e4f346e6cc3eee1e2406cc580a49eff23e4c4
 EBUILD libfido2-1.4.0.ebuild 913 BLAKE2B 98fc338e47d6eec425b9a0dc28e66d811bf6502f831170a179a2a0d69067fde8af24b9906e4906c2421f72f5bee1429e6932573ff2c59febb84dd72ca323e256 SHA512 987c094d3bdaf4d88728f083c4485c47e2fb5e4162f27fa21503f44c224b72ca42b45ff6236130cca64e78c3161e64e81c16ad479be4142c7863046ec3fc664a
-EBUILD libfido2-1.5.0.ebuild 902 BLAKE2B b388afe810ecb1ff5077120e2750bd8f93f1efea5282ea4db36d85d8044a06c0c005f02205a0979bd2deb9bfc5736702a788514aecc8b4bfe0c2c5411ceae671 SHA512 3e065ce487c5d9709000689062ba3e90c42bb23bee28e980964b0553949c65283e1eb5c8620671d899fbf11e784336cad3b35b534e60bd43ffdc457c80123fb1
+EBUILD libfido2-1.5.0.ebuild 908 BLAKE2B 4d36147e57052d072309f7fc9946097f4d9d9fab38159cbdc749f0e1a9c5213deb644aa6470880f26561889300f2750f59b5c072fc69add130fc3db86ca39c17 SHA512 a76cc636f87e87498bbc56326416bc4d7ee93a8f28885887a0af03bdd6266beaf70e44acbe12eefeec0a4e2ca3a455be4a4442e4f69b5f2bc7b684ff47eef087
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/dev-libs/libfido2/libfido2-1.5.0.ebuild b/dev-libs/libfido2/libfido2-1.5.0.ebuild
index 3615de97d12f..2005a19941db 100644
--- a/dev-libs/libfido2/libfido2-1.5.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="libressl +static-libs"
 
 DEPEND="
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index b5636fce9b9a..67f8f2d86e16 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,4 +1,6 @@
 AUX libmateweather-1.24.0-fix-tzdata-hints.patch 1101 BLAKE2B 484b389062d7f3d61085c3d937862dac48ca26c338fa21f72e0a189349834efe0bf5583fc6a54fc80d8514786d20a4130ca1b91331367d8762ffb3a241f31237 SHA512 97afd9cf53e35370b86b09d2414ca0b784d3b7e571d39873045f47b67f851a22be4181f8160007cc16f3037f8838868a4fd8f4dc4a06cb4ccdb403206f6e94d2
 DIST libmateweather-1.24.0.tar.xz 2233116 BLAKE2B 2b642af39e850d38d16f6a458568e43262007f2a1150db87371fca46f6db3f1b977a6cbad601ed182b8c0fdc9c5015e493ab60bc2c0e3485091e71992951cd72 SHA512 077a7cbcc75df0a64d9fab23d46154e58cf2455c8a2a17ecc04a8c691ead18b5027e177278a1d8e051ffb76e98bfd8e26ed5ca10ad974546e5446116a4f71300
+DIST libmateweather-1.24.1.tar.xz 2223880 BLAKE2B e9d86e66755760937e71b983adbd61a5d71a311b1550e7ed445e94d4f74efc4f5d4cf1af17558035c74a0c56b598cc7f464f4a011a873a2d00a26ad4c37c8209 SHA512 1e653a167b12593171bb3dcfae3a5e57b3f874b220c34ca4ad2e575da7df424ce8a71f88088f53ec53cf9614d40ecda48b088ef6bede680c0ce81dca35ee1156
 EBUILD libmateweather-1.24.0-r1.ebuild 1117 BLAKE2B dea76225a962e0f4629c92c737864dca79811059021eb91948ea4dbbe1a3ccd52e1a98398a087dcafe9cf2fd7364b8eeac85071a4ef6cdbd27f648cdb5d137d9 SHA512 f29017258f1e403cd6ad83a01f9781ec3e97755a2dd6241f5ebcf16e1bfe80494d326afa807e66a6a8c9dd472bb8d0c2e52e45ae7e89a3112228d20bb0deefbb
+EBUILD libmateweather-1.24.1.ebuild 864 BLAKE2B f3150774a7be4a0cea1b7a918e92a0f98cd09ba32c3610630d502d84d72b9a2626a9c2f8d78d791435e3eba56d8672e640a28e472dd9d392677184a390bddaa8 SHA512 e4d8312b027e6c0bba32589ca62f359b0b1e5e8a8a9bb2e651cecdc1344fd4a8987d6257d17eee38415dd18d4f6ae954cd5c7cf44d635907f053bcf50020e0fc
 MISC metadata.xml 343 BLAKE2B 2c44370234b1e71de86ca5e1fc09ab633185cd1401071d3487b8d4c582115f92e30ace26aca5d3dfb89b8c4aefade6ae4bf6b93776fa123206e638b83e0df9d7 SHA512 1bc3a926850df9eabb80136639bc47809b0c49bcefc37c990cb7941a3629c7a0b2b4e6b538c5af7dcb2187239792b500185349a1ba6befe5b85f191b73467a2a
diff --git a/dev-libs/libmateweather/libmateweather-1.24.1.ebuild b/dev-libs/libmateweather/libmateweather-1.24.1.ebuild
new file mode 100644
index 000000000000..a5ee3530e693
--- /dev/null
+++ b/dev-libs/libmateweather/libmateweather-1.24.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit eapi7-ver mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="MATE library to access weather information from online services"
+LICENSE="LGPL-2.1+ GPL-2+"
+SLOT="0"
+
+IUSE="debug"
+
+COMMON_DEPEND=">=dev-libs/glib-2.50:2
+	>=dev-libs/libxml2-2.6:2
+	>=net-libs/libsoup-2.54:2.4
+	>=sys-libs/timezone-data-2010k:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	>=sys-devel/libtool-2.2.6:2
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--enable-locations-compression \
+		--disable-all-translations-in-one-xml \
+		--disable-icon-update
+}
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 47f98f8ef18e..3eab5ef8d8dd 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -3,12 +3,10 @@ AUX libnl-1.1-vlan-header.patch 2378 BLAKE2B c6d72cb5c7437bc6600e2c34eb6f17fd22d
 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
 EBUILD libnl-1.1.4-r1.ebuild 1151 BLAKE2B 4f0985dfaccfe22881176666c5d0c0226e36151bf38bec832a98e5efc2331dc8e1a299219586acbf64bc3b3f505bba1cdce99708f1fc265c6a950fb61cb03c6d SHA512 6b1a666cfe7c5c9c4ba11aa5be790afb8f912503e55578bbec683f0a8861be2c8854be40f3f83b53d071e42c3bc9616902d0202d59639912512236bb82d7a053
 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 2389 BLAKE2B 4cd9dff1baad8856ae702dc8d3763e7b06d69c2cf14a390ca575d11111eac147c5b6edfac9cc435b6b3b621e56c0a0bdf9cc75df3b7195ae952ad864f9326260 SHA512 26e792c2f23f116fe9ddcbd1fb1beee269fac03119f478f8b11487b467af7e74e1cb9c27bf2c7d16f6baae4a780c579d6b704340f837d21b1b9b95f236c9e19c
+EBUILD libnl-3.5.0.ebuild 2387 BLAKE2B 9ec0d860e1faae60b7820a2324725f208add864e8db8d3a6fbf4aab700bea990034926508b4d48cdb3b8743d0fea299f43e17157caeab3a30d4d6751249edba9 SHA512 c0f4debc883331a4f06b2f31cf36eed4cb85c9e8b6f72140773d61c5c3e0dd74ad93a8fada4d83f8c475e8b394ee3e13d9a94cbd6002398c93cbabecf3bdbed2
 EBUILD libnl-99999999.ebuild 2429 BLAKE2B 2eca6e27b7712ffd35e72df536ddf2740ef67f4af222d55f8db5fdcb4ac9046ff7545207869b71754d17e9302e0f3c8f59a61bb5f54ecd4d26bfb8319975a647 SHA512 72d03036db53aefcc25ff84ec27dc1f83f5f703f2f80196c45ab0d60a164f088c5a1bfe024404620739ae7b1e2270ee9b27db6ca8b4960f3b3eef73d7eb7f736
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-3.4.0.ebuild b/dev-libs/libnl/libnl-3.4.0.ebuild
deleted file mode 100644
index fe516272f7f1..000000000000
--- a/dev-libs/libnl/libnl-3.4.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_OPTIONAL=1
-inherit distutils-r1 eutils libtool ltprune multilib multilib-minimal
-
-LIBNL_P=${P/_/-}
-LIBNL_DIR=${PV/_/}
-LIBNL_DIR=${LIBNL_DIR//./_}
-
-DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
-HOMEPAGE="http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
-SRC_URI="
-	https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz
-"
-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"
-IUSE="+debug static-libs python +threads utils"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	python? ( dev-lang/swig )
-	sys-devel/bison
-	sys-devel/flex
-"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-DOCS=(
-	ChangeLog
-)
-
-S=${WORKDIR}/${LIBNL_P}
-
-MULTILIB_WRAPPED_HEADERS=(
-	# we do not install CLI stuff for non-native
-	/usr/include/libnl3/netlink/cli/addr.h
-	/usr/include/libnl3/netlink/cli/class.h
-	/usr/include/libnl3/netlink/cli/cls.h
-	/usr/include/libnl3/netlink/cli/ct.h
-	/usr/include/libnl3/netlink/cli/exp.h
-	/usr/include/libnl3/netlink/cli/link.h
-	/usr/include/libnl3/netlink/cli/neigh.h
-	/usr/include/libnl3/netlink/cli/qdisc.h
-	/usr/include/libnl3/netlink/cli/route.h
-	/usr/include/libnl3/netlink/cli/rule.h
-	/usr/include/libnl3/netlink/cli/tc.h
-	/usr/include/libnl3/netlink/cli/utils.h
-)
-
-src_prepare() {
-	default
-
-	elibtoolize
-
-	if use python; then
-		cd "${S}"/python || die
-		distutils-r1_src_prepare
-	fi
-
-	# out-of-source build broken
-	# https://github.com/thom311/libnl/pull/58
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		$(multilib_native_use_enable utils cli) \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable threads)
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		# Unset DOCS= since distutils-r1.eclass interferes
-		local DOCS=()
-		cd python || die
-		distutils-r1_src_install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-}
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index 61695c261d15..6a56b881381b 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/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index f8cd7f829830..b80ddec063c0 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,5 +1,3 @@
-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 2024 BLAKE2B 621549d79c7cc9da9dac463fa6be48af6a1d687ddc8368d0fa67fba5c2978a9cd036db4927cac5c64545020333b07c79206e1ff382fa43b7f7da890f0fcdac00 SHA512 15a9a65617d82b0e6d146eb0497ff669ed8d11bf86b5aa688f186ca93dd0d5cd6c734f99d3e786865dd71f8cf614b7908c87d21af0bfd978103a5dfe2e9aa2d7
 MISC metadata.xml 611 BLAKE2B 1960af3cc6dc4e15de110c38b2ca41ca94355054539cf28169de54c952726e96327ce21c82dcc0e439d997fd52a8deb825a9f6bc921e727636a9edb9a3ce176b SHA512 2cc8f173d0f1e390e212741307420722c6a8fa8b5afe60ff6a706d4cec17086c88e84ce5f3ed265a0d8d8699de8fffa83c10fb7e1e700370f1eef1d6c3ba4bd3
diff --git a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild b/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
deleted file mode 100644
index 6c4547472135..000000000000
--- a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1
-
-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"
-HOMEPAGE="http://pqxx.org/development/libpqxx/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc static-libs"
-
-RDEPEND="dev-db/postgresql:="
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? (
-		app-doc/doxygen
-		app-text/xmlto
-	)
-"
-
-DOCS=( AUTHORS NEWS README{.md,-UPGRADE} )
-
-src_prepare() {
-	default
-
-	sed -e 's/python/python2/' \
-		-i tools/{splitconfig,template2mak.py} \
-		|| die "Couldn't fix Python shebangs"
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		$(use_enable doc documentation) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	einfo "The tests need a running PostgreSQL server and an existing database."
-	einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
-	einfo "set PGPORT and PGHOST. Define them at the command line or in:"
-	einfo "    ${EROOT}/etc/libpqxx_test_env"
-
-	if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
-		if [[ -f ${EROOT}/etc/libpqxx_test_env ]] ; then
-			source "${EROOT}/etc/libpqxx_test_env"
-			[[ -n $PGDATABASE ]] && export PGDATABASE
-			[[ -n $PGHOST ]] && export PGHOST
-			[[ -n $PGPORT ]] && export PGPORT
-			[[ -n $PGUSER ]] && export PGUSER
-		fi
-	fi
-
-	if [[ -n $PGDATABASE && -n $PGUSER ]] ; then
-		local server_version
-		server_version=$(psql -Aqtc 'SELECT version();' 2> /dev/null)
-		if [[ $? = 0 ]] ; then
-			cd "${S}/test" || die
-			emake check
-		else
-			eerror "Is the server running?"
-			eerror "Verify role and database exist, and are permitted in pg_hba.conf for:"
-			eerror "    Role: ${PGUSER}"
-			eerror "    Database: ${PGDATABASE}"
-			die "Couldn't connect to server."
-		fi
-	else
-		eerror "PGDATABASE and PGUSER must be set to perform tests."
-		eerror "Skipping tests."
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index 05eba456d42d..040d750ea9e1 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -2,7 +2,7 @@ AUX libstrophe-0.9.2-libressl.patch 843 BLAKE2B f979127225535d271dafdb379d9e07bd
 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.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
+EBUILD libstrophe-0.10.0.ebuild 1092 BLAKE2B 185281c223cd29f2d90dedfdfa18525be8ef017a170b8a78a3f151b4051bd2a8f00a452322b272c36f762efd99bab47da162ff33983ff1a59e5200fa5377534c SHA512 d4744a181fb65e52f7b3f2d549db4278a0dceb4e00723dd6590a02393df29e1740a468b5496cd7b7f6083f27201e08c06af3cdfc530625a98370b3df2df80035
+EBUILD libstrophe-0.9.2.ebuild 1150 BLAKE2B 307a9eb08191ad50f3c9c43d6b9ba6ad1f4ea695a9ca904355218f359a50cd4cb49d41c170b058d9aa898a2e9a37a00fa6b561928d522ee437e35ce2a15e93cf SHA512 00c14fb2236618196b874fc16ecaa8c58e12996f702c76db46ebaa179fc0920a989c3492657e85c0e54f4369acde9e1a3731df08d048bedc30dc390892a939f6
+EBUILD libstrophe-0.9.3.ebuild 1092 BLAKE2B 185281c223cd29f2d90dedfdfa18525be8ef017a170b8a78a3f151b4051bd2a8f00a452322b272c36f762efd99bab47da162ff33983ff1a59e5200fa5377534c SHA512 d4744a181fb65e52f7b3f2d549db4278a0dceb4e00723dd6590a02393df29e1740a468b5496cd7b7f6083f27201e08c06af3cdfc530625a98370b3df2df80035
 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
index be09401f2e96..5757ff621942 100644
--- a/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.10.0.ebuild
@@ -43,3 +43,9 @@ src_install() {
 	use doc && dodoc -r examples
 	find "${D}" -name '*.la' -o -name '*.a' -delete || die
 }
+
+# Explicit src_test is there to document that the test suite is integrated and
+# is expected to pass. Please do not remove.
+src_test() {
+	emake check
+}
diff --git a/dev-libs/libstrophe/libstrophe-0.9.2.ebuild b/dev-libs/libstrophe/libstrophe-0.9.2.ebuild
index e370927cb139..c312bb04fe2b 100644
--- a/dev-libs/libstrophe/libstrophe-0.9.2.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.9.2.ebuild
@@ -44,3 +44,9 @@ src_install() {
 	use doc && dodoc -r examples
 	find "${D}" -name '*.la' -o -name '*.a' -delete || die
 }
+
+# Explicit src_test is there to document that the test suite is integrated and
+# is expected to pass. Please do not remove.
+src_test() {
+	emake check
+}
diff --git a/dev-libs/libstrophe/libstrophe-0.9.3.ebuild b/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
index be09401f2e96..5757ff621942 100644
--- a/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.9.3.ebuild
@@ -43,3 +43,9 @@ src_install() {
 	use doc && dodoc -r examples
 	find "${D}" -name '*.la' -o -name '*.a' -delete || die
 }
+
+# Explicit src_test is there to document that the test suite is integrated and
+# is expected to pass. Please do not remove.
+src_test() {
+	emake check
+}
diff --git a/dev-libs/libugpio/Manifest b/dev-libs/libugpio/Manifest
index 83a60b6cf32d..1aa98eb5e2fa 100644
--- a/dev-libs/libugpio/Manifest
+++ b/dev-libs/libugpio/Manifest
@@ -1,5 +1,5 @@
 DIST libugpio-0.0.6.tar.bz2 252283 BLAKE2B ebdfae8ef400b3deb95e4313fd0ca2ad7b195945c850ce5c84904373bca2f2c9d446aec45b0500f549ab5319a294fbc2f0c37a6734fab69d8571389a0cb5fb63 SHA512 f40517d34509f9f3b5b26a5cb5523863034d48887ef3f26bd38a38e9aeac73e09ecf71099cd5a036e23fe3db5c8c2ead588c49022a398f2a426bc7148cc64ecd
 DIST libugpio-0.0.7.tar.bz2 300015 BLAKE2B 430a17651f3c443424694d50817e562ab3c682ae2006c14d2ca46ee3078993e85214a0ca0b9323d148ca3aedaa758985cf5e2e45527e1d1278d3a36c3648ecf9 SHA512 27f8b00b13b4865635fa26e9b14c7fe217ee005c316500f0f344268d82f8d2858def524bd5cee11e9cca9c2a534a50546d5fc3504ecd1f88bd96c6fbefe1586e
 EBUILD libugpio-0.0.6.ebuild 605 BLAKE2B 48b6c2faca3a050d2624321f70507e56926b428d2bc11445a21d9b5a076e2b5059945c02e9bcaa22814291010504c0eb1878026a1efc1d6590dc9c655916d9c4 SHA512 346a2fad0ef0f6c1db939989520a7e8c290aa2399fd1a68f100c4826298147068ed4a8de249a7e17aa6438420efcb3151ea9a1165c235aff578493e5e7f27640
-EBUILD libugpio-0.0.7.ebuild 609 BLAKE2B d9cb106ec206dce0efbdcd273eeb68fa16dcf1ce94154fe39981f58deb26eb2d96dd9d16c02e0482f0b3abf12217fe3b372dcdb24379b078e9c4da0793676cee SHA512 8aaf3a20064cf74d4c53a023e276c470f2e85d51d65f117fffd7e10184ab2ef85f76edff3130eb177c57d91bcb54343f701d160a249827aac118779bc6792566
+EBUILD libugpio-0.0.7.ebuild 607 BLAKE2B c06a1642dcfefbc37c1a9a8c5493fc9e437f7f1625e54d4cfc323a1aadf5a6662c64571759949573272114c49cdab7b8d4a573f8453d6f2955f3964667d2c964 SHA512 f4256423ad931dfdfeb91654c44853d544b12775dec0e29c0a44f03a3bd200f0f8b210d887b9561dd90c769a7002d301af743a9665261f4eaeaa8a3cdd81b218
 MISC metadata.xml 634 BLAKE2B 08bf2fa023595f3444926c7fca72af2d2a649ff2ac5b8372447f58113f4667ba4d85b46c0a872cef9ce76f4bd437b6c28a03e5c602c640de465a08ffe3718720 SHA512 946cb753670d9a2bb3c2cb4a35feb3e633e4d3d9a44584ff2e896544e11621aeb31630938d7e64d7d830e1e9fcf7edb4755dbda6fa502d624472e23227dd6d14
diff --git a/dev-libs/libugpio/libugpio-0.0.7.ebuild b/dev-libs/libugpio/libugpio-0.0.7.ebuild
index 9ce29b2cceda..39f1fe2de5e7 100644
--- a/dev-libs/libugpio/libugpio-0.0.7.ebuild
+++ b/dev-libs/libugpio/libugpio-0.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mhei/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 
 CONFIG_CHECK="~CONFIG_GPIO_SYSFS"
 
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 61697c7929e2..07edfa3fe6ea 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,4 +1,6 @@
 DIST libuv-1.39.0.tar.gz 1272565 BLAKE2B a5ca826f99f2b7fc1736463df3c455caf2b63c8915fba61edd7b418639040910dfab6e170a089da0c18cd928d3b80c586cd10be4c5331a924a37105328960ca5 SHA512 b6aca197cbfc96125321ff071f6b2f3e56e99f85db8db6e20601019eae08056b42330ea7a73aa8c9960d142a1c8209910bc33050527f6fe0afaa8f7ed9f54066
+DIST libuv-1.40.0.tar.gz 1274587 BLAKE2B 91d0e64a92be5686c0da3c4ad35fa52351012434a2a23db3fd91c26fc8e7b42d20d183a861feb876e2b5ab43e45ab59e720299f622a79c6bbdc6350b4b9e6e3d SHA512 14a6880e636e9d046e1f4c86061d7ca5fe0cdae0efb0c6fec6b6ad03b17c626da479d6cc1ae84da281ec04a75e0d56fa99ef25164432cdb246cf59f0964a7e8b
 EBUILD libuv-1.39.0.ebuild 1222 BLAKE2B 1ea452b11211781bfbb0fb7566f737208a9ceb288b41f613ee1c2189fca091127322bbfc1e4a8f71bd6e62527bff66bec218cdef398f31f0d0f05d69ceadc318 SHA512 5d9a665b8267f7cf058f6f3b3afe4de75e214973c7a9d8d9c0eecf062f60dfb30de805e4ab1ffff02238219e70ec7149ad554ec712a5a759503a0a9e9c6a49ec
+EBUILD libuv-1.40.0.ebuild 1231 BLAKE2B 07bbc6b09e38c9afb4fa929b74b636905c6e4eccaa14a594d68ff189f3523a4c5e1e0bc14c4244e21d95f49e8943a24d88ab9e818ee78ce0b3bff4f8b532ec2f SHA512 ec0b799dd24416c8b70112f745ac2604010f9f809d8dc385341aaf1ef825eecf111bfec1ab68372428a71e85b5973549bd5128ef6d256a8279b36d08a3343c37
 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.40.0.ebuild b/dev-libs/libuv/libuv-1.40.0.ebuild
new file mode 100644
index 000000000000..a9a8ca340c4c
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.40.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+		> m4/libuv-extra-automake-flags.m4 || die
+
+	# upstream fails to ship a configure script
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		cc_cv_cflags__g=no
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	mkdir "${BUILD_DIR}"/test || die
+	cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+	default
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index c559b54615f6..46f232f217ec 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -10,7 +10,7 @@ DIST libxml2-2.9.9.tar.gz 5476717 BLAKE2B 00a67c38084f2effd5d68d7d3e68f0c96cf4f5
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.10-r1.ebuild 6815 BLAKE2B 1c4619b182be59bc8448deca9af64fcd8aed9b23120b4dcb25bf592b9f7957f5902d7bc24fda73874abb8b0f71f6d16662941d1b1096810ade59a46a995b4e88 SHA512 71af1ea794074a405e5e5e046263d1d3510e157b25cbe84cfb7c0463d0a71f5845ac54333905eb6ec4ace24f57b77f5acf97acb53cefc991a85c90ab710e7fa2
-EBUILD libxml2-2.9.10.ebuild 6816 BLAKE2B 7d1574df705961e96f314c4e64a05fff9930c01164ef006e28466ea57327558db7ab1bf698798a0182d0bd3c45e15314ad78515c1651b3dd53d14209162be6e5 SHA512 517edfdc130d70de52b825c37d3ca36ecc0a4b04ceca5e7bde251d823dcf53b43ce08fced4bf06a940395fcdefe2f9ff93d6c67ad813c9ad9a6228232df316cb
-EBUILD libxml2-2.9.9-r3.ebuild 6943 BLAKE2B cfc351f4626fb77dec2032e57385fe0800d8ea79c5a776efb31549b7d7a1af9822762ae463bf08982988d740e693eeb4139c117e4a8dcb0b71bdb7dd1d8c3574 SHA512 be36f698c42bffd8d153806bef4e2820e5f8f0245abe4c5547986fab64067d3282227dccf16d7d1e475572abb952b1f57f16a4a311e18071a31a1bf4d7fbd7b4
+EBUILD libxml2-2.9.10-r2.ebuild 6806 BLAKE2B 3b71125772ee4351c1c6870796cf204456f1f3d9b1d532e7f8625d6b77ca9e0f159d4d90907b08a33a9dba24eeabeb5843784d77d682360d66469bb2d0640e99 SHA512 ddd6ec3ccf0c0b6744b71e7c2906c86d05b721c7ad6c57266bfb9717bb96f612690b3270be675d684e60a6d12450040748bdfecb4b15c44e268726ab407eff2c
+EBUILD libxml2-2.9.10-r3.ebuild 6809 BLAKE2B 35bc0c4630c0f9ebd3c8da1b90b26eb33ab7388c62b95a7c2f4975d3d4932e654c6fca345cd79fb06acd347938bb4bdf1c9338bf4d0bd057f09022bc380fb3bb SHA512 509a4df958b37b040d4fc674311523f9c74dd310377a066ff9d094fa443b2c6ea6d318c77b674e9854f3c4661c5fbad6a01a38be3db82f36ee873bd4353b7083
+EBUILD libxml2-2.9.9-r4.ebuild 6933 BLAKE2B 49187c14be3109743739465ec89ca0bb01e6982d1dffcb8f68de2d55286c41262552abee8d01c774351f518f1eb723a84bcbc8a34e9eb76a70690b8153a83003 SHA512 5249bfd2def69de21b7b94b3134a7fd4102be75ede637c1df35d22b99dd362e83f7709e7adeb68b6009f7ad23e45a30143132e4af3f28047aaca7b549aa74b0b
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.10.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r2.ebuild
index d0bf6aa7bf9d..2993851ec4a0 100644
--- a/dev-libs/libxml2/libxml2-2.9.10.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.10-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="xml"
 
 inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild
index a7e1eb4a9918..360bcffb2024 100644
--- a/dev-libs/libxml2/libxml2-2.9.10-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.10-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="xml"
 
 inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
@@ -26,7 +26,7 @@ XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
 XMLCONF_TARBALL="xmlts20080827.tar.gz"
 
 SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PF}-patchset.tar.xz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-r1-patchset.tar.xz
 	test? (
 		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
 		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
@@ -55,7 +55,7 @@ src_unpack() {
 	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
 	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
 	unpack ${P/_rc/-rc}.tar.gz
-	unpack ${PF}-patchset.tar.xz
+	unpack ${P}-r1-patchset.tar.xz
 	cd "${S}" || die
 
 	if use test; then
diff --git a/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r4.ebuild
index b226aa06cb99..6e250aac8ffe 100644
--- a/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml"
 
 inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 58485ca32f69..1bbc0d71fac0 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,5 +1,7 @@
 DIST libzia-4.21.tar.gz 631871 BLAKE2B 8c54ae86e38569914c05da6c11b8ffe2c349884fb4e8ea00b05b88da12f6ee4e80ddac82f1790b67586c24d9df5b0ab71053fc80479cfdde22250a034db6dbef SHA512 e4277dfc3c004a0a1d1ccd8a11431e46344763ff5df68403b451e2be4b6bd00862fe2af0e15ce9017c3d6144d301e792f9279632687697e0dd4a238c805b04a8
 DIST libzia-4.22.tar.gz 626973 BLAKE2B 6cc87ce5bb11824fc6fbaebbf1ab3c4728884d626c18455088e02d61f84d361f194d07567eed5408671e0c31c015e1fb1d9245294457e699a0342f8487778023 SHA512 1b04460e3706e13e7b6e680a1c58c72131a7f7436a40e9b74ddfd1119cb8507e509658081b9d2daa8eb085f101091a897f8ffec518d74d4409cbd07d999d2c40
+DIST libzia-4.23.tar.gz 627405 BLAKE2B 913173aca367dd660b8e04502e1198072e99e9ece5cd30ef2d4ad528292b3aba00799d89ee336bdf6a1cebf43118610caddfeeedccdd4b5af48bd54ac795066b SHA512 c34aff9b8a19713ea9881ea5a58a038fe7f0127c3503c845ecd6187ab07f90f7ae2727331e43b9cfb6b8db15d8dcbf80b2e1f4105bb4a34e9b30d9778d3a815b
 EBUILD libzia-4.21.ebuild 838 BLAKE2B ff1f384a87ddb0b798b03c8f04b83f86168b4e45755f12d979825d4ffcc234784cfcd52773ca37eefc6cd04885946d25bab069b542faf6ccbeca3dfbc3c512f9 SHA512 edc8c49c7186755c8dd25cc0d2958c27c26d9f607804fccdb3a85debb8bba4edc3f124ba044712273411909781a06072f301db8e121d2df08a5389df3d5ed6d5
 EBUILD libzia-4.22.ebuild 965 BLAKE2B 43c805e94e0a1a466a0c6bd427320f29130991ed079deff9a3fe3d0858db261e2a59550bb883ab6c6fda8f7542422abb3f473377b7fa3553e5bd0e1df35ecbdb SHA512 cf875842735ff957b9385fdfe0ac37ae50cd5196ac2c3d3f87c91f37ddd242ade6efc402e65884222e789ff2c08e3b44625f9613c36ccd7f2369214feec1bcc9
+EBUILD libzia-4.23.ebuild 965 BLAKE2B 43c805e94e0a1a466a0c6bd427320f29130991ed079deff9a3fe3d0858db261e2a59550bb883ab6c6fda8f7542422abb3f473377b7fa3553e5bd0e1df35ecbdb SHA512 cf875842735ff957b9385fdfe0ac37ae50cd5196ac2c3d3f87c91f37ddd242ade6efc402e65884222e789ff2c08e3b44625f9613c36ccd7f2369214feec1bcc9
 MISC metadata.xml 325 BLAKE2B 749bbcd37b8ec3f3b537e5cca5abba07f042c3f0f56e07786633d5a68eec8242e5f9269c1cdc2b6d2862766cbb9c0bf5ebf971a7a35537c368fb033a52c1be12 SHA512 a406f9e74ba2f99af089909a9a0aef44da9ae1261a61d76cc4689e3d80e610f8610fe54ec3da3441e53c9e1f8c18487eb5662bbbc488a50b48844814cd235f2c
diff --git a/dev-libs/libzia/libzia-4.23.ebuild b/dev-libs/libzia/libzia-4.23.ebuild
new file mode 100644
index 000000000000..4977fe81e7dc
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.23.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:0 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 82750533cf7c..f53df10c9fa1 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,8 +1,5 @@
-AUX link-grammar-5.3.9-out-of-source-build.patch 2541 BLAKE2B 6b60a65bb39e628f8c555dce20410872a4dd56d27402e7bc939d49483053cf84199f3f5bab495c16f734b4b6662b467b0369cda4dc852a39568f27b68c0f14da SHA512 340a03c31ed94f53b00622bf7f925d8f47c658ec81843f0139deb5b38074f346ad4d65dc49653cccf1b7b49966c77029ab64e993d113e709e75ebb930448b8f6
 AUX link-grammar-5.8.0-dont-inject-O3.patch 621 BLAKE2B becccc08314e45416ee96ec52a5b03b3cf5b1fc141a427a774c7d2b816cff985abba54a99b8bc308e9e75759045b335380a186031d647cc8df00582669615ebd SHA512 71e05d722d24a4647af9f879c14d74d2875ee5435f1b70acb8f962f9e7e602e044e8ed98e118e3ad9ebf725a9701a302ca1e5ea75aa8662326f29251c1317138
 AUX link-grammar-5.8.0-out-of-source-build.patch 1189 BLAKE2B ba89966a0744b39f0f24fa3359a031041cae61f3ec26aaad42eb6e05cbc5c33e54f927c460b33f8d1d37b3987e149f1c88da1ebaab408d322954eefa755b38cb SHA512 e2f094f341bf943a57ce04f10f49a1aac8345ced88a63c54fdfceda946ab575ff088c597d61847d9a9bbebf10af9ad1c284239f29004fc7917deddcd79ddce69
-DIST link-grammar-5.3.11.tar.gz 3632617 BLAKE2B 07fe951743096a0d6b906c9b7174b58fcc54b0e2c54805d15731de783888327799fd77f64a2ae7f4e09327feb08d91cb95471e9c0c3c2fe00fca3553f40b1905 SHA512 09671d187deac3b9530dd63eb4497de9c2c9db32d79da06c677bdbccac015adef06813819692a92d15499c7cb347071c58b73c52505af154bdc8a8fcd409ddd2
 DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e
-EBUILD link-grammar-5.3.11.ebuild 3632 BLAKE2B d0e14eb500342a137661236b1c4ed9ab67623a854b994cabe70ed3c3cf6e15e6aa0035380461c99ae4cc665f0921e92bcb995c264dc4d2547a1bd37c5ffdeec6 SHA512 b0e9264782da3b7bfc6aea75870fc7c789591eca23c442f29051dec5f28e0b8d5100f971e6eba143be14dfb27d06042952b469af5f6337d3c89020eea3112d76
-EBUILD link-grammar-5.8.0.ebuild 3181 BLAKE2B 18941b1f0bd78512702cd4fb5cd213e1a93a4b911b341e8b1ab36fc7d5a14c935577bc2d07c12c38f56c5c9c539927c3793e00f51be95539b60a5741966883d5 SHA512 f6f44ee826cab91f012f18eb8a863955caf074ffe3fbf7b0d58211391f5d4b7ac651424083cdee342e26a7ea1ae9b8cc3f734fd7335ebc5610e799f91df0d91d
+EBUILD link-grammar-5.8.0.ebuild 3180 BLAKE2B e431e616920aeef3b86a82ded5ae20c72de2d74e63ee074d258cbf4340c4e9fec348375dfad2d513cb78f6f0f23ecf83ece841db6a76d469e3f0b1feb924dcb5 SHA512 8ac6a02816241df0be5c89fce69926b8daad1f8c321653efd737fd8efbc6abb3d10c4086eb086dfe0d54af5776ab7483e43d40c425402b16cd716bfcde821ce9
 MISC metadata.xml 963 BLAKE2B ebe0a68ad3a8fee0aa3d112f152e306d691b73e6969bf1fb7026edbdfb814fa1476c2e7d9e8ff9051e5920f9279acea871fab85da58ff8642ec819b5a4fbb57f SHA512 d53e9c7867629e8caf488cef531e258bb2cad3fcbe458e80024b0292fe90148656a77069c45f42e782ba473daafec5cf1fa93e9be00571ceefd21bf59b0ea5a2
diff --git a/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch b/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch
deleted file mode 100644
index 6eacc6610f90..000000000000
--- a/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/bindings/python/Makefile.am	2016-08-26 04:28:48.000000000 +0200
-+++ b/bindings/python/Makefile.am	2016-09-10 16:13:33.554781694 +0200
-@@ -4,9 +4,8 @@
- # Created by Linas Vepstas February 2014
- #
- 
--SWIG_SOURCES = ../swig/link_grammar.i
--# BUILT_C_SOURCES = $(top_builddir)/bindings/python/lg_python_wrap.cc
--BUILT_C_SOURCES = ../../bindings/python/lg_python_wrap.cc
-+SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i
-+BUILT_C_SOURCES = $(top_builddir)/bindings/python/lg_python_wrap.cc
- BUILT_PY_SOURCES = $(top_builddir)/bindings/python/clinkgrammar.py
- 
- # Over-ride the install location, so as to remove the dash in the
-@@ -20,7 +19,7 @@
- pkgpython_PYTHON =                                 \
--   linkgrammar.py                                  \
-+   $(srcdir)/linkgrammar.py                                  \
-    $(top_builddir)/bindings/python/__init__.py     \
--   $(top_builddir)/bindings/python/clinkgrammar.py
-+   $(BUILT_PY_SOURCES)
- 
- 
- # These are packaged in the tarball; make clean should not remove them.
---- a/bindings/python3/Makefile.am	2016-08-26 04:28:48.000000000 +0200
-+++ b/bindings/python3/Makefile.am	2016-09-11 01:30:35.700926275 +0200
-@@ -4,9 +4,8 @@
- # Created by Linas Vepstas February 2014
- #
- 
--SWIG_SOURCES = ../swig/link_grammar.i
--# BUILT_C_SOURCES = $(top_builddir)/bindings/python3/lg_python_wrap.cc
--BUILT_C_SOURCES = ../../bindings/python3/lg_python_wrap.cc
-+SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i
-+BUILT_C_SOURCES = $(top_builddir)/bindings/python3/lg_python_wrap.cc
- BUILT_PY_SOURCES = $(top_builddir)/bindings/python3/clinkgrammar.py
- 
- # Over-ride the install location, so as to remove the dash in the
-@@ -18,9 +17,9 @@
- 
- # Files that get installed in $pkgpythondir
- pkgpython3_PYTHON =                                 \
--   ../../bindings/python/linkgrammar.py             \
-+   $(top_srcdir)/bindings/python/linkgrammar.py     \
-    $(top_builddir)/bindings/python3/__init__.py     \
--   $(top_builddir)/bindings/python3/clinkgrammar.py
-+   $(BUILT_PY_SOURCES)
- 
- 
- # Apparently, anaconda does not work without this!?
---- a/bindings/python3/Makefile.am	2016-09-11 12:44:01.466971878 +0200
-+++ b/bindings/python3/Makefile.am	2016-09-11 12:44:22.385788941 +0200
-@@ -26,7 +26,7 @@
- # This seems wrong and lme to me, but see issue #298
- pkgpypathdir=$(pythondir)
- pkgpypath_PYTHON =                                 \
--   linkgrammar.pth
-+   $(srcdir)/linkgrammar.pth
- 
- # These are packaged in the tarball; make clean should not remove them.
- maintainer-clean-local:
diff --git a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild b/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
deleted file mode 100644
index ddab5316ca13..000000000000
--- a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools eutils gnome2 java-pkg-opt-2 python-r1
-
-DESCRIPTION="A Syntactic English parser"
-HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
-SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE="aspell +hunspell java python static-libs threads" # pcre
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# XXX: sqlite is automagic
-# Does not build with >=sci-mathematics/minisat-2, bug #593662
-# add pcre support: pcre? ( dev-libs/libpcre )
-RDEPEND="
-	dev-db/sqlite:3
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell )
-	java? (
-		>=virtual/jdk-1.6:*
-		dev-java/ant-core )
-	python? ( ${PYTHON_DEPS} )
-	!sci-mathematics/minisat
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-"
-
-NORMAL_BUILD_DIR="${WORKDIR}/${P}-normal"
-
-pkg_setup() {
-	if use aspell && use hunspell; then
-		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
-		ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if"
-		ewarn "you want aspell support."
-	fi
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	use java && java-pkg-opt-2_src_prepare
-
-	# http://bugzilla.abisource.com/show_bug.cgi?id=13806
-	eapply "${FILESDIR}"/${PN}-5.3.9-out-of-source-build.patch
-	eapply_user
-	eautoreconf
-
-	if use python ; then
-		prepare_python() {
-			mkdir -p "${BUILD_DIR}" || die
-		}
-		python_foreach_impl prepare_python
-	fi
-
-	mkdir -p "${NORMAL_BUILD_DIR}" || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		--disable-editline
-		--disable-perl-bindings
-		--enable-shared
-		--enable-sat-solver=bundled
-		$(use_enable aspell)
-		$(use_enable hunspell)
-		$(usex hunspell --with-hunspell-dictdir=/usr/share/myspell)
-		$(use_enable java java-bindings)
-		# $(use_enable pcre regex-tokenizer)
-		# $(use_with pcre)
-		$(use_enable static-libs static)
-		$(use_enable threads pthreads)
-	)
-
-	cd "${NORMAL_BUILD_DIR}" || die
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		--disable-python-bindings \
-		--disable-python3-bindings \
-		${myconf[@]}
-
-	if use python ; then
-		prepare_python() {
-			ECONF_SOURCE="${S}" gnome2_src_configure \
-				--disable-python-bindings \
-				--enable-python3-bindings \
-				${myconf[@]}
-		}
-		python_foreach_impl run_in_build_dir prepare_python
-	fi
-}
-
-src_compile() {
-	cd "${NORMAL_BUILD_DIR}" || die
-	gnome2_src_compile
-
-	if use python ; then
-		compile_binding() {
-			emake -C bindings/python3 \
-				VPATH="${S}:${NORMAL_BUILD_DIR}" \
-				_clinkgrammar_la_DEPENDENCIES="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				_clinkgrammar_la_LIBADD="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la
-		}
-		python_foreach_impl run_in_build_dir compile_binding
-	fi
-}
-
-src_test() {
-	cd "${NORMAL_BUILD_DIR}" || die
-	ln -s "${S}"/data tests/data || die
-	emake check
-}
-
-src_install() {
-	cd "${NORMAL_BUILD_DIR}" || die
-	gnome2_src_install
-
-	if use python ; then
-		install_binding() {
-			emake -C bindings/python3 \
-				VPATH="${S}:${NORMAL_BUILD_DIR}" \
-				_clinkgrammar_la_DEPENDENCIES="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				_clinkgrammar_la_LIBADD="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \
-				DESTDIR="${D}" \
-				install
-		}
-		python_foreach_impl run_in_build_dir install_binding
-	fi
-}
-
-pkg_preinst() {
-	use java && java-pkg-opt-2_pkg_preinst
-	gnome2_pkg_preinst
-}
diff --git a/dev-libs/link-grammar/link-grammar-5.8.0.ebuild b/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
index 1ef3c88c3730..d37b96f28aa0 100644
--- a/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="aspell +hunspell java python" # pcre
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index ca754112f9ea..fad529c7306a 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,5 +1,3 @@
-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 925 BLAKE2B e004095824d4c34af521daf27d5d991cf61471e7954f035136455b1210d9ab2cbdbf62512b4508285b3f95f2017007ceb4d773e00ce551c6f38c939d0ec9d420 SHA512 741a78c01d227fee1872eefe0438f37bd7d71c4893b69aaad4bc4726018cd358338a09350f9a6e4ad0d863bc282315fce2094dcd8ad126a3a85356f39253f7f3
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.1.0-r1.ebuild b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
deleted file mode 100644
index ccf53fd81003..000000000000
--- a/dev-libs/mpc/mpc-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
-HOMEPAGE="http://mpc.multiprecision.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/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"
-IUSE="static-libs"
-
-DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/mpfr-3.0.0:0=[${MULTILIB_USEDEP},static-libs?]"
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index 08c38a7f544e..0106be35c171 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -1,12 +1,5 @@
-AUX msgpack-1.0.0-cflags.patch 1189 BLAKE2B c62a041fce3efcb0d643e8a3e3529d5be5cf7d263a731a8d7d9a839ece6e56451be4e7bd27c4f7889a31f21b3003227d8208f94811316b7e650b31b59be526bb SHA512 7e6aa85e8850b7daf0c9ee741548bab7bfe9e62871c4f5388598c28819ed8efc14cb8e828a449369ba5f97b68d4257b246a017f5815ed7d8d5cfedc4a793be51
-AUX msgpack-1.0.0-static.patch 1324 BLAKE2B eb133b5bd2a344b5029dc1ed6a6ec1654e6f53531c8810e7ab83ae4f4c301e9104454a012a91fe89b52d321a932b55ae1177861a03a3fe3163cf51a9c1bfafc9 SHA512 a99cbca27fe4773711ad0220c75645d247fd1b4ed99baa41d5a952d65b316d2ea2e60182e8e1fafd6caa667ab0e6eaf110024f66337604effcdda2c9dd87d3f0
-AUX msgpack-1.1.0-gcc6.patch 900 BLAKE2B 770cce3486efe6b402a5d8a54c317cc31e603a34ece09bc10182e12d8970e34f06d03b94e744be5607ba9b09c5ae9873e0ead71eae87c761344bd041bbb4ecaf SHA512 be88e6f2119ded151af8334315c40027967603240158f0a1ab0aadbfdd0e8a04df13aecc9ed26135d6684a0f40f627727635c032722108bb4a63a68d8eed789b
-DIST msgpack-1.1.0.tar.gz 493551 BLAKE2B 3ee162fcba5ae61c7c69945a567ac4d39526e7941f42cc2ed55bc5885b823af84eea212c4e75e8e8583e8ea8a5e12f75e969409193c5e7273430e2e02d33a02c SHA512 6823fab090c2146f871a45736c29b8f81434f0d72c597ebea2e947e4a9a17554e163bc88fbbc3dd0805b2ef0df029b10ca30c09dfbd1111252b9861a1e373901
-DIST msgpack-3.1.1.tar.gz 495858 BLAKE2B a99b7edb2a6de80e018d5c4084ea199518e34045a6293c622c8690147ae353abdb63856eb031962a02ce20903d4443ec2b01a3c033e756c339f8674ff801d4c3 SHA512 cc634ef38b3844bf994159024441fe72d99055c42b0a4d81245b0629fd1f3147587eb36537cfb85e4cae2edc1dc23d7fa400022efa5a10dca295f9a6acd38346
 DIST msgpack-3.2.0.tar.gz 499188 BLAKE2B 6e5fd59a96ca726d3429b173b3db4c74163eaf6d314b289845237b6ace6208478dbbbb60397c630d515f6f6eed344b74f76225d1a4ca143b91ebb9b3a1369c14 SHA512 f3d011adfaa71b3c5d5f3eb43f0addbd461ae82b8ac22f367ddba7ef762d3bea500477501cf394d1770f0c47809bc363fc1088819ecfdfa668e93529885f4b88
-DIST msgpack-3.2.1.tar.gz 1234733 BLAKE2B 97fb6cab5125463f10e7ad2c55ee478b2bf3dab5628a40ce1b0bcdd96cc002f5c99e495592c91f1342e6623d32b5594536de226b0bf80e1cb5290dae9b0566dc SHA512 68d06b05a1f00a3d9d7d39313a9e11f42828606c39d9d4c07673a48c9b88028a6316f2a964881cc8e4d185616a037711f02a7d3cd6029eadbacf52145603538b
-EBUILD msgpack-1.1.0.ebuild 1055 BLAKE2B f50c69aa071803feb8fe923a4013555713f275c0efe59d6fb72664275a590b45f5b6c95e3514d8afb170c85f68ea9e3f5d9cebc6baa12b7ee3b02a09c80c3994 SHA512 39c31dd96a67f9c8e36b68c6c4f7392eb90305934696b47464eb2677323e0a59cbe1100d06d2e23455e75b8fb671f90d4a6347abb13b8c43f35608f185cd69ef
-EBUILD msgpack-3.1.1.ebuild 1717 BLAKE2B bf44d36d1b0c747d054699dfbc13b4d51badbc80575ec44769ea1f27459ec50fdcabc6b1b3c76273ee686fc843561ce6e02ba883c159ffcf48fecf21bfc24e32 SHA512 a1bab4c161c0493441413584d0eb8957b5d074809c5008d1084bb2da9c1bc9741bdd5562dacd461cc96f873a2181abdb5f209a0a8ee716752089e33cf2bb47cb
+DIST msgpack-3.3.0.tar.gz 508001 BLAKE2B 3017c44689f8afbf078b9c498449e21b4e3b87591c50a37bf9ae73869dab550819f24d6e5179a3600df297aa2c024e5a7fe1defcbab7c0f1aff826870de2ab32 SHA512 ad3e32edc8c6afd70282b3d4b493c2ffe74a697c41bd1f39030c5b4752cccefaa965bc049d4c2e63103a210bf714dc3bddd474691bc067d1475ae017593f55e6
 EBUILD msgpack-3.2.0.ebuild 1715 BLAKE2B 48a074fdc4f7e465d1339914853469eb240edecef610d6f4d81018bfd945601ad3891ac4e32e9fb9e36b4aa53052301546808519c5b54ca6ef65a72e66cc7f10 SHA512 7c1f10c53ab2f13a259bc43fc8e485f6d523b1bf9a9e21c36e367967d3f5e1fbc530cca28267e56ecff89fec41f3f3b918a6934da80da568f8182f3c644b21c8
-EBUILD msgpack-3.2.1.ebuild 1724 BLAKE2B 55a6691b776143a253cf727b382042c2ef67f9ecc1484981cffeab77ab85ccd7ee64e4e75bb397dd9ef150acde0b21c909630547d67728ffe9f897bfa493413e SHA512 e4e4e26d30aa7138ccdfcdb99cba3a281f12cb0db358eb79f5b30a967fe51290bbe80f8c254d12b15e5bd977d70838ceb34b7052713d1ee190287d131c935db0
+EBUILD msgpack-3.3.0.ebuild 1730 BLAKE2B d634a5064f4266b2b4d3be1625c1e9649b49105b63c658cfaa497c33482e69857bf982986bbc0aae1e4fdcb907e241965d2daa9ed21d8ec6ee3dff91d4a37959 SHA512 9b4d4947a34eefce90515841f676da14bc25213768e4c7226ca283f34adf979651581da9181b52082eb857d7235538de3dd2ac51ad16743574872cddd0bfa4e4
 MISC metadata.xml 409 BLAKE2B 7656515e9cbf76555dd77ba3350bfc3720d685f061aa2a4c9ef793c7d0eb0dcf327bd707f00a01b0d2be706ec79d62778cf7266998457a62f4291ccb1a5de194 SHA512 f56436ccd3ab6d2d5cf453e4eaeb8e3b79cd8d89a73c1c0ff17c2a47b1802641b20e41d75a12ea161f0a47e0236c84425a02cf8bb16e4b9d5b406fba4d2f1ec1
diff --git a/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch b/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch
deleted file mode 100644
index fc6cacd0a03c..000000000000
--- a/dev-libs/msgpack/files/msgpack-1.0.0-cflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- msgpack-1.0.0/CMakeLists.txt
-+++ msgpack-1.0.0/CMakeLists.txt
-@@ -213,10 +213,6 @@
-     ADD_SUBDIRECTORY (test)
- ENDIF ()
- 
--IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
--    SET_PROPERTY (TARGET msgpack APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3 -DPIC")
--    SET_PROPERTY (TARGET msgpack-static APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3" )
--ENDIF ()
- IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-     IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-         STRING(REGEX REPLACE "/W[0-4]" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
---- msgpack-1.0.0/test/CMakeLists.txt
-+++ msgpack-1.0.0/test/CMakeLists.txt
-@@ -52,9 +52,6 @@
-         ${CMAKE_THREAD_LIBS_INIT}
-     )
-     ADD_TEST (${source_file_we} ${source_file_we})
--    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
--        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -g -O3")
--    ENDIF ()
-     IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-         IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-             STRING(REGEX REPLACE "/W[0-4]" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
diff --git a/dev-libs/msgpack/files/msgpack-1.0.0-static.patch b/dev-libs/msgpack/files/msgpack-1.0.0-static.patch
deleted file mode 100644
index e40a9deaaece..000000000000
--- a/dev-libs/msgpack/files/msgpack-1.0.0-static.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- msgpack-1.0.0/CMakeLists.txt
-+++ msgpack-1.0.0/CMakeLists.txt
-@@ -17,6 +17,7 @@
- 
- OPTION (MSGPACK_CXX11 "Using c++11 compiler" OFF)
- OPTION (MSGPACK_32BIT "32bit compile" OFF)
-+OPTION (MSGPACK_STATIC "Build static library" ON)
- 
- IF (MSGPACK_CXX11)
-    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-@@ -196,12 +197,15 @@
-     ${msgpack_HEADERS}
- )
- 
--ADD_LIBRARY (msgpack-static STATIC
--    ${msgpack_SOURCES}
--    ${msgpack_HEADERS}
--)
-+IF (MSGPACK_STATIC)
-+    ADD_LIBRARY (msgpack-static STATIC
-+        ${msgpack_SOURCES}
-+        ${msgpack_HEADERS}
-+    )
-+    SET_TARGET_PROPERTIES (msgpack-static PROPERTIES OUTPUT_NAME "msgpack")
-+    INSTALL (TARGETS msgpack-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+ENDIF ()
- 
--SET_TARGET_PROPERTIES (msgpack-static PROPERTIES OUTPUT_NAME "msgpack")
- SET_TARGET_PROPERTIES (msgpack PROPERTIES IMPORT_SUFFIX "_import.lib")
- SET_TARGET_PROPERTIES (msgpack PROPERTIES SOVERSION 3 VERSION 4.0.0)
- 
-@@ -233,7 +237,7 @@
-     SET(CMAKE_INSTALL_LIBDIR lib)
- ENDIF ()
- 
--INSTALL (TARGETS msgpack msgpack-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+INSTALL (TARGETS msgpack DESTINATION ${CMAKE_INSTALL_LIBDIR})
- INSTALL (DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
- INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
- 
diff --git a/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch b/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch
deleted file mode 100644
index 2fc9bb46e4bf..000000000000
--- a/dev-libs/msgpack/files/msgpack-1.1.0-gcc6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Bug: https://bugs.gentoo.org/623492
-Backported from: https://github.com/msgpack/msgpack-c/commit/66a5fcf8f1a9e57b02904a6ac55a86a9c74ea1de
-
---- a/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
-+++ b/include/msgpack/adaptor/detail/cpp11_msgpack_tuple.hpp
-@@ -46,13 +46,14 @@
-     public:
-         using base = std::tuple<Types...>;
- 
--        using base::base;
- 
--        tuple() = default;
-         tuple(tuple const&) = default;
-         tuple(tuple&&) = default;
- 
-         template<typename... OtherTypes>
-+        tuple(OtherTypes&&... other):base(std::forward<OtherTypes>(other)...) {}
-+
-+        template<typename... OtherTypes>
-         tuple(tuple<OtherTypes...> const& other):base(static_cast<std::tuple<OtherTypes...> const&>(other)) {}
-         template<typename... OtherTypes>
-         tuple(tuple<OtherTypes...> && other):base(static_cast<std::tuple<OtherTypes...> &&>(other)) {}
diff --git a/dev-libs/msgpack/msgpack-1.1.0.ebuild b/dev-libs/msgpack/msgpack-1.1.0.ebuild
deleted file mode 100644
index 934638604a4a..000000000000
--- a/dev-libs/msgpack/msgpack-1.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
-HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+cxx static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.0-cflags.patch
-	"${FILESDIR}"/${PN}-1.0.0-static.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMSGPACK_ENABLE_CXX=$(usex cxx)
-		-DMSGPACK_STATIC=$(usex static-libs)
-		-DMSGPACK_BUILD_TESTS=$(usex test)
-	)
-
-	cmake-multilib_src_configure
-}
diff --git a/dev-libs/msgpack/msgpack-3.1.1.ebuild b/dev-libs/msgpack/msgpack-3.1.1.ebuild
deleted file mode 100644
index 9f05ddf33b7d..000000000000
--- a/dev-libs/msgpack/msgpack-3.1.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-multilib
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
-HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
-
-LICENSE="Boost-1.0"
-SLOT="0/2"
-IUSE="boost +cxx doc examples static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="boost? ( dev-libs/boost[context,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-	)
-	doc? ( app-doc/doxygen[dot] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMSGPACK_BOOST="$(usex boost)"
-		-DMSGPACK_ENABLE_CXX="$(usex cxx)"
-		-DMSGPACK_ENABLE_STATIC="$(usex static-libs)"
-		-DMSGPACK_BUILD_TESTS="$(usex test)"
-		# don't build the examples
-		-DMSGPACK_BUILD_EXAMPLES=OFF
-		# enable C++11 by default
-		-DMSGPACK_CXX11=ON
-	)
-	cmake-multilib_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_make doxygen
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		if use doc; then
-			local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
-
-			mkdir docs || die
-			mv doc_c/html docs/c || die
-
-			use cxx && mv doc_cpp/html docs/cpp || die
-		fi
-
-		if use examples; then
-			docinto examples
-
-			dodoc -r "${WORKDIR}/${P}/example/."
-
-			docompress -x /usr/share/doc/${PF}/examples
-		fi
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-libs/msgpack/msgpack-3.2.1.ebuild b/dev-libs/msgpack/msgpack-3.3.0.ebuild
index a1129dcdc409..c21dd416d641 100644
--- a/dev-libs/msgpack/msgpack-3.2.1.ebuild
+++ b/dev-libs/msgpack/msgpack-3.3.0.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 if [[ ${PV} == 9999 ]]; then
@@ -9,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
@@ -20,16 +22,16 @@ SLOT="0/2"
 IUSE="boost +cxx doc examples static-libs test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="doc? ( app-doc/doxygen[dot] )"
 RDEPEND="boost? ( dev-libs/boost[context,${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	test? (
 		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
 		sys-libs/zlib[${MULTILIB_USEDEP}]
 	)
-	doc? ( app-doc/doxygen[dot] )
 "
 
-src_configure() {
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DMSGPACK_BOOST="$(usex boost)"
 		-DMSGPACK_ENABLE_CXX="$(usex cxx)"
@@ -40,14 +42,15 @@ src_configure() {
 		# enable C++11 by default
 		-DMSGPACK_CXX11=ON
 	)
-	cmake-multilib_src_configure
+
+	cmake_src_configure
 }
 
 multilib_src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if multilib_is_native_abi && use doc; then
-		cmake-utils_src_make doxygen
+		emake doxygen
 	fi
 }
 
@@ -64,12 +67,10 @@ multilib_src_install() {
 
 		if use examples; then
 			docinto examples
-
 			dodoc -r "${WORKDIR}/${P}/example/."
-
 			docompress -x /usr/share/doc/${PF}/examples
 		fi
 	fi
 
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index e1502489f6f6..98453a7506a3 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -3,7 +3,9 @@ AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84
 DIST opencl-clang-10.0.0.1.tar.gz 23549 BLAKE2B 8663da4525507862835ebc14fb4666d9f2f3cca0a2c08aadfc2875bc285e604e81b21ccc7476976eea2e3eb1ce88ae7b187c2d0ce085fc3ede1a2dbfea0789eb SHA512 406e27d90ae26a2f8ade04172bf680f8786011c7e8357a40b15c8bbfd933d0f1c5e0c114e371036318439fcab999ec5f141dab2df4b498eb9d2548bf175f8502
 DIST opencl-clang-10.0.0.2.tar.gz 53935 BLAKE2B a0f1c1d8f9e4be24e63318daf38fc70a0372ee1dc5cb2443831b6bf64dd3d44ac3f52ca70de5f52dabab2b34a53d4efafd9c19598b471e6f3b855355c03cf4af SHA512 817cc7d977629e63b9d61bdf7ec8e93596f28102a321927507b035397c99e6e6eda1e5f36d0ed59c9949ba12baab32b138f5053a6bc84ba74211e199ddbf3109
 DIST opencl-clang-9.0.1.tar.gz 24574 BLAKE2B 2e3b69c10b572678f91e92fa0ca885dd9332d172c483c394f4c1b140a5fd926b26eff4d4ab722733e1e164ff99a6eb397b8bc9e30a0b7e289506432fd1291b2b SHA512 01c5011dc1ea66288f3e425f85c921142fd3bc5a3d79eeafe5c14b5741b8281f17727cbffa7ed31869f7704be957d2fed5e5e8a57ab31e7b8c3a9688f048cced
+EBUILD opencl-clang-10.0.0.1-r1.ebuild 1136 BLAKE2B d6f1bbe34d2af79dfd9aec8246ba785c0befd4da31948d86ef5bdc495e69b20fe3b9a1c3af3c0a535f90e782a7d02f51438bdb8f78b95f36e8976130b926259f SHA512 16f6191679ac3268e201b1d03c76473f1660bb9747dca49f6cbfa37826f8bb28150c2811294ab501d23aafc710ecf2040de67804d3ba1203711f04ec95da348e
 EBUILD opencl-clang-10.0.0.1.ebuild 977 BLAKE2B c999d6908707986a138485141b441eb95ca55d07e839bbd8d2b613ce846450f137aeb5bcaf2dd3e6c48f91202d70f0c7c640f8ad3a6e1c3c1cb043b1c41f32c9 SHA512 e484696df78c482232406c8fffae4e6af3d2c3b73a95ebc40b79608d3c67418f3adf241a91e2bebc2868722d62e3eb3fea56ea7a9e89ed91dc4199ef97761e6d
+EBUILD opencl-clang-10.0.0.2-r1.ebuild 1156 BLAKE2B 267d9b3b910ec6e141aaa7ae309eae9b50f5212f5d56084ae4c339f1df563839ac24292d199544e152fc0f39e12dab5e8c9268470ca36deb0fc98bdef381d84a SHA512 647d1edbd6d2a69ea16e5388c56e0b933c0c5dce741b028a1369a07398fc485bb30cf4836641bb23faf68f63c0196a11300499e65ad67a4ae00de20dd2a1bfb8
 EBUILD opencl-clang-10.0.0.2.ebuild 997 BLAKE2B 0dd9f22f085765e93f5652bcc2ee128950df801dc820a6c53a3cfc3dafe381afdf1985dd679b7484d12cacb8a2cfcec430d7b35be2338cffc6e94dd98243e80f SHA512 cb0a15b2a66830dfa2e45800b8a3e3430fa7edb32840efd51f7a1fe3c729376614c9e930d4fdcead87d38caaf2543ba718cc2d9f7b95cd5616266a78326f0ec6
 EBUILD opencl-clang-9.0.1.ebuild 869 BLAKE2B 4a19199ca6e9141ba8ecbfabe949d328aa54f51619aa8842f32cad1cd45d98ad2743a8b233db7b2e8bbe9f917bb4714656f2fcaa23772cec6b4eabd110316fca SHA512 2915ec087251d6ddcc3f24cd3fabfb03b8cdc05c99a62c1608e7d423ecc7521070ad1d56a993cde42edeba828e22c780ed8bcf21fbeb0e850a745ab2ff77a5a0
 MISC metadata.xml 329 BLAKE2B d50cf1fac225c2240bd4af19962089d9b7446549d9cc7067d860218e76013acfbc65f40abfffded01c098b06dd4c8a5688c94e40710ecdf6e7db71e05816498d SHA512 de4a3177f7091c00cd54f5eb52d8d88ae88d207ca72acd71c824220593d27ebdbf3673459ab48440373af19eb88603a5fcdd5956597d816927c9663be177eccb
diff --git a/dev-libs/opencl-clang/opencl-clang-10.0.0.1-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.1-r1.ebuild
new file mode 100644
index 000000000000..362abf92b92f
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-10.0.0.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib llvm
+
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="10"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${MY_P}"
+
+# Force a rebuild of this package once clang has been updated from 10.0.0 to 10.0.1
+# in order to work around Bug #743992. Hopefully a one-time thing.
+DEPEND="~sys-devel/clang-10.0.1:10=[static-analyzer,${MULTILIB_USEDEP}]
+	sys-devel/llvm:10=[${MULTILIB_USEDEP}]
+	dev-util/spirv-llvm-translator:10=[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+LLVM_MAX_SLOT=10
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/opencl-clang/opencl-clang-10.0.0.2-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.2-r1.ebuild
new file mode 100644
index 000000000000..1c81dddfcdf5
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-10.0.0.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib llvm
+
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="10"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${MY_P}"
+
+# Force a rebuild of this package once clang has been updated from 10.0.0 to 10.0.1
+# in order to work around Bug #743992. Hopefully a one-time thing.
+DEPEND="~sys-devel/clang-10.0.1:10=[static-analyzer,${MULTILIB_USEDEP}]
+	sys-devel/llvm:10=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-llvm-translator-10.0.0_p20200909:10=[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+LLVM_MAX_SLOT=10
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+	"${FILESDIR}"/${PN}-10.0.0.1_find-llvm-tblgen.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index f46298843f24..b3f0895c592a 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -9,18 +9,13 @@ AUX protobuf-3.12.0-system_libraries.patch 6352 BLAKE2B 17f24c6cdcc845dada12424f
 AUX protobuf-3.13.0-disable_no-warning-test.patch 965 BLAKE2B e9a5eb9887ef2088ad0ce06375aedb36deeed3cd60a557e1d9972609fa5d5faa8e04c4d758a6ff0916f2a9d4c1b886a7197ded35501fbdf712ea985d442f8b43 SHA512 536b968f9a95d19236d034be3194b6d750dcb5619677817aaa5191a70370a646e4ad475a89592b6e96c44fc1ae380e782483afe4263617d7e03af2d5b06731fe
 AUX protobuf-3.13.0-protoc_input_output_files.patch 10321 BLAKE2B 3973d819c43f30d81d162b0ff167582f2983ca2752b33315e7f0b462068d437b8fe7b6faac9d3dd96f17740919ed51b19837e75b96791d765f347415ae893fcb SHA512 5812e471f83ec368886e2682f84ff5c92ad6b2a897e1cba3a1b8fbf291c0349d411ac06bc013d514fdc42eb40559f6d78bcebbe5826ab1efcbb1f851db1b74e5
 AUX protobuf-3.13.0-system_libraries.patch 6352 BLAKE2B a615d54449fe8bad5d9c7f0b4f03c0ded27c3fc4dc7d0fd6fc78874e65096731a5436a2569396ccd13c5f185bf73823eb70274e71c1bc35cccc820a2318ace5c SHA512 4a2f0fdd2512c8e8abd108bfb986d788153c2ccd761318fe05aef49f268814f2f6f35350bf2fadaafe3e5250521739cc5660f0106437f75831a8704fa755f817
-AUX protobuf-3.8.0-disable_no-warning-test.patch 965 BLAKE2B 0183ed17104e192fbd9efb4739a41ec2d6f39e31cf6aacb141f4e5015335096321491d68748613ef18eacdc57437b111a15b5b4762b0b339c716b98dc1b7041d SHA512 37846745f1e88fda8dc84a829e266e8f8d2c98a075750b2e548fa2b8f34a97d37b6b5200e880fc29a9682fb95a8c75567b53bca532859068a7b379540940067a
-AUX protobuf-3.8.0-protoc_input_output_files.patch 10351 BLAKE2B 54115688e2fb6a7b8c33cd2efb4dddd777f4d536f4b078badb60d6e458766b69c915fe4091f4ca379eee59d75875bcab9837a96bc461b6a60c15b93000fa7e38 SHA512 2e18b47aa82a035a76c45d6f80de7818449f6358e0e253cb6330158bf9d5b213052b372797189246eaeebea8497b289e8a0de16441f25bcae81ab807733bcf60
-AUX protobuf-3.8.0-system_libraries.patch 6352 BLAKE2B fde8a49ac3034320d9ae03479127946b1b50a0fe64d388132a129d8cd0a5cb6eb82565e82089fd1dada83848ef494fa87eac8dec4cd4b90dde580123dbe7f006 SHA512 0264d20c585312345315364a4732905abcca569535460d274528ddb6dcef6cdcb9661804f22c8cb209a7123fb41df7974ac739baa65debe0b676b2b902482d4a
-DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
 DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
 DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 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 3026 BLAKE2B 2947ec5816430b051e9d1d279e66057230e371d94e5196aa09349ea1e41d88fb9f07d833cc56a7d8991c3da7260c69450ae7c5047369f85c0020a61e3f72aa72 SHA512 703f0930a9890ca2826783c3676189c55c3fa9bd3827f7b6b5f4b5873bcb3e020b6b7db40676c089728b54d49b7acecd6576d938218afc57e9a3f5209da0f005
-EBUILD protobuf-3.12.4.ebuild 3218 BLAKE2B a201cc755244f015986e90255fbe0d1a95e25d348a851b44c2a14fa1dcf93927f6a8b77822ef2f5bec4971583c115da71e0ff85f3ad5b03b0ef09d58c9a3821e SHA512 8b4931aa05a0571ddcc0944ecf04d2ca8335d09b9bf3f1f7344ee5afb63e7ff63f0981c720f280ef858e63adddc4d1c31de3a81d29155bcfb87e0cbe5bedff8f
+EBUILD protobuf-3.12.2.ebuild 3023 BLAKE2B 17edacc34ba8056d3da2ce8b04501fa7548f4c119ee1f2715d901109a776f3c94fedd2420d68bbc2994b1125f39b5ab384d9e962ac0b7b4328036bbeb1209faf SHA512 40bb0f399d6c5761fbaefaa9a934a21ce7de263e096334e596400aababa2856b0e178fc0e14c55b083a1c4805044c86511c7d673d5d326f0d536ccd7b535ab16
+EBUILD protobuf-3.12.4.ebuild 3216 BLAKE2B 00884ac0dbfbe0f0219278f0af46510a8c706a01e5085266913f09438b03883a39b681100867b1fd5dc9fd4e7719b22c1e881c1513ef9b2c09242a221a19fcb5 SHA512 194f2956012785bf70ecdcc672ae57cbf80c26ea527a24acc221095a2c814e917eb26ac22aff33d5915cc2568fae11d99c1639f734f2f1da043c950a686c7631
 EBUILD protobuf-3.13.0.ebuild 3218 BLAKE2B c3a7389f4da1d9ff6f1628b504897ebc1e72ae02c33d713b7625cbd30ff74e4a5cc8e9823005e6d31512edbe4cb06ab09de35bd9d65b003003fc6437b2cbfab8 SHA512 6462ef2647c0ee9ea3d703afd7402aaf337ec3078fe5fe0219cd7f157101446f3df863063427863604fac0f61f8def5df61255020b095c8ab4aa7b09426f478f
 EBUILD protobuf-9999.ebuild 2672 BLAKE2B 19039df5ff9af194b335978f77c6ac9f8ed3387840e01c449e7661ce628129a1bc9de5938c453a08e21d9ce6e0d734430796aa911135a3c43c84557500da43ad SHA512 32744cffb2e57592c6475845bebc5dc221a8cd933a057699c2203205ed93828041e4b6242aa34c1e07d5f36cb24573a675ef0bbf9ab3fc56e341e3e31acbec47
 MISC metadata.xml 627 BLAKE2B e908d6d2ab7bf7886f09af02f2a2828bcd9d6909ad7b421e0879551c24ab382733c2140def8132c70d7b6a0f8074651773476e9a645c64440ef596a7f62319d0 SHA512 2f60739bbea23091942893776b29257ed556c3d98351e0e9455852e8ea6b275d3ecca613c81ed35c009431c3e5fb378a77259f13c470359526ccbdff4033d86b
diff --git a/dev-libs/protobuf/files/protobuf-3.8.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.8.0-disable_no-warning-test.patch
deleted file mode 100644
index a09edb9ef368..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.8.0-disable_no-warning-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Disable no-warning-test which is compiled with -Werror option and whose only purpose is checking if compilation results in any warnings.
-
---- /src/Makefile.am
-+++ /src/Makefile.am
-@@ -715,7 +715,7 @@
- GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
-                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
--                 no-warning-test $(GZCHECKPROGRAMS)
-+                 $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-                       $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
-                       $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
-@@ -899,4 +899,4 @@
- 
- TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
-         google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)     \
--        protobuf-lite-arena-test no-warning-test
-+        protobuf-lite-arena-test
diff --git a/dev-libs/protobuf/files/protobuf-3.8.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.8.0-protoc_input_output_files.patch
deleted file mode 100644
index fafd4bdb8f96..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.8.0-protoc_input_output_files.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-https://github.com/protocolbuffers/protobuf/pull/235
-
---- /src/google/protobuf/compiler/command_line_interface.cc
-+++ /src/google/protobuf/compiler/command_line_interface.cc
-@@ -949,6 +949,28 @@
-   }
- 
-   if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
-+    bool success = false;
-+    int in_fd = STDIN_FILENO;
-+    int out_fd = STDOUT_FILENO;
-+
-+    if (!protobuf_in_path_.empty()) {
-+      in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
-+      if (in_fd == -1) {
-+        std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl;
-+        return 1;
-+      }
-+    }
-+    if (!protobuf_out_path_.empty()) {
-+      out_fd = open(protobuf_out_path_.c_str(),
-+                    O_WRONLY | O_CREAT | O_TRUNC,
-+                    0644);
-+      if (out_fd == -1) {
-+        std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl;
-+        close(in_fd);
-+        return 1;
-+      }
-+    }
-+
-     if (codec_type_.empty()) {
-       // HACK:  Define an EmptyMessage type to use for decoding.
-       DescriptorPool pool;
-@@ -957,13 +979,20 @@
-       file.add_message_type()->set_name("EmptyMessage");
-       GOOGLE_CHECK(pool.BuildFile(file) != NULL);
-       codec_type_ = "EmptyMessage";
--      if (!EncodeOrDecode(&pool)) {
--        return 1;
--      }
-+      success = EncodeOrDecode(&pool, in_fd, out_fd);
-     } else {
--      if (!EncodeOrDecode(descriptor_pool.get())) {
--        return 1;
--      }
-+      success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
-+    }
-+
-+    if (in_fd != STDIN_FILENO) {
-+      close(in_fd);
-+    }
-+    if (out_fd != STDOUT_FILENO) {
-+      close(out_fd);
-+    }
-+
-+    if (!success) {
-+      return 1;
-     }
-   }
- 
-@@ -1001,6 +1030,11 @@
-   for (int i = 0; i < proto_path_.size(); i++) {
-     source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
-   }
-+  if (mode_ == MODE_COMPILE &&
-+      (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
-+    std::cerr << "--protobuf_in and --protobuf_out are only valid with "
-+         << "decode operations. Ignoring.";
-+  }
- 
-   // Map input files to virtual paths if possible.
-   if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
-@@ -1627,6 +1661,12 @@
- 
-     codec_type_ = value;
- 
-+  } else if (name == "--protobuf_in") {
-+    protobuf_in_path_ = value;
-+
-+  } else if (name == "--protobuf_out") {
-+    protobuf_out_path_ = value;
-+
-   } else if (name == "--error_format") {
-     if (value == "gcc") {
-       error_format_ = ERROR_FORMAT_GCC;
-@@ -1763,29 +1803,50 @@
-          "  -h, --help                  Show this text and exit.\n"
-          "  --encode=MESSAGE_TYPE       Read a text-format message of the "
-          "given type\n"
--         "                              from standard input and write it in "
--         "binary\n"
--         "                              to standard output.  The message type "
--         "must\n"
-+         "                              and write it in binary.  The message "
-+         "type must\n"
-          "                              be defined in PROTO_FILES or their "
-          "imports.\n"
-+         "                              The input/output protobuf files are "
-+         "specified\n"
-+         "                              using the --protobuf_in and "
-+         "--protobuf_out\n"
-+         "                              command line flags.\n"
-          "  --decode=MESSAGE_TYPE       Read a binary message of the given "
--         "type from\n"
--         "                              standard input and write it in text "
--         "format\n"
--         "                              to standard output.  The message type "
--         "must\n"
--         "                              be defined in PROTO_FILES or their "
--         "imports.\n"
-+         "type and\n"
-+         "                              write it in text format.  The message "
-+         "type\n"
-+         "                              must be defined in PROTO_FILES or "
-+         "their imports.\n"
-+         "                              The input/output protobuf files are "
-+         "specified\n"
-+         "                              using the --protobuf_in and "
-+         "--protobuf_out\n"
-+         "                              command line flags.\n"
-          "  --decode_raw                Read an arbitrary protocol message "
--         "from\n"
--         "                              standard input and write the raw "
--         "tag/value\n"
--         "                              pairs in text format to standard "
--         "output.  No\n"
-+         "and write\n"
-+         "                              the raw tag/value pairs in text format."
-+         "  No\n"
-          "                              PROTO_FILES should be given when using "
-          "this\n"
--         "                              flag.\n"
-+         "                              flag.  The input/output protobuf files "
-+         "are\n"
-+         "                              specified using the --protobuf_in and\n"
-+         "                              --protobuf_out command line flags.\n"
-+         "  --protobuf_in=FILE          Absolute path to the protobuf file "
-+         "from which\n"
-+         "                              input of encoding/decoding operation "
-+         "will be\n"
-+         "                              read.  If omitted, input will be read "
-+         "from\n"
-+         "                              standard input.\n"
-+         "  --protobuf_out=FILE         Absolute path to the protobuf file "
-+         "to which\n"
-+         "                              output of encoding/decoding operation "
-+         "will be\n"
-+         "                              written.  If omitted, output will be "
-+         "written to\n"
-+         "                              standard output.\n"
-          "  --descriptor_set_in=FILES   Specifies a delimited list of FILES\n"
-          "                              each containing a FileDescriptorSet "
-          "(a\n"
-@@ -2101,7 +2162,9 @@
-   return true;
- }
- 
--bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
-+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool,
-+                                          int in_fd,
-+                                          int out_fd) {
-   // Look up the type.
-   const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
-   if (type == NULL) {
-@@ -2113,15 +2176,15 @@
-   std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
- 
-   if (mode_ == MODE_ENCODE) {
--    SetFdToTextMode(STDIN_FILENO);
--    SetFdToBinaryMode(STDOUT_FILENO);
-+    SetFdToTextMode(in_fd);
-+    SetFdToBinaryMode(out_fd);
-   } else {
--    SetFdToBinaryMode(STDIN_FILENO);
--    SetFdToTextMode(STDOUT_FILENO);
-+    SetFdToBinaryMode(in_fd);
-+    SetFdToTextMode(out_fd);
-   }
- 
--  io::FileInputStream in(STDIN_FILENO);
--  io::FileOutputStream out(STDOUT_FILENO);
-+  io::FileInputStream in(in_fd);
-+  io::FileOutputStream out(out_fd);
- 
-   if (mode_ == MODE_ENCODE) {
-     // Input is text.
---- /src/google/protobuf/compiler/command_line_interface.h
-+++ /src/google/protobuf/compiler/command_line_interface.h
-@@ -286,7 +286,9 @@
-       GeneratorContext* generator_context, std::string* error);
- 
-   // Implements --encode and --decode.
--  bool EncodeOrDecode(const DescriptorPool* pool);
-+  bool EncodeOrDecode(const DescriptorPool* pool,
-+                      int in_fd,
-+                      int out_fd);
- 
-   // Implements the --descriptor_set_out option.
-   bool WriteDescriptorSet(
-@@ -418,6 +420,13 @@
-   // parsed FileDescriptorSets to be used for loading protos.  Otherwise, empty.
-   std::vector<std::string> descriptor_set_in_names_;
- 
-+  // When using --encode / --decode / --decode_raw absolute path to the output
-+  // file. (Empty string indicates write to STDOUT).
-+  std::string protobuf_out_path_;
-+  // When using --encode / --decode / --decode_raw, absolute path to the input
-+  // file. (Empty string indicates read from STDIN).
-+  std::string protobuf_in_path_;
-+
-   // If --descriptor_set_out was given, this is the filename to which the
-   // FileDescriptorSet should be written.  Otherwise, empty.
-   std::string descriptor_set_out_name_;
---- /src/google/protobuf/compiler/command_line_interface_unittest.cc
-+++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
-@@ -95,7 +95,7 @@
-   virtual void SetUp();
-   virtual void TearDown();
- 
--  // Runs the CommandLineInterface with the given command line.  The
-+  // Run the CommandLineInterface with the given command line.  The
-   // command is automatically split on spaces, and the string "$tmpdir"
-   // is replaced with TestTempDir().
-   void Run(const std::string& command);
-@@ -2335,6 +2335,17 @@
-     EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_));
-   }
- 
-+  void ExpectBinaryFilesMatch(const string &expected_file,
-+                              const string &actual_file) {
-+    string expected_output, actual_output;
-+    ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output));
-+    ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output));
-+
-+    // Don't use EXPECT_EQ because we don't want to print raw binary data to
-+    // stdout on failure.
-+    EXPECT_TRUE(expected_output == actual_output);
-+  }
-+
-  private:
-   void WriteUnittestProtoDescriptorSet() {
-     unittest_proto_descriptor_set_filename_ =
-@@ -2429,6 +2440,19 @@
-       "net/proto2/internal/no_such_file.proto: No such file or directory\n");
- }
- 
-+TEST_P(EncodeDecodeTest, RedirectInputOutput) {
-+  string out_file = TestTempDir() + "/golden_message_out.pbf";
-+  EXPECT_TRUE(
-+      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
-+          " --encode=protobuf_unittest.TestAllTypes" +
-+          " --protobuf_in=" + TestUtil::GetTestDataPath(
-+              "net/proto2/internal/"
-+              "testdata/text_format_unittest_data_oneof_implemented.txt") +
-+          " --protobuf_out=" + out_file));
-+  ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath(
-+      "net/proto2/internal/testdata/golden_message_oneof_implemented"));
-+}
-+
- INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest,
-                          testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
- }  // anonymous namespace
diff --git a/dev-libs/protobuf/files/protobuf-3.8.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.8.0-system_libraries.patch
deleted file mode 100644
index 020b0cc74aaa..000000000000
--- a/dev-libs/protobuf/files/protobuf-3.8.0-system_libraries.patch
+++ /dev/null
@@ -1,121 +0,0 @@
---- /Makefile.am
-+++ /Makefile.am
-@@ -11,28 +11,10 @@
- # Always include third_party directories in distributions.
- DIST_SUBDIRS = src conformance benchmarks third_party/googletest
- 
--# Build gmock before we build protobuf tests.  We don't add gmock to SUBDIRS
--# because then "make check" would also build and run all of gmock's own tests,
--# which takes a lot of time and is generally not useful to us.  Also, we don't
--# want "make install" to recurse into gmock since we don't want to overwrite
--# the installed version of gmock if there is one.
- check-local:
--	@echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
--	@cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
--	@cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
- 
--# We would like to clean gmock when "make clean" is invoked.  But we have to
--# be careful because clean-local is also invoked during "make distclean", but
--# "make distclean" already recurses into gmock because it's listed among the
--# DIST_SUBDIRS.  distclean will delete gmock/Makefile, so if we then try to
--# cd to the directory again and "make clean" it will fail.  So, check that the
--# Makefile exists before recursing.
- clean-local:
--	@if test -e third_party/googletest/Makefile; then \
--	  echo "Making clean in googletest"; \
--	  cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \
--	fi; \
--	if test -e conformance/Makefile; then \
-+	@if test -e conformance/Makefile; then \
- 	  echo "Making clean in conformance"; \
- 	  cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \
- 	fi; \
---- /configure.ac
-+++ /configure.ac
-@@ -218,12 +218,5 @@
- esac
- AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])
- 
--# HACK:  Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
--#   since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
--#   too.
--export CFLAGS
--export CXXFLAGS
--AC_CONFIG_SUBDIRS([third_party/googletest])
--
- AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
- AC_OUTPUT
---- /src/Makefile.am
-+++ /src/Makefile.am
-@@ -709,19 +709,11 @@
-   google/protobuf/testing/file.cc                              \
-   google/protobuf/testing/file.h
- 
--GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest
--GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock
--GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
--GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
- check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
-                  protobuf-lite-test test_plugin protobuf-lite-arena-test \
-                  $(GZCHECKPROGRAMS)
- protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
--                         -I$(GOOGLEMOCK_SRC_DIR)/include
-+                      -lgtest -lgmock -lgmock_main
- # Disable optimization for tests unless the user explicitly asked for it,
- # since test_util.cc takes forever to compile with optimization (with GCC).
- # See configure.ac for more info.
-@@ -810,12 +802,8 @@
- # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
- protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
-                       libprotoc.la                                   \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
--                                         -I$(GOOGLETEST_SRC_DIR)/include \
--                                         -DPROTOBUF_TEST_NO_DESCRIPTORS
-+                      -lgtest -lgmock -lgmock_main
-+protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
- protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lazy_descriptor_test_SOURCES =                        \
-   google/protobuf/compiler/cpp/cpp_unittest.cc                 \
-@@ -836,11 +824,7 @@
- # full runtime and we want to make sure this test builds without full
- # runtime.
- protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
--                           $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
--                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
--                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \
--                             -I$(GOOGLETEST_SRC_DIR)/include
-+                           -lgtest -lgmock -lgmock_main
- protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lite_test_SOURCES =                                           \
-   google/protobuf/lite_unittest.cc                                     \
-@@ -852,11 +836,7 @@
- # gtest when building the test internally our memory sanitizer doesn't detect
- # memory leaks (don't know why).
- protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
--                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
--                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
--protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include  \
--                                    -I$(GOOGLETEST_SRC_DIR)/include
-+                      -lgtest -lgmock -lgmock_main
- protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
- protobuf_lite_arena_test_SOURCES =       \
-   google/protobuf/lite_arena_unittest.cc \
-@@ -866,8 +846,7 @@
- 
- # Test plugin binary.
- test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
--                    $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
--test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
-+                    -lgtest
- test_plugin_SOURCES =                                          \
-   google/protobuf/compiler/mock_code_generator.cc              \
-   google/protobuf/testing/file.cc                              \
diff --git a/dev-libs/protobuf/protobuf-3.10.1.ebuild b/dev-libs/protobuf/protobuf-3.10.1.ebuild
deleted file mode 100644
index 53bd166190bc..000000000000
--- a/dev-libs/protobuf/protobuf-3.10.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/21"
-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 )"
-
-BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
-DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.8.0-disable_no-warning-test.patch"
-	"${FILESDIR}/${PN}-3.8.0-system_libraries.patch"
-	"${FILESDIR}/${PN}-3.8.0-protoc_input_output_files.patch"
-)
-
-DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
-
-src_prepare() {
-	default
-
-	# https://github.com/protocolbuffers/protobuf/issues/7413
-	sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
-
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local options=(
-		$(use_enable static-libs static)
-		$(use_with zlib)
-	)
-
-	if tc-is-cross-compiler; then
-		# Build system uses protoc when building, so protoc copy runnable on host is needed.
-		mkdir -p "${WORKDIR}/build" || die
-		pushd "${WORKDIR}/build" > /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${options[@]}"
-		options+=(--with-protoc="$(pwd)/src/protoc")
-		popd > /dev/null || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${options[@]}"
-}
-
-src_compile() {
-	multilib-minimal_src_compile
-
-	if use emacs; then
-		elisp-compile editors/protobuf-mode.el
-	fi
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		emake -C "${WORKDIR}/build/src" protoc
-	fi
-
-	default
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	find "${D}" -name "*.la" -type f -delete || die
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins editors/proto.vim
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/proto.vim"
-
-	if use emacs; then
-		elisp-install ${PN} editors/protobuf-mode.el*
-		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
-	fi
-
-	if use examples; then
-		DOCS+=(examples)
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-libs/protobuf/protobuf-3.12.2.ebuild b/dev-libs/protobuf/protobuf-3.12.2.ebuild
index ec32fddd43b9..2bc0efa743dc 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/protobuf/protobuf-3.12.4.ebuild b/dev-libs/protobuf/protobuf-3.12.4.ebuild
index c21840f05fc8..1229fc8ca166 100644
--- a/dev-libs/protobuf/protobuf-3.12.4.ebuild
+++ b/dev-libs/protobuf/protobuf-3.12.4.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/re2/Manifest b/dev-libs/re2/Manifest
index 3ea96787d7f9..e394a1534357 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,7 +1,3 @@
-DIST re2-2020-06-01.tar.gz 403203 BLAKE2B 46270c39fdb9eda127752e97e5dfea24a6cb9ddc32bfc298e123eb29609a003fd1a7a3591e760944ec36721ee1981f9bdbbc0b04d596764922e6bbc3daa9159c SHA512 8592a5409cb087c3188023746a4121bd58972a7a21bae98022af587f6191b3096bbb5d379e622ea853ff3373c76972fb61f331354550715c9a7e77d08fba6f3c
-DIST re2-2020-07-06.tar.gz 404055 BLAKE2B 1dca93ec928ef508aa30c44889d3f451acdf1f4430dc62b05c256790cb755e30ec5fac6aca23d44ad57eb61b0971437529bf63fb89b4bd7bf1937748046e61a9 SHA512 5ff5b0fa80d28a5c1cd56e42de4392899347e083c8eedb79282763b8967d301e0d287223e2b1a140cc30f7420a4a1aed5d7be0b68e8f5d2e8813ab4bfa64c103
 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 1347 BLAKE2B bdb9fc615575c109a7ccbc389d2726f8d1f5f183d6d8abe4b1f46bb95f208b3e900d90fd39bf432dc156d662adf51fe7de3056a988b30b05864d3c584e8b9d15 SHA512 df2f0f8eaa7519bb0b92b1f410bc8d1ce7e5c2c27e1bdf6f995868ac3a9c63cd9ccdaf595ccf65aaf5de4d175d2082caa168347b604188fb392aa512feabc68e
+EBUILD re2-0.2020.08.01.ebuild 1345 BLAKE2B e5f9646ea36c54b50b5e4e5eced5fc37181f28dc1c951e6e07970f16ca88402531f233d17cc9b80a6c0ac835bf15860689277be1089b1e343c22a99ab97f36bc SHA512 1a83552bd446f1fa5e4e9eba72a60d22ee3e542a55ff798d7e6eef85d328f80dfc6a0e48afdc990e662c1aa6cbb5eea414209cb2601417496f8e27201356a5bb
 MISC metadata.xml 471 BLAKE2B d5263d5aa06995cb4abacde849d1f7d970a7c365654fc25c4e4fd9c423f9a99f21e86f60abd8bb50bcba08aed799f510353e6baf23b42299c294b77f95d657fd SHA512 7534d637458ea189e20f259c9f039629f9b5fc738750d8d6e1050163aa147ec447d38ed93df98cedc71510be3fc5949c9084f63da86c12bdfd0c109122a001a8
diff --git a/dev-libs/re2/re2-0.2020.06.01.ebuild b/dev-libs/re2/re2-0.2020.06.01.ebuild
deleted file mode 100644
index b1b73d54da92..000000000000
--- a/dev-libs/re2/re2-0.2020.06.01.ebuild
+++ /dev/null
@@ -1,52 +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
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="7"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="icu"
-
-BDEPEND="icu? ( virtual/pkgconfig )"
-DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	default
-	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}" shared
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
-}
diff --git a/dev-libs/re2/re2-0.2020.07.06.ebuild b/dev-libs/re2/re2-0.2020.07.06.ebuild
deleted file mode 100644
index adf595f07b8b..000000000000
--- a/dev-libs/re2/re2-0.2020.07.06.ebuild
+++ /dev/null
@@ -1,52 +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
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="8"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="icu"
-
-BDEPEND="icu? ( virtual/pkgconfig )"
-DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	default
-	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}" shared
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
-}
diff --git a/dev-libs/re2/re2-0.2020.08.01.ebuild b/dev-libs/re2/re2-0.2020.08.01.ebuild
index 658704eab243..69b48d1d9c89 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/rinutils/Manifest b/dev-libs/rinutils/Manifest
index b59483cc65c2..896d3dca5742 100644
--- a/dev-libs/rinutils/Manifest
+++ b/dev-libs/rinutils/Manifest
@@ -1,5 +1,7 @@
 DIST rinutils-0.4.0.tar.xz 17072 BLAKE2B 90cd40fca0f682b730457da04bb392eada83ee2ab2ae3287ffdfd2235776038d6597143ca60c51b9c8d13b366511a5cd084b90811c5cfc7663125952fa009105 SHA512 96c0fc1e8164df8703910a8e14215e1a3fa52d5cc2fdf90af2f21dd064236e2b2b5f44485689553cd0df7cb99aa01f71241983166683934175d907e9f583edb5
 DIST rinutils-0.4.1.tar.xz 17136 BLAKE2B 890b7201845609026577ab49b952db193480bd252c2798d3084610d29b1d62ddd9afb791150ad0ac951e6e1518c5711de11f8f7253c1c4ce115dd220cc27f5b0 SHA512 e175e5ce6e32e85d4102ba788c5dec40bd09ecd4002e6de10e726843b7ac562a63b305898061cab623eb85d46983ae777ac6b57c46194a29d78f0fe498fa63e7
+DIST rinutils-0.6.0.tar.xz 16768 BLAKE2B a4fe413c6a4f18bd8c41a4d933a2515ba64f2dbe180d8a5868eadd8cd6ed7008d30f5b6cd5fa730edcb6548f6ea269ab419b912fd6c7346dd013a737320bb714 SHA512 2523747f9cf5f830e5fb5acc1e92691e8acfb59d6c4474d3768b68de9190dbc63c9e06cdd3c6ac67f8a853d37d1711d4c18550bb24446b2730198668f4ad0c45
 EBUILD rinutils-0.4.0.ebuild 567 BLAKE2B 8d8d59bf7764a81d1264384956314f662884c1da009ba871fcac827f1f4b1384250848c28003903fdbbe6f8b61a801bd91f5827e728b54bb000e9c946ca609eb SHA512 318b02ed7f1330ee8d71654bad78debfd3ca2ed5a2357b92b29031808113bf6057664d50b2962162daaee1b48ef9884b57ab085ca9374057911472fe289b23dc
 EBUILD rinutils-0.4.1.ebuild 570 BLAKE2B 30d2366fd0a960f501b31ddbe691698a3579fa325912d2c653ca962cb976029c0cb69201328f9b399bb4c2f5a8acc2f26b1f66eddfa1faea500c8604ad713d94 SHA512 596126c33be635552308d28f22b47721ddb44e193a5ca3fe75493aedfc97f7c9ba77857c2f053ab84b2684accb23e6a4ecdd81e79e0d25959ac6bbcae4147c90
+EBUILD rinutils-0.6.0.ebuild 570 BLAKE2B 30d2366fd0a960f501b31ddbe691698a3579fa325912d2c653ca962cb976029c0cb69201328f9b399bb4c2f5a8acc2f26b1f66eddfa1faea500c8604ad713d94 SHA512 596126c33be635552308d28f22b47721ddb44e193a5ca3fe75493aedfc97f7c9ba77857c2f053ab84b2684accb23e6a4ecdd81e79e0d25959ac6bbcae4147c90
 MISC metadata.xml 330 BLAKE2B cfc9f4f9873b63df5ed997fa0fb659fd5c15205a53b727a963c125cc31cb071ccd7fcdd524939ed10b8dd6fadf4c4cc304ed3c4be852fc1e29feb0918efb698e SHA512 aa5bbe760f05a3c67365ddfa2f0c9d52636bd645075ac0ca2a96124e1127557b20d12162fe2c44b4cd77cf6106c5803da3d25b36a4dc9bb21bc1842e0da71b24
diff --git a/dev-libs/rinutils/rinutils-0.6.0.ebuild b/dev-libs/rinutils/rinutils-0.6.0.ebuild
new file mode 100644
index 000000000000..fa04b75970b8
--- /dev/null
+++ b/dev-libs/rinutils/rinutils-0.6.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Set of C headers containing macros and static functions"
+HOMEPAGE="https://www.shlomifish.org/open-source/projects/ https://github.com/shlomif/rinutils"
+SRC_URI="https://github.com/shlomif/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_APPLYING_RPATH=OFF
+		-DWITH_TEST_SUITE=OFF # tests require perl
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index e85e8b86fe56..48022dfdf07f 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -2,6 +2,6 @@ AUX rocm-opencl-runtime-3.5.0-do-not-install-libopencl.patch 548 BLAKE2B ae42344
 AUX rocm-opencl-runtime-3.7.0-add-rocclr-include-directories.patch 529 BLAKE2B c5902c6582d4ab23196829dd5953bd74469951d41ac393e92b9858d6a6336dd68c73cf57d917a13fb3869c84b1e6930e7a0de71936091011039bcd3bfc3b102e SHA512 2ac5248e05b479b9e84322cd9afb1bb783e03440648fe91e0f92e77bb2f673f9752412a2a689aba152663b5235df176a6ab54b5ecea3a20e720b831bdf6292f9
 AUX rocm-opencl-runtime-3.7.0-amdocl64icd.patch 503 BLAKE2B 33154b45dd539c068cb86d29bfbfe07b189c1bd7ec36bb5ecba7e7b6a8de416c8c6794f9aed5f18f8aab33c50718f25882a46b86e4c0678440e24586eee9d967 SHA512 8f22ba90782290d0b89b3d48dbf24d5ff1418bf2d82effe5f362456ebbd65f4e3ffe044072d9023e585ec38eb3ac501ce598fef297099753818a93948bc06ccd
 AUX rocm-opencl-runtime-3.7.0-change-install-location.patch 2523 BLAKE2B f31cd13f8b50ea75c3ababe89905881ef92ec0319057a98978ff49514f213e5aad0f72d2eda75d300836ee4e90d1ac8b6b897442c968b30ad4c8af6c31f61fca SHA512 945d37ef36adec5ff6915bc4f3cc30801776370bce8097b53bc4e72568d4801fb7f092ebc0103ec0f625a0297d8ab5a43dcaa84d59f7145ea87610a7bc855f79
-DIST rocm-opencl-runtime-3.7.0.tar.gz 1004361 BLAKE2B 7fa9481c77884dda15a3b0335449b2879fbac000f644fc56bbd8d06c5fd77d8355f159b9b7e8920f06351e388d0df41379b7e1fcff51cf81714a28f902218e42 SHA512 6ea509dde0290f13e66497eaad587099ed6a98df967adce207afc857ecd961b65801332ca74e36173719488639480cfcffc625a007345d0e48c10c8a0efdfa3f
-EBUILD rocm-opencl-runtime-3.7.0.ebuild 1977 BLAKE2B 7e1d8e62cc3c8c89fbdbe253d0393e1a567d924d41ab184d4c7cdafc0320e88e0cf33a88af67725c30d49fee579546faf1b78f75698165ff28933d38b58bc368 SHA512 427ea0cbbecb7195ca79b250216b5649b5e9431b9369e40876b9c49631d85b8f050c78524f4a16a53005671c07058392c5a583ac7f16dc57d7f4f3e41cf82efe
+DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
+EBUILD rocm-opencl-runtime-3.8.0.ebuild 1977 BLAKE2B 7e1d8e62cc3c8c89fbdbe253d0393e1a567d924d41ab184d4c7cdafc0320e88e0cf33a88af67725c30d49fee579546faf1b78f75698165ff28933d38b58bc368 SHA512 427ea0cbbecb7195ca79b250216b5649b5e9431b9369e40876b9c49631d85b8f050c78524f4a16a53005671c07058392c5a583ac7f16dc57d7f4f3e41cf82efe
 MISC metadata.xml 380 BLAKE2B ead1a4d03ea8079057819764408b0d70da70bfa15b374f448f82ff90dc31067d9dfd2a7f888bdfc72a331e2c35b606dde55dde89215f7d52fef8e73740b3ca68 SHA512 1dda9d4be917efcf0b0d447b5f6a2a1ac5f6815699269e0ff6cc0763f286a32dc6180a7a844be0534847511f847afbf12ee5c249f4dd0976f773107ec46859f7
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.7.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild
index 5a1a4386433c..5a1a4386433c 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.7.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.8.0.ebuild
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index ca2034e7141e..fb9aca0c2c71 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,5 +1,5 @@
 DIST serd-0.30.2.tar.bz2 590337 BLAKE2B 7b47f4f9940d9d2d37772c034c3f15801fff2bc8a058d30b40891ae900bdee3a631803e25505230a853e4beb083be4c854c627074eb89c0b23781da42fbde2d5 SHA512 b1e18ac883aac2a8146ee0e1de553ac2b512deba5307e5c9fa2733d9011ed0777d67790aa6527e73b3f11c9da0d8c9a98227457bb412897296f4464228cac0f7
 DIST serd-0.30.4.tar.bz2 605441 BLAKE2B 6b9b561db04a612d04726f29b1b56f535b9af57b7cbcf521c2a6afdafaf63b2ff4a205015d2f4c20bf48340348edda586dfed4a7cff24c57363b0f218d185609 SHA512 4cc032f826d891213c6db787b10a41ffb8f4b2a3357ffa536e34013755dc34db7109d1b42f550a0d559d8651f56c3a5dfb3654c3e2047ee6e609ff9a5fe803d6
 EBUILD serd-0.30.2.ebuild 1149 BLAKE2B 3c7ff48c692a05f300fa0fc93accc6f93cb1cf2a7328765fa5689ec0b0bc524cea24ef161fb130bb94da8f6a8b0b3950baf1d09d382e82a1044c3f4c684bf16b SHA512 f124f80e396d11ad5e8a3600ecf713a714efb22674bffb77ee8940e44008af7b78475ed1a013a150537906f66eb43774bab526d2a111d882b1cdb9ebf3030c44
-EBUILD serd-0.30.4.ebuild 1155 BLAKE2B a851119894d7b86edf2c0de340a332c1229bb659d19481ff5e44d885632252189f68911e4877ac553aa165ff8c7abf714e5af5d490f873a81716f95e2dd7f17d SHA512 ca344766dabba0552390d57b23ac684175a0f9233c6c62b59568f5b6d19a3dbcaa8daefa5b924e454b784806c39271c808b6028be4c979c32b1df154e9dc8e66
+EBUILD serd-0.30.4.ebuild 1154 BLAKE2B 1ceedd8b0824c3156c18a9b6acc593ff8922cc7e94992dd7cd3803dd106a3f6a94b61e5e7a659d377658ced82c2ecfb0d3b7f3b86d082bb85f5f25af5c802981 SHA512 679c97234694b2fd1757f5572b7e45cdd63de81ac280f3a07b334ad32c11445a96de39c2e2135e04ebfda7092de52672c69c5a590df7f58f50e041fd6993320f
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.30.4.ebuild b/dev-libs/serd/serd-0.30.4.ebuild
index 5cc979180ac6..2c0d9cab644c 100644
--- a/dev-libs/serd/serd-0.30.4.ebuild
+++ b/dev-libs/serd/serd-0.30.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest
index a6230eea1182..94d532e8d31f 100644
--- a/dev-libs/softhsm/Manifest
+++ b/dev-libs/softhsm/Manifest
@@ -2,5 +2,5 @@ AUX softhsm-2.5.0-libressl.patch 1046 BLAKE2B e647878998493606d9941f1b4683be8f07
 DIST softhsm-2.5.0.tar.gz 1078439 BLAKE2B f96f9e08f3ea568daccb64a5de94ac91b5efcee3dea09f460e98491e7fcdca1277ed52c339a2ec10dac2f78c9e7e44fe5c4a7d36c58e97afba6e749979d4d7e0 SHA512 a1e686729196dc25591eb3da57c2c8ea8494ed274ba711842b2dcae696f477a202acda13a975b8fb1eb68e8e44a79e839dbbc6ba500cab02ad13072c660752d9
 DIST softhsm-2.6.1.tar.gz 1066766 BLAKE2B 0295c5f40235c8abd8879a8c6f7fbe8e8d686ee03355006e9c90c0f2f7135eaf6794a3d39febda1b1ed6e5d48dcacb1e14dae85fb0efb884d0d719bfc6624b92 SHA512 e77137096ff2ac2f5396971efbaa2007188855a8f723cb511182c6c5e5a353b3f98297442758e77a18c3a378c0ca3fce8abe090977f0f4f8d526de204fd523fb
 EBUILD softhsm-2.5.0.ebuild 1112 BLAKE2B bec60391d1bd029ad7904113fb97acd9a1407cf355463f0a958ca6faeecda12e59cfde0ac4fc727d63d607936cb7b13e8beb7493eaeada5f179ded9490bb115f SHA512 56c3ddfadaeb674d1f9e56473729f8d99667933357a8fbc366384d5efa264f7edc8a1faafed0066848c52c9956e8cae92ff14bda340ea14bdc24ded7adc345e5
-EBUILD softhsm-2.6.1.ebuild 1064 BLAKE2B 9593218c5058cf0e159fea27287492bb335ff728f1f012bbce29314678879d6414a8d0ca20f7f14b7ff76322e3efd6b3586d1ba0b33143aaefa849b3487bf9bd SHA512 784945f1962fcbd19ded377344c3aefa69f21032780902507b32fad09fc17dcfe9f541a837c4c600852d98cb71b49d5d9bc66858ce5d68da8933ab6bc4e1804a
+EBUILD softhsm-2.6.1.ebuild 1069 BLAKE2B f4fb6078aba387cf3d6ccbc07b3be60a630e73a78e51685bf20f3be6b4b8a2cd60b60354c992f10562ee59d4dc5984ac2f09d80e66d15348d74a108e6de1d792 SHA512 85ed4dfdf6faf55ad5fbaecdaceeb32f64263f4dd141dcc33fadada396837de2265e7656ce54aff44cd0e66a708b853ebcb1b60161eb8f262e5f60b8e908a95f
 MISC metadata.xml 292 BLAKE2B 273da0cfca0f98179144303c91b631ff47844748840f99b6bf1ece28ec442191e950756308242c25f4f27ab907674cdbd6efc88a4af1887676eb878d01b73f7c SHA512 7b3d1e2e5adc04c50256ea1f98490787cc0d2ff33af13462501cb5e08f482de3ce6da60d3026d5aacd1f46075915d1cc5c37206d398c61176ca7a023adae693d
diff --git a/dev-libs/softhsm/softhsm-2.6.1.ebuild b/dev-libs/softhsm/softhsm-2.6.1.ebuild
index 41a1b769e854..6d8c36701e27 100644
--- a/dev-libs/softhsm/softhsm-2.6.1.ebuild
+++ b/dev-libs/softhsm/softhsm-2.6.1.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A software PKCS#11 implementation"
 HOMEPAGE="https://www.opendnssec.org/"
 SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bindist gost libressl migration-tool test"
 RESTRICT="!test? ( test )"
 SLOT="2"
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 039718164af4..b57b5aeac93c 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,5 +1,8 @@
+AUX sord-0.16.6-x86_32.patch 1292 BLAKE2B 0177c404d77cbc27a79a31b21c6c7e51015aba6c912bc2e3ed660f1d9516cf6afe8f52fd2f2bcf4028addc340f441cf9c1a61d412b10bd5e696ccb10902db33f SHA512 c851bd761eb1c77177c5333208f74b577a36a8e5b0ea0b2dc704c30d1e984c28df7003208ba629981a395b5e893b94289210f6c6273f51551d595276353cc1bf
 DIST drobilla-autowaf-6c6c1d29bfe4c28dd26b5cde7ea4a1a148ee700d.tar.gz 384589 BLAKE2B d643df2e133c2b70e00d85562d1c30f8a01190b4c1e1a512b732d016db3ae77ff543d4acafc00309edb173e7bbaaf17b0c2844bef2ffe786c02a51930f03f29a SHA512 50b2d063866630c7c566af9da07c9ac0da2cf86e70f76ad6af57973ae0b346d4687c0b4263cefa90f0c0ba9e853a60583457c9f8b1313db3f4298ca2f0cfc4d3
+DIST sord-0.16.6.tar.bz2 520690 BLAKE2B 7ec248a78e0d9e525d640363414ddd32acc3e32817e2ab86e791fd9232a46658538c9a4db936a5daa7eeb5ef9f7bf13e1aa1429ab6d9fc769e1391a014da919f SHA512 1d3c2bf47ff7e4b533e4e737e2ece8e29bace78bb00c41a252ad5c583abdcba3baa05b189cb8651c212861a2eea3c690354c99d684fd0f343b40e74c94572f98
 DIST sord-81e138633076c2d7ef7e1691845757208d02f478.tar.gz 293332 BLAKE2B 794aed020b14f0cd4bae851de12f24fe54c87202b69c3f21cc26a86f0da092b05ea2244279be16ab3231431a8a5fb0cbab7236c2e761715e9a1759bb5b3ab54b SHA512 ba0dd8a8434a04be3548b959789b5b81491cd2f91f6125d3620fa17d4d38ae18015db7cd72af71900a0a17331c6b5400756719a25e09e596590ff943798a5991
 EBUILD sord-0.16.4_p20200803.ebuild 1584 BLAKE2B 4c4c075c41f094bbc70054c63d423d9d0574c5fb103f1a45f3e5180e4ac1ab4cb67cbb801524dc10022ab58616c636d519c9035b4a62091769aae23b1ca00939 SHA512 1a28340237a91a4ed316b216b925459005eaccda7863e132682740d32916f5e4e2c0b77caa5f6fe3ac94d827a22fdf8ff9e2db5483b08f9ffa933d447ce9ae6e
-EBUILD sord-9999.ebuild 1125 BLAKE2B 39b455cafddea954aefad917eb782504eaa38f5cf5a07abdd56d5b0dc06227464c0d3dd3c2e64519cad415d6278ac4f0cf16b48ba7023b5df759dc3d39522952 SHA512 11739648e64dbdb746d2774a2632a9fd54b36af4ec147b71166ad006ef438b62618a588b9a69ac5e08b152d2644783f49773ec314da2fd4664d508e9489e2cc0
+EBUILD sord-0.16.6.ebuild 1215 BLAKE2B 114775f3ed2e81a94e05049a5a5015252aa7c4aa28b7909a5e6a9c29eab8cc21de9acf40a9cd1616fdf099b1dd4f4a15ece3fad01380d9c36d66194884dd65bd SHA512 36bdfe99b243f3178ebd207100d47b78fb701ed6dab610d6764e40c608826030f572e4851f097dad190dbc629599c74b9cc1b23d5322996c8df402d6945a4efd
+EBUILD sord-9999.ebuild 1169 BLAKE2B e814b98d57f0c12b816134b113417f4fb09923c56a275cd54086f54529242335cd3df8a8d7bb8ecb458f530c83ec2dd55bb10fd38483baa91773e6bb16d498d2 SHA512 4a88c8475943eb0bf4a487124c1cac7c891c3ffa53bf460656e170db13e9b55ab87a672a62d16833eb89c957718ca739ea6c12f1dc5c6e07315ee7231342d02b
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/files/sord-0.16.6-x86_32.patch b/dev-libs/sord/files/sord-0.16.6-x86_32.patch
new file mode 100644
index 000000000000..3effc4d44dc3
--- /dev/null
+++ b/dev-libs/sord/files/sord-0.16.6-x86_32.patch
@@ -0,0 +1,44 @@
+diff --git a/src/zix/digest.c b/src/zix/digest.c
+index 889cfde..00b9fcf 100644
+--- a/src/zix/digest.c
++++ b/src/zix/digest.c
+@@ -38,10 +38,12 @@ zix_digest_add(uint32_t hash, const void* const buf, const size_t len)
+ {
+ 	const uint8_t* str = (const uint8_t*)buf;
+ 
++#ifdef __x86_64__
+ 	for (size_t i = 0; i < (len / sizeof(uint64_t)); ++i) {
+ 		hash = (uint32_t)_mm_crc32_u64(hash, *(const uint64_t*)str);
+ 		str += sizeof(uint64_t);
+ 	}
++#endif
+ 	if (len & sizeof(uint32_t)) {
+ 		hash = _mm_crc32_u32(hash, *(const uint32_t*)str);
+ 		str += sizeof(uint32_t);
+@@ -57,6 +59,7 @@ zix_digest_add(uint32_t hash, const void* const buf, const size_t len)
+ 	return hash;
+ }
+ 
++#ifdef __x86_64__
+ ZIX_API uint32_t
+ zix_digest_add_64(uint32_t hash, const void* const buf, const size_t len)
+ {
+@@ -72,12 +75,17 @@ zix_digest_add_64(uint32_t hash, const void* const buf, const size_t len)
+ 
+ 	return hash;
+ }
++#endif
+ 
+ ZIX_API uint32_t
+ zix_digest_add_ptr(const uint32_t hash, const void* const ptr)
+ {
+ #if UINTPTR_MAX == UINT64_MAX
+-	return (uint32_t)_mm_crc32_u64(hash, (uintptr_t)ptr);
++	#ifdef __x86_64__
++		return (uint32_t)_mm_crc32_u64(hash, (uintptr_t)ptr);
++	#else
++		return (uint32_t)_mm_crc32_u32(hash, (uintptr_t)ptr);
++	#endif
+ #else
+ 	return _mm_crc32_u32(hash, (uintptr_t)ptr);
+ #endif
diff --git a/dev-libs/sord/sord-0.16.6.ebuild b/dev-libs/sord/sord-0.16.6.ebuild
new file mode 100644
index 000000000000..bd3d4f728ec6
--- /dev/null
+++ b/dev-libs/sord/sord-0.16.6.ebuild
@@ -0,0 +1,61 @@
+# 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/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+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
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "NEWS" "README.md" )
+
+PATCHES=(
+	"${FILESDIR}/${P}-x86_32.patch"
+)
+
+src_prepare() {
+	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/sord/sord-9999.ebuild b/dev-libs/sord/sord-9999.ebuild
index e1388ab2877c..acfd96a2744a 100644
--- a/dev-libs/sord/sord-9999.ebuild
+++ b/dev-libs/sord/sord-9999.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/libpcre
-	>=dev-libs/serd-0.30.0
+	dev-libs/serd
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( "AUTHORS" "NEWS" "README.md" )
 
+PATCHES=(
+	"${FILESDIR}/${P}-0.16.6-x86_32.patch"
+)
+
 src_prepare() {
 	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
 	default
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
index 821711525d9f..d25f62c88f45 100644
--- a/dev-libs/unibilium/Manifest
+++ b/dev-libs/unibilium/Manifest
@@ -1,3 +1,6 @@
+AUX unibilium-2.1.0-no-compress-man.patch 576 BLAKE2B a99123e8be6e229c0661b2ca9df0a56c5280e9f0a3f1e2fffae10537f5dfcd1e6ba5b35a78ceda8b52437b42442e30d1793c5a79ade78bbe2755e2d17c84d505 SHA512 501f93e537dcf8e2b5cd03e63d6c03b91c422bea52a4f615fbdd0acd64ba839d95dcf2f209ca28dcdeece902445a19d5777329a40af7b795529ea8cd9755ce53
 DIST unibilium-2.0.0.tar.gz 112570 BLAKE2B 95c24c53e11590faabf3d4b8484c344be0b2a0988f05bde785d03dac338d9f18fc65324f5ccc402723c9fabe2990083ce260d8fa57129591a1b2a1f8405eff9d SHA512 e93f319b7a85a4441c7f4e30d12d906805f066b14bff03331e48b6257da893f6447e257c8ba731077ad4b54d82d3ebf1ccf1fcf2d864273e0d4321a26ef7c172
+DIST unibilium-2.1.0.tar.gz 121971 BLAKE2B e035eab4343ee779218c302b3cae3ff5d443fc9bd723cade53a3d38dde3d66ee3d7374f7c69b85508a59d44d936601b24f33b01d923e55677d2bac71bd520fea SHA512 c0074ff8431f82c92072b8c0c9d3cf38d759b4de996b168c6ab00e475b0a6204d9c29b0a6e48e62dd4fa4898f82246150ef7cd5e246893d2c225c50ec4d4ac68
 EBUILD unibilium-2.0.0.ebuild 784 BLAKE2B f8decdab42671f3f9891ae9f019692f0c658c527c902ee2499395c1b0ec34b49f0056deec87396ed439ea1cb0a25d12b50d7727da739d4db5f4d9d11add57d43 SHA512 2c1f1edc2b1e0ace8f7dc54840636558873004f44d68ce0f434cfc403437d9fe5873ca1a66841febcaf4923bff2c82ac9d0c7937c180f11cddc721783d6eef66
+EBUILD unibilium-2.1.0.ebuild 871 BLAKE2B b89f7e59d5e3ebb9104293c138bab0a0cccc71063e139fd3089b5dfa0cd91592139c45960d7b0bfe8aee9bdbffe13e7cb4bf83a548804f1b821e2293c278f72a SHA512 75146a7a44f9343a17422ff02f2174934a792f2cab797c2c77aa499b04f5e4795052cb30ca73548f676c61963d390d0e613060dca5f7768e125265c793791c78
 MISC metadata.xml 339 BLAKE2B 36a1748f4030bc835201a0001ddf70b7ee4f1a73703c40a98650df0ef8b7e48e8acf3bb2272232ce528e2794310908214f1f9d9ac3ed75cf5bfadac1bd1cf19f SHA512 27c4da145b68654f559c956b5414a877ff9ca54a794390e690e1c11596dfda61d4d2ebfc3f891593f40c42f4070dd802ae7c73a9ece69e4c9ce0c1f76873644a
diff --git a/dev-libs/unibilium/files/unibilium-2.1.0-no-compress-man.patch b/dev-libs/unibilium/files/unibilium-2.1.0-no-compress-man.patch
new file mode 100644
index 000000000000..d4c1944554bd
--- /dev/null
+++ b/dev-libs/unibilium/files/unibilium-2.1.0-no-compress-man.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -56,7 +56,7 @@ OBJECTS=unibilium.lo uninames.lo uniutil.lo
+ LIBRARY=libunibilium.la
+ 
+ PODS=$(wildcard doc/*.pod)
+-MANPAGES=$(addprefix man/,$(notdir $(PODS:.pod=.3.gz)))
++MANPAGES=$(addprefix man/,$(notdir $(PODS:.pod=.3)))
+ 
+ TOOLS=$(wildcard tools/*.c)
+ 
+@@ -121,8 +121,8 @@ install-man: build-man
+ .PHONY: build-man
+ build-man: $(MANPAGES)
+ 
+-man/%.3.gz: doc/%.pod
+-	$(POD2MAN) $(POD2MAN_OPTS) $< | gzip > $@
++man/%.3: doc/%.pod
++	$(POD2MAN) $(POD2MAN_OPTS) $< > $@
+ 
+ 
+ # Regenerate static test files, based on existing terminfo entries.
diff --git a/dev-libs/unibilium/unibilium-2.1.0.ebuild b/dev-libs/unibilium/unibilium-2.1.0.ebuild
new file mode 100644
index 000000000000..54bebfe17a3d
--- /dev/null
+++ b/dev-libs/unibilium/unibilium-2.1.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 flag-o-matic toolchain-funcs
+
+DESCRIPTION="A very basic terminfo library"
+HOMEPAGE="https://github.com/neovim/unibilium/"
+SRC_URI="https://github.com/neovim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+ MIT"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="static-libs"
+
+BDEPEND="
+	dev-lang/perl
+	sys-devel/libtool"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.0-no-compress-man.patch"
+)
+
+src_compile() {
+	append-flags -fPIC
+	tc-export CC
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" all
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" DESTDIR="${D}" install
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib${PN}.a || die
+	rm "${ED}"/usr/$(get_libdir)/lib${PN}.la || die
+}
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 5761b3b07175..fd0a312a832d 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -5,5 +5,5 @@ DIST xapian-bindings-1.4.17.tar.xz 1135100 BLAKE2B 8c45322725c341f6e6484e0aa8716
 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
-EBUILD xapian-bindings-1.4.17.ebuild 6447 BLAKE2B 8cc17f4428e0c6376321a1d7fc0c79a1e9f9c0fa9c94d207587942a9909183d3b23f0a6189f3e79730c96082744b2f3d6d38e273c2be80bf9b63b6e5620a013d SHA512 dd19b3ddca4556c13023d6e749eeac696f87162410c192b3c15bff8636eade45ee9b110e0ad857f4f56e36ec620c3eeffd264331ad1c3dd564d15afa7902d8dd
+EBUILD xapian-bindings-1.4.17.ebuild 6453 BLAKE2B 918f0b17fd076f95991f6bfe5672d8c18a32de1f834d1d8c454c6bb552fd559cb9091ca70945c9338cb84a32e7e3562a071e5a51d88951fc205e71d9b7fc4dfb SHA512 d174d0ccca69c4dc900e81e202c3680974025f260da4ac5b3f3f6ba80d49e9cf9cabb601b0d4e98f940fa2ea55461598a717bdb825033e992f24c56f5f33ec83
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
index f1522bf0ac05..ac2ceee5d1d1 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
@@ -23,7 +23,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	python? ( ${PYTHON_REQUIRED_USE} )
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-30 17:27:54 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-30 17:27:54 +0100
commit	f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
tree	e907cb121b30e3c1df1710719c0ddf4029597a47 /dev-libs
parent	db063b515939ab15261136b24e4bc44386335c0c (diff)