gentoo resync : 08.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-08 09:04:53 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-08 09:04:53 +0100
commit: 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree: 2878053f3e7faed19a1f82c733d3bd29df69991e /dev-libs
parent: 2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)
68 files changed, 390 insertions, 569 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b12983a1ead2..7b2ea0e46f81 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 724524a852ff..92d54856ad63 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -8,6 +8,6 @@ AUX llvm-terminfo.patch 788 BLAKE2B cb652c28aac1cca566cb801b9e7f2b6ea8a9ff945789
 AUX no-debian-multiarch.patch 1652 BLAKE2B 4d112429412a7ada957228aa8e6beb145fbaf04065d6f816b0f13513631211894c57e9999157db5f22d7044f231be65396040efe450d090e3774bd24c9c93482 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a
 EBUILD beignet-1.3.2-r2.ebuild 2959 BLAKE2B bd67d958a8ab72669c924c28fcd487d677098370c357045cad33b4fc627a182c41bc8037388255d16215a9ad7d73663f36d91bc4ad1bef32fffcdbce29de551a SHA512 64ebc3b96c4a9e41fa36f1c5260a9ef47779c11f9d8dac83deab2777ad8a9cdf5259348d67b2ce2fa8e41e2a093dac85b073580b70827729498fa4febcffd56c
-EBUILD beignet-1.3.2-r3.ebuild 2855 BLAKE2B 760d63a15608ea0ffcf78fa42db32d64ca690794ff5d0d7f79f7b70b10b1de4064f777ca8c3c9c3c29a0f03abcf38fb045983f28c140cd97407f985e9d1f2f70 SHA512 71dcea5162e2c039971959030a49c5e64dbf02524665bd63722cec4d79e03bb5f29ebca0a3a8012c0469ad2d49d768a8218f0fc5b1472321cb1cb8f76b58e6f5
+EBUILD beignet-1.3.2-r3.ebuild 2852 BLAKE2B db92e4701e1d3e5504d77af1452a4c3b7d0b13c7a4c9d9a3789716f1feae192d393eba47fa7ee1ee6bbc683b7931d9a04a3a476bf115772124fe0ca88d1e55d5 SHA512 60b22f9c06163767cc7b3c696171f10d7b16703dc30e2ef649cd50d41c6ced8eb013f4eb093b11980713ec39afba06ca828a56549b99f8ecbf4bda792a5b8812
 EBUILD beignet-1.3.2.ebuild 2673 BLAKE2B 8edf3cb1b0dfe6201405afe50117e79172e20f9d5aafdecaba72cd85301c01c472a9be024d0b3a8a2c723b84bfd4a72c631d76bec3f08dc8412aa9d6ebd8f2dc SHA512 bf959b3ce52019d83e4a8bd3871155386c2e3c5de4f241044d77a1282c56c9837be6f12a78ca648833b2e21b533f42ba85de31d16027cb66cb47d52a985ac8b2
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2-r3.ebuild b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
index 820fc50e9a73..babcfaac9b4d 100644
--- a/dev-libs/beignet/beignet-1.3.2-r3.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
@@ -21,7 +21,7 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig"
 COMMON="app-eselect/eselect-opencl
 	media-libs/mesa[${MULTILIB_USEDEP}]
-	<sys-devel/clang-7.0.9999:=[${MULTILIB_USEDEP}]
+	<sys-devel/clang-8.0.0:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libXfixes[${MULTILIB_USEDEP}]
diff --git a/dev-libs/bglibs/Manifest b/dev-libs/bglibs/Manifest
index 2f5ce50f3d8c..23fbefb1e63c 100644
--- a/dev-libs/bglibs/Manifest
+++ b/dev-libs/bglibs/Manifest
@@ -1,8 +1,6 @@
 AUX bglibs-1.106-parallel-fix.patch 2142 BLAKE2B 2f51f4bf7980afadc9bed2d701a59cf8c7c4abc628dfd3cae5eb0aa72ef6c2da4e7c5d846a7090d47bfd9be51fe72c7cdba9ddb9da3b3ecf95e59eae121af0a3 SHA512 8f6d1760932416e1f9b83229df89730a191c467b3e05ba7ba4faf4e3f5ef57d16469695fadc39717352be6b8ae7b84d8ba3933b39e4a8a041086c386c84c0339
-DIST bglibs-1.041.tar.gz 317199 BLAKE2B 808bfbc713aaf06c5eb828b4bf0f5b789969afaa078b68292f209d7612860d4a5de793ec8768c63908a48f98841d30a0b2bd9a40b45ce94cb0a539ebcb2cbdbb SHA512 63f1cbef024f528d13a23f84f11b014be2ee9a9c8c40f49f8a114a6b4407c1279860a049f3dd67cfa7306a5326bbb93bb57b134af05031ec3c00f5f49784f6bc
 DIST bglibs-1.106.tar.gz 481564 BLAKE2B 838bd29753b254efc90c8c2c2e4d4920de2e931f823d32393184156f76967ec1995f1e79d2879169dd509cddd298b2389a4ca0109b81245fc617575f3ccf7405 SHA512 c1ae4bb9978b09ffe01231738d1f249c2040a51c2a0bbc4b04389a7085a3885cca6483f1bfe65deca213d991273bb3b7b925ebde8b6e2cd9182d8a57cb9a49d8
 DIST bglibs-2.04.tar.gz 713673 BLAKE2B 9e1353b3221ef6a8cfb256ec8616d1e208777b20ecade3e6ae17faca6b42222e18aa601a948e6201139378bf6f8131a2b7a053d77b198176776d42a1af611186 SHA512 094268cad7d4bacf65c0dd3d42fde2e6bac34da0fd6193b1c8202c018e752b3ef80a86c38e687467fb3a4e97130126fe74ee4a86063e4b25ee291de573984a6f
-EBUILD bglibs-1.041.ebuild 1229 BLAKE2B e8fbe4236b2f0dd0d561af4e9347922cbb2319c22edebcc9ca859012f0d0a53e7bd0118ea7fcf34704c23bd90e1410ecadc05fe8d5b3535f84eb027dcb32f4d2 SHA512 81ef08efbb8b12d1614dc0d111fabfa41b38d8b15dbd89b43e65d399726f039a0f8ec3b681048c4a63c3488796e2aa429892adedef0e65366afacd77aa058013
 EBUILD bglibs-1.106-r1.ebuild 2306 BLAKE2B 42fccf4efd079a4e18f318b70aa37080f35ac6885b7f9922d4caeb1013c6885e166bb863f91538a39ce7d8356be6edfe06461aa761c5f1f2a4ac98fe74db5336 SHA512 7687de754e81aeec14538d92cb1ac0d768ecaee8f9621d8921c42ce0c87dcbfaf915de84cf32b7befa3b45154229ba3eb0abff5ef01304b196582db5f84901f8
 EBUILD bglibs-1.106-r2.ebuild 2391 BLAKE2B de82b2768655bf2690a58abfea210de7cc887c5d64d7988c9aeb22bbd0f3f419b32af44c71a27392dcd655bfdf9cca81f4af2e0525c5e126594596271a4d5417 SHA512 6e6093d5c0fbe9fb6acff127cff01cab06f641ff7b0d377fefa4bb3a3376bc5f161aa431ed692eebfd46969d065661e0bcfd1e01c572f2479c4510a685cb531f
 EBUILD bglibs-2.04.ebuild 1667 BLAKE2B a1b17d614118f3496acaec1caaf13c2366bb16d73601755b3b535c5d94d77a49730fbb3d93f7a8aed29e184bab099d2826ae7928e9b0ba0b565d6c4dd0d9e202 SHA512 5fd4d846563913c8f70a88fe43dde2f8bfc5e513b4e9140b671ca8d2803b475fa480d1ae22d288168c406b2b44bcd683c3e9d541870c47baf6077c9b1d3dcc6b
