gentoo resync 08.09.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-09-08 10:50:14 +0100
commit: 3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree: a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /dev-libs
parent: 12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)
182 files changed, 1010 insertions, 974 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0ca132973e32..1afba6104908 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/amdgpu-pro-opencl/Manifest b/dev-libs/amdgpu-pro-opencl/Manifest
index 92ee3dae56c5..165b80c89f30 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,5 +1,5 @@
 DIST amdgpu-pro-17.50-552542.tar.xz 549501204 BLAKE2B 37dcda126a3bda4e87b64ce260c7e4b65a1b864363c51f06e3152f152b83a60074331e6a0bf7b831c059a50192dea8add9b38ed16971c87293ce0e56ddf26bb2 SHA512 060e96609cf1a013fddf10db9bba4b512750e5188671a669e2582c28a03213b40d073031e35a617b982374d9d1cd4078f43b27053ee34be7c83873c0814ed196
 DIST amdgpu-pro-18.20-606296.tar.xz 230733856 BLAKE2B 21a498a894a9712d9f0277fae7f704413be0cd01cebbe427008fa3d181d03b58268e74bd3cdaf0dfb9aeca2871dad82b4aa640bbce690ca461e3f3e4acf01ffd SHA512 6575bf963e5714657914d9116de4d9b1835851fe0609b1f072b1fbdf73c068da77aba0eca1c9cce6e05e6cd8f2c1ed6b4bd6ab4ef334be5ff796ee6a3ad73831
