gentoo resync : 04.05.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-05-04 12:02:00 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-05-04 12:02:00 +0100
commit: eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch)
tree: ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /dev-libs
parent: b7ebc951da8800f711142f69d9d958bde67a112d (diff)
84 files changed, 358 insertions, 751 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 565a2b05c4f9..8e16aa28fe5f 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index eba1422611c6..44d477f03407 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -8,7 +8,7 @@ AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4a
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
 DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
-EBUILD apr-1.6.3-r3.ebuild 4394 BLAKE2B 87533c1bf662271c3684658f09943d0dbe0196ac06e3d03d319e0a4d4bc160cabd88c05b96e517aa3dd32eb257cfc443dca9fd714fb2474622c031169c545ce9 SHA512 aa649c0d762f031d164eeab493d7cd3257d59e08351f1e1f7f2438913d0a6e6855ca8c35186cc72ed013f30969679c99bc5bb5f61e4c358957452922f2df3d36
-EBUILD apr-1.6.5.ebuild 4344 BLAKE2B 9ce9356d89d4433ceb9f987f8f13d152d0bdec5d9f3e733c71ae2ede16deacf29e6cc9a84fcd7c5773edbcc3f3963c03248b1c14ad5ede26ec393a858b338503 SHA512 9d18249bda4c4bd1d10de424bfea14b5a2b998279745010aa937be31519a8e7407434f53537af6616e48b97915d604bc4312c21eb3b715c99fc1d3c3cc4ed3f5
-EBUILD apr-1.7.0.ebuild 4260 BLAKE2B f04cbbc17205fd627ac2235ee4862bfff141e52cae21fd588116606264402b81647ce4270bd94c7d11b5a0daf0964f5d2ab2e7c237b5d02767f3fab5e929dcac SHA512 5c58b65b4ccb8a974d2b4d33af1b648c0fd1478c8291ef830f787c4b43ba0aae2501545d50509e583698c4bf1fb560550470341da7e79f913a19d9d1d6ac17fa
+EBUILD apr-1.6.3-r4.ebuild 4399 BLAKE2B 8add7035d166291e2c65161dfc33942b87b08d66b67050a7ae7c11bfe264b537a99743f7ba0eaaa3bdd3d02d82ba8d9dc3223f26cd6523ef6ae61090229cad57 SHA512 2dd58a8a032de1888dff02d063fbd97f0b50c69fe0e236793bf8b4b3f3438bb84bb767af498de6587b1d2db194e27fe4a63084ecf30d98e4410372158582b186
+EBUILD apr-1.6.5-r1.ebuild 4349 BLAKE2B b445e1deba15b15700c7e10f821bb6616ed396ba8aa3a6f42015ba7ce4b458d0a9eddd39881315087c5d75cb7dae883de3406e64fe47a61a6492a63664a8da13 SHA512 452d9db94f4a57267d964815504aab528d90428fe556e2b79df53c77071295020d5594cc2945d45cc17ae4987501fa49110fee841a96107a42f0d86ecef62429
+EBUILD apr-1.7.0-r1.ebuild 4265 BLAKE2B 20d2ff9bcf61b735960cb41a1eb007fdef78d34ddac2845a685fd9d809be252d6aab26afcef26ae1e5d6dd2fe4493044f377331d4492bb573b61409de418cfdd SHA512 aaf1c39e3c3248e376b74c669e2dd5333dacf83c7bfb8151d0695ffc454a31b97de09439ee467bd1af7f9977070302aa0a068d282785a5397061981538c7c175
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.6.3-r3.ebuild b/dev-libs/apr/apr-1.6.3-r4.ebuild
index bf354b41d133..35740d4ef048 100644
--- a/dev-libs/apr/apr-1.6.3-r3.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r4.ebuild
@@ -17,7 +17,7 @@ IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
 	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
 RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-apache )"
+	selinux? ( sec-policy/selinux-base-policy )"
 DEPEND="${CDEPEND}
 	>=sys-devel/libtool-2.4.2
 	doc? ( app-doc/doxygen )"
diff --git a/dev-libs/apr/apr-1.6.5.ebuild b/dev-libs/apr/apr-1.6.5-r1.ebuild
index 904427dc046c..5d7c7debd7d4 100644
--- a/dev-libs/apr/apr-1.6.5.ebuild
+++ b/dev-libs/apr/apr-1.6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
 	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
 RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-apache )"
+	selinux? ( sec-policy/selinux-base-policy )"
 DEPEND="${CDEPEND}
 	>=sys-devel/libtool-2.4.2
 	doc? ( app-doc/doxygen )"
diff --git a/dev-libs/apr/apr-1.7.0.ebuild b/dev-libs/apr/apr-1.7.0-r1.ebuild
index 1a7fe29b7a21..fc5639976512 100644
--- a/dev-libs/apr/apr-1.7.0.ebuild
+++ b/dev-libs/apr/apr-1.7.0-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
 	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
 RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-apache )"
+	selinux? ( sec-policy/selinux-base-policy )"
 DEPEND="${CDEPEND}
 	>=sys-devel/libtool-2.4.2
 	doc? ( app-doc/doxygen )"
diff --git a/dev-libs/bglibs/Manifest b/dev-libs/bglibs/Manifest
index c7facf9e3989..8a1d1a652b45 100644
--- a/dev-libs/bglibs/Manifest
+++ b/dev-libs/bglibs/Manifest
@@ -2,5 +2,5 @@ AUX bglibs-1.106-parallel-fix.patch 2142 BLAKE2B 2f51f4bf7980afadc9bed2d701a59cf
 DIST bglibs-1.041.tar.gz 317199 BLAKE2B 808bfbc713aaf06c5eb828b4bf0f5b789969afaa078b68292f209d7612860d4a5de793ec8768c63908a48f98841d30a0b2bd9a40b45ce94cb0a539ebcb2cbdbb SHA512 63f1cbef024f528d13a23f84f11b014be2ee9a9c8c40f49f8a114a6b4407c1279860a049f3dd67cfa7306a5326bbb93bb57b134af05031ec3c00f5f49784f6bc
 DIST bglibs-1.106.tar.gz 481564 BLAKE2B 838bd29753b254efc90c8c2c2e4d4920de2e931f823d32393184156f76967ec1995f1e79d2879169dd509cddd298b2389a4ca0109b81245fc617575f3ccf7405 SHA512 c1ae4bb9978b09ffe01231738d1f249c2040a51c2a0bbc4b04389a7085a3885cca6483f1bfe65deca213d991273bb3b7b925ebde8b6e2cd9182d8a57cb9a49d8
 EBUILD bglibs-1.041.ebuild 1229 BLAKE2B e8fbe4236b2f0dd0d561af4e9347922cbb2319c22edebcc9ca859012f0d0a53e7bd0118ea7fcf34704c23bd90e1410ecadc05fe8d5b3535f84eb027dcb32f4d2 SHA512 81ef08efbb8b12d1614dc0d111fabfa41b38d8b15dbd89b43e65d399726f039a0f8ec3b681048c4a63c3488796e2aa429892adedef0e65366afacd77aa058013
-EBUILD bglibs-1.106-r1.ebuild 2307 BLAKE2B 0751028037610103348d4777364604b968f3e90b66797b5d4a6b5b7742383a28af49148b31e7df056558fc5bd10310d1e544eb79379a6b7e133cb6d09bfb8137 SHA512 2fb00841b6f04a3fb65b94a8be7c229fe8aa80cfc5243875df857da86fddafee4d3da55ab8b4e6d0bb813306b154ee7fb29a462b7b6852bc0e7bead445feb89e
+EBUILD bglibs-1.106-r1.ebuild 2306 BLAKE2B 42fccf4efd079a4e18f318b70aa37080f35ac6885b7f9922d4caeb1013c6885e166bb863f91538a39ce7d8356be6edfe06461aa761c5f1f2a4ac98fe74db5336 SHA512 7687de754e81aeec14538d92cb1ac0d768ecaee8f9621d8921c42ce0c87dcbfaf915de84cf32b7befa3b45154229ba3eb0abff5ef01304b196582db5f84901f8
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/dev-libs/bglibs/bglibs-1.106-r1.ebuild b/dev-libs/bglibs/bglibs-1.106-r1.ebuild
index f1dfbeca1672..3964c00ce922 100644
--- a/dev-libs/bglibs/bglibs-1.106-r1.ebuild
+++ b/dev-libs/bglibs/bglibs-1.106-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/bglibs/archive/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 80f51276ba64..d8c276016552 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -9,5 +9,5 @@ DIST Botan-2.9.0.tgz 7216373 BLAKE2B 5ad2e15db871ccc3a32b29b7f54a02d69f251f0aca2
 EBUILD botan-1.10.17-r2.ebuild 4270 BLAKE2B 7b8f1a4722002c8dee3d30c9f29c9aa27e2d1cf3e98e7b41ddc2b9b959e51b5b451b945cbaa9c13890f555e077843cbc94106f2c0032c9f4fb181513f159b432 SHA512 fd4b7886680da84254c19e546ddb4a96491263b228caf5408e48b01ad02c1156058ba11c8aef6722e99be92af6f6f5bd9599730f93820c40f0598513000ab9d7
 EBUILD botan-2.7.0.ebuild 2476 BLAKE2B eec45b4b7ac06952b9c93753d50ca45e2a4c00b7502f471a901a49ae9a8123eaf24f556b99dadd3706c97af3ec79328fc30d4fc2bb4e13a2f4a891dc8296a220 SHA512 11fe68f739d0090a9a2002ae7c2bbec51cf75efd974560236a9ec37bb30e6c5c1d57e2adb7075e8bf7c8ac25399fd87c9da143b17885151c802eba1f3079b8f8
 EBUILD botan-2.8.0.ebuild 2535 BLAKE2B 5985f79ecd22ecfae7f91743ebbfb85cffcfea39c8e60e3d8a2bef918a5579fe7e8cfd9ce1fde70ba65892f4ad9b17648535516d6013b03aaaf83aa03ba218f4 SHA512 bdfbefbbbb5f5e221f105470646fe2318284c941428f6d610d096903ae3b87da77f4be5583b3506fe6aa00f0cf38952b5384ed71b53a5cf6714f0611406c4de3
-EBUILD botan-2.9.0.ebuild 2531 BLAKE2B c231f9ac6f47478ec4d29bd2787b6e92a8771bea8f6a79edaaded0b640e3b710188efd0ec9453690d0dc3a4a35275613494b5a15b29a8b466788787e0e4b4d06 SHA512 2e772f90c51b641cb529eb5cb6cdc0aae84b6273de0fba8c7e8f2286b3ee3712ea9b52fe3d0a88213500befe6a73c6eeb5e2ad41d88ada48b091fc9aaccc77e3
+EBUILD botan-2.9.0.ebuild 2530 BLAKE2B 550a64323758808af1525767900553a56fc7e80b857923c678d718bde1bcc04e9265e1671b3cd16dca9bc4ac7b2dcf1b8ae86c6f4c098cb63fbbcad880230efd SHA512 d22a695d68e9e05add7aedc7d79985261238593b5ff626d28e40eb49d4d287ea3dcfba6c272a3ccb951d5a8d453e36bd47ff3d6581eba247492fb9f16dc15aa3
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-2.9.0.ebuild b/dev-libs/botan/botan-2.9.0.ebuild
index 90a1e9416b8d..0f61ea3a3a99 100644
--- a/dev-libs/botan/botan-2.9.0.ebuild
+++ b/dev-libs/botan/botan-2.9.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="https://botan.randombit.net/"
 SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz"
 
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
 SLOT="2/$(ver_cut 1-2)" # soname version
 LICENSE="BSD"
 IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
diff --git a/dev-libs/cgilib/Manifest b/dev-libs/cgilib/Manifest
index 27b4b13ff0ce..53509a321449 100644
--- a/dev-libs/cgilib/Manifest
+++ b/dev-libs/cgilib/Manifest
@@ -1,4 +1,3 @@
 DIST cgilib-0.7.tar.gz 268783 BLAKE2B 525487df43b9a936af8e32aa1e9b979bb93197cee7d7eb730e31d756201bab441e46d21b05b2c9e92a518fe761d7e6a643545160587e462b604780d52a88c261 SHA512 9feaa6c18e0c8ebbffa2682c07e584ab4970e0b98b61507ba67b83c920d9ba9012244fa96c95ab71121728b9945269683a2eef274cd56660576ae9b055861c83
-EBUILD cgilib-0.7-r1.ebuild 578 BLAKE2B bd1cc16ed188b18e97343ed64d6feb27d360360c240de98baa0c5f4bc72ed7c372acab03706e51175d2d9a2dda1f0cc4b0a75c858a045fae542af912a4330874 SHA512 2c487f707de41539bfce998c5c039cc6e3f9bf2715ec4a4c25770b10739718519989cc878da51a91906bf9456fd91bd4f96756947a766e7dbed06674762b8bb3
-EBUILD cgilib-0.7.ebuild 582 BLAKE2B fd601c877a2eb64c4bf996c290b3b31529c658bd91e73f99bbd022663385af170f1f413c35d9921f3ebb5a928dd3f82286d051e498a74b6f899cef66ebd60bb6 SHA512 c056ce8d29e102cabaabb07c4c9a03aee93583d7be137250c2013c4c34b350d06f9081bcaa826881eb3e342c2c962b1e42ea33cb7f98a384189661098e4b8955
+EBUILD cgilib-0.7-r1.ebuild 577 BLAKE2B 19c2db87bfa38cce710fd83e492bee9354da65da5ace76113ee11b6e3a622d477fd97b2ee1b4bd24868709ffbea53249234337e388e76103d51f8b5e41cf952c SHA512 9fa1c957f5c658fed69244240e01f0e9f0551cfe4d9aab735410e36987d462602297eda0ed1f66784b7d81ea0fce91bed515b2d5bf4d7d36e7157c5235d04e5d
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/dev-libs/cgilib/cgilib-0.7-r1.ebuild b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
index f0c3da5679c5..adb2e501783e 100644
--- a/dev-libs/cgilib/cgilib-0.7-r1.ebuild
+++ b/dev-libs/cgilib/cgilib-0.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs"
 
 DOCS=( AUTHORS ChangeLog README cookies.txt )
diff --git a/dev-libs/cgilib/cgilib-0.7.ebuild b/dev-libs/cgilib/cgilib-0.7.ebuild
deleted file mode 100644
index 12578b4f1442..000000000000
--- a/dev-libs/cgilib/cgilib-0.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools autotools-utils
-
-DESCRIPTION="A simple and lightweight interface to the CGI for C and C++ programs"
-HOMEPAGE="http://www.infodrom.org/projects/cgilib/"
-SRC_URI="http://www.infodrom.org/projects/${PN}/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="static-libs"
-
-DOCS=( AUTHORS ChangeLog README cookies.txt )
-
-src_prepare() {
-	autotools-utils_src_prepare
-	eautoreconf
-}
diff --git a/dev-libs/crc32c/Manifest b/dev-libs/crc32c/Manifest
index d334bfe2b269..ce80f2ede958 100644
--- a/dev-libs/crc32c/Manifest
+++ b/dev-libs/crc32c/Manifest
@@ -1,3 +1,3 @@
 DIST crc32c-1.0.6.tar.gz 29596 BLAKE2B 5806e0a48cb3048c9b07abb75eb232491483176bbeb98bc11ad1b0ef7d4ce89929ad20b0354906fd67e8773541f9913f3948f1db9a3f3987fe7e2ca67e9d2467 SHA512 c30f6510d6348f15dcdddc06e375f21a69681cd615483d67628b32de747e5e98200fa49faf7e3fc30a1302991fd1f9c9a706c9eb4e13c9c6c09e74066474ea7b
-EBUILD crc32c-1.0.6.ebuild 580 BLAKE2B 118db28971cfc223ddc16bf67583393a8c6c90a31e1cd8ee221d16242486ce9ea10839067cbe369ae2baa59692edd0548f79e01089609684eaaa0813fc58dfbf SHA512 df15cae485a888e5df4aed4794d394dbc6230e776abfdc4c73768e7baf9e70b7f933b9b7389a83bf628d3f3441bb83d5b24a908f7f16ca442042e2c68a2aee5a
+EBUILD crc32c-1.0.6.ebuild 578 BLAKE2B 4eb6adc4f997bb5375daf78cb92ed6c95872ae78d392e737b384e4849a23d664ab614cf7801736a590d66304c790eaabf3d601d386ac71ab04d173466c679b2e SHA512 8ab6cc5f97f219d0b84bc1838a810adb67c1cb3d5be390e7c3783ab764b2b899fea57bc804a3ad3d48bd8bd7fdc745b2657ba05c32a5a7e2292896ba24c17dae
 MISC metadata.xml 376 BLAKE2B 98a66d83b64fc45ea9c6e127fd18002fbe521851084496c4a2dab72fa3714f1d5eb6c495e770668de2d02d2b5a91dee35fee2c4917504d71ac4fd7717161c028 SHA512 414702e63bba2c5f4647eeebb6c59049e40d11da18aa3049f58dee2d269f5be86c851ea4f14dda36a1b4ec15f2f6afd0e516b8106dd3064cf6fa47cba9bc164c