diff --git a/dev-libs/bglibs/bglibs-1.041.ebuild b/dev-libs/bglibs/bglibs-1.041.ebuild
deleted file mode 100644
index 5af367576d92..000000000000
--- a/dev-libs/bglibs/bglibs-1.041.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit fixheadtails toolchain-funcs multilib
-
-DESCRIPTION="Bruce Guenters Libraries Collection"
-HOMEPAGE="http://untroubled.org/bglibs/"
-SRC_URI="http://untroubled.org/bglibs/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc sparc x86 ~ppc64"
-IUSE=""
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	# disable tests as we want them manually
-	sed -e '/^all:/s|selftests||' -i.orig "${S}"/Makefile
-	sed -e '/selftests/d' -i.orig "${S}"/TARGETS
-}
-
-src_compile() {
-	echo "${D}/usr/bin" > conf-bin
-	echo "${D}/usr/$(get_libdir)/bglibs" > conf-lib
-	echo "${D}/usr/include/bglibs" > conf-include
-	echo "${D}/usr/share/man" > conf-man
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-	emake || die
-}
-
-src_test() {
-	einfo "Running selftests"
-	emake selftests
-}
-
-src_install () {
-	einstall || die "install failed"
-
-	#make backwards compatible symlinks
-	dosym /usr/lib/bglibs /usr/lib/bglibs/lib
-	dosym /usr/include/bglibs /usr/lib/bglibs/include
-
-	dodoc ANNOUNCEMENT NEWS README ChangeLog TODO VERSION
-	dohtml doc/html/*
-	docinto latex
-	dodoc doc/latex/*
-}
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index 1e596a6c950b..ea751fb95921 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -8,5 +8,5 @@ DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc
 EBUILD ding-libs-0.4.0.ebuild 492 BLAKE2B 56a1412b2906d75ba6623c7e3f57aff2829a95c4fbdf8b21f3127754b5950deeaafaad6e918e6f97a26e44ea5127b7cbce2e58b4a2d16faca17a85bc9791eace SHA512 169e8d203a8aac008017dd1d61e7c160d75b97f90f4874ab6e6321c61a6c58b7bf04817520b081d33598290dde2069cad8e4e60c785bebde332a611783fb252f
 EBUILD ding-libs-0.5.0.ebuild 548 BLAKE2B b85dc9940e7d1249f3d729f8b2aca392ebccc4a8af068712fb68c31f7996dd1704eac4cc9247bc447715b9f8aacc5a0dc32d7bd37ffab00f5bc8a811fedf454e SHA512 ece4b10606274a789cb9a6877b7cad4fc87d7a011c48b7d0791fbd4a1a9b8859acb800c0c1b95cda542edf1abf63c364dab01ff6c149ca0fba742eb70138705e
 EBUILD ding-libs-0.6.0.ebuild 598 BLAKE2B f0212d264f319d4ac2c3204e8e187b0f00b35359a69987814eb1a2242e5ab4234aef0f16efb244c262f0bfe2e745d32ba3c9961cc8f01cc0c81573f59d39a515 SHA512 5e13b98a2defd0fcbb2c0e6ca17b06981ddaaf0ee09b83095f6c63edcf4f9f4eda0d1049f03705c9c677935d601f25e66acf36e3b3e7bdadf9b034a86c3b84d7
-EBUILD ding-libs-0.6.1.ebuild 801 BLAKE2B bb44b255ba41dea53fa1efdc27f67a8c611b5ad1c4c1ac3a68054cd5ad171c46c7f766c67ec1f6810ecf3bae83603228e1fd6977a2e2cfcd3233d416d7a551f3 SHA512 c48f4aeeaa8bb788f0d4682d15d0e73faddb6ab20a60a082490f2c4fb33a458d68acd871f90c995c7ba8ae04c2fe17d4b17bcd1300c15eadf684e5a8b4b4cf6e
+EBUILD ding-libs-0.6.1.ebuild 800 BLAKE2B 13e0e369efc5bb003b7267b621c331a5490be246b1a8565e550b759f573fb06dc4ef833b41bc26b3ab2c0ebc9f97a9699438a4f961551d444a6237a0d3be5fb7 SHA512 923630e38c76d70a57cae2c6e832156e3d4f7794d42ca61dab89ea599f66f0620887d12d612b47c7f3c49761b9d68a803050a2286183cc4d27e60ea8604d41bf
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
index ad1d696f0176..9484b437cce3 100644
--- a/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
+++ b/dev-libs/ding-libs/ding-libs-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux"
 IUSE="test static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index 4d5808d02c84..0fa42eff5df5 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -5,5 +5,5 @@ DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afb
 DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78
 EBUILD icu-layoutex-58.2.ebuild 2518 BLAKE2B 885f5583a750f60830f94e4fab7b80070cd9633fc16aca7d2713b16418685ce3eb8eeea27ac33f52a864edb8c3508e77592b729b63f690e9849c562f79d16c42 SHA512 f2b385bc0bad96157f3d321dc9f1b418438b3d390729b372d6c47b28bb7acf3792ff071288d25ed6a78741feb2831dc3e0733109380d86eda2e0631dd75bd8d7
 EBUILD icu-layoutex-63.1.ebuild 2525 BLAKE2B 7c45a83f8dcb5035d44c676edbeed9cb971eca673172a8ab5642589fd63c04f05d6c26b0346ea9caf5da340e5d29d5fc085a4e9e17390c5cbb358926f03257f5 SHA512 0f27c41556ab551538f95c086b39c85539138254d160284e6579a0ada90d93485a9ad41670518d7f27e9b93e9029a63bab484727101c5026d4d1f52e44536588
-EBUILD icu-layoutex-64.2.ebuild 2562 BLAKE2B 52ee1fd8e360a9970319ba7941770dfef3efaeffeecbb2ec66d053b8f988e68596dc5ff67b90ce2cbe13bc9854bef75a0bc4fdee323487019e8c4eb7c3cd71a9 SHA512 b4413e46715babae7b05668a00d157b0813191bfc2108d23aa955070fbc5f58bba5b5bd0ec1f03ef53b7adbc04ba626ab6af044e1d945fd1b63db138e77b7909
+EBUILD icu-layoutex-64.2.ebuild 2558 BLAKE2B 1ba5b8b02161c8607e664c9fa51fd631ff77dcf5ac938cd6f4d6c745c75e0f3edab46401104a6e71a24725c2c742316e0130123597989976863aecc9c4b3c442 SHA512 b0efbe0483c156cf6a5de4628ae048a5f650a9289726c4e52603741ca1fa8857780c145ecdfde0475a45284bbab827c93b3dae35a29799a7eb71aae01ee18459
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
diff --git a/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild
index 48222c7d4dd8..f9f559cf11ce 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-64.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-s
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="debug static-libs"
 
 BDEPEND="
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index ab6bbe6c1e9d..d39f76ccaaf9 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -5,7 +5,6 @@ AUX icu-58.2-darwin.patch 2076 BLAKE2B d85d07ae3ade827a81bf2ce4eb2813a6535d7cd70
 AUX icu-58.2-glibc226.patch 463 BLAKE2B 840440c4a3eb0882ac6733d3c5f44568bc081fce6f3f641e01d76f01fe1f35f74cc2465e89b3353ab86569c7478090df459a659d69143810ba121e15c27923dd SHA512 20d8e76c43ef5549ca7f104b052661269c99d4af45b2a65bd9d72e28b01d0c3b70c066b51799e09d7117a4a39e44fd463fae2522a238a41972c0679c290c5da3
 AUX icu-63.1-CVE-2018-18928.patch 2813 BLAKE2B 21940b9c1f17eed7f056a8c60b5a8da3790955fe6bab02336b0c042d80d90afd02a54dbe441fa38a536b2a77f08fb629510186a0419ad6352b3bc461c7b9b9e3 SHA512 f55cc50673e33dfba4d213bb4f18dd905e9db372dde4c64c1f389c0cd19b31e5fd0aaa113778068758497b35667061659d55fafd0eae818624c9374e17a8d5c5
 AUX icu-64.1-data_archive_generation.patch 473 BLAKE2B 88e77149ec92a316d5e534a6aba8808829ebdef16978fc7130bb4fba80f2bcc7886bafe3c944ff83f56cbf5f02860a35cb0a655722ce305e5e6b05dae15d5254 SHA512 3cf34c7ffaa200f841d605f11ee8145d70f2975be2ae5282a6de2fb5caf6bd8ae67e05cf652b0714023087fa145b4e5fdd4e4287dc331334ec347d957674d291
-AUX icu-64.1-guard-memory-include.patch 1449 BLAKE2B bc255a8ef9a8d7fece5fb10ad2a51b67c28307aa1954a1c690c923b9695b946bc5aceafae39687f60563f62112672b60405d47c393755147568272678516f334 SHA512 7cb0142486d0162a7e9441c55225e010db5dfcd0a9b67f3f738de2a619388e4323b1314e9531537259403fbdd5a263e58576991b6e90629feacdee522f40cee5
 AUX icu-64.2-darwin.patch 2162 BLAKE2B 74682494b903ee1cdcd2025afe36648adef39573754ccb0e0e86b5b7d7f26937c6ea54d655e8482ad9d7a2ccc64b5c8a8640d4e71390b19b64a25bde76b3d63d SHA512 e4e0eb9f953285f4221f2733a3a76c23e9e72127ce3ac0ecc67a46a9e37236dee352f28b7b9befdcae9e2f95297e01a98e0dd177697ee6335145ad5088d2f00f
 AUX icu-64.2-extern_c.patch 29978 BLAKE2B 398f371d256fd4e60fc069949d0d861e363c43889a762c9fffad176cb1164b069209a295475748c08a18a83b43abb561851f4d74359fc3fd683b97eb0cef2e50 SHA512 d45a8da416a573b69b76a615d11bf99f852cb1703cb0fd4ba35fe96411134fda97a29cddf3d14a23900a5099a930c32ff9d1865f02d07314268974c306832409
 DIST icu4c-58_2-src.tgz 23369902 BLAKE2B cdd2e02c3aba050f5b7f8b38c5a3731e3e5f1cc1403ef86a50908b95560ea3cf8a2d47119fa60cf34f22a8b65eaa2392fd5bcbd3bc48b3da541fe3d9bd7392c0 SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
@@ -13,5 +12,5 @@ DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afb
 DIST icu4c-64_2-src.tgz 24013250 BLAKE2B 4a286e7a952f5faa74d942f6b6a73147a46aa10fe6d54d024e2d18d1e01056444d56118ded04b4fe084d6a0f9058d7d9e76973960ac8fe5bd9ee105d9e214318 SHA512 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78
 EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42
 EBUILD icu-63.1-r1.ebuild 3321 BLAKE2B b8e6b6ea9bb9379f0b09195382db18e7758fc919d626f49240f9b8a75b97c84833dc2741c528788348d090749229b18d610bcd5bb196506fec03803d3a78af3f SHA512 0efd9eeac3944f3ea14e20f99c3d3bf0f9a2ed22d62074a1d1342c8fb04f4bb76c30d51ca173a09a59abb832cdb134bd1120b065ce0c63536da08839f4abd2de
-EBUILD icu-64.2.ebuild 3452 BLAKE2B c155821d71318f0cc7f9d109f274e3bebdfde38cda04ec4278d377d47a65b8c65ff705c1db7f3475161b9eb1a1ac067467d76b952c72d90bb40d606ac00137d8 SHA512 add4911b736ecfcf00f56a9dd706bb9abb33e18725e295ace2fcb7f6c6b3d960823bc32487289f31385fff1deb0eed9482a51a2f19c532035a0381ffa8eeed31
+EBUILD icu-64.2.ebuild 3447 BLAKE2B 79683e5d5770c84e5f09e032d5f7a9c9dcab23e163358a93d4b60f1532e3698e5f4dbe5fa1efc9652d2de82f85e6e0ce02a6188818c1c7a2fd8c2e6ed9a4fbe9 SHA512 22d0c7e6ae62bd25ebf3e480b757624a50b9d831de54facb93d19e0f6a8cc763c2d0adfb997689235603d5b3b8b1fe5aaa3cea356828b480ae6f0d7c63bda672
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/files/icu-64.1-guard-memory-include.patch b/dev-libs/icu/files/icu-64.1-guard-memory-include.patch
deleted file mode 100644
index 618a42541277..000000000000
--- a/dev-libs/icu/files/icu-64.1-guard-memory-include.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 5ecd46bab07561758e0c37a9178e74175e989bdf Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 30 Mar 2019 09:59:46 +0300
-Subject: [PATCH] ICU-20530 Guard memory include for C++
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Introduce by ICU-20357, commit b7a3571b adding <memory> include without guard.
-
-Fails when compiling within extern "C".
-
-a.cxx
----
-extern "C" {
- #include <unicode/localpointer.h>
-}
----
-In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/8.2.0/include/g++-v8/memory:84,
-                 from /tmp/icu/icu4c/source/common/unicode/localpointer.h:45,
-                 from a.cxx:4:
-/usr/lib/gcc/x86_64-pc-linux-gnu/8.2.0/include/g++-v8/backward/auto_ptr.h:325:3: error: template with C linkage
-   template<typename _Tp, typename _Dp>
-   ^~~~~~~~
-a.cxx:3:1: note: ‘extern "C"’ linkage started here
- extern "C" {
- ^~~~~~~~~~
----
-
-Found by usage of xmlsec.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- icu4c/source/common/unicode/localpointer.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/icu4c/source/common/unicode/localpointer.h b/icu4c/source/common/unicode/localpointer.h
-index e011688b1a5..8e35ded0b10 100644
---- a/common/unicode/localpointer.h
-+++ b/common/unicode/localpointer.h
-@@ -42,7 +42,11 @@
- 
- #if U_SHOW_CPLUSPLUS_API
- 
-+#ifdef __cplusplus
-+extern "C++" {
- #include <memory>
-+}
-+#endif
- 
- U_NAMESPACE_BEGIN
- 
diff --git a/dev-libs/icu/icu-64.2.ebuild b/dev-libs/icu/icu-64.2.ebuild
index 51285878f756..f2670562cf82 100644
--- a/dev-libs/icu/icu-64.2.ebuild
+++ b/dev-libs/icu/icu-64.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index 9fbb812c2d6f..23ac7c9b87e7 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,5 +1,4 @@
 AUX kdiagram-2.6.1-fix-horizontal-bars.patch 4650 BLAKE2B 4063f8dbd92621f7d05d9b771650e9094eb3caa175a601b3ba51066853e4b222ceeeb6ac006c78a6ae12e70e5b0b4f192a004bb07437c296b5d4c9907f21c681 SHA512 8e0a94c65249f7a8b52e0c6261e251a7bcc07103e5f2bf21c1fc06b171d60a8d726f4c475c91a9114a1b129443208a95340b1aad07f2d31b2be0988f7f1611c4
 DIST kdiagram-2.6.1.tar.xz 674016 BLAKE2B 323fcc1101f4bba527426923652ee53a1986edff1c7a0d17a478585019c97f731675fa30477064f1e5375ef0a3da27ba1918ee21cf6758ac445ea0d7f1b7611c SHA512 caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128
-EBUILD kdiagram-2.6.1-r1.ebuild 781 BLAKE2B 87027f52dd286e85dca1b418c07d63b1479d9900a61eeb175cb5d5fec26e4813b1e3f0fcbc53f023e0c850b1fae5ebb3d0f5b64d49c29511715ef74ef5f13a17 SHA512 8ff4ed92a236f8e1b0986a8c226e1e0b3520112aef6d39a1c944dc98cfbb404fedad79af275976001880e453bf57a642c2dd2ef8f61f4b70899583325857f9f1
-EBUILD kdiagram-2.6.1.ebuild 654 BLAKE2B 107e745348aa6492db244419f2ab596e9d4f95970ea2c7bbb798c53347bffec9b993c61976a489da293abfd2f46e7fd606c6a3d228da22a01cb5eb8d387d186a SHA512 9b035287ab682100ec8d1dc5616439c3ca695a7c45a35bbd3593fdd12563babfa5b06dff799bece565bf75091a82c3d84345631b6304f3b2beefc0feedb7adcc
+EBUILD kdiagram-2.6.1-r1.ebuild 780 BLAKE2B 60dca7566dd4c48e0e2d59e0e2a16c0175c52891d6f89f33fb102ee8929ccb5ae2249e0cf515fc43ca8cd2771f677b3e2b7499f0eb90b66f1c38942c33774877 SHA512 315d1c7395928419ce5846e9fd46a0b596b33979b633bfd6081327116db40c0500c7e6cdb6328336c00886ad45094dfc6abb904683df24d585fb4f07110b65e8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild b/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
index 84b8bfdc1cc5..d03b24c8394f 100644
--- a/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
+++ b/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 fi
 
diff --git a/dev-libs/kdiagram/kdiagram-2.6.1.ebuild b/dev-libs/kdiagram/kdiagram-2.6.1.ebuild
deleted file mode 100644
index 6a4cc4834ec7..000000000000
--- a/dev-libs/kdiagram/kdiagram-2.6.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_EXAMPLES="true"
-KDE_QTHELP="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business diagrams"
-HOMEPAGE="https://www.kde.org/"
-IUSE=""
-
-REQUIRED_USE="test? ( examples )"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 ~arm64 x86"
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-fi
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep linguist-tools)
-"
diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index cfa11d832c65..e29cb47b85a4 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -14,7 +14,7 @@ EBUILD leveldb-1.15.0.ebuild 1230 BLAKE2B bbaa78014b6f36a8c6d8e5a71ff56995b95f9f
 EBUILD leveldb-1.17.ebuild 1720 BLAKE2B 683381ebc3ae11d8844e52fb2c7161348a6495f4f83bd29369f991d4169619d526ae6bd1ed878bae9269715da5a9d7f80efc298253fa78c35aa1c7eea9b98bd5 SHA512 a59df720d900c7da98a4e0c9c865f5cb962b1843461289cd0a4e78cbcb5bcfff93b0d4213fde486df0a9f5d2dc7bfe86ecfec757c83513932fb1ab02859feb25
 EBUILD leveldb-1.18-r2.ebuild 1878 BLAKE2B 8a31c57e1e5e6015b549e55b83277c47be0b882f695f3af8f2295ea801380cb02ac0e0691a2a9113bccbb39e4a505a9ceeeaa2c0f9be3644afb1eb4c5949d7b3 SHA512 865cc8d9fa5b956e3b31863d3ce4d18624bda106aa06c0176ff514c7cc3b7016edb0dd34dd5724b5fe4a9ef231ceaf2b59ef47ac9589c66ca4979254b4703075
 EBUILD leveldb-1.18.ebuild 1647 BLAKE2B 65c40aea5784964fcdf7550ff41f20980b61e3eae2e69ea790d1e1db1c3b152abb18c7ec679bbdaca21c2c91ace348e7b8a8bee53fa5c39528f1b0c1ac76108c SHA512 5a8feaeca45690fbb5d6f7ecfe7074e176532765900cb343107da542b32e61935bb0832a6682550d57a7e74bc20fec0469a7b0b20a1de9636f628fafd3de4193
-EBUILD leveldb-1.20.ebuild 1735 BLAKE2B b4f0ef8f4ddd61fd24a8ad649081085a5e7c55b708a13f45f13ddd5fce339f6fdee478913a09d56cfaa34667fe4df673c8e6b37867a892f23e284407b8e569a2 SHA512 61f2a35428c9dd6f76092d46d742179e17e48eb4281d36c96e527c6b7d800d1dee9d44c4032e1efb400b100bbc952e40aa492f3082da904a172d5f653055f170
+EBUILD leveldb-1.20.ebuild 1734 BLAKE2B f11bc9aeb85706437e4fef3519870b3fdfbbc11473c89d1936074fce6da7fe62d45279e9604a05c2cc0c813b4b01caa26e5e0ae12b18138b7fb255e62c21b028 SHA512 ca4bdbf333522c199c0e192a779c50bc506cec454f95a599b83e595593a1e39d1e82e49bd342a178b5fd38ef074ce05e8cf689ca9f5f8db585207e807ee43e01
 EBUILD leveldb-1.9.0-r5.ebuild 1223 BLAKE2B 7bbb2958034b96f22b3bb5e55fd9f1383e2cd01b7a523dc32ead090b31cefcf4299d581e85430dbec267746ded520ed21ddb89a5fad9c40a1f6a652677961ecd SHA512 a97ee6357c3e37208d7900f216e4d4270bd7b6c9add1449e3a0c52d49755a1be88f6008e9ae9bb6a021d3345fa57db18e3751073a63ccc8e4270e7ba684216ea
 EBUILD leveldb-1.9.0-r6.ebuild 1277 BLAKE2B 9e581129c37d33f46037eeef50916c5ce6916e6f671f01144b9f0f7cffed096dff724076f36261d552df6cd8f396a38725ee476258211a1cdbf42af9bef6b289 SHA512 ca4965119338028813e0cdb5d1b303c88ef2e2450f471f4d58e16a276485fcb001d6c4818097f5b0c47eb66ce1b23b561ad37809415654c4cee771d0ac17137a
 MISC metadata.xml 487 BLAKE2B 33632d0f2ef6a0ed11b059a6245ec9582b1e977622a9a755e4ae98cd1f8dd8f853c0ed0aea919b11451c57c576699f4e9a22bd1303148eacec6fc2770f47492f SHA512 61c9350d750209e948d6aa51a3594546837e425c49dede490c0171771e7ff5a2e03932f5052ee90b36e477a20153bde3c265036839e2723703677414bd77d0d3
diff --git a/dev-libs/leveldb/leveldb-1.20.ebuild b/dev-libs/leveldb/leveldb-1.20.ebuild
index ce1166ec824c..148679ff2a54 100644
--- a/dev-libs/leveldb/leveldb-1.20.ebuild
+++ b/dev-libs/leveldb/leveldb-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 # https://github.com/google/leveldb/issues/536
 SLOT="0/1"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="+snappy static-libs kernel_FreeBSD +tcmalloc test"
 
 DEPEND="tcmalloc? ( dev-util/google-perftools )
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index f04bfff5e119..a109bc9240ce 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -5,11 +5,13 @@ AUX libaio-0.3.110-cppflags.patch 629 BLAKE2B 0fb7bee48ba36c68aad96f76254fb7efaa
 AUX libaio-0.3.110-link-stdlib.patch 731 BLAKE2B 9599f75d405de3c1fd38c15cdcac6c65e624674d0be01982d13480fa0fe4020ebfebf0d22b1614cb70d4533f93d1dd58f293aff314a414d84c94fbab499db3da SHA512 b434da8190ca145fcdd64aa788be5d8bd1b44c112e117bfb8583cce91cfdcfb52038189bd9c92d690286e6576d82e74e62b465585f6333f1a920769ddbe29c32
 AUX libaio-0.3.110-optional-werror.patch 832 BLAKE2B d732c6c15247a6b601e4296acfe9733109360dc57f4397f7ae35a207b5c98e652d9c9dd67d52bf4997a26498a58722a77dcceb01df9b0b39289f51596e39aa2d SHA512 14b73acded7f67d01e199c411f2ea090b1d0d666521233d3829ca76572d6962f5dc3560096dc10e13c342eed046fb47a6e370e57fceab457696fad6c888a5067
 AUX libaio-0.3.111-optional-werror.patch 911 BLAKE2B f6ce9b16bfe7d3fe3fde520c4e6438b534b1ea54561faf94229cbdaa2cae40ee6e6ab0e9a689f08f7e43442d1b863bdf2c42e784774cca89003feb5dbbffd63b SHA512 8315c9ca018578d4b8e81b87ce155d8ebfc586be68f24659a91f027449cd27a9660b2cf33ce47fcf240ce44f2b7f1095e8d5996ad08782d91392f6dd8fafa5a8
-AUX libaio-0.3.112-cppflags.patch 610 BLAKE2B f3b79a3b1abdb40741b15a53e3308defa5538a01744f02b13a03af686176c753fad02d6977b9213ffcde6b6fd11261a7c23476adf1a23b87bbf1a64834a4b790 SHA512 160ba75e05066eb5114d7a7e6d14b2e92e670d664c2f179b9703140cbcfa96df803166dff008b0bc0c2edfa7050d03c7d5aa4fbf5d8f4fb1beea02e3ca172942
+AUX libaio-0.3.112-cppflags.patch 350 BLAKE2B 8c2d0706f92a47dffff6465712588b525b89ff223019cf3ec759beca14ff2ef9515d4b3697ca64931c2d86969a40ad74642aa06544cc2671906e5b49d2e10352 SHA512 7386d741658af265cc4f156d4cc8518a7ec9abc15e8738cb13c2e2c3827b284cf8f8ee07c4a16dd0b7ae424cf87e9aad438389f0a832dac2e49ef945e3829374
 AUX libaio-0.3.112-install.patch 1921 BLAKE2B 5338c1deab3152fec06dfcebc3c3527fd8df77640700e9a95db831b30c4b56ffef65fa50dd8669608c7dcc63eba302e87646e63d4fefb2313369ac175836ff23 SHA512 56009ed2cde7b9f7a6e7f64c4348d3b78807e2d72a44f39c811004a14e6757e53a94739e7513ae7e3a1f2efef1ecfdf98f61f24b70a65c6f9d320ea94415a443
 DIST libaio-0.3.110.tar.gz 42270 BLAKE2B e774e5888106ffcf4db08569a8b3dc6722f4e0e8278e9f2fafe865e282c0568059e8dbb37aab7a33719ab4d80f42404bfb1d4ab03f5c066d9eb75301676f525e SHA512 664295d330d6e9adc005e2331e77582619625b479ffc2b81728ba6a682487380ee936079c4a69d35144b458bbe35c612f4ed9b32e913bd7e109b824345763eb3
 DIST libaio-0.3.111.tar.gz 44557 BLAKE2B dc2f44599218de0ca80cfc17f604eb85c9b1241ce7221f49f1a4ee8c5bd3fa135c29ac8d97f6f97550a508e27b0dc92eb709256ffd803c1feca255016a4d674d SHA512 259b89647e22ba47edd4076b8d6aa8ab89af197b64930aa5b01b69fc1969b13b4a5e91c449ccdc9b2746c9eae3160211ce1fe110d252efeca5f2c56d0ea66e2e
+DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
 EBUILD libaio-0.3.110.ebuild 2213 BLAKE2B 109c4534a9c9c2329cba96f30bdc0262020e3bbb1d39494b4f0338914080aaee990b780076bad97030fe68e7eba5f9d6585b6011f09e45ff2cd605b531bc2ea5 SHA512 80601b081b9362ce194d91a760395ccbfac4bd8e0a089c55c1715504939b742ec9e4b313dd3fb382058d0ae5a08f9ea8670938a3405655e7de7feb3c1de6ec09
 EBUILD libaio-0.3.111.ebuild 2196 BLAKE2B 0ec691fbd8a98d8fd32825d7f26a96fcc2b533ac573df1e368b99e4a995f4190aa2e004d808ede6d365fbf437d5324278e644718cd1a912eedeafd3a57205e0b SHA512 5e7386c402db309b54f0d62f582cc66e48335f76bb319e3803567db4185ccc0dcf3da918c075d923e92416e7fa0ebd803b3a324bf84b487c2e8acfed990fd544
-EBUILD libaio-9999.ebuild 2135 BLAKE2B d77e5b3cbf65b30c3ffa974fa2ea703df4f30d70fe3ee8705644c297686c35e58e807e6f840c571f3fbdfc855f573e71f4f4564f6c0f8b525d82af5cb9878fb9 SHA512 2715b824d05430b8d5f3b252b2dc9354d71869fa7c6cbc676eeec169f8a1d7c1a85f224fa4fc9321b76b3d5280fe35f67f28a5c227c9ea75d21edd1d0475eacd
-MISC metadata.xml 486 BLAKE2B 68cdbe0bbc0e629e59f580672dee5d694d8f411d81f60c249220aa60a8fee8cbac7add2910e265afce266923127fa6d0ccdf7d3adecdc2a25c752cb80028b006 SHA512 e8301c12097a02130a43f9349dea0cfa5418db8c6f76ae638e01631039caf21cd3b9f8a39255c12a58c779270239d7bf086842997e96ff7c0cfedb550fe44ab1
+EBUILD libaio-0.3.112.ebuild 2097 BLAKE2B c52be9821a9f3598509ee63e4c78c205715ea6c3cb66024f00aa0e2c3f6769a21f7f7db7ceda33a6ce9c6d63e7e9e12efa9d473c7fb3ad89e0fbd3c2d66243be SHA512 d91e7f2c6c8732806d88cc85963d9b87dab1d49fbde994b16af4b283b89bbbeb14a715a8cf9ed7c0e444ba14421c81649e9aefb3d2124c9529ee607998b65261
+EBUILD libaio-9999.ebuild 2097 BLAKE2B c52be9821a9f3598509ee63e4c78c205715ea6c3cb66024f00aa0e2c3f6769a21f7f7db7ceda33a6ce9c6d63e7e9e12efa9d473c7fb3ad89e0fbd3c2d66243be SHA512 d91e7f2c6c8732806d88cc85963d9b87dab1d49fbde994b16af4b283b89bbbeb14a715a8cf9ed7c0e444ba14421c81649e9aefb3d2124c9529ee607998b65261
+MISC metadata.xml 414 BLAKE2B 291cfb45ed8ed29e916e1873b00685eb32f2cfdca2f225176028fda48335bff8369d1084565acc79d58bcf1c69af752efc0f7d30fa775406be03ce432c56c5df SHA512 31c76d1e4bb0c87402c00bdef098bf930b273cdf6c631a704fb02f925a3cdfebcded9d33d31f10cdd8c9ae2ab9bb71dd2cd0113029df501ad83a5a92b611b7c8
diff --git a/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch b/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch
index 2f1ba4b7aec1..dddb9c216607 100644
--- a/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch
+++ b/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch
@@ -1,25 +1,16 @@
-From 1df69d571c5b764c42ba17970707cc29d2394a25 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 21 Apr 2019 13:04:24 +0200
-Subject: [PATCH 2/2] respect env CPPFLAGS
+respect env CPPFLAGS
 
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- src/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Makefile b/src/Makefile
-index 66534b9..44bbef8 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -5,6 +5,7 @@ usrlibdir=$(libdir)
+@@ -2,8 +2,9 @@ prefix=/usr
+ includedir=$(prefix)/include
+ libdir=$(prefix)/lib
  
- CFLAGS ?= -g -fomit-frame-pointer -O2
- CFLAGS += -Wall -I. -fPIC
+-CFLAGS ?= -g -fomit-frame-pointer -O2
+-CFLAGS += -Wall -I. -fPIC
++CFLAGS ?= -fomit-frame-pointer -O2
++CFLAGS += -I. -fPIC
 +CFLAGS += $(CPPFLAGS)
  SO_CFLAGS=-shared $(CFLAGS)
  L_CFLAGS=$(CFLAGS)
  LINK_FLAGS=
--- 
-2.21.0
-
diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
new file mode 100644
index 000000000000..b6ff5d1d4215
--- /dev/null
+++ b/dev-libs/libaio/libaio-0.3.112.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit multilib-minimal toolchain-funcs flag-o-matic
+
+DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
+HOMEPAGE="https://pagure.io/libaio"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://pagure.io/libaio.git"
+else
+	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="static-libs test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
+	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=(
+		-e "/^prefix=/s:/usr:${EPREFIX}/usr:"
+		-e '/^libdir=/s:lib$:$(ABI_LIBDIR):'
+	)
+	if ! use static-libs; then
+		sed_args+=( -e '/\tinstall .*\/libaio.a/d' )
+		# Tests require the static library to be built.
+		use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' )
+	fi
+	sed -i "${sed_args[@]}" src/Makefile Makefile || die
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	if use arm ; then
+		# When building for thumb, we can't allow frame pointers.
+		# http://crbug.com/464517
+		if $(tc-getCPP) ${CFLAGS} ${CPPFLAGS} - <<<$'#ifndef __thumb__\n#error\n#endif' >&/dev/null ; then
+			append-flags -fomit-frame-pointer
+		fi
+	fi
+}
+
+_emake() {
+	CC=$(tc-getCC) \
+	AR=$(tc-getAR) \
+	RANLIB=$(tc-getRANLIB) \
+	ABI_LIBDIR=$(get_libdir) \
+	CFLAGS_WERROR= \
+	emake "$@"
+}
+
+multilib_src_compile() {
+	_emake
+}
+
+multilib_src_test() {
+	mkdir -p testdir || die
+	# 'make check' breaks with sandbox, 'make partcheck' works
+	_emake partcheck prefix="${S}/src" libdir="${S}/src"
+}
+
+multilib_src_install() {
+	_emake install DESTDIR="${D}"
+}
+
+multilib_src_install_all() {
+	doman man/*
+	dodoc ChangeLog TODO
+
+	# move crap to / for multipath-tools #325355
+	gen_usr_ldscript -a aio
+
+	# This lib is a bare minimal shim on top of kernel syscalls.
+	export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n')
+}
diff --git a/dev-libs/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-9999.ebuild
index ddaf4e22813e..b6ff5d1d4215 100644
--- a/dev-libs/libaio/libaio-9999.ebuild
+++ b/dev-libs/libaio/libaio-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit multilib-minimal toolchain-funcs flag-o-matic
 
@@ -11,15 +11,14 @@ if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://pagure.io/libaio.git"
 else
-	SRC_URI="https://pagure.io/${PN}/archive/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="static-libs test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.112-install.patch
 	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
 	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
 )
@@ -72,7 +71,6 @@ multilib_src_test() {
 
 multilib_src_install() {
 	_emake install DESTDIR="${D}"
-
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/libaio/metadata.xml b/dev-libs/libaio/metadata.xml
index 68c6fef5c3a6..5870dfd12814 100644
--- a/dev-libs/libaio/metadata.xml
+++ b/dev-libs/libaio/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>whissi@gentoo.org</email>
-    <name>Thomas Deutschmann</name>
-  </maintainer>
-  <longdescription>Library to provide user-level kernel Asynchronous I/O (AIO)
- support for Linux (needs kernel patches as of 2.6.12)</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">lse</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<longdescription>
+		Library to provide user-level kernel Asynchronous I/O (AIO)
+		support for Linux (needs kernel patches as of 2.6.12)
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-libs/liberasurecode/Manifest b/dev-libs/liberasurecode/Manifest
index c74140945d5a..260ffa668d3e 100644
--- a/dev-libs/liberasurecode/Manifest
+++ b/dev-libs/liberasurecode/Manifest
@@ -1,7 +1,9 @@
 DIST liberasurecode-1.1.1.tar.gz 202934 BLAKE2B 06048aaf304a8e00f1c74312558b00512a5473c6e24e64a03f832c1c1b74ae8c4f1b67efc78ae71d15ee43007e59d8a5151ab77e8a6808114cba7f3eebdee99c SHA512 651d9537f2f1152eecae777b02d4d877b3aabcc88c354fe977679ca5025c83635b165fdf12be6174944037822ad3e2b075a9c270cae81c8f4f15c4bfcdc569cf
 DIST liberasurecode-1.5.0.tar.gz 209093 BLAKE2B 4c1911ee1884e0a47fd6665327aaed45b423d5c95ed33c01c7857636fcfe5ef56677a80a2c40de9ddcdc7363b54f9f86dce205cff445a3492afc1500ed5c51f1 SHA512 369b19cb3db90a459667f024949784780f53b409961180ed36dc2299f4bad0037dc44d36b09e198da8e9f8a129bd7d1d2c4648216356d86f0fdf96c4166def5f
 DIST liberasurecode-1.6.0.tar.gz 209343 BLAKE2B 43dabdafac29972bb439fd81f37ac7fd562309e62b30c454326684ef58fecf4aa755193e69e194aa8db2d1b65ba421c7dbd571f1230996f0b405f6ce4ff3caed SHA512 168fb75f2e329e79d6cbbc5d97e7a60963f742d9cce6e492a3c845ef77acc204b00a34292e847ae0c165177fa38a8563de2428d01f8f47364af4fb1e8f4d9517
+DIST liberasurecode-1.6.1.tar.gz 209761 BLAKE2B 94c26cd49e3181a02908c5379dec69da4e37501c7c0123e63d368c3c19b72f344f2246bfabfa5e7e0aee547f6a746ca5aa1f72ff4370c975425d68abe00c07ed SHA512 7d0fa00b12bc561272573f4425bdecab3c2f0f40914f50adfd471b464232047de70036f4cfbda5f93f843afbfc60ecc0afb40705bb772453c4956565083bb2d0
 EBUILD liberasurecode-1.1.1.ebuild 1061 BLAKE2B 1fc435e15b401beda13108960ee09be99c42da3d77b1ff5506a76afc7ddf077798b005d00a9594c34a460fce592240549dc54b8f054f9d224a4206489c403d70 SHA512 ecd84bfaebffef13a302d83b5c4a76f79aed06eafd2025b83e1610f4021f78ef99848948c2d04c338c2649046c2402f241c9b931faf5a90d079db0ace8502505
 EBUILD liberasurecode-1.5.0.ebuild 795 BLAKE2B 002ebaca0315fd82647eb036b00b8595b1f88c72b45a53cd4f4d7b6b27e432ee40a53cd2525ac3b3af57ed9d038a507ed3a4398bfe805894ef9a1c4abbc6f7d6 SHA512 8321dad413310be359399b59356f8a65747e71ac427b7e06b73e41df150575fb498b619bd632b74c64894eadc4698e2a417f9e4185d6900dbc0fd27115a825b7
 EBUILD liberasurecode-1.6.0.ebuild 792 BLAKE2B 75b3bab56ac6e7bb62a7f6b761ca78506a65d1d98f24d7658ce330f4af18b267abd629f83d7d333f5810717b717571e2af7b3427d4a1705cf3cc17c41db6e1ed SHA512 88e5560543134da391be17dce6691445148b157003e921e81e5ed9d0453788e48ce2aa1cbd82fe2238d47cec424c00533df948ccf79c8f58e7001ccd7de4103e
+EBUILD liberasurecode-1.6.1.ebuild 794 BLAKE2B 458a93f8ceacf2d081fff3296d134ad77d14d94c39b3e68ece60fb9b56bee292076ff9100e3a7ae85179e174836e7869365cb34c8a9528233b2a6f792a0c4f30 SHA512 a5b198f9f1563d08160a4a55b56df48d90d56f54f0ea5564a90568b326c7532fee150aa02032f5fd942c5bef5c22ea20e149583a172ea152535794744db3c5e7
 MISC metadata.xml 464 BLAKE2B ca354debebf2db1768ff8cd28d88b0edeb6a57d47fad34837d04e6ad21f59e37204c85b63df08dbee14d3eae342db561a785bf00ecb2d908fc5c0112a72baa6d SHA512 1b94d0071d7670f163e28193c066b6a9f39a086051aba5e6291c0f31d56465e6cbf48798adf6fc90e08fd56121063d909bcd4aeec58547539ec72dde4210b197
diff --git a/dev-libs/liberasurecode/liberasurecode-1.6.1.ebuild b/dev-libs/liberasurecode/liberasurecode-1.6.1.ebuild
new file mode 100644
index 000000000000..f4ba76cec309
--- /dev/null
+++ b/dev-libs/liberasurecode/liberasurecode-1.6.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils multilib toolchain-funcs
+
+DESCRIPTION="Erasure Code API library written in C with pluggable Erasure Code backends."
+HOMEPAGE="https://bitbucket.org/tsg-/liberasurecode/overview"
+SRC_URI="https://github.com/openstack/liberasurecode/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND=""
+DEPEND="sys-devel/autoconf
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--htmldir=/usr/share/doc/${PF} \
+		--disable-werror \
+		$(use_enable doc doxygen) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index a8596412507f..342036b9c056 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -1,6 +1,9 @@
+AUX libev-4.25-pc.patch 1237 BLAKE2B 6f07e9a8614f136dc44c099a49aafc57e78d107820f23319a9d498d7e6919c01d0e77cb0649e84913d8453341191f48ab6c1b71138c11005400e1936a2efd6e2 SHA512 4cb83f6ab869028a023f1dbc5be4d29b7bd5a703ce12e0cfa54305682e83a5e4a357c19b95dc1b8236e9dc2fe5e2647f42547983a1a3cff3eaf8049b297306bc
 AUX libev-pc.patch 1031 BLAKE2B 395e57ac5b71761c9603bc5355265ac7bc73aac78c2d6e0aaf9a53cc378c4a1ea3d819960d412e3cf0b6081c46fcf2120b6cef0ef9aa8be26d64e1241d090217 SHA512 09905e5bdd28b06e92bf0023b659c339e2dee05c78657f0871275ad3816cd050db346cfa6621d569b3b12977b2f99a63edcb9a5613367167d7187d705ee44fbb
 DIST libev-4.23.tar.gz 524184 BLAKE2B bb8c15665e0ff59322bc2f076f4256ca8f5acff5bc55bb3f5f10ac9704f9311ad90f581e4ced25dcc22c39988ffacce1958f195234a60039d33ba7b7beb9aee2 SHA512 e3d98364b3788a7f5c56be49b99cecc98da6323fc7e6d47aff808580653ab9effffe88636a2f5d357d596a9a580e778c20139cc162467e3e2c5fc736713c6e39
 DIST libev-4.24.tar.gz 524264 BLAKE2B 92a480cfba67119c630211b9acfadfa2dc6ab1806ed015cca693829fa6deedeb4fc5530aa47e0a0d21304b0f626136110596ccdbeb75bc13ea5d23eeca7b9ded SHA512 e4cb3b5dd4b9828d5b8da840c73ae4604258a8c4330aafa5472298b83bf944628f36918f0ddd47d9069d255639f0b24a2cf8d349f0644ffd50de823bcb54a31a
+DIST libev-4.25.tar.gz 545817 BLAKE2B a6ce69ba0a5824afc9e49afa8dba67f15b5945bb01104733c2a9478265fa78908ea26b6594c00f210c86eaef936956c16d3a55cb91a834501da0a6db12caf201 SHA512 83455d4dcb626a28d8477aaea27cdee6bc88b273fae926a57eed9f6a59d4b0ea2eef0f41ad09ff711aea2956ed83a591aa53cfe8aa242f7d0a4da19180d764c4
 EBUILD libev-4.23.ebuild 1098 BLAKE2B ed8a663be761548bf235607134c83f867cac6a090dad8a1a0fd27ae79c7124308cebdb58713631c23fa98eb40515bcf39f6d5d3a7e1393738982787f304ccb31 SHA512 ff3e6e3d8674b5c82f725039cc302e80600df10d4d428e1986720710409b9d26a2212a52a6c79c4ecc5d83bf7ebbabfd3226be377269dcc67dbe63ded9e27209
 EBUILD libev-4.24.ebuild 1115 BLAKE2B 28966f42a644d7817418cdcbd90347df31daf2470aa37934601a4d3b648193530063df7220179052ffab81151018e77031227ae68d01e621543b8ee0b103a1ff SHA512 0ac922c356c641aa6c1b636f9e0aea0a9805ee2869df1d2d441479b23519b9ded961207072513863a0ff7ad581dfc0b9d36438b70404f14a16c3f9516ece4266
+EBUILD libev-4.25.ebuild 1155 BLAKE2B a83b82d1ceacedef2390a70584cfb41dea9231962bed2422d948ea1fa2436e778ec3af2c25c44b3ad81c34b8b5026a5955d32a2994d3f8657fe72c487f6a2eef SHA512 e4b86e636b5cb80a66a5ce28b8183c4cc3ce07f9483f8273c8168a9c7062721502b3277ad142b23c04cb19cbed35c9745f3194e234e707ff3904388a4d6ceb3f
 MISC metadata.xml 246 BLAKE2B 65c152b918cef5b72db59bbb3fd1a71a6fd444bbbb3e95a87aa880e23f33d418b96f842f4a2070ad1bbd0c1d1c3753e935841e6fccf088954bb58f297b672dc4 SHA512 9977bb6fcdb8374bf6148fef57fa31bf04fdd8eb3701ecd75be5ea62a48382fb0ef703b3d01bbc996f91322b6fd0f8365dfa4134426770fa98d624d69d8073d9
diff --git a/dev-libs/libev/files/libev-4.25-pc.patch b/dev-libs/libev/files/libev-4.25-pc.patch
new file mode 100644
index 000000000000..a5e362479f31
--- /dev/null
+++ b/dev-libs/libev/files/libev-4.25-pc.patch
@@ -0,0 +1,49 @@
+diff --git a/Makefile.am b/Makefile.am
+index 059305b..76d9852 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,5 +16,8 @@ lib_LTLIBRARIES = libev.la
+ libev_la_SOURCES = ev.c event.c
+ libev_la_LDFLAGS = -version-info $(VERSION_INFO)
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = libev.pc
++
+ ev.3: ev.pod
+ 	pod2man -n LIBEV -r "libev-$(VERSION)" -c "libev - high performance full featured event loop" -s3 <$< >$@
+diff --git a/configure.ac b/configure.ac
+index b004dda..6ba3f5c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,6 +4,7 @@ AC_INIT([libev], [4.25])
+ orig_CFLAGS="$CFLAGS"
+ 
+ AC_CONFIG_SRCDIR([ev_epoll.c])
++AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE
+ 
+ AC_CONFIG_HEADERS([config.h])
+@@ -23,5 +24,5 @@ AC_PROG_LIBTOOL
+ 
+ m4_include([libev.m4])
+ 
+-AC_CONFIG_FILES([Makefile])
++AC_CONFIG_FILES([Makefile libev.pc])
+ AC_OUTPUT
+diff --git a/libev.pc.in b/libev.pc.in
+new file mode 100644
+index 0000000..8bc8681
+--- /dev/null
++++ b/libev.pc.in
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: libev
++Description: A high-performance event loop/event model with lots of features
++Version: @VERSION@
++Libs: -L${libdir} -lev
++Libs.private:
++Cflags: -I${includedir}
diff --git a/dev-libs/libev/libev-4.25.ebuild b/dev-libs/libev/libev-4.25.ebuild
new file mode 100644
index 000000000000..b2ac07e21a86
--- /dev/null
+++ b/dev-libs/libev/libev-4.25.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="A high-performance event loop/event model with lots of feature"
+HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
+SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
+	http://dist.schmorp.de/libev/Attic/${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="elibc_glibc static-libs"
+
+# Bug #283558
+DEPEND="elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )"
+RDEPEND="${DEPEND}"
+
+DOCS=( Changes README )
+
+# bug #411847
+PATCHES=( "${FILESDIR}/${P}-pc.patch" )
+
+src_prepare() {
+	default
+	sed -i -e "/^include_HEADERS/s/ event.h//" Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-maintainer-mode \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -type f -delete || die
+	fi
+	einstalldocs
+}
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index aa95e5738def..10e07d897c31 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,6 @@
 DIST libevdev-1.6.0.tar.xz 411512 BLAKE2B 0e9190fd4c28b36bcf325953aa634c0d8c604cef7f56e46679fc88351536d78b0bddedbbdfffe4164e0039c7d56ef604b143e23de2c4bb9a66653a03d6844fa9 SHA512 73046da447773716c9f0c9f511f3a0a6ababcf92a146eba363014afcbdb465f4c3cd8be0917f2f01561a72f24f20fe8ecd333467437d9d85c03afcb433d05060
+DIST libevdev-1.7.0.tar.xz 438264 BLAKE2B 3f71ccdfbd68598afed7316dd4902a8ac439c6f094788abed5cb8ed24acaf070edaeceefad17de51cadb039259aa0de6a8ec576fa1f8dbd60878ee75aeb39fde SHA512 bc43723fd1ca251a77ee549022609f73c15a33ae470fc843ac687542fb1938fba4d046d3ee1dc814bc38a4292a7f2ad9e71fcce45525b518a4f4a5bef099aa6f
 EBUILD libevdev-1.6.0.ebuild 1108 BLAKE2B 0c193d4337e4d2c4608b56c4bfa1fb6ca8324b979bdb83ff2df1d2b75f120d406a294ffc32c2fe503b7c5a5efb75a6c77421469609a33c9783f662b342e341f0 SHA512 3046e3c9b2144aa12e5133dfe3131d3a6115d8437073c41f21e7c202a3af100732d2f1523544500a0c8964126c89c5679b6eafbe977117fe712b55238bfb9fb8
+EBUILD libevdev-1.7.0.ebuild 1119 BLAKE2B 84c1cd909ea8f81ab025940c58b2969fc6d68be3360bfab21b865f23c1d3c26564fc1de9d1c149184efd9c517e28bcde305bc4713d8d5d1474f1c748d4c25b1c SHA512 9ecbd94c60955824c7100b0427a6417a47301618111787ca6e64d8207ac765b6de2c95994c17f8f6412f95d819b533a794add1582d526cd9e930dacbeaaf2a77
 EBUILD libevdev-9999.ebuild 1119 BLAKE2B 84c1cd909ea8f81ab025940c58b2969fc6d68be3360bfab21b865f23c1d3c26564fc1de9d1c149184efd9c517e28bcde305bc4713d8d5d1474f1c748d4c25b1c SHA512 9ecbd94c60955824c7100b0427a6417a47301618111787ca6e64d8207ac765b6de2c95994c17f8f6412f95d819b533a794add1582d526cd9e930dacbeaaf2a77
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.7.0.ebuild b/dev-libs/libevdev/libevdev-1.7.0.ebuild
new file mode 100644
index 000000000000..c32b139bc873
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-1.7.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit multilib-minimal python-any-r1
+
+DESCRIPTION="Handler library for evdev events"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc static-libs"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+"
+RESTRICT="test" # Tests need to run as root.
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999* ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+	if use doc ;then
+		local HTML_DOCS=( doc/html/. )
+		einstalldocs
+	fi
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index aca5f8b4c487..4671e09a5ca0 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -3,5 +3,5 @@ DIST libinput-1.13.1.tar.xz 529516 BLAKE2B 9eb9952ca2762470ee3e9ac0eab6b11c4b404
 DIST libinput-1.13.2.tar.xz 529488 BLAKE2B 489f962ca0b0385817fc76a5bc7254143d12c07e32a91dd118dca53fcdd6eaf5d2eef8aa5c5598a2aadda9e4a20b8a4c9340b60dee8286cd322fe2d294f1f6b7 SHA512 26f11c5274c26acc38b9b5729195010c0799a9563f1eb0e0cd67e323f8ed73b0fc8db8584ec8fdf1b726417f64c2daeb54832167079832626c8c1190fccf459f
 EBUILD libinput-1.12.6.ebuild 2055 BLAKE2B c8dea3e1942f7ec25de860c377afd70ad5baacf632d12670ac5394bcfc9476ec987dd92630558a47d54d5a6aa58a779da51414bf534e6b32b82b556c2af6b087 SHA512 1638b3ec959a58c1b198990e028df0319360485e352e1f1fe4b20690cea0549b6272636213e38952f5b236ff335cff557d37e1e11919cd996d10b28eee0184dc
 EBUILD libinput-1.13.1.ebuild 2065 BLAKE2B 2a0fc6fd6d51ce43ae70213313a2f06e360b55fe44fa643324ef2342ea723b6b360203a158f037efd5d4e5bee92b7ac8f42230bcdecd4bf152dd1aa82546ba9f SHA512 4020188a8802bf91c06bf5fbf7b9738ed2ba979aa4cc86d9a4a5317d1161a5c50298802e33ec015fc4b980e6ded61d6abfe9d4e94990556dfecb4cb51adc50ff
-EBUILD libinput-1.13.2.ebuild 2065 BLAKE2B 2a0fc6fd6d51ce43ae70213313a2f06e360b55fe44fa643324ef2342ea723b6b360203a158f037efd5d4e5bee92b7ac8f42230bcdecd4bf152dd1aa82546ba9f SHA512 4020188a8802bf91c06bf5fbf7b9738ed2ba979aa4cc86d9a4a5317d1161a5c50298802e33ec015fc4b980e6ded61d6abfe9d4e94990556dfecb4cb51adc50ff
+EBUILD libinput-1.13.2.ebuild 2071 BLAKE2B e6703ecfa1191fcc8e5f3ae3a630513497121cf2d709fa4f2b6992d86e8071bb1e502ee9f858e28f5bfbcc40018095cb5cc5337e338fbd4a9097623ccd7e2248 SHA512 2a63e6bac28abe072bc0cc6648fcdebf3722113167d7cfd2f27d95fd955e114420b0e2f94c9e020e17a676d1f1e69e9d47e182c29cbec2cfc7b3bdb6d893312f
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.13.2.ebuild b/dev-libs/libinput/libinput-1.13.2.ebuild
index bc7c6286e491..fd529371d3d1 100644
--- a/dev-libs/libinput/libinput-1.13.2.ebuild
+++ b/dev-libs/libinput/libinput-1.13.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc input_devices_wacom"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index 07fa4bd0bc98..689bcd6d3f85 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -2,6 +2,6 @@ DIST gettext-0.19.7.tar.gz 19235781 BLAKE2B 4c2cfcb0b21a66a9f8d2d57de7420e624a12
 DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
 EBUILD libintl-0.19.7.ebuild 2100 BLAKE2B 9b655e464aeac02ab8310be730489c98cedfa880d7afe8a8df71b28e81cfe068248052137f77eb28dbb2a2435ea4e5698b6786b08e71443a1c51dc500fc94b94 SHA512 9fc279db2f3a42d087572e8bb3bad92794bb7ece576ed1fa97160250264de2a586e7b3f2b0d68893456458cdd45cb4b8decb7b1f8bf020898ff7a5affa71c7be
-EBUILD libintl-0.19.8.1.ebuild 2108 BLAKE2B 597a7bcd05f8c2c6e98ea9fbd73870a59d285863f5eb56e4325387be0278e769205e0051439c250d0979cbbb19058d6f953c6cdc73882eb3809f3dd73433abb0 SHA512 439ffc0704490d2a7728ba943ab3e946dd5a41ce64fc85b32bae908ea27c847c7419e35ca68e604a0ea33a558ed2e377d9cb5cdde2cd6fd2d1d99cc88ee1ae1f
+EBUILD libintl-0.19.8.1.ebuild 2107 BLAKE2B e61df48a0f3afdfe56eb23addfb59ff1a96f9dcf818e99d0155171369b5a3784ce923ebfbdb7184826f56389406072fd3159ac5d66eca7eda6ba97261764f8b0 SHA512 2204410b0b03f7aedfc994bf0e00396213b3d0f21ca13f2fa73b2bc91d46a58303b287b7167a20c278ec13974aabae3907726c0df28e3ea226c7481b593477cf
 EBUILD libintl-0.20.1.ebuild 2122 BLAKE2B 4ea73f2f4bf1dcdf2d762e378ddc196d7c4723e6b2ac484eb6050a58f589877aa7b888fe7c5403ddf1b5189012733a817ba58616081e22ae966e3e0558de533c SHA512 d0b6f6527dc1ded47374ef404391f8d10ac27d6d835750c73e0e308d673f48be7aae7429e308f33cb60a4a946a1bed33e7bf95f703ab813d867cf9b974da964f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libintl/libintl-0.19.8.1.ebuild b/dev-libs/libintl/libintl-0.19.8.1.ebuild
index d7c6b994c6a7..8088bddc8dd4 100644
--- a/dev-libs/libintl/libintl-0.19.8.1.ebuild
+++ b/dev-libs/libintl/libintl-0.19.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="static-libs +threads"
 
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 21f5ddffb555..8acff9642c3e 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -6,5 +6,5 @@ DIST librdkafka-1.0.1.tar.gz 2466259 BLAKE2B a391d57b21711853ce7df338070512f715f
 EBUILD librdkafka-0.11.5.ebuild 1249 BLAKE2B e10b7391be22a1b2fa32af02872ffa2e813ae0a387e7a31005900b63c9d2d3ada9cd47ca2e7a155f6178267b3a2b258f7eb9f8c7a2470be8ad61256d7d207a38 SHA512 41f0086bfe66d0a12f2ab448d842119bb3afe4e3008662b0fb0ca5bc99ef36fe81c4c4d0c8de46ff4eeb6594cd4253ef5f0895beb45235f99b195d3b13476953
 EBUILD librdkafka-0.11.6.ebuild 1249 BLAKE2B 038b73de2adf38cf66b95a470c1bf4e82b4d30c50410ba8ddbad3d59cb6ec323dd28da6c9deaa162049cb26c4d38f1456459fb309f01ee7d2b7f7d826825ca99 SHA512 e3d82210e7d6caee61bece6eadf2098144bb7dc7f1fe3c19e6e0ef154e0f36acc2b60017d8fc044f3a63ab7c83a7e1f5c8c732c39817904d31fec3b47d1f20cb
 EBUILD librdkafka-1.0.0-r1.ebuild 1369 BLAKE2B 0217f4996dd3904f871ccd0fbb300f681c1f2cdb9c4d08bcfb494ea99b15828c35712cd635c371daa776ec8f8dfa07dd70f4f678827393e9c45d3731e321ed70 SHA512 af7fd02a7f5c56b903c57f2f986a417ed9b31c956afb201b2c0523a452c1fced34359722e88d34e06203c1941101c0fdf56c4768397cd37432edfb309a13ba8b
-EBUILD librdkafka-1.0.1.ebuild 1376 BLAKE2B 6042b6b5ff4be42cca0a4a2703e66474b169bd2098eb9f98b29db001f6c5caf478bfc7f2996b42fc13efb56af7efdf7c0e797ee8ea8b1d28a0ca9d988821a705 SHA512 22ab80e0f1fca1b2dae08fc2dd3fc6fb9f9a2bbb8bd3b3fc02f82f86a027ca4aa820cd5e823eee8cdc2945a5eb122043b99b98073c258b9f94228311421485b2
+EBUILD librdkafka-1.0.1.ebuild 1375 BLAKE2B aaaa66f6fccee106dfa0f1cdb14a526b2c74ee5ad79c8bd5a95af154531eb27b9f519c5d9a85585d9e22881e5cc2563353d45a3d111e8d85baa87fb34fd0314e SHA512 acf8c1d0e8d25a90ed02110cf81cba78ef4b89f9ca26720081141c8de299ad544811533484c6d1fd4c2b17d19c2e8b0bf63e108d75f9a14d8330b5683136cba1
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.0.1.ebuild b/dev-libs/librdkafka/librdkafka-1.0.1.ebuild
index 7ffc8964e5ea..4f3e2e8a5333 100644
--- a/dev-libs/librdkafka/librdkafka-1.0.1.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.0.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 21f9b002aa26..a948acab7a0a 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -4,5 +4,5 @@ DIST librelp-1.3.0.tar.gz 514470 BLAKE2B 3e8d844d3cccd4c148036191f376ba49b3851a2
 DIST librelp-1.4.0.tar.gz 519235 BLAKE2B 9c1e52cc9f666e75f261db65f45e3d954afa033cac59f93394c30ba99ed772d71b2882bdbb9bed696e57ed99805d47e57fd5e331cc3bc3850c5f15041a0d70d0 SHA512 92d01a51b4ee3c66d1f65d2e26f214646d72b41a8411ab700fe5f9f30f805ef98dec962526ef95c8d8428bf7398d38f656c919f95a3e49382adc745ef9eb4239
 EBUILD librelp-1.2.18.ebuild 1240 BLAKE2B 1e5c2a3c09963f3ccb25da31ba90e2cd0ca2ebfa0de68903656fa9727f3b56f1c44dbbb59d2ecf23e913ba0fbfd42cc821826f72b786bd54da66a06032c00ed0 SHA512 772112ff4a073d526c0054a211e11d295641f7583c84716019d007ba2e33654adc4f639d40be6e54ad4d23b4028aa85c039624138550360b20a0e9fb21ef3752
 EBUILD librelp-1.3.0.ebuild 1483 BLAKE2B 668859d6c0a0604e5bf7171b4801b6b8e678379e04b5fd6ae95620dda676905bc320e82b9212b0a6baa5f15ee920625695eddc2c8a1d2575ab1c3439cecf24a5 SHA512 11dbb4bc5b1a0495753b2c264d1b5094903d93acabef402c4022f523666b80862f0a277acc39a0c27fdc2b36ee89d2d964420e3edb8642fd031c4b97f13f1acb
-EBUILD librelp-1.4.0.ebuild 1416 BLAKE2B d5dab6b78144a75436905421f7f75c211569411b837d6960e560c12d55697db1a00aab77f28d66cb1f211a8aac25b792e71aba4883f6efbc8b4ed22d6bdebea7 SHA512 01e885fb4d736790f6ef945e2ef6bb259ceca3d05b91fe6c986e4993dacacc4df49f422befd783996ae7f35ba2ea64b5d3ae3face70824479bfc232e9f373123
+EBUILD librelp-1.4.0.ebuild 1415 BLAKE2B bdb0a5b19fa6f0baa9c9ffa1cbee143a4a55240c9529215e2e0aab93a3af1fa252a4db3f5d2069a827b80fbc9ba263bdad0000bd005e2e0ed88ff2adba2884c7 SHA512 c2ec622e88b74487ec1f554f2d7a8e86151dfc72f14d3567296825cbed08658966e29934833c31ee73822c502e7266c63cff3bd077792d8610c17b246a5dbcf7
 MISC metadata.xml 503 BLAKE2B 987b40e4f9b5e33e1f293023237b7d0cb614ea36113d6d5becb780fddc729a2a2a033cab8e41b64a0465d0f14e220c96787e30b7b133979e36ad86a1273ad0a8 SHA512 31f5e4ece41aab561a70c7b9af6119bce8c3cb7fb6720be754dd925ee656faa75ee953cd3d296d1b8bb5f48368d015ec5d2768d217b349f1689e767424786e3a
diff --git a/dev-libs/librelp/librelp-1.4.0.ebuild b/dev-libs/librelp/librelp-1.4.0.ebuild
index 7f2f302f8323..c9f0ee10f78d 100644
--- a/dev-libs/librelp/librelp-1.4.0.ebuild
+++ b/dev-libs/librelp/librelp-1.4.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.5.0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc x86"
 IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
 REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
 
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 4c34b1c74e82..e8cd84b594b3 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -3,8 +3,10 @@ DIST libsodium-1.0.11.tar.gz 1846782 BLAKE2B aadab6c89d11740dca72d7686d06cfeca6c
 DIST libsodium-1.0.15.tar.gz 1866057 BLAKE2B 220e327f7803c6cf0b1260b313a225d7cc7a965b36920c744379c5939643e588687032478e3d7a79b4614c5fa57b0dd2afd216b2e23ca69ad16ea67764a840ca SHA512 299a208f8342793d13498e95b23f1749f5b5b13ec276db3ec401130615e837ef475b6a1283b6e87a5f8227d23e70e38ca721073dadd5dc88fe4aff342aa64adc
 DIST libsodium-1.0.16.tar.gz 1910835 BLAKE2B d0d83730cfdb64a928c4597a3bcf4ae179d74bb9f850364bf0670547a12842009c0ca32d36d06053906fb649497406b1d7988e167772d5f1138d23798d8775f7 SHA512 eab917d599c9c1fe971a6ecf915b9a6476ccec2d46cf23cbfbf06dd3833089b422f192de4d55f17b93362f1251ba8d5ddeb95ced1a422a3a2631b4b82553907f
 DIST libsodium-1.0.17.tar.gz 1911910 BLAKE2B 488079599f8448a75ac60b955bddc2a284bc09307ef6c3d1e12fef6316d3ddc354b0b60756487311ea8b50920009394e749ba0f6f159542716e0e864fc80646c SHA512 7cc9e4f11e656008ce9dff735acea95acbcb91ae4936de4d26f7798093766a77c373e9bd4a7b45b60ef8a11de6c55bc8dcac13bebf8c23c671d0536430501da1
+DIST libsodium-1.0.18.tar.gz 1919817 BLAKE2B a42d898fe77f232dcbb75728e776b88f006e89f734c4d335e75e01d37b1034cc024df2e89d4350ecbe713d3e4b32c08bec537922c81cc63b0e87ee7fd89b2940 SHA512 17e8638e46d8f6f7d024fe5559eccf2b8baf23e143fadd472a7d29d228b186d86686a5e6920385fe2020729119a5f12f989c3a782afbd05a8db4819bb18666ef
 EBUILD libsodium-1.0.11-r1.ebuild 1039 BLAKE2B d5abb8deb7cbe76beec8cc9b5a5b2300d1a6d62117b33525bc1087e1f09a499a4aa0e7e279dc5dd003a3e2f18dae20104262da5822ed6d62ea63bdb197f792de SHA512 93eddc42552a4921d4de77603e8b26fbc29627b44edb889d85fbe9948ece1f0864053a8b09f5f6457eacd6e6bd1da078a91d5c67266395e1e1f5edf20b1dcacb
 EBUILD libsodium-1.0.15-r1.ebuild 1147 BLAKE2B 041f58dcef86c866941a670c23313e2e4fb9804e024beae6950c468b4e55632f3eeba8e73a2b9bbdcc52bebc0000ac36e3d692e72d4b4e32d6935dcae0319e7c SHA512 bc140c2446e4f1aa45d5f4429223996397a9999c374ed6cbb43c7eb211b89531018b4e363ba0d9404be1e6aeace799c783c22b67565fbe70ca1e6153e31a1635
 EBUILD libsodium-1.0.16-r2.ebuild 1303 BLAKE2B efb5e7314adc904c0d5ac99ebc7804e4125a7ed18f8d1d2945a6f020932030cc642919729f1d491ae251daf0ca901076d9fad1cb1624dacd9ba5a0a81c3092a4 SHA512 06c4bb4de35de4ad3ce64da1a6dc8b13e3d57eeb7bd1f281e7ad383bd0351f3e0246fdf22783a88f3961024a8b0dcd817abe2348b65f3fe6ebd444aa4bb95fd4
 EBUILD libsodium-1.0.17.ebuild 1306 BLAKE2B da03b755da6c2afa42c04c629d2f5f446f6b53bc1e5ad037e14451297eced8491ecb0c3741317f1784b5167aa34b6a024cd157f35b2aff0705d38b00cf7ba515 SHA512 13922c24a0abd9b75bb7716bef8f82ad46005a72c81350a90dc510f85005a34b30ea9f23df1a01caa9b4d6bb4f2a9f79de376bd875594fce00cf34e5d30a8333
+EBUILD libsodium-1.0.18.ebuild 1314 BLAKE2B 923670f66bee00609fe26356adc982103013d80cde9d4fa78dd14214aff05a13bef7cc1537b8e0164aa467b7d51d614bb012fa412faf035dea98593af7424087 SHA512 17c116372b69ddc2e52ad125b2a1c5da26df4cee12977855203dc7af7f2d59062a9950ca382848ffbd235bc9f63d2d10708442422e11db80618ab037d6526618
 MISC metadata.xml 792 BLAKE2B 381d25a84293a019bccb6e68f25b37a08ff768cb36207bd971c925731380925b50f743efd7bdb542364a870be0070c1428a2b08e37de5d190a21a2f077ca8ff7 SHA512 78cae1c9f71512da084b0c93301bda69cf6d2da6cf66099df45f31a763c5f23459e6b484ecd5d3d1e8faf570c2de8a4d1816a2b3c8565a539ee64fcf7b1b61f1
diff --git a/dev-libs/libsodium/libsodium-1.0.18.ebuild b/dev-libs/libsodium/libsodium-1.0.18.ebuild
new file mode 100644
index 000000000000..b1a14071e574
--- /dev/null
+++ b/dev-libs/libsodium/libsodium-1.0.18.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
+HOMEPAGE="https://github.com/jedisct1/libsodium"
+SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.10-cpuflags.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable asm)
+		$(use_enable minimal)
+		$(use_enable !urandom blocking-random)
+		$(use_enable static-libs static)
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
+		$(use_enable cpu_flags_x86_aes aesni)
+	)
+
+	# --disable-pie is needed on x86, see bug #512734
+	if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]]; then
+		myeconfargs+=( --disable-pie )
+		# --disable-ssp is needed on musl x86
+		if use elibc_musl; then
+			myeconfargs+=( --disable-ssp )
+		fi
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myeconfargs[@]}
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libuninum/Manifest b/dev-libs/libuninum/Manifest
index 4dcf983d67c1..bfc70fbcc0f9 100644
--- a/dev-libs/libuninum/Manifest
+++ b/dev-libs/libuninum/Manifest
@@ -1,3 +1,3 @@
 DIST libuninum-2.7.tar.bz2 276712 BLAKE2B 0894c632d7e9081f35d543895809bcc04fde6da674d4e6adc7cdc914f4bbb257a3e683b381e6496a08b65790731f73315d8263970265a351f40fe504f210c883 SHA512 4536a90b9f34fbabd3cc0560c1ff385063151bc381de51e6ca0253d2a42c2290b92329795b1a12ade305c3cb5757b02fe9d92817829977f50da2e34852936274
-EBUILD libuninum-2.7.ebuild 548 BLAKE2B e758ef4489d9a596ab918890f4351bd7405bbb5cae90c7358c40adf89345a7226e1f9469fbc189ffedaa713b1725df3c16efdc6fa521f3b0bf78dfbea70cec88 SHA512 1d892a9ffd242004355b8011983eca63e7f32aa714a2d039415d6e68e34d7014bb1e4bb921b3874d8f58f6e8243305049fd575f8b0401a401ed6cc681f74a22c
+EBUILD libuninum-2.7.ebuild 547 BLAKE2B c8e43c650e8ce680e1b6ee849eb04e7c2b63e2f013ea99ce5dd67f423a3fa54fa6274d400233cef5e3655a8d52c119adac85402292678cbe3b4bdded27d1128d SHA512 3de4909ef04b5acb3307279b58c2fcaecff59e0cdf7c395667a5cc71f719160f4d938c3c45325ab0838ff2b60151594845432033d952e717f81fcc915e3ea089
 MISC metadata.xml 806 BLAKE2B 12ab88f8c41b905d21b49c60e5adf9dd30a6d19486fc00f79a625bf04427a8c9588df25ad58e52a04ac521b4c6bff5e438470afb857ae773a6cc46b3e377753b SHA512 9a02d6a9c4a9424e009a2b54661768955918eb2654661e8ce966c919b4b4bf8bb6adc2be158f89088d4e140b65c4421f17e8ad5fffabf611c8ab12d074048b0c
diff --git a/dev-libs/libuninum/libuninum-2.7.ebuild b/dev-libs/libuninum/libuninum-2.7.ebuild
index 5fed049a786f..d13f676205bd 100644
--- a/dev-libs/libuninum/libuninum-2.7.ebuild
+++ b/dev-libs/libuninum/libuninum-2.7.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A library for converting unicode strings to numbers and vice versa"
 HOMEPAGE="https://billposer.org/Software/libuninum.html"
 SRC_URI="https://billposer.org/Software/Downloads/${P}.tar.bz2"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2.1"
 SLOT="0"
 
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 96e90d6219c7..9540219dd161 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -3,7 +3,7 @@ DIST libuv-1.28.0.tar.gz 1218769 BLAKE2B 444881479688144b36559a258f998e99e663d85
 DIST libuv-1.29.0.tar.gz 1223722 BLAKE2B e4e7e3e3c0668a573a29bd90b0bd63954fe0c03a195c420df5d7997fd79475f997117d09bf81aec5b58a57482aa8b3ad50cd7892249697e256340b36a720fd6b SHA512 19f1f25ffdb287a755f773488e3da5fd5b5b43c333e3dfb019bbac430ccd77456da96dbf60c38b97c87880f90f08438366e29bbcc8d81a28f777f39fca8af529
 DIST libuv-1.29.1.tar.gz 1224127 BLAKE2B f116b0e0df9c2b65bafb8ebe0259ac1e1702232e751e015dbffa9be403f39727d255a7abc560b219279caff1bfab9528f38e32dbd2cf42dc0274dbaa57727861 SHA512 7e1ed1bc500bfaab44858b3ff4685ec3d2abce412718ad144d642f7526f6dbcba643ea9a623bb129d545599570be64ed9a498d85485c1716c4c365bb7ab61898
 EBUILD libuv-1.20.0.ebuild 1167 BLAKE2B 822424c522ba27df7624d2b3e1fabb522e15865b8eb8a56127f6565da3d1ae55f519d47ddfe7cb7cecf406626487fba48d77a164a67e9d48be613cc2e36bf93e SHA512 3eb698ab1c3e9d31a90f79293a9484cf7a27e7a7945577bb241b74e6390bc4efee13e43b28de51c38c5fe3b921ca886f0ea8d26c752ea5f0437f5a4d0ab7bfd4
-EBUILD libuv-1.28.0.ebuild 1217 BLAKE2B 32d99f6d79e589f0b068d8fab8c9cba584a26e002d7c047308ef02478838a84fdd57192d16ee3be61aca6fec1390afa8f018ce5a84983e91f2f73b29f5c2923b SHA512 410b9743d1e98c1a16a31a2c737d8944158dcb846a9a33001747bf67a7fd72af5ccad1fe1c477b4681ba1468d03bd98b42e4445245f1db1a56a6b52e2692edf4
+EBUILD libuv-1.28.0.ebuild 1221 BLAKE2B 17d507c3c76a75c094cca92c7d8417ec652011b8659763da377178452e8b2e767d39815d63ea2274dfeb624572319b609768677b43490eecd1d9370e6f145505 SHA512 aeabc3494d89bdebe7eab97046e588fd1bdb4aafa151551bdad6eb8ea05d18900284791de0cb7954e4b750a60c4c398322ff00df57d1bb6dfd51e9015fd1fdd0
 EBUILD libuv-1.29.0.ebuild 1225 BLAKE2B fe6dbfacdd3562385ccf2f61f5b96464c27bac6bc95f2245f310dc2668f6bcc8d891b582fcad7b5bdd16ac5857172693e2a25f3322068b9835ed87ea45d4e39c SHA512 51a45fef804b877197521000397423721c2f6a5d027c8c27700498389279406c57e6efb2561236ebe443cfc51f8198f73c0d95f2fa2e480b5eda91a22f6e52b8
 EBUILD libuv-1.29.1.ebuild 1225 BLAKE2B fe6dbfacdd3562385ccf2f61f5b96464c27bac6bc95f2245f310dc2668f6bcc8d891b582fcad7b5bdd16ac5857172693e2a25f3322068b9835ed87ea45d4e39c SHA512 51a45fef804b877197521000397423721c2f6a5d027c8c27700498389279406c57e6efb2561236ebe443cfc51f8198f73c0d95f2fa2e480b5eda91a22f6e52b8
 EBUILD libuv-9999.ebuild 997 BLAKE2B 1d82e7c3acd3715c580dda78f0aa6db97f217cdcd1dd58ac04963e43dd077cd62c798e2d676a098c69471bed2b4d035a63da335abe427762097de1bfe947e624 SHA512 d1ad9a68ce54465945cb795d28312eae4615e839889f8a7dadfa6ab54e580925c15781d00fadc99edc8d3dc5b54d18351df17b1de096fe97ab06bdae21fd9870
diff --git a/dev-libs/libuv/libuv-1.28.0.ebuild b/dev-libs/libuv/libuv-1.28.0.ebuild
index fe2b4e41346e..c53594d25259 100644
--- a/dev-libs/libuv/libuv-1.28.0.ebuild
+++ b/dev-libs/libuv/libuv-1.28.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/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 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 RESTRICT="test"
 
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index a5b19aec153c..475d62b15ad5 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -4,5 +4,5 @@ DIST libxslt-1.1.32.tar.gz 3440715 BLAKE2B 8d5dead5788d8d09ab121d6e33397ee8ed883
 DIST libxslt-1.1.33-CVE-2019-11068.patch 3965 BLAKE2B eb3a0741ac9f464e31e8edd276fec4d837c63676a56a446ad42a0e251508bacb0129cbe18783de305336eaa32b189ffc23e95e03cfd5f940d4dee376f1fa0f8c SHA512 9a97c5038809aaf64cb4eb7d67b95acc4b62236d7613a5f753e2a0f4c9e707c22cd07bda2e518d3f36a40b9ed5aa93496b743998c7adadb84ca147e045e35948
 DIST libxslt-1.1.33.tar.gz 3444093 BLAKE2B 3457e5b62328ccbc48fbc5f71bf8a54c195c0059dd18afa38e6916e74c57e72601970446210c7584d5410b956e3bbb8cd4b852ec71e0a13c4441e6de095d86d1 SHA512 ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0
 EBUILD libxslt-1.1.32.ebuild 3275 BLAKE2B 8c62899c0f9744559d7aac7be6f73ae599303b848699eb89f9276ab8e72a038024773a5754c5ba08f223ceab334a5a22c91137343b0c89a5b3bebd56d59739c6 SHA512 7fc90253308d84200aac763dce0e4fea507c0d43ab36b07d55bd40bcbf4a2365c496977ff963200b68966b892646b05680138c1e94e790def07f3fb5d4f4ac95
-EBUILD libxslt-1.1.33-r1.ebuild 3473 BLAKE2B 704ddda02fd3eb1338b18c529acc3ac41518948e206c113659dc64a5f6df020d35cbae4355d2a734b095697965855ed780715ab7daca94a4768442e24c6f7bb5 SHA512 20cd0332110acd01a34e0499dfd0cecf001077347417183be0c0319b7518ea39c6c99b7972d4bffabaeeef7f8865e46f5bb78cbfa83d35d06db5cd5f037ea69f
+EBUILD libxslt-1.1.33-r1.ebuild 3471 BLAKE2B 3b1eb800ee740ed89a497609adcfc17a0f0f8e9d866b5b2b632f2c426b37314bed63b8f173eb4b2d3c6e1d48a2b487ab0055b1fadedd4cf03021d012bd149e82 SHA512 d1b3d59957c9af85c0b8328859d9655691ae2bceb678b922ed681861cdcffbf1846e27d7c2a303ea0dfdc62c5b7b5a9e9e01178ac2518ad4df4cbb6c7fda2e9f
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
index 8d3e53d37f01..fbfb9cfe0d7b 100644
--- a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="crypt debug examples python static-libs elibc_Darwin"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/openobex/Manifest b/dev-libs/openobex/Manifest
index f376ad63bdd7..3b2c8ddc01d1 100644
--- a/dev-libs/openobex/Manifest
+++ b/dev-libs/openobex/Manifest
@@ -1,5 +1,5 @@
 AUX openobex-1.7.2-version.h.patch 621 BLAKE2B 90ef501688d2313b70d755a5d6233c027eade70870bb135c018eea180993d5138fdaf614fd1cc396a1521a2d522f8d03c132dc3d3c14839664c7021fc2e657b4 SHA512 9c060d3f4af4ca78ccbc931df26311d1e37c1a86279a56358eb468162746ef3e3d6324fd419f9b38c072ae4c1bb0e9df64643b5de0cdb876aff54530daa83262
 DIST openobex-1.7.2-Source.tar.gz 127248 BLAKE2B c0405aef2f15f16e31641f4a60ac01da26c2a61a5114b8f3990f0fcf64bd55c730ff7aa5f524b450c1e6b5653b9616c0861686102594818ba3bdf2314a3c51ff SHA512 22f1b0d99e7186da9fa12b510ef9dbb6f7d76777d58b235ab2f627703d07b6f6b0488cdc9c6d8c0ab7bc86d6d19117c55fff9273fed02736c0210f9b1788bf4d
 EBUILD openobex-1.7.2-r1.ebuild 1055 BLAKE2B bf58d40d55db3a9d51a0b032f3342b0ab1c7f6428db4de40aadb242a49f8bac3c5935c2e12a4d1450bbb9531311f4d6a1e138cffca2d71a720061ce62a4d44ce SHA512 1ad98eddb4b2ea6561add36053f42b7713747c96834c0111a68906ccf316ca74931b93f1e724ba1f4dd256c549e75a26e9f9c99d7ecea2ff0062367239369b45
-EBUILD openobex-1.7.2-r2.ebuild 1098 BLAKE2B 04a5e11beadd1011f7046371ae13808387340def5f4e1ad555ea44854a96df1ac3fccc6dc4ec6e1102237aee6f9f87ab7682c296f968ee53c4b7d583424a791b SHA512 d957daf6c40d340c88fb2cdb79cfd5a6b6c3387db2d89f1b19c1b6b4a0cf0f2ab855011c52b3f8f0714c0e0358a9d1e5cfcedb46d0909dc6df504d21ef80e6a3
+EBUILD openobex-1.7.2-r2.ebuild 1095 BLAKE2B 03be467fbd33a7612c5285dc5ec9aaad3cdd3958e85bfeed357a30cd48846204620b665feb406e13441d3c307f3b9e7ef48cbd1641ada75431db0b7e56dd71a4 SHA512 7517eb4e653dbac00eb81f27b48d5c3af40e3af5575fc394f79aac0d57b66a17701ec9d7b3dfde26b66c743860d0a22e005752467d4390cef453fbff69194f3e
 MISC metadata.xml 550 BLAKE2B 4505f0b70a901fbbf3cebe1a066d4c9275853a7667abf221ff439cb6783f485c5d43a24c8abf05df5757a8578712fffbc8a1ff43e0f16f8f8507417e32654ef2 SHA512 19bbed2e27c2fd9ebf00552d3443d09bb295f81c7637d2d09850d5bfc6128f6f3a7642ae55760c36308f7fe333319d6d8324cde0fc75781d32a486abb32be4fe
diff --git a/dev-libs/openobex/openobex-1.7.2-r2.ebuild b/dev-libs/openobex/openobex-1.7.2-r2.ebuild
index ab1632e42d34..9191f5544e49 100644
--- a/dev-libs/openobex/openobex-1.7.2-r2.ebuild
+++ b/dev-libs/openobex/openobex-1.7.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-Source.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc ~x86"
 IUSE="bluetooth doc irda usb"
 
 BDEPEND="
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 6d9ca38b7587..e52332c8ecdd 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,3 +1,3 @@
 DIST serd-0.28.0.tar.bz2 371592 BLAKE2B 143e858b5947cd52d01341ec7ff5fb36f98aefceda4e748b2a999c2e6d2c972b2f5d30053d8538f04f236597da93a595d0fabbfa4c667397e27d4c897458d1ee SHA512 b25cc70af17ff821812ab2a70c2812c1713ff811a0f18fb5d5c54f3b67e0c68293aabedfacd687afe6b7acdfd81602ef81764d7e11bc0d933de738bc6d4fce3e
-EBUILD serd-0.28.0-r1.ebuild 1118 BLAKE2B 33772236a29b1d08cd24dd73e5a3029211fb8e7de8708c246054b5e08fb0783e3a177bc00a3c4136b75695c6c3a3b4da0bc702f3881fe6d9fe5a22e8d0740047 SHA512 aae05966d1d890be9fbf40ff94306342836537153a2638acc2bec6026ed0f3535f9bb4e3d007f23aae59b8c14b1377a84bf020ec027880e8e237744df8feedc1
+EBUILD serd-0.28.0-r1.ebuild 1117 BLAKE2B 258917733969fc81c6e9446bfcce77beab73bc36b01c693f765a5b9d47ace547728e0618eeeebfc2e976a2694358c6e38a64cfe313b647ffc049c67e4f05e768 SHA512 285c375fd80d583752fdd7c17bc9dd24dc550a2de36cee76c656ebc1390d80464d7d14ab89e8844e9897344ba8436042c5ec8046785ed3d34e6e654f732ab0a5
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.28.0-r1.ebuild b/dev-libs/serd/serd-0.28.0-r1.ebuild
index d945053ae450..2e1f11f6e97e 100644
--- a/dev-libs/serd/serd-0.28.0-r1.ebuild
+++ b/dev-libs/serd/serd-0.28.0-r1.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 x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 5e4ac145f5dc..d3d5df78f809 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,3 +1,3 @@
 DIST sord-0.16.0.tar.bz2 316331 BLAKE2B 27702600e48e14c75be18cc2b83705cdea1eed7158223ee685821ae80b18b61f5db82f804ee6a32236143cf8287ee875c3b3354edc6ccd1d4f25eaa3a04c785b SHA512 e18c6de62f2cbffedd4c200f6452f4fd37f719aed764ccc1b77c8da04a0f3394d47e8b57e19eefd6d600770926f505fdfa5da91564bbff5f4ead49f1adaba249
-EBUILD sord-0.16.0-r1.ebuild 1120 BLAKE2B 04b8f85abad3de3ac22933009631110080c3707d23dbc978acfd95faee5cbee20b85183fe8302d74f2f5d059cc6b7b1fea0ab7539e2eb107bc4fb11652185bc4 SHA512 d2ffd2687e261cd6fc2ecd44e6b3b4eb841bbdb923fbb6977fc2b28867cb0ae877fb7e8322589f60a2536bd3c5d30cb5f2ca98a9a81401a52d5545dad87971ce
+EBUILD sord-0.16.0-r1.ebuild 1119 BLAKE2B 0409bc977a8117c0edfbe504db6fdb3a99f8476e6de0c5f3f84c6e30d8ce9f728832e44c01e76ed49e8351e0004b85d7d6cbec11e55bff646904955e66405ef6 SHA512 28697510e13d8f0a55dc105fd8e7c1cf1aefb773f50cf662a6aef392e3dd0a1f34cf6e6e41e4fdfca1ee79f00c7d72622a2cc91295fadff204d2b12326daa0e9
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.0-r1.ebuild b/dev-libs/sord/sord-0.16.0-r1.ebuild
index d65bb3b73170..bc604ce422aa 100644
--- a/dev-libs/sord/sord-0.16.0-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.0-r1.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 x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND=">=dev-libs/serd-0.28.0-r1"
diff --git a/dev-libs/spsdeclib/Manifest b/dev-libs/spsdeclib/Manifest
index d4f6c644a7d1..67989d752e51 100644
--- a/dev-libs/spsdeclib/Manifest
+++ b/dev-libs/spsdeclib/Manifest
@@ -1,4 +1,4 @@
 AUX add_symlink.patch 804 BLAKE2B 2b0eec3a3a9008b887cd4af8f2900631fa347890cd37ced2930fbbe21b05cf213e6b088d2798173ae6c89a75467db0e6111e3e3e738d37eca7fbc884725b66ee SHA512 ca370e101057851e214009ef6880afa4a96711407d28e3ce34592317200c7da623996c7fcf7c31aefe55ffd6b649ab5ff970fc0134435114234f4436919b93ad
 DIST spsdeclib_5.1_source.zip 282236 BLAKE2B 6f37a3f0791baf9ca7a6bb3532be4cd7bcf90cdc2fc51def4d5daf4419c6b8c08aef87275555f359394e37e5ab6cf34d1e4903bea542ff99f7dc317238dd52b7 SHA512 26db037096c7c98c1af800577ce298c6b572541f665b512e80c6268818075d3c46d296b282268bd27a73a34f4063607ae8dd9d6d7a9301c441eb9cfce780f439
-EBUILD spsdeclib-5.1-r1.ebuild 1188 BLAKE2B f7678d22d3d4f7fd2caca5aee1a227ce31d4c45f8604e569b006a94084c3ec0c7e1de4a8ae923511506adea968aba16719f1b639d14a71851879ed2d216675b8 SHA512 40265a833ca431f9ad9679889840968870a426607f376a0a353ac36a04c8dea9457a640f49d4c05fc050de03fc03deda2aeb562d984fa5a1d80f004f341516b1
+EBUILD spsdeclib-5.1-r1.ebuild 1187 BLAKE2B 6ed2973600e1ae4fbc54911938d6f36f84c0acb4aa749b7bb4ffa1717b657ac3349a7b9e109b0e40aac5513c97a7b2c2ebbc72296d059f3ba618c68ccc4a4719 SHA512 1d4c1d231511f1bee310149da3fa5df9f06e9171d5b1238a6f47a32491f913df48995ac684ee47baf586ca48204ccbbdb7cbc02805d7bdefa576e0a14e4e8190
 MISC metadata.xml 564 BLAKE2B 12f28c6acaf31c25b52acaf1bd5853216ffb6f0924c9f815e814c56b50aa657603ef0f3e0e89daf072e463feb34c135d59c7351174bdf3a4b347215937311ce1 SHA512 42781e4e7c15a066141221c92421c174dbc748de3ef94cd419d23c0c9ff85cadb90295543d126362ca8e346ba5171ec3a527a46f6018d0b16beda68c7b432b45
diff --git a/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild b/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild
index 344c3f15737b..3aab0f92fab0 100644
--- a/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild
+++ b/dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Kryoflux SPS Decoder Library"
 HOMEPAGE="https://www.kryoflux.com/"
 SRC_URI="https://www.kryoflux.com/download/${PN}_${PV}_source.zip"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="Kryoflux-MAME"
 SLOT="0"
 
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index d38f88c47470..6c3e062d5f85 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -2,7 +2,7 @@ DIST userspace-rcu-0.10.1.tar.bz2 503347 BLAKE2B 32e75d5d94b15fdcb28397aa64c871f
 DIST userspace-rcu-0.10.2.tar.bz2 503833 BLAKE2B 17e2102e096903f301d1a08d606cf98e28a413ef26a3dc8fa6f400ba74aa14aabdef5e28d4fed5fb01cee33b0bd5de9fb0682523aaa50c6053fd3471711a02e7 SHA512 47413b4a593d19185ee3d455e5744042c060cb50008dac25e9135c5cd2250ef5129a419258b18c665c8c794ad3b09234fdd70a106c72d8fc64631172b13d0e22
 DIST userspace-rcu-0.9.1.tar.bz2 468197 BLAKE2B ac2ae4ea788feef5463571e1a0d5dac35a5d6e298f628e0b0b2acea68d01e52a513cd5d1b58886d8b42d07455823fdfb91c1548caffb969cb9fe8c6b4d17adc7 SHA512 958234d72319decef07093c13b067e398c1b285ac714ab1dda89c2ad2ba0627d053e0cdabb07d480e399ebd60215445002876bd99f2829ca1e5582ada639f730
 DIST userspace-rcu-0.9.2.tar.bz2 468871 BLAKE2B f8a13b9683e8c32942a3d675ca94715de82b40b1a39be8161e1ea6009373f2ea6ae57b2e9ba4068544db2c9064457aaa8e83bad5e4af600bede248bf0780d11f SHA512 36264119d68569565a7b1222c4b0ca90128d121f032b388f27204ceaa9c964901f35be25584e1553b1a7613aad01d11766983ae245860df09444eb2f8ac913fc
-EBUILD userspace-rcu-0.10.1.ebuild 675 BLAKE2B 3ce6fa3d2c038384f2f05ba1e4db6c1d83da3d77b524f0ed0dec888e6fbf20ee2412bb78557ebec0b936e5307b17963b4379c59bd27274c724cb57b4b27f65cb SHA512 84e55943329d8e651e0a7756947f29ad0f0f7473555ac202b79b5a45bfd66137208d530a78e2af6bf2e546998ed89ed0ba247f2f09d9c15b0aedfe9f280f4b6a
+EBUILD userspace-rcu-0.10.1.ebuild 674 BLAKE2B ea32ac5800156b5c1d4a56f2fa457a0b5c7b489983ab9db59b4a5d0ee470542ecae24302be7e1c43f7d265c3cbbd835862ae29a240725fdadcfdb38406a19224 SHA512 b0d254f6ecec5252812a41a9010e4f5cace84a6e662c608ada5b81ea8417e121927817ce96569f72d36278d0f65b37ecc938b6ed72f7c4ee0efc9b645a6544c8
 EBUILD userspace-rcu-0.10.2.ebuild 680 BLAKE2B 45f02f09faae2fd0a10eaf5bbe8b385e4bebe2af15e9aa9a9a65d4e7b7e25f13af41d150c363823a2d9914cc555b863f4547a457114afb931fc285ba619843f0 SHA512 e0d4eedaa1420a5e7d4a4f5c3cfefb28c47a8789c4a48711d541cd8204fce7958cca7de85599f25427cfeae8109d604977fd484bf5921a0f534de863f00edf2a
 EBUILD userspace-rcu-0.9.1.ebuild 740 BLAKE2B b14e6a5df0fe84b42d932333de46b1c370ee594ddc37e33805ef00e6af75a42fc72df610ea083dd5b818e7b77d8177b86bab602f864e279fabbd99356943de77 SHA512 b12eff3a56fefb0fb9c1a181b47f25eb1278d171f919c1a0dae2f788f95437eb418d8ddb64cedba9e7b95b81f4ae9ea8b8b125fd07f816a2511871f692a69322
 EBUILD userspace-rcu-0.9.2.ebuild 746 BLAKE2B e47e73ff204d61dd97063ce7c00df11750fe27406ca7c3166d947e55c094eee04142658917841bca424b4d6614fd33694f932f16876182f963c53a50f251d1e3 SHA512 ff838cf89d63324f8a9741bf5064abe2fd814b5758930046cfec333ccbaad16fd0d682371978ea6382ae84772278409fa8e7c0822de379503eee852a828dc8a4
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
index 2a1262088b2d..cefca5c03e1f 100644
--- a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="static-libs regression-test test"
 
 DEPEND="test? ( sys-process/time )"
diff --git a/dev-libs/wlc/Manifest b/dev-libs/wlc/Manifest
deleted file mode 100644
index b4400d60ce9a..000000000000
--- a/dev-libs/wlc/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST wlc-0.0.10.tar.bz2 249721 BLAKE2B 7d1d1f3bb0b878912b4bcabec3046d45a243b83acedb77b0e939c10c9c08b47ac6a90bd55b0c2e7df8fd8e591aa4be3f848dbe3f6aff67670aa4ac8c716c96ba SHA512 93474b04aad6534d850d9666cb7ba2b588d8beda89d785de1d569951e3c410ec66da84cdaab5e99060e61360b9bdffa96226f20e1d1e906873edc6850c34500c
-DIST wlc-0.0.11.tar.bz2 247642 BLAKE2B 705b60eb96951e64a0f47bd5091cddb4d6bdea9553db02701fec1e3fbe3288834ae8b6bab5e193457b89c8db451497a1ba299ec6e3b283c92e56c69b1078f517 SHA512 29e7d734cee76b9d0d1fabac71bab33a7146fec8557e583be2d0e85413fa77ed938f23f3bc8728f1f0766239d5eb023ace52abb9b78d40ce1edf876185a60ea5
-EBUILD wlc-0.0.10.ebuild 1438 BLAKE2B e1ab846a29c42946c23eefb5f4e0c630a7aae1051be45e04860c680f27af2307e87021da3c8ae9ae954b0661963343d513bba60423242de6270520c7d475835f SHA512 c7734721a8644196a6fa063a94f180edb63b805eb24136831eab81955a5ee6d3e58614511116031179eff9f16fa4300f29f9e0a6e545a4f67e9b720597ff83db
-EBUILD wlc-0.0.11.ebuild 1445 BLAKE2B f6aa68b77317b6b12e3a6af690f2e93c29456c641efdd5118be56978b97a96a8539fe05ed5a0c2de90a884985a7a4cc9e78a2516b994941b571fa63d5b74a1bb SHA512 0f93dff42ece8d9d1ab50507836096bdd7937dd15e4a0605cf95f1ec540d452c576292653df6c452b96f0b0690710a3ad35ff020b258fa66aa10c06fe250dd54
-EBUILD wlc-9999.ebuild 1401 BLAKE2B aa5f303f494e93e2acf2977343d0b36549bce30729e2b0af180525652dc5667f194f3a552497ac0e4a070bb9336f4e6eeabd30e0b9c5afd147033d6ee299165a SHA512 da5672db2822bef0bef3fdaaf7ae0e8274832c037199da88b3ffc8d8462c75a6d5c53926043f3368c9d3cf5662cd4796b21e863610523788c2bfce7b8f01cea8
-MISC metadata.xml 751 BLAKE2B 5e798ddaaefb86272efa9653ff96267412bc6fa0a9d49b6ae895079f90f0d5a125dcea3f43e7830d57a738fa5efa0727b5783b552193661ff7f263ae9a102ced SHA512 c53002499d04a0d0b4cb30178662e522f4d6a5832dad5f8e1dea8aca88766488561f4d67d912763ba3fff9c3491db4cf44ddeced08d0f0fdd2636827dcf0352a
diff --git a/dev-libs/wlc/metadata.xml b/dev-libs/wlc/metadata.xml
deleted file mode 100644
index 4d7e16aaf19f..000000000000
--- a/dev-libs/wlc/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>hilobakho@gmail.com</email>
-		<name>Mykyta Holubakha</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="systemd">Enable support for systemd-logind.</flag>
-		<flag name="X">Enable X11 backend.</flag>
-		<flag name="xwayland">Enable XWayland application support.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">Cloudef/wlc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/wlc/wlc-0.0.10.ebuild b/dev-libs/wlc/wlc-0.0.10.ebuild
deleted file mode 100644
index dfd3d6fd8a5a..000000000000
--- a/dev-libs/wlc/wlc-0.0.10.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A helper library for Wayland compositors"
-HOMEPAGE="https://github.com/Cloudef/wlc"
-
-SRC_URI="https://github.com/Cloudef/wlc/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="MIT ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X static-libs systemd +xwayland"
-
-RDEPEND="virtual/opengl
-	virtual/libudev
-	media-libs/mesa[wayland,gbm,gles2,egl]
-	x11-libs/libdrm
-	x11-libs/pixman
-	x11-libs/libxkbcommon
-	x11-misc/xkeyboard-config
-	dev-libs/libinput
-	dev-libs/wayland
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb[xkb]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-wm
-		x11-libs/libXfixes
-	)
-	xwayland? (
-		x11-libs/libxcb[xkb]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-wm
-		x11-base/xorg-server[wayland]
-	)
-	systemd? ( sys-apps/systemd sys-apps/dbus )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-libs/wayland-protocols-1.7"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWLC_BUILD_EXAMPLES=OFF
-		-DWLC_BUILD_TESTS=OFF
-
-		-DWLC_BUILD_STATIC=$(usex static-libs)
-
-		-DWLC_X11_BACKEND_SUPPORT=$(usex X)
-		-DWLC_XWAYLAND_SUPPORT=$(usex xwayland)
-
-		$(cmake-utils_use_find_package systemd Systemd)
-		$(cmake-utils_use_find_package systemd Dbus)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if use X && ! use xwayland; then
-		elog "xwayland use flag is required for X11 applications support"
-	fi
-}
diff --git a/dev-libs/wlc/wlc-0.0.11.ebuild b/dev-libs/wlc/wlc-0.0.11.ebuild
deleted file mode 100644
index 9786fe291a83..000000000000
--- a/dev-libs/wlc/wlc-0.0.11.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A helper library for Wayland compositors"
-HOMEPAGE="https://github.com/Cloudef/wlc"
-
-SRC_URI="https://github.com/Cloudef/wlc/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="MIT ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="X static-libs systemd +xwayland"
-
-RDEPEND="virtual/opengl
-	virtual/libudev
-	media-libs/mesa[wayland,gbm,gles2,egl]
-	x11-libs/libdrm
-	x11-libs/pixman
-	x11-libs/libxkbcommon
-	x11-misc/xkeyboard-config
-	dev-libs/libinput
-	dev-libs/wayland
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb[xkb]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-wm
-		x11-libs/libXfixes
-	)
-	xwayland? (
-		x11-libs/libxcb[xkb]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-wm
-		x11-base/xorg-server[wayland]
-	)
-	systemd? ( sys-apps/systemd sys-apps/dbus )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-libs/wayland-protocols-1.7"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWLC_BUILD_EXAMPLES=OFF
-		-DWLC_BUILD_TESTS=OFF
-
-		-DWLC_BUILD_STATIC=$(usex static-libs)
-
-		-DWLC_X11_BACKEND_SUPPORT=$(usex X)
-		-DWLC_XWAYLAND_SUPPORT=$(usex xwayland)
-
-		$(cmake-utils_use_find_package systemd Systemd)
-		$(cmake-utils_use_find_package systemd Dbus)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if use X && ! use xwayland; then
-		elog "xwayland use flag is required for X11 applications support"
-	fi
-}
diff --git a/dev-libs/wlc/wlc-9999.ebuild b/dev-libs/wlc/wlc-9999.ebuild
deleted file mode 100644
index 709fe5def74d..000000000000
--- a/dev-libs/wlc/wlc-9999.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit git-r3 cmake-utils
-
-DESCRIPTION="A helper library for Wayland compositors"
-HOMEPAGE="https://github.com/Cloudef/wlc"
-
-EGIT_REPO_URI="https://github.com/Cloudef/wlc.git"
-
-LICENSE="MIT ZLIB"
-SLOT="0"
-KEYWORDS=""
-IUSE="X static-libs systemd +xwayland"
-
-RDEPEND="virtual/opengl
-	virtual/libudev
-	media-libs/mesa[wayland,gbm,gles2,egl]
-	x11-libs/libdrm
-	x11-libs/pixman
-	x11-libs/libxkbcommon
-	x11-misc/xkeyboard-config
-	dev-libs/libinput
-	dev-libs/wayland
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb[xkb]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-wm
-		x11-libs/libXfixes
-	)
-	xwayland? (
-		x11-libs/libxcb[xkb]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-wm
-		x11-base/xorg-server[wayland]
-	)
-	systemd? ( sys-apps/systemd sys-apps/dbus )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-libs/wayland-protocols"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWLC_BUILD_EXAMPLES=OFF
-		-DWLC_BUILD_TESTS=OFF
-
-		-DWLC_BUILD_STATIC=$(usex static-libs)
-
-		-DWLC_X11_BACKEND_SUPPORT=$(usex X)
-		-DWLC_XWAYLAND_SUPPORT=$(usex xwayland)
-
-		$(cmake-utils_use_find_package systemd Systemd)
-		$(cmake-utils_use_find_package systemd Dbus)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if use X && ! use xwayland
-	then
-		elog "xwayland use flag is required for X11 applications support"
-	fi
-}
diff --git a/dev-libs/wnn7sdk/Manifest b/dev-libs/wnn7sdk/Manifest
index ec9efd6e2359..442423ac69ba 100644
--- a/dev-libs/wnn7sdk/Manifest
+++ b/dev-libs/wnn7sdk/Manifest
@@ -3,6 +3,6 @@ AUX wnn7sdk-gentoo.patch 2120 BLAKE2B 1fd66badbc4e55478bed5c456da4b4945a49b1b37d
 AUX wnn7sdk-malloc.patch 366 BLAKE2B 3bfdbf3e4ee8eed98f2e54364d29a533793acf5ff54d04986d614387daaa005653313bb1db6336fb70b3f7f786a5e4ba36b559eaf95c6f763f1d953920719a13 SHA512 cdc2142a1bdd16158b765fda01983cd530dc8271383177b4bb7e534ba192e07dcccd042c234f4160d346ce69ed1b0eacf366ee86fe7209b4d54fe91befbc3b89
 AUX wnn7sdk-qa.patch 1459 BLAKE2B eb56155148fc9c8f75afe719d217f14626e5468056c0f4ff499e3e04a440beac9705248db4d1cbc701e1bf5e5d8c779a62aff9bf4096c7c41dba12194cad95e7 SHA512 0f29f0e3b26b0038473f9601cd9179095422882dfbc62c371e17055d9a9143b8b35f5d7ad2165301f935bfabe2b90768591789a8a5cbbcc931e65c16441b681e
 DIST Wnn7SDK.tgz 178403 BLAKE2B 9dfccd0bcbe38cd1d782fd2b331c6349a1e1788c328dc121eb91ed362028c18661dc08d761b31722cd19fd3c76970a2566c2641488cd4b968f898f6d1e76ea76 SHA512 d6e24357c0071eb29e3a91cd3484c8fe7901a5e1537bff6632fa04eef21d0e56d7a5f3d7d899599401f607eee259cab36026321f09eea45590d00425d1963f52
-EBUILD wnn7sdk-20011017-r1.ebuild 1259 BLAKE2B 193177010fdeb274b6bd597bb739e8b6250a12c9d5af1832d9b3c5138b2f9e25c4a40a4dbaf4ca8b94716943dd9a5e726ace98de2a6b418585732b9591bc6622 SHA512 5e58fdc927f306839eff8c571e6a4e3192f66ef7a01a50bb233b8f417fe05f6b88a9937c5ca4da862289de474a3be830e42f65fb9452b8839f61f6cad38794d1
+EBUILD wnn7sdk-20011017-r1.ebuild 1255 BLAKE2B a35145875061478f7af335c5b75e749306a465c4c546ca1f9419a8a5c0c65d3676df4dc229a46f6c0cd5c33baa470cd2d9cca248616f0e30a37cdcc991d6e716 SHA512 79c8b1c611f2dbdb495f3a50b2be7cff13d15d289feb78b9d9058e1d00b4e4b0375a49740cc66cb452993a642995d3b1eee7f6324a54f8a0f837ba010ed6c9b4
 EBUILD wnn7sdk-20011017.ebuild 870 BLAKE2B dbd30567852a26fe4d8f9d09e5db5ec752133456df925fd957ba8714e099352393a678ac855e7dff491886e263f7f70eaf5651f1423b54b5e4af7ffd8ae0c350 SHA512 4dff59f1b82a45959eb9a2d7907683c533f60c19eb9612f5ee81611dbd595940128062fe0773ddf7cfffbb2b900cbb904a1422fd3b46b3261012bde8a70e5cfe
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild b/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild
index 192f5277277d..455ccb1d772e 100644
--- a/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild
+++ b/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.omronsoft.co.jp/pub/Wnn7/sdk_source/Wnn7SDK.tgz"
 LICENSE="freedist"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 # x11 is required for imake
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 13c7c8d4a28e..d4bf735560ca 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,7 +1,4 @@
-AUX xmlsec-1.2.27-gnutls.patch 1638 BLAKE2B 0368f307fbadbc9f90b130e339abe7d1f5774207eff4853f5415986d9d97ed85027f9679d74b76705ab53931060be52586a053c191b9be9954e6594092e0922a SHA512 e5c6398ff234f69d72531e1997dee28b1f0fc10f7ee67d2b70036760ac2e3c0bfa4c3caca29ab05feeafe402ef8e87f95b3c96e7c9fac9df90e74bae3199fc13
 AUX xmlsec-1.2.28-test.patch 2418 BLAKE2B e5cf92fd7f72be16d95fe67da99c96fc8e1bc8e7dadbfdbf5970ff7c148aa95868c2a4db8a03e86a2b67dd54c6bb71f0409bc4e075ad2b7148da1f489e672dee SHA512 48e72e197a23d4a0f3c7679dad438b1d9e140f2c9a311959748d432c543e4f48d32a52a4f65bd971d0263038cf6fde4a753e0eb2616ac6d5db092279cdc08b46
-DIST xmlsec1-1.2.27.tar.gz 2013651 BLAKE2B fa46a25e3aaef432134d1c98a0e7bf0aba83f2ef6d1aff3774d6d37c5f6f392d1c2c11a0fe433ee910c39b56400c96b74ab061577948622b14a1116fa1ec2947 SHA512 01f7231d7d7ac8037aecc1f922acc572cbfe0903abf5bd5879d836438c36684e23402b803d20806fff6b1cdc5ad9af114d1341b10b336f71c0bce28b4716f920
 DIST xmlsec1-1.2.28.tar.gz 1995599 BLAKE2B 5d90646d9a72024856da2638adb6d0d00d5142f8d3eaa5b12a993e2e6ae78ad49aab69822ebe331191bf1fc5b98431b85e113545aec84e2bb7d5c5add9028df0 SHA512 17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480
-EBUILD xmlsec-1.2.27-r1.ebuild 1566 BLAKE2B 07937e208f8d123a8bc02efae6e83a0da1dc3c89bf8046e8e0f3e1b4378952e1071c71f2ce26230c97058ca4e828769565a5771d528ff20fbe648a6eac7fc6e0 SHA512 fe3ec7050c90a5edd33cc9ed6a8ecb7c03c8bfe71641897aac9f8aeab720bee92a565d51bda30546eb9cb603d399bcc654cadf832da78821e4f6de5dc772f126
-EBUILD xmlsec-1.2.28.ebuild 1372 BLAKE2B 6694591d9ead51d34ba1701adb642cfe14009032a8e04fa8bcda9a89afff7ed0dd6beb0a4c17e00d2ca0e67db2bc72c74f54295d777622d8cf833c7c1486d737 SHA512 7c4c195d528d89681930054f9433e18aa9772396274858d5fef10afa01ec6906c3ccdee99a7a34dde4a0899d0e51c8adec1ac4e46aa9dd04f44cb68e703e5bce
+EBUILD xmlsec-1.2.28.ebuild 1371 BLAKE2B fc6c926519bf9172d3bc4e868e2b97cde93a63cd170495d95141d4270ed7df1763196e3cf9d5f78204939c5470a4b93a0bdb944401da650432eca4c71c2d6c09 SHA512 b6f80d712fb05f116b8c62cfd65a4332360149031428e62a96b830af149c18769a427e20203efde0004c56220269a696ecc0597dde03a17b13e6cdba0c9874fc
 MISC metadata.xml 487 BLAKE2B 0e191be30487c618789a7eaf8c2ca9ba0e801649213674adc85e76a5402853055d384efb9d6b534099683de4b2935dafa613ac029fd810125993d039cf9caec8 SHA512 1be5c6aa74ba9542e7b4b85adb8dd743fbeb72b4fee345996ee1b5bc662d9455d910f00ca37b16e644f53039a346ef44afc5e49abba19c5f8d4d00cbdf37d660
diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.27-gnutls.patch b/dev-libs/xmlsec/files/xmlsec-1.2.27-gnutls.patch
deleted file mode 100644
index 2837420e0dc7..000000000000
--- a/dev-libs/xmlsec/files/xmlsec-1.2.27-gnutls.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 321e62add243cf8f024d6278da4c5ff030bae3b9 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Mon, 1 Apr 2019 01:28:18 +0300
-Subject: [PATCH] gnutls: allow SHA-1 signed certificate when not in strict
- checks (#250) (#251)
-
-This is required for gnutls-3.6.x.
-
-Allow tests to use no strict checks until all certificates will be converted
-to stronger signature than SHA-1.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/gnutls/x509vfy.c | 3 +++
- tests/testrun.sh     | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/gnutls/x509vfy.c b/src/gnutls/x509vfy.c
-index a9c956a3..4c753344 100644
---- a/src/gnutls/x509vfy.c
-+++ b/src/gnutls/x509vfy.c
-@@ -295,6 +295,9 @@ xmlSecGnuTLSX509StoreVerify(xmlSecKeyDataStorePtr store,
-     if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_SKIP_STRICT_CHECKS) != 0) {
-         flags |= GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD2;
-         flags |= GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD5;
-+#if GNUTLS_VERSION_NUMBER >= 0x030600
-+        flags |= GNUTLS_VERIFY_ALLOW_SIGN_WITH_SHA1;
-+#endif
-     }
- 
-     /* We are going to build all possible cert chains and try to verify them */
-diff --git a/tests/testrun.sh b/tests/testrun.sh
-index 02484d09..ea65802b 100755
---- a/tests/testrun.sh
-+++ b/tests/testrun.sh
-@@ -59,7 +59,7 @@ if [ "z$XMLSEC_DEFAULT_CRYPTO" != "z" ] ; then
- elif [ "z$crypto" != "z" ] ; then
-     xmlsec_params="$xmlsec_params --crypto $crypto"
- fi
--xmlsec_params="$xmlsec_params --crypto-config $crypto_config"
-+xmlsec_params="$xmlsec_params --X509-skip-strict-checks --crypto-config $crypto_config"
- 
- #
- # Setup keys config
--- 
-2.21.0
-
diff --git a/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild b/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild
deleted file mode 100644
index 56460816acfd..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
-HOMEPAGE="https://www.aleksey.com/xmlsec"
-SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~sparc x86"
-IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
-REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
-	gnutls? ( gcrypt )"
-
-RDEPEND=">=dev-libs/libxml2-2.7.4:=
-	>=dev-libs/libxslt-1.0.20:=
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= )
-	gnutls? ( >=net-libs/gnutls-2.8.0:= )
-	nss? (
-		>=dev-libs/nspr-4.4.1:=
-		>=dev-libs/nss-3.9:=
-	)
-	openssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	test? (
-		nss? (
-			>=dev-libs/nss-3.9[utils]
-		)
-	)"
-
-S="${WORKDIR}/${PN}1-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gnutls.patch"
-)
-
-src_prepare() {
-	default
-	# conditionally install extra documentation
-	if ! use doc ; then
-		sed -i '/^SUBDIRS/s/docs//' Makefile.am || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-pkgconfig \
-		--with-html-dir=/usr/share/doc/${PF}/html \
-		$(use_enable static-libs static) \
-		$(use_with gcrypt) \
-		$(use_with gnutls) \
-		$(use_with nss) \
-		$(use_with nss nspr) \
-		$(use_with openssl) \
-		$(use_enable openssl aes)
-}
-
-src_test() {
-	emake TMPFOLDER="${T}" check
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/xmlsec/xmlsec-1.2.28.ebuild b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
index ff93864ba19a..a47903e5571f 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc x86"
 IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
 	gnutls? ( gcrypt )"
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest
index c566989e38ab..712eae7be9bd 100644
--- a/dev-libs/yajl/Manifest
+++ b/dev-libs/yajl/Manifest
@@ -2,5 +2,5 @@ AUX yajl-2.1.0-pkg-config.patch 2299 BLAKE2B 1de5b3d183b692b8be1fe37d0f05e97141b
 AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d
 DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985
 EBUILD yajl-2.1.0-r1.ebuild 929 BLAKE2B 3056d21fbf420a21a5fe3e8ba091b5d1509c5c270dd559faf6ba189c1770f5eae18adb40efc9c67bdc5f662eb94594e593943ec5c9938eb90370007f394bdd70 SHA512 ddf6476d025c541b62e831540a97c16a89706a51c61b1207afdfe52bd04c1175360e67351433158237cb17156e41446a81702e50ede4078a2bb67f08618deb61
-EBUILD yajl-2.1.0-r2.ebuild 966 BLAKE2B 5861f88f62a9ce2d6725e5ac971d1a2cb6934cc5d6f2567460c76aaed3cf399c6b88284b439641b2f6e6f8164b33e630a1190f3a4c1a4f6bbd836c5ad83964cc SHA512 07922ebe0057094df5d077cd6cf068ef77558e7b4b74fa8dbb410d251d443492750cbf2b83681f5c65464abcf8169c5dd1d610e8d8c989d1040348510040087c
+EBUILD yajl-2.1.0-r2.ebuild 965 BLAKE2B a76898d7ab9746d57558097c5fa4ca013aea232ea0fe93653cd7a6b35d2e8b10158da34a2f8aef459d5faca007ee8353f672cd361b7b99cf907de659dffd6192 SHA512 34e1126fc69a00f56c8bc4c211bec911cf20f01198ab0c3d8cb107c631d02d362de648fab797072f72b0ad3a4bd9c0c93fb697846512dea5c7e1887c85a83050
 MISC metadata.xml 336 BLAKE2B cfff08a4c7fbc2990928356c47d5110c6e6de6278ec3a45ac89f7dc1ae5f247a12214c41c884e622d264142b3f487fb82ff0457e15a0d39080e7680ad72d790e SHA512 c01c9b3ba695bb76ef55ede76c3e4b2e6843b27d4148aca7c290ac909aa8800541f0b85c043c5a74e518e4e84a0d3c6907cc4f93bbe8d0addfaaa40ede3a347d
diff --git a/dev-libs/yajl/yajl-2.1.0-r2.ebuild b/dev-libs/yajl/yajl-2.1.0-r2.ebuild
index d90b251ae72b..6a64e199234d 100644
--- a/dev-libs/yajl/yajl-2.1.0-r2.ebuild
+++ b/dev-libs/yajl/yajl-2.1.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 PATCHES=( "${FILESDIR}"/${P}-uclibc.patch "${FILESDIR}"/${P}-pkg-config.patch )
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-08 09:04:53 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-08 09:04:53 +0100
commit	73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree	2878053f3e7faed19a1f82c733d3bd29df69991e /dev-libs
parent	2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)