-EBUILD amdgpu-pro-opencl-17.50.552542.ebuild 2324 BLAKE2B 1912cf7ced90db456b26978a516749e5f8531f92479288995ed68c3a4d81882f9e05ac704454c957a3218b3ef6414166d21aeb933ab3e0aeff9942653cfd4297 SHA512 86d9a1b05d85a8c367bf511f1d3739d419ac7c08bc13749d3384a420ffcc7989123626070922af508ebe9b0ea462c96339ef8a050de1544a787035c73f50c419
-EBUILD amdgpu-pro-opencl-18.20.606296.ebuild 1838 BLAKE2B 5d9dc6a2fea24026f87d7273d5281b344ea2d3dbc4090c7516085bda7c5085e9ff9db99bd37945074b69b7d2f4b89fa6b0e452558d041a176cbc1ddadd4a262a SHA512 6a01ae72eaa059aa5d87b9e159ac02b2dcf42de6b85be87d7f2666d2f043ab17bcba0f316948d6d31d2b90c512f482620d2b261a9e86e569cedfc5f2aa852afa
+EBUILD amdgpu-pro-opencl-17.50.552542.ebuild 2336 BLAKE2B 30c89a7a894398799d7a3ba509487ff264f0dd68610becadbe6af347e3a25f7e6f5127dc6441b417a7c288025cb3a23b2180c049d72c47da887d42215737d90f SHA512 f3301b312dca3733d1daf7868557c4b0f6f718175963003da27ce636e150f7dc073732ebb04426cf0dae57bf443401f319c8f8c7c514a24697faa17f1a5328ab
+EBUILD amdgpu-pro-opencl-18.20.606296.ebuild 1850 BLAKE2B 45e6ae4d207f34c641b1f8be1eef99c668edd706ba8d999f317904cc65f00d1a5e312058959d1a57bde38b0a58f38d86fb25690005a758a7621d996f3e112828 SHA512 ef6774adbeca94680e5921ed21f8460c9d2d6959bb826637f20f64d424318efce62e0f7c01e2c675f2789c1a257854c6ad59fd42226382222b1fb7e031413a81
 MISC metadata.xml 656 BLAKE2B 5af3c00c551e7fd2b0de6d8c24421a58986ef20c24b7f2799a428dc7e07e2da4841ce93ade51edae33c0ba79dc55ed6df3452c0b5a610499e7e79e09c31b22de SHA512 5f6933f6ff6dd222a54e4c3609b888182ffd136bb0b58c905624cc9b404091b4e46917cf20d4d24585fa3ed710fb9881f3b6437e015371743d23d07fab488fb0
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.552542.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.552542.ebuild
index 19adb74c35b8..fd8832619846 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.552542.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.552542.ebuild
@@ -29,7 +29,7 @@ pkg_nofetch() {
 	local pkgver=$(ver_cut 1-2)
 	einfo "Please download the Radeon Software for Linux Driver ${pkgver} for Ubuntu from"
 	einfo "    ${HOMEPAGE}"
-	einfo "The archive should then be placed into ${DISTDIR}."
+	einfo "The archive should then be placed in your distfiles directory."
 }
 
 src_unpack() {
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.606296.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.606296.ebuild
index 614f397a1b7e..241e495069ac 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.606296.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.606296.ebuild
@@ -29,7 +29,7 @@ pkg_nofetch() {
 	local pkgver=$(ver_cut 1-2)
 	einfo "Please download the Radeon Software for Linux Driver ${pkgver} for Ubuntu 16 from"
 	einfo "    ${HOMEPAGE}"
-	einfo "The archive should then be placed into ${DISTDIR}."
+	einfo "The archive should then be placed in your distfiles directory."
 }
 
 src_unpack() {
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index 3c09ea56b1f4..b579e095a21f 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,8 +1,8 @@
 AUX apr-util-1.5.3-sysroot.patch 1234 BLAKE2B 58e66e338ae936b7c206eda88a97f99785a88d79c32245c4c028f00b98a33d3f29764f66646e486d828d8cc655cbe59813236b7c5ca7060643771e4ab9b915c6 SHA512 44ee2a9cf61587f05d43976d40023f6313b310c3eeb37299840445e3faec7f0352367875f515b21d3b1fcdc8c082d8584a21cf8187deb1f6f69187c14f84f0b7
 DIST apr-util-1.5.4.tar.bz2 694427 BLAKE2B 6de337fa48f0ca3775ba5b054b3a59726e25a35c9b2ea67323edde52c88e4affc0ea0a25a0a64f42c82f0927482d22dc6049286df8cb6048f8bbb61659beb0ac SHA512 ca877d8e444218c4ba0f28063ee075ddcd6c0a487b692dc80ef442fe775ec4eeb337c6957853772e8082e27edcb450d7e909c2c6c3ab4a95bbf0a5ee5ea4a2d1
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
-EBUILD apr-util-1.5.4-r3.ebuild 3696 BLAKE2B 740a3c17f34c719f7b3d977a6866eb45061504d31c93d5fc59189bb3161ef8dd9b641308e17999789f6c547c4a56ce765fb4cbff8052d6e48f5e54ad279708b4 SHA512 024b8b03d382a0e50f6eac0a6e48d72b5e0852d60824df671e5f7b793c06f323b89037507eb131d05b785c3c03bb42862f133f054d89720dee25ab5b67d2f432
-EBUILD apr-util-1.5.4.ebuild 3225 BLAKE2B da5ff3b9cd371cab9220d3df59dbca2f8705eda3db4842955a30146e9458b6d037ca1d64dfca6d77317bfc3affbfd8ae73c85113ff5e4fe94c4dfa6532313901 SHA512 1811870406d1cf2eff475c9bd13bddf58b7a7b4f86743b003095fff20303cfaec11ef02aaeb312154831a6d2eacaf0d9a612bdd4d5bd880b272a625e8d04e26e
-EBUILD apr-util-1.6.1-r1.ebuild 3603 BLAKE2B 0fc6012bf57e8ad9eb2f64ec9b00572d85da07889094a2eee7b93d79050153bd0f0dbef6c90591d1425e459c1489cf87b87f9415f1e41baa4e4f6e67443bbb28 SHA512 fdbffe248164f9f5a4cf7949058db79195e3883f05f639e4ea42d5eeefcf640263a75e1010db03bfc56e028b11366929958024b3e74b1ee4071b1892567be042
-EBUILD apr-util-1.6.1.ebuild 3602 BLAKE2B 429e1d93762ee3c4ed62b32acd739972f5e389201a63692e2eaa10e62d708c57a595369ed066b65269bad86a5e188ab5e4ad1e57dfc8250c1c019ef734c34a44 SHA512 6045a8af31e1fe8cdbf0e1210ae856badea9b1a80ffbd095fcbd2a3bc9e9e7b94eef8094f670eeb17c26f143e450b986620fdf250bbe74b90772f30ebfa24fdd
+EBUILD apr-util-1.5.4-r3.ebuild 3685 BLAKE2B 6de15972c714d4077aeeaf62771b0427c96d7022ffbe8f639576d1c422562806ac5daf93b6d6841f581f0d8e2419a33692abe392bdb583b1722ae3734865af9c SHA512 576d513d8716117cbbe854d14e183c13060408f187a22b000e5e21f2f6b71c8774bf197612ae27080a3d97ea0bbbb078579db2551c54c12a6a1b75dd63fb2c7b
+EBUILD apr-util-1.5.4.ebuild 3214 BLAKE2B a90ae943aba394503d08cfad961e603c5aaf1460b28f040e35c0a330ad59ea333606cc909e6d8543f1c24a4a0898492dc50d988cfcf6e7ea681dd12207870838 SHA512 a419670fc4df0a4b7c7f1c2d07b67428dda3d72663e45ab1c2cd72268c33100a4d9319398086666530d69524f61eae196198e4622f0dc889f7413b763c3ec5c2
+EBUILD apr-util-1.6.1-r1.ebuild 3592 BLAKE2B f4d9b91d96722e6e9024cfb64d5f5bf61919ebb8a101656f00cb398d5460e995d551f8629d9abbf865a900f71b35090fe164466e7fd3a2007ea03d71dab3e2bf SHA512 d3aec21f41fb841b37d516cadef78e900211d65f87bab26e9fb1b65ac249ce49b08e75c9e338af2334bdd88ef0e75270a5f68d4476a5b95fbd485296fadf657b
+EBUILD apr-util-1.6.1.ebuild 3591 BLAKE2B 3c85f06d310ea1f2ab24a7c76278acc3ef6300f416371f764be80d1c1e4eae6409049de0e3346d877cdb3fa25a5d543a88c2bedb3c221f2dd88ef9277b362e01 SHA512 6c9a46f07a883e2e7f7064b00445e09e152cb3ba21e52a92b24cde30f41452e2c2cfd4832a6357ad446c15e4697cbef2b7ded34afbcc79efed32c25934df0af2
 MISC metadata.xml 515 BLAKE2B d300be91135a6a7dcc55a61b484b5dd1785663b9f3b51d621dcacffd9ec5747b69bb227f60dce1bf30a57fe93629de3c82fa7138a5f056e4f349ce6909453020 SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158
diff --git a/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
index e242eaa843aa..c9a2d794b218 100644
--- a/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
+++ b/dev-libs/apr-util/apr-util-1.5.4-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~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="berkdb doc freetds gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/apr-util/apr-util-1.5.4.ebuild b/dev-libs/apr-util/apr-util-1.5.4.ebuild
index 87915cb78e0e..fca0234d9e7c 100644
--- a/dev-libs/apr-util/apr-util-1.5.4.ebuild
+++ b/dev-libs/apr-util/apr-util-1.5.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~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="berkdb doc freetds gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r1.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r1.ebuild
index 55ba63acefc3..c3edbbe60b6f 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r1.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~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="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/apr-util/apr-util-1.6.1.ebuild b/dev-libs/apr-util/apr-util-1.6.1.ebuild
index e11fcc8ff391..04a669b576b8 100644
--- a/dev-libs/apr-util/apr-util-1.6.1.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~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="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 35c6959dd722..e15e3b0f85a0 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -3,13 +3,14 @@ AUX apr-1.5.0-libtool.patch 514 BLAKE2B b9d33d1317293c7614a3f0f753e466c7f8acf079
 AUX apr-1.5.0-mint.patch 872 BLAKE2B dda2941cbed87117a8a6c488bd8045894686aef0ba219ff489f67dd03b58fb07a05f9e67c54cdff330c65e579c41c992446a465104661bbacbb2525a5b9518eb SHA512 ba71f17ef9f61a8379139f05ca17eb583ad34cbc3ebf5c4f59d011662db6b5c963da5c466c093c3eb98372299d8f202d927a05b52cc7515270ac52fe44ec6daf
 AUX apr-1.5.0-sysroot.patch 1309 BLAKE2B de3dc13a44a9d5071c249875322b7d6be9ed765176f8232b96a5e5088c5764dff8b810377b214999b59380522fdc9d0577217fe1acff5a7ab4b17461d6daf909 SHA512 48609c522225b47df96039174dafa043f77ce5b91f464b14250dd2b30590d6685c9baa03d4ca34937532c26afea8d208fb78158dfc8026a606ff90543b5c8d5d
 AUX apr-1.6.3-fix-overflow-check-in-overflow_strfsize.patch 567 BLAKE2B 7a41d3aeb1e69af2a90bc55ac5aeb1e8395c5b0f6ff569f65f88de15c29c1df794415526b1ef13ca2deedfe48f8801e93b2eca655086518d9cd7bc5159252d1a SHA512 d2c4e0fbd9d4b909669820c30642c34de51b87edfc746875c0743430a7cc2599b68a037a6146f9c0f49d8e78844617c392819367636e2b6175bd919fce5ec5a8
+AUX apr-1.6.3-skip-known-failing-tests.patch 512 BLAKE2B 29607bce9a35853d824f8872557f361f3d5ffa0f2c7cd35e06cbf4d449e54f1b12978c0220b8ce4ae5d590ee9e04b5cd77af22876e3880deef115efbeb5a1dcc SHA512 ac097d28d5ae0b2437522da0578ff8bd049190d8df576e4e5298426f827b2bf69891e4f33bd1ffaf1a3c53143927e71f10d8362567121faa03cdf908d4fbc6c2
 AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4af9e65169c1c5862c3fa3532cc02df8e084b540e7a81091c3b16d50388c6234cba469b15fff896d0428fc SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf
 DIST apr-1.5.2.tar.bz2 826885 BLAKE2B 62953c31cd6cb9a80142cf65f791543febffd1716d9e4babd55c8010c6fc6e60ba3c287b21e146c19446185c03407f3990d862a0b9816039c2d1b7158ac90cd3 SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d
 DIST apr-1.6.2.tar.bz2 853363 BLAKE2B 99ff559a5a974c1cd116dbaa65a03c731ed8cdb4393c395b66daee3d6217f17ff1c895dc1cba498b0244f32b8b00dccc76f2d84a5b3dde053458e7557753e446 SHA512 20f449fde522f186b919b64ce6f90073b267557e17438607d31af917eca7941222dd7a7379d66f1430ff68f7e28fbccd140d24f3ca7aae8a876a550b19de284a
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
-EBUILD apr-1.5.2.ebuild 4088 BLAKE2B 42d181fe7480bffff9577aff115731ac62e70513ee49fe459db6d82ac62431ac2323c698d139285449defe377c7fd90c586342773fb05722003cd4075807f165 SHA512 1675f275f3c37a3141f73434ec17ba6841f153c6a12edc20997f9cf5da462126cdc77d5ff7a625b0a3c9ef8e08480163c6b004ccd374d8e96f6a2a19df1fc775
-EBUILD apr-1.6.2.ebuild 4079 BLAKE2B 0760c6a464e2ba6006a815d335aeb37a8319b6513252d113c65713417cbad361a892d1da65d63eeff7341881724f5790273b326116927e1c70acac8aa054c0e0 SHA512 b0d0cd2ae97fb8d3622d891385f17a2b2098b55278563880d4062f0014ea1831478cbd9363c898431a3073d7340332c3406e55c08eb075752865b021b63d29c6
-EBUILD apr-1.6.3-r1.ebuild 4125 BLAKE2B 554bcdbfb44ade141ca48850d4c62bda067feb802b03f38d1a8b6d46a8f20fed1cf9e3498c54dee16e18bee1ad62df6687ef4839b1c6f5f92fea783a6d2b63a9 SHA512 8b53c6e0b587f63b75cd31099fdadeb4e410a1d825dd681ad0e3f9553a58c02dd1eb3dca47cacd580a925a46e9273c294d1e40f6a5b748d420b38f3e19e53fda
-EBUILD apr-1.6.3-r2.ebuild 4271 BLAKE2B 57587f147574e6898f5996bd8322561ef072975ce258ac4d6791a41a5a961b816164eba98a8d563185a8f3b193ab6314208aae3bec5cfabe17b5e5a149545574 SHA512 cd39d77617d53364bb0cd3a586760b983016f5c14fe0eb63be16ef95e0f4b690e2a022818965ec1fa9f8d12ba77843717746db8b7bec6e6a71ed8c638602c633
-EBUILD apr-1.6.3.ebuild 4079 BLAKE2B 0760c6a464e2ba6006a815d335aeb37a8319b6513252d113c65713417cbad361a892d1da65d63eeff7341881724f5790273b326116927e1c70acac8aa054c0e0 SHA512 b0d0cd2ae97fb8d3622d891385f17a2b2098b55278563880d4062f0014ea1831478cbd9363c898431a3073d7340332c3406e55c08eb075752865b021b63d29c6
+EBUILD apr-1.5.2.ebuild 4077 BLAKE2B f9bdb8503c2101780f101db394a12040118f8f91a6ebc7a3d08899eff715d4065291b07fb9b662edc586807305edfa64ed2b0983efbdb074cb8733a91acc4e09 SHA512 4d5b178bff085c61704037f87d00b28fd51b588928d870a61670e2b171891316ac29584b2afaac38d0237a301d156eb0ebc316010f1695e5b8a8f268a68b1b3d
+EBUILD apr-1.6.2.ebuild 4068 BLAKE2B e665cec8463d6e075380298918963cce92dadabb51f93273b0c898d7f00ae35ba1301d8f96cf78e0a2e25e0727b421f06cf1aa2e20a7c02954edb119bf9ecac9 SHA512 109a0f00e9a0a6435ae2b7482ffbe6013e7f00ea2ff247e47e0ba7f374a3e9ff67720f112c486c8ea4abdc3bbca4f7bf5143aab3069e6ddcf2ce5b286e19d4ff
+EBUILD apr-1.6.3-r1.ebuild 4114 BLAKE2B 42f93b5c1b11dca5a1273ffe319b481165275f55dccee9fdb77877e814fa7a48b478fa8e2cb8f77ea15290f102220b6d97989504af10d977e1d835d7973cc1eb SHA512 0dcdc9c9ffc2247add035f7ae5304a5b777c73dab39aba37b7fc7da1e12fb8781abe10b93e6d32e93bd418ad222ed0c1c822864ea215fdd874ddfa5ac8c3ec91
+EBUILD apr-1.6.3-r3.ebuild 4404 BLAKE2B f4abe4650467f7142ef6145bd42812f409e5d666ca10849d3f18e3cf431c18d8615e102d7e23af2d60b29a3373a69c69349c461d97677834a6e13e9818065b6e SHA512 dd2afd6aff0084375818cfe9ce5177ab50eaacbc26ad705c4c1ace722c9b9f5bc1850461e987bc925ebe1af61a62b443bf03a902537d6a53426886a8e61cab00
+EBUILD apr-1.6.3.ebuild 4068 BLAKE2B e665cec8463d6e075380298918963cce92dadabb51f93273b0c898d7f00ae35ba1301d8f96cf78e0a2e25e0727b421f06cf1aa2e20a7c02954edb119bf9ecac9 SHA512 109a0f00e9a0a6435ae2b7482ffbe6013e7f00ea2ff247e47e0ba7f374a3e9ff67720f112c486c8ea4abdc3bbca4f7bf5143aab3069e6ddcf2ce5b286e19d4ff
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.5.2.ebuild b/dev-libs/apr/apr-1.5.2.ebuild
index 2c9101846cca..32175989515a 100644
--- a/dev-libs/apr/apr-1.5.2.ebuild
+++ b/dev-libs/apr/apr-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/apr/apr-1.6.2.ebuild b/dev-libs/apr/apr-1.6.2.ebuild
index 0c823dc89014..67376760d717 100644
--- a/dev-libs/apr/apr-1.6.2.ebuild
+++ b/dev-libs/apr/apr-1.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/apr/apr-1.6.3-r1.ebuild b/dev-libs/apr/apr-1.6.3-r1.ebuild
index ba7eb74e48bf..b158e12bf637 100644
--- a/dev-libs/apr/apr-1.6.3-r1.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/apr/apr-1.6.3-r2.ebuild b/dev-libs/apr/apr-1.6.3-r3.ebuild
index a874140ae17b..fd6717d9db75 100644
--- a/dev-libs/apr/apr-1.6.3-r2.ebuild
+++ b/dev-libs/apr/apr-1.6.3-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools libtool ltprune multilib toolchain-funcs
+inherit autotools libtool multilib toolchain-funcs
 
 DESCRIPTION="Apache Portable Runtime Library"
 HOMEPAGE="https://apr.apache.org/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1/${PV%.*}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
@@ -30,6 +30,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
 	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
 	"${FILESDIR}"/${PN}-1.6.3-fix-overflow-check-in-overflow_strfsize.patch
+	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
 )
 
 src_prepare() {
@@ -49,6 +50,7 @@ src_configure() {
 		--enable-posix-shm
 		--enable-threads
 		$(use_enable static-libs static)
+		--with-installbuilddir=/usr/share/${PN}/build
 	)
 
 	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
@@ -139,7 +141,9 @@ src_install() {
 	# Prallel install breaks since apr-1.5.1
 	#make -j1 DESTDIR="${D}" install || die
 
-	prune_libtool_files --all
+	if ! use static-libs; then
+		find "${ED%/}" -name '*.la' -delete || die
+	fi
 
 	if use doc; then
 		docinto html
diff --git a/dev-libs/apr/apr-1.6.3.ebuild b/dev-libs/apr/apr-1.6.3.ebuild
index 0c823dc89014..67376760d717 100644
--- a/dev-libs/apr/apr-1.6.3.ebuild
+++ b/dev-libs/apr/apr-1.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~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="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
 
 CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
diff --git a/dev-libs/apr/files/apr-1.6.3-skip-known-failing-tests.patch b/dev-libs/apr/files/apr-1.6.3-skip-known-failing-tests.patch
new file mode 100644
index 000000000000..79efb502a8d0
--- /dev/null
+++ b/dev-libs/apr/files/apr-1.6.3-skip-known-failing-tests.patch
@@ -0,0 +1,18 @@
+Skip testlfs test which only runs on non 64-bit systems and fails
+on Gentoo due to a sandbox issue. Bug #603244
+
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -172,7 +172,11 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
+ 				fi; \
+ 			done; \
+ 	        else \
+-			./$$prog -v; \
++			if test "$$prog" = 'testall@EXEEXT@'; then \
++				./$$prog -v -x testlfs; \
++			else \
++				./$$prog -v; \
++			fi; \
+ 			status=$$?; \
+ 			if test $$status != 0; then \
+ 				teststatus=$$status; \
diff --git a/dev-libs/atf/Manifest b/dev-libs/atf/Manifest
index fdc9d0f93732..c0a13feafe78 100644
--- a/dev-libs/atf/Manifest
+++ b/dev-libs/atf/Manifest
@@ -1,5 +1,4 @@
 AUX atf-0.21-getopt-solaris.patch 191 BLAKE2B 100e710c5cd10d5b0cd35fc2b6fcbba440496c3bdf99b7b88162b214e1fbf030cf54a0289b801b9946f89df0fe26ecc452f498ecd9e546462ccfd989aa313f64 SHA512 c98c062793abb014731e249d833e94fb4c0e7f5ced37f7310caa6e3a26a3b391c4fe90133656c21f6bb467af5d8039f887a3a42630b6e9725ecb84b99309a94b
 DIST atf-0.21.tar.gz 567791 BLAKE2B e9449bb61008a91c10050462e84ff65c6fd88124db56ff3f6c149ff47fe8647fe8fe786cd7b1106cbfd62723a57ab613432323f266a93a4c86d8a6ab39bfcc0a SHA512 9b4b67d7d0d1f65cc9571d38c67dfc620b08ff7c0abf57d87bcae54055b4af21f95f3363f2cf8ee9b13b89a5351bc58669b784a0fd8c1beb0664c14933c10ce1
-EBUILD atf-0.21-r1.ebuild 640 BLAKE2B 706df2739402cc239334a82f6e6e3ca3341709be287c064c13fff689511c4005e13d35e2b855ae72667ce87ed69338564dc18a9c8e05bddbd40c64e581077ce1 SHA512 4f33193da9f1f5fbb22e1492581fff63a02dc3d92554345a0b89316a08802728b95f77e759665676cfe45dd158dbdeb56391ed12e504d3466f05e2e3ffc7b6f1
-EBUILD atf-0.21.ebuild 489 BLAKE2B e74c5ca6fbd9fc2bee96632d5dcbda578c1c363b64dfffbf8a52903c787f54e9854e7ba786a2a5b8f12f859db945ca0047eccedfe03e191924f7dbce03e9be11 SHA512 63027784fb4ed54582ba81c7c88ded888a5f125d3e768a5c0b6958d76971ad2083e6865feb6dae99fb9bbfd06fc4577da67a86f8228feef49e4c5c9415ddd958
+EBUILD atf-0.21-r2.ebuild 671 BLAKE2B 92ff69da001d811e5e6cab4ea9ca4ee1f46beef82b7596c93c83a6361f3a9cee2f4cd27ecb408aee38639910d1870fe6017b0b9567bf3421759c5e5304571545 SHA512 d9bcd1c6767dd10e2661053da3cd03fdcddf22fedf03fe6cf1af76db567a2b3e666046ea77c252bfcc6d2b82eec04497f2062f3d01af9618b62a0b2df5667a23
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-libs/atf/atf-0.21-r1.ebuild b/dev-libs/atf/atf-0.21-r1.ebuild
deleted file mode 100644
index 8f0c520fae81..000000000000
--- a/dev-libs/atf/atf-0.21-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit ltprune
-
-DESCRIPTION="Libraries to write tests in C, C++ and shell"
-HOMEPAGE="https://github.com/jmmv/atf"
-SRC_URI="https://github.com/jmmv/atf/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="virtual/pkgconfig"
-
-PATCHES=( ${FILESDIR}/${P}-getopt-solaris.patch )
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/atf/atf-0.21.ebuild b/dev-libs/atf/atf-0.21-r2.ebuild
index 66e1e218e8b9..71c1edb34d1a 100644
--- a/dev-libs/atf/atf-0.21.ebuild
+++ b/dev-libs/atf/atf-0.21-r2.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit ltprune
-
 DESCRIPTION="Libraries to write tests in C, C++ and shell"
 HOMEPAGE="https://github.com/jmmv/atf"
 SRC_URI="https://github.com/jmmv/atf/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-getopt-solaris.patch )
+
 src_install() {
 	default
-	prune_libtool_files
+	rm -r "${ED%/}"/usr/tests || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 5035709ac752..02de2db0d63a 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,5 +1,7 @@
 DIST atk-2.22.0.tar.xz 745572 BLAKE2B 4764a6044446de8e08b54c47400727268ca68e676aa36c01877f2b3f973614a40f209406b649f0e96f4a5b75be883ce67ac3fbf20ac0c58adfbaf3509caac312 SHA512 af3f6197eb97de869ee706f19564449b02c1444c413e5418323e4bf4c8cf1d98c7c8baa25189f6879d63606d4bc75f33799cb901f4697c087e868bb9a5643cba
 DIST atk-2.24.0.tar.xz 748972 BLAKE2B f9db7e35322cf4a1df5171c812c83eb935ba44b0167b20ca9a951109c00911392a48db88fac02a12074de4d9f458656f946e8bb7611e1d11cc0de841986f8cc7 SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962
-EBUILD atk-2.22.0.ebuild 1428 BLAKE2B 09fcdbf9c0360b4028be8ffca418f4e83a839fade16e3d1a67f34b9a43ae87ab6f4b44e6f5c363f6fef074ea2d822ed3bb14b58c656dc294426c82d968db98c8 SHA512 64ed9a17da2175f795a0abce2ef28d246f242990962fef66002fab227d5553bc89ca4dbdb779c2a29a1c59e34f3f04260f8669405a9cdd166b76cf2dd9ae6652
-EBUILD atk-2.24.0.ebuild 1429 BLAKE2B 6ebee4e0388171527cdf514ca1c38725aeeb7fe27718cc7237ad2d31ff5014bdc2916d6086f35b27957c4595a6ad4e2373d100508ff6b4195ec695eb498520ed SHA512 31460d1d7f2404e573b2a3d6ebeceb20e47a9126567db60060551c59c1da0619711e0cedc1489b5e2557c36283d165df78a72185c12d5ca0176358b279ea8fdd
+DIST atk-2.28.1.tar.xz 712508 BLAKE2B 71aee8bc937e1e37d40e6a9820d0002bcc763dbf87385ede2484ec6fe17a9924d5753d74dc3a769602746c915d0c46da8eea78cc80c706e3c38faca2e5050364 SHA512 aa61e7718b3f4d9c33ec2b4747e35f894a51550ef39ecc4a7af5705811c029645bd3c728071f446b075a0b7aef0c35c1b73406a210cd30171838f24a8dfc0abb
+EBUILD atk-2.22.0.ebuild 1417 BLAKE2B 934ad34cb4e2e90422a8f885a7da073f3e153a9ff6c21f2ab1862a550fb2be483a286593346b8ca1f17f885cc1fcf6eae3cfb8dc6363f42226f8d318d7f23211 SHA512 12bb3647b4393dec7c50360c74530286a8063ee1db6c63e27024ee3d7cdba0388535bab36b072b8f35c0b06b4597d0358f26ea0b6a0b998f06c11ed4df1344c0
+EBUILD atk-2.24.0.ebuild 1418 BLAKE2B 5401d1d1637b38c85b693232bb01306cf458138adbe9bacdfc4750f398a27ee94e8cedc7b159a048e4f2c52dddf411f800a0ee97d72bd68ad2c8c41ce69a58a1 SHA512 9a2925a00a45d270d34f107676b69c99d6806cca8b75a24d2ff66df5ee7ca21886efccdfb44cf0f46324a2c423241fb42d15b157fca908a0f729b2940ceef9fa
+EBUILD atk-2.28.1.ebuild 1466 BLAKE2B cc263cb90d23aeb5cd52a5bfce50c27a205f83c8b8401a4abcd86df7a8895f965bf9ed6e15baf6c9dc1daa2b1c75e1bdfc367e5015f483d777fd6a1aad75d493 SHA512 b04ecfa9eb39521993119a64258108fa024054ab17b009d2c21681787da1a05b2ceee410e9b9b1ba82a92e0485ffdfef31d70e0d07fb69befad9989601f72256
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.22.0.ebuild b/dev-libs/atk/atk-2.22.0.ebuild
index 96f8672f4347..52fb26755253 100644
--- a/dev-libs/atk/atk-2.22.0.ebuild
+++ b/dev-libs/atk/atk-2.22.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~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 ~x86-winnt"
 IUSE="+introspection nls test"
 
 RDEPEND="
diff --git a/dev-libs/atk/atk-2.24.0.ebuild b/dev-libs/atk/atk-2.24.0.ebuild
index 3d011579c0cd..2a98ec045f25 100644
--- a/dev-libs/atk/atk-2.24.0.ebuild
+++ b/dev-libs/atk/atk-2.24.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~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 ~x86-winnt"
 IUSE="+introspection nls test"
 
 RDEPEND="
diff --git a/dev-libs/atk/atk-2.28.1.ebuild b/dev-libs/atk/atk-2.28.1.ebuild
new file mode 100644
index 000000000000..00caaa9ac80f
--- /dev/null
+++ b/dev-libs/atk/atk-2.28.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="GTK+ & GNOME Accessibility Toolkit"
+HOMEPAGE="https://wiki.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="+introspection nls test"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.25
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	nls? ( >=sys-devel/gettext-0.19.2 )
+"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	if ! use test; then
+		# don't waste time building tests (bug #226353)
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed failed"
+	fi
+
+	# Building out of sources fails, https://bugzilla.gnome.org/show_bug.cgi?id=752507
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+#	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(multilib_native_use_enable introspection)
+
+	# work-around gtk-doc out-of-source brokedness
+#	if multilib_is_native_abi; then
+#		ln -s "${S}"/docs/html docs/html || die
+#	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index 2959a8da8121..085e7f2af5d7 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -3,5 +3,5 @@ AUX beecrypt-4.2.1-c++11-allow-throw-in-destructors.patch 734 BLAKE2B a0997dde4d
 AUX beecrypt-4.2.1-cast-uchar.patch 8230 BLAKE2B ee94bf2e741e2c250ac4dbd6dbc7b2f5af4bbec8db5c87f7faefa381e8d973159f2b1a5e74189511eb43d200b7617cafd5cec18e23eaa69c99b68113fcf5998f SHA512 d344979022ea1e7ed2b7894bf9015996488cb5ec7c458aaad93a639ce457a1b790ba9e51b5369318566eb9ffc0df12d0b4108fd2997aa21c886dc079b836e973
 AUX beecrypt-4.2.1-gcc-4.7.patch 262 BLAKE2B a99fa0e61728bd38510622a1770c3ecad156654dd79a2e380a0aaf48cd895d1308964a4dbc0ebcbbed978f78c066e4e480e193eeeb9b0e941828301256b0cabb SHA512 908d688ae29f23a3f67cb1ddf8d2f5277853abbf6fe291e371fa8595b8c6c5e4293c1c15b80171270639b9d4f092b4602bbd5144448c4f19ff958d5522edbc77
 DIST beecrypt-4.2.1.tar.gz 882758 BLAKE2B 7ca25613cf95df8657c762d932618979783ea2ddfbaecdf066701d61a5f9ac76bd474a51eb65e140c83ef01880477cb7104e3d67c2fc078ae7b710637d18bb53 SHA512 59995d53c024efe6344a21ac0d6d55fbe652488a4a22cc6719f9fc3851d56697fa8738937d48aa1e6f9ebe749de61ac3c79a5f0cea793872213c3bdf922e71bc
-EBUILD beecrypt-4.2.1-r4.ebuild 2238 BLAKE2B b31b50b146d5a12ebd196b4675bce2b12d21c2f6224a7c8f46faf45dde0a3c78c2dc1f3cfc5cd34ec89bb2b3b865073c83897c423cf5b13f2a4a99a92186f443 SHA512 23bd4a818ec4b4965f3f08fe35910674cc572a5da85abaa00b9b4638f31b63ce620f686674c959d14de2cd5c12ca1be20457f82a49926b4ec089f6b17802dec9
+EBUILD beecrypt-4.2.1-r4.ebuild 2227 BLAKE2B f66a1cb5bea84db49c4bfb3928526e6d7927ac57ce04a0a525e8d75c8b49989d03e96e7e8be7c272af07adf8595635c142d4210fc1ec9f7e4f93e643b6c8d872 SHA512 bc49a21bada431dbfcd5be9233602d7c0feda3585c8a10887dfffcca99f781a5b6a1749b583b479360022ce20838282c47932643ba1816d0308c3de5698ca78f
 MISC metadata.xml 245 BLAKE2B a937157650e974ab296da9c19930deffad940d0c256541ea0338121f36fde942eb41529c5f3f39d37fdd3fe6e30eb8e9b987a0cb5c2b7736ff837c2e332ddf95 SHA512 7da531ddd382748b46b2be3d6324c0f654e772ca0d1b87884a5de0ae1f4cf8a6e32d9cd0e4b87b7fd632aa176f873d7e315adbb974c367b4539045fdeffde98b
diff --git a/dev-libs/beecrypt/beecrypt-4.2.1-r4.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1-r4.ebuild
index a04082f9c8ae..b0189d3c74ce 100644
--- a/dev-libs/beecrypt/beecrypt-4.2.1-r4.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.2.1-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+threads java cxx python static-libs doc"
 REQUIRED_USE="cxx? ( threads )
 	python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index bb37b22ebc7f..36c8489aadf4 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -1,13 +1,15 @@
 AUX beignet-1.2.0_no-hardcoded-cflags.patch 721 BLAKE2B 033bd173462a38e9a35aedb7090adf6c621c040d3a732dfec12c2807a33ffeebbd3dac85a1bfc500f86b997604c6e66d144653cf2ada95b589fac6f6bd4f2600 SHA512 fdb922091986a60a416f9f7be3487e30974e085f8d1fddf0dba2fdcca155d26523c504289d8775e4943acce01bbb7bd3619c1af5e9a43af8afada276a52506e6
 AUX beignet-1.3.1-oclicd_no_upstream_icdfile.patch 564 BLAKE2B f90bdf1c1a795007e9c9322e43df988267eaa1544b2f896bfc1b0bf333647fff753cc7a2e0ec5715f4251b1c54220590d796e48b8a0d0d1681e30f51247639f3 SHA512 c26772accbd5c2a04f8b8a108b87a518cba5ee4fdd142c7514d67f387080d2d37d6d3e87020b4d44b602dfa0cd6387dad29d5fc1bb75e1d5d090f674f937ddd9
 AUX beignet-1.3.2_cmake-llvm-config-multilib.patch 950 BLAKE2B 9028eede7ee68dfd539bb268914c354eeaac8a9d26647c6dfb030078199e749cf67d2c396305ccaa7a139f10fcc8eca7b36657d4425439137e7199a4e62c4d13 SHA512 9a9a0348b39f0f9d256166141b48e255ccbc03e4d5150e660cfad2c23af8ff67b75049361fa84f2c2c26be2be914ad07efeae5e150f4f390ec7d5503c49b1c74
+AUX beignet-1.3.2_disable-doNegAddOptimization.patch 2536 BLAKE2B c07e063686e80a0b3f461475345582616ee59b8e195f90a87c2338a856cb3ebb04f0dd70595d901f10ae3645b9c33cccd5c0fb9bfd60052f76067f415eafac64 SHA512 d1d4f7ba2a44ee2c6255190189d141fc8adadeb6f64935501d5ce41cff1eb31e64b32664aee3edb2203f0d267fc776fbe9ed761c344fb23d858d91d6690af086
 AUX beignet-1.3.2_llvm6.patch 1039 BLAKE2B 990a653b7ff52ec89ec1204cc5bae1d0b041ae51da4a16fd1a459abfe083be1e5647e9fdac3b336284fcdb6c460dbd9c151d5818c084d49c0c2d68fb56aed905 SHA512 634ddb79878b017be984c0327160affc06d7acaf17b1030e55542d2d2cc873bebd3808638f0966538b0dd7bca763eda2263f22f818dd0b73167a4ba3f5933aaa
 AUX beignet-1.4.0-oclicd_no_upstream_icdfile.patch 726 BLAKE2B 4d182497c099e174a95524b4bd7bda66c03e128cb089b7536716afda442d8959beab19f0e6015173fbe761f1f569ce065fd1701545ebfdd0680b070644a4d9c4 SHA512 3a77f85cb8f28096b21a77e70f901ccc64291e7439c5e4ae6d7259c30531ea550604f54d0cf910e4482089ab5782f50dcb1940e5df723b0457fdafd550b2b537
 AUX beignet-1.4.0_no-debian-multiarch.patch 862 BLAKE2B 54fb9124832e57b3466c11696cf311d32863bdc36d9f4f4e946958233884f95ad9c212bf63f598e52ad054da79f453fb5a3208958de48e45bd9f21a010309edf SHA512 6760b3b7038ba0dc125998de65ec688b5eb840d8a41543ab35f6d6b6084a877fe0e383bd44b6947695ff835b391794547d7eec21bf787548e6bb03ccf2b73587
 AUX llvm-terminfo.patch 788 BLAKE2B cb652c28aac1cca566cb801b9e7f2b6ea8a9ff9457896a50b3323b41a009e039085d2d4aeff14d9d8cf35fca3e4a23bacb3078451c4981b6f806cec4146aec83 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312
 AUX no-debian-multiarch.patch 1652 BLAKE2B 4d112429412a7ada957228aa8e6beb145fbaf04065d6f816b0f13513631211894c57e9999157db5f22d7044f231be65396040efe450d090e3774bd24c9c93482 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a
-EBUILD beignet-1.3.2-r1.ebuild 2694 BLAKE2B 97cb62df2e7dbc7647e5a81c1056350f53992715d3904b9b1c55cf78e853124ef9d77f4a1d6b5303039593a8693e668a6de354bd637f781b931b09a093bc42c9 SHA512 696d0b6df900197e4b6b765549f0441ce29afe4a89be86041d5f1ccf984428d84810570a9d2c2d00f501afb977b416ec00aadd9531b8d803aca8efaeb4ed0ea1
+EBUILD beignet-1.3.2-r1.ebuild 2688 BLAKE2B f9dddac927aa9f34731cb1e10113bbaa686cf6a9f5adb9890f89f00110033c844d2395a0a81dbd73269ff33ed78f24f6b2a15a42d7d00f63ab391a62dd3021f1 SHA512 337bf60e64644f541fbca9b0b7d5571c40fdfae97c571bc0ecc9ba408fa9c3d0f98bab41262bf7ea453da598c9ffb240e17644c15033f6d04adaa93a045a14b0
+EBUILD beignet-1.3.2-r2.ebuild 2750 BLAKE2B 39ddec90fcc36856f47922663e500b0fd9d43abe5763a7f7ad5638ae47a63f82a80495b2eb02d406613bc9456c3d197f43ee5cb58a419112545235abfc31f2e1 SHA512 650d7b33c334eaa9688d49e6849bfa6d37879ed59150e3d2554e0a655e37b2c3ecd1ccf0883a202536ff65f3f7469c6d197aaf3960a6487a05e0863f3070546e
 EBUILD beignet-1.3.2.ebuild 2630 BLAKE2B 09a301f4174494e0f8007de277f9c3d888361661631ace7e1858a0a4cfec7cac07f494b2187862e447e1079716b9561bc6526422ce8100df54bdaf282de8cf0b SHA512 823a890987d1c6e3c16f9127ebe20947ea09d9114f9e5e42fe97e212d32ae53d44dcfb37aead35608c8b3c2f2214f9c493c99381073cabd4d6ab8872f49762db
 EBUILD beignet-9999.ebuild 2452 BLAKE2B 91b4102d667aa6e265c725f7e77a5bf66198b75569d15a6ea7ea6e89a064639a5783d7670dd7627e47b6ee90124a076fba3abc8a13aeb7f82d3aaf9a7e4ab7a0 SHA512 def37f0a7884bcf1f87f3ec1da46d499a7cb6f8dc216ce51212f72039490f70746a5ca3fe3ab1bc7da481834b16d54c0bdf11f7834de319b5e978e5b641d203b
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2-r1.ebuild b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
index 7975dc31d3ce..aabc386a74b1 100644
--- a/dev-libs/beignet/beignet-1.3.2-r1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
@@ -82,7 +82,7 @@ multilib_src_configure() {
 	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
 
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/${VENDOR_DIR}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${VENDOR_DIR}"
 		-DOCLICD_COMPAT=$(usex ocl-icd)
 		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
 	)
@@ -96,7 +96,7 @@ multilib_src_install() {
 	cmake-utils_src_install
 
 	insinto /etc/OpenCL/vendors/
-	echo "${EPREFIX%/}/${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
+	echo "${EPREFIX}${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
 	doins "${PN}-${ABI}.icd"
 
 	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
diff --git a/dev-libs/beignet/beignet-1.3.2-r2.ebuild b/dev-libs/beignet/beignet-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..bc69b887c3d5
--- /dev/null
+++ b/dev-libs/beignet/beignet-1.3.2-r2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+CMAKE_BUILD_TYPE="Release"
+
+inherit python-any-r1 cmake-multilib flag-o-matic llvm toolchain-funcs
+
+DESCRIPTION="OpenCL implementation for Intel GPUs"
+HOMEPAGE="https://01.org/beignet"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="ocl-icd ocl20"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/beignet.git"
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
+	S=${WORKDIR}/Beignet-${PV}-Source
+fi
+
+COMMON="media-libs/mesa[${MULTILIB_USEDEP}]
+	<sys-devel/clang-6.0.9999:=[${MULTILIB_USEDEP}]
+	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]"
+RDEPEND="${COMMON}
+	app-eselect/eselect-opencl"
+DEPEND="${COMMON}
+	${PYTHON_DEPS}
+	ocl-icd? ( dev-libs/ocl-icd )
+	virtual/pkgconfig"
+
+LLVM_MAX_SLOT=6
+
+PATCHES=(
+	"${FILESDIR}"/no-debian-multiarch.patch
+	"${FILESDIR}"/${PN}-1.3.2_disable-doNegAddOptimization.patch
+	"${FILESDIR}"/${PN}-1.3.2_cmake-llvm-config-multilib.patch
+	"${FILESDIR}"/${PN}-1.3.2_llvm6.patch
+	"${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch
+	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
+	"${FILESDIR}"/llvm-terminfo.patch
+)
+
+DOCS=(
+	docs/.
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if tc-is-gcc; then
+			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
+				eerror "Compilation with gcc older than 4.6 is not supported"
+				die "Too old gcc found."
+			fi
+		fi
+	fi
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	# See Bug #593968
+	append-flags -fPIC
+
+	cmake-utils_src_prepare
+	# We cannot run tests because they require permissions to access
+	# the hardware, and building them is very time-consuming.
+	cmake_comment_add_subdirectory utests
+}
+
+multilib_src_configure() {
+	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${VENDOR_DIR}"
+		-DOCLICD_COMPAT=$(usex ocl-icd)
+		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
+
+	cmake-utils_src_install
+
+	insinto /etc/OpenCL/vendors/
+	echo "${EPREFIX}${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
+	doins "${PN}-${ABI}.icd"
+
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
+}
diff --git a/dev-libs/beignet/files/beignet-1.3.2_disable-doNegAddOptimization.patch b/dev-libs/beignet/files/beignet-1.3.2_disable-doNegAddOptimization.patch
new file mode 100644
index 000000000000..ae399b17f053
--- /dev/null
+++ b/dev-libs/beignet/files/beignet-1.3.2_disable-doNegAddOptimization.patch
@@ -0,0 +1,66 @@
+--- b/backend/src/backend/gen_insn_selection_optimize.cpp
++++ a/backend/src/backend/gen_insn_selection_optimize.cpp
+@@ -74,7 +74,8 @@ namespace gbe
+                   const GenRegister& replacement) :
+                   insn(insn), intermedia(intermedia), replacement(replacement)
+       {
+-        assert(insn.opcode == SEL_OP_MOV || insn.opcode == SEL_OP_ADD);
++        assert(insn.opcode == SEL_OP_MOV);
++        assert(&(insn.src(0)) == &replacement);
+         assert(&(insn.dst(0)) == &intermedia);
+         this->elements = CalculateElements(intermedia, insn.state.execWidth);
+         replacementOverwritten = false;
+@@ -101,7 +102,6 @@ namespace gbe
+     void doReplacement(ReplaceInfo* info);
+     bool CanBeReplaced(const ReplaceInfo* info, const SelectionInstruction& insn, const GenRegister& var);
+     void cleanReplaceInfoMap();
+-    void doNegAddOptimization(SelectionInstruction &insn);
+ 
+     SelectionBlock &bb;
+     const ir::Liveness::LiveOut& liveout;
+@@ -159,13 +159,8 @@ namespace gbe
+ 
+   void SelBasicBlockOptimizer::addToReplaceInfoMap(SelectionInstruction& insn)
+   {
+-    assert(insn.opcode == SEL_OP_MOV || insn.opcode == SEL_OP_ADD);
+-    GenRegister &src = insn.src(0);
+-    if (insn.opcode == SEL_OP_ADD) {
+-      if (src.file == GEN_IMMEDIATE_VALUE)
+-        src = insn.src(1);
+-    }
+-
++    assert(insn.opcode == SEL_OP_MOV);
++    const GenRegister& src = insn.src(0);
+     const GenRegister& dst = insn.dst(0);
+     if (src.type != dst.type || src.file != dst.file)
+       return;
+@@ -254,29 +249,10 @@ namespace gbe
+ 
+       if (insn.opcode == SEL_OP_MOV)
+         addToReplaceInfoMap(insn);
+-
+-      doNegAddOptimization(insn);
+     }
+     cleanReplaceInfoMap();
+   }
+ 
+-  /* LLVM transform Mad(a, -b, c) to
+-     Add b, -b, 0
+-     Mad val, a, b, c
+-     for Gen support negtive modifier, mad(a, -b, c) is native suppoted.
+-     Also it can be used for the same like instruction sequence.
+-     Do it just like a:  mov b, -b, so it is a Mov operation like LocalCopyPropagation
+-  */
+-  void SelBasicBlockOptimizer::doNegAddOptimization(SelectionInstruction &insn) {
+-    if (insn.opcode == SEL_OP_ADD) {
+-      GenRegister src0 = insn.src(0);
+-      GenRegister src1 = insn.src(1);
+-      if ((src0.negation && src1.file == GEN_IMMEDIATE_VALUE && src1.value.f == 0.0f) ||
+-          (src1.negation && src0.file == GEN_IMMEDIATE_VALUE && src0.value.f == 0.0f))
+-        addToReplaceInfoMap(insn);
+-    }
+-  }
+-
+   void SelBasicBlockOptimizer::run()
+   {
+     for (size_t i = 0; i < MaxTries; ++i) {
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 0f78c738f579..0a3ef8254675 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,9 +1,7 @@
 AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432ee7af503dd2fc8a59185c5406b659629ee5a0c4f73c2c090dfccf64757baea196fcca4f60379a2b2f04baf81ee6 SHA512 bccb615e832ef31381afd0996a06cfb4c37f29bd8d7691435d592f2ec88f525f3e9e19adf84c78ebd6f24f60e407e29ef99bdff11103ef1344250fe5251fca0a
 AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642
 DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649
-DIST Botan-2.6.0.tgz 6599127 BLAKE2B c45a974f89571c1050e28108267ca6ec094171be3d7dbcb033b86b7dac3f8074703c40c42d5737074a86c19266b4b47c266d0864ce08ee26fad05116a50c48a8 SHA512 2082b4aaac0802f117a5f75c67a69e6d364b436a0ebe543032e370c3f085752bbe1ca48051462066e13bd42e47573ebc532d1d45074fe406df032f33346ee645
 DIST Botan-2.7.0.tgz 7021654 BLAKE2B 3f18b7ba660a72a409beeaba8bd1b1bd021f645c135bed56d75b6ba906b7c28d1e14eac9550862500dda9c4b3ac3135cfc9c340e073c573deb66b236e09f8054 SHA512 992138d83e18aedf80337d825f80c34dd3d2177eb30967573c57cf9fb7e7f9a9965ae3d75f23635f4c93b4efb7bb5adbb3423702663c78a5eb905dd567561858
 EBUILD botan-1.10.17.ebuild 4221 BLAKE2B 463e3e2b0893b5c9330c7d317fb089f70cc8adf2f60654711674bfb1eeb3c2b34e44e5695b230078510821cb7f45a23745016ebfd6c30cc660d6a132f4ef3223 SHA512 00065423d5f3600a08542e8722ce63dcf6147bce0b2104e466acf444c7e107f191652b588d7b7054652099cb89973b646987084c39678a8472d565249e064f6b
-EBUILD botan-2.6.0.ebuild 2339 BLAKE2B f3871202e70810f7003a16a02befc4bf69ff04baa451a80a2bfb13a96cb1cbc645a1f622941c9af27b2a6b8617fe69f81d601a1fc0738ac4f922465a8014277a SHA512 f46c844b7df21647876f933f4263427625fc2da6a6688c5333f4205fad06da0c99a68de152036778ba0a6b4890b772c8e41f95687786e6153ace2d52856be3b2
 EBUILD botan-2.7.0.ebuild 2339 BLAKE2B f3871202e70810f7003a16a02befc4bf69ff04baa451a80a2bfb13a96cb1cbc645a1f622941c9af27b2a6b8617fe69f81d601a1fc0738ac4f922465a8014277a SHA512 f46c844b7df21647876f933f4263427625fc2da6a6688c5333f4205fad06da0c99a68de152036778ba0a6b4890b772c8e41f95687786e6153ace2d52856be3b2
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-2.6.0.ebuild b/dev-libs/botan/botan-2.6.0.ebuild
deleted file mode 100644
index 9ff13b7881c5..000000000000
--- a/dev-libs/botan/botan-2.6.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit multilib python-r1 toolchain-funcs versionator
-
-MY_PN="Botan"
-MY_P="${MY_PN}-${PV}"
-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"
-SLOT="2/$(get_version_component_range 2)" # soname version
-LICENSE="BSD"
-IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
-	zlib? ( >=sys-libs/zlib-1.2.3 )
-	boost? ( >=dev-libs/boost-1.48 )
-	lzma? ( app-arch/xz-utils )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	dev-lang/python:*
-	doc? ( dev-python/sphinx )"
-
-src_configure() {
-	local disable_modules=()
-	use boost || disable_modules+=( "boost" )
-	use bindist && disable_modules+=( "ecdsa" )
-	elog "Disabling modules: ${disable_modules[@]}"
-
-	# Enable v9 instructions for sparc64
-	if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
-		CHOSTARCH="sparc32-v9"
-	else
-		CHOSTARCH="${CHOST%%-*}"
-	fi
-
-	local myos=
-	case ${CHOST} in
-		*-darwin*)   myos=darwin ;;
-		*)           myos=linux  ;;
-	esac
-
-	local pythonvers=()
-	if use python; then
-		append() {
-			pythonvers+=( ${EPYTHON/python/} )
-		}
-		python_foreach_impl append
-	fi
-
-	CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
-		--prefix="${EPREFIX}/usr" \
-		--libdir=$(get_libdir) \
-		--docdir=share/doc \
-		--cc=gcc \
-		--os=${myos} \
-		--cpu=${CHOSTARCH} \
-		--with-endian="$(tc-endian)" \
-		--without-doxygen \
-		$(use_with bzip2) \
-		$(use_with lzma) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssl openssl) \
-		$(use_with zlib) \
-		$(use_with boost) \
-		$(use_with doc sphinx) \
-		$(use_with doc documentation) \
-		$(use_enable static-libs static-library) \
-		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
-		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
-		|| die "configure.py failed"
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
-}
-
-src_install() {
-	default
-	use python && python_foreach_impl python_optimize
-}
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index 4d8b60e488ef..95dd8061f807 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 1529 BLAKE2B 986777433697a41644c784a03c574b46b8342354fd487750340410ed0721ac7b92f30f69606c948735e6f61c3864917ea362fb43e8d543aaca96b15d82bc4aa6 SHA512 ce3bbb0be152c64998b4f8d242b1481fe1e1ac9d541867095e0d9405833f043153a1eaf4b848710ca7dc58481e626fc535042253319f0c65836b5c3ff4fc34ce
-EBUILD crypto++-7.0.0-r2.ebuild 978 BLAKE2B bde9d9e58cd8352a2daadd29b43e36f6a9f32c34f12ef5df79d7118c31597d93a3d550a25cdc96d0644bb551423ee9956ca1b62ee47e21dfe13e7822a2fc105f SHA512 4d4f243f149afa182131b6b22e0f91ce7d15fa7202ba6a5bdf2ec419854ef098bff8e60e453e97bf509087f7f2d5f45fde5456c4fca1d92585d70602cf656421
+EBUILD crypto++-7.0.0-r2.ebuild 977 BLAKE2B e31b81c78106b4ccff69efaf20765d65398dfd699da5d2cf271ed6729ccd869396bb5dd9c70ae6f1843533d93407fc68b2972547af74c7e7a21d36c70fd43029 SHA512 d589c5fd544886d074f81d6ca72a6462fa501020f272ab524b2fa24a2db672d9f67066eeb7185c5c8cb96c4bd7f8109c88303ed312c6d18e7c8178fb547cd229
 MISC metadata.xml 597 BLAKE2B 8e8dd9fb9a60f2a5e7fdda6de99b6a07264d54aaa666a41d7fb30da338f91867bdda7135bd21e92191722de7e14ac10f394ac8d8f3118109f4ce6800fb12ebc0 SHA512 e20fd2e76765968417d659a6342ff9229dc822c2291bca00dd6cccd55dc3195563574aaf3a88c68b111821b41c9bce172f4d79bbb462f2b913ab15bcc2c2ee5a
diff --git a/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild b/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild
index e117e4eabc3b..6a821198fac2 100644
--- a/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild
+++ b/dev-libs/crypto++/crypto++-7.0.0-r2.ebuild
@@ -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"
 
 DEPEND="app-arch/unzip"
diff --git a/dev-libs/dbus-glib/Manifest b/dev-libs/dbus-glib/Manifest
index d62d81fc47d9..443c014e7e76 100644
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@@ -1,7 +1,7 @@
 DIST dbus-glib-0.102.tar.gz 783792 BLAKE2B 5dca4d1d4c9d281e46ad9b15307a738698d6588b064fe07ddeae63d7fbbca0b1338d655ebcdb2b4259ce8979c5ec2888c05f8578d73f04c6c7037bd80e6692d7 SHA512 9bf4b33dd264eaed9ade0e35f0ad47986c31bd5e3de4d3e2fcee66a9be87000b6121bc810b9a5a24eca53190d98323b871dc78f341df8e05bd0247b096cf778f
 DIST dbus-glib-0.108.tar.gz 812488 BLAKE2B e958c4054c09ec98d7bff659917a9c162dc4338aabcc5c6ec6d7ec34304867dd65d373eeb8871cd188424a36dafa337bb713fb2aaa87e47d1ed4f91a4e7ecd7f SHA512 9fa7cd1c22bf6ee1e345dd6fe48aa725abc01b3b180ba430efea9996403ad99636b2c40f682956978ae5049c110c3298fa199470a4cc05907e11773d034ea5b1
 DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
-EBUILD dbus-glib-0.102.ebuild 2015 BLAKE2B b3b6deb9d510088818e8d7fc2c3d06136790e863f07863cacd680a1982262eec89451251d341c334450fdd1bdcbc9260fffd9fe88ef2e23feaf13f1ef621e545 SHA512 4081a7c7ee44f7434aab752ea2483174d37be33ae6d056b1b57db6b0ca55f70d09ecedc06958821cd75c3e2d24ba6fcc32fdb894d69fc1dfe9f0fa566ac72aea
-EBUILD dbus-glib-0.108.ebuild 1968 BLAKE2B 9c7fed5282fbdea61e97cdf89ea900f0791920c868ff6eefb002cfd995529f06c43d5bdf5acfbfc30f8a3aae26056e90d65867ca6e0909d96e1de3065b51fce5 SHA512 2592519f239c67641c446c1747626900ecdab189c7f518abb9b16eef32799589be7bd732a93aded039cfe6680265143285985136d4281b0e2e6fff74f7db8ced
-EBUILD dbus-glib-0.110.ebuild 1917 BLAKE2B abd159b8fba288cf5085b5902ef2f08c238e4bcbb225b722e12451f98a291dcd24116023ce21a0265601f67874370484b4ebbf38ff9874c2bdc4a2f72a352667 SHA512 7aea1d3a9b12d4d6c543af4840d462635346fa46f09c954424285745661333893c21f081a7a84a68aeb9c8d7c0716da70550948abdbea84e6ae99b938a7c45d2
+EBUILD dbus-glib-0.102.ebuild 2004 BLAKE2B 96ae72736aa5720e4a977014e4ddf8ea50296d1a769201864f19f36b1a910c8489a894b983a6106970a2407efea6d1c56510f78f2b5a27d6dff62972ac4e9de7 SHA512 abfa6ade67b9dfbbba290cf4bf5af1224763ec6ffb7b5bd5e1a420cef6117325dfa292f5916f905656348487346b041fff0fe98ea120229c5aecaf4ba1e92f54
+EBUILD dbus-glib-0.108.ebuild 1957 BLAKE2B 97f1a627cb0d1f45cb9668483e2ab90cd56c633759f0286a3ab87016fbcfc8126f890f5095275ab1ceae109783b2be1cf8d587e970f10798e48cf15edc4fc707 SHA512 3b419676f6a1b24181b61dcc20becb6f25df57ce61322f9f186e89f67a084efa8f86b69a282ae48f4ef451011238d7744e49df8f23f332d1a33297b934319325
+EBUILD dbus-glib-0.110.ebuild 1906 BLAKE2B 493c94309e38a1ee7513cda7d62e077a436e290a0cc79c9197a404189a2721da396c5ea1993d6d251c96ed2267369f0c19b421c98ef80b7f4241abdbefdaf0e8 SHA512 36e614614dbc59c7e6ccf9d011adddfb766bf5cf52e465aa0fd3db60f29d60750b8a9492758576632330bad6ac4631b39dc4e8e611e28a652fc6eeb7946d6ce4
 MISC metadata.xml 326 BLAKE2B 83337c958adc4c6e7c8ffe6c166598af211c2688753440bbf3978e3bca37553eb90d3d0c8b0423d422691afcbae51c872b2149c97a76206bd090e379e7fff422 SHA512 65080e75b6d877c594f4f4a1e931d26885b3059f43d567ccd640f089cfc5d7969963cd5d8fa51200dbbafcaf93eddf6faa5cf7d548b60809b808543dcb3c2af6
diff --git a/dev-libs/dbus-glib/dbus-glib-0.102.ebuild b/dev-libs/dbus-glib/dbus-glib-0.102.ebuild
index 5d32ceb301f5..9abc12ab03ad 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.102.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.102.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-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 ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="debug doc static-libs test"
 
 CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
diff --git a/dev-libs/dbus-glib/dbus-glib-0.108.ebuild b/dev-libs/dbus-glib/dbus-glib-0.108.ebuild
index d7e488813c04..bf3855c09031 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.108.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.108.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-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 ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs test"
 
 CDEPEND="
diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
index 79b4c02e2d66..c2e3549e33e5 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-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 ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs test"
 
 CDEPEND="
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index b0d2f5ce7b4f..ea7f3d19a494 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,9 +1,6 @@
-AUX efl-1.17.0-gnutls-3.4.patch 1303 BLAKE2B 74368829bd2cc3ebf1878384dfa6fc5a4290fb7b59b52d387141992fa957ef3099b6c5bf2c8a0723bbba034a45448c68e3bee5c42fdf0c4f8bd9196a95d1f178 SHA512 3bff2855849031b35fa68f70b3c59136f404793564a3fe2b15cc9e15ef211b0a41cb628330d84832fc4e9b1b331c161e6731816d2efe68aa7a1a5146bd87196a
-DIST efl-1.17.0.tar.xz 43485360 BLAKE2B 97a79bda40658eac6e50886a01821bb8c98d6f56d18fcd51dc3827154506064bec3bf665c8f471919aedb03ae83ce4045293afa9a0bf8d3eaf947221ef7cba9e SHA512 e4f28f938daf4ec1cb3d761407a443e401b59c6bb0f9fa6cd771dbd256b95f4a32a5f9e6bd8ad8328708a382f732e67abd1a23c7be2ff222f08bc8135a2435da
 DIST efl-1.18.4.tar.xz 64609944 BLAKE2B b36e5ee7c64a57772c5826e990a85110fffc3488e605d72515d4db7a6ec56eee25eb68c7136840f24cb8cdcdc8d7050e2825c17f0e4c5566db7d9ec2c96fd557 SHA512 2cfdcde8b5adb93310e75e4923e3845392bed97563ca1a68f4537e346b51f59acefaa85a425bdbb5619e5bfd6c9ff92b4bd1888b5d4ddd8db94c8a555e3934c9
 DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
 DIST efl-1.21.0.tar.xz 71030532 BLAKE2B 3480e261aef05b169a850d27f3d9fa6da0ad9bc9ac04548137829e662546cd7d85c87596576e561bba33f9f1be657d81f261595e34c711ff9e35d551ae5f09a8 SHA512 497735f518976d70b96023b013a6d821f6695fe56def2abf5bd1e1c7ad89d324428017d7909c7b73bfb332b811b5596592b105bb4c3d2f6a40929f1cefc2b789
-EBUILD efl-1.17.0-r1.ebuild 7068 BLAKE2B e0ce5cf1e86f41918799a7ceebfa341726ea9a700c7e2e4d89acedaf595171b12bef11261fed2bea14c4099fa63fcf063d0eddb49c1dcf490449f936ec4dd1c8 SHA512 a5293c2f97a4976fe3681ad8da97918f37a0bd47bf37cf38d4f025ad7512782e967deaef1d2f80c624ccf57c8b68b74f8288a9b223f710dcee3bde515d454be2
 EBUILD efl-1.18.4-r1.ebuild 7298 BLAKE2B d88740f4081b53d274f36e1f8200dd917030b6246cc88d8f9f2b24569ff79a69f2b7e68e76d61e2123297315850d03c3273894ffc0a508d425724fb25395ddd3 SHA512 2e2992916f6af3acec5af00c3d5c3e781414fb2c35c13000a18786dfd0e46ba27506130010900cbe75da80f33fa62410ccfb597be4b77d2770773bdf87be7faa
 EBUILD efl-1.20.7-r1.ebuild 7785 BLAKE2B 6f9cff3f6fbf9a8169251b5e89b447cf20a9d9a187efe24681dc6d6e5e6fa912018df393444fd7720d0605116c68f0ad0c7173192ca720ccb3472da57d11e6b0 SHA512 3433be6e2fe8913671f8028fbd2566ea98fb4f14c9184086f4bd13760aaa153769b024dd57faa7e0c5327b6de961f55175c5d35ecc515b7e76a11c595f6e0d0d
 EBUILD efl-1.21.0.ebuild 6780 BLAKE2B b172687994d6794457cbfc4f282b12646e2865ae909b7348f4776570c4a95020457c59aded59a9abc7d133804293ce5d7755221be5aede6f58cffef04792b7de SHA512 58c326f5cb419931a15c4745c0fef5b4fb3b5034611fc5d3acbcd9e8df9deee2bd14f3d67b98d9d6d49805600699ddbadfe6da0c0c9f2b79c6d1bd5af32324e4
diff --git a/dev-libs/efl/efl-1.17.0-r1.ebuild b/dev-libs/efl/efl-1.17.0-r1.ebuild
deleted file mode 100644
index 9ab0e9d1a1e7..000000000000
--- a/dev-libs/efl/efl-1.17.0-r1.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_P=${P/_/-}
-
-if [[ "${PV}" == "9999" ]] ; then
-	EGIT_SUB_PROJECT="core"
-	EGIT_URI_APPEND="${PN}"
-elif [[ *"${PV}" == *"_pre"* ]] ; then
-	MY_P=${P%%_*}
-	SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
-	EKEY_STATE="snap"
-else
-	SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
-	EKEY_STATE="release"
-fi
-
-inherit enlightenment pax-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib unwind v4l valgrind wayland webp X xim xine xpm"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-REQUIRED_USE="
-	pulseaudio?	( sound )
-	opengl?		( || ( X sdl wayland ) )
-	gles?		( || ( X wayland ) )
-	gles?		( !sdl )
-	gles?		( egl )
-	sdl?		( opengl )
-	wayland?	( egl !opengl gles )
-	xim?		( X )
-"
-
-RDEPEND="
-	drm? (
-		>=dev-libs/libinput-0.8
-		media-libs/mesa[gbm]
-		>=x11-libs/libdrm-2.4
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gif? ( media-libs/giflib )
-	glib? ( dev-libs/glib:2 )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? (
-		ssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl )
-		)
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( media-libs/harfbuzz )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	!oldlua? ( >=dev-lang/luajit-2.0.0 )
-	oldlua? ( dev-lang/lua:* )
-	physics? ( >=sci-physics/bullet-2.80 )
-	pixman? ( x11-libs/pixman )
-	png? ( media-libs/libpng:0= )
-	pulseaudio? ( media-sound/pulseaudio )
-	scim? ( app-i18n/scim )
-	sdl? (
-		media-libs/libsdl2
-		virtual/opengl
-	)
-	sound? ( media-libs/libsndfile )
-	systemd? ( sys-apps/systemd )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	wayland? (
-		>=dev-libs/wayland-1.8.0
-		>=x11-libs/libxkbcommon-0.3.1
-		media-libs/mesa[gles2,wayland]
-	)
-	webp? ( media-libs/libwebp )
-	X? (
-		x11-libs/libXcursor
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-
-		opengl? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-
-		gles? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-	)
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-	xpm? ( x11-libs/libXpm )
-
-	sys-apps/dbus
-	>=sys-apps/util-linux-2.20.0
-	sys-libs/zlib
-	virtual/jpeg:0=
-
-	!dev-libs/ecore
-	!dev-libs/edbus
-	!dev-libs/eet
-	!dev-libs/eeze
-	!dev-libs/efreet
-	!dev-libs/eina
-	!dev-libs/eio
-	!dev-libs/embryo
-	!dev-libs/eobj
-	!dev-libs/ephysics
-	!media-libs/edje
-	!media-libs/emotion
-	!media-libs/ethumb
-	!media-libs/evas
-"
-#external lz4 support currently broken because of unstable ABI/API
-#	app-arch/lz4
-
-#soft blockers added above for binpkg users
-#hard blocks are needed for building
-CORE_EFL_CONFLICTS="
-	!!dev-libs/ecore
-	!!dev-libs/edbus
-	!!dev-libs/eet
-	!!dev-libs/eeze
-	!!dev-libs/efreet
-	!!dev-libs/eina
-	!!dev-libs/eio
-	!!dev-libs/embryo
-	!!dev-libs/eobj
-	!!dev-libs/ephysics
-	!!media-libs/edje
-	!!media-libs/emotion
-	!!media-libs/ethumb
-	!!media-libs/evas
-"
-
-DEPEND="
-	${CORE_EFL_CONFLICTS}
-
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	enlightenment_src_prepare
-
-	epatch "${FILESDIR}/${P}-gnutls-3.4.patch"
-
-	# Remove stupid sleep command.
-	# Also back out gnu make hack that causes regen of Makefiles.
-	# Delete var setting that causes the build to abort.
-	sed -i \
-		-e '/sleep 10/d' \
-		-e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
-		-e '/BARF_OK=/s:=.*:=:' \
-		configure || die
-
-	# Upstream doesn't offer a configure flag. #611108
-	if ! use unwind ; then
-		sed -i \
-			-e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	if use ssl && use gnutls ; then
-		einfo "You enabled both USE=ssl and USE=gnutls, but only one can be used;"
-		einfo "gnutls has been selected for you."
-	fi
-	if use opengl && use gles ; then
-		einfo "You enabled both USE=opengl and USE=gles, but only one can be used;"
-		einfo "opengl has been selected for you."
-	fi
-
-	E_ECONF=(
-		--with-profile=$(usex debug debug release)
-		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
-		--with-x11=$(usex X xlib none)
-		$(use_with X x)
-		--with-opengl=$(usex opengl full $(usex gles es none))
-		--with-glib=$(usex glib)
-		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
-
-		$(use_enable bmp image-loader-bmp)
-		$(use_enable bmp image-loader-wbmp)
-		$(use_enable drm)
-		$(use_enable doc)
-		$(use_enable eet image-loader-eet)
-		$(use_enable egl)
-		$(use_enable fbcon fb)
-		$(use_enable fontconfig)
-		$(use_enable fribidi)
-		$(use_enable gif image-loader-gif)
-		$(use_enable gstreamer gstreamer1)
-		$(use_enable harfbuzz)
-		$(use_enable ico image-loader-ico)
-		$(use_enable ibus)
-		$(use_enable jpeg2k image-loader-jp2k)
-		$(use_enable neon)
-		$(use_enable nls)
-		$(use_enable oldlua lua-old)
-		$(use_enable physics)
-		$(use_enable pixman)
-		$(use_enable pixman pixman-font)
-		$(use_enable pixman pixman-rect)
-		$(use_enable pixman pixman-line)
-		$(use_enable pixman pixman-poly)
-		$(use_enable pixman pixman-image)
-		$(use_enable pixman pixman-image-scale-sample)
-		$(use_enable png image-loader-png)
-		$(use_enable ppm image-loader-pmaps)
-		$(use_enable psd image-loader-psd)
-		$(use_enable pulseaudio)
-		$(use_enable scim)
-		$(use_enable sdl)
-		$(use_enable sound audio)
-		$(use_enable systemd)
-		$(use_enable tga image-loader-tga)
-		$(use_enable tiff image-loader-tiff)
-		$(use_enable tslib)
-		$(use_enable v4l v4l2)
-		$(use_enable valgrind)
-		$(use_enable wayland)
-		$(use_enable webp image-loader-webp)
-		$(use_enable xim)
-		$(use_enable xine)
-		$(use_enable xpm image-loader-xpm)
-		--enable-cserve
-		--enable-image-loader-generic
-		--enable-image-loader-jpeg
-
-		--disable-tizen
-		--disable-gesture
-		--disable-gstreamer
-		--enable-xinput2
-		--disable-xinput22
-		--enable-libmount
-
-		# external lz4 support currently broken because of unstable ABI/API
-		#--enable-liblz4
-	)
-
-	enlightenment_src_configure
-}
-
-src_compile() {
-	if host-is-pax && ! use oldlua ; then
-		# We need to build the lua code first so we can pax-mark it. #547076
-		local target='_e_built_sources_target_gogogo_'
-		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
-		emake -C src "${target}"
-		emake -C src bin/elua/elua
-		pax-mark m src/bin/elua/.libs/elua
-	fi
-	enlightenment_src_compile
-}
-
-src_install() {
-	MAKEOPTS+=" -j1"
-
-	enlightenment_src_install
-}
diff --git a/dev-libs/efl/files/efl-1.17.0-gnutls-3.4.patch b/dev-libs/efl/files/efl-1.17.0-gnutls-3.4.patch
deleted file mode 100644
index 6c5f8eb757c5..000000000000
--- a/dev-libs/efl/files/efl-1.17.0-gnutls-3.4.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6f42992b4f1110f44d2db57cd6fe42559cfffdc2 Mon Sep 17 00:00:00 2001
-From: Cedric BAIL <cedric@osg.samsung.com>
-Date: Wed, 21 Sep 2016 10:33:44 -0700
-Subject: [PATCH] eet: fix gnutls support with newer version.
-
----
- src/lib/eet/eet_cipher.c | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/lib/eet/eet_cipher.c b/src/lib/eet/eet_cipher.c
-index a34fdff..cf9ef71 100644
---- a/src/lib/eet/eet_cipher.c
-+++ b/src/lib/eet/eet_cipher.c
-@@ -679,7 +679,6 @@ eet_identity_check(const void   *data_base,
-    gnutls_datum_t datum;
-    gnutls_datum_t signature;
-    gnutls_pubkey_t pubkey;
--   gnutls_digest_algorithm_t hash_algo;
-    unsigned char *hash;
-    gcry_md_hd_t md;
-    int err;
-@@ -717,10 +716,10 @@ eet_identity_check(const void   *data_base,
-    if (gnutls_pubkey_import_x509(pubkey, cert, 0) < 0)
-      goto on_error;
- 
--   if (gnutls_pubkey_get_verify_algorithm(pubkey, &signature, &hash_algo) < 0)
--     goto on_error;
--
--   if (gnutls_pubkey_verify_hash(pubkey, 0, &datum, &signature) < 0)
-+   if (gnutls_pubkey_verify_hash2(pubkey,
-+                                  gnutls_x509_crt_get_signature_algorithm(cert),
-+                                  0,
-+                                  &datum, &signature) < 0)
-      goto on_error;
- 
-    if (sha1)
--- 
-2.10.2
-
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index f1c424ee9d49..3c5b33ecdf8b 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -2,7 +2,7 @@ AUX elfutils-0.118-PaX-support.patch 962 BLAKE2B f631b1dcf20cf257efd83f24cf53b33
 DIST elfutils-0.170.tar.bz2 8358001 BLAKE2B 03ea3ba7d3feaac43065312c475f4a3cd9083a6c56c9982fa00c0ed02b28440f6a37bbeca4be18db13749647ea1c8a6f00dae7efcb1c70235110e60ad7d56d06 SHA512 aca0b5e271138eaf86e36505ffb101181207b151e833e6cd7c18986ac50678542a5ecd2250f8dd6923ca497142f197c8b08fd225e4130b16b6203c24013d6d28
 DIST elfutils-0.172.tar.bz2 8601066 BLAKE2B 7d4cb9944bfc258ba46312e8a4dde491f9d8fb4fa27837f6df0993107256f76e79ce02ea5872475a70ff9ebe9093e39bddf1c807be2af4bf0f6f5429f446a1ce SHA512 b2f491e976ef3067fe33ad22b3ef1952c47557571747899e94aee601bfeb95e8e1a91daad80a7950bee7feb42192769663db32eb65734ea5ffbc0b87cdad76b2
 DIST elfutils-0.173.tar.bz2 8684782 BLAKE2B c5905bb864059bdfb2699a0681a0ec576b6b8da444b0641e8184f58735084588910930bcca14583db6be75b24a0e374413911ded5ba2ca893798404fbe7374eb SHA512 7f38e4ce2098b685f15030bf01f0a66a74aa32fbfcead0304c1d0e0a929b348a72f99e685cd4605465f4337393382112f64b8847e6c2f7cc1a57a4fd03d03eb3
-EBUILD elfutils-0.170-r1.ebuild 1801 BLAKE2B d4052f7c28551fe5fdb97bf6dd59b72dfdf399a928fb218ba644c45131dbd18e3ab022e6d1b895ddbc13b65e0477813ce9aa8193aca88b4496bff9efc066cbe1 SHA512 c7ca487e67420bbcc9d0ac30a8338c0088f9b49ad23344dd7e0054596b20b1808ce123e1868d807afc87529ccc710f1a8fe1096461445fcbb77aa5d25ba3a4cf
-EBUILD elfutils-0.172.ebuild 1824 BLAKE2B 2766930b57ff25716ad60dca35aa71494ea41732f1be9b342d8217748d348c4db4256df3b859ab6bfa23e14eba0aa5d3e7c56f717b8da4c0f0b2ad77073134ee SHA512 bf79df6347d8d34f1020753adef3359add34c2dd3c16384f2091853e2dc691e2fe0aeacfe2f5f717a3449b18b9d1d914506b5cb3d1cf159527d973de0bdf9445
-EBUILD elfutils-0.173.ebuild 1824 BLAKE2B 2766930b57ff25716ad60dca35aa71494ea41732f1be9b342d8217748d348c4db4256df3b859ab6bfa23e14eba0aa5d3e7c56f717b8da4c0f0b2ad77073134ee SHA512 bf79df6347d8d34f1020753adef3359add34c2dd3c16384f2091853e2dc691e2fe0aeacfe2f5f717a3449b18b9d1d914506b5cb3d1cf159527d973de0bdf9445
+EBUILD elfutils-0.170-r1.ebuild 1790 BLAKE2B 2581434109a567bc3c57d6ebaf6b1416377d2fbfcc1cadc51efbefa02caab505dcdfa22e58b33c80ce37637c5abb1559ebdb117999eb5f552095f85da8f0dafc SHA512 22d72fdb2e2c1e8d4e1d47113a8c0d6aeb2e8e7b9f0759d445e32509c7bce9cc6dc8edd38e12ffa556447981fc60c7a04df76fd6d529b79d07d28cb10314f6ce
+EBUILD elfutils-0.172.ebuild 1813 BLAKE2B e364165c42a078dfeea283efdd0268261a57862dcd98f26f10c363edb54f1c12990148b9ac2d6c1170e719e81c902953f1212d4a43a61d5fb6839205ac836190 SHA512 21afb93206de176856703f5ba64ba990a108160e004f66251a3557b110063414cc4d9b90558ea2be6c38b676fbd15b9cb5f03b49681ac52d723dd7ee6add14a4
+EBUILD elfutils-0.173.ebuild 1813 BLAKE2B e364165c42a078dfeea283efdd0268261a57862dcd98f26f10c363edb54f1c12990148b9ac2d6c1170e719e81c902953f1212d4a43a61d5fb6839205ac836190 SHA512 21afb93206de176856703f5ba64ba990a108160e004f66251a3557b110063414cc4d9b90558ea2be6c38b676fbd15b9cb5f03b49681ac52d723dd7ee6add14a4
 MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac
diff --git a/dev-libs/elfutils/elfutils-0.170-r1.ebuild b/dev-libs/elfutils/elfutils-0.170-r1.ebuild
index 8efbddc98e10..43f88abea483 100644
--- a/dev-libs/elfutils/elfutils-0.170-r1.ebuild
+++ b/dev-libs/elfutils/elfutils-0.170-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 ~arm-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/elfutils/elfutils-0.172.ebuild b/dev-libs/elfutils/elfutils-0.172.ebuild
index 12da334a1b00..06de183c0017 100644
--- a/dev-libs/elfutils/elfutils-0.172.ebuild
+++ b/dev-libs/elfutils/elfutils-0.172.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 ~arm-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/elfutils/elfutils-0.173.ebuild b/dev-libs/elfutils/elfutils-0.173.ebuild
index 12da334a1b00..06de183c0017 100644
--- a/dev-libs/elfutils/elfutils-0.173.ebuild
+++ b/dev-libs/elfutils/elfutils-0.173.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 ~arm-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 9ab3201ff42c..a88d4ba46d7d 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,7 @@
 DIST ell-0.5.tar.xz 393112 BLAKE2B c9b718a6b471ef428f563989843281b7b00c1ed382d68e241d9b1f624ef085c554ed46eefac544a8711fe2ec15428eb5b069f60d827e5a363e8c0a539e2fbf7f SHA512 aa84ce99980ada2bd80ac5a479d31c84784bc7b09afd0586ab1672a1227dbe14fdbc3788ccc812b22073e1e55b8902f81f86d9f1350c5c280886a8528d6979ce
 DIST ell-0.6.tar.xz 393016 BLAKE2B ad3a5402eca26a77caabb1d01054500333824c56403c1585c7aaf9ac19fd3f17e4d1dfc226f58ae1303d678e88d5b07c6b6e9c68a643f99b645ca4c4a10f7b19 SHA512 df39c460e781d5fa9838df362721687747148280cb7762dddce6aa35c38db1713b01efff5156d9dc144d6e11d50be7058db1362f4143f7a606bc6fbeeedaf8bf
+DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
 EBUILD ell-0.5.ebuild 711 BLAKE2B b2d4c540efc7456c20c10e42e79006ae43de0bd502ff4948a50d098c1eee1016f32b72d705d555a6b5dc6320467de1d962b3c382d785daec9025f1c288e8f8b2 SHA512 26fd2588d3630c874fb0a6ccc1bdd66d175022586b29b75362920ddf3e28928378d1e3c2156ffa6c70fbc57e0fc743ac8496ff8d0ef946fe51a417122f3c0fc0
 EBUILD ell-0.6-r1.ebuild 761 BLAKE2B adad8b4b8c0691fb5ee832041183f9fd6d48c4bde90e08c706ee41badc394892d77f85cb382d677ae31af34bff8a31966bea341eeda48d15e18144b4a585f702 SHA512 0a971cb5de632396621f3d4854ad33bc529348a8a7aef5625d89886e1984391d4bd5fba05c646b831b2b8734172fef773ee42236cc4ea302b5ac5630381e9f47
-EBUILD ell-0.6.ebuild 713 BLAKE2B 82bbcf1bdff172c0db3d90e1339c2e7666ea21936a4180b20ebaef6515e035f461da3b0afd8c2d43897ce64702dc924c159fdfc21e87c54cd7b1ba2df25d5f38 SHA512 d2ceb939d7f51d3191908b1df17dacec48c48a68df21f6a192818a7d2081e5122b00c0b03b73f612364071a7e901aa56cdad56ea00a7cb7ecde6191ac14b5668
+EBUILD ell-0.9.ebuild 761 BLAKE2B adad8b4b8c0691fb5ee832041183f9fd6d48c4bde90e08c706ee41badc394892d77f85cb382d677ae31af34bff8a31966bea341eeda48d15e18144b4a585f702 SHA512 0a971cb5de632396621f3d4854ad33bc529348a8a7aef5625d89886e1984391d4bd5fba05c646b831b2b8734172fef773ee42236cc4ea302b5ac5630381e9f47
 MISC metadata.xml 343 BLAKE2B 520f23aef2f64a4592c7252ad8a956763fa337b746fa8b968d66cbf94c06e2c2cf435553340ca82720c83b653e7caab95394c3ce20c52cdc53bf7fbd4099e7dd SHA512 0a4654d2652442d1ab324cc2ea849506381d7f250e3c52bceb966a61795a81072d35e9656b9d472725f4ff78a84bd58b3576fcc837b4ec9e93cc5c34c92d6fae
diff --git a/dev-libs/ell/ell-0.6.ebuild b/dev-libs/ell/ell-0.9.ebuild
index 5c7f1002ae5b..c3776ce019cd 100644
--- a/dev-libs/ell/ell-0.6.ebuild
+++ b/dev-libs/ell/ell-0.9.ebuild
@@ -28,5 +28,8 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
 	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 94ebb5639cf9..c4502be23eb3 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -5,8 +5,8 @@ DIST expat-2.2.1.tar.bz2 405441 BLAKE2B 273960016692f3b9a1121eb07b67c28e5b3066fa
 DIST expat-2.2.4.tar.bz2 505038 BLAKE2B 4d40629621bde41b44cdef4fa37937ce064cdbd621cc0d466b50a1a4626aff8bc8c8f6e9fbd94a36b709d449384da76ade683f31cf0aec0470006b750fc0a6ea SHA512 788249e2c6edf8521c4a99830fd5e51a55c062b834516f6775759cd71accf6375f12d3bd38f8b069777d081a4380b9549049921386ca0cb4b9b9daa4861d6592
 DIST expat-2.2.5.tar.bz2 510868 BLAKE2B 9d4709c2d157a04c08afd80b05f120407dc320023c3dbfe9e6872fadf0de2d6fa497f85ad9a21679fa0689c13cbb25adfd92912ae374d08de791dfeb4eb6918d SHA512 8226970a7e5d2b8d7818081758ca59bb6ce2d655feaa9d3a92481629000b73fde4782f50343d58ec4e1cebe75649e1980f636775a731d8aa4b55ceb843d9f637
 DIST expat-2.2.6.tar.bz2 513322 BLAKE2B 386736da1f2204fa8f15ee4d1b3d11f01ed691efe6951b9f24f2bd30ab5494e75da6a97ceb1ffe4a0a8ecdc80f96f51d21c54f35a2cbc352a9fe9425545bf15b SHA512 dbfb635a5fe7b190722664263a0dd437b512fdf519bc53bd4905567f4bfb4b1e89a021562da63df8cacd48b706d1dea60ccde47f279e57400ad3c846b6e9c4e6
-EBUILD expat-2.2.1.ebuild 2209 BLAKE2B f4910c2e5a6462c7c1859d2f20a2d9892c72572077c9e479851a47d49882f8ff578e399b40b93bb162e50052b0374ac7f632a02a6accdf509646cd6ee5e37bf1 SHA512 ea6413bb3948b72797acda79e186da6416ab0f95c5313391d158d4ddad549622f85fe0f69ec81811ed84a5c4497b63bd07feffaf964476bc64becfa66246a126
-EBUILD expat-2.2.4.ebuild 2409 BLAKE2B 1db61d230d3038095018a1f4a996ada84ca9f93df5b0f8de4bcfa258d4c8f0e56f00ba449ebed7c8e5c605856d28df2530f64c8f62b16b6463d6b756123bf793 SHA512 7d0ebe8c7ff822bec9908c5118eeee8a3145a9ecbb6986acb08806dce5134184706bf5c017ce766901671c7d733a1d59b700a3a889f62857726fdc38847a80a0
-EBUILD expat-2.2.5.ebuild 2466 BLAKE2B 5f4b6db129c491de37e2da970e2143c69f12a830a1aff5125d8b149f7ea3a668bc98df055c1999363d0b968cafc8f3528a6f0d8fcb0bdc02567dbf892de3d232 SHA512 526292962f0f8a1ae6032061ff3f8b6d681ca128692726734e81686e52e3f1113810640bb2f5f48aba89824731689cac5a4345804ee3c6714697986a2ff95e7a
-EBUILD expat-2.2.6.ebuild 2476 BLAKE2B 9d16cd9fe9c3c7da4bbd225d975976e757ca4020e8744df17fef6d62e33808fb3d2f2e4b03cdd020d82b20482a7c86221ffce391688a330badda83a2c6901574 SHA512 11ad1abf2fe9961cb877f5a5b86e7ce0ba6a440ef1672675c95cbcb9a92099cde4a4af7e7064c8f307a70fe5f152d1f2e1c1712ab81bced3faa513a8a230f523
+EBUILD expat-2.2.1.ebuild 2198 BLAKE2B de5700f2f068344861ec29ae0eefd66340f5f9494cdeecbb4ab58cf37ff0f8bc85032dcc8e2cc0d079dff39bf757401f9cab532fd327bc6fc8c4ca0a48f0eb39 SHA512 5a1a6fa5cdce7a89122803bb03af3f2958a2f34bb23d9b2daca749ccef3b864bab8b52fb3300d90d497cc24e3b70af4f767ea1fbdd9d8a871efe494e965936f4
+EBUILD expat-2.2.4.ebuild 2398 BLAKE2B 74b30d474290b5483f3d5f10784ca37ddfa0888cf1e455a8137eb118389af12dd8327a56d42b1a36c7dd71e88ccbbc3c21e301464452973879392cbbeceac2e2 SHA512 3f5b4d64c156ca1cc4003bc4c9e6dc0d73ac7dec967691129039054f019b4997910719347ffdb780ee7adf9509e89b936dbdfa514d34badce4e3e7965c17f1f3
+EBUILD expat-2.2.5.ebuild 2455 BLAKE2B 17c00af701f3ec4ceab16e48247abbc23febe01271cc1ec8cae8d1a45d38d194d12959d98b8339907dde57456e84aee385ae11c5712c8787745b63fda21101f1 SHA512 37ea03cdbd79fa0e1b01e953b1f07cff067968ff3885745fa2269a23daccb1f495f3afd5b6950fd244614b094232b9c38842812dc7ae6415e186e7bffb6e335e
+EBUILD expat-2.2.6.ebuild 2465 BLAKE2B 6778d1c55b0f2655b48c6a1e7a8b2b90530f11f51cd11c0bdcf766f3ad51eedc70e4fdb4346eee57b9db2e216b24e6a7690dea5dfde4c454b0a931a8495bab76 SHA512 a895e03fb48984a31ebb2b10f1b1a6dafe3fa9982e47876e29ad6addd011004992fa4701cd74ff4fa7b97416a1b2b961845be3154c48d9c045c0f5600c4c428e
 MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3
diff --git a/dev-libs/expat/expat-2.2.1.ebuild b/dev-libs/expat/expat-2.2.1.ebuild
index ac06d60513e4..84e0ee7bea04 100644
--- a/dev-libs/expat/expat-2.2.1.ebuild
+++ b/dev-libs/expat/expat-2.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/expat/${P}.tar.bz2"
 
 LICENSE="MIT"
 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~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 ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 RDEPEND=""
 
diff --git a/dev-libs/expat/expat-2.2.4.ebuild b/dev-libs/expat/expat-2.2.4.ebuild
index fc3869969b43..b99fa87d64f0 100644
--- a/dev-libs/expat/expat-2.2.4.ebuild
+++ b/dev-libs/expat/expat-2.2.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/expat/${P}.tar.bz2"
 
 LICENSE="MIT"
 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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 ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 RDEPEND=""
diff --git a/dev-libs/expat/expat-2.2.5.ebuild b/dev-libs/expat/expat-2.2.5.ebuild
index 62fe398a4281..427cb0428d7e 100644
--- a/dev-libs/expat/expat-2.2.5.ebuild
+++ b/dev-libs/expat/expat-2.2.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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 ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 RDEPEND=""
diff --git a/dev-libs/expat/expat-2.2.6.ebuild b/dev-libs/expat/expat-2.2.6.ebuild
index 508815f0741e..9176c8ac6d89 100644
--- a/dev-libs/expat/expat-2.2.6.ebuild
+++ b/dev-libs/expat/expat-2.2.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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 ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 RDEPEND=""
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index c94fc4c4ca59..e0258f1e2991 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -5,7 +5,7 @@ DIST glib-2.54.3-patchset.tar.xz 39488 BLAKE2B 0bebd1f8eadd1796c355dbad20739ec24
 DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
 DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
-EBUILD glib-2.52.3.ebuild 9547 BLAKE2B 042a59e8fdee8c0de912c224e2bd51aad8ce17ccfb33c123ef5a52225f1b993e9133469fd4e1577d27c47effe3315e0117f64acf41fccdba760f38df83acb6e3 SHA512 82508386cbee8cf9e49a04c22ce5a81bfd62b9aef1270da2ed885081797e6229a74a4313cea713830df6d74b99dbb7acb1f07bf7b0e588208656eb37a81143c6
-EBUILD glib-2.54.3-r6.ebuild 9998 BLAKE2B a6aa0197dfc2d787654970ab5d8086b181c97b8ed40bb5a1bebe5127f4bc5d9c62ecdb82e46a7c3eb99b150fbf3880be3846259501ddf1467827ec172b3d8990 SHA512 31a17d1552181e001bda28ced508699b757ceb892ca64955c65eb57ad8b1761261b966c6d272dfce5a9515f96d6a3ab14247dea83c875c3f1d56c0de63851d31
-EBUILD glib-2.56.2.ebuild 9687 BLAKE2B e9d239d2eaa1265d7312a8d9ce8467ca7eca6fd66c7e317605f0ecfc94c9f3a52177d2642894f3840e58ca772fc887e96ebdc883b01505ad5d8b1e42aa55a4b7 SHA512 bc7591a1eb4ec4475cec8e98e2e1c0ddb054d9bf41a7f3fd62a6af0f9763e2c0a05683543c4ac42e523dd8074dc7fb6a348f7198b897b37a1236fe297499bdf1
+EBUILD glib-2.52.3.ebuild 9536 BLAKE2B 6ab32f46e939df7690f1a855522e323db3e5f34294399cb281a6d775fcd47272019cbf5be91ef19c6f264ab9725691485a7656bf24fe1a7f94de95d843657c56 SHA512 81dea9748342fe63b025fc637ea8940ae10e0f2d2aef5ff3d724714998ccaef21f10229a6c0374cb3c7bbf0ef1991a4d4da1f1fcfcee1c566918817ecd463cf1
+EBUILD glib-2.54.3-r6.ebuild 9987 BLAKE2B 9c0a0272ad99ece03e1770a6e2506fcb517996c1a54f6bf68a2f88eec5fa169876d8570e2bc73ff207b8ed4afd7c23ac82caae00ff7c126d48771517bb00c16f SHA512 658a2e7e650abb0b2d3b77c158f5b754f3979f8b8fb91227368c81142815d6087b3c6e2b2e55981c348ded06a96475890213d65930b78209aaf71ec7653da1f6
+EBUILD glib-2.56.2.ebuild 9676 BLAKE2B 06d2b78ba5ba5515467b8458cedc6b9897c8103ca91aa42b1618be7f6eaf21c666318edb1581c4b6e97603d8ae3aa3a42b8767cff81666f33a8c195d5c82aabd SHA512 0b83bed25cd099cc044ca6581d618f0eb1bf6b81a797052722bf68bbb7cf19b92431622790d702b5613b600bc6b1b0a570e5b51f02a469b496459bbef1a91a9d
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.52.3.ebuild b/dev-libs/glib/glib-2.52.3.ebuild
index c85788d6d53e..f5f22a01a8a2 100644
--- a/dev-libs/glib/glib-2.52.3.ebuild
+++ b/dev-libs/glib/glib-2.52.3.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
diff --git a/dev-libs/glib/glib-2.54.3-r6.ebuild b/dev-libs/glib/glib-2.54.3-r6.ebuild
index 3541bdfccbef..475953b02b92 100644
--- a/dev-libs/glib/glib-2.54.3-r6.ebuild
+++ b/dev-libs/glib/glib-2.54.3-r6.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	test? ( ${PYTHON_REQUIRED_USE} )
 " # test dep left here and elsewhere to not forget, as global python requirement is supposed to be temporary until a split package is made with meson
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild
index f18c2acdc30b..c30bba39cb88 100644
--- a/dev-libs/glib/glib-2.56.2.ebuild
+++ b/dev-libs/glib/glib-2.56.2.ebuild
@@ -21,7 +21,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # Added util-linux multilib dependency to have libmount support (which
 # is always turned on on linux systems, unless explicitly disabled, but
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index da24de523b11..67bb6977d55d 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.50.0.tar.xz 1415700 BLAKE2B 7707d0affc35e60d272312debd429a96a578cc6ea4e889244a0a1dc34f23e3b686cea06076427575fa620f570141e173990ed12649cb669808141dab1fdffb19 SHA512 cb108cf3d49743e1686fe4ae99f2360799bc8825ad97bf0b97e097b3f89e2771079593de0f497a9e5b9cff892f6fbf870834a6c4d13f11bcde99162e9388ecfa
 DIST gobject-introspection-1.52.1.tar.xz 1384292 BLAKE2B e1176bff177d7b6deee3e93159425a176d8056fbac2af5038950b7bc4486785ca988fc4c8c4d6a069b2bf623092e57f096aea37bbb9a767adaa695ec8f0db4e6 SHA512 878653ffa80c064c73453ea2878a977e52f0d6a0b2123bee8c3429379366f9da3e9fd991fad0dda170d74e4241314ea6c5120f5988e68fad4bfe9c333d11389f
-EBUILD gobject-introspection-common-1.50.0.ebuild 1032 BLAKE2B 88bf89cee40bdfe0e69efe0126f65dca0133903ae4756c336494799c7a3a1b8093f7f2483560c627482d0a5dae7ec41872969c1322c0dc117df389f4e74c3424 SHA512 2f026c9d91e6300594e43499235d9fc563bbffc967cd91ebe7c7582ce173d717d10bc18a906086ac57eb82e5446c18288f091daf8a622b2e5a5bc033c70b5058
-EBUILD gobject-introspection-common-1.52.1.ebuild 1034 BLAKE2B a303a427f1f1373242105d1e94fb28428b80b5dd62a8d34dae9d64af86085ab2aa0e5a46dd52e466e06ac9dff2c991c7efeeac7f2df6cf9377dd7d31f7161443 SHA512 6b128e908dc0054ad7133b62e4718267a72a6f810a0f2f9b39d941ea42fb1595311496147c9006c1ece3888192bc9990b6ed25e07856c73926a128b422c8e8b9
+EBUILD gobject-introspection-common-1.50.0.ebuild 1021 BLAKE2B 7577ed238cee2ddcea22796fd8968438bb57ceea23590b74a6a89b1559326bac672b3a5d8afaf5cd042a640da2714f13bc497963155842b97fe3e8ebfa64c337 SHA512 ab4e5c309321e83eb4912cd64281f0b096acbc66de5cb4c37a759b1d9fd028b1aa2dbe5a895669385e836c26170e61a710d5ca7bf633cb59dc5cd21c5fc3d23b
+EBUILD gobject-introspection-common-1.52.1.ebuild 1023 BLAKE2B d5341bb90b541590d630dda04d62aef2cdd42b31d993bfcd10015432edf47f38d587f688bbd6d8440d1f28052cc220c36fea508c7740f0f16e0d28d7b9cf4761 SHA512 a183f7bd90ea9b0cbaac76e633a4e43d59ceb7eb35c9ee434a6309ad8bd5892ed580745ef848f9759dc1f6bedca5fa067b858b8eeecb3c5478c3508c64f0c073
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.50.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.50.0.ebuild
index 20201297a09b..6478bed4a14c 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.50.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.50.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
index e96dba30ab58..b529c3883afd 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 2f50fefe96b6..275d8feacd97 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.50.0.tar.xz 1415700 BLAKE2B 7707d0affc35e60d272312debd429a96a578cc6ea4e889244a0a1dc34f23e3b686cea06076427575fa620f570141e173990ed12649cb669808141dab1fdffb19 SHA512 cb108cf3d49743e1686fe4ae99f2360799bc8825ad97bf0b97e097b3f89e2771079593de0f497a9e5b9cff892f6fbf870834a6c4d13f11bcde99162e9388ecfa
 DIST gobject-introspection-1.52.1.tar.xz 1384292 BLAKE2B e1176bff177d7b6deee3e93159425a176d8056fbac2af5038950b7bc4486785ca988fc4c8c4d6a069b2bf623092e57f096aea37bbb9a767adaa695ec8f0db4e6 SHA512 878653ffa80c064c73453ea2878a977e52f0d6a0b2123bee8c3429379366f9da3e9fd991fad0dda170d74e4241314ea6c5120f5988e68fad4bfe9c333d11389f
-EBUILD gobject-introspection-1.50.0.ebuild 2092 BLAKE2B 92e733407ea06a272049437950950d24f42a90757c4368a4e634833df2b3502c1ebc9c57297fe9b7972d2d96fc57b0b247afd624d6468a697d59bd53fbde958d SHA512 559b28837ba8826dba5b258cd3c6a1723174fbf2ec2609c002677aee0fb2bfde431fc9f18b20f888c483fd4f4980b386bebd7888f5eda1c150b2f80b002297d8
-EBUILD gobject-introspection-1.52.1.ebuild 2103 BLAKE2B 8ae5796263b70658e60073d7b4509db72d36753fb67ebc4e2426d9dbed42770f4acdd6892d8473f80e805dc4e1f9e3eb7beedcb1c8e917d3f7c04835c4731919 SHA512 035427b653fbbc484e39616b87dcf17f3886403e3eb24f2e143b370a6dc1b3cafd00068b3ad8dda331b5cb8fd7923355248d559defa63099b992494c575203d8
+EBUILD gobject-introspection-1.50.0.ebuild 2081 BLAKE2B 2a42307c51587ad61e972d3d68157abd585535fdef31dd049290a6a6910b6e0f5c9bce0ddf0a64e085d8388559ae3cc522993cb620ebe3a4f56d062d1bf4d518 SHA512 75202082c2ba498db9433d772822a44544c78aa67692274325b123744d6ebb73fb6a58169f6d7ce9253972836fa97dd36b8ea01c2a9fcd83a83025ef853c116c
+EBUILD gobject-introspection-1.52.1.ebuild 2092 BLAKE2B d442af8ead29ef58a66bee45888b03af487ba7af6497703c1d5519d6ef14a7dfc063acf6ea10294597a3ad85dc4f8fbfd4dbc1c80cca5840959f2395ce76f0ea SHA512 6146e60515db67590400d53d9204d4f6d5a396dad583b48e0ce05c3c7237784dc292d039be371ca879d42235cefa2b22043a44c8eae368d56b9e71b68ac60c6c
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.50.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.50.0.ebuild
index 96dcb938793b..92ef3f654920 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.50.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.50.0.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 # We force glib and g-i to be in sync by this way as explained in bug #518424
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild
index cd13d805e9c9..9609e01e33d6 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.52.1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 # We force glib and g-i to be in sync by this way as explained in bug #518424
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index 684acf449ed2..a2992eb64555 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -2,7 +2,7 @@ AUX iniparser-3.0-autotools.patch 829 BLAKE2B 808f8f7870151286ef4e4baea4ce80df3c
 AUX iniparser-3.0b-cpp.patch 1446 BLAKE2B e538e93d01e8521b9f3726bc4d24fee827f5ae3ccae81976cdb42abef62001a6d2a7b2abd7792df4b31fac00a7f4de69d750610253579ae3a2e618b704fee18b SHA512 8eb2058e332783ae11ef5cbebec153ee1938352f111e3efe332035aa013cf6d01a917aef9a7b8f46f7bd070986e5e686e584d46dedf30276baeb8da0954631a9
 DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86
 DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968
-EBUILD iniparser-3.1-r1.ebuild 1153 BLAKE2B 9f0fbed16d45ca5273e7af7f80857aa71a967aa0f8d19b544a011d2ac93a815ab6dabbc66ab4717af6bef60f4c763f3ca3843f898d05659976841dbd77c118a9 SHA512 4799ed1b8503f5d05d277bd57b192b86ebf500febc5e0af933bbb5851b582c2de0de58494a381fb029c06fbff74d6468d53f1f0b9c9c968bb56dc1e06adbcc7b
-EBUILD iniparser-3.1.ebuild 1009 BLAKE2B fbbf62ea14c9d2a00589ccdc25ef919531ad3dc452a82a31193cabd134bec760f7287f180e1bfa3a13d9c8816e0fcc3887d97f1d704bd7dbc75f09f184d91ab0 SHA512 a92ef3174bda9702bf8e30fbddda1046fc31af55286080bb1583c5ea4d3734930241300da3912e0df6f1dee9b8acfd63b1e865568a61f1886e2bf1916fb0e3f1
-EBUILD iniparser-4.1.ebuild 1767 BLAKE2B 12c8fb96e509f0e75a5f020474d20a0efa995074cd788e8652b9594b273f28012836154428c086361e97286be68794f7c8831f24d8453f92654da2f740bb973f SHA512 197309228a7eb4e75f866eaf0148680bc69ab9fa1f481547c176b227fa336149ff335a32257c5d57d55d37cecdd87b08da990fb193c79e48253424c90aa344de
+EBUILD iniparser-3.1-r1.ebuild 1142 BLAKE2B 69df8a9c32866c85c5225f67d3262b5e2220ba2b6317e79d46265a79601dbd46287514c59cf55826508c3ac0cec1fd7cb0431b63e279bc7ea9725fa2676febf2 SHA512 714c0c4bb58316c80f6af3ff5a11853278f4a17f1bc900225fd4e4cdd52aff7028763d669fcfaf3b1ffb61627f867a6c7cf6159c568c2380cf8e6f4d758386f9
+EBUILD iniparser-3.1.ebuild 998 BLAKE2B 2e1e7eb3c6d52fc1e9caa9b8c41b0537bbc24d35dd1681addfd90422a5880ef0ebec1a957e0603abe31b1d0597cde0ccdc4be3aed324a87eae32258b5a0c7257 SHA512 d3245f9011c03e7f3eba25d78246e65833467d737eeb91bb337c557cb1e72b36d026e0dcc8266f61d120278af75bddf9a9c6a62d892e5086301178c4b10019ee
+EBUILD iniparser-4.1.ebuild 1756 BLAKE2B e1ce140179a820037a12eceb32eec1806f366f278246d6d8b8c4aebdfdddef40b2ba8e88972613801439851a29dc645df0eee9a730ad58311c70fdd19635e1e8 SHA512 d9d2330b8109919702db41c6a03a24c6dde3cd6d8d8abffa2a3fef0a5f60982c13dc048fc84646c4f4139d40a37eb8b0776d386c70f8073e16f9172c48b4a397
 MISC metadata.xml 326 BLAKE2B 922d683a7f0a18fdde9cda90de1fa291ff1884a0fea2425c082dec777f2e4ea76b036c70d26fd40cf1ab980c35def4abfc574640f0fb0048e9fd66565c1eac96 SHA512 7b19035fb203e35182b45f83c863916a8555b54d87605d310c2499c234bad06a39a33403aeb4f8624f31a9ef3660e1a98710e2f234cf9cd0e983f1ca173521e5
diff --git a/dev-libs/iniparser/iniparser-3.1-r1.ebuild b/dev-libs/iniparser/iniparser-3.1-r1.ebuild
index 2537e1e7e290..b80a2e43e6f9 100644
--- a/dev-libs/iniparser/iniparser-3.1-r1.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://ndevilla.free.fr/iniparser/"
 SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz"
 LICENSE="MIT"
 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 ~arm-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="doc examples static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )
diff --git a/dev-libs/iniparser/iniparser-3.1.ebuild b/dev-libs/iniparser/iniparser-3.1.ebuild
index 6cddcadb73c5..93933b43ee75 100644
--- a/dev-libs/iniparser/iniparser-3.1.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://ndevilla.free.fr/iniparser/"
 SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc examples static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )
diff --git a/dev-libs/iniparser/iniparser-4.1.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild
index d108cf9d01bc..1e69a0452de2 100644
--- a/dev-libs/iniparser/iniparser-4.1.ebuild
+++ b/dev-libs/iniparser/iniparser-4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="doc examples static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-libs/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest
new file mode 100644
index 000000000000..709a8b3ff77a
--- /dev/null
+++ b/dev-libs/jsonrpc-glib/Manifest
@@ -0,0 +1,3 @@
+DIST jsonrpc-glib-3.28.1.tar.xz 40328 BLAKE2B 36b512e27c46836fc8285bf4d6a6f8e39bdd748a09475af151d9a07f05e92dafe269d7675f8ff0253b21485405776d9348b38b067d73f75d6bdc3203fb876ea1 SHA512 874791c898d8fd6f8c6401b8ae219dc08e34e207ba214add1f14bb28b407581dc372487398d276395ddbe2f349d5b04f2ffb78fc73398d85975df40d3409f352
+EBUILD jsonrpc-glib-3.28.1.ebuild 939 BLAKE2B 105e2ee60a16660ab0b76a64990a94e411c35db5f3cd4d56a87548bd8e9b26b16bf82a3582d0e3196dd7442124d276d4c2ecfe6f8cffc96e37bf62b2e38322fe SHA512 75d6ca24799c7977a495de2321e62e443864f33b4581ca90984fbf6ee2ba1eac637c0799c2f1fe6a7c2343e9cd6b22fcb9d8ea23a1e3e69cc31c0c6587ba0d14
+MISC metadata.xml 505 BLAKE2B 2319e91326203e3b6173bc52a21d689b6adafff6a08ff2832a28d48e5b537592766b5c7a7ae5c60ea682beaca10e8037a88b05e2f98573441ea611c11e021dc5 SHA512 02f34f7222c80a4568b3c293fa46f45bf64bf1410c529c77271aa9922b22237c8f29ec9724e071cd6485d0e73ec0ea2bee028c6b0763d2c0da736d6aac24b2b3
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.28.1.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.28.1.ebuild
new file mode 100644
index 000000000000..1a70d33d2b6c
--- /dev/null
+++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.28.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org meson xdg vala
+
+DESCRIPTION="JSON-RPC library for GLib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64"
+
+IUSE="gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib[introspection?]
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable_profiling=false # -pg passing
+		$(meson_use introspection with_introspection)
+		$(meson_use vala with_vapi)
+		$(meson_use gtk-doc enable_gtk_doc)
+		$(meson_use test enable_tests)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/jsonrpc-glib/metadata.xml b/dev-libs/jsonrpc-glib/metadata.xml
new file mode 100644
index 000000000000..15582ff4dce7
--- /dev/null
+++ b/dev-libs/jsonrpc-glib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<longdescription>Jsonrpc-GLib is a JSON-RPC library for GLib. It includes support for
+		communicating as both a JSON-RPC client and server. Additionally, it
+		supports upgrating connections to use GVariant for less runtime overhead.</longdescription>
+</pkgmetadata>
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index a7bcac4a518f..638f7b0f61cd 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,5 +1,5 @@
 DIST libassuan-2.4.3.tar.bz2 559867 BLAKE2B b80f73573449aa1705ac3b4f12f89cac6a19bf4b2ed8f46d5576164196300baeaeb782c997078ac252a564b9f6067df87a340b46c68058d4a28c8291bbecf96b SHA512 2b0f58682b408fc58fa0ec2980b36e54ba66701bf504cf6c98ec652af43501bc7c18573bc78c5b83260f5a3bdb0ec8f4e0662bafd9bba3fe7287e77598e8e4c1
 DIST libassuan-2.5.1.tar.bz2 564857 BLAKE2B dc046b9551183ec543d2a186c3c593471c80445b48aec1366d0b997386c57187f9b7a848973d0930ca8d2be3f138e83c22ef9292e4c8bf5614a99ea3065c7827 SHA512 c8829925221780f175cee8c4084060b0d661229f583a50d400a1903ab7303b2724b99ff9c0fa242881d4c5d779036756e1da54d9143acc0fcd92f302ecb5882d
-EBUILD libassuan-2.4.3-r1.ebuild 1099 BLAKE2B b2df568fcd4c2e50fde71a384e85a829753915a74164582f01a0be20f30d5a8a4dfa61d645b6f90ede321cf7bcffc674cb7872c6ef313cc06bb0689f3facea45 SHA512 a3cab0a03de279a18d49db4bc521dbfd04340f66edddb1cb05ac1dfdf6ab4096d1f082c3115e8cfa281873f2d25f810fdbe514aa083313e66a2c470e0e752db8
-EBUILD libassuan-2.5.1.ebuild 1098 BLAKE2B 2b761fdf571da3cb5006d8054ebd765927f3c09738229f13d54816a7e889627e05f370d1abc5b0c1b14c63cb98b4adc91b7049357f255f4e40a20e8d1bc1b3c0 SHA512 8b39c918da219dcc573e230a1ea17fb9d00d0e326e6206181a7155c8cbadd5995771eb3d5ac5e006981c9b6bacb459a0f8c34aa7aa4694ff21b2c3385595e16c
+EBUILD libassuan-2.4.3-r1.ebuild 1088 BLAKE2B 458d0bc83d786010d8baa61a4a7c195a1c0081ee6e592ca3d29be23aaaccea5497e4927b706eb3ff63a9d07360046e02474c31ca03f8bab94af695db3611faaa SHA512 e37bd3bb1d513367b556210b9a395958f42773f5ecb4252a525717fbaa769c9a0911f6586a920c264ef388c382aad148747166c02e4bf8919c960b16c129638f
+EBUILD libassuan-2.5.1.ebuild 1087 BLAKE2B 16d92a4b99e67f950b73ffd544b112833b3da5ec14d7eca14d40651bae83a5b96eee71f751190b4522aaf969fd4fd8df492a85b5cc71baa41d7c284795c84639 SHA512 8d9b67ceaa45c369d93c0fff2a56061d49c056aefe9a67dfee92d508d8bdf323f5651e912480d246964e4a0bb653a22f107d1ee141b3978affccd3798ece6194
 MISC metadata.xml 858 BLAKE2B 2fc69cd4f58f8764d9d43c0b89be8765fe6d8bdab1dc8c0de634899d6ae22702ae1d7cac1b9cd69999fc297dcaa7a7386872cabb63f905558a20f736b500ad5b SHA512 cb46245a5f02ad762cb86bb18ca13fee1e9df22c6e1e367c16c9392680722d4852834c6d4d259d7ca71d817ecac22bda120da75513d6f17d243fd8db062f4303
diff --git a/dev-libs/libassuan/libassuan-2.4.3-r1.ebuild b/dev-libs/libassuan/libassuan-2.4.3-r1.ebuild
index 158bc92f11b4..b7f485950915 100644
--- a/dev-libs/libassuan/libassuan-2.4.3-r1.ebuild
+++ b/dev-libs/libassuan/libassuan-2.4.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libassuan/libassuan-2.5.1.ebuild b/dev-libs/libassuan/libassuan-2.5.1.ebuild
index a91e146f7a01..aa43cb719793 100644
--- a/dev-libs/libassuan/libassuan-2.5.1.ebuild
+++ b/dev-libs/libassuan/libassuan-2.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index 7f5b559da5e4..12e101ee0c9d 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -1,5 +1,5 @@
 AUX 0.6.12-CVE-2017-7960.patch 1285 BLAKE2B 10118fd008c5c009052f8802db3d65693806c4e90a29d06ae8cc9124b3ce4d2868d7cc689285b685841d989f66100ce50ccab0ea145152bfc818beeb1efff4fb SHA512 736240327aeddbb9a2d7272a7dd3dff2b459e5b99bd81ab9d881644c995e51879d9b3e9c8080571bd387d8dd46ab5cf656f8e2b4e3715fd5548ca32b1d77d58d
 AUX 0.6.12-CVE-2017-7961.patch 1437 BLAKE2B 8678147cc24ff674b067691a3eeae42a5731faec2740c23a4679f689b51b160e51f0ec451b38954fb644b2545fab120aa2e97bd22bce253f5f4e5c1b7c21e22a SHA512 88cbcaf64e4c8ceb7002ffd05ce5f42880bd37a25f8c89e927760f0fa982122cde3819ace2e730cc0dd0e093812ad8470e8783477bc2bd10fe05aacf0b3e0e4f
 DIST libcroco-0.6.12.tar.xz 482028 BLAKE2B d43b73ba21f600ec6d549b867a58db956e081ca8b0787db577062e36487d23cd99b384ca3269421d26aff9825725b262fd6a3e48be73448fe984548ab3eb080b SHA512 af9a171d5ccded255b57f170576e67155f12fa0f61ab3e379e907975f77afc37e82e22772c6019b2897cffc15b2425faf3ccfda92b1a45b23eda2519debabeb6
-EBUILD libcroco-0.6.12-r1.ebuild 1453 BLAKE2B 7e5432e3ef939b1c612367c670b49ae92757f21bb164a6105e738b4af00a86f67be47ce30e0aa5b7f55ab2b89f87b03b0b12c7bd164eef797542a5402d65d3a6 SHA512 4ec27a3f313424c49fabc213d0848dfd3b4c9909863c6fafe4dbd65c4c740f7f535650fb8d9c98a839e8a784bf3043d9812bcb2f136475248b89bac4fda5a033
+EBUILD libcroco-0.6.12-r1.ebuild 1442 BLAKE2B 9f5c7428459553d93c099cb6ed0c1f6b3e0fe0bdeafec490f0e709f08f50045761748639b4b9df2e58fd4ad78e8bf2e30152b5654b2cc277d3467639b4f556ec SHA512 c25781b12bcc99c38e4a55e4dc03b8c27171e60b84c8095313c3b705446e2c02cdabc0d7206bf0aa459296dfc687f3c7b573513a4cbde71b5f9df088c8cd4846
 MISC metadata.xml 597 BLAKE2B 93f85899d5ecfde37206061e57a03b1eaa181d9e2c105999621da011bbed2b11efaae603c2dbba0b405917653adc75cf849e92682e798e9514984e5577fee90f SHA512 9161b1cf0d796d0aeb681374b278be7938bc551316d6d7fc4fc1e19bfff4477f6b12bf606df0eb17c57e08ecb257f358f579a232ce6dbd6cc2f838aee4e2b9bf
diff --git a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild b/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
index 6967b79a1068..cd38c8bb5ee2 100644
--- a/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.12-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/"
 
 LICENSE="LGPL-2"
 SLOT="0.6"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
new file mode 100644
index 000000000000..8ffe1d1e13f7
--- /dev/null
+++ b/dev-libs/libdazzle/Manifest
@@ -0,0 +1,3 @@
+DIST libdazzle-3.28.5.tar.xz 422792 BLAKE2B 65b994798c2f9c7ec0d5ec5b3506896ba3fe09e8e563f1c03246684837a876d0918763f8589deccfc1477071434acda56973097904c3ad5469aa4374a56d1914 SHA512 e4616994226a7e755913343487a2850030dc13816c94dd0de166bb617a001097f6b849fa45ee546e75a15ad3357bd5a61a0caf436c4e3656eaa3480ed4b7f903
+EBUILD libdazzle-3.28.5.ebuild 1307 BLAKE2B 191f7e521b7c895d8809166e932b6eac1943c59c7ec7d80a3f54d8504735fd9c112f3dab6dc21a2d6c3c72a027c3e9e0028f5c38b81a8afbed2eb9d2824c5b68 SHA512 d6a05ee7bd918aaa9c16a53c3d0b67807fc3c46b32407a64dc5cefed1637f120f168277cc082a11288773f6e38c5a1c82001733f08250be40b4aa9a26e771528
+MISC metadata.xml 561 BLAKE2B b496a84878e088cf09b2a5a071d3617b0d934fd92ab916c32a18dbad6015168431c30ba50125ccf21a5fea813fbc951b233c5353d30274525d5defc4d401583e SHA512 8ab426f8a2683c2bfc4a42d4d32893f5913fa1f5b2551b5be496594995916f9e17d285f2537d890fdd25be172c833b038a1942130e3fc546285c3f56a7a93652
diff --git a/dev-libs/libdazzle/libdazzle-3.28.5.ebuild b/dev-libs/libdazzle/libdazzle-3.28.5.ebuild
new file mode 100644
index 000000000000..9dddb0f7f834
--- /dev/null
+++ b/dev-libs/libdazzle/libdazzle-3.28.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org meson xdg vala virtualx
+
+DESCRIPTION="Experimental new features for GTK+ and GLib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.56.0:2
+	x11-libs/gtk+:3[introspection?]
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+# libxml2 required for glib-compile-resources; glib-utils for glib-mkenums
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable_tracing=false # extra trace debugging that would make things slower
+		-Denable_profiling=false # -pg passing
+		# -Denable_rdtscp=false # TODO: CPU_FLAGS_X86 for it?
+		-Denable_tools=true # /usr/bin/dazzle-list-counters
+		$(meson_use introspection with_introspection)
+		$(meson_use vala with_vapi)
+		$(meson_use gtk-doc enable_gtk_doc)
+		$(meson_use test enable_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/libdazzle/metadata.xml b/dev-libs/libdazzle/metadata.xml
new file mode 100644
index 000000000000..ccb7f7ef56f2
--- /dev/null
+++ b/dev-libs/libdazzle/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="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<longdescription>libdazzle is a collection of fancy features for GLib and Gtk+ that aren't quite
+		ready or generic enough for use inside those libraries. This is often a proving
+		ground for new widget prototypes. Applications such as Builder tend to drive
+		development of this project.</longdescription>
+</pkgmetadata>
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 4232fafff840..d1fdd3693d78 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -6,7 +6,7 @@ AUX libffi-3.2.1-include-path-autogen.patch 2901 BLAKE2B 836e61b6f64b9d649e96979
 AUX libffi-3.2.1-include-path.patch 1156 BLAKE2B b5842f5dc6462edac0a5f58265246599d0283bb148f954fb79d8037e37ae332a664f57a201589b89022d63932d8a4e56c4b0c6a7a9a2240ae6602e847fff3a55 SHA512 f387590510ee5e3aedc03744fcf1faae35c105a81d4c2f646e495d489bc6467cd88d4a0a63b40a29fe620ad71db1a05c1fe483af63974222f366135f73f36cb3
 AUX libffi-3.2.1-o-tmpfile-eacces.patch 660 BLAKE2B 651067a56e0bd0980a696ad12c8fa76d68d914fa370fb93c3f5f5759dd4837895a077510606fa451beafb75e7da19f42a9f88e3d56d6c283f684da695ad69960 SHA512 0887063ce1d812c31a34d662f852cf2944e008f2f60bd07941572f9032861e749968b090686e0d788f7cc3c5c8f1ed2388418ff000c42fd2d592f9837e782f65
 DIST libffi-3.2.1.tar.gz 940837 BLAKE2B d202ccaa185acfd2476ed2a9b011891507cd8efbbda60f67c583268d1563853442ed829acecbf81c9b6b9a930345780bb7a4bd80e71e50ef544c7f4eab8cb01f SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483
-EBUILD libffi-3.2.1-r1.ebuild 2280 BLAKE2B b7e132e2eb06444885e48cbc90c8d211102c83a94aa86a5c44e2b1279737641915667753145b9ea9aaea29ef25f0fc833e0155e750dc9b1ab25d1ae917f3f580 SHA512 ca3ca3fdb0b5b83ef2fb472021ffc0a90fadeddb30569dfa41422f3a154d17b18701d7540e72420241792fdbe8b893d89b15a439b9159fabcfccdc1bc3b16e5e
-EBUILD libffi-3.2.1-r2.ebuild 2339 BLAKE2B 60b29ea62d0db9dd9ca2a7ce8a425b8d37bd9ce15f7558b839d5c89add50be0531055510a9dc06ffa498046eeb9436b4526b72226c9b3a36b15bc08539a021de SHA512 ed5f7463a05dcf7f8bfab1a13358149bb887d1ba5b82d0d7dc60f72fe03d6067450dac6f8e61665d0b4ee85ad74b71f5de48af6e6cb172cc8cff342399ec1b6e
-EBUILD libffi-3.2.1.ebuild 1979 BLAKE2B 1c09607c862083825aa3314dcea2ec77fe5f10d947c69d9bbb245262095fda9b925fba6ee075f2a1978b714b32a46e84788903b0479d2ebd5eca69f1205d0c79 SHA512 168e0f14c7ec739242c7f32dfe5bf0edb7dcd0d85cc00fae39dc4e58ec62e39562759556e0d4c7d800b1d1ec6f1bdc38e19ed9603972ab6049b5f82009515cce
+EBUILD libffi-3.2.1-r1.ebuild 2269 BLAKE2B e2075034b9e9bec42427dcacbfc03aa114d9c2e5fd3cbda307bd24ae63573a8ab27459ed0b73177bd969232be7640b737a35bae7f5be69876b92de4351dfcbff SHA512 1f27cd306112d3de8762f0cfab1f6196819a6793585c477027b3e0a48fdf0259f764d87b8cb221c5b32aabd5ae47d8535f040d0960256064d14a4d78a67bcfb9
+EBUILD libffi-3.2.1-r2.ebuild 2328 BLAKE2B 26926447321e54807371c9e2154b062def22f04e298ee1ccbc5f92fed4bedab44d19622f034460c0727838fa1c6146c42cbd7fe83bc385df03c827535c42b949 SHA512 04a18c564ca898ffc3434ab7d62f2c2380300937726dae6c50f5e0d479009b059d020d48589b52970aa34723f6530bbeddd0f8f5f6fe3a865d90a48dd494e189
+EBUILD libffi-3.2.1.ebuild 1968 BLAKE2B 611f038994a687222d26a6709163e1848d15114dccd3e87c9b0a28cdc5851c6cb769eba5517d18f196cf0d27a1703ed01b40ae73e04d4e15b9cc26c07ecc9acb SHA512 f9f3b0a71a8a57adb563eb6c1ed64602976f18ff8e653f777d8dd14928bfc27417ee1aa81eab2529be1dd6b7fb70af274fe2d7cc1c0c09d29e48f37661ddeec7
 MISC metadata.xml 1866 BLAKE2B 4623e414d8d8c2d569b2ae8a6fd6117c38b11e5b3845bba17b32ce442b88afd0ea1aff66cd73181c59b7e66be65df078d68d13f793ab654c3e213ab4c20fce50 SHA512 e1de94bb58c77aa48ee1b7d81777d26b736db3f3ef652099bb3f3a9bd75689258a61168371a30976e0717519bc9300b3812a8405ad1f16683c45a24817960b90
diff --git a/dev-libs/libffi/libffi-3.2.1-r1.ebuild b/dev-libs/libffi/libffi-3.2.1-r1.ebuild
index 20b4510e96ba..94aacacd13b0 100644
--- a/dev-libs/libffi/libffi-3.2.1-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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 ~arm-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="debug pax_kernel static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/libffi/libffi-3.2.1-r2.ebuild b/dev-libs/libffi/libffi-3.2.1-r2.ebuild
index 3661338c6afc..99e5d165f3da 100644
--- a/dev-libs/libffi/libffi-3.2.1-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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 ~arm-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="debug pax_kernel static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/libffi/libffi-3.2.1.ebuild b/dev-libs/libffi/libffi-3.2.1.ebuild
index c6f9feea53e0..8c103bd0cdbe 100644
--- a/dev-libs/libffi/libffi-3.2.1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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 ~arm-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="debug pax_kernel static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 5be20c60b2c0..2b074593c537 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -6,10 +6,10 @@ DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9
 DIST libgcrypt-1.8.1.tar.bz2 2967344 BLAKE2B f259d08427f76238576e3897a821d457b6ff47c99716301b54b20a21ae7574a7ef1f4aa62947c443efb8274d5cb3d64dc1d9c4ea45568f6df6f29c2c1717860b SHA512 27c9d2fd9cba5afca71d421c9299d6942463975fae0bd10d4ff42cda2d7ea213e6b73c071a40fcf23ff52a93394cc7505ab332f8a4a3321826460e471eda5b4e
 DIST libgcrypt-1.8.2.tar.bz2 2966534 BLAKE2B 1a0768dc1c4fc64913256575ec9ebe77fe8c4297c648972c93865271f0a18e60954d2f37c264bad5f1941b5e80753f34349ded9626e5c26ab469cc076da9ac2e SHA512 1e8c414f95bf6b50e778102ca7c1b3b1f30d8320826d9fff747a0a098ef85499cdc3e6de736853b9cd4e5dadda35c7c0a291e13643dcac5eaef44f2ddc7a6c09
 DIST libgcrypt-1.8.3.tar.bz2 2989166 BLAKE2B 3443883c3e8d005be6cbdc91589b8b287226f26eb59536e1a32512004af739a64a3817ac38fa1132fdfc3424c21ca49c81db93535a23d590a5dc4f4518f3cce1 SHA512 8c873204303f173dd3f49817a81035c1d504b2fc885965c9bc074a6e3fb108ceb6dca366d85e840a40712a6890fc325018ea9b8c1b7b8804c51c44b296cb96a0
-EBUILD libgcrypt-1.5.6-r101.ebuild 1679 BLAKE2B 8e65e4e836227b5701e1111e27aba14c7656df9f286aeada02410c6413240f3689620ba2b57a92b3482912766ee2f462ca5b930212dd5e0ce1a73fba34c0c3e2 SHA512 3ec645179ac9836eeaf369f12e654186e171d3cd04c42857df75d1ced9b35b70c098ff5697d20ff66396d9438c37bc7c0733a200587781edc2f9db5b0d344ea5
-EBUILD libgcrypt-1.8.1.ebuild 2098 BLAKE2B 05f395da3900dcc66b319f25c1a4ad57fe51acbf7fbe042956577291325abadd2cc76e8fe4e7dfc8828b792771aecfd39af0a529b6978390a2e704557c1d5d77 SHA512 ce773db8eda9b5e64191974da00ae9cfdee292d6bacdfa8a79074501dc9120ade518a2dc7f007a13733a7fa67342d1ae1793e55f792d5b8222b70e22c6e1c987
-EBUILD libgcrypt-1.8.2-r1.ebuild 2145 BLAKE2B bf0273a1c467077406890da14fcd055dc7b144a834b04554fbd1cf9949530a6c4905dc701a42fa945b93bea6d6ae031b2dc22073d9873487906b75aed60fa0d4 SHA512 e3aeeafeccff8e5c70c7d3c5784dd26c7f250f08a8dba378856ed065e1e7dfa18da989fce814872a36d548829ebeddd48758ebaf40d4c9031ebfd012575fa580
-EBUILD libgcrypt-1.8.2-r2.ebuild 2210 BLAKE2B f34057ad59eca6355567b72bbfdf1985e44e4746d7fbb1b0522f2306ebf645aa73f4760561520beed81ff51ad713787fcced4f4af0fbbeec3f6865e325a95850 SHA512 d2e53d31e04a409b5dd58012416ed0470dadae9cc8a0eabaeffc35131d390a9a77466c2a8bd61ce3e4a90585db9a8352660ca7e66df7849a90dbf1c23edc807d
-EBUILD libgcrypt-1.8.2.ebuild 2111 BLAKE2B 8102d7a2504f12054a8a6b99960651930b22df9961d9df8efd72ba4f5ce76e89741a4607ee96118eadc2cd91cf2f1c2467405d2aaae145e709d382091b1ace08 SHA512 e8977abb9bc4313b09222d4945f487b0f3dd39e7bd1455e2186cb65965f77f653c7618b7c8b10d9d8028d50ff3d054b06b9565df7ecfd0f8849188fc783d78d1
-EBUILD libgcrypt-1.8.3.ebuild 2199 BLAKE2B 0dcbf625f04d7dea01569f8613ebba8d851ac612164dff1623dd1221d6b16e86f06e2e38d32226c7f93d453fe9a34cd6a6d9aa0af57acc51d38b13b7a98ca76b SHA512 c15d1510772203435c6c94706dfe255d04a65922f889e67881de69081ab0bdacfb4e23f81422af8752d813028e7835b67443b05d4b58faaf3bfe0409c9e4bd22
+EBUILD libgcrypt-1.5.6-r101.ebuild 1668 BLAKE2B 1b8591c2613fd7d281b69718e296724b297b218357d334d79a70e85a2c088ea1dbdc38b3206290dee728e43393c0f8ed9f53b86a2758c9cd07acf2ad8b7c8424 SHA512 1479228533afab05f4e90413b9c5134452c0a041d27cdb05bf2e5e878f883c9a488140dd84d07e772aa52316ed543e29a76a40e0be202a98022f05b541ecd58a
+EBUILD libgcrypt-1.8.1.ebuild 2087 BLAKE2B 3fef7833b394d4adc5a21b6e725029e222d5b8d824d082e4bc4a1cfbadc3731e8e485c4b00953d9d3e459030d53187ba944b2f1db628d2e68fb1d3b004929c57 SHA512 907ac75b859a782ab48814c12ce47b8d36157f91c10e9824b805efe791fdd28c61b08ce6fe10fe2b7e37ba69867a652bd7695c13e83411afce7354c468806efb
+EBUILD libgcrypt-1.8.2-r1.ebuild 2134 BLAKE2B 337e99d2b43af15fcacf52bfc1dc2f58ffcebdc1d9ddb5441afa887dc14d0ef3c01129862133cd9d1cbc589985822bca6aa48a6527ae624e8d5c51183e1ac066 SHA512 81266f185d38869b311ee901a476e001d4d08ad49dbc789a6c196145b3203439398eb31dac171490340146aab09b69b9b01183a404506f3a42b57745819b604f
+EBUILD libgcrypt-1.8.2-r2.ebuild 2199 BLAKE2B d89c6479ecfe6ba8aefa19e8a3a93acfc1b36f96b3d24442918c9265829623564e11fbb447f953677c68ee88512705bd760e72a66265b2f4f65712372916d7fb SHA512 fd32c5982155cd59683efe845834c861048135330b1a6677c04780be1545183865a2880ef712e2f68a38fe130efe8b6f9f39268b0ffa147edb1ee608750d9f46
+EBUILD libgcrypt-1.8.2.ebuild 2100 BLAKE2B f5b19c9a2df7e882a440b8efcad581bc20df60805ced3ac31e289a36095008d6d89167d89780185a2313516779938d0a151714d06f6d12f93cb5456ea695b6c0 SHA512 c9966023f681b53bf9d2c9b9f0da01f888e14b15c360e4b565e752c0013883b4a91a08dbb06aedd75678930376a8aef240e2cfa193b2b7978d4a15d84acd060d
+EBUILD libgcrypt-1.8.3.ebuild 2188 BLAKE2B e942281522c2b4339777e8d1223f161d24a477cc73ecd1c0f1673d46b99452c8fba7ecaf545635c7ff5b65ef7e4b694203fb0c3331cc510e5196858c672a6fc9 SHA512 3544d7ba9a69b3827e52a80d13b7c28898e518a46c8ef0886c7f2724ee08019a136227430bbadf55b7d59ca93c2c6a010b516b70586bad21296748a9e1b79bc4
 MISC metadata.xml 436 BLAKE2B 63494d2110caa2744cb7e2a43bb1622cc1709698a914bcda9958ee6fb9f8e5c5cee94e5cc9ce744a6638650e6bb78a0cea719a7afad53868513a15314ebb75f6 SHA512 953eb7a141dadcdb8f4c997924169a5e9dc5ce9e86a37b3171417f3825fad7763891ddf71cf7f05e36e2c39c534474dcba3e958b06bfb0f384d0ddf26afc10e4
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild
index 6b4a94d3540b..fd156e85c490 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="11/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild
index 361413f50a04..4e99d101735f 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="doc static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild
index f5f5899b7265..b9fe59106f5d 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild
index 038308e1dc4c..c4007a6d0360 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild
index 41a6baf100a1..f9de0223b8df 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="doc static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
index 52183aedd458..89d90bee0b6d 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="doc o-flag-munging static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 3e3ba6af63f9..2751a2d33f27 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,7 +1,7 @@
 DIST libgpg-error-1.27.tar.bz2 813060 BLAKE2B ece50b2f6f2fc21584724c07e4285ba6e3cd7c11def7155ef1e7be1d496e0d3a7abf977afa1f618b33ca8bcd0427c0c3b46fce2d0a2b9613378f06780f1aa47c SHA512 51b313c1159074fdbbce84f63bd8afd84b3b58cd608714865b25bed84c1862d050708aa06ac3dab92f1906593df5121161e594c2809653b0fb2c236cae5dcc2f
 DIST libgpg-error-1.29.tar.bz2 894749 BLAKE2B 27f7eb516663e31b5a4734d83117127d88abecf87aefb655eb7847546148a6a887caf7f574aae101274da20375b90b32c35d599508711f7b5eac2addfabfe4b8 SHA512 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b
 DIST libgpg-error-1.32.tar.bz2 904382 BLAKE2B 92141af9e00725015ef31152ccfe4db9535a7a6ba0aa6d011f2404bc998d7b0932fdce742a45d271995c838d34342e5197a081a42eb2e5e29c11271a1c11c6f7 SHA512 0130af48fe81f4db401635757d22a330455aab5dc27edfffad44b7c7c5c439399e92d234c9e00f4d3a399646b52e06c95d53196ea19f5a166817e2032511cb20
-EBUILD libgpg-error-1.27-r1.ebuild 1298 BLAKE2B ab43e3a8adb285b7932a607cd242af87aa1e7db2731fef7d77227d058ff1737802fda662e1f2b96e6116ee60f3d41dde98ca9a742a97caf5a2dc7ea34bdf8231 SHA512 9e285f2989b2e9fbf2a2e8a8ce1cbd3cd93433c302ecc0216ab8a977cada3f3edf753c02ef24b57b44af8bc6be23cdbf42dc46ba7846b55dcfa73b33db26f139
-EBUILD libgpg-error-1.29.ebuild 1300 BLAKE2B de5e87c95237d71b3e43fbacd6601cf5f93ddafefee9025675fb4611b01d346df17e2fb3a53d739da0b3b3cbcabe5e744a4c485d6a3746ae43d9a9b886c5faaa SHA512 0bcf5a7c36a42c1453cf776cc5fa0815759cfd8bdae0fd0fb2d79bc2f1ae9c6abbdea96d90d47328d55a21144f5c6f6abd5495cc9d0d2e7ca2595afd2862d070
-EBUILD libgpg-error-1.32.ebuild 1311 BLAKE2B 4d114d8dcadbf6f89df3c20fdf0d0b31bafa84c46bdd4098975c12b3774ae448f00c2628d22fa9f0a3bc51a873823df25cbc95efdca9e6d4d646f2d69fb2380f SHA512 2f13e457f63751fb4f03051d7ccb0f4d1f30bd5a36d37ab2274b14af748f9e3f38afc17a7f4241ca9fbc8501a7627984e2a2c92212d509f44c4d7835d30e6fe4
+EBUILD libgpg-error-1.27-r1.ebuild 1287 BLAKE2B d8b77035b21a5d67fb35fa94c7581a1c2229aff20fab7ad47ab4a0bc18490d4331dbdfb81e2114b5f3fdfb4184837067a3afcca141710b1f846d3e40de2f3c98 SHA512 59121052137fb7f122a048bc320076d1d54320a41748aa5647e3d660be4b53d1d89868eb4ae23335b0492ee5b530f912449c45f1e1a5a8567b386fc7f077993a
+EBUILD libgpg-error-1.29.ebuild 1289 BLAKE2B 0d86eb4d6815b150aa7f9514e44368af4a45ab36462e4f8d858552c7b88df9e82ca103d2f742f42e5d93ea5df9721b47f08026ba99eb9fa5c63bf27bfa80059d SHA512 6b22dbb50879e62a76df64f957a23a718177a37f610b793c09c6e08c073fd882e421ecf820a0499e77edaac7cb3095003e1ccb5b62ceddb46fa88513395284ac
+EBUILD libgpg-error-1.32.ebuild 1300 BLAKE2B f7367cc13a9db8e3e671459d9dea8884633c5f401af615c28670c4902c52e9f461ad4d40b2cee61ba4aaf0b76f205ab55a32b724083a14d3762d469109894f66 SHA512 ae3d6a4c73e9ba6631a1f852278ea3a5827e81271ef90bc8cb991cd7c4b69cdf81df660ac768cd76d3a5b8010bfb7da9c7cef1421dfa1ba01138d2b03a3b0282
 MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
diff --git a/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild
index 9f78904467c4..6bfe1cfbd13b 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.27-r1.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 ~arm-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/libgpg-error/libgpg-error-1.29.ebuild b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
index 06e9e5c75d5d..45f1b8149553 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.29.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 ~arm-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/libgpg-error/libgpg-error-1.32.ebuild b/dev-libs/libgpg-error/libgpg-error-1.32.ebuild
index 2576649e58dd..c45b281f1571 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.32.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.32.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 ~arm-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/libksba/Manifest b/dev-libs/libksba/Manifest
index f788a57b9b3f..1a3c7a8c9194 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,3 +1,3 @@
 DIST libksba-1.3.5.tar.bz2 620649 BLAKE2B 6ed250684e40b4efcc07a86584adfbc659f886919d0306e82e2275c9acb8a1df698c7cc9a917fa66dd906fe473d14fa29507c03e681aed86286d65d9551cb5f6 SHA512 60179bfd109b7b4fd8d2b30a3216540f03f5a13620d9a5b63f1f95788028708a420911619f172ba57e945a6a2fcd2ef7eaafc5585a0eb2b9652cfadf47bf39a2
-EBUILD libksba-1.3.5-r1.ebuild 814 BLAKE2B 8877db269b3de8a198464bf638d2d00fdfee573e5d188f5639188cb5ce68c5a4abaa28fd1ec7853a9497d8749e0ebbe09d7c99269ea08a5cea957d090bf275d4 SHA512 c3f360077ee98f9b088907248cd37d342d8ae6c121c5c1c9fca6094a936ca06c5dde9612d36d1d01c47b1e2711df24bda77721c5b4f706e1fe09ce59b2ebc9d8
+EBUILD libksba-1.3.5-r1.ebuild 803 BLAKE2B 9efcc44c2c4eed76d727ba908068e13edacf642d0136b54c4d310e168661c5a1cb8a9a4af90628493748d4fbcbe5c0a6489c71ac2fa401dedd076b131d98f0e4 SHA512 1f648c845434fabc1a9ebd5650e9a17a9943f82ed5963c8e5400cf5fbd8d13fc281be2f82a571616f3c55a59430f19aed69c8696c0d3ecc61a3aee3523c67c0a
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/libksba/libksba-1.3.5-r1.ebuild b/dev-libs/libksba/libksba-1.3.5-r1.ebuild
index 6d7d07110393..108f1a8ab6a1 100644
--- a/dev-libs/libksba/libksba-1.3.5-r1.ebuild
+++ b/dev-libs/libksba/libksba-1.3.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
 
 LICENSE="LGPL-3+ GPL-2+ GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.8"
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index 29a3a46e2d90..0b7244146260 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -2,6 +2,6 @@ AUX libpcre-8.41-fix-stack-size-detection.patch 569 BLAKE2B 68f685ccd9ebe0a256f8
 AUX libpcre-8.41-sljit_mips-label-statement-fix.patch 584 BLAKE2B 6523a93f78730f1689ddb79631e31e134d6de844dfc4b3e63a15aea4f0737773ff0a8e4fbf3e9e80ea920d1da751ba2165a7b3b459dfbe0d8673c9a9da95f63c SHA512 38f133a539f4e09886084e0ff2d30bf69ceb600095f87f32eae42f8f03ada9c1aae0a1eff6763d473f0edfcef047a0c573859d0ada503419a7d663140a92fbb9
 DIST pcre-8.41.tar.bz2 1561874 BLAKE2B 2a97a859237994137190da00c30ba7c15e8631b82b7f200858cf722f1fdd0405d36c24bb716eb099d8107f2f829a85fd7d3497f36cdac51769636989331e7a79 SHA512 cc9cdbeb98c010fe4f093a019bebfb91965dae4c6a48f8e49c38ec8df7d9da7f0d32c12fc58f22c51f1c2f010e72b65bcbf8bbf180060e93edf464fa9a7c3551
 DIST pcre-8.42.tar.bz2 1570171 BLAKE2B f68bac3cf8ff5a81ccba31fd4d8926e05143a25a756e7daba9793467cec9cd8a4766f394f958ffca088b472463a43a31ea77014f2d4505082c1f366a18f30c7a SHA512 b47b923108f6ee0c31409b79d0888314271b482a22590e164d02f21d2112fba22dd0342c24f9ba0f5fcc5b8c65550bad08c476e30a2fc79b34ecf4601ed82f3d
-EBUILD libpcre-8.41-r1.ebuild 2756 BLAKE2B 29cc305f8748feae7cad0fe5e11066a75ae212e441d95492c9e6b5f421a51813c32538b4e84294e4ec47a6fcb1d3281a05eccaad8709d8a5e73a9b0d28363d45 SHA512 fedbec7ca069d47f3cd96ba8a514cbe7af0dccfa30a3044f6de6bc94867072821cbfdfccd89ef458e72a79819bf37f9d26ab8e0f9cb11632f3218becd6c7aceb
-EBUILD libpcre-8.42.ebuild 2591 BLAKE2B 59f1cd6f60d2dc16c2c927fdf293ece576124566eaeed7027b66ed3f95ac2136226b1fabef44514468d48edf47f497797c811e4a3f5ceeb7fa9fea969c5f7648 SHA512 e3121271f15390c66401cca2eff0e4ab795d4c99254a96bba1007de519f362f212021d2287ccc0b13c7fed994751a1e31c2681a8e233b2efa3d78dc394ed85a8
+EBUILD libpcre-8.41-r1.ebuild 2745 BLAKE2B 0baa729c7510e74daa1ad81a843eef9dd3f86903d11a2e2f8ba1d8346391fd0db78b0b951c57e199c5c52ce98c23ce439d7b08a5bf619279a03ce5f1ad360215 SHA512 119f0340195ed0d78e419501c3ec767ca6f8cca18ba01111a4bfa8e835dbd8051cd2a6bd82a974b836d1a8a60e5c8d969d06b3f0f049a0b81d6e22e9686efef3
+EBUILD libpcre-8.42.ebuild 2580 BLAKE2B 45a3377eb78ddcff54ee4e04614cba5339c5d4aaea39ac54a8203dd568feaf63e3619024864736d0db8b651c26363aa0a828c131967a1e8ffc3b8ff904755f40 SHA512 1e4a4e86954faa2b615f9e992f5345ab40f2ba54f7469f3cd4d41d41558c8a99eaf1d0d1d1f87d59d23a3a8c2ffcfa614236503807790d4fb18baa245e5a1183
 MISC metadata.xml 1112 BLAKE2B 640e6cc2fe53eaa86b6e6cdd72d45398c880a27d027441447b6162c70fa30fafe818cae8c08614333b866cfb1176feae365996386a72200232a738d99b592b83 SHA512 eb7e2db9932c108442e69bd3ddf04d8d753dede44f7453b1fa33730ec9cda89e618f4444a0adf3f9e7d09baf8c97ff19831906ad7148a26674269f1efd427e6b
diff --git a/dev-libs/libpcre/libpcre-8.41-r1.ebuild b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
index c2d87d6d28f7..d6f935a21d87 100644
--- a/dev-libs/libpcre/libpcre-8.41-r1.ebuild
+++ b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-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 ~arm-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 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libpcre/libpcre-8.42.ebuild b/dev-libs/libpcre/libpcre-8.42.ebuild
index 613e96bb360f..6ef489f6de48 100644
--- a/dev-libs/libpcre/libpcre-8.42.ebuild
+++ b/dev-libs/libpcre/libpcre-8.42.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-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 ~arm-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 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index ce429f9f4335..738c2ecb3ee7 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,6 +1,6 @@
 AUX libpcre2-10.31-cygwin.patch 370 BLAKE2B 3dd868d520c6c4f7f64213ce6854a3d603c6dfd26073eb36238dd04fe7ffb46395ec2002a519269ee28a31e1510251e2d532c46307f0fa2b332cbfe7306b09ed SHA512 7e1eaa3f9a9284c6a21e5971c1c37d8d032da15e7cf98b4b7814e502a3c76221e6939c332ccab0fad5b812c7d9dc55b26532a18a57f6ed715fca3eb79ca95200
 DIST pcre2-10.30.tar.bz2 1583543 BLAKE2B bd9369f3c81bf0d154aaf3d111b934835af25068051f9bcafc0d4b00376011ff7a4acfac127ee10efe6094021163a07a073076d9d769eff68823fd8d1041cd1f SHA512 f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e
 DIST pcre2-10.31.tar.bz2 1603075 BLAKE2B 3cc101b738320823f5b8ab5d29fcc94d8bc2ecd3fbade148de34eda5371cc4d9c168f9e234f0d581626f3da85988ec8d46f76377b019459d3f6b044998e82426 SHA512 44d7db2513d9415dcdf6541366fea585e016f572f3e4379f6e959a38114b2337851092049ab4a1576ae8f19b9de413edbcfa62f434c77fc8470747ee5413e967
-EBUILD libpcre2-10.30.ebuild 2335 BLAKE2B ffabdb786539182e475225186a21b27e1ef059e728af83696bcbf361d37cc98d13e124f4c51e89efbb9004e5a28fa9d0d995f5e21e469107adbf9ce1af6ca1f6 SHA512 89e37f6decc384fa5c499c3978a3eeae03144cf4340d94ec3e4f41fa507b57ad2f8ec2eb6a5dc37718e5eeaa37fad400077fe1d05c61f33606cc389b75dc79cf
-EBUILD libpcre2-10.31.ebuild 2402 BLAKE2B cbd62bb53513a121a65e576bac4a48064b575c6ba0cc31b64c211c11c34acfb39b7bfd7ad3c3a67d9c4497c8820e8b55cf32ee5a8bcbd7abf3456e6b7b2be32c SHA512 0f1fdb609859b949c1b4b87a7113893e405fc3b1407bdcc31800e39638d9ed87fc4a4cc578204c4cbf7b5c8559fabaed59d9ac421fcb5e15c5bc8eab0c23143b
+EBUILD libpcre2-10.30.ebuild 2324 BLAKE2B 1f25bfa72b1418ebee600d5a278a9882fd70064834e3b53eab8ae968429ad75a832854ae144773d1093700792b6e870357bbe2859e91dc1a58beff1333060b2b SHA512 3d7523986e2999cf9ab0263f2b9089ec4a92ccbe174a4dddef9fac17c6a91ddd27e6db529c2bc62afce5cfd784c00fa63e21b3e82646290be2c4a05f2d4dd522
+EBUILD libpcre2-10.31.ebuild 2391 BLAKE2B 3ad00fbe8ebb65a59c3166cef3a00c1c2e6800a4aed99d7aa5b3371ca10a8f64cb392e5e1724efaded8dc3f7e4908b8dfef60756b81449148c5efa562f9c0e66 SHA512 b31d04fd3e8c65638c2bce57bab9e1a66dd42d6a05d791c02395599867f0abb45eb5ae4a5884019986f555e64514fe6b0481a3a36a29d170559c23b74793a110
 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
index 197ccb92f7ff..1f39038c4324 100644
--- a/dev-libs/libpcre2/libpcre2-10.30.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.30.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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpcre2/libpcre2-10.31.ebuild b/dev-libs/libpcre2/libpcre2-10.31.ebuild
index 6cd15f0dac3b..45e150f0b696 100644
--- a/dev-libs/libpcre2/libpcre2-10.31.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.31.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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index e6e6aafdc70c..05c790b2f246 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -3,7 +3,7 @@ AUX libpipeline-1.4.1-gnulib-darwin-program_name.patch 687 BLAKE2B abf27acb9ee56
 DIST libpipeline-1.4.0.tar.gz 805155 BLAKE2B c0e1c774a0e165b6eb7639246324a2945b07652c6ddfbbc60c58a6daabf7cfa5e17690b815d971b0d694b1c7887196be7a70a72c1db5573690bf8c89c8dac28a SHA512 0dce585f9d7aea91889804fd7a65a549b41730add0f6156bf8d0409762fed9c29e8843426e8136c9e0a0348734acaabb48ceede1e3e4d9071d4d787d0b8d46f3
 DIST libpipeline-1.4.2.tar.gz 827362 BLAKE2B df85af1ca5c000a54d18d127bdff9286d7aced24e60fd0eff984cc6ae7acde880f71ec998946a7fd925167b5c05360ccb47439bb68eaeeb3fa7df1d320bf889d SHA512 18d4592c142b745e709b9d30e894f1cb95e8006d8d3d3c978a1c4b8fc2393fc40383aa8236587cc7caf576ee9664867358a94c081c0730de9e337ddbd1e57e02
 DIST libpipeline-1.5.0.tar.gz 828765 BLAKE2B e3a0012b7e916a313eb29c5c995755d345777b86b6d5b595814591c38490179a4dc80c375412f6489dc27ac16883bcd75dda418cbe429e7f4f8f70cffdb7a1ab SHA512 4b4d4a4ac347065d89e2092a00f744932422292a014c7176a4b7c4d2e8fb9d2165a3378d9e93b6899e11f80417b9a8c5c4785dab2f3113e33ffa61265e4c9117
-EBUILD libpipeline-1.4.0.ebuild 507 BLAKE2B 0a893ebbf6cbb052ba0d6e91f4b09ead966e5814f52f47a6e1160abc282fd575d0a5e2d92c61d31223c9bbc0f869fa5f0ee45e452e38201d345722d02473d7bd SHA512 f6cb1cb95a5cbe04c2d1c3b8caf7cb01d25330550c647a542601d7b8bdbfd0c2618ce51a5f276bd3bc4d5234c9af309f1e7ef2660933a5d748d68d906cf499d5
-EBUILD libpipeline-1.4.2.ebuild 670 BLAKE2B 2f6114f69b8dbbb675f4609d3b0a0ddd0ad31baf8df0f4aa5ce68402df145aa60434015c2109ff57c3c87a862c7a24c8990008a37aeee1b1acc5c110d07b3db6 SHA512 74a98b07a06fb576610069b54a0690abe2a642ce440f9e2698cb8c15b00c5724d9942896532e2befbaf7fb330f87eb293c02eab28bb24abd75222eb125753f83
-EBUILD libpipeline-1.5.0.ebuild 785 BLAKE2B e65b17fa1e305e51d0cd87e8e0e4d45d9e36deb4d59c8d7865a6faa6611d620e3d6a050bf11a8b3e855c1c98afb8186ec5bc6ab5928dcdeaef1266ed64ffee80 SHA512 22a844d139bbcb2bc729fcd7c9e75450d5ae2444d99b2a2a7177ab66dc1a49ac89da6a900baedb576d9edc78c639086086491e47bffae6830e5d8cb77c7a5f64
+EBUILD libpipeline-1.4.0.ebuild 496 BLAKE2B b28d348f01d4a9dc8a5016ed332613edef894ad199b7a24f0a81745b0d17b8e00523e538405a9b3246b97c7f1997cde9e4fa385b4868c728f33b81cdb864cac3 SHA512 35930d7ba97cee5d03c5464929411b9497fc6f0439cfe3d093b49baf5084af44951e70ad1287bbf98d7dddc9bc9e013b971233ae54d5c211ab6e0bc535c7f86e
+EBUILD libpipeline-1.4.2.ebuild 659 BLAKE2B ec089cba0d20931ad41e6296e665b209b107951a29169776ec2b58a454e228f33f0a86ee120728b9cfd68d78da1dfe55820b1fee42d3d06674153112e4c46501 SHA512 ee5a01ba66fb4131a9cbf38a219e7e53b4385b01a71eb35b449049b984b7e55b9642a4f5bed3853dfa099ae70dd9f53ed79e2994de2df42085d3ac819bfffe5b
+EBUILD libpipeline-1.5.0.ebuild 774 BLAKE2B 4c9adc18f6fe606385cab11904c6552dd520402ee120448d55e39579890a5a1595330fcc637e9f8d39978926ffbfd2b5f4dd5b5edc8709e0d45a9c78d3719e82 SHA512 3103d6649f43f787ee4e9b7947a9ff1b77aeea32cd3d4fc3583076fb6a5f111190a9d817f5f7db45668440ce6892fa4ac4182c017973955165f947e1867804d1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libpipeline/libpipeline-1.4.0.ebuild b/dev-libs/libpipeline/libpipeline-1.4.0.ebuild
index bd2f9ae7601a..d166b0175118 100644
--- a/dev-libs/libpipeline/libpipeline-1.4.0.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 
 DEPEND="virtual/pkgconfig
diff --git a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
index dc3b38a2de25..c67a85b9482a 100644
--- a/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs test"
 
 DEPEND="virtual/pkgconfig
diff --git a/dev-libs/libpipeline/libpipeline-1.5.0.ebuild b/dev-libs/libpipeline/libpipeline-1.5.0.ebuild
index c38a474ae051..698019ed702e 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.0.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs test"
 
 DEPEND="virtual/pkgconfig
diff --git a/dev-libs/libpthread-stubs/Manifest b/dev-libs/libpthread-stubs/Manifest
index 5e96e83cc93d..0bc9c5f2985a 100644
--- a/dev-libs/libpthread-stubs/Manifest
+++ b/dev-libs/libpthread-stubs/Manifest
@@ -1,4 +1,4 @@
 DIST libpthread-stubs-0.4.tar.bz2 57565 BLAKE2B 0c59ba509aa24ce0d255790363d78d670be0bae5fd9556798f276466ecaf70c4d93064b531dd9870da8f934da6660fba71a7f0b402bb6ba5420fd6ee5ca546df SHA512 0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954
-EBUILD libpthread-stubs-0.4-r1.ebuild 807 BLAKE2B 9cd1d7dd3baea215a92cd538a05ecf4858c5479e7834625884ebf8364c2060788dbd0ff36a00049535242b07a0f287f54c937d12e415f6179c84a27af56bd593 SHA512 827319c423a00961f5db28cd939422025c34619ce18f9d7b7f0a8f6c647f87fad2002d6fef317d5b7117f890a48ab897a055c469d1c3ebace6a8a504d313ca3f
-EBUILD libpthread-stubs-0.4.ebuild 558 BLAKE2B fbdf5eb277d82abd40c467575f23c62518d5202be6bbfcb6bdea017da32d57cf8c9a022e9b5a1149735aba6270d321c4d30aec83a40569bdf58f8b9180a4d0d8 SHA512 11c659e774a557599cec8388436eb85628b191d602f378a2e9e233f26309ff4b6ced321aa0e6947a84f7fa270ec904720502c1319d59409be46f1cde6ae2395a
+EBUILD libpthread-stubs-0.4-r1.ebuild 796 BLAKE2B c4fba5621e2cd450dd56d1497ebf3941052c51435814be8e1284478dc1196ac18547860fcc42e302654282dbb71910bfa6e5d758d7cafff811ea50b89d81f0f1 SHA512 afcadc8b6157b43a7f0ee7be4d7240720286b7772f552902429c63fb1b1b056df01188807a3a0718a252ecde91da9965dc3f751aae0958d1f5c70365928ad7f0
+EBUILD libpthread-stubs-0.4.ebuild 547 BLAKE2B c84aebda474fc0b1d5990b8e049865b1ee2425576ddaddc3f53584096c3ddc190151a3808d0e0739bb734b50940adb4a18c850bf2ea5f3546c4d0ebb7723a326 SHA512 409fb08919bc28e9c28894cf0aefd10d1998d8b25ce5141b7cae7e0589fabccc5b87670df758abd953461142687bc7cff2ec9b33ccbb14ee4585e3999f5162b6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
index 34cbe4bdab8b..63bdeefaedc8 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
 LICENSE="MIT"
 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild
index cf314be164bb..9d8f3b709454 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild
@@ -10,7 +10,7 @@ inherit xorg-2
 DESCRIPTION="Pthread functions stubs for platforms missing them"
 SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 8fe8f335db3f..01b394fbbea3 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -3,5 +3,5 @@ AUX libsigc++-2.10.0-make-disable-benchmarks-work.patch 445 BLAKE2B 250bfea450ba
 DIST libsigc++-1.2.7.tar.bz2 326205 BLAKE2B b316460178224c0b8177ce9a236c69a8b737bf7356b290b59eaeb60b09285c61d113bfc7de89bd712c3c049a492f5cc36d205ac77816aff73e587e8a42ade520 SHA512 79fd9657219459bce64fc069dbcb054959e324b5d546b5f11acaae5e5bedcc4dca699a21c949e3f6b2ec0dbe1c3dba3981158e5950d0aaba5028445b2ad5740f
 DIST libsigc++-2.10.0.tar.xz 3794612 BLAKE2B 205cd8cedbe25d04108df888c392fe6a14829826cf1b6b7604a03f357788dfa83a5ba213d6365c48965dd16fcd7b545c9e76d4e4d10971cc1c9ccb172ec0400f SHA512 5b96df21d6bd6ba41520c7219e77695a86aabc60b7259262c7a9f4b8475ce0e2fd8dc37bcf7c17e24e818ff28c262d682b964c83e215b51bdbe000f3f58794ae
 EBUILD libsigc++-1.2.7.ebuild 953 BLAKE2B bbded60c997517150857e66d1d1bce9123666391c0328862ef3da2abb75519ef06585ff4209803277352e49c5059606975ec963b564a075229d4fe7243d92dc1 SHA512 8fd16c8a79761172d2674ba2935d07d13d16c20db687a00e53241a2f5d7b1c9f7b61510968960e02be85a6f5e52aa622cc0d09af19c2ba19a274e997596850b2
-EBUILD libsigc++-2.10.0.ebuild 1667 BLAKE2B 06b495573cb9dd4fc2e4e18a4c50a6e8e701d83fcd664637786e408d6860e907e751f6d145bc0ead7f19ad85b13ed60d4416db6e6801550011dc6aa770156b1b SHA512 118ea0948c4c9e2ab18db7de6370a7bbc251a2cdb885dfa5325b8c96b3cbcf53707322730d3585d2ab1e0974911e5308f259a546d69660e3b71de5f1fd20f95a
+EBUILD libsigc++-2.10.0.ebuild 1656 BLAKE2B 06f822384e9c2fcbf52fe91a783ca9266d4ea7f728d9c9c14db04bea4a8b69cd1d863f719f4031028d30b074563b5cc401eeee2fd3693e33497e9b3449910e79 SHA512 f28e3fc55596383da213da6941015162cb7b2983d40990b030673fe6aecae01ab88b842e1b75cfccb70d235134cbfb8da6db626b22822bed277c5f2f4e7bcbc6
 MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-2.10.0.ebuild b/dev-libs/libsigc++/libsigc++-2.10.0.ebuild
index 3fc06ee2e3d4..82c255add4fa 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.0.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://libsigc.sourceforge.net/"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND=""
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 73a15ceb2d6e..7a361bcc1cc8 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -1,3 +1,3 @@
 DIST libtasn1-4.13.tar.gz 1891703 BLAKE2B 5a8bfefe1a3701505c8a1a4920412a6dd15fe771fb848fbd00f0a332388795dc6108a0fa5a282b4212abe0b0642f205bda53c2c39a4a2d65fa71e082fc76a6d2 SHA512 bf5b60a296795e0a8a4a658c0106492393aa7ce698e785256b3427c17215c2a5b6178a61a2043c93ea4334f754eabece20221ac8fef0fd5644086a3891d98a9f
-EBUILD libtasn1-4.13.ebuild 1177 BLAKE2B 34fdf4a4deb945bf9529bcf09976011a77c0b86f61ab31c226f98f347aaedea70b32af227c027d512ba2cd18b6f7cd320cb596cfbf4f03a847dd883e70f8040d SHA512 e7efc304860cc9ee726fd51df8f14ade7122e16a1a97de2addd208d2081c985ff2873e2999e3d36fffc7d26d423e6ebdbd21d3215623ef5d680d0b29cda23fb1
+EBUILD libtasn1-4.13.ebuild 1166 BLAKE2B e49c5eee41158b1d4a43bc67be3f949069fdecec8a575eede869287744071eff5358c5f3f807f5a79d3adc1554faefbdb4f4954d4011ac5c7bd14582d887e7e9 SHA512 5e59ee9b5e9184fcb5f8fa11ad89963214697835760ed7aed27b5b8102377cc36b7e75c99aa7bc40e391b234cb3e9dba654dc9c248ddea7ac019321548121ec8
 MISC metadata.xml 347 BLAKE2B d1cb59aca28df43f3b322b98daf2cefd4c91d45120bd47c5cb883dde59ae0ac9b8fcb092e0bd4b51e1f09aff48b97a6e1880568ae6796025a989b67902b01a7c SHA512 2f70d06c9e91e2d9305cce180c302b6b04b4831fd93c1897fd2027a1bf5855700c5531ba3f9c3fe93748df1db923d6ad4ea78bbe3cfd2458c0006457ed43a450
diff --git a/dev-libs/libtasn1/libtasn1-4.13.ebuild b/dev-libs/libtasn1/libtasn1-4.13.ebuild
index dd05e0d8d309..45c44f460574 100644
--- a/dev-libs/libtasn1/libtasn1-4.13.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs valgrind"
 
 DEPEND=">=dev-lang/perl-5.6
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 99330cabfbb2..285314c2a997 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -2,8 +2,8 @@ DIST libusb-1.0.19.tar.bz2 521496 BLAKE2B 9f38dcb8f053019511dc2eed93772183c54879
 DIST libusb-1.0.20.tar.bz2 795247 BLAKE2B 9b3b4b9e372487ca355611917eb00a41d439df391796edf0b4fea28fcd88ca92214d05c4beb8eaf918028d833544e385e59ca38426880c293e070c5f1fc64647 SHA512 4230047dbc18db402f399a6b228f70da37ce4f9da9d57203e5c31cf0edec5ddd664865b4f16038a2ae72c26097e713b709b9e882a11b65a274e84993d617c765
 DIST libusb-1.0.21.tar.bz2 607417 BLAKE2B c76352a19f416ad27b8940e99f38878e248cdbc04ef97752f8c8468ab0391869ab611197e3e143d69e0e23563da59f1691c14fce72958fdf28ebf10dd8c1521b SHA512 015ca07bdb559aa40af5db1302ab0b1c8a30d593699fe2f3c9f45162673dc7b608cecc58d60fde8f3bde2a68370794a045e8efa48fc55402eece11261e525762
 DIST libusb-1.0.22.tar.bz2 598833 BLAKE2B 38d01c1dd1837434c24008151a27cdfb2b2e9aab30fe95e4403bad613a0147a13b9b029814e15520bcfc2c181b00e3c5cc1ffdc3a586a604190bf441d3c89318 SHA512 2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4
-EBUILD libusb-1.0.19-r1.ebuild 1560 BLAKE2B 1cb06351bcb1d58201ac0429d0a485181ac661508610e53cc0884647277a005114f17da0c1ad69b454adf01515976510f72488cf7471acccf87aada9135b8b8d SHA512 cf2de7a2ea5c519af0e1d145356601d7007b33008eadb55dd0ce8996d8ff5ca7387379abe8f4c9864f856b0a4d4741c893e309094920b837b90bd1095035485e
-EBUILD libusb-1.0.20.ebuild 1619 BLAKE2B 12953b79d2c2a7e8face48723aaf838df0fce66d8a821001b9473e627d35209510ef42a3ae29f40dd42747d355713b1bb6deea72526c7f19ea207bc7224e5300 SHA512 eebe72ff4c4d1d0f2089b01a4af68824d2841d89641b698385cfd5486280592d0141857c011a347c9b915fa5f46f7dc43f0e6d4bbfd6e9b1a55bb15392f83cb7
-EBUILD libusb-1.0.21.ebuild 1592 BLAKE2B 2f491953f05ecdda858c0878a84768b81fb629c442fc4352537d0b5259e291b54986a1117a1312406741b9b2b6388cde44b076a60d76eb4238f67ac162ccbbaa SHA512 4c172fcbb7a64856ce455bb8591e937cee3ac3fb6f477d816cea5c5e9510e682c54345fe5bd584dcc02947e212053cf1e47b73aef048f33b073b767d5a82e540
-EBUILD libusb-1.0.22.ebuild 1587 BLAKE2B 5be9233a0964ba0872088bc29796bd5733849189db5783f49f79bcfa439a93eaa4f7d37ea8d684545c2e6537696f75c5ddfda0860f3faf5c8649d2c426c693aa SHA512 fbbd119fe0f9b0bcbafcd337d5e932a3ce10ab0f09f796d5bd9f7aa05b5986a8dc5557536504a062246c2d60e108507ec99f41e388220e6084c61fad20b44f07
+EBUILD libusb-1.0.19-r1.ebuild 1549 BLAKE2B 6a12714ca41ce219044e7e7e899b3ade24ef87a30279c0e736ca3d30aa16cc83316d879d790bc3917d57cb313a643c5863263488177504c833fca8f8e7d276d3 SHA512 95e8a31d19a4780bf8c4763be4c9b78fa07e25330e237a2bd3b73a5b2de6d0c74f90b8c1da857d9e6668778cb6cbe01130b62cc31a69b8dbbe56e3f012f0a762
+EBUILD libusb-1.0.20.ebuild 1608 BLAKE2B 2cf7b9d95cdd1145c0be082a4ac76f56db425515dd47f96843548e9dae8ae20f811a64f8e6854269e6624bbce1c6cc44096b2d3c718611e77360171712ccfcbc SHA512 f3ea152ec746f8f7d3bb436217376dda43332ecb0c5bdf1c8c8354eba4bff6106744f5b499ae69b4a457b106ccc935e2b90fd0c20f51ead919fb67df912a35a3
+EBUILD libusb-1.0.21.ebuild 1581 BLAKE2B a68ca4839ac711f9d88e12211c01e04fd58725bc848e005ad079115e08441ee4bbdb04d143037ac4ef4610bf6caa0b2f499f1866e42270c56deed1d23cb858a7 SHA512 bdfc6422076d472b292a5807b4f8d4505bd7bc66a00ee0327d59386c70efcf9974bc0d635f276e657fd8182ebcb71cf390e20df1f3ce5e047a771940cb8f3588
+EBUILD libusb-1.0.22.ebuild 1575 BLAKE2B 5f37b8ba133dc6fe02160b6a119f5a486798769c5993be4f20cbf48aa5d46e8784225b4b5772f70afa13a4d33b5294cd83b65b87e77062e147e9746d1d0d5060 SHA512 52cd79ff6b82b08d0a8409433bb281ba1a5dac67de872bdf40f534a8f03930eb9cf7e08d6315f47f48552347bb4e884ca93ca719393d88398e5cdd17eddbe868
 MISC metadata.xml 437 BLAKE2B 19a1ea2b26db27c6441a15502f61ca4240b1180b9aaaaf3942ce5b8cce5ee45724385401ec067901e31a0da785a636ca2e2a9d27efe231094d3952288374d169 SHA512 a67b2294e73782a948e338bc8820bc023e39ad612319a38387b3ee15e63903687ce4d90d8246df93cf2ea498c5c8dab25cb760c3f333d6dffc5d4d7b8c77a0a0
diff --git a/dev-libs/libusb/libusb-1.0.19-r1.ebuild b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
index 4b991d0cc92d..c2aeaec6561f 100644
--- a/dev-libs/libusb/libusb-1.0.19-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 
 RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
diff --git a/dev-libs/libusb/libusb-1.0.20.ebuild b/dev-libs/libusb/libusb-1.0.20.ebuild
index d2db6a57dfb8..ad04abe7f033 100644
--- a/dev-libs/libusb/libusb-1.0.20.ebuild
+++ b/dev-libs/libusb/libusb-1.0.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 
 RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
diff --git a/dev-libs/libusb/libusb-1.0.21.ebuild b/dev-libs/libusb/libusb-1.0.21.ebuild
index bd9fd63444c5..b9139ce49c31 100644
--- a/dev-libs/libusb/libusb-1.0.21.ebuild
+++ b/dev-libs/libusb/libusb-1.0.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 
 RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
diff --git a/dev-libs/libusb/libusb-1.0.22.ebuild b/dev-libs/libusb/libusb-1.0.22.ebuild
index 277a0132b99f..0b14288ec0d2 100644
--- a/dev-libs/libusb/libusb-1.0.22.ebuild
+++ b/dev-libs/libusb/libusb-1.0.22.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 
 RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 85f2710e2805..1c48ab0eca0a 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -4,5 +4,5 @@ DIST libxml2-2.9.8.tar.gz 5469097 BLAKE2B 0b7836db46edebf6e7108c28da4bb7e3fb5ddc
 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
-EBUILD libxml2-2.9.8.ebuild 6433 BLAKE2B ea543a19bd079f6846a305c0a2e8863ea737535a92cceecd4e139329c3b247ce5d4d490c2f2bf81e55d0ff22efa5b2eff45ac7d869f2ebf0f7c0a11f972c7d75 SHA512 bbf2b4369055ba8f7207603ede8a13f4a6555330967098b95fceca3a8d26680e731c64417650a474accff156deaff14955488b1d4742a9b3dcf6493a4843692d
+EBUILD libxml2-2.9.8.ebuild 6422 BLAKE2B e58ea4de8a520aadcc704c4893fa1663e6beb44cb5e92297ded959b2ec18bf428c27f42268b546c4be332065451360b00852dfe7415cb35917579a89318a1cbf SHA512 a861d5a2a20db478d933624bed1972fd1f2df3817a4ac31a848bce21ff4ff227be96d909b28fadd3cee980db93da47cae1ae056d4f7c3f9511710bd373c31d4f
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.8.ebuild b/dev-libs/libxml2/libxml2-2.9.8.ebuild
index 9f5dc9055c6c..c55b293e2021 100644
--- a/dev-libs/libxml2/libxml2-2.9.8.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-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 ~arm-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="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index dd4f2bfc5a3d..10d4f95d25a7 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -6,6 +6,6 @@ AUX libxslt-1.1.30-simplify-python.patch 7487 BLAKE2B d4a355c285a3c62b1c96846c62
 AUX libxslt.m4-libxslt-1.1.26.patch 1421 BLAKE2B 91a1bf2487158d5e364247d29da4485e7b62f1838cbe1f8eabc7617b67929640280f6f2b649ea090fcc818fd5e5e99809b960e1cd69a5df42ca73abe86839b98 SHA512 78cfb6bd823805f660c9d07c4f6f83a87cf2385c48fcb11bff82792101f06b36d08f851089497f0c019f5743f31248cbabe341f78f4ca7e7617c86c4e5a8404a
 DIST libxslt-1.1.30.tar.gz 3444029 BLAKE2B 668371393a11c0c16d1549fe771fef7dea96a7208f359578b773c9e7d4c6c4accbe43500e960d58e8f2275682a839582f1f40c1bd984745b8e3944a1d9a97582 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986
 DIST libxslt-1.1.32.tar.gz 3440715 BLAKE2B 8d5dead5788d8d09ab121d6e33397ee8ed8836f573adba4b5f0e3f2e1410acfca0c50dbe06ea3b50a2df819aa01e7522902fbd5270e5329075b854881150ab64 SHA512 e1ed3c103cd4c9897e7dd2360a11f63cf30382b7566ce6fcc81117804e203714446b5a62179ce628c3834b0b32ecdeeceecbdfa417507ce9ed5a107a0ebefb39
-EBUILD libxslt-1.1.30-r2.ebuild 3697 BLAKE2B 1ccf6efd66585d9331fcbdafe28cc95b447319160c92f4285199a839a6f7b40cee988d6cc0a9f2c60c30b56dd1a890909f4e1b1cc39178d1146a2a338436fa11 SHA512 51c36880c9f8a6a9882c4a5b8143ab96af96e0123d4a82767d0eb8e5fae9ce24d1ebc9be6692c842cdb049c34ae3f6757494d7e4bc6f2b7e090e33002ce69ec3
-EBUILD libxslt-1.1.32.ebuild 3284 BLAKE2B 33fa441d3491a58312a1bfab57c7d73b980aff1f95057fca6327914178710d0a217a60201c371e95cd254c2ed3e629bbbbdbabe380a746a38a78e5a88d7992d2 SHA512 3da5e9aa110d04ed395dfbb461ddf45c5abe688cd89bf1ef1446132671425c169c42bca6d36c9c9dfee27cb9f650556836f57e23425b44cf188a990e493336cb
+EBUILD libxslt-1.1.30-r2.ebuild 3686 BLAKE2B b9166f6b1920bae85b94714552db3ef1abbb6aa3ef96a1b10c5b90030f457c4b6bc05a6d591c84b7d2b0fecb3ff5c731372390949752cff5f7c65da7d040c83d SHA512 20fa9f8bec546ba0c2a78647d730254bb1fa36b90829a083a2452ad8303e1835c74a0a8d2f318ebbc9d8e07a31728ab8fc67c7cb693b70aea27849827daef1c8
+EBUILD libxslt-1.1.32.ebuild 3273 BLAKE2B 0655ead957292f5e00f0ae6f60ebd44a08796863f5203331cf5e0ebdf537500064968eb92d96e073f70e5ebdc299a5bf9768338d529892d90e86ca98f22fbbc6 SHA512 eec9a8572d17b14fb117c203d13c44ac36eb2b9df326e460ea5a72d031ce3ae4ea06bb108065dd8cceaa18fa73ceb06f00af2c1380d39367df36d9402af2e31d
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
index 7b2ee91de7da..fa6a482f36c2 100644
--- a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="crypt debug examples python static-libs elibc_Darwin"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libxslt/libxslt-1.1.32.ebuild b/dev-libs/libxslt/libxslt-1.1.32.ebuild
index 43b455821912..56ea83a8de3e 100644
--- a/dev-libs/libxslt/libxslt-1.1.32.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.32.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="crypt debug examples python static-libs elibc_Darwin"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index 5359b94711b0..9ff00fadf8c8 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,3 +1,3 @@
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
-EBUILD lzo-2.10.ebuild 1041 BLAKE2B dbfeadcfb8660622b324012587bed2db8f4dbe70aaa7cfc0f1e651fb2a6d072f9c5292d018a6fdd9a2c4287bb5881a1153f3e6ffb0f0bbcc487713439578ee31 SHA512 b354b5edee1e3587c65a0734145cdf0322bd574f35fcfbcb5dcb9cfcc2036789523982b26dd19b81c7297c0982a4d59c12837c22f2ab6b92b6517242d61e6905
+EBUILD lzo-2.10.ebuild 1030 BLAKE2B 423551ac47900377b809e25c72749334beb26426a7860abf435913ce3d76ac415059dd05bfb46f64887ad127a28952d4948afe9e4289aafac426b228b3b8cdd1 SHA512 db7e23121a482d074f76634215c10b5eef6c2e5fdf01984c5bfee57d5442eba424bb2244ceda3f9ce383b6fd622c83641538763f4d5afa4d1c8e789c2efb3963
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild
index e12c63e23914..2960660b6803 100644
--- a/dev-libs/lzo/lzo-2.10.ebuild
+++ b/dev-libs/lzo/lzo-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~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="examples static-libs"
 
 multilib_src_configure() {
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index ba76f8a2d1c1..ca6f5959cdb9 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -2,7 +2,7 @@ AUX mpc-1.0.3-mpfr-4.0.0.patch 3748 BLAKE2B 906ee3ff90ab1d9aad58caae7b1185d99d6e
 AUX mpc-1.0.3-no-ulp.patch 904 BLAKE2B 33f96aa9ce60823ac9b84a604ac84c87fd0d4d8eec9b08880f70920aad24775a00cfadf0e76f08274d829f3a7ef03f22d8f440f0207ccaa7f98f1c4911d0beb1 SHA512 22bf9f04ba745d66469a23366d405b7b32bd7454e2240d01995b0dd04e156f23fa1bd842b520799af899ff96650bd050f4675d7a9cba6ebd68ba8fb5d658a0a6
 DIST mpc-1.0.3.tar.gz 669925 BLAKE2B 4b5a1db5220b58070f9356041f44f021c2c9ec46aa4303d0a31e809d649897bc3547e9b06271dae4e80be569ee67e2a84f86b662e05dac0ca36ff87e95fcbd62 SHA512 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43
 DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628
-EBUILD mpc-1.0.3-r2.ebuild 1105 BLAKE2B dc62c597630b6de0c870eff40e6322b75af258926185a296f55353976c3cfa2ff3f4d189f97001de02c1e4b1665f808c1d3944846abe5839775a0aac7bc0f72e SHA512 73fc04828fdf561b94d830a3b2604bccd53e8ef0669a4af28ca8402e797c8eff2e851074874142f1ea23aebbd7def75b4b03b26ff75456d84d368922b7386ec7
-EBUILD mpc-1.0.3.ebuild 1015 BLAKE2B afd85b4bcbfebbdea5b2fd505552f81d2b58e1e639fcc6f0eb3f8d88a1235c35fa04151a4f8d7ee4499e77fad87be3b9f63b5ee738af139fdeb95f488d76cb42 SHA512 f0451c7c73564ac34d08a6de5c985c1c34eea2a7a5e44617ee6304fcebe9899ff7f46072685edee15a1e3c75b1f4beff273a871b3109ea77e35072405daa2aab
-EBUILD mpc-1.1.0-r1.ebuild 953 BLAKE2B 8a96c5856edaf54eab23ad5625164636c818b53a0bb66155d8c0fe99b280942d8421fdbafdc988764dbbc03d93b34665ce61d69f6cbe29c113e4abefd787fcfc SHA512 c4435f9c47e4b2c2165fd380b749cfb02ecfb77ddd17fe51afd46e9d8ada086b29f92ead62481327b0a5baca60380bf7b2f57b609b6561ace4ab5ccba535bdfa
+EBUILD mpc-1.0.3-r2.ebuild 1094 BLAKE2B 69cb343f8c8e09a5f892322c542778d07d9fb258e285504d9f7e7d42631f01654880db81d2dea4c91296d81ac03d9869b6cadde63205fee3f84fac6ee123786d SHA512 0b14ce81f3a0311745c14aa3c48c1a86f196f7948b93ef4dd1476f018386cac393827aca263413989d556c43aba7a6897ad8b248f824aa3b4c2eb079f6319174
+EBUILD mpc-1.0.3.ebuild 1004 BLAKE2B 8b2413305471f3f300f64a20d19bc953f78037c1ef24c4fc48ad3299ddbee4d3ee98fce7f40ea791689c4f66ad38668baed9dc1ec184b5b6a6f41102668db926 SHA512 213f0d5e744bdea51bb06d5b5d4ea84399064f004a9a08421a2b0712b6a36f582983ede509e2db0e4bcb4ba76cbe83152c57858a89ba7c2faf7e2e2c4788b987
+EBUILD mpc-1.1.0-r1.ebuild 942 BLAKE2B 7b626cb052f27ee7729e8657babe2e5a2a19ea848d60a73454210622a0f47db6eb718e71cc86f0b566e90c7f4f27892e2001b0dd2b2c5f85ba234647577f9959 SHA512 2bb90eabc2c49db7f786f5bc719f0fa2d40fa0fb7c7dff3a19f2ef82533abe6507c1e31f27ffe4407b3c534161d68776ac9a8fecb8e90ba5b92eda96ef414ab5
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.0.3-r2.ebuild b/dev-libs/mpc/mpc-1.0.3-r2.ebuild
index 341a5f65ce14..8d3833ff376e 100644
--- a/dev-libs/mpc/mpc-1.0.3-r2.ebuild
+++ b/dev-libs/mpc/mpc-1.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.multiprecision.org/mpc/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"
-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 ~arm-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="static-libs"
 
 DEPEND=">=dev-libs/gmp-4.3.2:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpc/mpc-1.0.3.ebuild b/dev-libs/mpc/mpc-1.0.3.ebuild
index cabde2f027f2..94ef19f4592b 100644
--- a/dev-libs/mpc/mpc-1.0.3.ebuild
+++ b/dev-libs/mpc/mpc-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.multiprecision.org/mpc/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="static-libs"
 
 DEPEND=">=dev-libs/gmp-4.3.2[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpc/mpc-1.1.0-r1.ebuild b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
index 745967b5ccbd..2827f3730ba6 100644
--- a/dev-libs/mpc/mpc-1.1.0-r1.ebuild
+++ b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="static-libs"
 
 DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index d27e0c5519e8..9ca1c01694c0 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -10,10 +10,10 @@ DIST mpfr-3.1.6.tar.xz 1133672 BLAKE2B ab8b87be9d29e9ae5807976f72d65e16cd3e5b4c2
 DIST mpfr-4.0.0.tar.xz 1406244 BLAKE2B 2d1e356ac1f7119aa8896c438e7e30c4b316780d76fa2690e50482005e9ff5d6b5cd368d4c9a524df66ea3e7f2942c627329fa15be83402209c6e249cd1abd28 SHA512 9c9c4535f33fffd2126d1c290e5eeda7cd2804219244643f09c9a2d2acfa3d410d2cb1e4a7bb77cd86cffc2fac59c7f5d32c9910317cac37dbca474ab6d63808
 DIST mpfr-4.0.1.tar.xz 1412692 BLAKE2B 3e8d5cf558071571c21417088e74b8cb94a2e179667af41f734a68c7bd89d4beff245b9344c4c37d2f6558036a1a8c9ad3ea5ec8fbde16d2c7ebbf37a22cf424 SHA512 137ad68bc1e33a155edc1247fcdba27f999cf48ed526773136584090ddf2cfdfc9ea79fbf74ea1943b835b4b1ff29b05087114738c6ad3b485848540f30cac4f
 EBUILD mpfr-2.4.2_p3-r1.ebuild 1497 BLAKE2B 7161fc539fd4de18e4c66a057bbddf9633e45a964fa628051c800a265140fdbea1652c3e8fa8ef1e9f156dcab58d8283761218382c5af7056dcbef2b63405342 SHA512 6634ef915f69bbd2ee2f27c01a4aef7f6c8e3258adc270fca97e55c8f2155fd66b6ab827c2152db1d9ce93aba7a96b884a05220dac3ae92c02b869efb8e9f6a4
-EBUILD mpfr-3.1.3_p4.ebuild 1823 BLAKE2B 1313196a76a17659dd2217930c7927aa36d21796a63892029bddaac05378166d9538798b76bac24cdabfa62bdbcef2355a7d72781200b9fcb65b43ddbdae0cb7 SHA512 ae4016e18528c4e4835760654581ffa59d1ce497af327a0f4c1f73f1e647d01a02cb5c8d900ad63e2567aecf21290cf11f13c3df6f7292a90a5c736e9877972e
-EBUILD mpfr-3.1.4.ebuild 1645 BLAKE2B 4dcdecbc94e30f09cd4b4619585309f40a52e0845b07cb3455fda73125a064b20bff587d894a2487a67ee75bc1448336903cf84b4267a19d2f9fb735e8e062e4 SHA512 b482c8e4d47251cd0cf9298d4a2881532844e86a7302f787d9f4b5f80c0597c170516ea33ed754c20bf587d4480d465fa2440d33db0ca984570de4e4d1716f4f
-EBUILD mpfr-3.1.5_p2.ebuild 1705 BLAKE2B 4f83cc7b2078c2649afefac597628bef22a87814bd314c294ba0659c50c16b17ee7e4ed74b66d00d9be733c0cfb3110e2528f482d549d9f5561d462422f96a5b SHA512 d257664f34a7a69fa414dc141023bf13314afa55194b66070dbf90cc43c48ee28775b6a22d17a8a5e33e2ae050c7157197136c22b6164418b5c16a171c54f3ab
-EBUILD mpfr-3.1.6.ebuild 1624 BLAKE2B 3b035335d20d7dbb20f385d54c3fc04241cb448f6ef9a02d7fc60145e20ba8834bdfbb8149714b4593832d6f8fcbb6fcc8edd17d4dc8b3a61841fd49922b7176 SHA512 88318ce5042b52c77e7a7ff3099bd23b9255a299df7a2eda382a9f41e774dd55652f1455cd30f831bb1bf01ea75ea2c93c6128c25c11bda9a8d84ba6b8e17174
-EBUILD mpfr-4.0.0-r1.ebuild 1731 BLAKE2B 4236d16c7a09560e28533302a13283da3efd381754dbc249e71c1b39eaf2745883ef83220c8a78b19b7b9e679ceab846254ed781e22d3585cd3762a9a851fafa SHA512 1be6eaf4d69bc6d17929095d608b320f4ebc080b5bfdc44cdf1583320b4c66290ea1eee1b1c2e62d0bbd86c889ba1212cf5f63cbb9db7a177540aa02e2500a7a
-EBUILD mpfr-4.0.1.ebuild 1731 BLAKE2B 4236d16c7a09560e28533302a13283da3efd381754dbc249e71c1b39eaf2745883ef83220c8a78b19b7b9e679ceab846254ed781e22d3585cd3762a9a851fafa SHA512 1be6eaf4d69bc6d17929095d608b320f4ebc080b5bfdc44cdf1583320b4c66290ea1eee1b1c2e62d0bbd86c889ba1212cf5f63cbb9db7a177540aa02e2500a7a
+EBUILD mpfr-3.1.3_p4.ebuild 1812 BLAKE2B 488a0b5543cff2058fb64cb7164916caf22a81b0e931498d1f54d567c182fa846dbce4a838316c973d99c2715f9a5ed279bca94d9fe5cc189791fb162c01121c SHA512 95d57a2c819ba28565e00cbc9e8075f506e75bf685b8a8b4cbecb56abee8525b8b3adb070d1470dff6f7ee69b8547e77b312e64f6400c41120a4830ef92e6c50
+EBUILD mpfr-3.1.4.ebuild 1634 BLAKE2B 2c3ec81dbec054f865b81a5e16cafb0c4464ff6eca4fe034d328554087594112d90d64c76149c293a1d210e8ce0da7e39f55018512b8154bb5dbcc44271c411c SHA512 86aefae35f12481e03f5b45831e2c0ebc64060d9dfa7253b3ce2fffbdb08429c53c3fc5f0ed334b9fcae2fed6b74170a612494943db5423b9acf24c34b8d0f2f
+EBUILD mpfr-3.1.5_p2.ebuild 1694 BLAKE2B 5fc3003fdde93f5d358af91b8e70483ad969f808ff39c43fd7e76e40c69baec9c578d1eb76b47c0860a119b29e9a06d51e013f07382e87380f2159d79e1ff7f9 SHA512 a851d8c13612123defdbdde43041b3d477e0cee21086aa82e18252f2811011c3f6af0d47078c1cf9fd3d056977f42426ddf60b4f062607599a7bbc8ca95b20f7
+EBUILD mpfr-3.1.6.ebuild 1613 BLAKE2B 395a98c009ac37dd9a66d1f5d6dceed463571235164946e2c6dd5dc15dd25e967f0c4832f5743a3a22e563a292b5dd4469e0d7ee3f5a4de10fcd84c0746dee00 SHA512 c39187e26caddce22e50724f2045d4e170f640d62085a6d19efcbecd77bd55a6632bb2076c174ee1ed41770a335921c3ced75b6737a9234feef6527b21dc2f4b
+EBUILD mpfr-4.0.0-r1.ebuild 1720 BLAKE2B 33b420b5be1b09b18a5f3f99bc574b84d81cae9979d26e6f937056a206e8b817c6f995cc01318bf443bda82967e4f0f2d3703806bdcd7e9539c50fffa58d1270 SHA512 7d8c0fd531d8de2a533282171b3183b6f9d9e518fb620ff5bd1ad7ff94cb8b8a897a780b2fb680244e6b963c704d109ba92aa718904c5af8cef6c0ef0e966dd9
+EBUILD mpfr-4.0.1.ebuild 1720 BLAKE2B 33b420b5be1b09b18a5f3f99bc574b84d81cae9979d26e6f937056a206e8b817c6f995cc01318bf443bda82967e4f0f2d3703806bdcd7e9539c50fffa58d1270 SHA512 7d8c0fd531d8de2a533282171b3183b6f9d9e518fb620ff5bd1ad7ff94cb8b8a897a780b2fb680244e6b963c704d109ba92aa718904c5af8cef6c0ef0e966dd9
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
index 4a7ba6e98544..e19a31cc851b 100644
--- a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-3.1.4.ebuild b/dev-libs/mpfr/mpfr-3.1.4.ebuild
index aed000a2fde4..f5a549273d6c 100644
--- a/dev-libs/mpfr/mpfr-3.1.4.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild b/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild
index 09e5460b545c..bb73ce2d6a48 100644
--- a/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.5_p2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # libmpfr.so version
-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 ~arm-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="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-3.1.6.ebuild b/dev-libs/mpfr/mpfr-3.1.6.ebuild
index adc199a660fd..54529fa86a00 100644
--- a/dev-libs/mpfr/mpfr-3.1.6.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # libmpfr.so version
-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 ~arm-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="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild b/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
index f2ae19aea02d..b15b4e64c7aa 100644
--- a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # libmpfr.so version
-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 ~arm-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="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/mpfr/mpfr-4.0.1.ebuild b/dev-libs/mpfr/mpfr-4.0.1.ebuild
index f2ae19aea02d..b15b4e64c7aa 100644
--- a/dev-libs/mpfr/mpfr-4.0.1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # libmpfr.so version
-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 ~arm-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="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 5bc03215e1f3..4759f00b664e 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,3 +1,3 @@
 DIST nettle-3.4.tar.gz 1935069 BLAKE2B b73c88236c8233360607a6ed65cd4f6d19bfbbf683b46149326ce3440bf0a42b8add69de5c64145720163b1095fdab3cb8bf410c2ef727d0ea4fb58391ff0f14 SHA512 3bea3aabd2c99cc42d084a94fd6b0b5dbdb24cd6c7020271a6ee87a81a904b21b21756f590cb1afdf2e85fd1cb59e5c3651c5c4032e30204e7ea6f8801d1ea3b
-EBUILD nettle-3.4.ebuild 1763 BLAKE2B dff04a774b1698987c57710cfa329fc2ac1ecc7f4ecf5b646137c4b9ca3ff4c3a3a57b95f7bceac60d72c348785d7bdcd85a7b7b31daf998c9dad8469b5a6bee SHA512 0b241e5b35c78540ebcea244b41c4fc5c38e1436c8491d23000b6b5cc0cc56808eda0361349cba925374024f239d405361368bd5f0f5cbcb94469fde972e126d
+EBUILD nettle-3.4.ebuild 1752 BLAKE2B 583491077b1cbcda7ca0909a215bbcd12e6b4ece00df150e8f5a140b6743953d8b13308f18433ba5e5050d9e0080549e71911d7ef496454cad0687c35e56e512 SHA512 ef782229fe7d438976584c2df45ecd9b21852b19e62f551db7b981bc47c0bd1948227ad9953780c17578678defafcca72c1796a7cfb084bd3e5f49b997ea3c60
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/dev-libs/nettle/nettle-3.4.ebuild b/dev-libs/nettle/nettle-3.4.ebuild
index 7646376f7968..38bb60c51e7a 100644
--- a/dev-libs/nettle/nettle-3.4.ebuild
+++ b/dev-libs/nettle/nettle-3.4.ebuild
@@ -11,7 +11,7 @@ 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 ~arm-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 ~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}] )"
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 7000ca023a0b..9f6f3f70d691 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -5,9 +5,9 @@ AUX nspr-4.8.4-darwin-install_name.patch 1046 BLAKE2B 1182149b03bd2c03fc4051bf98
 AUX nspr-4.8.9-link-flags.patch 931 BLAKE2B 6aa6aa1cf3b856a95b7baa20f58e9ed83b8b29ccce37bab39e10e0e76c433ae5c79839b5f7f9bdaf8b2475c8e3692ff4a57c246dfa4e1fed6866ab284826ee0d SHA512 0bb61dc09d287f1324749c983404e1f03fdf7014fbbd32cc5abe452fc2f32b90b759d8f18d964a61da044b5a7221f5ba274d94c93c07c8a7359e3c937e44b975
 AUX nspr-4.9.5_nspr_config.patch 251 BLAKE2B 65ae8b981e758e2955b7a3358f24b7b17dc1ef59f0e78f9fd9ddee740a4da3825bafea34f3900200b3f6edefed7d0797c194cb0339d4e36551615d599156108d SHA512 3f118b7142a19dcc7e26b348cec6029c78d585a57cc2bfc2ab7ca13d2ef953e576dab0ac044316e3165d0201bf27253afa732109f914da6f7a39f19facff8310
 DIST nspr-4.13.1.tar.gz 1136646 BLAKE2B 68a756f16f3bed7b75e26ce67b8216b06a61c71f669f29970ff6caec624d39a98496f22e643478b20d1bf2b3e753dd4a98aa5fc685929cbece365dda7302a6d0 SHA512 4755dce1a0fddbf4991f46328bdd15b6b07162792370953e16481be56952d4c02d11a83001b3600c80a919b1c45e99d6150ef2c24d407c86f430f9376fe6a694
-DIST nspr-4.18.tar.gz 1139663 BLAKE2B 96c74e0b04f26ddb20e807912804c5be6f0fb19fef18da6e1827ef09a28142a1db747332ac3574c3759b34912d0ead26993c0208651d0e4d7800e23fd30ded39 SHA512 4ee9eb561f9c09f78681f8d262ffc3b3ec3395e181ce7b7c5d6c565885283180e5989b142d64799f9392ddf28bdc6a38d3ed6ca079fa107691fd5c758d4f7078
 DIST nspr-4.19.tar.gz 1139967 BLAKE2B a8358249647a3d0e073f00febc475199d6479e2a34bb8255268fde90f0d3064ccc4b03e012231700ed6d75cd44669b6ea8afa5e760bad1d73682cd9eac1f8432 SHA512 45a48111d0f89db0649a5e1356719868ff81881f9cf48c22c1d13b0831978b103f19e9840d6a5359fcdc90d763c0a60f0a29f7840d756a5efbd53ce1afd36844
+DIST nspr-4.20.tar.gz 1140892 BLAKE2B 2cb96b7a40c307f904dac038f016b5c0e527aaf673463cbcb59d8bb6c9d0239219402587d624f48804e33f43abd4427c87f267bf1a88a0dacffcc408ac15dc49 SHA512 22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949
 EBUILD nspr-4.13.1.ebuild 3865 BLAKE2B eefd29695e1bf4666d2d3f99193d09566d7bec69cec353779ca612bcddc89d4f8d47607446e6286a6d80dcdbd01e4879546f209f32c2a1379bd04b757ae481b1 SHA512 594efb0fe957e619cb41c90c1d414dbb3d8c24e26cd82ef752e97dc220f2a9ae85048a1bdfac4712b931b265ef27f3108f8837580ed35e3efd401340403f36a4
-EBUILD nspr-4.18.ebuild 3860 BLAKE2B 279aef46f5bf56118ecec03f67b435d5e753520a52a2896ed4cfccc40bd8a39e14d316e8d4a17c0ed50099e1655fe945904eea1686f9d74b1976ad31b19d6fcf SHA512 02a36869d23567de14750cfe8348a68804218e94ec678719f631385aa7210469e91eb69514adec04cd7ec2905cf6f204726b52fa7d529c3b19d4931b1fd30ce1
 EBUILD nspr-4.19.ebuild 3860 BLAKE2B 279aef46f5bf56118ecec03f67b435d5e753520a52a2896ed4cfccc40bd8a39e14d316e8d4a17c0ed50099e1655fe945904eea1686f9d74b1976ad31b19d6fcf SHA512 02a36869d23567de14750cfe8348a68804218e94ec678719f631385aa7210469e91eb69514adec04cd7ec2905cf6f204726b52fa7d529c3b19d4931b1fd30ce1
+EBUILD nspr-4.20.ebuild 3828 BLAKE2B 7519ae3ca0b8aed35a452b15d78b04d3351be04868886a5c9b47d58b425d55297c9817e059ebaa90bdbe0f36b62df254b25a6f764f28488fe6a3c0bdbf01b254 SHA512 fb98366322ad9c4b7368d2cf6e64867a756afc1ae43352ee46a99051e796df165f700e9911fbe746fc593dc506d232d1660e20ab2ed63c59f0f8ade00eb3bd2c
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/dev-libs/nspr/nspr-4.18.ebuild b/dev-libs/nspr/nspr-4.20.ebuild
index 44af9aaaf0cc..bd7aae66dbb1 100644
--- a/dev-libs/nspr/nspr-4.18.ebuild
+++ b/dev-libs/nspr/nspr-4.20.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
+inherit autotools eutils multilib toolchain-funcs multilib-minimal
 
-MIN_PV="$(get_version_component_range 2)"
+MIN_PV="$(ver_cut 2)"
 
 DESCRIPTION="Netscape Portable Runtime"
 HOMEPAGE="http://www.mozilla.org/projects/nspr/"
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 69673432441d..20c15d91576e 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -4,13 +4,13 @@ AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef
 AUX nss-3.28-gentoo-fixups.patch 5310 BLAKE2B 5f173bc4bba374c8233945293e8e944c5fc9068c71d1242bcfbac37d0c020a09cb6a0ef3f54994003fc58364285f86f08017762c0c196aa6ab03fca91ea6c631 SHA512 22fe711d4e59c41f8208b4e85eb101eb6cdd4ad43d83438841b94a57219eeb182c527be1a97bf58df25672fe027aaebeab7458da2bebafef7254c68b94c7b98c
 AUX nss-3.32-gentoo-fixups.patch 6443 BLAKE2B cfe0380832776b7e51f95f800e70436622332d90f61b6b75fcd5474faaf722342ab157694be26881acfae3baceb6d2fdcfabc0c7673101abedfe1667d3821e6f SHA512 36a6db836ab9210e8201a3987229cf18a6b1fe5adeb0d82037f9641da72e6280807123b18fc74d344c680751b04f883bc402cd1c505783c77f00f9962338da03
 DIST nss-3.29.5.tar.gz 7480246 BLAKE2B 9ab16cbbd95aa31358b5b686bee64cd81c8343524dad8aac084f7c86883f1eaead78912dc1021b0461d027b0085356c4b7156f1d80010c3a0ece29d542deef50 SHA512 ce18bc7e793d2b3698db412b2e5fcabbfd9862eca3def120d5e44bc67276526bff6b33ffa84b8128f8af6d35101000e6f7bb24194f63a55461b3c245fac11faa
-DIST nss-3.36.1.tar.gz 23026430 BLAKE2B 76eaf5b24f8954a4e14cf556912250a3ddb7b333054a2ea4ee3d218493a8f12c77a37455aae354ef6ddd9bd55c33a269dad515806d70ef38727fa8a382d47fd4 SHA512 096fe4360b6d584a746ac6156830f8cff821fd173bd889d7a396238919328a227fa4ebb46f738970a4001773046f3dd4f4675b85ff6de8420a4a7657b3ba0c65
 DIST nss-3.37.3.tar.gz 23034239 BLAKE2B 3e30b0fe14501ca0e6b9d14322af73f191164989e6857b9ba46572b7363cdc65c88b672285982f2764ed44fcaf615cb249eea2f45b98050dfc6675003dc74a3b SHA512 11b21818f9fcff11d0e7f4c066ae9fbce0052a30a6b30df9a20022792039b5348554834a472e1b1195e467b9902067f9719678d5ca32efb4e60f1df161feed6f
 DIST nss-3.38.tar.gz 23023474 BLAKE2B 72500827955a25c53124ca6054850beef91868019ba155b70f8268fe79261b71e4f11ab42382241c2855478be7e6def57378cda5f398bf5e25f7fa5c035d630e SHA512 06804163daa08f1f65cfe0e9546ddf066ec7f773aa615431a5952f6c04956dd62425fec38d11037ff7fb02b709de03e5a7637c6ba13de5b7686db4f9ecda52ab
+DIST nss-3.39.tar.gz 23048561 BLAKE2B 74214b6ed23a44a0b6e0d52b9a327f908668079413ee637d172e4f0c7769f252a6c6ecca33215c1865606eaebe4630f31b435f2d40cf1a24ab373874508531b9 SHA512 16358c2d8660ca301410b1d39b2eae64fe2ebbbfab797872410e5fcc67f802ef48f4e362edeecb0591626c77013537019094a6a5dfc8d24487b6b6e54564da8f
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
 EBUILD nss-3.29.5.ebuild 9187 BLAKE2B f2c2a4d1470950405afeb2acdec4443818406ad60f85fd88dd399efaf30b62c7bb2e8d8002cd6c1fb1a7e3e3af6e85c953db10d0e2340d64dbe3dbcce1379219 SHA512 b0244c44bfdaf7f24fb36aaba4c9efea40d4e9439df81981b9f83f5f415aabcab17ed1726f0ab55729b82f8198b4b39c699eef4422259e95262f7a7f69f64802
-EBUILD nss-3.36.1.ebuild 9430 BLAKE2B df5002039f14bbddec5f0ee8fcf36e4cbdbe3b5e7ac3b5e7b48e8df65de339dd8db7ccebf68cfcb9699caaefbdad78d8f20965135e20f43faf5537bd5db29e5c SHA512 356e735118784a06ac4be499df2888d41b7a16cca4ab015a7ef7a21363c578a0acbdf495e2a07cd408721800e57f0e005cad61f9b000e75679e1a3c9e6db8ef3
 EBUILD nss-3.37.3.ebuild 9430 BLAKE2B df5002039f14bbddec5f0ee8fcf36e4cbdbe3b5e7ac3b5e7b48e8df65de339dd8db7ccebf68cfcb9699caaefbdad78d8f20965135e20f43faf5537bd5db29e5c SHA512 356e735118784a06ac4be499df2888d41b7a16cca4ab015a7ef7a21363c578a0acbdf495e2a07cd408721800e57f0e005cad61f9b000e75679e1a3c9e6db8ef3
 EBUILD nss-3.38.ebuild 9430 BLAKE2B df5002039f14bbddec5f0ee8fcf36e4cbdbe3b5e7ac3b5e7b48e8df65de339dd8db7ccebf68cfcb9699caaefbdad78d8f20965135e20f43faf5537bd5db29e5c SHA512 356e735118784a06ac4be499df2888d41b7a16cca4ab015a7ef7a21363c578a0acbdf495e2a07cd408721800e57f0e005cad61f9b000e75679e1a3c9e6db8ef3
+EBUILD nss-3.39.ebuild 9430 BLAKE2B d465d134977270ae52f893c87d3af1e80b999a022e4478009c1313080d07d29e10c8c132e1242e2fdfd43ff0b604835260e7125f1c8fee60a129d8501582dd74 SHA512 99709454db815aef2430f7b80b1321d247424075594941d25f45068fce1afb528e330ba0d9190ac432e17d8153f84ad792c1ee7cc08907cc175db0452984e094
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/nss-3.36.1.ebuild b/dev-libs/nss/nss-3.39.ebuild
index 3a343d29931e..dce724d6b8d8 100644
--- a/dev-libs/nss/nss-3.36.1.ebuild
+++ b/dev-libs/nss/nss-3.39.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
 
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 0be7470512da..d34729be8519 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,10 +1,10 @@
 AUX opensc-0.17.0-build.patch 3577 BLAKE2B 0ad69e4305a21d613f93e76818d442983b1b1b642ba8e5c7030e44c96d4e86ed03f72c7623ba6b08ef9b620f6a5c5f43ea00a670880f070c165cb1f60235c529 SHA512 0412a0d0ee3caca534098357e7778f2aa6800ef6d8d559614cd892de13c6dd05d3a6f78dc12cdf834ab6a4c0160234342b46efda0ac844e2411f54aa08a94016
-AUX opensc-0.18.0-build.patch 2053 BLAKE2B 6b5d90a5290b5366a75e299ff55e64924a12e900eedd8aa66b835624c8d5e3b037ddadc72d1f423d24bd31a97320876e024c0698156ed341688fd8ddeb1f45d5 SHA512 05ccaad103f5ccfe82261a258d3d16f2a948a284aafc28b0902b00b43795b9aaa12454823d27b3a981ea8d499db1e4dfaa2e4ea2ca1f9692ac1d33470a82e20a
+AUX opensc-0.18.0-build.patch 3060 BLAKE2B 4716e3cef86eca1da01f479909f21e23b362870eca9a9f44d391e5b0ea0b1fd5d04cc4cac2f681e3ea5325c366a154b919a34f827d6b85d92cc462f9b3832116 SHA512 3d70a8483b96a2ab0cee7c4eb9c71ce1429ef6bf5dbee65f685ec8f21b4c3f7b822e2b7011f420beca957f2ffbdb5726ec52350e2ae92c26c718fc0c421d953e
 AUX opensc-0.18.0-libressl.patch 3145 BLAKE2B 2e1c0c789adf7c21db1cfd4ab2bf0ba077a463f74ee5bc3293278260b5531cfb231f70d594c491fdaaad0d09f4e7107804f3937d316816ea62eb0e6956ac1c6e SHA512 fedb3906104c02d08d5c44a0da49764556e19653a9d52a3e1ddc5254a2f13abee92b23fc3101779bdc6b9c623388ec9242f198402c022505dffc7e932d1b0dfe
 DIST opensc-0.16.0.tar.gz 1760418 BLAKE2B 7f5799445e285010392f315fa57919c7f0b038170a19e83dbda664d5d73898f075cccad4304275402c900b9fc50564ed5515a10d31156a6c76a68f170ca3e439 SHA512 15f7d62388dde6dad226acab3cd54f8e2f2f53684dc0cb976c6fc6fbdb4487be931ca69bf965ab07c51efd16be64d5411f10bacea11a07fc823c92dd7bb25139
 DIST opensc-0.17.0.tar.gz 1950547 BLAKE2B 861dbb60e211d503332228c9d75d667f70cb9e15883c571821bb2f7703ca62dd4ce56c5ea7965e2d5e8c6a81b5063fc689013670294426baf1bfaec88282e20e SHA512 8991c1724d187d3c34a2ed591b21f0085f767c0d866edc2decfda85a2b3dedf717838f4937d1dda3e1bbc17f02e6eca6740299660128bc448a29e8bfc2962922
 DIST opensc-0.18.0.tar.gz 2037073 BLAKE2B f2b339d1f9c616f6f706acb3c55289deb5b1749a8b5561142c69db4ed1c7dee554ce1f8d820e6e69bb9e462ca460379badf3017ed35fa6cd395702c995326c3e SHA512 dc90cff3e0e639c14bfb11d1d0455964d24d08aa27728592ab0d8b487a1ffee1ca71cb9bbf5d0f101b2ebd85cf9478988f686d45effa72315e6ffc843d398768
 EBUILD opensc-0.16.0.ebuild 1390 BLAKE2B 14cd6dacb0ebc6d688ac0c0c6628cf11cb10337e13cf390a72d83bd755a589f8b8a61e4961a66b4de0b479e39f43ae30725dddd91aea27e33242cab1955de7ca SHA512 ab05e282f226d4c194b292330cdd132c23e92abff34aa8acdb75b3e2e97d5c1dad29089fe79f8e48d0ba93ed4150c7a287a497da20322ec9f44e8c6850230b4e
 EBUILD opensc-0.17.0.ebuild 1467 BLAKE2B 87f9b57bfeedd29319951e7e88e96f67dbdb6517ecef4a185f6f61c396a1943b7967b2e6ac9080dfc4f54b6bcf017c81169702a0e6b035eec6f4bd40a3f34f42 SHA512 50b49c15558621c22addc53dd2ed3b5379e1c185b098c1b4caee9a3af8557f87dc1de3c0d4f6d8c6ae8c73399caf7780aa2a984ff1f64d30814eb2082c8792d4
-EBUILD opensc-0.18.0.ebuild 1497 BLAKE2B 50d99d8c463ae0b49415070fec5510999bc581ae09c1a8417366c842af3514a53a2d7844b1327328fa9893a4919f0e631353ce63cd10da5d761958e64c3908e5 SHA512 cea13e5a0f4de7713e8ee72a7427a9e62d7638aca82031964b8b4c062071884cbf5c21597b32673f09a8ab0283913d503428cbba0f4069da2b0bcd1de221e98e
+EBUILD opensc-0.18.0.ebuild 1496 BLAKE2B ca71d1b5c5e679d1b8bdc3e424cc6b5c46a4611c2ec6e7a2b2435eb017f788ef0ebcbfefdac73b07ef5e2793371a8e9579bdaf2ef864a1e39b07b2ed44c208b7 SHA512 54555a9f3e0c80913c90cbd8403ec7f912fef4502f4052c66328841c017be2a284bea580cabd4fd7ba87fd1799f98f3f495df5b45fe00594632e72997d349699
 MISC metadata.xml 1164 BLAKE2B d512f5bb01592e7f864a09e7d537a94e89ac2226be34fa999d746701e3b0b9fc8495700f5dc6ec1c866ec9f2fa59ed23d737de53204e4cbc401eca176d1a8ac6 SHA512 eae0e3d7c795c452f65730138d867bff881778d9615b1cea1aba362d374e4d8ae8949d01204ce14bb8ea80021ca3328cb2657f3e25b95b93a7848e76f577c761
diff --git a/dev-libs/opensc/files/opensc-0.18.0-build.patch b/dev-libs/opensc/files/opensc-0.18.0-build.patch
index 342abd83eb01..1db749ca654e 100644
--- a/dev-libs/opensc/files/opensc-0.18.0-build.patch
+++ b/dev-libs/opensc/files/opensc-0.18.0-build.patch
@@ -64,3 +64,37 @@ index e85dfc45..13b0cc21 100644
 -- 
 2.16.4
 
+From 0f7af8a647a8fca6b1f1ee2327c3d26bed38c8f6 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 8 Sep 2018 00:16:57 +0300
+Subject: [PATCH] reader-ctapi: ctapi_connect: remove unused variable
+
+from day 1 return value of _sc_parse_atr was ignored.
+---
+ src/libopensc/reader-ctapi.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/libopensc/reader-ctapi.c b/src/libopensc/reader-ctapi.c
+index 8d4c1c24..4b94337f 100644
+--- a/src/libopensc/reader-ctapi.c
++++ b/src/libopensc/reader-ctapi.c
+@@ -239,7 +239,6 @@ static int ctapi_connect(sc_reader_t *reader)
+ 	char rv;
+ 	u8 cmd[9], rbuf[256], sad, dad;
+ 	unsigned short lr;
+-	int r;
+ 
+ 	if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE)
+ 		return SC_ERROR_NOT_ALLOWED;
+@@ -265,7 +264,7 @@ static int ctapi_connect(sc_reader_t *reader)
+ 		return SC_ERROR_INTERNAL;
+ 	reader->atr.len = lr;
+ 	memcpy(reader->atr.value, rbuf, lr);
+-	r = _sc_parse_atr(reader);
++	_sc_parse_atr(reader);
+ 
+ 	return 0;
+ }
+-- 
+2.16.4
+
diff --git a/dev-libs/opensc/opensc-0.18.0.ebuild b/dev-libs/opensc/opensc-0.18.0.ebuild
index 5572f8c5297d..2d33364c868f 100644
--- a/dev-libs/opensc/opensc-0.18.0.ebuild
+++ b/dev-libs/opensc/opensc-0.18.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc +pcsc-lite secure-messaging openct ctapi readline libressl ssl zlib"
 
 RDEPEND="zlib? ( sys-libs/zlib )
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 9b06035e5d49..5840bb23ddbe 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -7,6 +7,7 @@ AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162
 AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2b8dbb9a7ea63a816d3a5de544fbffd8b4216d7a95bd44e718c7a83dd8b8b5ad85caed4205eab5de566b0b7e5054fc1 SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c
 AUX openssl-1.0.2o-CVE-2018-0732.patch 1194 BLAKE2B bd06c5b1289f7a3dca52bbfab7ae17c9d103b07ffd2649c5b5a8cc60163aa3056e4bd86108548dfcd3690d2ef94c3e0d3a911694199b5a3822215dd01c7467d6 SHA512 ff91298629f157496a012da00ba7325923f5d087bfa54b60e205bf2dfb06374e958912e0df39dbdf39773555455c1a3afa3dcde1ddfec6e85cf89b0b62cc0eb4
 AUX openssl-1.0.2o-hobble-ecc.patch 11987 BLAKE2B 28c1217e500a9d6578dac3ee8aeb08f6e3b1d2c6749336ef05e4142828c7c4b176ec16707dcbbf97e1e2e91d51f85f2a02c076cfcc8bcef1aa9d3fd5ba50eb6a SHA512 817a5a1cbab171d9e6d3fce9c612985d2ce3f9f0b3781b3681ef42da1ac6389d8a8a11e6d696eb7f051d3bfc2d045f1999cc4076d1257b10e9fb65620aee3ee2