diff --git a/dev-libs/crc32c/crc32c-1.0.6.ebuild b/dev-libs/crc32c/crc32c-1.0.6.ebuild
index dd3651dd58d4..9b78af3cda5b 100644
--- a/dev-libs/crc32c/crc32c-1.0.6.ebuild
+++ b/dev-libs/crc32c/crc32c-1.0.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DOCS=( README.md )
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index ecbb3d6b70bb..cc014efdd590 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -3,5 +3,5 @@ AUX crypto++-5.6.5-CVE-2017-9434.patch 1728 BLAKE2B 0cfd25fca89d59486ba9c49a87f0
 DIST cryptopp565.zip 4220843 BLAKE2B 0c42da3564cdd175c2f2c5c4272caf826f21e47d2271c7f54acab86f5f79dcdad8d6cb946bc88f55fde6189bb2d24ad8fb03dda6b3b8c6f105434b55b8b217d0 SHA512 f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7
 DIST cryptopp700.zip 7296665 BLAKE2B 1b1a60e240a9d94b4edfea16beef0ec48ec26c61f7f9a3d89d29bd2e77b13a83ce942f81467bb90d3086253560a3c4acd6b89178dcb416ed4328340ad5222dfd SHA512 8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec
 EBUILD crypto++-5.6.5-r1.ebuild 1530 BLAKE2B df7d53463e39d86aa3eb905911e5ccdd6cd6ae435b4a51059978b68109c3448c555bbe91984f285671856d5ab7c98232cf2b171d154a01a97655d5aea14cf94b SHA512 f8065ac14fcffa77b75a439edcad34214d62a40184c27f79b073d4f788b2ef3b8667110ef9766d901ed69a25cb1f1639d494f4a0ad2e97391879821569b5a06b
-EBUILD crypto++-7.0.0-r3.ebuild 1078 BLAKE2B 8ef04dadc10e2cbfa9703682b45a14cc38710c78562f8b8fe649c1908befcc7715d5746b13ab9da56d1526895372bd9d2679ea4137e20d8d354f17b91709ed03 SHA512 b40b4762b563d7b39a15daf4116b4afb10089765f7cca9639876546e2dfe04c672fb67f1cdeb32e796a466ca01d039fea9600e27b4a4b4e3a825e5d68be08835
+EBUILD crypto++-7.0.0-r3.ebuild 1077 BLAKE2B f6fda1242e5f9c5379b03793d1652a62596f8f3f97a507c19c7399e8418128908e82ca92494b485eff40d195e16a84009377208e9c83c49feb69d8b338a40edf SHA512 0088c1bc6c4a3e573955f14dab24da6e077699c147de1f3b18c3d76ab0d4073d20ddfb169691f2fee9c459a88d9662cc69d519224434c327d8c4b1dd36f6951b
 MISC metadata.xml 597 BLAKE2B 8e8dd9fb9a60f2a5e7fdda6de99b6a07264d54aaa666a41d7fb30da338f91867bdda7135bd21e92191722de7e14ac10f394ac8d8f3118109f4ce6800fb12ebc0 SHA512 e20fd2e76765968417d659a6342ff9229dc822c2291bca00dd6cccd55dc3195563574aaf3a88c68b111821b41c9bce172f4d79bbb462f2b913ab15bcc2c2ee5a
diff --git a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild b/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
index 00541d4446d0..b9882c54d476 100644
--- a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
+++ b/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
 
 LICENSE="Boost-1.0"
 SLOT="0/7" # subslot is so version
-KEYWORDS="alpha amd64 ~arm arm64 hppa ppc ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
 IUSE="+asm static-libs"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 05d14f0d0008..5c1c45e4cd6f 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -35,5 +35,5 @@ EBUILD cyrus-sasl-2.1.26-r12.ebuild 8431 BLAKE2B 0b769d0f97c9607da49eb82b5720351
 EBUILD cyrus-sasl-2.1.26-r13.ebuild 8465 BLAKE2B 48ad450be4078bea4077b8e22d664eab654136b264af31cd08037d78846d4989d3ca16d31123cbd266af0e62f29b0b5017a26dad4673fe56dac61a6e5519edd0 SHA512 80635f22cebf55ab59ae7575d3ea3e6eeeffaee25ad452577ef5af16c04eb9c5dbf300cd824814c09dfe701415b19343951dea40b8cbe957de848693c2d609b9
 EBUILD cyrus-sasl-2.1.26-r9.ebuild 7662 BLAKE2B 8a7b96ca43d133164a9818727486f2d15bd6f66d66e083dee2ac0a8d83c921a86e3e1f34dfa04689c81b5227cf80f06d1fea3c1da74b48c828e4a31f51b67c9e SHA512 6515a66682bc8c0d18b13a3cc540d00f07d26374a6bbefdcb6c974b3184164cfcce80e965b29bc10e81345e2abb8c04eb7edb21adf4097af741d5df1557ae04d
 EBUILD cyrus-sasl-2.1.27-r1.ebuild 8080 BLAKE2B e5ec4df72f32f8e29cb06fe0ab9015dfdc906721065ea09d1a625b04687a02cdcdf93df8aa1661849d8341c3a9432d49fbf052f3f9adbaf8d59e1e0827503cec SHA512 345fe84f61ff18b8fb6917d264db8db552d029937d9de242cfc6df0c36e2728d02bac6a7c7a1975b64ffdf1e0922da27339304b9fa5984689382b2650c94ac0a
-EBUILD cyrus-sasl-2.1.27-r2.ebuild 8143 BLAKE2B 930e5a3e6c84b59151f4913b1f37497ac98dd9617e95282efc60f268f5e9ef45b62c4b16084a376e36560976ef27ab8fba9dd7f6ad97b9691d164df7226ab7f6 SHA512 7d98464a8e275e2bcc5a7b136e64897b09ad245699bd967d1b890cbbbe6f1839a441427d37380cdec552c8bef9615adeaefb9b058675b455a6ad41140b86da46
+EBUILD cyrus-sasl-2.1.27-r2.ebuild 8142 BLAKE2B 23584308ddd6ba0bbfcdf5f2a58686303ae2a1b803b076bb74f26b3137f759968273d6441b0d87f70c030285e2383da396cb90d94cd58f1d52139814dbecd04a SHA512 1e3cec16a142e1f8258f09ea6182e6749e2f326b6246785a0a7c18624e1ff31e996ab16e14685ddcd88ac304dcbe0006788bab2cc0def289921f3c83a904f5e1
 MISC metadata.xml 630 BLAKE2B b24d644395a824cc17a25bef92679a2dd50656722223ded02b3311cd9b386470f4f2dafe8c8d604fd042a096d8f0f2d532e2bbc261e3c0affe4dc8d7a1db816c SHA512 45178682e8cfab5eda20e3244f42ce37be7f0e16c87405d0a1e198f561a73f8105df384055f6f228864030f4a196dcdd6b2eaf51b65b7e49f84827df9b56fba4
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
index 53d51e6525ae..e58382e6e184 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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 ~sh 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="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
 
 CDEPEND="
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index 14ce91c55953..f742b24cf019 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -5,5 +5,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 597 BLAKE2B 77c0cc82eb2b042968c4a8088432bd3f1990f5365b1eddaab067538046b7be0faaa8c4787ba4150e46a888178088e9e5e862ac34a678c8c1f6f2e8c1982e9152 SHA512 21659592ccaaa94c8c6b4206cade55a644998da29b913e0bf8f3bd5c56025b696d331558e4c4c0b75785953f74f07e4ca17e3953de2a51b93ae40f9d8f870313
+EBUILD ding-libs-0.6.1.ebuild 596 BLAKE2B 11bef827671de0e05337eb7a834a0983b477d7639cf28484d06fdd7a5366ef6a57d5a9d4c8ddbbdb0b4c3e00ed2ed759c5586203930c80046022aa30752bb278 SHA512 15dba21537d6ba66a49a9b01bf3e114e98d05a822a0f2a970dc1ffac1a5f0b5c199e55814812254f4f5466d2b515f2a2d0e20db3fcedb5447173e53eae7b21fc
 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 f4e891709dbf..d5e4cec20bf8 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/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 76a6f5f82e39..c74a0234bb5a 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -6,7 +6,7 @@ DIST elfutils-0.173.tar.bz2 8684782 BLAKE2B c5905bb864059bdfb2699a0681a0ec576b6b
 DIST elfutils-0.175.tar.bz2 8786600 BLAKE2B d6d4ade37741da788c6c2eec9688c6f8ac9707e0b17e0518398972dab3cf77a70cc82346c2e37b41f0ea414b9a1e925a7567567fcf43d504d75c92971ab25f5d SHA512 2c3168a34bbc8f22425faa263fc24ec50df39258a4f9ace4e6cd88e9764c435fee70c1a82db8273dbab70a75e5216a200bebf05af1d3ea77e444e35d71a4ed84
 DIST elfutils-0.176.tar.bz2 8646075 BLAKE2B 7f23d59b7f5d74946fea928a7fada7764c1f96a5eefefc4a3a382090eb7cad07c80419218300d853ccbef8f4e2288eb443ff06b3e64bf4511d9fa7aa84f5b794 SHA512 7f032913be363a43229ded85d495dcf7542b3c85974aaaba0d984228dc9ac1721da3dc388d3fa02325a80940161db7e9ad2c9e4521a424ad8a7d050c0902915b
 EBUILD elfutils-0.170-r1.ebuild 1790 BLAKE2B 2581434109a567bc3c57d6ebaf6b1416377d2fbfcc1cadc51efbefa02caab505dcdfa22e58b33c80ce37637c5abb1559ebdb117999eb5f552095f85da8f0dafc SHA512 22d72fdb2e2c1e8d4e1d47113a8c0d6aeb2e8e7b9f0759d445e32509c7bce9cc6dc8edd38e12ffa556447981fc60c7a04df76fd6d529b79d07d28cb10314f6ce
-EBUILD elfutils-0.173-r1.ebuild 1913 BLAKE2B 5bce756dc0f8d4534b490f5239ce2acd4687b6edc53243dacf908883893f6ea160991e46d1987a3f3cf8425e76e717114625ba43ab6cee999af2ff13120e704b SHA512 fe9ff7574f33791275607296f7cff8d41cd2b5e9629e2dc5119e56517a107fd25c381e9753d22ca9b41320a47540511f6a77622afd92e611669447de6241012f
+EBUILD elfutils-0.173-r1.ebuild 1909 BLAKE2B ed2992e3c50b9ea4885f434d074782db9b3af7570ae2eefd99c17b6c7cc58a16b3774a4c54545e644ce9ac159f79dbdd0ba22442d2a0cbe098218c2e2016f546 SHA512 9a62caf142a53c2b3ab7da0250235536e6911f0a905a1d56a8ba2469f23c7d11c2a068b22985fce38e5fa1bc00f3a4db6ffd823c69625ffc2914df9699ede12b
 EBUILD elfutils-0.173.ebuild 1813 BLAKE2B e364165c42a078dfeea283efdd0268261a57862dcd98f26f10c363edb54f1c12990148b9ac2d6c1170e719e81c902953f1212d4a43a61d5fb6839205ac836190 SHA512 21afb93206de176856703f5ba64ba990a108160e004f66251a3557b110063414cc4d9b90558ea2be6c38b676fbd15b9cb5f03b49681ac52d723dd7ee6add14a4
 EBUILD elfutils-0.175-r1.ebuild 1954 BLAKE2B b4e6aec7008d866b1f0060908cfcf9b1d6b239162d16108e08a7e7e16f4d735c0db19a5ecac2e697e0f3360dad9e441b2266ac3baac8f6849669ebbd3f8db53e SHA512 d3b4faefebb70143d4f5ba2559910206ef0ae6abe232f57b94affc65d57beb157ca7e682710410ecf4941911bd92a94995f6d454496922797cc03570a4af7a6c
 EBUILD elfutils-0.176.ebuild 1908 BLAKE2B 1472eb100a0844c972eb09a7ddc6d19d0875c2c8e3dae44ed8bc033ce5f7e868c3b990b38b40b92840675e3a215d4e1a28f153847c5f02f633f9b6cbd4a4882a SHA512 44187ea7978b94cf0a540ae4bc1df337357bc2a6a29f13c5ab2933d70ebce256b3c28e1819214a86deb47b59be0b2f1c08c9bc503c964aaa36354b8066801818
diff --git a/dev-libs/elfutils/elfutils-0.173-r1.ebuild b/dev-libs/elfutils/elfutils-0.173-r1.ebuild
index 02689c5904f0..d102c9265db0 100644
--- a/dev-libs/elfutils/elfutils-0.173-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.173-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 47285dc056d6..8057de9f058f 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,8 +1,8 @@
 DIST ell-0.18.tar.xz 439368 BLAKE2B 9e65ed73119f322fea7177771d21e46ce9ad7d4060e50d8850451939a66bc82dcc1731ddff56458f4cd60c1b6b82b5023bb96adaf3992d3ec982ed845283c8dd SHA512 cc62d01ffaa11a491d1a3ab2898da001f0a418b968350c2bdba2f381df931e53c4281cc4287937264eee72da263844886816af9baea96d7f65309b3e47e42d31
 DIST ell-0.19.tar.xz 439472 BLAKE2B 9d29f49ce401c686b2e2262310bb00552d703455dbe9190acbb479e8fa2be7a03e732250ed63c9721f6079a46841a7bbb954fd0943edf520893eccb1a4fb9b6f SHA512 f7a22d0c385d45661b7c630d39f31b67321d20635c938ef5ad3ddce7194501652381a6bfc39a1b9a404a59108977216e24e2c32f6f30fc00972a0ebca909fcab
 DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
-EBUILD ell-0.18.ebuild 1034 BLAKE2B c2097125e1880957c12dcc23eb8de05c8fc05df26b56a01c1199803bb33ba69539f4269c806cee507180891c6ce337eb9b9fadb83acc8def0ef49e914ac6869c SHA512 de0cc98a2b9d1c47ff7b29711ab2641357d039193aa1a6790e9ec5d0fba885975d10104b3b8545c86b0bdd04ca5a8adf65ac33908490e565d7a06dd0edbc489c
-EBUILD ell-0.19.ebuild 1027 BLAKE2B 308455a53f88d1f6f901c5f00bf8a53719f7c35265937eb08e0f2f4a2364ff518ab8a447f8b38e708455b9fb2363a37b0aed92a429ac8b228a3ae4264d0fbca4 SHA512 fba6a65c1be5b80daab305675c1b8a82b75bed76c53c765a034a443a593c4a84009184517e6f233d98ccc0755d14d8f25699f9e7a835950bc20b9092625e7dd7
-EBUILD ell-0.9.ebuild 823 BLAKE2B e5903b8f005ada47a5307a4b5aa46d6694072d85d5e32d946999109c0d57d170d1bfe1ff6e0d19bea94ed5065dc3bb406da5d3f70e286b4894c93bdc84417aaa SHA512 f627588913e1259ff0b4d0fceb248aee840641150d3b0fe674b31da9fff714ac451e0a8b638c752408f59b1129d219c4827b66721eb6a5aceec3a3f1cdd15d42
+EBUILD ell-0.18.ebuild 1041 BLAKE2B 1b3c2cda4f13a795f1bbb32208ea0fd4cf62bcb593d42255e523173825ee535193e6691961033b533c4926acee864f82f6c2b82c2833e3c809f27bc238bbf349 SHA512 6daf4baab54fff7c33c1de37c82282887ab9b9cd1ba1692701496b877ecbda3b6615eade0ef9dc2fe0a1bbaf5714573e8e3e137e2b44c137e2c829b320a16bbd
+EBUILD ell-0.19.ebuild 1034 BLAKE2B 7ea489d2db90a5695631236ccca9fd0c58ded12d93e50ddb1b0ede685a53f8d916550598dbfbc770fc38e7c9375cf998376bdd0076755b583e1ede66f474242c SHA512 7458c2f805911724e443f3b57a05b71adcf10c142402214e38dbf388cc21cffc174b09c1b9c4a9bac910c947fd0b38b7f4718a8fd8bcf11e11cda15296a663a1
+EBUILD ell-0.9.ebuild 822 BLAKE2B 0a9192b104d8877872968bb5da2d3b1aab6184b8d3f58965a5cb34dc45f14255d281ffebfb217c58a393906ccd6f417c2b76f182da6c903f91f78a2c204ed88f SHA512 e0af39ca55e273e51c23e10b58d118d8218e27739a4084a271f2799f2dfb22a25f0640707a9d17185d395977fde5ef65a8ef65cf3a788600ab2bc1df80b3413f
 EBUILD ell-9999.ebuild 1027 BLAKE2B 308455a53f88d1f6f901c5f00bf8a53719f7c35265937eb08e0f2f4a2364ff518ab8a447f8b38e708455b9fb2363a37b0aed92a429ac8b228a3ae4264d0fbca4 SHA512 fba6a65c1be5b80daab305675c1b8a82b75bed76c53c765a034a443a593c4a84009184517e6f233d98ccc0755d14d8f25699f9e7a835950bc20b9092625e7dd7
 MISC metadata.xml 343 BLAKE2B 520f23aef2f64a4592c7252ad8a956763fa337b746fa8b968d66cbf94c06e2c2cf435553340ca82720c83b653e7caab95394c3ce20c52cdc53bf7fbd4099e7dd SHA512 0a4654d2652442d1ab324cc2ea849506381d7f250e3c52bceb966a61795a81072d35e9656b9d472725f4ff78a84bd58b3576fcc837b4ec9e93cc5c34c92d6fae
diff --git a/dev-libs/ell/ell-0.18.ebuild b/dev-libs/ell/ell-0.18.ebuild
index 2eeaed548a92..e067c9ec27f8 100644
--- a/dev-libs/ell/ell-0.18.ebuild
+++ b/dev-libs/ell/ell-0.18.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/ell-0.19.ebuild b/dev-libs/ell/ell-0.19.ebuild
index 7cc62bc675eb..75a8368f5c6a 100644
--- a/dev-libs/ell/ell-0.19.ebuild
+++ b/dev-libs/ell/ell-0.19.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/ell/ell-0.9.ebuild b/dev-libs/ell/ell-0.9.ebuild
index 4a78a0408c52..da1b465594fe 100644
--- a/dev-libs/ell/ell-0.9.ebuild
+++ b/dev-libs/ell/ell-0.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
 IUSE="glib pie"
 
 RDEPEND="
diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 9d2859e519da..83ec980609fa 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +1,6 @@
 DIST girara-0.3.1.tar.xz 58148 BLAKE2B 7945ca0b417bf09a37f4ce7cc6603adc93cd224d7e449c7f4dae00a4abf254b251230fb40e2f985c293bad95c0bd05ff646418bb5f8e0a1c6d5d2df832900256 SHA512 5c4b2972bfb0296cd1b984c9426b67b50e29e2928fb0e9a3aa3f9bc21aebc28dcc93570e888060e0bb02561022b379cdfcfa3317b52e78cac04e7fc1ba476107
 DIST girara-0.3.2.tar.xz 58220 BLAKE2B d5962a2c8425ab49a23a08d9e2e3db44ca5d721f978070c221cbbf0bf5e16fba9121911d932607e14350abe0e6190e74412c52ea7ccbf24f0159721485170e97 SHA512 ce8b1498c2c5e278a4689f945e6773cbf19b3357711636bbe785d96c8d381cf8ba457268ca154f7bd48b06d79cc03296d2e4350784299a13c4972030bcb0dbed
 EBUILD girara-0.3.1.ebuild 1055 BLAKE2B 31476edfd1e68fc846b2eb339d098d82dbb2fb04d8751b57568661b357d1016b44abafe5a8fe6871120d4807dfd6415da5187b4a00ba98801d6c01eb1912b835 SHA512 1c5f4296473db9674a97be80f7bbd8ec697230853196d175ddf542fc96e2ba215c28f60a1475798c5bcb92eff220cc888eaf458b33d05190a03cac8035f390bc
-EBUILD girara-0.3.2.ebuild 1052 BLAKE2B 9adcdb00508e3c0ca9936d3bc1bb4c35ff8261cec4f8ce082ac283f6cee5e1290f9bd51972bb7560dc1fc71e7b5cded916913b6a71cb0008a9607967bcd6b290 SHA512 97918c6739a71a2a90eed64ba71bbf2d4b537230a510a1fc22bcc62afc16be8bf900ba18256a856f225c6f42c3022d49b8ee9b2fb90a4f83fa0854eb2f26026f
+EBUILD girara-0.3.2.ebuild 1049 BLAKE2B 042c375f57bf86f8c8af4b57b7e167ca41367238690dbb55aad6b5144e8ba4ab2dbe9d9b83b987e8763b49a8e0a98ec1bfcedc71ad45b94dd348f9b5777bdb4e SHA512 cc415478c8b086aa8a6ebb0296ec5c1b3d276b64dd5251f173002ec414ff3ad34f4f19dab9cb6c7f145a50090c119f79060cdb7400be0a92710677748313eb9c
 EBUILD girara-9999.ebuild 1058 BLAKE2B 3d2cec206425a1d8e392b5012d3328f7667fa2070c1b485377411de87ea5bc3a23463f0df76363178a435dc5958d6de93000cf21b68b43121052d90e3fce93f4 SHA512 b1e88ec6fb934ffc3e3c5d85e0e514aaf18d7fb20b591ef5ec08972bf64a34d3e8959c1c2c74936510f950cf2d30fa0f1566e56dad522c784d257f4ce3b6000e
 MISC metadata.xml 661 BLAKE2B 23e1208a22b54c7301973769a1b00adc8a2bc79cc7c4e5743e4bfd4f8e99933842466aa853510156f14020657954f35d89466888f03e515e9dbb00bd948845a4 SHA512 fb995def4c0b05dcc8bfc77ced8283bbc8e872586f7eed834291510f037215480fa38cdd4a4ff930337ef3e759e65ab55b417e531c8ff0c058c93cd15b630f59
diff --git a/dev-libs/girara/girara-0.3.2.ebuild b/dev-libs/girara/girara-0.3.2.ebuild
index 79deec03fde4..8e5a35185bb7 100644
--- a/dev-libs/girara/girara-0.3.2.ebuild
+++ b/dev-libs/girara/girara-0.3.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 fi
 
 LICENSE="ZLIB"
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index fe7fbe7fba89..0ae15ade9fd5 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,9 +1,5 @@
-AUX gjs-1.43.3-disable-unittest-1.patch 2128 BLAKE2B 73921b6b0f8b77bb98fdbe79e3a4debbad4577e856fdfba7ef57e22630a71672e6a3e330f3aa561c6c09cc7feb1d2339de4fb136643df5faa322c09179b0e804 SHA512 6fd3134bb5c19c46ee2b1f0d87e8644bc5c7a92e32fd62963fe6051ca49f20affde5f6cfbc134aaea0b7b6a5b9833e946796c689e7ebec56951b805b96cc56f2
-AUX gjs-1.43.3-disable-unittest-2.patch 1119 BLAKE2B 8ab995513b63faee201f84ec45fce226c7e7838f85160342a15e9b283c0020de52d35b43999ddfe9c06ec190e3eab5366665734bd5abe40767510b8ed548f6eb SHA512 a6f8df3c3454a635852b83ad1c3733182f2e7a28874476d1c28fb2edf8a8c0bcd7fece723c2baa43141c0ac252c2450a6b57e73821a991cb0ddd5a49aca62251
-DIST gjs-1.46.0.tar.xz 490812 BLAKE2B d7b71d6c611404d9313cdd19959e2a0cb7f035bbd2528db77ccb0030e685019b756216bfbc64885b3641c14cab2f29110492c87047c3ceb1a627765857b19a95 SHA512 14af40668e95d269ac87556c75cf45680c41bc8246f04c46726d34bd80e9344045c0a510567f156c2c25c1f10dd474dc38bd50581d1b2e5abe0daa0cf570e2bc
 DIST gjs-1.48.7.tar.xz 595324 BLAKE2B eac8b5b2f7e909e94e3fb305cac443da3f433047ee07fa8fbd15905890f77d57449c8689867df61f1ac849b8b4bddc089a9b1ddc3aa79d4b3d054226c58fa909 SHA512 b8c58e068eaecfca2fa40cebe209fa8058e603809be4307099a0f3dbd561752a540d587d546ffa74aef0268a111f2b2846a1e0febda1adcefdac8c02e716e2dd
 DIST gjs-1.54.3.tar.xz 647704 BLAKE2B 792225afd9828755ef67b3e7221d4c53535d79d879e0aef0c7c56f06e02313a966776b5dddf9876649984a1599eb44a27d6288f9216bb929a66ad9e14cb632e5 SHA512 f19e667963fa3feecd23a9e4cc263a55d9d1311de7d10905969966f74e26ff982839c192c555cbc059e4fd65ff7c89d18944ca6bf8ffbb65ec91081036d19505