+AUX openssl-1.0.2p-hobble-ecc.patch 10875 BLAKE2B fc8240a074f8cc354c5ae584b76b3fc895170e026767d2d99d8bd5e5028614c861dd2b3c7b955c223883062f9a057ee302ae0deecfbbed00ddc53ae8a4d50919 SHA512 29f64bacac4f61071db6caf9d92131633d2dff56d899171888cc4c8432790930ff0912cea90ad03ca59b13ca0357f812d2f0a3f42567e2bd72c260f49b2b59aa
 DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6
 DIST openssl-1.0.2-patches-1.4.tar.xz 12864 BLAKE2B ace6a782ef97b61af44988f978d089adffb06894617f9d66d3fce664c04d360b2774e1dd38c2171151fa93fe92428d405674bc2d452d520f10da426f95d09aee SHA512 d152af2841f1bf11c7f2a5ebba9a2b903fb4bcdef0468c56af0f9cc8c020adbf4490ac1a62f5bae8cbe18e379934fa997bfda1c2d49ec62365c07a0c0515a72d
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
@@ -28,10 +29,10 @@ DIST openssl-1.1.1-pre8.tar.gz 8334954 BLAKE2B 97cd018908925abd5a4eb660b3488b23e
 DIST openssl-1.1.1-pre9.tar.gz 8411103 BLAKE2B 93ac540afdf734c67aabbaf0682b43f044e8c05f80c0b1e7af926dd4179b215f68d569de24e45ae78a6915923ab5f77a8aa5690873e01c16478bf61d1f1c2a9b SHA512 cf23c11d7591cfa6dfd8b1086c2cdd33bd56f9eb44721cd60b228ef4d3c0c5de650dca53ae7becf7c8f0a9dd4bdae287f48116a3ac11d106b36919deb3214aa2
 EBUILD openssl-0.9.8z_p8-r1.ebuild 4937 BLAKE2B 4d8c960161f15f38dbcef1ba1529906d81ad1b8574c90b7e09f3b2a8f2fcfdda1d69d9c4259a7f616246fe34b5794ea08f5ef8f5cb1ecb4117784062587a1fa7 SHA512 2693d1d1cf167e0e0031d5b7b3ac2f850290ea2fa8513c8fe2f5b8c52fd5efd4296b574533165e24ddd315e271dad6e7f5b00afdf8d036864e27af62fae30e43
 EBUILD openssl-0.9.8z_p8.ebuild 4860 BLAKE2B 8c78442920df3443d9601c3e9246caa838e0acbe9541b5c250a6a96253b2d28fca65878cf9cddaae62f6fab6fd6d264997b168888cfcd1e53ea90b34a804e3e2 SHA512 60bcce7807ee7d0a68df11cdb2ab76560ef23b6e3df43a506263fcbdf54d0571dcfe0d16188159d13a268425b16798eb28c3c1ed985123ae095c8ea146c1e4d6