-EBUILD gjs-1.46.0.ebuild 1558 BLAKE2B 035abf83ae724d27a06ee1973ccd28afc29bedea4e5720fe5b3758bfda79e5c33718dce56fe938698ee58b7c48b1737767b1facfcea6fa6be97b093b92c7c70a SHA512 f6fb1dafb934f9b5296195e8a651dc410b061d0a1cba8b066547043c50090e1c101fde253d08312a0f0b98658f624e3513b4d9fdeddd99ad8893749e23ca43a6
-EBUILD gjs-1.48.7.ebuild 1549 BLAKE2B 8ee4cfb9bc4717075eb05cb5c8cb3434c927a90c780c9db4cc38b083864407284e490909dab2713c0dc8fa1ef0691bcfb733981ace846e78547012e46b978c45 SHA512 e957ed75af0c4d2fa6408a1c9e468fb32b104ce12cf061749f19673ce3103bef89630e54d9049c4b283f8fd6eb9178e9181de107382dea6d0644b5eeee78a9fd
+EBUILD gjs-1.48.7.ebuild 1548 BLAKE2B 47a474a7958d70ed915b8c1a2a973f1e72f99a7bc4459e98a687503122d83d40dc0733dcd3e7fbefc42304049520acf80b3ad609cda1ea5c8653e0ba215f19f7 SHA512 4a976754dcc518a188fa3ceae85ec61aa20b0abfe6c9c5ad248fa72ea62820935415451cb8f6659931b6b8f4044dee2f5a20be8c08a6d1a3df0d526b24b8695f
 EBUILD gjs-1.54.3.ebuild 1557 BLAKE2B 32cc37341e3071068228ba2ed4edc3a10eb803b3fceb08ace02c9daaaf8751ce37782a13c0e15ce6b69a322e98ddf9125db722cbbf3ffd4dc9448a6dbf2857b9 SHA512 e9f6ee160f653118abdf683816a7677268db84df81315538ce6c94c3c2cfcaa03a83d4cb13c76f6b267570a8bcd8e7031f37a89459352b8a45922d7fd9f5799a
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/gjs/files/gjs-1.43.3-disable-unittest-1.patch b/dev-libs/gjs/files/gjs-1.43.3-disable-unittest-1.patch
deleted file mode 100644
index c6d740ad5537..000000000000
--- a/dev-libs/gjs/files/gjs-1.43.3-disable-unittest-1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 115c97bb07f71ac91e20b84f9da6389434d31999 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 12 Oct 2014 21:57:11 +0200
-Subject: [PATCH 1/2] Comment broken unittests
-
----
- test/gjs-tests.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp
-index 6cade7b..4d6c61e 100644
---- a/test/gjs-tests.cpp
-+++ b/test/gjs-tests.cpp
-@@ -324,18 +324,18 @@ main(int    argc,
- 
-     g_test_init(&argc, &argv, NULL);
- 
--    g_test_add_func("/gjs/context/construct/destroy", gjstest_test_func_gjs_context_construct_destroy);
-+    /* g_test_add_func("/gjs/context/construct/destroy", gjstest_test_func_gjs_context_construct_destroy); */
-     g_test_add_func("/gjs/context/construct/eval", gjstest_test_func_gjs_context_construct_eval);
--    g_test_add_func("/gjs/jsapi/util/array", gjstest_test_func_gjs_jsapi_util_array);
--    g_test_add_func("/gjs/jsapi/util/error/throw", gjstest_test_func_gjs_jsapi_util_error_throw);
--    g_test_add_func("/gjs/jsapi/util/string/js/string/utf8", gjstest_test_func_gjs_jsapi_util_string_js_string_utf8);
-+    /* g_test_add_func("/gjs/jsapi/util/array", gjstest_test_func_gjs_jsapi_util_array); */
-+    /* g_test_add_func("/gjs/jsapi/util/error/throw", gjstest_test_func_gjs_jsapi_util_error_throw); */
-+    /* g_test_add_func("/gjs/jsapi/util/string/js/string/utf8", gjstest_test_func_gjs_jsapi_util_string_js_string_utf8); */
-     g_test_add_func("/gjs/jsutil/strip_shebang/no_shebang", gjstest_test_strip_shebang_no_advance_for_no_shebang);
-     g_test_add_func("/gjs/jsutil/strip_shebang/have_shebang", gjstest_test_strip_shebang_advance_for_shebang);
-     g_test_add_func("/gjs/jsutil/strip_shebang/only_shebang", gjstest_test_strip_shebang_return_null_for_just_shebang);
-     g_test_add_func("/util/glib/strv/concat/null", gjstest_test_func_util_glib_strv_concat_null);
-     g_test_add_func("/util/glib/strv/concat/pointers", gjstest_test_func_util_glib_strv_concat_pointers);
- 
--    gjs_test_add_tests_for_coverage ();
-+    /* gjs_test_add_tests_for_coverage (); */
- 
-     g_test_run();
- 
--- 
-2.3.6
-
diff --git a/dev-libs/gjs/files/gjs-1.43.3-disable-unittest-2.patch b/dev-libs/gjs/files/gjs-1.43.3-disable-unittest-2.patch
deleted file mode 100644
index fe21f92dfc2b..000000000000
--- a/dev-libs/gjs/files/gjs-1.43.3-disable-unittest-2.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c9d63c7531a29418c64dc44556519d7bd1664ce4 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 12 Oct 2014 21:57:45 +0200
-Subject: [PATCH 2/2] Comment broken JS unittest
-
----
- installed-tests/js/testLocale.js | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/installed-tests/js/testLocale.js b/installed-tests/js/testLocale.js
-index b086a66..0c5abb1 100644
---- a/installed-tests/js/testLocale.js
-+++ b/installed-tests/js/testLocale.js
-@@ -1,14 +1,14 @@
- // tests for JS_SetLocaleCallbacks().
- const JSUnit = imports.jsUnit;
- 
--function testToLocaleDateString() {
--    let date = new Date();
-+//function testToLocaleDateString() {
-+    //let date = new Date();
-     // %A is the weekday name, this tests locale_to_unicode
-     // we're basically just testing for a non-crash, since
-     // we'd have to run in a specific locale to have any
-     // idea about the result.
--    date.toLocaleDateString("%A");
--}
-+    //date.toLocaleDateString("%A");
-+//}
- 
- function testToLocaleLowerCase() {
-     JSUnit.assertEquals("aaa", "AAA".toLocaleLowerCase());
--- 
-2.3.6
-
diff --git a/dev-libs/gjs/gjs-1.46.0.ebuild b/dev-libs/gjs/gjs-1.46.0.ebuild
deleted file mode 100644
index a0935c8510fa..000000000000
--- a/dev-libs/gjs/gjs-1.46.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 pax-utils virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/gobject-introspection-1.41.4:=
-
-	sys-libs/readline:0
-	dev-lang/spidermonkey:24
-	virtual/libffi:=
-	cairo? ( x11-libs/cairo[X] )
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-PATCHES=(
-	# Disable broken unittests, upstream bug #????
-	"${FILESDIR}"/${PN}-1.43.3-disable-unittest-{1,2}.patch
-)
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	# XXX: Do NOT enable coverage, completely useless for portage installs
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		--disable-coverage \
-		$(use_with cairo cairo) \
-		$(use_with gtk) \
-		$(use_with test dbus-tests) \
-		$(use_with test xvfb-tests)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel, bug #???
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${S}"/examples/*
-	fi
-
-	# Required for gjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/gjs-console"
-}
diff --git a/dev-libs/gjs/gjs-1.48.7.ebuild b/dev-libs/gjs/gjs-1.48.7.ebuild
index 05b6ca3ead4f..7766348989c3 100644
--- a/dev-libs/gjs/gjs-1.48.7.ebuild
+++ b/dev-libs/gjs/gjs-1.48.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk test"
-KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.52.1
diff --git a/dev-libs/grok/Manifest b/dev-libs/grok/Manifest
deleted file mode 100644
index 343fe143159d..000000000000
--- a/dev-libs/grok/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX 0.9.2-Makefile.patch 2076 BLAKE2B 1ead4d0c489629c019b7b1a45f379b0010e2cf7074d81c64154b749d42d349803da8921291bdfbd30196bf972223f2a564bae3e4b45bc1370624f755dd66680b SHA512 d1b56f1fe577f9dba9a5fa4b79589d8c51a47baaa80fafeaa3ec8b0660f0e329ec0d44e5b3f1cae4c2cacd877497c499d1400cc996635f82262898e06c1507bb
-AUX 0.9.2-build-with-pcre-lt-8.34.patch 391 BLAKE2B ef7011f034108d8121fb2daf168de9895a75b24dfd9fb25195ae9b8a8dcfdf1444c88971c2f6229200e2fbd356e293bd9ac3930d1ff1dd61868953636c73fa6b SHA512 67c5f3d66536946d09c2a7b3e34dcb6d68a2cff019acbf31cafc088864eb38537e5eb09cde4a57627601057123a7748f49a6d0f9563cfed5cddb505c236c93f4
-AUX grok-0.9.2-Makefile.patch 1969 BLAKE2B 4ea88ada1d1dd4bb98d492ffb732f72f46fe2366a59f48e8025d9b039d8ba6b304e43d5aecc7cc3b81c24a83fcb47661ddf72d145f657aa8836ef0d4938ca3a9 SHA512 7ae93d4e7f4052c0f43581c9e2434985665398dbdf408a2dcd164b021f9abb54d35fae546f880debf80ae10e2620c3620423723c4489fc55ee9f6bca77ffa913
-AUX grok-0.9.2-build-with-gperf-3.1.patch 867 BLAKE2B 41242e21655df898d38c2508016d01921e1ab849dcecec8bc319bdece72d5e63ac19096f9c09999e06f91d874a06bc9a2bb0617048c09eff69045030858a4bef SHA512 6074c5ef9da13d874716b07d0796396c5974088ce2faf52835e9735378a4896ac21dbd8899b0eb2c221ab01cbc29ed9ca25c42814082aa5c6c98e515dc7cb8c2
-AUX grok-0.9.2-libdir.patch 1223 BLAKE2B 7a303aa738c98f9ff11bdb76e28d7b0ef13beb291f87bd6fa814c5883a3934c9d354e78cbde596cce1384e950e2a917bd4f2849bbb55bbf6815ec43370def24b SHA512 7c08ff83475783274d7a14e574327b89d7e44d6c0f743d7704951553377f0d6b74bcec757cfee81144d8547d550bf33ea7c9a368c013109e51ff708498ea7dea
-AUX grok-0.9.2-libtirpc.patch 665 BLAKE2B 21c00cba5fd0bb68104c8a5cdd886d8d634463afc41fce2bcc5384ff80bd32bb5ef75b53ca25f2463e35f276fe1efc1677f3075d73d3fe5a4b77df1f593e9a3e SHA512 565d08bd4f2d58f5db4f095cc5276077fb9c3de159ecc54c65825d2d8db1af56e6c5c567d5259cbf4b866c6e99d996f5c94b36c7bbd40162088ee74321c32a33
-DIST grok-0.9.2.tar.gz 243554 BLAKE2B 390f9a252668af2ccf90c5ea91e5182bf91ed0b66fd354d77f67c13a2e4c08aa244ba290adae687f7cdacea24fdb561fa378456d1d7bed07b3f44e0b46dc1adf SHA512 91d410259e89de6fbab011691cf56497158bc7a508194e6d17a2b32c8b70650be3b40c4792390589929b0f553a92b81cd3981e84ddcbe6a6ea80ab8fcdb38b2e
-EBUILD grok-0.9.2-r2.ebuild 981 BLAKE2B f6a34209d30159694a93bbec7a85574d03b54192a46da658d988e90471b0aef8266c3d2859d62e50fc8b36cada5951ac02626a02c330258bc504af7fc18a1193 SHA512 c8d1822ff477e7569a12e2e5a0370ac9b48f46a5991ab0b80b6766cacb7403d8221575ea178ac464049eae8f1861ef178cb3e891432800a01db4ffaa765244a5
-MISC metadata.xml 254 BLAKE2B 8b393297b0cf2112182d89c18f2fc26d2b57e4d191f96bdcad17d2809fc52c51e0b76c1e8f9b7998f36f296be7015eb8a0a730d18892ee83343b28738cba6ea9 SHA512 4cc0684e2b8c6a3d54834d288930076f6b90205f375b4c91bc8253cdda537d44022e34710d3e9fe657f57d5ac69b57320fe5ae8b7abd4d4162259b4fa9aa6fcf
diff --git a/dev-libs/grok/files/0.9.2-Makefile.patch b/dev-libs/grok/files/0.9.2-Makefile.patch
deleted file mode 100644
index f10531646ad0..000000000000
--- a/dev-libs/grok/files/0.9.2-Makefile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/grok-0.9.2/Makefile b/grok-0.9.2/Makefile
-index adfe869..fdced25 100644
---- a/grok-0.9.2/Makefile
-+++ b/grok-0.9.2/Makefile
-@@ -25,10 +25,12 @@ else
- GPERF?=/usr/bin/gperf
- endif
- 
-+LIBS=-lpcre -levent -rdynamic -ltokyocabinet
-+
- # For linux, we need libdl for dlopen()
- # On FreeBSD, comment this line out.
- ifeq ($(PLATFORM), GNULinux)
--LDFLAGS+=-ldl
-+LIBS+=-ldl
- endif
- 
- # #############################################
-@@ -41,8 +43,7 @@ VERSION=$(shell sh $(BASE)/version.sh)
- #CFLAGS+=-g
- #LDFLAGS+=-g
- 
--CFLAGS+=-pipe -fPIC -I. -O2
--LDFLAGS+=-lpcre -levent -rdynamic -ltokyocabinet
-+CFLAGS+=-fPIC -I.
- 
- LIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix)
- VERLIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix $(MAJOR))
-@@ -50,8 +51,8 @@ DYNLIBFLAG=$(shell sh $(BASE)/platform.sh dynlibflag)
- LIBNAMEFLAG=$(shell sh $(BASE)/platform.sh libnameflag $(MAJOR) $(INSTALLLIB))
- 
- # Sane includes
--CFLAGS+=-I/usr/local/include
--LDFLAGS+=-L/usr/local/lib
-+#CFLAGS+=-I/usr/local/include
-+#LDFLAGS+=-L/usr/local/lib
- 
- # Platform so we know what to dlopen
- CFLAGS+=-DPLATFORM_$(PLATFORM)
-@@ -97,6 +98,7 @@ install: libgrok.$(LIBSUFFIX) grok discogrok $(GROKHEADER)
- 	install -m 755 grok $(DESTDIR)$(PREFIX)/bin
- 	install -m 755 discogrok $(DESTDIR)$(PREFIX)/bin
- 	install -m 644 libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib
-+	ln -s libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib/libgrok.$(LIBSUFFIX).1
- 	for header in $(GROKHEADER); do \
- 		install -m 644 $$header $(DESTDIR)$(PREFIX)/include; \
- 	done 
-@@ -162,14 +164,14 @@ cleanver:
- # Binary creation
- grok: LDFLAGS+=-levent
- grok: $(GROKOBJ) conf.tab.o conf.yy.o main.o grok_config.o
--	$(CC) $(LDFLAGS) $^ -o $@
-+	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
- 
- discogrok: $(GROKOBJ) discover_main.o
--	$(CC) $(LDFLAGS) $^ -o $@
-+	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
- 
- libgrok.$(LIBSUFFIX): 
- libgrok.$(LIBSUFFIX): $(GROKOBJ) 
--	$(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ -o $@
-+	$(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ $(LIBS) -o $@
- 
- libgrok.$(VERLIBSUFFIX): libgrok.$(LIBSUFFIX);
- 	ln -s $< $@
diff --git a/dev-libs/grok/files/0.9.2-build-with-pcre-lt-8.34.patch b/dev-libs/grok/files/0.9.2-build-with-pcre-lt-8.34.patch
deleted file mode 100644
index 1593ac309817..000000000000
--- a/dev-libs/grok/files/0.9.2-build-with-pcre-lt-8.34.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/jordansissel/grok/commit/44ce9372a29319c01d4ac7f24287fb36315e0e34
-
---- a/grokre.c
-+++ b/grokre.c
-@@ -12,8 +12,8 @@
- 
- /* global, static variables */
- 
--#define CAPTURE_ID_LEN 4
--#define CAPTURE_FORMAT "%04x"
-+#define CAPTURE_ID_LEN 5
-+#define CAPTURE_FORMAT "_%04x"
- 
- /* internal functions */
- static char *grok_pattern_expand(grok_t *grok); //, int offset, int length);
diff --git a/dev-libs/grok/files/grok-0.9.2-Makefile.patch b/dev-libs/grok/files/grok-0.9.2-Makefile.patch
deleted file mode 100644
index 8d9351c8c0f8..000000000000
--- a/dev-libs/grok/files/grok-0.9.2-Makefile.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -25,10 +25,12 @@ else
- GPERF?=/usr/bin/gperf
- endif
- 
-+LIBS=-lpcre -levent -rdynamic -ltokyocabinet
-+
- # For linux, we need libdl for dlopen()
- # On FreeBSD, comment this line out.
- ifeq ($(PLATFORM), GNULinux)
--LDFLAGS+=-ldl
-+LIBS+=-ldl
- endif
- 
- # #############################################
-@@ -41,8 +43,7 @@ VERSION=$(shell sh $(BASE)/version.sh)
- #CFLAGS+=-g
- #LDFLAGS+=-g
- 
--CFLAGS+=-pipe -fPIC -I. -O2
--LDFLAGS+=-lpcre -levent -rdynamic -ltokyocabinet
-+CFLAGS+=-fPIC -I.
- 
- LIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix)
- VERLIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix $(MAJOR))
-@@ -50,8 +51,8 @@ DYNLIBFLAG=$(shell sh $(BASE)/platform.sh dynlibflag)
- LIBNAMEFLAG=$(shell sh $(BASE)/platform.sh libnameflag $(MAJOR) $(INSTALLLIB))
- 
- # Sane includes
--CFLAGS+=-I/usr/local/include
--LDFLAGS+=-L/usr/local/lib
-+#CFLAGS+=-I/usr/local/include
-+#LDFLAGS+=-L/usr/local/lib
- 
- # Platform so we know what to dlopen
- CFLAGS+=-DPLATFORM_$(PLATFORM)
-@@ -97,6 +98,7 @@ install: libgrok.$(LIBSUFFIX) grok discogrok $(GROKHEADER)
- 	install -m 755 grok $(DESTDIR)$(PREFIX)/bin
- 	install -m 755 discogrok $(DESTDIR)$(PREFIX)/bin
- 	install -m 644 libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib
-+	ln -s libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib/libgrok.$(LIBSUFFIX).1
- 	for header in $(GROKHEADER); do \
- 		install -m 644 $$header $(DESTDIR)$(PREFIX)/include; \
- 	done 
-@@ -162,14 +164,14 @@ cleanver:
- # Binary creation
- grok: LDFLAGS+=-levent
- grok: $(GROKOBJ) conf.tab.o conf.yy.o main.o grok_config.o
--	$(CC) $(LDFLAGS) $^ -o $@
-+	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
- 
- discogrok: $(GROKOBJ) discover_main.o
--	$(CC) $(LDFLAGS) $^ -o $@
-+	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
- 
- libgrok.$(LIBSUFFIX): 
- libgrok.$(LIBSUFFIX): $(GROKOBJ) 
--	$(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ -o $@
-+	$(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ $(LIBS) -o $@
- 
- libgrok.$(VERLIBSUFFIX): libgrok.$(LIBSUFFIX);
- 	ln -s $< $@
diff --git a/dev-libs/grok/files/grok-0.9.2-build-with-gperf-3.1.patch b/dev-libs/grok/files/grok-0.9.2-build-with-gperf-3.1.patch
deleted file mode 100644
index 89300eb5f6e9..000000000000
--- a/dev-libs/grok/files/grok-0.9.2-build-with-gperf-3.1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Closes: https://github.com/jordansissel/grok/issues/28
-Closes: https://github.com/jordansissel/grok/issues/29
-
---- a/Makefile
-+++ b/Makefile
-@@ -213,8 +213,8 @@ grok_capture_xdr.h: grok_capture.x
- 	rpcgen -h $< -o $@
- 
- %.c: %.gperf
--	@if $(GPERF) --version | head -1 | egrep -v '3\.[0-9]+\.[0-9]+' ; then \
--		echo "We require gperf version >= 3.0.3" ; \
-+	@if $(GPERF) --version | head -1 | grep --quiet -E '[0-2]\.[0-9]\.[0-9]+|3\.0\.[0-9]+' ; then \
-+		echo "We require gperf version >= 3.1.0" ; \
- 		exit 1; \
- 	fi
- 	$(GPERF) $< > $@
---- a/grok_matchconf_macro.h
-+++ b/grok_matchconf_macro.h
-@@ -19,6 +19,6 @@ struct strmacro {
- #endif
- 
- /* this function is generated by gperf */
--const struct strmacro *patname2macro(const char *str, unsigned int len);
-+const struct strmacro *patname2macro(const char *str, size_t len);
- 
- #endif /* _GROK_MATCHCONF_MACRO_ */
diff --git a/dev-libs/grok/files/grok-0.9.2-libdir.patch b/dev-libs/grok/files/grok-0.9.2-libdir.patch
deleted file mode 100644
index 06b19555cde8..000000000000
--- a/dev-libs/grok/files/grok-0.9.2-libdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ruN grok-0.9.2.orig/Makefile grok-0.9.2/Makefile
---- grok-0.9.2.orig/Makefile	2018-05-05 17:26:35.451938040 +0200
-+++ grok-0.9.2/Makefile	2018-05-05 17:29:03.414780593 +0200
-@@ -93,12 +93,12 @@
- 
- install: libgrok.$(LIBSUFFIX) grok discogrok $(GROKHEADER)
- 	install -d $(DESTDIR)$(PREFIX)/bin
--	install -d $(DESTDIR)$(PREFIX)/lib
-+	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
- 	install -d $(DESTDIR)$(PREFIX)/include
- 	install -m 755 grok $(DESTDIR)$(PREFIX)/bin
- 	install -m 755 discogrok $(DESTDIR)$(PREFIX)/bin
--	install -m 644 libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib
--	ln -s libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib/libgrok.$(LIBSUFFIX).1
-+	install -m 644 libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/$(LIBDIR)
-+	ln -s libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libgrok.$(LIBSUFFIX).1
- 	for header in $(GROKHEADER); do \
- 		install -m 644 $$header $(DESTDIR)$(PREFIX)/include; \
- 	done 
-@@ -109,7 +109,7 @@
- uninstall:
- 	rm -f $(DESTDIR)$(PREFIX)/bin/grok
- 	rm -f $(DESTDIR)$(PREFIX)/bin/discogrok
--	rm -f $(DESTDIR)$(PREFIX)/lib/libgrok.$(LIBSUFFIX)
-+	rm -f $(DESTDIR)$(PREFIX)/$(LIBDIR)/libgrok.$(LIBSUFFIX)
- 	for header in $(GROKHEADER); do \
- 		rm -f $(DESTDIR)$(PREFIX)/include/$$header; \
- 	done 
diff --git a/dev-libs/grok/files/grok-0.9.2-libtirpc.patch b/dev-libs/grok/files/grok-0.9.2-libtirpc.patch
deleted file mode 100644
index 9fd09bef8252..000000000000
--- a/dev-libs/grok/files/grok-0.9.2-libtirpc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN grok-0.9.2.orig/Makefile grok-0.9.2/Makefile
---- grok-0.9.2.orig/Makefile	2018-05-05 17:22:33.122558130 +0200
-+++ grok-0.9.2/Makefile	2018-05-05 17:24:29.554221133 +0200
-@@ -25,7 +25,7 @@
- GPERF?=/usr/bin/gperf
- endif
- 
--LIBS=-lpcre -levent -rdynamic -ltokyocabinet
-+LIBS=-lpcre -levent -rdynamic -ltokyocabinet -ltirpc
- 
- # For linux, we need libdl for dlopen()
- # On FreeBSD, comment this line out.
-@@ -55,7 +55,7 @@
- #LDFLAGS+=-L/usr/local/lib
- 
- # Platform so we know what to dlopen
--CFLAGS+=-DPLATFORM_$(PLATFORM)
-+CFLAGS+=-DPLATFORM_$(PLATFORM) -I$(EPREFIX)/usr/include/tirpc
- # Uncomment to totally disable logging features
- #CFLAGS+=-DNOLOGGING
- 
diff --git a/dev-libs/grok/grok-0.9.2-r2.ebuild b/dev-libs/grok/grok-0.9.2-r2.ebuild
deleted file mode 100644
index 0e18ee718f15..000000000000
--- a/dev-libs/grok/grok-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="DRY and RAD for regular expressions"
-HOMEPAGE="https://github.com/jordansissel/grok https://code.google.com/p/semicomplete/wiki/Grok"
-SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa x86"
-
-IUSE=""
-
-CDEPEND="
-	dev-db/tokyocabinet
-	>=dev-libs/libevent-1.3:=
-	>=dev-libs/libpcre-7.6
-	>=net-libs/rpcsvc-proto-1
-	net-libs/libtirpc
-"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-		>=dev-util/gperf-3.1"
-
-PATCHES=(
-	"${FILESDIR}"/grok-0.9.2-Makefile.patch
-	"${FILESDIR}"/0.9.2-build-with-pcre-lt-8.34.patch
-	"${FILESDIR}"/grok-0.9.2-build-with-gperf-3.1.patch
-	"${FILESDIR}"/grok-0.9.2-libtirpc.patch
-	"${FILESDIR}"/grok-0.9.2-libdir.patch
-)
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_install() {
-	LIBDIR=$(get_libdir) default
-}
diff --git a/dev-libs/grok/metadata.xml b/dev-libs/grok/metadata.xml
deleted file mode 100644
index d1adf07cb2da..000000000000
--- a/dev-libs/grok/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">jordansissel/grok</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
new file mode 100644
index 000000000000..1e0bc309f18d
--- /dev/null
+++ b/dev-libs/intel-neo/Manifest
@@ -0,0 +1,4 @@
+AUX intel-neo-19.16.12873_cmake_no_libva_automagic.patch 330 BLAKE2B a38c4a03d1837102168b907049c1a8fec93035f7efadd5e5cfb17296fd5fbf17dac1961affaa625847cd7c0cb3694d9d5c36b96d45f8c036334e8dc707100db0 SHA512 5c7133d355e0f4f8c0f8f0c84264d5f2a8cba6126d59b8a509354759a97d1a6f96b5deddcaacbce2ceb32e2014dd2f13e613a7db1973d3f865b906b803e8866e
+DIST intel-neo-19.16.12873.tar.gz 2370395 BLAKE2B 2efc76c9729d3ec000455270e923df1e3d0ec5d0a5c31cd156401b37c63ba01ee2a6051f487a98c4db10f61c2a70434f994f15472f54741ef4a80a71b036636f SHA512 1ec8b7883bfeefc1ed2095eac6111803a44e3c88e8bd1a478fb89a5baa4484fc96894f7ef0c01f4b6b9cb94731cdfc633f38ef2f636fdeb2d5e4344ca4aaa2ae
+EBUILD intel-neo-19.16.12873.ebuild 1239 BLAKE2B 9f656d45ae8dd12435ee39fbfc0c47b00d4556482db1dbd1298940d140e0dca46e5c58684f7388a3e04a68a67cf3d6cba8996c3d3f331135c59077e487054551 SHA512 4fb62c57384aca36eecc1734401ef7a7262811e27650f25fd84d854d217dc9209015ac9685662cf09becf355bf9fa5f6f3826ba11c6bb6aeb453bcf8183cfa10
+MISC metadata.xml 871 BLAKE2B 2e394b97e0147760965e10f7d43f3b7f189a0f146df84adbcfd5adf22937587982b113fe4d7f07d436265746eb9339d5141dbe2655846a1b10ebcc0751f1a763 SHA512 1092d3b8c8dd26fac3822f0b4d25f19ea74726df3f3978a6d596a97b5019465a8a7a853fb98512a07f51c5b81ecc3a7fb9350fb796a2fb7fb27fd16b937eff93
diff --git a/dev-libs/intel-neo/files/intel-neo-19.16.12873_cmake_no_libva_automagic.patch b/dev-libs/intel-neo/files/intel-neo-19.16.12873_cmake_no_libva_automagic.patch
new file mode 100644
index 000000000000..fbfdfd32dffe
--- /dev/null
+++ b/dev-libs/intel-neo/files/intel-neo-19.16.12873_cmake_no_libva_automagic.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -374,9 +374,9 @@
+ endif()
+ 
+ # LibVA detection
+-if(UNIX)
++if(UNIX AND ENABLE_VAAPI_MEDIA_SHARING)
+   set(IGDRCL__LIBVA_IS_REQUIRED "")
+-  if(IGDRCL_FORCE_USE_LIBVA)
++  if(IGDRCL_FORCE_USE_LIBVA OR ENABLE_VAAPI_MEDIA_SHARING)
+     set(IGDRCL__LIBVA_IS_REQUIRED "REQUIRED")
+   endif()
+ 
diff --git a/dev-libs/intel-neo/intel-neo-19.16.12873.ebuild b/dev-libs/intel-neo/intel-neo-19.16.12873.ebuild
new file mode 100644
index 000000000000..ac08c8c0ab25
--- /dev/null
+++ b/dev-libs/intel-neo/intel-neo-19.16.12873.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_PN="compute-runtime"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Intel Graphics Compute Runtime for OpenCL, for Gen8 (Broadwell) and beyond"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="vaapi"
+
+COMMON="dev-libs/ocl-icd
+	dev-util/intel-graphics-compiler
+	>=media-libs/gmmlib-19.0.0
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		>=x11-libs/libva-2.0.0
+	)"
+DEPEND="${COMMON}
+	virtual/pkgconfig"
+RDEPEND="${COMMON}"
+
+DOCS=(
+	README.md
+	documentation/FAQ.md
+	documentation/LIMITATIONS.md
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-19.16.12873_cmake_no_libva_automagic.patch
+)
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_VAAPI_MEDIA_SHARING=$(usex vaapi "ON" "OFF")
+		# If enabled, tests are automatically run during the compile phase
+		# - and we cannot run them because they require permissions to access
+		# the hardware.
+		-DSKIP_UNIT_TESTS=ON
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
+}
diff --git a/dev-libs/intel-neo/metadata.xml b/dev-libs/intel-neo/metadata.xml
new file mode 100644
index 000000000000..2c902f213320
--- /dev/null
+++ b/dev-libs/intel-neo/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<longdescription>The Intel Graphics Compute Runtime for OpenCL, informally
+		known as NEO, is an open source project to converge Intel's development
+		efforts on OpenCL compute stacks supporting Gen8 graphics devices
+		(Broadwell architecture) and newer.
+		For OpenCL support on Sandy Bridge, Ivy Bridge and Haswell architectures
+		please have a look at <pkg>dev-libs/beignet</pkg> instead.</longdescription>
+	<use>
+		<flag name="vaapi">Support the sharing of surfaces with Video Acceleration API
+			(OpenCL Extension #36)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">intel/compute-runtime</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index 64a49f1fda58..3f3d3fa1f167 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,7 +1,7 @@
 DIST libbytesize-1.2.tar.gz 70598 BLAKE2B e136b1274703da7b3596e7583cea1ac773c1594af09c626f4dbb481dfcc23a3186b03ebdc54bba67d0a063c5d6587f6b7f8b610828c461cfd114eea1388dd193 SHA512 a8151e7440d0ec43d10239ddf08a9924827cdf08f20a16dff6177b444c1022fab905a0567384531e7610d854998111adb77f9a6a98e2d9648c02521f84ea2bf2
-DIST libbytesize-1.3.tar.gz 71648 BLAKE2B 40794a38af8ee1fcc03ef8000b20123c0e02e208f329a75e7da3a18b224e4a8456ce5982d72e4eefa2ff9d9dcd90b98142037dd37be6bc31f25e2ff347010829 SHA512 a50f5d4ea07a295909e09168518f8fc25da8dcd52859beca9c9c3b8c8c180b025c774c730d449ffbd4c7fd5aba07b5d071b6d9ad36f9d9ebc96bb06699aa08f3
 DIST libbytesize-1.4.tar.gz 80943 BLAKE2B d4c6c34d81be01bf7db2c37b0660886d99eff3c0a87024f5fbc12cc3606dc01e772b81dfbcacbf76c62213120253a9e7bda90adbc749b6d4c3e31e1ed3ae7702 SHA512 5dd13cf52a1674be776220ee1863f42261a47dc53af1ce4a31460d6d02ce87e19c5a52260f700928af98f1d9d7a96de7c11d8f384907b3187ef2effc10cbb593
+DIST libbytesize-2.0.tar.gz 84673 BLAKE2B cbe439bafc5b6a5ee1fbba6ba3e78f6a2b080394eb1da57b14945edc9180cff179a0eafb9de29a9639dfcbd6abf86158aa84121b81704d9270a93e4331d98eea SHA512 5adc7f529bebab2a568b623f876c9b65e58cd1f19dcfb2cc0c068b03a4e0cbe6a527c9cef3417e442b5eb8c00c963f325090356474c69083793a55edb54a7001
 EBUILD libbytesize-1.2-r1.ebuild 1122 BLAKE2B 6f17b8fd6560664dd8dd33861e9016269f82be242785e1f8c30e5e55bf55d81082b68e5ab329286f505b31b2b6a30145e291ecb3665554a84bc4ae5130ea69af SHA512 918fd1fdeeb6b4df3d9f1a66fabac851dff049f14b62b12aea633c6b629fa54b54eb822ec17ff80f11f8784400d59f90eb49ea3812e54c86ca68de1f819700b0
-EBUILD libbytesize-1.3-r1.ebuild 1175 BLAKE2B ecf198112f90310f0a540a29d6dadecf716461c30ccf9d706553ac43424a0a66d06fd725b5eefd26dc2587d54bb463d635b0313582056d2ea5b7ddb1d2925357 SHA512 2f489188c42a90ede2e41d99e3267681d1abc8ccbabf4580797beff0210a595a179c0d38496338bee5b862dcac5d703227f08a9678e698c7a716254351467761
-EBUILD libbytesize-1.4.ebuild 1226 BLAKE2B 07fedb183ab087300409fc486a717a9c4c403d6efbd20d34a785cfe34cac804e215e72840bae8451a2b5f12b757c11025835abc9b02fcf3bacc4ade813255b2b SHA512 806d4df6f59c942c4259cadd6239838a8f57f78f6e11dc8781cf20142d308e2cec282d101aee59bc28c96aa87113bafc01aa38aa8d40a43bfa4d61b3e17dd6f1
-MISC metadata.xml 349 BLAKE2B 3dd4c7645734d29bef7f4224c72284f6bf3583287803ddd3fa94b75f784bb41762d96cd7eb0778f363e9fdbc014b52b93ea86900983553afab993cdba2c68282 SHA512 c54a783eca349652ac007075ff736d1cb53647e702ca8aa12915ae1109e5aee536591afc0b9fe0ac427e41fcf5b86d9d3f47fa5570001c84301c5cba8bca7e9a
+EBUILD libbytesize-1.4.ebuild 1224 BLAKE2B e411b8c26d017f8e3776a1e7eb10439858dc32629813d70de56f511d8da62fd51e8e093fda31c3cf7c44333ba83717515cd5b3e707862c2bf55ec47cc00fc261 SHA512 de3e7f4729b3ac3e19b459153c6ecc5ca44c166eae74298995d04ddf8c0ab026b89c4c0ec24003571ce956be1ca201ae0121608076105d1b31dbaa662f4d0cd1
+EBUILD libbytesize-2.0-r1.ebuild 1209 BLAKE2B c9db5b2424cdb0335aed6d37135c55da0b2ff54e44e436b0669b9ac4acb7ace85d4bbd4a46e1d0c17329ce43b7ef91445053b892301f3964a6c7d7321794d565 SHA512 8d0c692bc51edc912ae1fc4ac1d34fbf76e5ef97c874385435580fb9ccd8bf807573eed259fadbd9d1d995d59fb1d6746dec6af5cdd787d3d8f5ee3a102bb3a4
+MISC metadata.xml 425 BLAKE2B 445bf1e0d46e04c766c4c81c90f9acb8e8f3c1c3eeb567c3101400139a7b2ab830efcf737e30332af5dd0e50d46bdf9f583cccbfb2e50186cbb6d3f5a396f0df SHA512 24b8980240c3513229ea2e181c64b7f89597be9cd121459ad62bce935fd52a7bbc0ee4871e15899b69b477fdbaf0850d55821a6fbcf3afc30d0cb81a3eb83b65
diff --git a/dev-libs/libbytesize/libbytesize-1.4.ebuild b/dev-libs/libbytesize/libbytesize-1.4.ebuild
index a350712ffa22..3e5b0175c924 100644
--- a/dev-libs/libbytesize/libbytesize-1.4.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/storaged-project/libbytesize"
 SRC_URI="https://github.com/storaged-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="doc test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/libbytesize/libbytesize-1.3-r1.ebuild b/dev-libs/libbytesize/libbytesize-2.0-r1.ebuild
index 46301df5958b..6da71cd71480 100644
--- a/dev-libs/libbytesize/libbytesize-1.3-r1.ebuild
+++ b/dev-libs/libbytesize/libbytesize-2.0-r1.ebuild
@@ -1,42 +1,43 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit autotools python-r1
+inherit autotools python-single-r1
 
 DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
-HOMEPAGE="https://github.com/rhinstaller/libbytesize"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/storaged-project/libbytesize"
+SRC_URI="https://github.com/storaged-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
+IUSE="doc python test tools"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
-	${PYTHON_DEPS}
 	dev-libs/gmp:0=
 	dev-libs/mpfr:=
-	>=dev-libs/libpcre-8.32
+	dev-libs/libpcre2
+	python? ( ${PYTHON_DEPS} )
 "
 
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+
+BDEPEND="
 	sys-devel/gettext
 	doc? ( dev-util/gtk-doc )
 	test? (
-		dev-python/pocketlint
-		dev-python/polib
+		dev-python/pocketlint[${PYTHON_USEDEP}]
+		dev-python/polib[${PYTHON_USEDEP}]
 	)
 "
 
-RESTRICT="test"
+DOCS=( NEWS.rst README.md )
 
-pkg_setup() {
-	python_setup
-}
+RESTRICT="test"
 
 src_prepare() {
 	default
@@ -45,20 +46,15 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--without-python3 #634840
 		$(use_with doc gtk-doc)
+		$(use_with python python3)
+		$(use_with tools)
 	)
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	emake install DESTDIR="${D}"
-
-	python_install() {
-		emake -C src/python install DESTDIR="${D}"
-		python_optimize
-	}
-	python_foreach_impl python_install
-
+	default
+	use python && python_optimize
 	find "${ED}" -name "*.la*" -delete || die
 }
diff --git a/dev-libs/libbytesize/metadata.xml b/dev-libs/libbytesize/metadata.xml
index 19b3c25b5bd6..97f2d51ca8b0 100644
--- a/dev-libs/libbytesize/metadata.xml
+++ b/dev-libs/libbytesize/metadata.xml
@@ -5,6 +5,9 @@
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
+  <use>
+    <flag name="tools">Build bscalc python CLI tool</flag>
+  </use>
   <upstream>
     <remote-id type="github">rhinstaller/libbytesize</remote-id>
   </upstream>
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index a4175bc7a90f..02e12e7903af 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -4,6 +4,6 @@ DIST libebml-1.3.6.tar.xz 57764 BLAKE2B 554f9d4d162d02ba05e2b1eecd688a6c25a4c727
 DIST libebml-1.3.7.tar.xz 69460 BLAKE2B 53cb7ab3c553cc533b025bdf1953c1de33108e506900e8df0ecafa5f88bc43b0a54611c69bd169401ddea162a1e669bde0e93dc38255b8ea24d04dd41fae9599 SHA512 ad574a73a1d2c5fbd4581991ff790ef22cfcaf5645295b06dce36235b43d552bbec3b400d3c80550c8020ed3720226fad05348c6034c444da1106439c7fd9fc1
 EBUILD libebml-1.3.4.ebuild 834 BLAKE2B 11fe2d8ebf1fa93a7fd9c866a9bd556d00ce6da0553be6e39b85c61e711a8277eb3f27e212c00609cb092f16e7fb403285ad29623f7e8941a7bc7c96443becd7 SHA512 edc8bf5f0137d8fb44335b0ceb64a66c98d2eb88bde15b93f7350fdc2b80077006c5e31c8ea567b0ef6050f08789a1566ccdeafb8f6ef98e3559d344f85047b4
 EBUILD libebml-1.3.5.ebuild 833 BLAKE2B 63ffb0503ef6995d4317638ddb15d27fc3a29acc173db763fb792ffc240c9678b787f6bf6cc9e50575e47ff682d262163268a80cd3c8ae40cf5ec12dc384e778 SHA512 e4157e6a8d7b5b4c1ed559a474cb9b9511ab7eb76d8238eca97278bf694a37fa00114b0ddd881984886636e2ef65becff655374a4d91b8e66297e91e1b65852e
-EBUILD libebml-1.3.6.ebuild 628 BLAKE2B 8e0a5329ebcb9362eb25b9d4529e9d845f1a2f7b1e536866525d14d2a68765f407e95451e761bbdfe42a6a044bd45ab0c03502976200c628e7ae8bef0f412296 SHA512 c7af5f28fdb110d2992e490a9ffab2f2337aa33e1b286adf0ebe1bda5499b97e08ef1e3a3440993c2b8dbbd7bf974156d2b62c8483077229979bdee2835f64be
+EBUILD libebml-1.3.6.ebuild 627 BLAKE2B 3afb928f9737a0080d9a9dd8fa627ae9af36300aeaf6625f545f7c8ab7795fb08b07c3a0d97e57067a3de809ecec17e908e0d906408e40f77eea9a0d1041af3c SHA512 286dee2d4d9e3df77e4ad15a4cee4184540c515c8cb200997738a175a600cdf6dba71d6d5f51cc2777a08f9d2419e772f8afa6c8a7c6fff63be9e1057f3c8358
 EBUILD libebml-1.3.7.ebuild 635 BLAKE2B 5805ef9b68f9391dd868c94a44d2841283d61488e74a44ca0676d6f6fcf9f04a975cdda45f31c22cfdc428b7b90bc2ef904dee8f2a504afe9f3fee4cbe26a7c3 SHA512 7dc35d4f04ae4b0b9920bc86d765642896559352278ed5e14a3290bfb935f89297498e6a2822a7026325f4b87463aec64cfa04970ded60893dbab6e0d3dd3f77
 MISC metadata.xml 316 BLAKE2B d9c2545fc8f21819157e2c492aaf9d0af904896735cfc7899efceb4f14d56aa205a946a28cad171dd2d5e19c9e6dd7fb380d29a788d7c231e3b7120de4f8ec65 SHA512 e134cb7e80fb4da27ef695d9ac26d13850df19cd37116fd069ab33cb91a380c322c8087d50c8040ea2a776903e9bc59fd825eb65593b0c3215c316a819f0fb22
diff --git a/dev-libs/libebml/libebml-1.3.6.ebuild b/dev-libs/libebml/libebml-1.3.6.ebuild
index 1b8ed127ad85..8f2c1655d75c 100644
--- a/dev-libs/libebml/libebml-1.3.6.ebuild
+++ b/dev-libs/libebml/libebml-1.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 src_configure() {
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 9c771a287311..7f73fbe7b2c6 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -7,5 +7,5 @@ EBUILD libgpg-error-1.27-r1.ebuild 1287 BLAKE2B d8b77035b21a5d67fb35fa94c7581a1c
 EBUILD libgpg-error-1.29.ebuild 1289 BLAKE2B 0d86eb4d6815b150aa7f9514e44368af4a45ab36462e4f8d858552c7b88df9e82ca103d2f742f42e5d93ea5df9721b47f08026ba99eb9fa5c63bf27bfa80059d SHA512 6b22dbb50879e62a76df64f957a23a718177a37f610b793c09c6e08c073fd882e421ecf820a0499e77edaac7cb3095003e1ccb5b62ceddb46fa88513395284ac
 EBUILD libgpg-error-1.32-r1.ebuild 1409 BLAKE2B f0cde481c3f551321a384ed1b322255e5c8ced45edb655d744ede766ade0e930a540d9dad756da5d1107ddb52499fd102b1c4500b02064bb816948bdfe1fe9f5 SHA512 09e05389ff67906dfc1b93d57b4fe556b07ecb5b758b0567f90b5bc0c58ea4ae3aa5aef638fcec7a3baa1a1a7d0925ba1545c03342689f84c79600bbc95426c9
 EBUILD libgpg-error-1.32.ebuild 1300 BLAKE2B f7367cc13a9db8e3e671459d9dea8884633c5f401af615c28670c4902c52e9f461ad4d40b2cee61ba4aaf0b76f205ab55a32b724083a14d3762d469109894f66 SHA512 ae3d6a4c73e9ba6631a1f852278ea3a5827e81271ef90bc8cb991cd7c4b69cdf81df660ac768cd76d3a5b8010bfb7da9c7cef1421dfa1ba01138d2b03a3b0282
-EBUILD libgpg-error-1.36.ebuild 1471 BLAKE2B 0ccad737a1e5090b8eb0a03b1032ff5da63985c8992c13702a0fa7c9fc3c294ab5ebee5c0aea1fc67283c182236cea2a1653a05616a63ca4cacfa36b06bf34d9 SHA512 dee7603c50004fe57764edfa400ec8a281d8eee2523a9d8b6b26e32959d489f16d1422b794b6f329b04cf8bd76988b66e232d492498e6fda0297e3d670d272fb
+EBUILD libgpg-error-1.36.ebuild 1467 BLAKE2B bd69073fd9dca99b86d40b5f42080b8c71e2991c8ee01862513e6af34d5f7d0dd77e7a20e93ef8d755423012340b1028c5c46227d73557e0329c1d8427c2c7e1 SHA512 178530da999519eaaf9fe233fc47237bf21299a260b5f3dbd62ce45facf745fc34f701b0a0a01faff25caddc91ebd5fd0250f1dfe5f8c1fce2962c9b2e407e48
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
index ad179a9e0f90..66d4a733c915 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.36.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~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"
+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"
 IUSE="common-lisp nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index eb4fc9beb6d6..3756c431268a 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -2,7 +2,7 @@ DIST libp11-0.4.10.tar.gz 496891 BLAKE2B 219f65f68ab6dbd4bbe5893ac0d520d7e4676af
 DIST libp11-0.4.4.tar.gz 450709 BLAKE2B 4424c8dd8ee1f581c179c36b47bc03269f1c6b38bed2517a1209c8eaf2d8c2ab62da928b4cd20f1355b56dfbecbd2bd695118f7690c3eba2f5c188c6c4b5b169 SHA512 12d1e39981e62d758dc12a39c2ed5b6967a6e8c1db706c491db2c9aa0394fac278fa47dd4c64aa961e3b5ea98c1799b4ef7ef617ac076a414d88a6e29d5f0c4b
 DIST libp11-0.4.7.tar.gz 475538 BLAKE2B 81d36f0795cae00a20be935790441b46257728cc5b1d9eb16d6c5df2609a795a68e12d0dc6b34b0348107fbd8c136d27dbadc42e0bc8970d5e491529e1903091 SHA512 8142b32bee9e6763b506b93be788a4df2b28ae8cb3ad6e11fc53ba3db770d77bdcc0362661c2f906cab1b5afc2828019f3d0f0b9d898414c0d6266201b7e08e6
 DIST libp11-0.4.9.tar.gz 492083 BLAKE2B df84d9303e6e143fbfeaaf2e8d0b57f3c4cd63356b15d629ab210196611ab42e396cf7efa69392ac81dd9fd591aea5580e0b38f545bf9bad9ec4748d08da90d2 SHA512 0c4a76ee7a5d98ec144dac1de8d4f52ad2515e6c578b3ee9705ef861bc06a27477b6ec42cf1d96944844f006992aef449b579b430b2e32d367f29d1a0d82f8ee
-EBUILD libp11-0.4.10.ebuild 789 BLAKE2B 4ed184b076d4282589fb052f03ff6b039b1f0a946934bac84d8b5819ce0aa861b739f7e3ee1b9a73f2a8f90639b67ac9c3bf543fb601d3d29f54ccfb3e5eea9a SHA512 0880015f1f8de491e7ba4b33da66cebfe3e9df488165844d33ba19ed89438a56d3a0f9fbe0185c6a67fe292e2429b23add9d3503088bc153272a3284ee8536aa
+EBUILD libp11-0.4.10.ebuild 781 BLAKE2B 6985770648eba34bf70e4eedd489dcf97992c68fc9918ede4991d8ca35dbcd96ce4243b3b7d90c7188481d4981f84c1b68483e67332bde64024f766a0ddb2702 SHA512 cb99ab0be8cbef9dd8b70c561adf72eae3c4d549a6fe090e6c8af34c65230eb7dd0a8eb505e4f316181fd480baef378d9abaaad2183e3cf99ea97869456aa819
 EBUILD libp11-0.4.4.ebuild 782 BLAKE2B e2ea80c9b0a6c514806ecf69da143c3bc0f981cbff1aca891c7ca9ce1a4e36314b26a23166e8a6b0af141fb288244dae23c4e610687af39301403afc6b51f12e SHA512 6dd12ffe649c25f7320f1d5809d7b792fd3efd46725306193ed5fe92b246441e54e662fd9a2ac657c16977dffb146947f4a8a15fab2e1934711a7088ab310604
 EBUILD libp11-0.4.7.ebuild 786 BLAKE2B f44f40db44fd3455989171a60014fca0128b43741123a57c7d7418d626c716431e992809e175f6b8f6e71c2686b214991c5d6f7c793568915a4725418521f3d2 SHA512 9a934922c8731336e4b950ad9543b07e90b303d164bef57d4ff41dc99a2933e008613113a8f302d1e0a1324bc3e0d7a01590208a45428816b7a8bbfc023f92e0
 EBUILD libp11-0.4.9.ebuild 775 BLAKE2B 8605353f5a55c1e0ee467ec751bfcf5307c963f735095a9630201f230308dba02bc10837812f01d6735a912a8b7114987a452ac7980574d0985bfa4e24f6d24b SHA512 0b53c57f47b1f29d239f54f870b98fd010556b41a26d6f6213980dc3d606b5b7156eee3cf89685b361d546fbeb16fa67ec9f9af8db6886af310e7727bc31e802
diff --git a/dev-libs/libp11/libp11-0.4.10.ebuild b/dev-libs/libp11/libp11-0.4.10.ebuild
index b0fc86145a31..1dbbb76d9c31 100644
--- a/dev-libs/libp11/libp11-0.4.10.ebuild
+++ b/dev-libs/libp11/libp11-0.4.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="libressl bindist doc static-libs"
 
 RDEPEND="
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index f4edb77e109f..af18fdaf4556 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,7 +1,5 @@
-DIST pcre2-10.30.tar.bz2 1583543 BLAKE2B bd9369f3c81bf0d154aaf3d111b934835af25068051f9bcafc0d4b00376011ff7a4acfac127ee10efe6094021163a07a073076d9d769eff68823fd8d1041cd1f SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e
 DIST pcre2-10.32.tar.bz2 1641814 BLAKE2B fdd512312547ae90b36b6c9eb86b6fcfea9b03fcfd9766063c901819c6bf7536e1f3da89bd69ae62309069bc07c705e96e81f4a36355bf934c566f343e3104e4 SHA512 3d712e7d6afbaef227952680ded69fadbdec0b1abdfcac17cf071415c3c93edd152d6d268dec80570aedf24f82ba954f74f5f9e62c9b9991be75080a3d6ab5fe
 DIST pcre2-10.33.tar.bz2 1690739 BLAKE2B e59cf47a5068b2ec2d647d6dfe1cb5f8d6cdcc6fc6b47aa65a4c3d5aae256e7f0b090487d372c62aa7ec7f15a1f037650088b53385fc2fe31aa405878855e5d5 SHA512 c6aa52cdbb0c906b02e9a9f255697a1b9b99d9c7dccdaa484ffdb04fe3582d232ba3cb3c421d6df589a387b415dedb0817f58ec5391488b25b4e7bd9da6bab8f
-EBUILD libpcre2-10.30.ebuild 2324 BLAKE2B 1f25bfa72b1418ebee600d5a278a9882fd70064834e3b53eab8ae968429ad75a832854ae144773d1093700792b6e870357bbe2859e91dc1a58beff1333060b2b SHA512 3d7523986e2999cf9ab0263f2b9089ec4a92ccbe174a4dddef9fac17c6a91ddd27e6db529c2bc62afce5cfd784c00fa63e21b3e82646290be2c4a05f2d4dd522
-EBUILD libpcre2-10.32.ebuild 2349 BLAKE2B 788d2d01d79b750425099f283ee1fc0bb8545b7269bf36933c99061dc54fd7dbdf2c16b93ef80ad2072957061c4413aaff268598f809fb55875d74e73aa57555 SHA512 807fa4305c6da7e342cd801440f69b5322fd9549bfdc3498b465bda1c724d6e2fa3c183c7cbdcdfbb4a63cfbded74dc9e06355d019b41e6cc89e28b9858f9e0f
+EBUILD libpcre2-10.32.ebuild 2346 BLAKE2B 55d754a0ad126bd3ebb293cba7d0c6c5c67723b714b2b808887b9e938f3b8146ec0b9ef8eaa20794961c4fa9a16ba7d4f9fe99d6448f373cdf70df742553c119 SHA512 75b45539e39411b5ca7ce825f8669dda596b49f057b7e1317b75cc06292155150bd46b49712999db22e3c651e9f7695ef1cda7d381b7b34fc35a96dd80b8281b
 EBUILD libpcre2-10.33.ebuild 2359 BLAKE2B 6c6d62c1b08530e1e2a364f5e62d7f4c3581e9d113865cdd6c6655bfe044e5960bd748f37fb8b546cefe45c2da3e1ee0a074224297774f7ec5ed1f1c3f1f3602 SHA512 c64db13b39127e2e0bb3b757597591a2af28e8c7614df71843623a5fc945d58029cadedbbf18181f8bd63e9ee2ef4ee6613c193731697d8d18bd1d2a092a33cc
 MISC metadata.xml 1228 BLAKE2B da9f4403aa5618f793335621cecafefc6c3a475f7339884fdebe661002cf724e0b27d49270ce4dd4092bf9fe00371c53798988d28376475f630c965e7fbd1c09 SHA512 33c0cbcd3fd188d2c594cda3e8aa100a1528f40af2aad398c6371cf01c639b54d0cca52adf15a123fc036738031729f2950b8409b91b40240211ec7e9fbb80a8
diff --git a/dev-libs/libpcre2/libpcre2-10.30.ebuild b/dev-libs/libpcre2/libpcre2-10.30.ebuild
deleted file mode 100644
index 1f39038c4324..000000000000
--- a/dev-libs/libpcre2/libpcre2-10.30.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic libtool ltprune multilib-minimal toolchain-funcs
-
-DESCRIPTION="Perl-compatible regular expression library"
-HOMEPAGE="http://www.pcre.org/"
-MY_P="pcre2-${PV/_rc/-RC}"
-if [[ ${PV} != *_rc* ]] ; then
-	# Only the final releases are available here.
-	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
-		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
-else
-	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
-fi
-
-LICENSE="BSD"
-SLOT="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"
-IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
-REQUIRED_USE="?? ( libedit readline )"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	libedit? ( dev-libs/libedit )
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pcre2-config
-)
-
-src_prepare() {
-	default
-
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-pcre2-8
-		--enable-shared
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
-		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
-		$(multilib_native_use_enable libedit pcre2test-libedit)
-		$(multilib_native_use_enable readline pcre2test-libreadline)
-		$(multilib_native_use_enable zlib pcre2grep-libz)
-		$(use_enable jit)
-		$(use_enable jit pcre2grep-jit)
-		$(use_enable pcre16 pcre2-16)
-		$(use_enable pcre32 pcre2-32)
-		$(use_enable static-libs static)
-		$(use_enable unicode)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
-		install
-	multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-}
diff --git a/dev-libs/libpcre2/libpcre2-10.32.ebuild b/dev-libs/libpcre2/libpcre2-10.32.ebuild
index 086f9eb1d349..2f727e0827a6 100644
--- a/dev-libs/libpcre2/libpcre2-10.32.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.32.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 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 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="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 918a6bda0e2f..b39e18306b12 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,7 +1,8 @@
+AUX librdkafka-1.0.0-remove-automagic-on-zstd.patch 967 BLAKE2B 1df3c82dab189ab781ef848966561e87564e8878b7c69873792b2b6eaff963a132da8b248eb2796def6e78d8f7246136d3845374af6ad9d3ab3bb9c68ae876cc SHA512 0e01db881e7bd458837de5b4e1fb7ee97ac2dfdc0b163594ca4bc50b82e803acb18c5b768b359288c30fd2cd0a06b830858386c7175bd9028a23a9f959c1c77d
 DIST librdkafka-0.11.5.tar.gz 1984510 BLAKE2B 55a27482275726233b5c9b39dfac1b9f34235c68600b5720c1a9dec782de6a4d7d084ad71e50857c32a93b39beacc891933e02f45162d0de144ecaadb3640c41 SHA512 4a8dc46ad66f23cff4d4ef2fc8daa7207bfa3e77fd3580b3f141a73b449e60ea5381e97263235b4d0d762df027a8a2cad08637d88162d9605c82d74a1e64b67c
 DIST librdkafka-0.11.6.tar.gz 1994337 BLAKE2B 7b61e6ba02c5ed58c20e604d6765f6a57ff63ab0c61f2a4c64eff55bfb6c854ef089ac9eea9acc6d44b6abdb6d1425ff23e9d4e6037c733bc5719d6b69c74ae0 SHA512 9657dc53220bbff3eb44941cff2f50ab7f71a82f7486d64ea14f67eabd4abe8c67f225a752cc1f0339439a1cc512e99ade6536d087857979cd198c0102015718
 DIST librdkafka-1.0.0.tar.gz 2465603 BLAKE2B 7006dc421ae5c2c991853f4ede9d99e7dd308b49372a7c2c859ecc0e6ee7aa3b6cda9af7a71a5813610630b564bd65c6cf18ecaefd1a1880545838d7758aea88 SHA512 15ac1e4c9042debf8d4df602ccdc5eccae3a37b305be24d724fcaffc3d1d0aafa708fc8e29d6af51f51ed6c7daf74b3041b8b9b0444e6702cd73479c8078859a
 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.ebuild 1253 BLAKE2B a50b3eb6357710f87257ae6b183cc6e9eb55803712f22ffaacdf75ebb2eefff252df13498e3510dd0acad8b378feaea9aaca57d6c111f427d93000c8e4da6aad SHA512 a81ea699cc281d726a5236273e2aa045693cc02e4251f6647ab56f21ea08a87be0995eb2a99cd2c40de473e1e0d48da62997f43297a9c087aef3e2d463a4e740
+EBUILD librdkafka-1.0.0-r1.ebuild 1369 BLAKE2B 0217f4996dd3904f871ccd0fbb300f681c1f2cdb9c4d08bcfb494ea99b15828c35712cd635c371daa776ec8f8dfa07dd70f4f678827393e9c45d3731e321ed70 SHA512 af7fd02a7f5c56b903c57f2f986a417ed9b31c956afb201b2c0523a452c1fced34359722e88d34e06203c1941101c0fdf56c4768397cd37432edfb309a13ba8b
 MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/files/librdkafka-1.0.0-remove-automagic-on-zstd.patch b/dev-libs/librdkafka/files/librdkafka-1.0.0-remove-automagic-on-zstd.patch
new file mode 100644
index 000000000000..ed4dbda6b8ab
--- /dev/null
+++ b/dev-libs/librdkafka/files/librdkafka-1.0.0-remove-automagic-on-zstd.patch
@@ -0,0 +1,29 @@
+commit ff67402dcfb2f4913a3ff1d84449a5e1620ee4ae
+Author:     Thomas Deutschmann <whissi@gentoo.org>
+AuthorDate: Mon Apr 29 18:57:10 2019 +0200
+Commit:     Thomas Deutschmann <whissi@gentoo.org>
+CommitDate: Mon Apr 29 18:57:10 2019 +0200
+
+    configure: Add option to disable automagic dependency on zstd
+    
+    This commit will add an option which will allow you to explicit disable
+    zstd usage.
+
+diff --git a/mklove/modules/configure.zstd b/mklove/modules/configure.zstd
+index 6dd621ad..3ea36ccf 100644
+--- a/mklove/modules/configure.zstd
++++ b/mklove/modules/configure.zstd
+@@ -9,8 +9,12 @@
+ #   mkl_check zstd [<action>]
+ #
+ 
++mkl_toggle_option "Feature" ENABLE_ZSTD "--enable-zstd" "Enable support for ZSTD compression" "y"
++
+ function manual_checks {
+-    local action=$1
++    local action=${1:-disable}
++
++    [[ $ENABLE_ZSTD == y ]] || return 0
+ 
+     if [[ $WITH_STATIC_LINKING != y ]]; then
+         # Homebrew does not provide a static library for zstd
diff --git a/dev-libs/librdkafka/librdkafka-1.0.0.ebuild b/dev-libs/librdkafka/librdkafka-1.0.0-r1.ebuild
index 1ba0f2d7c09a..fa9a0fd5d556 100644
--- a/dev-libs/librdkafka/librdkafka-1.0.0.ebuild
+++ b/dev-libs/librdkafka/librdkafka-1.0.0-r1.ebuild
@@ -22,12 +22,13 @@ LICENSE="BSD-2"
 # subslot = soname version
 SLOT="0/1"
 
-IUSE="lz4 sasl ssl static-libs"
+IUSE="lz4 sasl ssl static-libs zstd"
 
 RDEPEND="
 	lz4? ( app-arch/lz4:=[static-libs(-)?] )
 	sasl? ( dev-libs/cyrus-sasl:= )
 	ssl? ( dev-libs/openssl:0= )
+	zstd? ( app-arch/zstd:= )
 	sys-libs/zlib
 "
 
@@ -36,6 +37,8 @@ DEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}"/${P}-remove-automagic-on-zstd.patch )
+
 src_configure() {
 	tc-export CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
 
@@ -47,6 +50,7 @@ src_configure() {
 		$(use_enable sasl)
 		$(usex static-libs '--enable-static' '')
 		$(use_enable ssl)
+		$(use_enable zstd)
 	)
 
 	econf ${myeconf[@]}
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 75b70d4c8974..21f9b002aa26 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -3,6 +3,6 @@ DIST librelp-1.2.18.tar.gz 506766 BLAKE2B 939bd2279e03a6431fbdfb787aa3d62b3f622e
 DIST librelp-1.3.0.tar.gz 514470 BLAKE2B 3e8d844d3cccd4c148036191f376ba49b3851a2c7e95361bb31a1a172ca0813caa96eb3753b2285a2547c85e073de3237a749bc64fc0fead69ab170656dcb200 SHA512 6e60398c68a78f4b4202a697e144f1516ff3bbb32192f745b52c77d107954febf8cb31d2e166efa96c00122f6807860ecd01084f1d3d4005336f2cb75e6461c9
 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 1484 BLAKE2B b5d30a4c855d15a8bd97c4f7b38eff9260bca1e95d45acbce9872d05541f72299dbfe7037d6648c0e5ba9d9a1b0e9536a6a0b7e6965d987df2470e31e5aadaa5 SHA512 3738e576b78f27e9a247f65ac1f9e0efe5a0872a579e91f901e7c085f07f1835f9cfb34282f0f577e9608cccf4b0decc26cdfbb1cefcd95799562c33f75a37d3
+EBUILD librelp-1.3.0.ebuild 1483 BLAKE2B 668859d6c0a0604e5bf7171b4801b6b8e678379e04b5fd6ae95620dda676905bc320e82b9212b0a6baa5f15ee920625695eddc2c8a1d2575ab1c3439cecf24a5 SHA512 11dbb4bc5b1a0495753b2c264d1b5094903d93acabef402c4022f523666b80862f0a277acc39a0c27fdc2b36ee89d2d964420e3edb8642fd031c4b97f13f1acb
 EBUILD librelp-1.4.0.ebuild 1416 BLAKE2B d5dab6b78144a75436905421f7f75c211569411b837d6960e560c12d55697db1a00aab77f28d66cb1f211a8aac25b792e71aba4883f6efbc8b4ed22d6bdebea7 SHA512 01e885fb4d736790f6ef945e2ef6bb259ceca3d05b91fe6c986e4993dacacc4df49f422befd783996ae7f35ba2ea64b5d3ae3face70824479bfc232e9f373123
 MISC metadata.xml 503 BLAKE2B 987b40e4f9b5e33e1f293023237b7d0cb614ea36113d6d5becb780fddc729a2a2a033cab8e41b64a0465d0f14e220c96787e30b7b133979e36ad86a1273ad0a8 SHA512 31f5e4ece41aab561a70c7b9af6119bce8c3cb7fb6720be754dd925ee656faa75ee953cd3d296d1b8bb5f48368d015ec5d2768d217b349f1689e767424786e3a
diff --git a/dev-libs/librelp/librelp-1.3.0.ebuild b/dev-libs/librelp/librelp-1.3.0.ebuild
index b5359490d5fc..9ce8c653d49f 100644
--- a/dev-libs/librelp/librelp-1.3.0.ebuild
+++ b/dev-libs/librelp/librelp-1.3.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.4.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/nettle/Manifest b/dev-libs/nettle/Manifest
index a2cc2fe851d6..7eec9f2b2e79 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,6 +1,4 @@
 AUX nettle-3.4.1-build.patch 1598 BLAKE2B ce10cb8a59bf8e2d1dea57ceff5bb2fcf2da1320034672abed770fcce54466704a6b3820a135d04d2d52881cb0d701bdd252d388bcc1ddd80b508fb3828cd237 SHA512 6b95ec112471895d3fb7c7c2c82517d113c0da604285f19b4d14ef3e4bfda6b5d32b869b97a0510c8a9f8c5828c410d99d67bba09f57a14115a6a7ed0d677b3a
 DIST nettle-3.4.1.tar.gz 1947053 BLAKE2B 354318c46c28aeaaca611abe70298024ec12ff70aed53c741e43c1b5373361e5cffb03df7b8e86ef103a3b7770b2b4fe39fbca00b128f2b7ec810b3a4d9fd0fd SHA512 26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f
-DIST nettle-3.4.tar.gz 1935069 BLAKE2B b73c88236c8233360607a6ed65cd4f6d19bfbbf683b46149326ce3440bf0a42b8add69de5c64145720163b1095fdab3cb8bf410c2ef727d0ea4fb58391ff0f14 SHA512 3bea3aabd2c99cc42d084a94fd6b0b5dbdb24cd6c7020271a6ee87a81a904b21b21756f590cb1afdf2e85fd1cb59e5c3651c5c4032e30204e7ea6f8801d1ea3b
-EBUILD nettle-3.4.1.ebuild 1780 BLAKE2B 752989f3fea0065cc8d639b7e4efad7de8dd9c0cb12429aa3bf76a6c1a75a24f2bbc64b348b68a24a5b63b1690cb2b87d6e9e8c5617702a330a679e116a24d03 SHA512 4c1b5c661e55903540ee6394831b9dbf1c90e413a70eabfc22fa597df24c2acd29eadbddceac3ac9dc801a681e1f42efd9d857e59f3dbb0776d5ae4854af1d89
-EBUILD nettle-3.4.ebuild 1725 BLAKE2B 71eb0b92783f817ab7eeb4c0a29445e65a56b9cb6cc07a7269c3401c34f605bb49589aa999c4e2a35330b4b4dc4a324cd2c860bfcf0164a79118330b40a1160b SHA512 dcfd2513e10dc106274500d3531b1b629ded8ac9c85d37ee5c150a32f2507fc1045d269b394d91b508a991525f271637048937a4ddf9a58613b35dbbfddb32f4
+EBUILD nettle-3.4.1.ebuild 1780 BLAKE2B d87fc76b12f91bf546406b9276405d270b3ceacb51a708a3cd3f0c4ea7ed598511b6d51d1261c0bacea99f76b84fcf635e37f8d95c5bde59f3175ce704883d54 SHA512 f6fb9e7aee2c66f014f1339df35436e91d00033a59d3063077764b6e468e187f909e7bfdce4c4880937c4dbc7cbf5206c8dce56d4fa1f6afea4770c44e8b7261
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/nettle/nettle-3.4.1.ebuild b/dev-libs/nettle/nettle-3.4.1.ebuild
index 0c477712dd3b..9dfa69caef38 100644
--- a/dev-libs/nettle/nettle-3.4.1.ebuild
+++ b/dev-libs/nettle/nettle-3.4.1.ebuild
@@ -14,7 +14,7 @@ SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 th
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~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="doc +gmp neon static-libs test cpu_flags_x86_aes"
 
-DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[static-libs=,${MULTILIB_USEDEP}] )"
+DEPEND="gmp? ( >=dev-libs/gmp-6.0:0=[static-libs?,${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}"
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/dev-libs/nettle/nettle-3.4.ebuild b/dev-libs/nettle/nettle-3.4.ebuild
deleted file mode 100644
index 40a536e8736b..000000000000
--- a/dev-libs/nettle/nettle-3.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-build multilib-minimal multilib toolchain-funcs
-
-DESCRIPTION="Low-level cryptographic library"
-HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-3 LGPL-2.1 )"
-SLOT="0/6.2" # subslot = libnettle soname version, .2 as broke ABI bug#601512 then fixed
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~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="doc +gmp neon static-libs test cpu_flags_x86_aes"
-
-DEPEND="gmp? ( >=dev-libs/gmp-5.0:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/nettle/nettle-stdint.h
-	/usr/include/nettle/version.h
-)
-
-DOCS=()
-HTML_DOCS=()
-
-pkg_setup() {
-	use doc && DOCS+=(
-		nettle.pdf
-	)
-	use doc && HTML_DOCS+=(
-		nettle.html
-	)
-}
-
-src_prepare() {
-	default
-
-	sed -e '/CFLAGS=/s: -ggdb3::' \
-		-e 's/solaris\*)/sunldsolaris*)/' \
-		-i configure.ac || die
-
-	# conditionally build tests and examples required by tests
-	use test || sed -i '/SUBDIRS/s/testsuite examples//' Makefile.in || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# --disable-openssl bug #427526
-	ECONF_SOURCE="${S}" econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--disable-openssl \
-		--disable-fat \
-		$(use_enable gmp public-key) \
-		$(use_enable static-libs static) \
-		$(tc-is-static-only && echo --disable-shared) \
-		$(use_enable doc documentation) \
-		$(use_enable neon arm-neon) \
-		$(use_enable cpu_flags_x86_aes x86-aesni)
-}
diff --git a/dev-libs/nsync/Manifest b/dev-libs/nsync/Manifest
index d6bbf9bc94ff..742b2bb90e17 100644
--- a/dev-libs/nsync/Manifest
+++ b/dev-libs/nsync/Manifest
@@ -1,3 +1,3 @@
 DIST nsync-1.20.1.tar.gz 154106 BLAKE2B 94eeb647de2ca58a3f3837119ef30805f0a72a9d12c19aa705f815955723ddefa1de4d2a3fe5fd0b227ffdd70d5208ab9a300e40b2aff2591a1cef28c79b450a SHA512 d7b9be1052b7d11d896d3fade822f7b1eebbd0a772c9f6e2cd827921f1adc29ed18f7587ebc7d29623d230be384a7a2356c1da3abd53567fc934979d89c70e0c
-EBUILD nsync-1.20.1.ebuild 578 BLAKE2B 01cef8c2bab0f07674742c7df195f081039cf8d761af8cab290587abfd38206239efa1a49f80524cca6371a7a36d9217792b87439eafff017d06fc653a9a0c47 SHA512 0a565f3e9e5dbb71af7cb50d77b18e25230a4c7975466214b9c5d4debbf1a1bd1d5e008f68733e0e622fbb8aeba7ed9d7d575afdda5e88675b0b756398aac5ac
+EBUILD nsync-1.20.1.ebuild 573 BLAKE2B 9eb352d16dc6532682346b492cda68225b53f7ed92227bc62db477a4bd1b6efb48d0f26335bd77e365b70f91cb2cfe7308203a5f965fefde08b717d605eae09f SHA512 252e9e8a0820d873945374c1d36e8df1bccc1a21ffdf46fe62105a17783fc5beb35782c5e990799e9b9208d7de4b952d25b07d33e21c0c8fb1553b4ad0948a87
 MISC metadata.xml 384 BLAKE2B 62c11261ccb01d4913cd84ed44abed5a2ae13d362c755db7102cb412ff9c4b55c4dec5e9a5b71ac970cd83e676d2a806d20d9b5cd7f63e1051b898927b064bd2 SHA512 83954282b0ca2a61a49222fef2e018057b7d02c4d68bd826a81a96bfcb4371e60c8c90a4c792607b337885154fcad49db872351c3ec27266631bb955ede097cf