-EBUILD openssl-1.0.2o-r3.ebuild 8092 BLAKE2B 66f9d07e6757aeffde65bd525f3a6bd66c0da6b6f503778de37a8172cb37656baf0c5a501699d426b18d63d0dac5bb1e7df9ea9f7d30dc19021c15985e8f2114 SHA512 f6aa3f6a4b89aa947d78ea28b8de2c9d3efd3eae2dac98de742784542d71700b5fb68b79392523d41a06dc9784522206637ee525e9fd1635f3907af172dab7a8
-EBUILD openssl-1.0.2o-r6.ebuild 9818 BLAKE2B 193ff450b056ceb4a496d79bd8afa1f2313918eb703de5e8c79375180ff385751f2bdd777a35d1e9d793ce3054703e785f73dc5941b0a05a4a18254d364a0593 SHA512 a15e7bf3d03c6c5fd8d9eda699d82a15ee693417844a328a0eff0ffc80593d783f589a253796dcd416496bb454938706157e85574eea7461e03c173ebef12040
-EBUILD openssl-1.0.2p.ebuild 9927 BLAKE2B a50b0a0da21d01c6028ee7fea3c15c62a15bf95f63df335597d81c3f489e1d10e093d4c3aecca0e86c15fd557dec7acb6873b588205fafc67cefb7106e620968 SHA512 362f0eeb4eb870bf8018e9ab5cc2262cf76f2632a6469d3c60644b1f740e067cdcbc1fef79a42e56d8937a20d9ae65aa1eb54c49eb6b34a04bf9cdf92ea702bd
-EBUILD openssl-1.1.0i.ebuild 9118 BLAKE2B de0a775bb48d3994a6c0fcdda7a7343dd539e0c1319df2283c2d1b7c70b3c802128abed45a3c1f32a2e58a6e47894565c11c825959494714ec05253fe2f7b524 SHA512 3fe656125909fa88a9d5d336c66b914c715fce35a355768e6872c3e5642857d3043188edbee2ee34e7744d3ae43e640d3bc933243ee14265403c5785eb26f052
-EBUILD openssl-1.1.1_pre8.ebuild 7652 BLAKE2B 8eff1ae544126b8a1ebda7f5d13ce8d18ae8a5ecd8b58caf8bea6733c8a6e879ab509a60e8d13871f27ea38a6a5e326d23b6a06c7d02499f04b5a1cc87bfd88e SHA512 14e1db47322d86f44c15d07036f2f7a56b0156b6298728a33b72a5a89dbb772d8ef7683900195eda17a29b64ea19d181729a04c912ff3c7fc05f7837b08ef201
-EBUILD openssl-1.1.1_pre9.ebuild 7694 BLAKE2B 5a7ba23b5766511fc377ca34902f2e07a24a3330a0993d4f733b6b58bd40bc691105e611cd056cbeb611456e453c1794cc01a54a129b8bca3d1ebf74a617bf85 SHA512 4dea415e40f592715e54c1bf7606054a08d4ef61b7ae1ed43e774fe38661e9006dd6ec1b306b18625bb7622d67c7a42f7aeb3dca9fbe3f65ddeb787d2dc5e6de
+EBUILD openssl-1.0.2o-r3.ebuild 8081 BLAKE2B 24e6149d41b047f0df8fac57fce8ab02ba14dd9036491e8e07e999b051d31b0a864eccb720d27d3e25f2ed7b1c932a4b1b2539ba567e42d4cfbd77d5ce82fcb3 SHA512 4fdfac9387f72faeb7e4c52ce4d950083f838776d96219bc37d20551ecd15ddb1731b735f5e1702b51915149a615812bbbe93a18df69066eb4c42ef1dcedcbb9
+EBUILD openssl-1.0.2o-r6.ebuild 9806 BLAKE2B c87a87119d80a4bd0c3ba96e55b0203dab9ac91ab100b0a9e7bf2b9f0a25b3d225e3c54c26e362ca53f36d35adb24b0af8acc34ca8d79dc5225f9500cd5a8ff8 SHA512 576737648832235b8aa33e1f5f55acf32c3ca719f345e7b5e911f4967cdda4d51439104e375ef4f2039bc8da29462859ef4ce5d00312eadea0de574708d956bc
+EBUILD openssl-1.0.2p.ebuild 10106 BLAKE2B 951f60354ba859c9cf725e725d10ff23f2bd6a01b90bdb536f7a5612a85966cb72c57840216f8c6d08b6ac6ab30436e09f3d73fa723ebacc9aa1496803bbd8cd SHA512 08486fcc1ea1a4ecd46de25285bdfc3ef724125d6a78b4b295df3cd3b6e781e74bf2c3a8cc43824d95ca2041a2cd2a36e84cf0de3c7809d43fd9e4b07ba9fc50
+EBUILD openssl-1.1.0i.ebuild 9107 BLAKE2B 8bee8407c13fbd1cfc7e13b4d11fb57ce9dd494d3ca8cf6cbd34f9f0e57dff824e421c31fc29e408ebf3a752896dc631f045b32757f2d89bacd2b9a52abe4722 SHA512 0cf7fd1a3957e197ac6b0d61a384a673b8216b0a07a90f61708759ef80e59afa1ab8e9f5761c1896439ee0cc6902bdd5bc83f4723302c648944d10d78d8396f4
+EBUILD openssl-1.1.1_pre8.ebuild 7641 BLAKE2B 438146e73fe01964c097cf31f151c2ce1b5e9c879b8935e8be9c70a7eabce67fd152aca01ab47e811251e821770ffa3d33106f4d58c19c0df8686a897622992c SHA512 a1a2719f76f9672e5cdf9153876a47b52b3b4a5ddb70c52ab8e0027c227d278fbb7bbb4c12525b2d1812fb67879c0a47b7eeb8e92862a629029ecdf6492ca4db
+EBUILD openssl-1.1.1_pre9.ebuild 7879 BLAKE2B 5e14c797a51486b7b1affdeec121e10e5d83bd017e042a0cb182ec3e3dbb8c9394082f0757911c0e46341c881c842f63cf90f3f708333827cf4d1be135bdb47c SHA512 c9f76da7864f61edfb4a99f203b684b7d0c20708eb4aa5b064b4b43096b69f7fafecb1cfbe5df8a9f67da33707cf19fdca9de0fb41049d7497b0de75564fbe67
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.0.2p-hobble-ecc.patch b/dev-libs/openssl/files/openssl-1.0.2p-hobble-ecc.patch
new file mode 100644
index 000000000000..3a458a783603
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.0.2p-hobble-ecc.patch
@@ -0,0 +1,283 @@
+Port of Fedora's Hobble-EC patches for OpenSSL 1.0 series.
+
+From https://src.fedoraproject.org/git/rpms/openssl.git
+
+Contains parts of the following patches, rediffed. The patches are on various
+different branches.
+f23 openssl-1.0.2c-ecc-suiteb.patch
+f23 openssl-1.0.2a-fips-ec.patch
+f28 openssl-1.1.0-ec-curves.patch
+
+Signed-off-By: Robin H. Johnson <robbat2@gentoo.org>
+
+--- a/apps/speed.c
++++ b/apps/speed.c
+@@ -989,10 +989,7 @@ int MAIN(int argc, char **argv)
+         } else
+ # endif
+ # ifndef OPENSSL_NO_ECDSA
+-        if (strcmp(*argv, "ecdsap160") == 0)
+-            ecdsa_doit[R_EC_P160] = 2;
+-        else if (strcmp(*argv, "ecdsap192") == 0)
+-            ecdsa_doit[R_EC_P192] = 2;
++	if (0) {}
+         else if (strcmp(*argv, "ecdsap224") == 0)
+             ecdsa_doit[R_EC_P224] = 2;
+         else if (strcmp(*argv, "ecdsap256") == 0)
+@@ -1001,36 +998,13 @@ int MAIN(int argc, char **argv)
+             ecdsa_doit[R_EC_P384] = 2;
+         else if (strcmp(*argv, "ecdsap521") == 0)
+             ecdsa_doit[R_EC_P521] = 2;
+-        else if (strcmp(*argv, "ecdsak163") == 0)
+-            ecdsa_doit[R_EC_K163] = 2;
+-        else if (strcmp(*argv, "ecdsak233") == 0)
+-            ecdsa_doit[R_EC_K233] = 2;
+-        else if (strcmp(*argv, "ecdsak283") == 0)
+-            ecdsa_doit[R_EC_K283] = 2;
+-        else if (strcmp(*argv, "ecdsak409") == 0)
+-            ecdsa_doit[R_EC_K409] = 2;
+-        else if (strcmp(*argv, "ecdsak571") == 0)
+-            ecdsa_doit[R_EC_K571] = 2;
+-        else if (strcmp(*argv, "ecdsab163") == 0)
+-            ecdsa_doit[R_EC_B163] = 2;
+-        else if (strcmp(*argv, "ecdsab233") == 0)
+-            ecdsa_doit[R_EC_B233] = 2;
+-        else if (strcmp(*argv, "ecdsab283") == 0)
+-            ecdsa_doit[R_EC_B283] = 2;
+-        else if (strcmp(*argv, "ecdsab409") == 0)
+-            ecdsa_doit[R_EC_B409] = 2;
+-        else if (strcmp(*argv, "ecdsab571") == 0)
+-            ecdsa_doit[R_EC_B571] = 2;
+         else if (strcmp(*argv, "ecdsa") == 0) {
+-            for (i = 0; i < EC_NUM; i++)
++            for (i = R_EC_P224; i < R_EC_P521; i++)
+                 ecdsa_doit[i] = 1;
+         } else
+ # endif
+ # ifndef OPENSSL_NO_ECDH
+-        if (strcmp(*argv, "ecdhp160") == 0)
+-            ecdh_doit[R_EC_P160] = 2;
+-        else if (strcmp(*argv, "ecdhp192") == 0)
+-            ecdh_doit[R_EC_P192] = 2;
++	if (0) {}
+         else if (strcmp(*argv, "ecdhp224") == 0)
+             ecdh_doit[R_EC_P224] = 2;
+         else if (strcmp(*argv, "ecdhp256") == 0)
+@@ -1039,28 +1013,8 @@ int MAIN(int argc, char **argv)
+             ecdh_doit[R_EC_P384] = 2;
+         else if (strcmp(*argv, "ecdhp521") == 0)
+             ecdh_doit[R_EC_P521] = 2;
+-        else if (strcmp(*argv, "ecdhk163") == 0)
+-            ecdh_doit[R_EC_K163] = 2;
+-        else if (strcmp(*argv, "ecdhk233") == 0)
+-            ecdh_doit[R_EC_K233] = 2;
+-        else if (strcmp(*argv, "ecdhk283") == 0)
+-            ecdh_doit[R_EC_K283] = 2;
+-        else if (strcmp(*argv, "ecdhk409") == 0)
+-            ecdh_doit[R_EC_K409] = 2;
+-        else if (strcmp(*argv, "ecdhk571") == 0)
+-            ecdh_doit[R_EC_K571] = 2;
+-        else if (strcmp(*argv, "ecdhb163") == 0)
+-            ecdh_doit[R_EC_B163] = 2;
+-        else if (strcmp(*argv, "ecdhb233") == 0)
+-            ecdh_doit[R_EC_B233] = 2;
+-        else if (strcmp(*argv, "ecdhb283") == 0)
+-            ecdh_doit[R_EC_B283] = 2;
+-        else if (strcmp(*argv, "ecdhb409") == 0)
+-            ecdh_doit[R_EC_B409] = 2;
+-        else if (strcmp(*argv, "ecdhb571") == 0)
+-            ecdh_doit[R_EC_B571] = 2;
+         else if (strcmp(*argv, "ecdh") == 0) {
+-            for (i = 0; i < EC_NUM; i++)
++	    for (i = R_EC_P224; i <= R_EC_P521; i++)
+                 ecdh_doit[i] = 1;
+         } else
+ # endif
+@@ -1149,21 +1103,13 @@ int MAIN(int argc, char **argv)
+             BIO_printf(bio_err, "dsa512   dsa1024  dsa2048\n");
+ # endif
+ # ifndef OPENSSL_NO_ECDSA
+-            BIO_printf(bio_err, "ecdsap160 ecdsap192 ecdsap224 "
++            BIO_printf(bio_err, "ecdsap224 "
+                        "ecdsap256 ecdsap384 ecdsap521\n");
+-            BIO_printf(bio_err,
+-                       "ecdsak163 ecdsak233 ecdsak283 ecdsak409 ecdsak571\n");
+-            BIO_printf(bio_err,
+-                       "ecdsab163 ecdsab233 ecdsab283 ecdsab409 ecdsab571\n");
+             BIO_printf(bio_err, "ecdsa\n");
+ # endif
+ # ifndef OPENSSL_NO_ECDH
+-            BIO_printf(bio_err, "ecdhp160  ecdhp192  ecdhp224 "
++            BIO_printf(bio_err, "ecdhp224 "
+                        "ecdhp256  ecdhp384  ecdhp521\n");
+-            BIO_printf(bio_err,
+-                       "ecdhk163  ecdhk233  ecdhk283  ecdhk409  ecdhk571\n");
+-            BIO_printf(bio_err,
+-                       "ecdhb163  ecdhb233  ecdhb283  ecdhb409  ecdhb571\n");
+             BIO_printf(bio_err, "ecdh\n");
+ # endif
+ 
+@@ -1242,11 +1188,11 @@ int MAIN(int argc, char **argv)
+         for (i = 0; i < DSA_NUM; i++)
+             dsa_doit[i] = 1;
+ # ifndef OPENSSL_NO_ECDSA
+-        for (i = 0; i < EC_NUM; i++)
++        for (i = R_EC_P224; i <= R_EC_P521; i++)
+             ecdsa_doit[i] = 1;
+ # endif
+ # ifndef OPENSSL_NO_ECDH
+-        for (i = 0; i < EC_NUM; i++)
++        for (i = R_EC_P224; i <= R_EC_P521; i++)
+             ecdh_doit[i] = 1;
+ # endif
+     }
+--- a/crypto/ec/ecp_smpl.c
++++ b/crypto/ec/ecp_smpl.c
+@@ -187,6 +187,11 @@ int ec_GFp_simple_group_set_curve(EC_GROUP *group,
+         return 0;
+     }
+ 
++    if (BN_num_bits(p) < 224) {
++        ECerr(EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE, EC_R_UNSUPPORTED_FIELD);
++        return 0;
++    }
++
+     if (ctx == NULL) {
+         ctx = new_ctx = BN_CTX_new();
+         if (ctx == NULL)
+--- a/crypto/ecdh/ecdhtest.c
++++ b/crypto/ecdh/ecdhtest.c
+@@ -501,11 +501,13 @@ int main(int argc, char *argv[])
+         goto err;
+ 
+     /* NIST PRIME CURVES TESTS */
++# if 0
+     if (!test_ecdh_curve
+         (NID_X9_62_prime192v1, "NIST Prime-Curve P-192", ctx, out))
+         goto err;
+     if (!test_ecdh_curve(NID_secp224r1, "NIST Prime-Curve P-224", ctx, out))
+         goto err;
++# endif
+     if (!test_ecdh_curve
+         (NID_X9_62_prime256v1, "NIST Prime-Curve P-256", ctx, out))
+         goto err;
+@@ -536,13 +538,14 @@ int main(int argc, char *argv[])
+     if (!test_ecdh_curve(NID_sect571r1, "NIST Binary-Curve B-571", ctx, out))
+         goto err;
+ # endif
++# if 0
+     if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP256r1", 256))
+         goto err;
+     if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP384r1", 384))
+         goto err;
+     if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP512r1", 512))
+         goto err;
+-
++# endif
+     ret = 0;
+ 
+  err:
+--- a/crypto/ecdsa/ecdsatest.c
++++ b/crypto/ecdsa/ecdsatest.c
+@@ -138,9 +138,12 @@ int restore_rand(void)
+ }
+ 
+ static int fbytes_counter = 0, use_fake = 0;
+-static const char *numbers[8] = {
++static const char *numbers[10] = {
++    "651056770906015076056810763456358567190100156695615665659",
+     "651056770906015076056810763456358567190100156695615665659",
+     "6140507067065001063065065565667405560006161556565665656654",
++    "8763001015071075675010661307616710783570106710677817767166"
++        "71676178726717",
+     "8763001015071075675010661307616710783570106710677817767166"
+         "71676178726717",
+     "7000000175690566466555057817571571075705015757757057795755"
+@@ -163,7 +166,7 @@ int fbytes(unsigned char *buf, int num)
+ 
+     use_fake = 0;
+ 
+-    if (fbytes_counter >= 8)
++    if (fbytes_counter >= 10)
+         return 0;
+     tmp = BN_new();
+     if (!tmp)
+@@ -539,8 +542,10 @@ int main(void)
+     RAND_seed(rnd_seed, sizeof(rnd_seed));
+ 
+     /* the tests */
++# if 0
+     if (!x9_62_tests(out))
+         goto err;
++# endif
+     if (!test_builtin(out))
+         goto err;
+ 
+--- a/ssl/t1_lib.c
++++ b/ssl/t1_lib.c
+@@ -271,10 +271,7 @@ static const unsigned char eccurves_auto[] = {
+     0, 23,                      /* secp256r1 (23) */
+     /* Other >= 256-bit prime curves. */
+     0, 25,                      /* secp521r1 (25) */
+-    0, 28,                      /* brainpool512r1 (28) */
+-    0, 27,                      /* brainpoolP384r1 (27) */
+     0, 24,                      /* secp384r1 (24) */
+-    0, 26,                      /* brainpoolP256r1 (26) */
+     0, 22,                      /* secp256k1 (22) */
+ # ifndef OPENSSL_NO_EC2M
+     /* >= 256-bit binary curves. */
+@@ -292,10 +289,7 @@ static const unsigned char eccurves_all[] = {
+     0, 23,                      /* secp256r1 (23) */
+     /* Other >= 256-bit prime curves. */
+     0, 25,                      /* secp521r1 (25) */
+-    0, 28,                      /* brainpool512r1 (28) */
+-    0, 27,                      /* brainpoolP384r1 (27) */
+     0, 24,                      /* secp384r1 (24) */
+-    0, 26,                      /* brainpoolP256r1 (26) */
+     0, 22,                      /* secp256k1 (22) */
+ # ifndef OPENSSL_NO_EC2M
+     /* >= 256-bit binary curves. */
+@@ -310,13 +304,6 @@ static const unsigned char eccurves_all[] = {
+      * Remaining curves disabled by default but still permitted if set
+      * via an explicit callback or parameters.
+      */
+-    0, 20,                      /* secp224k1 (20) */
+-    0, 21,                      /* secp224r1 (21) */
+-    0, 18,                      /* secp192k1 (18) */
+-    0, 19,                      /* secp192r1 (19) */
+-    0, 15,                      /* secp160k1 (15) */
+-    0, 16,                      /* secp160r1 (16) */
+-    0, 17,                      /* secp160r2 (17) */
+ # ifndef OPENSSL_NO_EC2M
+     0, 8,                       /* sect239k1 (8) */
+     0, 6,                       /* sect233k1 (6) */
+@@ -351,29 +338,21 @@ static const unsigned char fips_curves_default[] = {
+     0, 9,                       /* sect283k1 (9) */
+     0, 10,                      /* sect283r1 (10) */
+ #  endif
+-    0, 22,                      /* secp256k1 (22) */
+     0, 23,                      /* secp256r1 (23) */
+ #  ifndef OPENSSL_NO_EC2M
+     0, 8,                       /* sect239k1 (8) */
+     0, 6,                       /* sect233k1 (6) */
+     0, 7,                       /* sect233r1 (7) */
+ #  endif
+-    0, 20,                      /* secp224k1 (20) */
+-    0, 21,                      /* secp224r1 (21) */
+ #  ifndef OPENSSL_NO_EC2M
+     0, 4,                       /* sect193r1 (4) */
+     0, 5,                       /* sect193r2 (5) */
+ #  endif
+-    0, 18,                      /* secp192k1 (18) */
+-    0, 19,                      /* secp192r1 (19) */
+ #  ifndef OPENSSL_NO_EC2M
+     0, 1,                       /* sect163k1 (1) */
+     0, 2,                       /* sect163r1 (2) */
+     0, 3,                       /* sect163r2 (3) */
+ #  endif
+-    0, 15,                      /* secp160k1 (15) */
+-    0, 16,                      /* secp160r1 (16) */
+-    0, 17,                      /* secp160r2 (17) */
+ };
+ # endif
+ 
diff --git a/dev-libs/openssl/openssl-1.0.2o-r3.ebuild b/dev-libs/openssl/openssl-1.0.2o-r3.ebuild
index f54edbbadc2d..f372f86e99c5 100644
--- a/dev-libs/openssl/openssl-1.0.2o-r3.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2o-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/openssl/openssl-1.0.2o-r6.ebuild b/dev-libs/openssl/openssl-1.0.2o-r6.ebuild
index f7ae84bae162..675a09eea9d7 100644
--- a/dev-libs/openssl/openssl-1.0.2o-r6.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2o-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/openssl/openssl-1.0.2p.ebuild b/dev-libs/openssl/openssl-1.0.2p.ebuild
index f6f695eb5869..9cca78d6da8e 100644
--- a/dev-libs/openssl/openssl-1.0.2p.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2p.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
@@ -77,7 +77,7 @@ src_prepare() {
 		for i in "${FEDORA_PATCH[@]}" ; do
 			eapply "${DISTDIR}"/"${i}"
 		done
-		eapply "${FILESDIR}"/openssl-1.0.2o-hobble-ecc.patch
+		eapply "${FILESDIR}"/openssl-1.0.2p-hobble-ecc.patch
 		# Also see the configure parts below:
 		# enable-ec \
 		# $(use_ssl !bindist ec2m) \
@@ -106,7 +106,7 @@ src_prepare() {
 		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
 		-e $(has noman FEATURES \
 			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
 		Makefile.org \
 		|| die
 	# show the actual commands in the log
@@ -131,7 +131,7 @@ src_prepare() {
 	append-flags $(test-flags-CC -Wa,--noexecstack)
 	append-cppflags -DOPENSSL_NO_BUF_FREELISTS
 
-	sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+	sed -i '1s,^:$,#!'${EPREFIX%/}'/usr/bin/perl,' Configure #141906
 	# The config script does stupid stuff to prompt the user.  Kill it.
 	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
 	./config --test-sanity || die "I AM NOT SANE"
@@ -203,8 +203,8 @@ multilib_src_configure() {
 		$(use_ssl sslv3 ssl3) \
 		$(use_ssl tls-heartbeat heartbeats) \
 		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--prefix="${EPREFIX%/}"/usr \
+		--openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \
 		--libdir=$(get_libdir) \
 		shared threads \
 		|| die
@@ -239,13 +239,19 @@ multilib_src_test() {
 }
 
 multilib_src_install() {
-	emake INSTALL_PREFIX="${D}" install
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED%/}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED%/}"/usr || die
+	fi
+
+	emake INSTALL_PREFIX="${D%/}" install
 }
 
 multilib_src_install_all() {
 	# openssl installs perl version of c_rehash by default, but
 	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
+	rm "${ED%/}"/usr/bin/c_rehash || die
 
 	local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
 	einstalldocs
diff --git a/dev-libs/openssl/openssl-1.1.0i.ebuild b/dev-libs/openssl/openssl-1.1.0i.ebuild
index 9cbb018e24ca..f97d4157d7e4 100644
--- a/dev-libs/openssl/openssl-1.1.0i.ebuild
+++ b/dev-libs/openssl/openssl-1.1.0i.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 static-libs test tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/openssl/openssl-1.1.1_pre8.ebuild b/dev-libs/openssl/openssl-1.1.1_pre8.ebuild
index 3acbe2ea21f2..746a28e3de31 100644
--- a/dev-libs/openssl/openssl-1.1.1_pre8.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1_pre8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/openssl/openssl-1.1.1_pre9.ebuild b/dev-libs/openssl/openssl-1.1.1_pre9.ebuild
index c869ecb3ce06..4c92eedb393a 100644
--- a/dev-libs/openssl/openssl-1.1.1_pre9.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1_pre9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 [[ "${PV}" = *_pre* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
@@ -58,7 +58,7 @@ src_prepare() {
 		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
 		-e $(has noman FEATURES \
 			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+			|| echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
 		-e "/^DOCDIR/s@\$(BASENAME)@&-${PF}@" \
 		Configurations/unix-Makefile.tmpl \
 		|| die
@@ -78,7 +78,7 @@ src_prepare() {
 
 	# Prefixify Configure shebang (#141906)
 	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
+		-e "1s,/usr/bin/env,${EPREFIX%/}&," \
 		-i Configure || die
 	# Remove test target when FEATURES=test isn't set
 	if ! use test ; then
@@ -150,8 +150,8 @@ multilib_src_configure() {
 		$(use_ssl sctp) \
 		$(use_ssl tls-heartbeat heartbeats) \
 		$(use_ssl zlib) \
-		--prefix="${EPREFIX}"/usr \
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+		--prefix="${EPREFIX%/}"/usr \
+		--openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \
 		--libdir=$(get_libdir) \
 		shared threads \
 		|| die
@@ -185,7 +185,13 @@ multilib_src_test() {
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" install
+	# We need to create $ED/usr on our own to avoid a race condition #665130
+	if [[ ! -d "${ED%/}/usr" ]]; then
+		# We can only create this directory once
+		mkdir "${ED%/}"/usr || die
+	fi
+
+	emake DESTDIR="${D%/}" install
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index 66da44492a54..8fa18a97f5ed 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,8 +1,4 @@
 AUX pkcs11-helper-1.25.1-build.patch 932 BLAKE2B 792082e48c6566c47ec4b043ccd7762d2c94d8c6f6d7fe8233f91e8f17c2361cb1786644ad7e77f8f0c398cc8d86167f675257a9dbf62a40bd56f1e7c9cb6d40 SHA512 81494d947f62b9cf4aa45fe35a88afb0044a5b36fa89e7f175cb9ab4e1d17ffc6afc81a8da17ab18f087b47894460d0d8c26ca8024c98a73a4bc2a14bbf00346
-DIST pkcs11-helper-1.21.tar.bz2 417527 BLAKE2B 39b2b405ada79e0077c810b3537853051bbaf1cb4d79bedaedf04156066b573c9186ee587c869ed49053a0b471fa239447edef71184d421fb6ac2e65e3a58830 SHA512 064b04c1ece2db0757e14263955c0f7488edde5f5f4415ebda9c4370e608d7df681706ddefcdba2392e5642d00ebd4c211f15266bb39baf8da46ffaec4f3e572
-DIST pkcs11-helper-1.24.tar.bz2 425627 BLAKE2B 2489af89dc4be6d056facedecf38fc42079c18ee74ca4f9621cf11b1060e2f463318d0efc263df5009eab01771c98e44a3efe7246ccbdc8982a130592327beca SHA512 28e9b53dd36e4e3fa8e30b7ad76af3bcfce1947d228f07e607a26aa6b06ee3bf1fd6f5a0ebf8ec581a16074de7b21e53f3b225e1cb1f58d4ded7bff2c50a6376
 DIST pkcs11-helper-1.25.1.tar.bz2 425719 BLAKE2B 527b387a981dbfd855d4eb0024dd7625388cda27c3a0e993b49315e311d46f1735afc8d436361ac1b75a7b3d7f1f712d7dda8eb546ab7adc3dc046bc85fd4c5a SHA512 a5954f4d07a166ed7e711b7a0aa84b454b25774b2fb187ca65bba439f59539c8074bda8ddd5f579d635fe0dc27d8415d8bd22707dc91327bbe05ce03e277b499
-EBUILD pkcs11-helper-1.21-r1.ebuild 993 BLAKE2B ab38240b1b8872fc624526b86b28efe4b947f586f36bbac74468e3e06b9bc640f2a5f82d7e419a2f27f74bb4595043a11f20c3bb3a78972ef76bcb45bf53218d SHA512 6c1b9cfc5ce449010a0c7fee9d7fcdfd45821b582aa68bbcb70aa0ed211528aafd6ae434388b16078663911069b014f6fe7cd2df79f71a93489410226b4e8272
-EBUILD pkcs11-helper-1.24.ebuild 1002 BLAKE2B 72f811926ec93cd90e805705b8642faa93150c13b9f1ecf6c0c9243375e2903e41642ef2463846ebd10aa7bd8515dfbcc295291b585833c7b0f8257960b6543a SHA512 884b85e55231f025b8f55e5b74b82eeab5d1803755b63dd767df7e336e7a9584b94aff1c4f71eaf9e8d5c8f1cfe5429d5beaaaa4856cf1d6aee49ba6617bbb25
-EBUILD pkcs11-helper-1.25.1.ebuild 1060 BLAKE2B ad7da4e7aba600cf143aebf0761bc44959a7a12003012d3c304c9722a2da5559171aab4741261c2c8ed1ebb0a437be41230e6a3b956677815f5abc67895c9e6f SHA512 273ad805064811f571195d9f240c3b856d460f3bdc548c6df29376b879dff75e962ea2a1cff6b6c17e136a24ca36a4f1326ddd7b7628fac8bf438590d2b05008
+EBUILD pkcs11-helper-1.25.1.ebuild 1058 BLAKE2B 0a72a732a7e41c96dca0276fe7ca8efd60c8c003157ac2791b8cf6909e3a2679fdca5a383dd67939c3dd4ef2879cdbf9991a304baed1045550b47bafd8c7caa4 SHA512 f01d31b05570e55fd0bd14afec3ea6fc34c94a78bf6aabf33ef364f37b8ce3070bd396dcf5163091b4933ce088fc6a35b7669ed2bd80b63877aa249711e0ab32
 MISC metadata.xml 442 BLAKE2B 83c40281896d78612f6e624c6335ade3b04be710debd1a8a40da1c569c84a66f6b61eceb07bc4f31d659d2ccc2d5c6fb6fa5ed3a22e5839656e210147a8ddc2e SHA512 ec42c4dd8aaba2001a76530f2cbe2869791f2d88c8ecaa323eb418ed6156751bb5cb143ecc1ba3901afcff42ba78ea099c42a3a2b3b8ae258bbaf9c8990116dc
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.21-r1.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.21-r1.ebuild
deleted file mode 100644
index 90c676f280b6..000000000000
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.21-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit ltprune
-
-DESCRIPTION="PKCS#11 helper library"
-HOMEPAGE="https://github.com/OpenSC/pkcs11-helper"
-SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="doc gnutls libressl nss static-libs"
-
-RDEPEND="
-	!libressl? ( >=dev-libs/openssl-0.9.7:= )
-	libressl? ( dev-libs/libressl )
-	gnutls? ( >=net-libs/gnutls-1.4.4 )
-	nss? ( dev-libs/nss )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( >=app-doc/doxygen-1.4.7 )"
-
-src_configure() {
-	econf \
-		--disable-crypto-engine-polarssl \
-		--disable-crypto-engine-mbedtls \
-		$(use_enable doc) \
-		$(use_enable gnutls crypto-engine-gnutls) \
-		$(use_enable nss crypto-engine-nss) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.24.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.24.ebuild
deleted file mode 100644
index 02e44a3a603b..000000000000
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.24.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit ltprune
-
-DESCRIPTION="PKCS#11 helper library"
-HOMEPAGE="https://github.com/OpenSC/pkcs11-helper"
-SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc gnutls libressl nss static-libs"
-
-RDEPEND="
-	!libressl? ( >=dev-libs/openssl-0.9.7:= )
-	libressl? ( dev-libs/libressl )
-	gnutls? ( >=net-libs/gnutls-1.4.4 )
-	nss? ( dev-libs/nss )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( >=app-doc/doxygen-1.4.7 )"
-
-src_configure() {
-	econf \
-		--disable-crypto-engine-polarssl \
-		--disable-crypto-engine-mbedtls \
-		$(use_enable doc) \
-		$(use_enable gnutls crypto-engine-gnutls) \
-		$(use_enable nss crypto-engine-nss) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
index f207f2094d9f..9020a02da000 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.25.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="bindist doc gnutls libressl nss static-libs"
 
 RDEPEND="
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index 37196161d61f..1415adc987b4 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,4 +1,4 @@
 AUX fix-popt-pkgconfig-libdir.patch 519 BLAKE2B d31d6d121f745f208c743aed94c071343efd09b8396c777f7887e8931f87d4fd8e4fa1eff7ec340300a68ae67862cdd7bb05d6bd60e08289c406d3cc9f4ead6d SHA512 8862cb25283f38d734aa1abaa4d29d1f018718be77d03a4f0533b6b8b2518581abf277eefd3b3d56d5f9ab9e00b544e816e83fca6863e86a66dacae0f9abbfd0
 DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
-EBUILD popt-1.16-r2.ebuild 929 BLAKE2B 7cd8557d15ab34dafb444309718ad42adb1bcce2f1a7350a85608d88a98c3b3c22ff662dc446dc15a5ce2e5b93405ad448cc3e7f3de7f138291949deb5c5045c SHA512 f72a1229502b6cb6c092fc3c042d32ddf77bdea5f5a14231f509ba6b784b1092cf95b87f78d9e3d8050852c55fb1d5650dff145df1a0c1c8255228e887031046
+EBUILD popt-1.16-r2.ebuild 918 BLAKE2B 219d3905d01f6e7871b5724b8a83ccc3f3518528ea76d1def194e2ca13fa1a689333fc5c0020acb10005811d137014553bf827aa7e9c430a935f8adf015405d2 SHA512 6e9337c02a178c7c5b35f617cc65de65e2649b75d7595103b65b176bf5d54d2c7e07ef1a4052b75227428dce651b9f429168e917891ea36ce40b63d3f0ae888e
 MISC metadata.xml 263 BLAKE2B da35927a73cc22621ec3170a872817bc1f2e91967dd369f21f6543ce2a02e995eb654ab2c1209bae764ef194788828e00daf5d559d3a26926e6912838075dc7f SHA512 b25a1229f571493fdde40749d60d17d411676854bc3f73810e15edac8a2a930d3633f46a6f7f5a7ec6cf7f36b9ef690a7e03916c7c76869315f5ba1f862fd0f0
diff --git a/dev-libs/popt/popt-1.16-r2.ebuild b/dev-libs/popt/popt-1.16-r2.ebuild
index 7ab06b9a326f..3f9b837efa6f 100644
--- a/dev-libs/popt/popt-1.16-r2.ebuild
+++ b/dev-libs/popt/popt-1.16-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://rpm5.org/files/popt/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 88bb680425c1..2d93ad2e65e9 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -12,9 +12,9 @@ DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dcc
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 DIST protobuf-3.6.0.1.tar.gz 4483964 BLAKE2B 8afc1e4f4a6eba0eb453fa7cbee8e8ab4986ab9dda39a0005de9d07ec4bd4fd27a5af4ab359b139b4117a5da580be6da3387295266625ee8cc7ec9421c5c0235 SHA512 63cd799d5d6edbb05a87bc07992271c5bdb9595366d698b4dc5476cc89dc278d1c43186b9e56340958aefea2ce23e15a9c3a550158414add868b56e789ceafe4
 DIST protobuf-3.6.1.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
-EBUILD protobuf-3.4.1.ebuild 2523 BLAKE2B a774fdcde73cd91848e3d9ce0a04af49d2716598d3437db4dad303653173aea1d0348a35e8676323d8e80c55c56423ad8e1d521ef335eb055ce83082cf03a1ea SHA512 61f7adaeb0b4c88aa3955ebeb4e703f007d1c98e04d6856becac21be0378af85dc18b60b3f8d36a5e7fb639f4a61f5c8f518c724544ce7bd2e5faed93c2e6980
-EBUILD protobuf-3.5.1.1.ebuild 2617 BLAKE2B 59fd5152cae402cae46bd4b3e03cdae43a5ebd74c2035ee21bebe4bdfe9449388eec1d54adef01ff0912e4872aa1aae390f862b644724d4b6403ef2c654fba43 SHA512 3189220abf34c044eab311e9d86d30aa57873b172ac57b86fb33bbd98a367b6d4a4c101884bfce152e78d949bb7c2bd66bea6c35b6e7371c4d1fbf306ef2e23a
-EBUILD protobuf-3.5.2.ebuild 2487 BLAKE2B ba8dc1715f5ef4bd5aab3ac71854774774b2d8e45025fd2dccbf7d43b0d1f0f0edb3b13bd2ded9324472806d5d62cb60b2d15bc338b44280a4a87a05a364ce2e SHA512 f7b2324fb9deed34549e70b6340e98934388e212e3610a41cc019b4faa6d0f2ff2a84f6e681623c0f978e2bba0c112a6a9d900808f09808e58569c5226d6b784
-EBUILD protobuf-3.6.0.1.ebuild 2487 BLAKE2B fcb28f8c2adca162d0a1e0460b428c232cf8124616b5a4c6c6b3914071fa0141d06f20bf01333238254f004126213456d573c74c3472b32f7d7881e741e4278c SHA512 d96ef1201556409abbbbc6966db3d351c88a8bf7ff40636d5aaf393c4635027ecc64438fbead24c22b56a5c09ae3aae74a6d71b103bce7a8b6b96beeca0cd414
-EBUILD protobuf-3.6.1.ebuild 2487 BLAKE2B 6a8e5d3257b39ed30325a92fa92b49250e8ef99a5447ca2c575c6dcef4bc2926496d03eb79b26d7b9fca58b4a8ab2b4a69fa0abbc5e470814fe4d986fd0f3260 SHA512 2089ed4d07dfe518fd0a30196e5484b1494276ab21639bb804a5b59375f93ff9186aa226ebd253d6cefd3f5059df5bf63e181208f7658e2a28a9d25c84905127
+EBUILD protobuf-3.4.1.ebuild 2512 BLAKE2B 671e0bb79f5744b86a4c968a42b3efc0583b357cea941ae577dfa3839c401d19a2f42db02d0a70d66466d5a585bac646c8d143da3c4b2bbfb81fab0512418f70 SHA512 e80a80f3806c09fcf79a6ad7cb271a1bac2ad10f4020cc49b57112982bef76f2658660439f320ba71fe0b2ec1f86374c8e5f19d8b9640963ba10bbb436e5fcf3
+EBUILD protobuf-3.5.1.1.ebuild 2606 BLAKE2B de3ad34fecf997b8734738c0e8eeeb320c1a40cb31fb254e6385bfce42ee6e783de5328dddd3f4e65967e19d8d37f11d24724155d14d378cd3e75e0b611d4f30 SHA512 e15a7313e583a56b88cc7408d2d081e8ceac6e660595fb99c9f1dd91eafa7a8fa45c4f6259d7bd240a994f7464d28bdd0997da5c026d64399ad650e3f32625ab
+EBUILD protobuf-3.5.2.ebuild 2476 BLAKE2B 102bace5a78941b00193e4f0ffbd49e6ed849e7ffaadb24337ca014ce2d8e3c701c059add758033e77a85b4b91102a506f30c4abe990f634ee591779ae599ae1 SHA512 cbf835d457fd5420001d85cfb6ff34ea0adf385fa606a2b169e57f01214835f72d54589309ea215f8823e8ce7551e8d7caf4d629353ed1ae3ce4c00a840e1bd1
+EBUILD protobuf-3.6.0.1.ebuild 2476 BLAKE2B 527f59cc354c4c0e1db7500f5b7c803abf79d7f97e4d7ab4a187ea7817cc75441d162bac2614fb00e635871d79ac89cb76726320e060c01d622006e9668c7c23 SHA512 10ea54508497790213297670dfc9998218d46f2eb5276bc636a37b9afff3762650c081bcdd12ff4d6a28a50b01b781b6afa83abc9b2c1e36dee1d61d29f535b6
+EBUILD protobuf-3.6.1.ebuild 2476 BLAKE2B bef94c1f01371d56bb2f7dc0c95349b9a011f408b43694eb2129fe363d3de3ec07fc67d7acfe3770edc2b99ae11f75672afeae392ad8cc38f23a503a0f242ef6 SHA512 3c11db3b60189a0d09c91fd61566e521f124048037e28af02789ef87094137f7aea3fe0d47b42b87f6f41dd0fdb0ff33980e24937e3b0697cbc8b609a8a08f34
 MISC metadata.xml 534 BLAKE2B b5ffe91fcd25e8285f33e178fdf39f6c5e2e477e5db4bf80ffb144dc8e2c982a586329eb27239ea2867efdbc771ecde26197aa12c67441ede2bf08e1d8e78f0c SHA512 f9b4a37461edbf530940c86f2b0a3838fad80395f1c5e4738b40519fec2df24867e005cf55884f126d2a3a1dfc894cfd1a26fa085268da2dc4b0e562390ebb3e
diff --git a/dev-libs/protobuf/protobuf-3.4.1.ebuild b/dev-libs/protobuf/protobuf-3.4.1.ebuild
index ab347e7227c1..861514638202 100644
--- a/dev-libs/protobuf/protobuf-3.4.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/14"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 
 RDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
index c0acbfe7b8cb..ea6e36624008 100644
--- a/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.5.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 
 RDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/protobuf/protobuf-3.5.2.ebuild b/dev-libs/protobuf/protobuf-3.5.2.ebuild
index 60e3d7bd86db..1f060c91027f 100644
--- a/dev-libs/protobuf/protobuf-3.5.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 
 RDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/protobuf/protobuf-3.6.0.1.ebuild b/dev-libs/protobuf/protobuf-3.6.0.1.ebuild
index 3153b8aa572e..463b4135d83e 100644
--- a/dev-libs/protobuf/protobuf-3.6.0.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.6.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 
 RDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/protobuf/protobuf-3.6.1.ebuild b/dev-libs/protobuf/protobuf-3.6.1.ebuild
index b4ba0f76dfa0..05027c009a55 100644
--- a/dev-libs/protobuf/protobuf-3.6.1.ebuild
+++ b/dev-libs/protobuf/protobuf-3.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples static-libs test zlib"
 
 RDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/template-glib/Manifest b/dev-libs/template-glib/Manifest
new file mode 100644
index 000000000000..634dcfd65f3f
--- /dev/null
+++ b/dev-libs/template-glib/Manifest
@@ -0,0 +1,3 @@
+DIST template-glib-3.28.0.tar.xz 54320 BLAKE2B 3f06857756cc49655b0289a4c0e576c681948e347112de713e0ea3c8c47db8a68efb258688afa8277362d2fb1e5a73d2f659570607d90abf6a804ea13a9467e2 SHA512 95d780c03567a8cc1bc02ffabfed2ef4bbe359941b326bad006aba6689686421bc25d357b574cf8ab9d9a27b7707f2f6041a9fcc90a7fcedbf02e9a0e8286860
+EBUILD template-glib-3.28.0.ebuild 1057 BLAKE2B 30b223b120eacc943e47faf52022855a7ce4832263f3bb77c6f9265c1e99975f62e156d0ad5846d7a33e0f7919b3ec83b6533dec9141053b0febdd6f6ef79433 SHA512 f84b335769acf5e591fab9ed2ae8395428d8f3ccc1caf5cb9317153ac62c98746e70e067113c2cf2a4771de809fc26eb438742d256f0b9c6a5850b580fdc34b9
+MISC metadata.xml 644 BLAKE2B 76c8a25f64948739ac646ea100b365426db6b9f674502d2db83a93ad7203bcf2c6a49396daf959b4f3b3b89777e5f2a02c8a5a168041f6f93168f95c46fd7987 SHA512 272335daa1c3844c85dde4fe91b5020112c0652547d644fdb04126219ea39a3c0cfc16bb3d054cc362393507844e9a63d4c24e5e0f323d2bb3fc8b43e65810a6
diff --git a/dev-libs/template-glib/metadata.xml b/dev-libs/template-glib/metadata.xml
new file mode 100644
index 000000000000..b776041d6e26
--- /dev/null
+++ b/dev-libs/template-glib/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<longdescription>Template-GLib is a templating library for GLib. It includes a simple template
+		format along with integration into GObject-Introspection for properties and
+		methods. It separates the parsing of templates and the expansion of templates
+		for faster expansion. You can also define scope, custom functions, and more
+		with the embedded expression language.</longdescription>
+</pkgmetadata>
diff --git a/dev-libs/template-glib/template-glib-3.28.0.ebuild b/dev-libs/template-glib/template-glib-3.28.0.ebuild
new file mode 100644
index 000000000000..319031f57b3e
--- /dev/null
+++ b/dev-libs/template-glib/template-glib-3.28.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org meson xdg vala
+
+DESCRIPTION="Templating library for GLib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/template-glib"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64"
+
+IUSE="gtk-doc +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection:=
+" # 3.28.0 depends on go-i unconditionally, USE flag controls GIR/typelib generation
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+	dev-util/glib-utils
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable_tracing=false # extra trace debugging that would make things slower
+		-Denable_profiling=false # -pg passing
+		$(meson_use introspection with_introspection)
+		$(meson_use vala with_vapi)
+		$(meson_use gtk-doc enable_gtk_doc)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index b1881c84d6cc..89238d46dd08 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,16 +1,3 @@
-AUX tinyxml2-1.0.9_p20121123-test.patch 618 BLAKE2B 7a0cc49f47de3a08f16e119ed44dbcab5ed0b1847c80f3560f08a4bb7365e8b3a29ac20035ec0117866ce0e975b297bd3de66456b21a3dcfdedfeef7d040af49 SHA512 c86ef1946b3ade23b0fcbddffdbd085aa998b7fd165508181613c62e5db3c998db044f2d8eb25294a3fc2bfd358c0acb475815cc7076649253157c8238c90cb9
-AUX tinyxml2-4.0.1-optional-tests.patch 1059 BLAKE2B ae179ad1a8e7e52648dbf1b3192e59d128ef30a6fa92d97536eb9a1cdb3c13c0e0ad88029969153d45b8dbb3866dd94c5799de6c35fad5e301cd53a831f67636 SHA512 18286df9b643bc89fb7cc06bc7149d565add606590715eb80855ccd960498c09387329de232af1a007a5779a9e8cc5f11f796aa8383510008a206b7e2f2efed4
-AUX tinyxml2-4.0.1-xmltest.patch 302 BLAKE2B 916495ce5e3d33219754deb14069adb2f04ee6b3c28d301fc0f6287e643f094b798882bba003a900c699c314ccf0fb20c756c044e2900efe8ed1e0f1bcc1cd4b SHA512 6485c5efea35f580b2747e458265f80e758b20dee362c97825cb420cc4421fbf0deef93bcd5401ab25565152453cc37fe448bea6323d42d0b0d25eea88eb376e
-DIST tinyxml2-2.2.0.tar.gz 455226 BLAKE2B b3e76f0cda38ad01186b85ffadc554398edaf593624b869a7954ddf4aebe484abf95596fc4e7e11c622a1a23716d38d117035237c8e2f3d4e1f2fbe5551199ce SHA512 e06edb46f96dcc58cf16c8fef91dd072c9bd6dd296bb9ba3e082db059438f5f31e0689015deee7f1c390788d9bd0e64b6f5c0235c9d2839419ee2ab1784f53c4
-DIST tinyxml2-3.0.0.tar.gz 339620 BLAKE2B 02c083462779467a40a30922b224634179d7feee19191a36d6106962e59d3cf2e29e6080628bd89881241d0010355bad619d8f47a31a0139bed219cd3476195b SHA512 724f1f6ea9bbc74b679067dfe69d156eb05f5d4a694cd825814b717dd676fe53ddc8707e0512a0c8449bb13586cc4bc085bbaca41bf8e29c304c5fafae53b1d2
-DIST tinyxml2-4.0.1.tar.gz 344295 BLAKE2B 58044e7898b4004aa0c1ec4b65d11a75c7a85568665baff419a23ac096596bf424c49d13318bee43c467de2e722c21ac3304eab8978e7ca3602e68a83fad4ac5 SHA512 4add31a72c62b3f68bdb17fb90630bc51bf96b616f4beafb413082dc77bc699b8d516fa0955d001d5d69bc3371b7ca9ce5cd9696d91dd913b09a1c10681b819e
-DIST tinyxml2-5.0.1.tar.gz 349622 BLAKE2B 13cec7ee49ad2fc2e74ce993e27de96fba45ed599b38a2d08463c2b6513be862e9f5f6c425549f0f07ee81e6fc8dc0ca1056295929c862b9da628d507dc9a3a1 SHA512 a51ec5843774df0482620c549fb6c61d30a6db5025be26ff6d25b3c53533a27a57f00b026bd9fbca78e9e30084b3f5f6fbff9dba315d078419da084b57f518ba
-DIST tinyxml2-6.0.0.tar.gz 576612 BLAKE2B e7ad757edae2d07504b76821caf7a68a8dcac90fc90dc3d0a2fedd082297e522e5cc1f294ba31f14c6046d9742a09e16a046f6d283d7e1ed165d8d35703c6cb2 SHA512 30c68f491830187738b01ca5db1a96e7b4907cf8fa09a533c90ea084ab5e73f798dff6305cfc4edccc8989926e91c0482677bb5796799113c839dbd0528c8ad5
 DIST tinyxml2-6.2.0.tar.gz 585870 BLAKE2B 6f79ffe0894d625e3a2cccaf897c13962672f090c477b6b13e8685585a304b5cf0f5069d88d61650882e55f23768514dcbeea4795e3a4758b016cb177eee44d4 SHA512 ef784240aeb090ab04aad659352ad4b224c431feecf485f33aca7936bcaa0ef4ab9d0a2e0692d3cf6036ac3e8012019d65665e780a920bbad3d4820f736445b1
-EBUILD tinyxml2-2.2.0.ebuild 745 BLAKE2B a3274f447601fe19bf427e42fc8ca0985d299e724843dab48fbf6748cd66bdcec5ad03cc40ce1314405d24a138a49c8fd79164fe02b7f340071fdb47ea7957ae SHA512 7eccbdbed726312173a7d46f3fde4deb07998797b7f4f0cec97cad1ea8c55ae6e87eaa460b25932dbd2236b2b90e2f7f35ed4dc5ebdb26a22f5c5a90ff3876db
-EBUILD tinyxml2-3.0.0.ebuild 673 BLAKE2B 2295bb669f272e5ba1fac220d5447524be9144c231648c956a30295aaf746ce5171707a9265c7a8c5fe8d3958664b83f21a6472863a97759d513a9982bb6c3af SHA512 dc23ed027f96b757b3b808f1115cf2f1d86e74acf8738b15fdb2c0bb6384807bb329fb1d62000b6f74690ec8b142019bce389dc05a51728e9e56ae3f3fbfdd4a
-EBUILD tinyxml2-4.0.1.ebuild 762 BLAKE2B d3a802a3813a9f99c16feec006f07a5e136b3415098a6e8793a757ca7583fec0d0b5989d80cc38efb2803a4eb564dc3ad53a76d649655c415101e3ac233c108e SHA512 0405efdf3fb5621653f620331050de75edae080e9bb7e41132ff532a7595d76dc9231e31102df0992f88be15321908ead5fd23d69544fed2e66cf697864d02bc
-EBUILD tinyxml2-5.0.1.ebuild 625 BLAKE2B 4e212a8cd13d3cdf62d89a1735e8e5d49e99426e5fd7b00e74049af868840a8be5997626356a42a04b86b39f2912342816ca56bf4b65da114ba5bae92fb6d84c SHA512 ef5934e90c628ab8a15e7824e930e19c7d461321cdbd1e69bff07226172bdb59bc228e992959f5d9373c5fe3b8513cdd1d42e0e51faf802dbdd3cc7340391af9
-EBUILD tinyxml2-6.0.0.ebuild 625 BLAKE2B 0d327c832f502b523d9e3479bcb474dfb0fa161a771ffdcb01af25253f29203c720bed574f2353c9effe0a1a65072bceae5d2357f17eac4f233e1b9a93f50b86 SHA512 c65e97a56c42b1cb81bfb4a116c534cdb9bae5ab67a42e104dbc4d95b01eba8a9b47537fa43c92baa84415d8df754bf1c0d74682eff24b3df7e946bc456cbb02
-EBUILD tinyxml2-6.2.0.ebuild 621 BLAKE2B 8ab8beee48cc0eafd9e1e3d4e2bfa020da42161533a25d3edd133aeb4e9b6282ffecd57fe5a6b92b38af1675784a8f65fbed3af881735892d46f91f2b9c3ed5e SHA512 fbfe662d555224092a37922b6a9db00a4c1636602feb38c51e5d7639f26871e70a83cbf784911aea829c2fe3bdad27f65fd6e7110005a8c5423f20c8d60fc9e2
+EBUILD tinyxml2-6.2.0.ebuild 620 BLAKE2B f60ccb2434b77c15b15b281c347f53513d6e27c40a8f5ea7d913574dc84504b54ec8ad8189104cfab3dbdbcb1862150c4a0b63ddc6717a480f6740c6f6a3126d SHA512 90f06488506b3238cbaab663e2801188a86e996679b211515c7bbac1cd1f1bde1bf37eab6f08ea9880ac2f3c5077c3f6f05500cc24188c59a65385749f78996a
 MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/files/tinyxml2-1.0.9_p20121123-test.patch b/dev-libs/tinyxml2/files/tinyxml2-1.0.9_p20121123-test.patch
deleted file mode 100644
index a6842eecb6e5..000000000000
--- a/dev-libs/tinyxml2/files/tinyxml2-1.0.9_p20121123-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tinyxml2-1.0.9_p20121123/CMakeLists.txt
-+++ tinyxml2-1.0.9_p20121123/CMakeLists.txt
-@@ -55,10 +55,13 @@
- 	VERSION "${GENERIC_LIB_VERSION}"
- 	SOVERSION "${GENERIC_LIB_SOVERSION}")
- 
--add_executable(test xmltest.cpp)
--add_dependencies(test tinyxml2)
--add_dependencies(test ${TARGET_DATA_COPY})
--target_link_libraries(test tinyxml2)
-+set(BUILD_TEST OFF CACHE BOOL "Set to ON to build tests")
-+if(BUILD_TEST)
-+	add_executable(test xmltest.cpp)
-+	add_dependencies(test tinyxml2)
-+	add_dependencies(test ${TARGET_DATA_COPY})
-+	target_link_libraries(test tinyxml2)
-+endif(BUILD_TEST)
- 
- 
- if(BUILD_STATIC_LIBS)
diff --git a/dev-libs/tinyxml2/files/tinyxml2-4.0.1-optional-tests.patch b/dev-libs/tinyxml2/files/tinyxml2-4.0.1-optional-tests.patch
deleted file mode 100644
index 95e849fdc8ff..000000000000
--- a/dev-libs/tinyxml2/files/tinyxml2-4.0.1-optional-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- tinyxml2-4.0.1/CMakeLists.txt
-+++ tinyxml2-4.0.1/CMakeLists.txt
-@@ -100,15 +100,18 @@
-         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
- 
--add_executable(xmltest xmltest.cpp)
--if(BUILD_SHARED_LIBS)
--   add_dependencies(xmltest tinyxml2)
--   add_dependencies(xmltest ${TARGET_DATA_COPY})
--   target_link_libraries(xmltest tinyxml2)
--else(BUILD_STATIC_LIBS)
--   add_dependencies(xmltest tinyxml2_static)
--   add_dependencies(xmltest ${TARGET_DATA_COPY})
--   target_link_libraries(xmltest tinyxml2_static)
-+set(BUILD_TEST OFF CACHE BOOL "Set to ON to build tests")
-+if(BUILD_TEST)
-+	add_executable(xmltest xmltest.cpp)
-+	if(BUILD_SHARED_LIBS)
-+		add_dependencies(xmltest tinyxml2)
-+		add_dependencies(xmltest ${TARGET_DATA_COPY})
-+		target_link_libraries(xmltest tinyxml2)
-+	else(BUILD_STATIC_LIBS)
-+		add_dependencies(xmltest tinyxml2_static)
-+		add_dependencies(xmltest ${TARGET_DATA_COPY})
-+		target_link_libraries(xmltest tinyxml2_static)
-+	endif()
- endif()
- install(TARGETS DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
diff --git a/dev-libs/tinyxml2/files/tinyxml2-4.0.1-xmltest.patch b/dev-libs/tinyxml2/files/tinyxml2-4.0.1-xmltest.patch
deleted file mode 100644
index 94b2668a1a48..000000000000
--- a/dev-libs/tinyxml2/files/tinyxml2-4.0.1-xmltest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tinyxml2-4.0.1/xmltest.cpp
-+++ tinyxml2-4.0.1/xmltest.cpp
-@@ -1618,7 +1618,7 @@
- 
- 		FILE* perfFP = fopen("resources/dream.xml", "r");
- 		fseek(perfFP, 0, SEEK_END);
--		long size = ftell(fp);
-+		long size = ftell(perfFP);
- 		fseek(perfFP, 0, SEEK_SET);
- 
- 		char* mem = new char[size + 1];
diff --git a/dev-libs/tinyxml2/tinyxml2-2.2.0.ebuild b/dev-libs/tinyxml2/tinyxml2-2.2.0.ebuild
deleted file mode 100644
index 650e51c55b06..000000000000
--- a/dev-libs/tinyxml2/tinyxml2-2.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A simple, small, efficient, C++ XML parser"
-HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
-SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/2"
-KEYWORDS="amd64 arm hppa sparc x86"
-IUSE="static-libs test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.9_p20121123-test.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build static-libs STATIC_LIBS)
-		$(cmake-utils_use_build test TEST)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-	./test || die "Tests failed"
-}
diff --git a/dev-libs/tinyxml2/tinyxml2-3.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-3.0.0.ebuild
deleted file mode 100644
index 8477f44d99d3..000000000000
--- a/dev-libs/tinyxml2/tinyxml2-3.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A simple, small, efficient, C++ XML parser"
-HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
-SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/3"
-KEYWORDS="amd64 ~arm ~hppa ~sparc ~x86"
-IUSE="static-libs test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TEST=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-	./xmltest || die "Tests failed"
-}
diff --git a/dev-libs/tinyxml2/tinyxml2-4.0.1.ebuild b/dev-libs/tinyxml2/tinyxml2-4.0.1.ebuild
deleted file mode 100644
index ef4b25aababd..000000000000
--- a/dev-libs/tinyxml2/tinyxml2-4.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A simple, small, efficient, C++ XML parser"
-HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
-SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
-IUSE="static-libs test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-optional-tests.patch
-	"${FILESDIR}"/${P}-xmltest.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TEST=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_test
-	./xmltest || die "Tests failed"
-}
diff --git a/dev-libs/tinyxml2/tinyxml2-5.0.1.ebuild b/dev-libs/tinyxml2/tinyxml2-5.0.1.ebuild
deleted file mode 100644
index 29d2f704db50..000000000000
--- a/dev-libs/tinyxml2/tinyxml2-5.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A simple, small, efficient, C++ XML parser"
-HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
-SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="static-libs test"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/tinyxml2/tinyxml2-6.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-6.0.0.ebuild
deleted file mode 100644
index adc1f1a46ed7..000000000000
--- a/dev-libs/tinyxml2/tinyxml2-6.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="A simple, small, efficient, C++ XML parser"
-HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
-SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/6"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="static-libs test"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild b/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild
index 0cdc6766266d..97f2b558c247 100644
--- a/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-6.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="ZLIB"
 SLOT="0/6"
-KEYWORDS="amd64 arm ~arm64 ~hppa sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa sparc x86"
 IUSE="static-libs test"
 
 multilib_src_configure() {
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 5be56a3e45e8..f4ca54099ded 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,7 +1,7 @@
 DIST vala-0.36.13.tar.xz 2869616 BLAKE2B adb22fa45e34c2be2accde2bc928148d3115dc0757338d66feb111b4225879f21f2af5f49511eff53697127d3431d22736be827d3663ed8a5de6d8ac718b0cee SHA512 7c9bb2e50f660ec28d55f755019ba81eb0358327967d8046a14691b5fe9c805f731c6277cbb732fc19af60322e2293bb25176387944ca2de709cde0c22b44d1f
 DIST vala-0.36.14.tar.xz 2874504 BLAKE2B 217178c9018e8d6623e5997f36210ecccfa0176ae06a52bed6b54b5d6af3504c7157b9bfb162d44ef96e0b95fa2ebfff4171b935f911491f62f88c69f6087d57 SHA512 123c54a3ba2198b6cc7d40bfce20dee687a369e26346fb6675ce07692755ceb91bea7137f707b9f5a7972c99b12a77e9d4cc65ae055053f48909c80377661fbe
 DIST vala-0.36.15.tar.xz 2880300 BLAKE2B ea83bde6396f3be1c96038d63ae30b18fa070a6f7a06b75569bfed9d7792c898201a1f24d000f5b6415bb890cf975758341a97f22db74da02fcbeb3f283e546f SHA512 1c8f888832b2dd4248737a5a27f00f42d8bab2fe0a0790a7df5c426f4e3e1d0919ed0f6f6fd905be758ed477ba840e18f608e67811389c811ba65710094abe61
-EBUILD vala-common-0.36.13.ebuild 2532 BLAKE2B d7d559633b486f7dff1ce9ba4d5afc64e51b711c8eddec3cfacde871b36b6b26b4b23fcff21a6828a9bdbfd337498942ff7eb363a4e1448bdc457490d5ec10e6 SHA512 7103cfa563c1dde203f73d3d9ee1f7f01fe912a16a7fd8e6473db61619bb25b3641f46c151fa93f300b5cd04639ed4fc828dcd5345b0356de08918332522d290
-EBUILD vala-common-0.36.14.ebuild 2542 BLAKE2B 4cdc068195601507e5d82dd5aae28c76f8793af489ddee1df1c9a48193ecdd006ae125775126eafcf9caee83537041369b2b3303cf2f97f214dd27224c057fda SHA512 edf400f4a70b300b13bc1086b1ee9923979d9bc21a81a3e4efce05944842a035d1c8701bd35b026b84f062a9465e037eca70690723f8e6fe05e1608f0030eb22
-EBUILD vala-common-0.36.15.ebuild 2542 BLAKE2B 4cdc068195601507e5d82dd5aae28c76f8793af489ddee1df1c9a48193ecdd006ae125775126eafcf9caee83537041369b2b3303cf2f97f214dd27224c057fda SHA512 edf400f4a70b300b13bc1086b1ee9923979d9bc21a81a3e4efce05944842a035d1c8701bd35b026b84f062a9465e037eca70690723f8e6fe05e1608f0030eb22
+EBUILD vala-common-0.36.13.ebuild 2521 BLAKE2B 79f6d446883655f63b2956fc8f8ec254993526d803b8eb975c0f7f9c7c3b1faecf39538ee51bb7062e69dc27d2349c8d8c2b3d560bb83125fb96a0c9b2f8cc48 SHA512 52667e85b97693ee7e90cc87513c79fe009380cbd4c7efbd12109cf19360cd7d84399bf707d8488270845decc7943d51bfa7f893b390eeaba5bf23adeda48443
+EBUILD vala-common-0.36.14.ebuild 2531 BLAKE2B f3e397e41035058698e9c15ceb1ffe1648b8456c6ab8764ed97a4c01e36d9ac83c3e8c94c2a8be744eb9a547ae8f2c3bbe1f7bd3c92599c9dbaeaf941de0c65f SHA512 32ec0798c0a5047f2573fce558c40a23f4b74399829f8aece4044a1907405d5905dfa9e7cada6af38bb37af7ae3cea7847df8c5441aacf5fcac4786d178bae89
+EBUILD vala-common-0.36.15.ebuild 2531 BLAKE2B f3e397e41035058698e9c15ceb1ffe1648b8456c6ab8764ed97a4c01e36d9ac83c3e8c94c2a8be744eb9a547ae8f2c3bbe1f7bd3c92599c9dbaeaf941de0c65f SHA512 32ec0798c0a5047f2573fce558c40a23f4b74399829f8aece4044a1907405d5905dfa9e7cada6af38bb37af7ae3cea7847df8c5441aacf5fcac4786d178bae89
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.36.13.ebuild b/dev-libs/vala-common/vala-common-0.36.13.ebuild
index f3f9c323dd3a..79b98ac09038 100644
--- a/dev-libs/vala-common/vala-common-0.36.13.ebuild
+++ b/dev-libs/vala-common/vala-common-0.36.13.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/vala-common/vala-common-0.36.14.ebuild b/dev-libs/vala-common/vala-common-0.36.14.ebuild
index 914750231de3..7be7c4446feb 100644
--- a/dev-libs/vala-common/vala-common-0.36.14.ebuild
+++ b/dev-libs/vala-common/vala-common-0.36.14.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/vala-common/vala-common-0.36.15.ebuild b/dev-libs/vala-common/vala-common-0.36.15.ebuild
index 914750231de3..7be7c4446feb 100644
--- a/dev-libs/vala-common/vala-common-0.36.15.ebuild
+++ b/dev-libs/vala-common/vala-common-0.36.15.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 55aa311f9d76..93e83c45c87d 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,5 +1,5 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
-EBUILD weston-3.0.0.ebuild 3471 BLAKE2B fe1bf52314d12e30c3ae4ee664c156a83a817b3150e27ed60286d06bb115169a459c8a934d89faeb1deb30bba2b6965ca1a30d8ba16d8e9b244f29c8267e2c03 SHA512 fd281abc3d24c558d996670fac22106501d8d94ef394b23112023d95d4987bcbc4f0208796d5132cdd1ae3033073da2cc3f8067afefdc7b55fc9100a70ca39b2
-EBUILD weston-9999.ebuild 3461 BLAKE2B 9e0e7004d2f0f70228cd396a98d926a66a250978fabdc2ef1e09e2981a0a610df03c56e3b552f3e3fb9534e42a99718144b9c8208ec29834ac89f0f2fa478822 SHA512 420518c195308a359df897e377c3bd71c0e17a000cf8c0c25831332031ca1704cfbd598c10e9b475054f52407a9021e581db6b4dcc13dba2605dad2912e3f7ca
+EBUILD weston-3.0.0.ebuild 3460 BLAKE2B 3831b7e40fdf6a767a8c4686ce935f6323e1250e9338e7a2e4aaaaa94753098bf28ca3f37e6b05e20eea3feeef3079f889b31f0b44fc66b9be2443b912f8df30 SHA512 3ee0b31c75053f23a0e558a9e83ae737137e24682ef8905c54e2f3437306e6a46137f4300014f9c2471bd7958eb7078c69c8762ea18e79e84d618583b1ad72c6
+EBUILD weston-9999.ebuild 3450 BLAKE2B 32f9b8b7f712e7a948bd6addc68792234684314c3dcb59db31f0884432805a3dc64fb79f82225fca22043384af9532e34d7f5872424af180ecc768111348f3f6 SHA512 e56e09138148f71d36f2d6543bcfee9389d8df903def4ee23f3f326a1e47950dac07899a66234adfcea841a2e2b248741a4d5bdc73586761a43f116340540b02
 MISC metadata.xml 1309 BLAKE2B 3d7f849f84c4270533b9f13b7edae39c405f9ac0fdd61eca140d7244bc8cc9310600b349f611706200210f36d190d5b99917551edc3338876f4ce5aae75e8438 SHA512 537d4e99af7a368f16758fde18d271bdc76957c416b920934ff9248c1ee2172a95b3fb83cdaa8d138bdfc6cbef4224cc492e0c55d499f2f8e45314156330666c
diff --git a/dev-libs/weston/weston-3.0.0.ebuild b/dev-libs/weston/weston-3.0.0.ebuild
index 5ecb2bdb3956..85b8492ffe17 100644
--- a/dev-libs/weston/weston-3.0.0.ebuild
+++ b/dev-libs/weston/weston-3.0.0.ebuild
@@ -19,7 +19,7 @@ if [[ $PV = 9999* ]]; then
 	KEYWORDS="amd64 arm x86"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm x86 ~arm-linux"
+	KEYWORDS="amd64 arm x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 01cec086558f..44880eb96399 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -19,7 +19,7 @@ if [[ $PV = 9999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86 ~arm-linux"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
author	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-09-08 10:50:14 +0100
commit	3f71901f8c228f4de570abed1831ce3ee425343e (patch)
tree	a2dcd300d05ef8a2ec275b44a92a9d85bd3baa24 /dev-libs
parent	12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)