diff --git a/dev-libs/nsync/nsync-1.20.1.ebuild b/dev-libs/nsync/nsync-1.20.1.ebuild
index 14e0c84223c0..cd34bebab49d 100644
--- a/dev-libs/nsync/nsync-1.20.1.ebuild
+++ b/dev-libs/nsync/nsync-1.20.1.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/nsync/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DOCS=( README )
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
new file mode 100644
index 000000000000..e0a1c75f90f4
--- /dev/null
+++ b/dev-libs/opencl-clang/Manifest
@@ -0,0 +1,4 @@
+AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
+DIST opencl-clang-8.0.0.tar.gz 40789 BLAKE2B baa559e90bf7f57cc59942c279b0488e306c7fd481582b213707d1cf0382f717965cd0fc7278e9c5a359847cead097243509a0730cd38f70fbbb2586c3145265 SHA512 4a353e2b28d54671be0eea00536c05093d358dec9950ea5b0732c8f46dd03bc29884487fb88f762f2c20311b928496c3b5729a8c6a72a7ce9caf30b23895340f
+EBUILD opencl-clang-8.0.0.ebuild 794 BLAKE2B 83c4637eccfdf8133fcffe8b3aff6be4472aa9f4f08ef4eb2ff0bd818542eadf61aa0ccdf44a5a1230064b23b5d05159f7e0ef79c6f5e67aec4b10935f61b36f SHA512 092b54fff58beaa14daa3701b87381e8cda45d19334185be4fda1bab8175f1d5be81511397e268c7f2cd49aee682ea65980fd97bc4feec94e0f14a5d95c550d9
+MISC metadata.xml 329 BLAKE2B d50cf1fac225c2240bd4af19962089d9b7446549d9cc7067d860218e76013acfbc65f40abfffded01c098b06dd4c8a5688c94e40710ecdf6e7db71e05816498d SHA512 de4a3177f7091c00cd54f5eb52d8d88ae88d207ca72acd71c824220593d27ebdbf3673459ab48440373af19eb88603a5fcdd5956597d816927c9663be177eccb
diff --git a/dev-libs/opencl-clang/files/opencl-clang-8.0.0-clang_library_dir.patch b/dev-libs/opencl-clang/files/opencl-clang-8.0.0-clang_library_dir.patch
new file mode 100644
index 000000000000..54ca2510004b
--- /dev/null
+++ b/dev-libs/opencl-clang/files/opencl-clang-8.0.0-clang_library_dir.patch
@@ -0,0 +1,11 @@
+--- a/cl_headers/CMakeLists.txt
++++ b/cl_headers/CMakeLists.txt
+@@ -13,7 +13,7 @@
+ 
+ if(USE_PREBUILT_LLVM)
+     set(OPENCL_HEADERS_DIR
+-      "${LLVM_LIBRARY_DIRS}/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/")
++      "${CLANG_LIBRARY_DIRS}/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include/")
+ else(USE_PREBUILT_LLVM)
+     set(OPENCL_HEADERS_DIR "${CLANG_SOURCE_DIR}/lib/Headers")
+ endif(USE_PREBUILT_LLVM)
diff --git a/dev-libs/opencl-clang/metadata.xml b/dev-libs/opencl-clang/metadata.xml
new file mode 100644
index 000000000000..b4f521584bbd
--- /dev/null
+++ b/dev-libs/opencl-clang/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">intel/opencl-clang</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/dev-libs/opencl-clang/opencl-clang-8.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-8.0.0.ebuild
new file mode 100644
index 000000000000..119d5523a020
--- /dev/null
+++ b/dev-libs/opencl-clang/opencl-clang-8.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib llvm
+
+DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
+HOMEPAGE="https://github.com/intel/opencl-clang"
+SRC_URI="https://github.com/intel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="8"
+KEYWORDS="~amd64"
+
+COMMON="sys-devel/clang:8=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}
+	dev-util/spirv-llvm-translator:8=[${MULTILIB_USEDEP}]
+	dev-vcs/git"
+RDEPEND="${COMMON}"
+
+LLVM_MAX_SLOT=8
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index b0a5cb7893d1..b1bf41fd6a28 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,3 +1,6 @@
+AUX uriparser-0.9.3-tests.patch 724 BLAKE2B de0681eaa68e4d846853d58804646c2a528f9a2be9bf317111d4b54521fa07fb6834df375c512c8bfa2b48832591706c01beedead9f1e199df5df3526606a205 SHA512 bde6f137503540dcc8a84eba2f97b8c21244d1d0dbf132b9bea07430e615804c4ad639663497955dc97e6bb8292bf2f1ac87b349dbbfc04f6230ce82b8077c17
 DIST uriparser-0.9.1.tar.bz2 372722 BLAKE2B 6fe21d1f5a98564f3e08094b1e27a13ea00baff3c4e09645236d8b08cba5455d49862a2d66fec02057efbb3b3d2e36040aeab31630f516eedd1ef36c84211638 SHA512 c6a4f3b737d4c53ba14148a5be363d93947c8c32755b369726ccdd6e01e8a2293d2c94d448700fc97bb56092696b67965646ae07c9ef31be253e2279d0bc3821
+DIST uriparser-0.9.3.tar.bz2 173073 BLAKE2B daf4d4ef2801850b8b4b3622ec195c7bfdc105cca085ea4a9d3ed9427bf7cf2eedcce4954b679a0ed1a79b7c57c98a1998b0cac27bd2b1de540aa79fdd4b160d SHA512 424419ea7b5f945b37ea06091d59e731c6a7ee76e7998f8a4e598036b3de8b593d62d1af6c6ddc7c31b43fc6795d4a5fa8d50da2508ca19de100a2222106fa3e
 EBUILD uriparser-0.9.1.ebuild 948 BLAKE2B ab6519668f0707732161e4a9c9eb6bc00c9ce90cdc6ed8b5bef1c71b784188a670abdde1a5fd921dfad8a72b26c9c5d8180e4c98bc25bf3c0e730810c983515f SHA512 9e999afb83368a25e17ffc8feed3307837673581b715ac41743ae42da77540704e7ac51f4e441f452553edcc42b2aa9bf7f8f787fe2ba988aacec49039878cdc
+EBUILD uriparser-0.9.3.ebuild 1183 BLAKE2B 5f71c34077aae2d1959bf1ffc5318b7f4bccc00f3ac1f1e309884c45dc7d2cc6ad1bcbac28f2614777f2aaa8e0c531ff94c15ec83ace8eed2b2584b34bbad4ae SHA512 1b3c13d727538086f1afab9f8d3b2246794ea44e399f291fafc91623e575dd07935e039156556d7821b5025e6de13bc40b31cd6724b1d2d0b5ecd8ae8758f34a
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/files/uriparser-0.9.3-tests.patch b/dev-libs/uriparser/files/uriparser-0.9.3-tests.patch
new file mode 100644
index 000000000000..ad6f1c1311d7
--- /dev/null
+++ b/dev-libs/uriparser/files/uriparser-0.9.3-tests.patch
@@ -0,0 +1,23 @@
+From f870e6c68696a6018702caa5c8a2feba9b0f99fa Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 28 Apr 2019 17:35:31 +0200
+Subject: [PATCH] tests: No longer crash when compiled with -DNDEBUG (fixes
+ #67)
+
+---
+ test/MemoryManagerSuite.cpp | 2 ++
+ 1 files changed, 2 insertions(+)
+
+diff --git a/test/MemoryManagerSuite.cpp b/test/MemoryManagerSuite.cpp
+index 85f498b..4cda664 100644
+--- a/test/MemoryManagerSuite.cpp
++++ b/test/MemoryManagerSuite.cpp
+@@ -19,6 +19,8 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#undef NDEBUG  // because we rely on assert(3) further down
++
+ #include <cassert>
+ #include <cerrno>
+ #include <cstring>  // memcpy
diff --git a/dev-libs/uriparser/uriparser-0.9.3.ebuild b/dev-libs/uriparser/uriparser-0.9.3.ebuild
new file mode 100644
index 000000000000..0c33c807ef45
--- /dev/null
+++ b/dev-libs/uriparser/uriparser-0.9.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
+HOMEPAGE="https://uriparser.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc qt5 test unicode"
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig
+	doc? ( >=app-doc/doxygen-1.5.8
+		qt5? ( dev-qt/qthelp:5 ) )
+	test? ( >=dev-cpp/gtest-1.8.1 )"
+
+REQUIRED_USE="test? ( unicode )"
+
+DOCS=( AUTHORS ChangeLog THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tests.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DURIPARSER_BUILD_CHAR=ON
+		-DURIPARSER_BUILD_DOCS=$(usex doc ON OFF)
+		-DURIPARSER_BUILD_TESTS=$(usex test ON OFF)
+		-DURIPARSER_BUILD_TOOLS=ON
+		-DURIPARSER_BUILD_WCHAR_T=$(usex unicode ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc && use qt5; then
+		dodoc "${BUILD_DIR}"/doc/*.qch
+		docompress -x /usr/share/doc/${PF}/${P}.qch
+	fi
+}
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index f91ac2b501a4..270b559015b9 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -2,6 +2,6 @@ AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f
 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
 DIST weston-6.0.0.tar.xz 1517032 BLAKE2B 598c525598f877715320d8b468618595d1f7b10ed56aa82c3535b05c369216d1a938d32354e3a8cc9077a0d910d0dbfdcf504fb687c73942d8ad92b13a124bd2 SHA512 127ab64b689f202acca4d9461e4decfd42357e4bbb63493af257b3b20b693a8ab4207b3c6b97663cefeed200505aad5f32b6a064db2e53fa1e201877613b394f
 EBUILD weston-3.0.0.ebuild 3498 BLAKE2B 066de40c7595bd86c63143e8dcc1b56991b09b23755530247f38ac2a35ceb94f16329e46ded39f0e9d4135fac47e9127477afc124c119f48d220c09022ac0bb8 SHA512 e3ef428c5f03621f8860463c69d7a124e7f16f6e92523d9e309dcb623b75f9c41c73268a54579e1c3849e1100aad534f289fd0e3465dfcd9d02b846695ac5237
-EBUILD weston-6.0.0.ebuild 3543 BLAKE2B 1e7bdf2b6d5056153d3602a3bfcb928d384f2ed7056976bee50cdbb286a1c99f0e8ed86b5ea038566189ef463e2d2075f733bcfa3cd4885cf9a39eff3096a188 SHA512 4fd1905c335608e78577b1d591cd8d6fba746622d8e1fc1a55c47533b65402b65b9727f0fa536bfead814b990230b084d4284ef194d045c609c0b9a007398982
-EBUILD weston-9999.ebuild 3441 BLAKE2B 62f4dfc7282bec3ab49f9b0b63c34ba63b8dbfaefee8a810c34fb7ccb1643aa8619170165eeb5726f33313c36592289342aa44265c6a0470ce3d5d2b8b8e2f71 SHA512 ae3112486214afc8f197d17769136db5fbc825589e17ce18855c554c2e056ff4133e159fb209df554852a71c9fa11594551b47d5c063c3a4c28d5b7cfbf3753e
+EBUILD weston-6.0.0.ebuild 3561 BLAKE2B 30743028f046b73951f12a86e6ed851664dc03568ce96c7646f286055c4b133b7ea55db5e8d1c9f9aac246a64844c52a76ffd12804d16ccddcbd663bf61ca6fc SHA512 39ee9294db7dac2426c44198ec0082bb82b4ea43c207ca3b15f5564724d929be0094558b0e11f6ad2526429a41cb5da94417aa693dacf3c156a522cee0f2c782
+EBUILD weston-9999.ebuild 3459 BLAKE2B bf9283cd35cd4dfa0fc973a4ef9b51e6ee71334b0a70c2324f66180cfe1b77feb774a12e5c019491e3b98c3506ec8031bb274ebf0902a38475e6608c71d4b024 SHA512 5ce39169a79587c55b450a999be5366ccb736a4b6168a70092c627c8729dd84b0dbdc0f283835adaeed5a6cd322965d1347b2df35c231c7b15e05d079a6e7567
 MISC metadata.xml 1476 BLAKE2B cc010d7358f64a0fc6eb9b886410a84fb80cf7c097231032e10efce10d827a74e238547b78325aa3b0c9a580a8d6dfcdbbe5f857c3e78939e20d5d14933250ee SHA512 1c89115a2e7e3f612159e642a898c2351718aeb90cd446f6f619c4002d5231c76b9f288a20f393110ddca4ce57b45c70e40a49646dab47111b1d45fdf2e8810e
diff --git a/dev-libs/weston/weston-6.0.0.ebuild b/dev-libs/weston/weston-6.0.0.ebuild
index e919840d917e..a223d8efcb1c 100644
--- a/dev-libs/weston/weston-6.0.0.ebuild
+++ b/dev-libs/weston/weston-6.0.0.ebuild
@@ -28,6 +28,7 @@ SLOT="0"
 IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
 
 REQUIRED_USE="
+	colord? ( lcms )
 	drm? ( gles2 )
 	screen-sharing? ( rdp )
 	test? ( desktop headless xwayland )
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 519399706138..282ba475de41 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -28,6 +28,7 @@ SLOT="0"
 IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
 
 REQUIRED_USE="
+	colord? ( lcms )
 	drm? ( gles2 )
 	screen-sharing? ( rdp )
 	test? ( desktop headless xwayland )
diff --git a/dev-libs/wlc/Manifest b/dev-libs/wlc/Manifest
index e45c456a9122..b4400d60ce9a 100644
--- a/dev-libs/wlc/Manifest
+++ b/dev-libs/wlc/Manifest
@@ -3,4 +3,4 @@ DIST wlc-0.0.11.tar.bz2 247642 BLAKE2B 705b60eb96951e64a0f47bd5091cddb4d6bdea955
 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 636 BLAKE2B 05622d8580d177d4ec21689ab81e35e18b32e53d6c1fdbcc9ae5304cfa8321bdf67784264b4a2d7110d85ef049c29ba15ee0b4295d55e24d2168b19f44e1ebf2 SHA512 c798e4255d18059e8fe7bb14d63daf9373e543ec626a95fe56edb643c58d315989b4aff1660711d4b3ae93bc80d6dae27831bd6d97a381acfbc096a94dcf8df2
+MISC metadata.xml 751 BLAKE2B 5e798ddaaefb86272efa9653ff96267412bc6fa0a9d49b6ae895079f90f0d5a125dcea3f43e7830d57a738fa5efa0727b5783b552193661ff7f263ae9a102ced SHA512 c53002499d04a0d0b4cb30178662e522f4d6a5832dad5f8e1dea8aca88766488561f4d67d912763ba3fff9c3491db4cf44ddeced08d0f0fdd2636827dcf0352a
diff --git a/dev-libs/wlc/metadata.xml b/dev-libs/wlc/metadata.xml
index acd5c4be487e..4d7e16aaf19f 100644
--- a/dev-libs/wlc/metadata.xml
+++ b/dev-libs/wlc/metadata.xml
@@ -2,6 +2,10 @@
 <!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>
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index c4d500787327..d1169f936bfb 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,9 +1,7 @@
 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.26.tar.gz 1922183 BLAKE2B 8cb8557a7d24df756655a7dfa45091445adc89cb67169a7620d9d1116f3fb3d982ea45199a53475e29300478c07e8e1168cec79cf9c3b5ff1dd6c840123b982b SHA512 1e3dc3c8c192eefee7b055787bef52ce3bcfafa786224f68af065aa45f4d7da93232da973359b3135615c5981ad4df7c124047d3934e552ab78439472685a7a4
 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.26.ebuild 1551 BLAKE2B f10ce32f0ba423c1e07e66edf9c20d4b516ee88daa9cf7e1c60aa2909b05db67e244dfe721a67ca1bac2f59a65cfb37eca88cff696f491c3e56357273c3b9b54 SHA512 d57d7e4dc58657e1affeebcefdb4315e5f531e32e6a633dac185898e9e45ab510a8fcb1b7974ee9e7c2ab8febaf2acadf8d8af32b2fa099f16fb6063f25eb19d
-EBUILD xmlsec-1.2.27-r1.ebuild 1568 BLAKE2B a0c648ce6a85c11f598e8b4515946bdca93fab9cd4a8a257f5b32011a86bd9f484d0bb568a545ef244401c36977b42052fa75b7e02018bca2a9f3cb75acb5e68 SHA512 3450a47f9ca8539356b699a5a669ce63b39b4f44e1e473ff67319e056061db03291a727013f1bde0bd066940f0f52f52ecef2fe046bd582f018608c8d1e628c2
+EBUILD xmlsec-1.2.27-r1.ebuild 1566 BLAKE2B 07937e208f8d123a8bc02efae6e83a0da1dc3c89bf8046e8e0f3e1b4378952e1071c71f2ce26230c97058ca4e828769565a5771d528ff20fbe648a6eac7fc6e0 SHA512 fe3ec7050c90a5edd33cc9ed6a8ecb7c03c8bfe71641897aac9f8aeab720bee92a565d51bda30546eb9cb603d399bcc654cadf832da78821e4f6de5dc772f126
 EBUILD xmlsec-1.2.28.ebuild 1376 BLAKE2B 6be12c2bf8f0f3582d9927940396a850b33710dcb910d1941a2da9d3cffb1e043cc1f8822581a9142245c4e878aa43ceddd4e788d2131cfb02774d7ba7dfa75c SHA512 e7b8c939c7f472bdb8e4276c4a86c1e06571527abfdb8e365813aa0c1a336daeb649548f5a9276e7b0ee3aedc7ffcaa05e98e6ae839b977b88b0b7422d2a5c3c
 MISC metadata.xml 487 BLAKE2B 0e191be30487c618789a7eaf8c2ca9ba0e801649213674adc85e76a5402853055d384efb9d6b534099683de4b2935dafa613ac029fd810125993d039cf9caec8 SHA512 1be5c6aa74ba9542e7b4b85adb8dd743fbeb72b4fee345996ee1b5bc662d9455d910f00ca37b16e644f53039a346ef44afc5e49abba19c5f8d4d00cbdf37d660
diff --git a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild b/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
deleted file mode 100644
index 16f8db947c10..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.26.ebuild
+++ /dev/null
@@ -1,70 +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}"
-
-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 gcrypt "") \
-		$(use_with gnutls gnutls "") \
-		$(use_with nss nspr "") \
-		$(use_with nss nss "") \
-		$(use_with openssl 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.27-r1.ebuild b/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild
index 856125079412..56460816acfd 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.27-r1.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.27-r1.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 )"
author	V3n3RiX <venerix@redcorelinux.org>	2019-05-04 12:02:00 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-05-04 12:02:00 +0100
commit	eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch)
tree	ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /dev-libs
parent	b7ebc951da8800f711142f69d9d958bde67a112d (diff)