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-util
parent: 12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)
109 files changed, 1546 insertions, 495 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b481c01a162c..7c950fa5bc2c 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/abi-compliance-checker/Manifest b/dev-util/abi-compliance-checker/Manifest
index b1727b605941..9115dfe3ce3b 100644
--- a/dev-util/abi-compliance-checker/Manifest
+++ b/dev-util/abi-compliance-checker/Manifest
@@ -1,6 +1,4 @@
-DIST abi-compliance-checker-2.2.tar.gz 229812 BLAKE2B 8cbbaab1b4063a93a794a6d68acbf4d2c2356eb759b6d5dea2836173887937aca3e23cc3ea54b716a472a43e3e7841f749c2e15286cf5d12780577841b792685 SHA512 4bfdad1d708f2498187a0c06cbabced3c34a05b44900231d453a8dcea88df3f381a180aa2d4cbb4c3df14d0013660b355f630e890e3715c79ce8af3a385759e7
 DIST abi-compliance-checker-2.3.tar.gz 228691 BLAKE2B cf472c81d0cb5a64588b9b889c6797399f99b368842066fb6a8b464aa04414ea02c261283396a0dbd95e65a3d9e0e19cf7637a012c433a9d2c579d0e5ad30f13 SHA512 dda5b65c36028da302ed2a8070de72f85fa0ecbc573bdc73d9a06fc6162f8850773b586c7bef8fd48b5ccb2918fbfdf8e70dd16de94cc5fa70617d35579edf2b
-EBUILD abi-compliance-checker-2.2.ebuild 622 BLAKE2B 210c126f4d2f04911ffea376d8db7d84a2df16496002918179b101e331099b7152db9a24827d46b324056d96500abaa1b24568eb72059e835764810d85e93b0d SHA512 49650e30c2078a5c7c128f92640991342af271acaf833de67bf887ba30e52e2e1d7f053a6ae7f3c018dc99d793102cb7973bfcb61c92b65f187d59cb39d29889
 EBUILD abi-compliance-checker-2.3.ebuild 603 BLAKE2B 28eb7ef1f221ff96ac227155be1ccc84edf94e4911d9544a0d7b2b0d7d34f6de2e31da1e9f0d03b58e8dd1f10c8e407f368e51d3b6e511386ee86e4602e7cba2 SHA512 a74cf6aefe43c9af71e0cfd15861e5cbb2b129891cea75a66663439c1e466782fbea0545ec8792721bb22932eb17fe1ac9dd074523dca54bce956c1f1a5e16a1
 EBUILD abi-compliance-checker-9999.ebuild 593 BLAKE2B 8f81e659becfd4de9a5d37655bcfef544e9a3c43f8a250edc91897e9c6f7ef07fbd3ebeb3df381904e4ea03ff26c2d40abfaf21640d5e815afd46835581dceb9 SHA512 73aa89f03caa5a7e4482024836743889cb75863bbc1522c2992f84800b7e1610da1cc770d69ab95e8a69b66750f1a4d12a3e7cc5a701bdc968b7282c7dbc75cd
 MISC metadata.xml 445 BLAKE2B 4a2c82729f916f7ae374040aa2e4008d45b0623fde7ffd41dbf54906690115441feb930695ee39c01cf3dd440d385414618781aa6a0d8a6e1e7a4256b668649e SHA512 a71d08620d61505c7cf7c6b56503c9275795980c97a1c4897bc20455674c60bd6b09bb5002a5faa0360be992fc775152c95b2a3366966cd7e636103e480d9dd2
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-2.2.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-2.2.ebuild
deleted file mode 100644
index 1057874dcfaa..000000000000
--- a/dev-util/abi-compliance-checker/abi-compliance-checker-2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A tool for checking backward compatibility of a C/C++ library"
-HOMEPAGE="http://ispras.linuxbase.org/index.php/ABI_compliance_checker"
-SRC_URI="https://github.com/lvc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-util/abi-dumper
-	dev-util/ctags"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /usr
-	perl Makefile.pl --install --prefix="${EPREFIX}"/usr --destdir="${D}" || die
-	einstalldocs
-}
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index b341ba014ca2..19de09637840 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -17,7 +17,7 @@ DIST android-tools-8.1.0_r1-f2fs-tools.tar.xz 93924 BLAKE2B b8b6c7ba4c3f5309bfcf
 DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed705975ad61f362d7b1c2252685a63a1ad6035f36b0b402f1857ac5d2635d35ffa10f05b4a2605f30f27dcc5e9d91930eb0656f3ce2da036d SHA512 8799f10b4dba840ecea8f6abb8166c2e137eb3f0d9c5cfb132c661cf17800f2eeaafb1b4ec9e8974fc3324fae99e3654e52397c987faf1d48ab6148152d84f11
 DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
 DIST boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz 13030361 BLAKE2B 6982416b6e193e7faccd41fff3bd35f80b11d7495251d876e6b081bd94a887ec3c6bf5b7852d9595594fc2bdc57353f268272ef01fb79f7c93b52d46cbda69ac SHA512 171b524b0452a48853b2c8010ff5e14d5d720e69eeaf1d3b79f675838f3afa94aee9de2f47b37303feb2d92cbf77639efe585786625b7b37b8cc2ba727c37fdc
-EBUILD android-tools-5.1.1_p13.ebuild 2088 BLAKE2B 5cb17a2be1150d399d12624525cdf1aabdc3ee4f775194c3c8a4aa1554e09fb8f3d3ceaa91469cd9fd576b292c69eb1b224c5980051d56b619fbd28daf99a955 SHA512 a557d31b6488a3a96164339f9e2508cfd71c6f749e5b3f7829b79bcba85ef75985e1865a9ce528556ef0976ebc1e2f52ae8c1368bc6f75bf78c7e70649327dcc
-EBUILD android-tools-6.0.1_p79.ebuild 2831 BLAKE2B 751d21e94536b18ba028038e264515b4e6c9ea89d94ea5a1350cfabb8f693380cd2940eac9f0acea3bca8d5d071c8621e9bd31308ce385055b47a674b4d767bc SHA512 034baa131865bfbcc2bd8d8eb894ecd62b2ee5535b29c2541e151705dca29a1e457bbbfbb5590faa927d3007e0358a79c496a985fb815baa46ca17cb55c4eb8e
-EBUILD android-tools-8.1.0_p1.ebuild 3980 BLAKE2B 74f5792d1fb1ea62086a0b3257a232c98afcf0ec6d17ad795c01d85edaf5a9fba478884b78c81b1a82a2ed01e23fa2e29db2801e30665b3ad63ae0573aa80555 SHA512 2fc66d84f177b009bf97889dc452d709fa59ceddc539204532d45b9365153428a184f18b3980982e1fde80e10d07fa652ecf764398bcddbb2e6f9f9b678fef3d
+EBUILD android-tools-5.1.1_p13.ebuild 2077 BLAKE2B edb2e3a9f69c2c8a4f86170b39aedb1f44b173df943b2edcb96f7d90384658c6689925e06873c3d5331c20f360732860f70e0bfecdb0d5518dfbb9d90816b671 SHA512 3659aca002096aa11dc94631de73f1081cda5a5728f2842aa767844b6b3e12e0bdcdd0abbc2903efbb1d9f11666e7bd392be694910ffae58fce1e8b52a8cd090
+EBUILD android-tools-6.0.1_p79.ebuild 2820 BLAKE2B a87ef5bc6d814ef772c3fe4292563c73beabd59cacebae706721d4019059be8b2cf31e27594c473abe202ed1f4afb78993ae3e947ef7c21b5016245797f90b45 SHA512 ccdd6e4fbc6a98ca0e9cfd89618c6a13e11e174abd6c6b3dd1d1b8f7a592a4574cf83e0f4770750918ee481b129d01425ae56fd55ddc323b3409add6ddf10279
+EBUILD android-tools-8.1.0_p1.ebuild 3969 BLAKE2B 804b060a8ad37b3d5929368dcf105e22760f20dff91ceef3b974c126e4968b655d0fdac614b3738aaf81da7f0878f25956d6c7ae4ec5d3158c844a65d7c88327 SHA512 adf32efb7cae22b50836bfcf2b33fae0ae518bb5289ef39051678e69260ee866d1a7b1b9b3d8a871131cc70e3a64a15dcd7ee57c5ecd7dd04922f87bc449b777
 MISC metadata.xml 643 BLAKE2B 99ac01fb57cc1d2908955720cd2fee6e97f98a19d9fe9bbbb07e0f9f915b7efca184a75c5f5eb5372b9c21d3ba7db542d061de47ac6f89e6c58fa3dc886d4f21 SHA512 51ee41cf77548eb1ce543b2c1f5f37e9634250c2fa42b36a8128b4a80a73a270b90b9e9e1c2c58d7aeb6dee85238ec73345f1a3a4ac398a4f7b2cd8e8c6e84ee
diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
index 7900622e6ed8..62e4096698a0 100644
--- a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
+++ b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
@@ -20,7 +20,7 @@ mirror://gentoo/${MY_P}-f2fs-tools.tar.gz"
 # The entire source code is Apache-2.0, except for fastboot which is BSD-2.
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~arm-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="libressl"
 
 RDEPEND="sys-libs/zlib:=
diff --git a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
index 3da6d296e886..6ad2b5147928 100644
--- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
+++ b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
@@ -20,7 +20,7 @@ mirror://gentoo/${MY_P}-f2fs-tools.tar.gz"
 # The entire source code is Apache-2.0, except for fastboot which is BSD-2.
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~arm-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="libressl"
 
 RDEPEND="sys-libs/zlib:=
diff --git a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
index a1e81887fcd1..53d0fe44f16d 100644
--- a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
+++ b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-2b7
 # The entire source code is Apache-2.0, except for fastboot which is BSD-2.
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-linux"
 IUSE="python"
 
 DEPEND="sys-libs/zlib:=
diff --git a/dev-util/artifactory-bin/Manifest b/dev-util/artifactory-bin/Manifest
index ca95351f082c..17855f0e2048 100644
--- a/dev-util/artifactory-bin/Manifest
+++ b/dev-util/artifactory-bin/Manifest
@@ -5,6 +5,7 @@ AUX initd-r3 5373 BLAKE2B feb7f637c644570225c589767753c27db59b10971ffe5f7886dc94
 AUX server.xml 516 BLAKE2B 6ed7e14de91fc1f7a9da25c8caeae4bbc25b783d84a321e69bcc897e5ef68002fa39bece886522f1833d9d4352dfa8391ec1d8c90f0a816beefec70b6afb8a05 SHA512 2c16207cccf29a3733e9759b0eb20d62184de6f91feb8f49037501e62f77ca09aefcd7a95a1544441318ac6a3577a3c366fc12d490726268233658581a64b91c
 DIST artifactory-4.16.0.zip 41455447 BLAKE2B 0f9f575d5ce3ba983c905e70c8e3545946065ff458f9a1c0f0e346bebeffe002bbea4214b7a23829e3a11d8ccf6aec4548f6ba5abd405d30165d3c07e2372e98 SHA512 e861b66ed7586ba881267312462584fd9037e2b72021e930a52489ae718ca2449c7997278cb26cb3dead774f16d74cf285c8ce2fca0c085e7edb444f71deaa14
 DIST artifactory-4.16.1.zip 41489457 BLAKE2B 7854710a5cf4dd52d7c92581a030259df6b0b8038f9843e528b0c57211eafd405a114b709ba5407a9c83e4d693f1ecb8eafe3d5e98bb22542d5c48e15bc3cf6f SHA512 b8f5441f011966837861073c928512704961c7683fadac4603f2177df1c64861432f894c5fe0669c4842a4b7d008553169e88aaffdde6e3d6e6bbdff6adf9d78
+DIST artifactory-5.11.2.zip 96724749 BLAKE2B 832fba6bec97e2974e3cb9e21542a76a3d10c1c6c600692cbd73b6452a50276b12b5081dbcb4a4fc0102e297657f58c77aa3eb0537e7423a480b79a8a1f957b8 SHA512 8c6d6305799631f430f7f7d74c4ef37e9a4cea50b5c3d50d44b37346a2296bd99cf96d09752006e61c97a6d6fea684183dc2b52d383810f06b3cbeabf41189ef
 DIST artifactory-5.3.2.zip 45729254 BLAKE2B 1fe6ec8a5a33d8735bd92d480e8fb7b035af2b27bf9034791f1bdca3c3d2a13794ba06613fb508ea8f221cc1647f2a8e213994ef7603d92c88b17037fd3c7266 SHA512 60fbbed97c9915ed4a7627a3b893fa6c5bcec695932415d3102b9788ba6182c8cef937ad48639d4398a682ab2f517771c3dcda9306842e4202bbd45ab4768f1d
 DIST artifactory-5.4.4.zip 76841935 BLAKE2B d763122cf0d2d1237fad41b825f68ecd6ec3c3453e5ec0a76a5b367c70c5aec4ee3cd81b9ab453628c879db22e0a292fc9b43d2b3d3d5461fc63d43bffde7b2d SHA512 f949e4c2ecaaf4581bc2e96058403684cab09f10b0bec512eda9b65bb41577a792b08d05f7a16e0e7f1614567dc9b0d1d59bb3c6ad6a4dafeb0c054a3add09a8
 DIST artifactory-5.4.6.zip 76857888 BLAKE2B 04185e4c585a6e8121b9b6d78a4565c5107381cae53fe3d8aea647ea6ebb0920f9775a7275ba79d282a0c87a7e0544f6382a2ed10dbecb6b279679be0fd94066 SHA512 08d7895dc823e61be83026d31eea387eb914f17cb2f13b03d5314c6473f30de9279d230d242d8160dba0d3c8f6981b25b5ad46f52ad12d1c39ee820ac7a676fe
@@ -12,8 +13,10 @@ DIST artifactory-5.5.1.zip 77406287 BLAKE2B be60fbbc3b8c61fc9d1a7272889219de7ea4
 DIST artifactory-5.5.2.zip 77438814 BLAKE2B b77d9348fbae8bf871e4fb6716e2a9d357cd0d268d65360ec7509b0999db78a8b80f68eb22cbbc0a85ee2980fbc72c7aa390a60c8129451506441d7cbfd9f776 SHA512 fd052e66316ec050599f6262274cdf5232ebb1385fedd2c19c6ba8e3dca0d9fe86d7a89fddbb8974b28e0f9dc3d7ccda1aac6b3f9159f0b77bfc51873ffd5e3b
 DIST artifactory-5.6.2.zip 91577071 BLAKE2B 1f9687bef239519171bdb28fb033368e5dea10186ef350c7ee7d9e4a33ce99c5e965692d8052d82454c83f42c84e79c18edafbb98540da4b818b65b577a9ac72 SHA512 b4bde9bcf53d2af6901a8e80827f3b09d685a8bbe7073badad586401b6881d046e5cade4165fa68843e981dea2912374c187518e29ab1ee86d3d0fac134a54f0
 DIST artifactory-5.6.3.zip 91592176 BLAKE2B 1214bac4d5bd6f15915e05a2e42de4b6b55b885210fa06ee4b4b63599b8f3c13c6fe46a04569e790ea6e274c4837a09b260736412805119e7f93f7867be8e421 SHA512 a2348b8667a1d936e90dc6fd42e3967f63cc88cc99bf425ea26731ff4c54f0177ea386c5b19be97a4ac8f89ce41e65237d14593112b38656d60ada45d3b62371
+DIST artifactory-6.3.3.zip 98166641 BLAKE2B 33d760bc0f763ba0d8e091ce5484b3a90df4e57f291ea7a96a69bed13579c3c17af0005f95dbda847b2ab428d7dc36ddbee594d008f6e3badbb04e45c3b5dd89 SHA512 12f545d5e66b70e35d8b9967baadcfb503df7457bc48957a80b38d447cc9f024ce8f33b2463da65f5616161906bc64652fdd042446c5e8615e24ecc7f23a527b
 EBUILD artifactory-bin-4.16.0-r1.ebuild 3336 BLAKE2B a7a6ec3cd771a42eb73bfb969162087ddd797f476031ca5b463fae39e2ab979bf786ff82eb2f013ddcfc1987d3fc1e7ca4a4de69e0dd210bc0745a3f888506f5 SHA512 f7297b2590d5329f851a9783cc066001b76734b8b7e6dc51d79d773d8d167e6d574a5c6ee8e2b4db9b53b4977df909eff796537fba815dd45752223e71b08852
 EBUILD artifactory-bin-4.16.1.ebuild 3336 BLAKE2B a7a6ec3cd771a42eb73bfb969162087ddd797f476031ca5b463fae39e2ab979bf786ff82eb2f013ddcfc1987d3fc1e7ca4a4de69e0dd210bc0745a3f888506f5 SHA512 f7297b2590d5329f851a9783cc066001b76734b8b7e6dc51d79d773d8d167e6d574a5c6ee8e2b4db9b53b4977df909eff796537fba815dd45752223e71b08852
+EBUILD artifactory-bin-5.11.2.ebuild 3336 BLAKE2B 57b6a9153b744428ef8ea398ac04e8e114e7472033ae1ad7a57c91c329a2e1d7bb474692e67aa95bc35d84a339b5c1cb597b965e30b001c8544b6fe65e46abca SHA512 b5253c320d7b699b41fbd6b9387dad3d021f3e6e3eadc6e94bfb175009514dcc0d1313b624362d72a34fc5f9c0d4190411d2ebcc5d3c5c39089bcc5f8ab5e6e3
 EBUILD artifactory-bin-5.3.2.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
 EBUILD artifactory-bin-5.4.4.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
 EBUILD artifactory-bin-5.4.6.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
@@ -21,4 +24,5 @@ EBUILD artifactory-bin-5.5.1.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d
 EBUILD artifactory-bin-5.5.2.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
 EBUILD artifactory-bin-5.6.2.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
 EBUILD artifactory-bin-5.6.3.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
+EBUILD artifactory-bin-6.3.3.ebuild 3336 BLAKE2B 57b6a9153b744428ef8ea398ac04e8e114e7472033ae1ad7a57c91c329a2e1d7bb474692e67aa95bc35d84a339b5c1cb597b965e30b001c8544b6fe65e46abca SHA512 b5253c320d7b699b41fbd6b9387dad3d021f3e6e3eadc6e94bfb175009514dcc0d1313b624362d72a34fc5f9c0d4190411d2ebcc5d3c5c39089bcc5f8ab5e6e3
 MISC metadata.xml 368 BLAKE2B 1a5f91a194a1eb7b58ddc795cae9c3e52b33aca6b716b286069b8185c2393bd6b5281219f4a0e6446c9a8a930f18168b0f5923df9423ffd6b20d0d7ec08c48c8 SHA512 889ab0f86261be62dc4988fc99c8526212c7936b3fbb8a078d644046047f653108b3120cef9cc65bce00a1c267227e58dae0cb1eb7d86ac1f4966408fa783beb
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.11.2.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.11.2.ebuild
new file mode 100644
index 000000000000..3079fc35b328
--- /dev/null
+++ b/dev-util/artifactory-bin/artifactory-bin-5.11.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Using a binary ebuild until a source ebuild is doable.
+# This was previously blocked by two major bugs upstream:
+# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
+# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
+# Upstream now releases source and instructions (yay!), but most of artifactory's
+# dependencies are not in portage yet.
+
+EAPI=6
+
+inherit user
+
+MY_P="${P/-bin}"
+MY_PN="${PN/-bin}"
+MY_PV="${PV/-bin}"
+
+DESCRIPTION="The world's most advanced repository manager for maven"
+HOMEPAGE="http://www.jfrog.org/products.php"
+SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="ssl"
+
+RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8
+		app-arch/unzip"
+
+S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
+
+pkg_setup() {
+	enewgroup artifactory
+	enewuser artifactory -1 /bin/sh -1 artifactory
+}
+
+limitsdfile=40-${MY_PN}.conf
+
+print_limitsdfile() {
+	printf "# Start of ${limitsdfile} from ${P}\n\n"
+	printf "@${MY_PN}\t-\tnofile\t32000\n"
+	printf "\n# End of ${limitsdfile} from ${P}\n"
+}
+
+src_prepare() {
+	default
+
+	if use ssl ; then
+		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
+		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
+	fi
+
+	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
+	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
+		etc/artifactory.system.properties || die
+
+	# See FIXME in src_install(), this can probably go away,
+	# but catalina.sh may need to be fixed for that:
+	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
+		misc/service/setenv.sh || die
+
+	einfo "Generating ${limitsdfile}"
+	print_limitsdfile > "${S}/${limitsdfile}"
+}
+
+src_install() {
+	local ARTIFACTORY_HOME="/opt/artifactory"
+	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
+
+	insinto ${ARTIFACTORY_HOME}
+	doins -r etc logs misc tomcat webapps
+
+	dodir /etc/opt/jfrog
+	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
+
+	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
+
+	exeinto ${ARTIFACTORY_HOME}/bin
+	doexe bin/*
+
+	# FIXME: this is called by catalina.sh (it echoes the variables before starting
+	# artifactory, as well as makes sure log dir, etc. exists). Those directories
+	# could probably be moved to the ebuild and the script removed from catalina.sh
+	# without consequence (and quieter starts). Would need to check if CATALINA_*
+	# variables are actually used anywhere (from reading code don't appear to be
+	# actually needed)
+	exeinto ${TOMCAT_HOME}/bin
+	doexe misc/service/setenv.sh
+	doexe tomcat/bin/*
+
+	keepdir ${ARTIFACTORY_HOME}/backup
+	keepdir ${ARTIFACTORY_HOME}/data
+	keepdir ${ARTIFACTORY_HOME}/run
+	keepdir ${ARTIFACTORY_HOME}/work
+	keepdir ${TOMCAT_HOME}/logs/catalina
+	keepdir ${TOMCAT_HOME}/temp
+	keepdir ${TOMCAT_HOME}/work
+	keepdir /var/opt/jfrog/artifactory/run
+
+	newconfd "${FILESDIR}/confd" ${MY_PN}
+	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
+
+	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
+	fperms -R u+w ${TOMCAT_HOME}/work
+
+	insinto /etc/security/limits.d
+	doins "${S}/${limitsdfile}"
+}
diff --git a/dev-util/artifactory-bin/artifactory-bin-6.3.3.ebuild b/dev-util/artifactory-bin/artifactory-bin-6.3.3.ebuild
new file mode 100644
index 000000000000..3079fc35b328
--- /dev/null
+++ b/dev-util/artifactory-bin/artifactory-bin-6.3.3.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Using a binary ebuild until a source ebuild is doable.
+# This was previously blocked by two major bugs upstream:
+# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
+# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
+# Upstream now releases source and instructions (yay!), but most of artifactory's
+# dependencies are not in portage yet.
+
+EAPI=6
+
+inherit user
+
+MY_P="${P/-bin}"
+MY_PN="${PN/-bin}"
+MY_PV="${PV/-bin}"
+
+DESCRIPTION="The world's most advanced repository manager for maven"
+HOMEPAGE="http://www.jfrog.org/products.php"
+SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="ssl"
+
+RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8
+		app-arch/unzip"
+
+S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
+
+pkg_setup() {
+	enewgroup artifactory
+	enewuser artifactory -1 /bin/sh -1 artifactory
+}
+
+limitsdfile=40-${MY_PN}.conf
+
+print_limitsdfile() {
+	printf "# Start of ${limitsdfile} from ${P}\n\n"
+	printf "@${MY_PN}\t-\tnofile\t32000\n"
+	printf "\n# End of ${limitsdfile} from ${P}\n"
+}
+
+src_prepare() {
+	default
+
+	if use ssl ; then
+		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
+		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
+	fi
+
+	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
+	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
+		etc/artifactory.system.properties || die
+
+	# See FIXME in src_install(), this can probably go away,
+	# but catalina.sh may need to be fixed for that:
+	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
+		misc/service/setenv.sh || die
+
+	einfo "Generating ${limitsdfile}"
+	print_limitsdfile > "${S}/${limitsdfile}"
+}
+
+src_install() {
+	local ARTIFACTORY_HOME="/opt/artifactory"
+	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
+
+	insinto ${ARTIFACTORY_HOME}
+	doins -r etc logs misc tomcat webapps
+
+	dodir /etc/opt/jfrog
+	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
+
+	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
+
+	exeinto ${ARTIFACTORY_HOME}/bin
+	doexe bin/*
+
+	# FIXME: this is called by catalina.sh (it echoes the variables before starting
+	# artifactory, as well as makes sure log dir, etc. exists). Those directories
+	# could probably be moved to the ebuild and the script removed from catalina.sh
+	# without consequence (and quieter starts). Would need to check if CATALINA_*
+	# variables are actually used anywhere (from reading code don't appear to be
+	# actually needed)
+	exeinto ${TOMCAT_HOME}/bin
+	doexe misc/service/setenv.sh
+	doexe tomcat/bin/*
+
+	keepdir ${ARTIFACTORY_HOME}/backup
+	keepdir ${ARTIFACTORY_HOME}/data
+	keepdir ${ARTIFACTORY_HOME}/run
+	keepdir ${ARTIFACTORY_HOME}/work
+	keepdir ${TOMCAT_HOME}/logs/catalina
+	keepdir ${TOMCAT_HOME}/temp
+	keepdir ${TOMCAT_HOME}/work
+	keepdir /var/opt/jfrog/artifactory/run
+
+	newconfd "${FILESDIR}/confd" ${MY_PN}
+	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
+
+	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
+	fperms -R u+w ${TOMCAT_HOME}/work
+
+	insinto /etc/security/limits.d
+	doins "${S}/${limitsdfile}"
+}
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index feb16200284f..89d6f0bc149a 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -8,6 +8,7 @@ DIST catalyst-3.0.2.tar.bz2 878157 BLAKE2B 3711e89be416cd79e98b25fbc432375257749
 EBUILD catalyst-2.0.18-r1.ebuild 3100 BLAKE2B 18f15c937c4f3fe3790ad0dd4f665b4c2a5c100ccc8e9669ded1e45bc24bbe8391fcc3a3b0d2f17b3a9494d2fdef529b387037ec7518796e045d59faf516fa18 SHA512 111606cceb268f3f4b8c51ed8d980ef440215d622a7994c773da7b3fe7ead0ad3fb32bd4eac1835bda1fad5389aa4c995dc597fe7ccc6f8b4d7871997df3541d
 EBUILD catalyst-2.0.18-r4.ebuild 3261 BLAKE2B 07fba7e944a03f7bd99c4504aac4014e515c667a6c4b05791ec059e7fa805cc648a228389045b13d71c39b1910fe8016bdde218cdc7b070a9bd7ac8beb8341a9 SHA512 19be49f4b0508aa4f091e5769463d52280693e5540b8ebda4d9745f24d16ba5a8e938081f1b345dfb25d3d7675f90d721c8fff928d3a4f7f40886e2b4cb14ade
 EBUILD catalyst-3.0.1.ebuild 1756 BLAKE2B c603a8fe69ae249700eb62e3ff45e338cf61758692cd6746d51833a24eaba10cc0b9d32deedbbf336efc1cbfc5571a7c40cde33be63191697f0cce9d3d4f74df SHA512 5f3c60d668c6aeb27987f32c71cfeee29d4a56bf3d48e2ea906527ef221638010512ac3bd00065591ae7aba71359cf2730078a33db883895d116fa95321519ef
+EBUILD catalyst-3.0.2-r1.ebuild 2038 BLAKE2B 4258371c0567fdb0e03e01862b4c544e78eb3ad57c875152c2b487ad1de2772d12d802cb09583248999f0858abaefaf8af2b3e2b7804d84e931c4c7be9087d4c SHA512 6c83767b736dcb2c30286517c494aefae6fe8c560561bc2e76a1e9b1bae0c2eea3ece78aa61700eb4b0fffdfee97d43a528d21bcb9776a5ebf9902e2a7c3a709
 EBUILD catalyst-3.0.2.ebuild 1991 BLAKE2B 320f68ea1cee53ff519006532321a8ecc695c1b547bf4f3d170a564eb336c430f7575effa03e112c086591c2f5fd18f817416e050a76e01769c4e282da1d1ad3 SHA512 a27092e4b8af69f20c08d3ed5f808e16b08a7fa7ebc09ed599e0dc0f3e0d969cdc8093995aeb245439a463a96fa44eeabdfb2031fec96ad442c3b0fb306b567e
 EBUILD catalyst-9999.ebuild 1993 BLAKE2B 055a409cbb3ac2c82f776c5613b0d9e09aee320fc6a9ad445f0738f10fb5334b2f49f975606203b6005370c568d5e1648aa9b286663439c34247c4eebce32081 SHA512 3e526426383b71b906be666f5cba15f8a9dbddf0836313acbd3ccadc08dad5bae445db81560a7e47bd23b1f2f6e7b885f6c677ce124a2782af4928a5263578bc
 MISC metadata.xml 561 BLAKE2B 34d8ab6f5f0a82f20cba329a4f6ece18577bc5de7ea9828a49262cc218a36e2a2d89c9043684daf048f9c1192a6950f652c275deddee5a6d8bc99cb7f61930dc SHA512 2e8a0ea51c2ee0ea20d1ef7be45fc6606a2b0d0f3a9b841227281a5453e79352a12b9f44424aefa6fba1a61113ba6bffb4cea359cd9ce11cf1a8ee4bddf331b8
diff --git a/dev-util/catalyst/catalyst-3.0.2-r1.ebuild b/dev-util/catalyst/catalyst-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..74acf27f4ce1
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.2-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-r3"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
+		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
+		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit distutils-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache doc kernel_linux system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	app-arch/lbzip2
+	app-crypt/shash
+	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	sys-fs/dosfstools
+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+	virtual/cdrtools
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+				sys-boot/grub:2
+				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+				x86? ( sys-boot/grub[grub_platforms_efi-32] )
+				sys-boot/syslinux
+				sys-boot/shim )"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index c0017e2edd78..5403300103bd 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -4,9 +4,8 @@ AUX ccache-3.4-size-on-disk.patch 522 BLAKE2B 6ec1f4cdb75d39997e16716caf3195c180
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-3.2.4.tar.xz 302548 BLAKE2B 7d642dc3f944183660e79cfdfd68948528aa3ea4ef8162a4d04837c85ccace35107e663ec81a15438dab133fca2e8bf100fecd483f33c9b0aa52c68989ae8122 SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7
 DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
-DIST ccache-3.4.2.tar.xz 324340 BLAKE2B e49582b4ff254dd4cd210634342d7b21d5c099892d4c7f3240122a3b9de013477f6c440eaf73d06fc0445020e225562528babfb41d10ca1fab68052c1e726531 SHA512 9bf07269df6785bb92758093f46f3be4df45de532e431e0bc3a68a7170d1782376a9b4495acf77569549062c84f61621c21c5d200e271cd064dbda4a73276f8e
+DIST ccache-3.4.3.tar.xz 328824 BLAKE2B f2ff3276cbadde642a362400b32291f59f60c274861c4c706f0bced801aec7aeeafeeb611331bc23e96fc8790a1d1ffd39df58f24f6a5384d8ddda0da54c9339 SHA512 8a92ef3f3b3688bb4c0b39106bea387ec3065a074327c1fa793e511192acd5cf9aeb5c0065ee8868a944ec63463c2b59fb84edd952102468cd12fcbb1ee16c49
 EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3046ec700266ccd3a1d44240e7a5cf0e24deaef38bad30f66d823488e8979ebe79a9668ff55c6a417ec048229 SHA512 965dcf43bd7999352de8aa6097e90418160cf4f51e4016113c05dc37d023518e22d001a2415ad7948c07e55ab57ae044021e7e4f044df127b81a12ad2bd37653
 EBUILD ccache-3.3.4-r1.ebuild 1907 BLAKE2B eb985796e32759c421dc13c1eed2d42af1b487eaed3a7765ec67ca1c909d9244f5eb14d6d643ba4f357645336ffa69b2e0fef01a6d9c8f20a984b046e541ec4e SHA512 2ee7fa571a5daa9649ee24fb7027da366181d0ca38ff3e2bf61358b5b461742625c80554575a55634f12fcbf515d7745bbf638b9ae38405499eb81039d4d199e
-EBUILD ccache-3.3.4.ebuild 2083 BLAKE2B c9ab28add0fd4b71ce98d2e5d6ad8fe6383c9d097438925f37cb7a61e6668e6ef9f517fa73ab7e69fed483948408bf9f782281ecc439eb14641f30193ac86798 SHA512 3e48057216c5618b26cdf5361fea268caae0814d7ee7cc5abfd54be4adfb3cfca7da171acda1f17ab2794478ba4c9b2721403023cc04fd468239e7a3a737378f
-EBUILD ccache-3.4.2.ebuild 1939 BLAKE2B 66a0eef49b7e59918703df2d1270f421d576858a1cbb37b9c4f285b6208b56e4dabd3fe650f3f7c734c3570e38e1082db18c37745246410cba1106338948de26 SHA512 4c9540d5c8c9d6e2bbabaf78f2656d32318387fb05995adb09584819ad5149e19473f32fe579d761bce7be79cbba9bd9aad0a7dee9852808346287adfa7ed800
+EBUILD ccache-3.4.3.ebuild 1939 BLAKE2B 66a0eef49b7e59918703df2d1270f421d576858a1cbb37b9c4f285b6208b56e4dabd3fe650f3f7c734c3570e38e1082db18c37745246410cba1106338948de26 SHA512 4c9540d5c8c9d6e2bbabaf78f2656d32318387fb05995adb09584819ad5149e19473f32fe579d761bce7be79cbba9bd9aad0a7dee9852808346287adfa7ed800
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.3.4.ebuild b/dev-util/ccache/ccache-3.3.4.ebuild
deleted file mode 100644
index e320f86f1d07..000000000000
--- a/dev-util/ccache/ccache-3.3.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils readme.gentoo-r1
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.samba.org/"
-SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-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 ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
-	sys-libs/zlib"
-RDEPEND="${DEPEND}
-	sys-apps/gentoo-functions"
-
-src_prepare() {
-	# make sure we always use system zlib
-	rm -rf zlib || die
-	epatch "${FILESDIR}"/${PN}-3.3-size-on-disk.patch #456178
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_install() {
-	DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.md )
-	default
-
-	dobin ccache-config
-
-	DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin.
-Portage 2.0.46-r11+ will automatically take advantage of ccache with
-no additional steps.  If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		"${EROOT}"/usr/bin/ccache-config --remove-links
-		"${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
-	fi
-}
-
-pkg_postinst() {
-	"${EROOT}"/usr/bin/ccache-config --install-links
-	"${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
-
-	# nuke broken symlinks from previous versions that shouldn't exist
-	rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die
-	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
-	readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.4.2.ebuild b/dev-util/ccache/ccache-3.4.3.ebuild
index 25d07d629e1f..25d07d629e1f 100644
--- a/dev-util/ccache/ccache-3.4.2.ebuild
+++ b/dev-util/ccache/ccache-3.4.3.ebuild
diff --git a/dev-util/clair/Manifest b/dev-util/clair/Manifest
index 053718eb5f05..0f2b2e747868 100644
--- a/dev-util/clair/Manifest
+++ b/dev-util/clair/Manifest
@@ -2,6 +2,8 @@ AUX clair.confd 75 BLAKE2B 8700f0e19734c3a6c0f0596e5fcbee5aafaf2bf19dd66fff0a94a
 AUX clair.initd 593 BLAKE2B ec5f50ef2fe997cd0f5e3aa7837be9bb7e39f4a5b766011034bde27c38d7eb32fc61853c8cc82d738724b4c6c5e01306c6e20c9968be0e4bbe8a5f4e7a79b7eb SHA512 827bf28ba4ad7a40f4eb916f315978da6d3fab52a8ac9b3316383d67ed90006f0b13e7cec3a8843d73e5d23ef27bcd53a9a02ec70c1795725cb98e5d1de788bb
 DIST clair-2.0.3.tar.gz 5194681 BLAKE2B b4f809e7699fbf66745c7f528f3f2c249e81541a64c540a8c39b9fa8f5b581d1297abdfe80bdb0ca3aec00010c6c95e8073397df284d2a92a3e95f91049cde80 SHA512 bf2d4ab15efc50bce3e828d0510ceb44463a6c1d978a854b3a05899996203a7c33bb6e60470eccb6e0a1e23b8ff41955cd0fdda4b77a9a7e042e1e27dd2e0885
 DIST clair-2.0.4.tar.gz 5194393 BLAKE2B 631ab14acfcf516a5dd65753fe2088dbabf1c7d13a6b079cb09f0c6a3000b346da948d9c6edd16c999753342d67b9bb2165a1b38956ee8957b48953d10490430 SHA512 fee3b9fe2865c0e352b454767383bf47d67bd14f7d08171197350c20f32bc80eb318db10c9fd4bd9da0024dac97ae287cb8dcc7605c3094f4d567122bfe3f7ed
+DIST clair-2.0.5.tar.gz 5194565 BLAKE2B 19eb49b5b3d4d3c3694c4aefc21abbdefbc5b6d3a53a0f845c587bfc98052be93bb83283b0b3fe42a5ed950e55390810032abb4ae4eba8de999f99f07528b1a5 SHA512 551b006c32f6e0c93f2ace33151864f876a7e32c85cf13d8e1dcf23b91f79c32d4b4a4c9bbb3991ff6955897c8dcdfdcec2d6fbbbdcf0b684522375269abca89
 EBUILD clair-2.0.3.ebuild 1064 BLAKE2B 789ad8bf42f99a85dfb47453d2bd2b042ebe4d67235a581678240b46f0fe823adcb00abc2bebc4c3d127893be78ab8b5804712c275d7b7ff7655b86859a15089 SHA512 543dbea35a7de36d1e2cc0a1b3f87b9e91ca647dc642eb0b8cd1f8951b1394149d05a6bafddbdc5c11a9af0f6c6a96cb1a6cdd3a470514f456706a4d2cea368e
 EBUILD clair-2.0.4.ebuild 1051 BLAKE2B fd423983af317557ced44c635bed120ce04dced81b8334336d3d1c0746892fbb2f39f8c096e89ade770b1111ab9dbd84748b1a0df02209defd05e3867e618f07 SHA512 bca22ee73de274eaa86d7442dfbbcc0ba9fdf9daa2cc8d851fff56e1cbfbfdbed5f4c75b186b6c8f1ab12842bb8a587a6d91d6246aecc32ea658f4ffda015c61
+EBUILD clair-2.0.5.ebuild 1051 BLAKE2B fd423983af317557ced44c635bed120ce04dced81b8334336d3d1c0746892fbb2f39f8c096e89ade770b1111ab9dbd84748b1a0df02209defd05e3867e618f07 SHA512 bca22ee73de274eaa86d7442dfbbcc0ba9fdf9daa2cc8d851fff56e1cbfbfdbed5f4c75b186b6c8f1ab12842bb8a587a6d91d6246aecc32ea658f4ffda015c61
 MISC metadata.xml 322 BLAKE2B 0f3b559d05cfd49e83c1b71381ee3775e83420f601ddd1cd47bc9211ff4d08831992418e4869f02fe73e96ff9089117fddce8b980c0282b44e408eed9c3cbcb4 SHA512 7ac0fefec4d71b29fe295ebc41df72ff0d80ba327104ca124bdd700ea054c477ba6a040fcdce6fcae38ec437703ff31ae36a2a7c5683420c39db20d775e52919
diff --git a/dev-util/clair/clair-2.0.5.ebuild b/dev-util/clair/clair-2.0.5.ebuild
new file mode 100644
index 000000000000..1cb27791309a
--- /dev/null
+++ b/dev-util/clair/clair-2.0.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/coreos/clair"
+EGIT_COMMIT="v${PV}"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Vulnerability Static Analysis for Containers"
+HOMEPAGE="https://github.com/coreos/clair"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-arch/rpm
+	app-arch/xz-utils
+	dev-vcs/git
+	!!sci-visualization/xd3d" # File collision (Bug #621044)
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	GOPATH="${S}" go build -o bin/${PN} -v ${EGO_PN}/cmd/${PN}  || die
+}
+
+src_install() {
+	dobin bin/${PN}
+	pushd src/${EGO_PN} || die
+	dodoc {README,ROADMAP,CONTRIBUTING}.md
+	insinto /etc/${PN}
+	doins config.example.yaml
+	popd || die
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 89102f422604..e6f01b0b0cd4 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -18,9 +18,9 @@ DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f68592
 DIST cmake-3.12.0.tar.gz 8089372 BLAKE2B 73c36b65ce3a3e7377d4c7dc7ec6c9050adefab75a0c0f245d7b1f774951779a213de13fb8589f209bd9b74b912b3f6533fff7b16990a85ec0159ed6a1460a2b SHA512 e1d5764023d6c8dd4e8d087614e0329a097f1bc587c08c7d22ce7600867bcd7f6750d513458c7c4042570a9526060b89778243e6ea6137efb1727e409ca031ab
 DIST cmake-3.12.1.tar.gz 8090272 BLAKE2B 081935b05bca26a0e4d515da9e76b62781d7bdbe00dc37c170b4905e5d3b1cffcb81d7a4ae1d1226034ffae927dc678a718e684a286cefae7278e988db284507 SHA512 7a0a769ef060785a8dc8c6aa272435a90a07cc8079f6c83c916da0b79d8bcdefca0d7be21f55f408ab4dfa6a57caa9ff8dec4be993145f4e3337ff392481b692
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
-EBUILD cmake-3.10.3.ebuild 5861 BLAKE2B bdbeccdd90de52f183d7a23bc70acc9bf181aec56d1d6515b0fb83d671f653acd24e847ca2eade51a083a31e2fade346d15922fba91e509596c0b312711f8115 SHA512 8661df8a255c2c7ead3c063bcf60504e587b8dde21e505e1adb5881890b4be47e18c67aa65ad14de514a2884459510405ec9656c77341d00dfe76dba4ee9a9d7
-EBUILD cmake-3.11.4-r1.ebuild 6238 BLAKE2B 2d2c117f9cb6725922d22ee5c8945a6f0d2b4a64128f6f9f25433cc18e3b2544588f9a138ed3004fab5ceb0340b0ca242e90917eba81eb258d1802fb15c4e489 SHA512 dfaf2287e51e53c6ffc60aab40d6e4bbae036bb4f494cb3379de76ec4cd9b671a8ddf724d4e31a59ea98900354639c74883050ef319ce08e6217f9600ca13925
-EBUILD cmake-3.12.0.ebuild 5989 BLAKE2B 03f23bb64dad0671acd2c783417ace7c0606bfabbef079b69986d5ee2bf9401918f60c39250807d9f291b1aea9a0c93b74a6192b6d291fb12cd97ce07b2e8274 SHA512 e774802f962d6eb9717e1f99af8e5b23c9ed6ca46bd619d1305da0f745bb2b0ab231f0c90ba1155346bef3088bc3ff36391865abac32418f4ec9abcdd8f34dd2
-EBUILD cmake-3.12.1.ebuild 6014 BLAKE2B cc7c6471cd77cd644114576616d2a8efb5517ea896e49730ca63d0323e3c001a871133946e8cffc41551d6cc2199446966510e151cd269f9cecc2753f02b9d28 SHA512 7375a6452277d1c52e03de09b19dc77e9d0e32407fc9cc5e195fe17c6beca9dbdd45fad2178e8a30a13c4dc5d98145afed77b770a4dc2c15ecd318f0bd2f9850
-EBUILD cmake-3.9.6.ebuild 5952 BLAKE2B 2b0c0bb6a20b30aa3b2bb5f28112423253021ac94b36ad8a1ac9bcb62a1da4fa53fb4693f460f47cc374cb0915b0e5c4e7b1f8e7d98a2b3254bb225ea2ee0fbb SHA512 4517b5a521bd3ca9dfd0b6085637a5591f6728b291bdebc4f1ae1fd37d549365866573e51803c363e3199db46a8677263054b01daeb98efa7e10009ff95b485a
+EBUILD cmake-3.10.3.ebuild 5850 BLAKE2B ac06e0efaf6b8cf93617c2690ee19313df282e7707c1b313eb69b5a0e0d40d2e1431cb62fca9539281fa15cd63268e84d0f5bece3d9217334724cb9689f98bbe SHA512 721359c13d244b30fa47a9b9c30a91225fe25eab866a5d3b9b7230f4127be30b77749a90bcbbef768ad709ef3bf5b0f13c4ddb862c293207bb534a7f4ba3e87f
+EBUILD cmake-3.11.4-r1.ebuild 6227 BLAKE2B 1ff1b9195e39fda2b03e5dc5d2148a53b959469b19fd7d423d5502e41c72a6791dba00302dab6d241fca639bbe80711d3c0ad77eaea2ff5aea7b621cb72d77e6 SHA512 7896c37bceb3300d554ec654b4500abc2c8d4a08af8b11bc488351e39652aa6b54d02e563f4de01c6d2d73f59b3545810221f3e35ab16883d50574b1bbff0af8
+EBUILD cmake-3.12.0.ebuild 5978 BLAKE2B d7631dd04140f5439ff82e2bdee9d9451b37bfa0417898fd7e18794fcdf926ce6aa53e43ae5e15f4832ac4b51d0b0bc695796a4fa5d0099f4a29ad1561b87873 SHA512 328a800e71062bf9ff732feec3921e92ebac749693aa852830aa5596c5b0072f1b41dcba0745f6864dc12ffa48213f2b55af7c33cbb0e4abb8363aa36627873d
+EBUILD cmake-3.12.1.ebuild 6003 BLAKE2B e16c5457ad5fb9a8ff562258dd6d42426001cbf579a00b7d9af982f43663358c418cf28165836382d63e6a1ddeae7346c7a012501f288c42de67ef2e48a31fc1 SHA512 a6e8eef0d87ddf880ea0c19058f16dd544ded44f198a14fc9dbca05802e5f7d2ec728289424fd498fed63578919c1d8bc5c31c14afd11134ab65abb60f63e6c0
+EBUILD cmake-3.9.6.ebuild 5941 BLAKE2B 6fb4f6d9adae179fae54b1e5745db1b584464c19483ea450b04f3dbf47e8d5ef45800fcc8a33f1dce1c139e0acf302aaa4fb190e097e521cec14540aa8ae9c49 SHA512 cb45d92c42aaf89ac39fd786442c2cd5d8f1316d591323fe7ea23bf6c4a27fe18424d55a02093333abf851cbae7f965c0c2c899118464b51a567738a5d6cfd25
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.10.3.ebuild b/dev-util/cmake/cmake-3.10.3.ebuild
index 843a7d270713..4db91c1c1979 100644
--- a/dev-util/cmake/cmake-3.10.3.ebuild
+++ b/dev-util/cmake/cmake-3.10.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-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="doc emacs system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.11.4-r1.ebuild b/dev-util/cmake/cmake-3.11.4-r1.ebuild
index 6e13be1ef965..c6d6affe7043 100644
--- a/dev-util/cmake/cmake-3.11.4-r1.ebuild
+++ b/dev-util/cmake/cmake-3.11.4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-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="doc emacs system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.12.0.ebuild b/dev-util/cmake/cmake-3.12.0.ebuild
index 08668397d3fb..b39aafffcc59 100644
--- a/dev-util/cmake/cmake-3.12.0.ebuild
+++ b/dev-util/cmake/cmake-3.12.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-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="doc emacs system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.12.1.ebuild b/dev-util/cmake/cmake-3.12.1.ebuild
index fb16015bae1a..1d2802087662 100644
--- a/dev-util/cmake/cmake-3.12.1.ebuild
+++ b/dev-util/cmake/cmake-3.12.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-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="doc emacs system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.9.6.ebuild b/dev-util/cmake/cmake-3.9.6.ebuild
index 3b09404e21f0..094197a70634 100644
--- a/dev-util/cmake/cmake-3.9.6.ebuild
+++ b/dev-util/cmake/cmake-3.9.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-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="doc emacs server system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index fbf85517b8a5..e9b6bda9e5bd 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,5 +1,5 @@
 AUX debugedit-5.3.5-DWARF-4.patch 3235 BLAKE2B 6c12d8dc99b746fb2b5b813fed429f94cc4b0e737a6cb287f4741705b94782ef9bfd2a87e3284a63ddba20961d0a676823ac4145247edc328c46087d95842a2c SHA512 594bed4c2433e15c840316ca132619fc2b65ea5477cfe416ef851414d44932b3f8e75d006025eefbfc9c6cdcea956ff9ffc28dd4ef4fe5858a486ce5d08f43af
 AUX update.sh 1690 BLAKE2B f2f913fbbc3e06f1ee5ae8423253c67080471dfb0176e6c1b4ef3665a7b3b1ab24d7811ea8611c8afbd5b56072c12c0b97b08f87faf176d160ecee19f57f624e SHA512 5b271427d6391f717286289c5ec6eb794e99b7f0bd966100d3db03f84507000bc9256526f4ad6cdf809ff1800d53d5ed64d76bb14733507563d7a6123c9fc422
 DIST debugedit-5.3.5.tar.bz2 27799 BLAKE2B f81b39122502afe66386b962d0e50e9a16a314f31acf2a44c6d53f16d24ac91b62483a67fed43d085c3dd573adcd312cbb5e15c214fd8f00bc5415835c2caa37 SHA512 afac800a8f2e035705fcf997500d8fd2c3dc658850f47754863e8811db97859748721c5a252cc90dc81d07bf08763a9507e2272e983ee3f6bf16d8016fe5b8c9
-EBUILD debugedit-0.5.3.5-r1.ebuild 948 BLAKE2B 1a5a19e80f3491a726caa708f13047069c4923a8829e99f351d7f823d1233cc9e152ab7dab992abcc9f8bc527dfe43bff45bbcaa7d8ab61503a1da1357a83ba1 SHA512 6660837428c4aca44724a4de55239ee5b71b16ac809e586378f37778ff058319e327715b89bb5fecdf850d259daae037544366957856db76b3ae9e9807c3f547
+EBUILD debugedit-0.5.3.5-r1.ebuild 937 BLAKE2B dc741f4fc4f880fffe5775067878d47e357a904acc79bdc69d9d5d7f2f95fcd41f5de34022cf73eb396e9a0d9813ddfe5245724830b069c1cc8d80ab6d462b83 SHA512 7553d4e2fa0ca9c2d65b52636af1ee775eba337bbd7313bb63f6392dd6db140fe81eb513d64b89a4bc07b04b7d80b2f3f24be13b76001f15dff057a7f62de407
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/debugedit/debugedit-0.5.3.5-r1.ebuild b/dev-util/debugedit/debugedit-0.5.3.5-r1.ebuild
index 2ef416c8ba0f..0f558d0076a2 100644
--- a/dev-util/debugedit/debugedit-0.5.3.5-r1.ebuild
+++ b/dev-util/debugedit/debugedit-0.5.3.5-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://dev.gentoo.org/~swegener/distfiles/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-libs/popt
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index ccc76cca2cc4..cb77c3b7869c 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -5,7 +5,7 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
 DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
 DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
-EBUILD gdbus-codegen-2.52.3.ebuild 1311 BLAKE2B bf17da01f79eb6b14738251e89bfef6cc4d7b3fec8fbe09faa0cb7e72dce085f232d558ab42c55a7683399a9f1ff91f30fc0c6265c9016b8e6c0cc7249e04253 SHA512 610cd17bac301bdba9e7fefc019da8aaf1157fedfa0d1e6b05310794fa8e7e757aee22d12520725612cb2b12c7c8e56e63b76fdd1c300d1d4a6f302555ee6bb2
-EBUILD gdbus-codegen-2.54.3.ebuild 1303 BLAKE2B b0e9e2582ee7f4d9fca636bf37a87a48bb596c9c3c196c0d2233c03e1c989d455524a99a516190b06dadedd72223f44b16db4c024853b4b3c0a0f58e2732aec1 SHA512 f7bd9a848fb0b32153545083876663d1f8d11a85bedebcae7bad7dede1b0f47e6455beb30dffb2cf5404563c24b585958e03d5fe71f006625a7ce3858346f36c
-EBUILD gdbus-codegen-2.56.2-r1.ebuild 1331 BLAKE2B 2637d705951b179a8ad0691a732257780bbe356f78b5a2ade116fc8884a7224c3305f98f239942bd13349dae8f74dd9309a75df63043b0d2b992f8b2bd8d8c40 SHA512 5d8e66202c15432bfd1eeaf0cd23559bbfe9ac834a60dc95d42b6ff07a2ebfd326a2f866efdd99dfeccdc727add74e34f11b7f8f8da6b55fe91cae8e096fd030
+EBUILD gdbus-codegen-2.52.3.ebuild 1300 BLAKE2B d12be53feaf81713fb6751be44aa4f0bd28bf3a24026fbc9660db984b5fa5812a61870f19eeef6d2bb3f7292454f885cac1ff85f3e7fc31852a1b7e8df63b0ac SHA512 5627b321d5e552b3362bb13cf639fa56612f9af8f69368f3d2853bb1166c9c33d494e7a5dfc024f9d766758360b8586d4921d53759441a1c6001bcf37542334f
+EBUILD gdbus-codegen-2.54.3.ebuild 1292 BLAKE2B 768770f538d5520ff22af528ce5ee0ec6483cd33a9564853033f05caadbc834239fe2a198760d24bcc8dbb21ec127a5bc1f71319a023b8e8f595bb7e82cd5129 SHA512 56c148582a8055d39827632c3f89947fb9a57b9061ccc29e0c5aecd9770407bcba371d71a8c8c6e0d0542ec3b193eb4e596153f2732badf540c858ede1a57454
+EBUILD gdbus-codegen-2.56.2-r1.ebuild 1320 BLAKE2B da4d2559ba52667cce4e0fbcdcac825774f36f0234d38bbbc10f18ea1ba6d2e314d60df61b16b02dd40410db5dacf2a088940b9e8319093d06e1506f14afae1b SHA512 54d063627724e94cee970412ed5ce1602fe91dd3ebcd9b2e71a848815d5d7c3dd2f2422ea8c675687deca557f749e45671bc0a1094ae4fd87786151329a5fa0c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
index 1b9457f3208b..1b6ca98b5f63 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-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 ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
index 1ac95b47d966..56bea99d5dfa 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-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 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild
index d913496897eb..deb79385d3d7 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-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 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index a81ac96619c1..f4bfa60f2f15 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,4 +1,4 @@
 DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
-EBUILD glib-utils-2.52.3.ebuild 479 BLAKE2B 470fc81c8c561d7877c888eb94a91a161989f47935ff9f709843fda0cdde77402cd672efe94a55fa0bee649553749612b1273e0391a18607108c5d7837299c1d SHA512 d6698c0a179f0bc645d74e205601a175ccf95e63cb0da8bfe2b07a2c8d6a4222a69def4d9dded8c7f09b435a1b7d56eece1bf57612d12fa47a743cff3225d5db
-EBUILD glib-utils-2.56.2.ebuild 1300 BLAKE2B 5df0d0cb06c47aad00450271a5734c97303b0558f89dfee7a74d2424640c69f6f9fabbde97d48bb60229102bb52ed16ffa6be8ddbab7709be2ffef7c6384b42b SHA512 ccd4fedc7f346460f429cd4169f5eae76c0638a778f54e88ca974033f9a965d45b34fa9798580c61422b30e0f40c2cb78b83856e6f70fda26759ac9b918131a9
+EBUILD glib-utils-2.52.3.ebuild 468 BLAKE2B 862493f148a7e42e6f7aa1e52ee0eeee924889c528b60da5d7ad1908f547cd1434a7b590cdf6c50b6693cc94f5749fa14a4a591e9ec9b00fbd6f6825bdc8e217 SHA512 0320dc667f5e53e0fa68570316b3432c9b3b7d3ba25bd3ecbd3641bead76204c066af0f54a436daba81dbdfc8067a656def6e71942eaa3c1a814e1669fc5caba
+EBUILD glib-utils-2.56.2.ebuild 1289 BLAKE2B 946b5b18db137b21ea2b4d77a685e40c6bd536ba5281079720a68cc485082b42d7952ef6c66a93fea74e1b2439ed6b26cb1199102106b2ffa62579a141e45d08 SHA512 9113b1679bcf2f4a7b409a4331d5908a8d62109f0c56a42cfa93a0f062896b95b31410ef85dc1ecab924f65c3bde6bf61c4299edfdc243bdd375662037700c48
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.52.3.ebuild b/dev-util/glib-utils/glib-utils-2.52.3.ebuild
index bbc78a7fd93d..d87dee708d85 100644
--- a/dev-util/glib-utils/glib-utils-2.52.3.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.52.3.ebuild
@@ -10,6 +10,6 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 
-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"
 
 RDEPEND="dev-libs/glib:2"
diff --git a/dev-util/glib-utils/glib-utils-2.56.2.ebuild b/dev-util/glib-utils/glib-utils-2.56.2.ebuild
index 94ec6c5e79f8..a8e60e261bd4 100644
--- a/dev-util/glib-utils/glib-utils-2.56.2.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.56.2.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${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"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 953c8dd871bf..48d1ad19cfe1 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,6 +1,13 @@
 AUX 3.24.2-jedi-fixes-1.patch 1224 BLAKE2B 4e3ea7702ddc69f892522596c9ff33495556b2d3cf1bcc2f09db7773d6f833b39e3a65f26813b1c75255c60ea5b0f0477439d25e7897f9d45baa84e6166f8d11 SHA512 f46e3a2e5128873bf8dc2ece5bca060d4d2dc936ce21127ce023f606c4841f888b5acaedf5500c1a5e2af634f12d1594e7dbb3480726ac871ca73e47c6fd0639
 AUX 3.24.2-jedi-fixes-2.patch 928 BLAKE2B 8fb3e4bb34217309475431ea66f24c003e27a89314d1eafff37b11eb9f79c76b7bddb78899e9cf78215dd72e5da27e6f416757db40921f06904ec6a215ea1dd6 SHA512 e5b08a6ad2e182e9340d49876b0ee61f9a5e97abb8c31361ee5058647490894b741250c0850adfb18f93005ccebbbbff5c0ca6fe75f61d1895816f33e4801af0
 AUX 3.24.2-jedi-fixes-3.patch 8966 BLAKE2B 9dc40ddc73ae2ca5b0cbb6202391eb3aa550771dd65f7fac84e724d207c5867129c8607417279c78aa469234e62a3e1f62cb294701948b5741b06c4a0aecbf9d SHA512 5481e325a338cea5946a4515e8e532c8d516b0f05a2f3c7ad33dc3e9bbc83024bb8ceb2f0913b1795fdc57e856b37ccaf314e05b414d27669a4819b63747f255
+AUX 3.28.4-fix-docs-option.patch 1504 BLAKE2B 8a20eb2f54661bb21c395c5a056a38a5a436d0b16eeb0481d1b77785c0344f1ad36f9e53beaf7eae46c7770211c7ea498edbd678c11b8b48221e375e175563e1 SHA512 ae8873baf05ad04d8fbd22d31f8c87fec0fa0daca5a382d4d8edd955a3fda9e795b611449c4d6de82ab732a76425eeed734c9e9d840b792246fecdd7abb1fc80
+AUX 3.28.4-fix-tests-schemadir.patch 962 BLAKE2B d027e41385f37239ca8a7c71b191a22032d15382bae093fff839edfbeb28df10e6fc86b15731f16a691a912883edb9daed3f623e573fd679edf8a8d2f3fc0ca2 SHA512 94da1944b15f7c10ec88b1ed852407f89d4018ea96b5f4037471e1b008ff66150e824341cdce94d914047c0dd8e46bc929712a50c59529037feec77a365f3650
+AUX 3.28.4-jedi-0.12-compat.patch 3659 BLAKE2B 9d259cf65c6cc3c164615af1cdef288fdaf5e39bdd23823119d7c534234a396a9acf07a0bfa217b66dd10281e21726b81001f4a51b429cb16d9f3fe1b986c94a SHA512 1c70278890b833dd6abbaaf526f5208c0cd6faa14a3333d2140d1fc363c04b43a46cfc3c9c7bbbd70eee5fcf364ce42115bf5902436aad1b0d64077179e514be
+AUX 3.28.4-python37-fix.patch 2518 BLAKE2B 6e9025560bf84accee9ed8b88af65204342eb16eee657b5ce43ec20412d3cb62e6a024e1243370d6cdc29721ed91e4125c066ca7dc9818b0c9ea41341b60ee53 SHA512 8e4bed650f19c45811396977ca0c366059dbcf12a3247e1662e902699cbb96c20741b4d39f399cd34cb5dfbbfa96f85ee0a3c64a36bc85c39f7a483707d25f58
+AUX 3.28.4-valac.patch 559 BLAKE2B bf7d217ea0d9432fe27445c0641f92361577deb50d81d5d52fd1b5c40d088946c05d2525e7b0a876681e33da65ecc7df8be417910a3be1a92c425479879f573d SHA512 98923a2db0c370f487d364ad909b79ae2e11bba680c89f61808a1708170f05a9e8171512914f084b583190a5b4b22f6386f38f4420e31cb9ede2ed361ccb4366
 DIST gnome-builder-3.24.2.tar.xz 4342908 BLAKE2B 5dca80d2e948041bc096fa9a2a5d39322c6fedb0560e3e4f3c60c7b0657c7c62e89387a63f7d050c3df90d8c129485bc5495039802548b22ae268d94c14a37ae SHA512 dec133ad3c5ef96a036598ebbe684667dc44f73d8643e700f1e776cf8eb860b99c1d333f1fed5bc896cb7bdcf607eb51fedb7bb1f5b0cc662e4b2703d74140bf
+DIST gnome-builder-3.28.4.tar.xz 9309060 BLAKE2B a4402452ffaf64cc767edb9cba65b74a88cb77d04ca2ffecd3b01c53382930891c2c03e2528861f4d28ca3643465b6767235e945f44cc37d2d716bcbb3ab25c8 SHA512 ef83b909f295d83478aa7d5deb8b5d8291ddf6134e147e88452cdba8ff449a2415d0381d63d3f82cf28942b1096a704de64540c8cdf5f06c21c8278c93fbbc03
 EBUILD gnome-builder-3.24.2-r1.ebuild 5195 BLAKE2B 2d9dbfd2abcf2261221ef5310853501d93f64db9e235a0b0b1b843a754306033dd26ebc239ef46ee05d8109f35f85055359fc2ce66ea6bf2007dea80f621b3de SHA512 ac2295cdc97874f921a65cf6cd5f766b9deb94dd1cd171e8d0568964c0d2f9e5aa8addeb6410af5174c2c6f636332cfacd171c3d2862bb586baaf0e0bd05e227
-MISC metadata.xml 1011 BLAKE2B d6099c6cd5ffaf091f2ee0e07e261caacf0283aa18dc6be22a617b95236131e831d24f36bbc73f86edc66a3e6fe74f5102d101c9736d5d992a80929a68ac2100 SHA512 b3519707a4023a6c9892827abaf6465e28dbad2f1a8c2760a3f2d9b34d4be384d10326870e0d7952b41cb725c955cc838092786543ff1867db4a3acf41cb404a
+EBUILD gnome-builder-3.28.4.ebuild 7619 BLAKE2B 8ffde3811c0c1cff1c1a7932757bdd65d58fae0c8d56b5a31cb6f9d62b02719b2eeb5baa8ebbbd6a675f6ec4b2f1befe8c97ab20b5a49694f26d3fee5c21c13d SHA512 f0cf0d8f16abf490f3edb6b5371f5e6c04f8bec5fd84f9bf09d06f62d4241b89c56a78bccc0b4c7ff90b16fbd122ba0256fccaea73ab2ef397c1fbc7d2df0374
+MISC metadata.xml 1114 BLAKE2B 34d8dba8d48edca606ec56c996b93a6e47736e5d92aa20b71bf8f2a4c46cda82d3023b4c253357c7126e91ece1d12d9043cd020a2de2a5390ee984f97be4e552 SHA512 1882f56d3f5f88db34f37559f4f64bcab0f01e9496c4316358229e5662347f66ad2eb987571df8596b12a4170cf9ba5a2a41d39d82f1687d21753b1c5716c2a5
diff --git a/dev-util/gnome-builder/files/3.28.4-fix-docs-option.patch b/dev-util/gnome-builder/files/3.28.4-fix-docs-option.patch
new file mode 100644
index 000000000000..ca2323f314a0
--- /dev/null
+++ b/dev-util/gnome-builder/files/3.28.4-fix-docs-option.patch
@@ -0,0 +1,42 @@
+From 054ef6d2e47da9f41e7c24908b251d074e11a03b Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Wed, 8 Aug 2018 13:03:50 -0700
+Subject: [PATCH] help: fix get_option() to check for proper value
+
+We want to check for help docs, not sdk docs. Also, if enabled, don't be
+automatic about it. Fail hard so the caller knows there is an issue.
+---
+ doc/help/meson.build | 18 ++++++++----------
+ 1 file changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/doc/help/meson.build b/doc/help/meson.build
+index 1336e6a26..e684f078c 100644
+--- a/doc/help/meson.build
++++ b/doc/help/meson.build
+@@ -1,15 +1,13 @@
+-if get_option('with_docs')
++if get_option('with_help')
+ 
+-sphinx = find_program(['sphinx-build-3', 'sphinx-build'], required: false)
++sphinx = find_program(['sphinx-build-3', 'sphinx-build'], required: true)
+ 
+-if sphinx.found()
+-    custom_target('en user documentation',
+-                  command: [sphinx, '-b', 'html', '-c', meson.current_source_dir(), meson.current_source_dir(), '@OUTPUT@'],
+-                   output: 'en',
+-         build_by_default: true)
++custom_target('en user documentation',
++           command: [sphinx, '-b', 'html', '-c', meson.current_source_dir(), meson.current_source_dir(), '@OUTPUT@'],
++            output: 'en',
++  build_by_default: true
++)
+ 
+-
+-    install_subdir(meson.current_build_dir() + '/en', install_dir: pkgdocdir_abs)
+-endif
++install_subdir(meson.current_build_dir() + '/en', install_dir: pkgdocdir_abs)
+ 
+ endif
+-- 
+2.17.0
+
diff --git a/dev-util/gnome-builder/files/3.28.4-fix-tests-schemadir.patch b/dev-util/gnome-builder/files/3.28.4-fix-tests-schemadir.patch
new file mode 100644
index 000000000000..3c427c415841
--- /dev/null
+++ b/dev-util/gnome-builder/files/3.28.4-fix-tests-schemadir.patch
@@ -0,0 +1,26 @@
+From a66b2d99f21bff6986b0dda5b7cc9ee393be934a Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 29 Aug 2018 12:30:14 +0300
+Subject: [PATCH] build: Fix GSETTINGS_SCHEMA_DIR envvar handling in tests
+
+GSETTINGS_SCHEMA_DIR does not support multiple colon-separated paths.
+---
+ src/tests/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tests/meson.build b/src/tests/meson.build
+index 646f6f875..42c0e6d28 100644
+--- a/src/tests/meson.build
++++ b/src/tests/meson.build
+@@ -16,7 +16,7 @@ ide_test_env = [
+   'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+   'G_DEBUG=gc-friendly',
+   'GSETTINGS_BACKEND=memory',
+-  'GSETTINGS_SCHEMA_DIR=@0@/data/gsettings:$(GSETTINGS_SCHEMA_DIR)'.format(meson.build_root()),
++  'GSETTINGS_SCHEMA_DIR=@0@/data/gsettings'.format(meson.build_root()),
+   'PYTHONDONTWRITEBYTECODE=yes',
+   'MALLOC_CHECK_=2',
+ #  'MALLOC_PERTURB_=$((${RANDOM:-256} % 256))',
+-- 
+2.17.0
+
diff --git a/dev-util/gnome-builder/files/3.28.4-jedi-0.12-compat.patch b/dev-util/gnome-builder/files/3.28.4-jedi-0.12-compat.patch
new file mode 100644
index 000000000000..4132e2d1bfef
--- /dev/null
+++ b/dev-util/gnome-builder/files/3.28.4-jedi-0.12-compat.patch
@@ -0,0 +1,93 @@
+From 799a378b96cad5dc9b1093604e76ed362d22f4cc Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Sun, 27 May 2018 20:19:34 -0700
+Subject: [PATCH] jedi: minimal attempt to get things working again
+
+This tries to get some of our jedi code working with recent API changes
+in the jedi project.
+
+This is just a minimal fix, and I'd expect some others may be needed for
+improved functionality.
+
+Fixes #403
+---
+ src/plugins/jedi/jedi_plugin.py | 44 ++++++++++++++++++++++-----------
+ 1 file changed, 29 insertions(+), 15 deletions(-)
+
+diff --git a/src/plugins/jedi/jedi_plugin.py b/src/plugins/jedi/jedi_plugin.py
+index fd8e15d68..052500da1 100644
+--- a/src/plugins/jedi/jedi_plugin.py
++++ b/src/plugins/jedi/jedi_plugin.py
+@@ -91,8 +91,14 @@ try:
+     import jedi
+     from jedi.evaluate.compiled import CompiledObject
+     from jedi.evaluate.compiled import get_special_object
+-    from jedi.evaluate.compiled import _create_from_name
+-    from jedi.evaluate.context import Context
++    try:
++        # 0.12
++        from jedi.evaluate.compiled import create_from_name
++        from jedi.evaluate.base_context import Context
++    except ImportError:
++        # Pre 0.12
++        from jedi.evaluate.compiled import _create_from_name as create_from_name
++        from jedi.evaluate.context import Context
+     from jedi.evaluate.docstrings import _evaluate_for_statement_string
+     from jedi.evaluate.imports import Importer
+ 
+@@ -175,23 +181,31 @@ try:
+                         pass
+             return module_list
+ 
+-    original_jedi_get_module = jedi.evaluate.compiled.fake.get_module
+-
+-    def patched_jedi_get_module(obj):
+-        "Work around a weird bug in jedi"
+-        try:
+-            return original_jedi_get_module(obj)
+-        except ImportError as e:
+-            if e.msg == "No module named 'gi._gobject._gobject'":
+-                return original_jedi_get_module('gi._gobject')
++    try:
++        # Pre 0.12 workaround
++        # TODO: What needs to be fixed here for 0.12?
++        original_jedi_get_module = jedi.evaluate.compiled.fake.get_module
++        def patched_jedi_get_module(obj):
++            "Work around a weird bug in jedi"
++            try:
++                return original_jedi_get_module(obj)
++            except ImportError as e:
++                if e.msg == "No module named 'gi._gobject._gobject'":
++                    return original_jedi_get_module('gi._gobject')
++        jedi.evaluate.compiled.fake.get_module = patched_jedi_get_module
++    except:
++        pass
+ 
+-    jedi.evaluate.compiled.fake.get_module = patched_jedi_get_module
+     jedi.evaluate.compiled.CompiledObject = PatchedJediCompiledObject
+-    jedi.evaluate.instance.CompiledBoundMethod = PatchedCompiledBoundMethod
++    try:
++        jedi.evaluate.instance.CompiledBoundMethod = PatchedCompiledBoundMethod
++    except AttributeError:
++        jedi.evaluate.context.instance.CompiledBoundMethod = PatchedCompiledBoundMethod
+     jedi.evaluate.imports.Importer = PatchedJediImporter
+     HAS_JEDI = True
+-except ImportError:
++except ImportError as ex:
+     print("jedi not found, python auto-completion not possible.")
++    print(ex)
+     HAS_JEDI = False
+ 
+ GIR_PATH_LIST = []
+@@ -376,7 +390,7 @@ class JediCompletionProvider(Ide.Object, GtkSource.CompletionProvider, Ide.Compl
+         return False
+ 
+     def do_populate(self, context):
+-        self.current_word = Ide.CompletionProvider.context_current_word(context)
++        self.current_word = Ide.CompletionProvider.context_current_word(context) or ''
+         self.current_word_lower = self.current_word.lower()
+ 
+         _, iter = context.get_iter()
+-- 
+2.17.0
+
diff --git a/dev-util/gnome-builder/files/3.28.4-python37-fix.patch b/dev-util/gnome-builder/files/3.28.4-python37-fix.patch
new file mode 100644
index 000000000000..2fc6ee5be06f
--- /dev/null
+++ b/dev-util/gnome-builder/files/3.28.4-python37-fix.patch
@@ -0,0 +1,57 @@
+From e1d32d76231b1051a2380995f4a7822aa525375a Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@debian.org>
+Date: Wed, 11 Jul 2018 11:57:06 +0100
+Subject: [PATCH] Python: Avoid identifier 'async', which became a keyword in
+ 3.7
+
+This is an incompatible change, but so is async becoming an identifier.
+
+Fixes: #565
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=903558
+Signed-off-by: Simon McVittie <smcv@debian.org>
+---
+ src/libide/Ide.py               | 6 +++---
+ src/plugins/jedi/jedi_plugin.py | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/libide/Ide.py b/src/libide/Ide.py
+index 02bb61937..07d429c7a 100644
+--- a/src/libide/Ide.py
++++ b/src/libide/Ide.py
+@@ -41,9 +41,9 @@ class _Gio_DBusMethodInfo:
+     in_args = None
+     out_signature = None
+ 
+-def DBusMethod(dbus_interface, in_signature=None, out_signature=None, async=False):
++def DBusMethod(dbus_interface, in_signature=None, out_signature=None, is_async=False):
+     def decorator(func):
+-        func._is_async = async
++        func._is_async = is_async
+ 
+         func._dbus_method = _Gio_DBusMethodInfo()
+         func._dbus_method.interface = dbus_interface
+@@ -54,7 +54,7 @@ def DBusMethod(dbus_interface, in_signature=None, out_signature=None, async=Fals
+         in_signature_list = GLib.Variant.split_signature('('+in_signature+')')
+         arg_names = inspect.getargspec(func).args
+         arg_names.pop(0) # eat "self" argument
+-        if async: arg_names.pop(0) # eat "invocation"
++        if is_async: arg_names.pop(0) # eat "invocation"
+         if len(in_signature) != len(arg_names):
+             raise TypeError('specified signature %s for method %s does not match length of arguments' % (str(in_signature_list), func.func_name))
+         for pair in zip(in_signature_list, arg_names):
+diff --git a/src/plugins/jedi/jedi_plugin.py b/src/plugins/jedi/jedi_plugin.py
+index 84bd11c27..a346a342e 100644
+--- a/src/plugins/jedi/jedi_plugin.py
++++ b/src/plugins/jedi/jedi_plugin.py
+@@ -688,7 +688,7 @@ class JediService(Ide.DBusService):
+         self.queue = {}
+         self.handler_id = 0
+ 
+-    @Ide.DBusMethod('org.gnome.builder.plugins.jedi', in_signature='siis', out_signature='a(issass)', async=True)
++    @Ide.DBusMethod('org.gnome.builder.plugins.jedi', in_signature='siis', out_signature='a(issass)', is_async=True)
+     def CodeComplete(self, invocation, filename, line, column, content):
+         if filename in self.queue:
+             request = self.queue.pop(filename)
+-- 
+2.17.0
+
diff --git a/dev-util/gnome-builder/files/3.28.4-valac.patch b/dev-util/gnome-builder/files/3.28.4-valac.patch
new file mode 100644
index 000000000000..acb1c54f8519
--- /dev/null
+++ b/dev-util/gnome-builder/files/3.28.4-valac.patch
@@ -0,0 +1,15 @@
+diff --git a/src/plugins/vala-pack/meson.build b/src/plugins/vala-pack/meson.build
+index dd36d351d..a8c53c6e5 100644
+--- a/src/plugins/vala-pack/meson.build
++++ b/src/plugins/vala-pack/meson.build
+@@ -6,8 +6,8 @@ endif
+ 
+ add_languages('vala')
+ 
+-valac = find_program ('valac')
+-libvala_version = run_command(valac, '--api-version').stdout().strip()
++valac = meson.get_compiler('vala')
++libvala_version = run_command(valac.cmd_array()[0], '--api-version').stdout().strip()
+ libvala = dependency('libvala-@0@'.format(libvala_version))
+ 
+ vala_pack_sources = [
diff --git a/dev-util/gnome-builder/gnome-builder-3.28.4.ebuild b/dev-util/gnome-builder/gnome-builder-3.28.4.ebuild
new file mode 100644
index 000000000000..9fb20da3c55b
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-3.28.4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+VALA_MIN_API_VERSION="0.36"
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 vala virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="clang +devhelp doc +git gtk-doc sysprof vala webkit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order shold roughly match that output as well, with toplevel one first.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# FIXME: with_flatpak needs flatpak.pc >=0.8.0, ${LIBGIT_DEPS} and libsoup-2.4.pc >=2.52.0
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# These are needed with either USE=git or USE=flatpak (albeit the latter isn't supported yet)
+LIBGIT_DEPS="
+	dev-libs/libgit2[ssh,threads]
+	>=dev-libs/libgit2-glib-0.25.0[ssh]
+"
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+RDEPEND="
+	>=dev-libs/libdazzle-3.28.0[introspection,vala?]
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gtk+-3.22.26:3[introspection]
+	>=x11-libs/gtksourceview-3.24.0:3.0[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.28.0[vala?]
+	>=x11-libs/pango-1.38.0
+	>=dev-libs/libpeas-1.22.0[python,${PYTHON_USEDEP}]
+	>=dev-libs/template-glib-3.28.0[introspection,vala?]
+	>=x11-libs/vte-0.40.2:2.91[vala?]
+	>=dev-libs/libxml2-2.9.0
+	git? ( ${LIBGIT_DEPS} )
+	dev-libs/libpcre:3
+	webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] )
+
+	>=dev-libs/gobject-introspection-1.48.0:=
+	>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	devhelp? ( >=dev-util/devhelp-3.25.1:= )
+	sysprof? ( >=dev-util/sysprof-3.28.0[gtk] )
+	vala? (
+		dev-lang/vala:=
+		$(vala_depend)
+	)
+" # We use subslot operator dep on vala in addition to $(vala_depend), because we have _runtime_
+#   usage in vapa-pack plugin and need it rebuilt before removing an older vala it was built against
+# TODO: runtime ctags path finding..
+# FIXME: spellcheck plugin temporarily disabled due to requiring enchant-2
+#	>=app-text/gspell-1.2.0
+#	>=app-text/enchant:2
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for appdata.xml gettext translation and validation of it with appstream-util with FEATURES=test
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
+  plugin out of the box functionality.
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* dev-util/cargo for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust language server via rls; Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-python37-fix.patch # async 3.7 keyword usage removal
+	"${FILESDIR}"/${PV}-jedi-0.12-compat.patch # preliminary jedi-0.12 compatibility from 3.29.9x/git
+	"${FILESDIR}"/${PV}-valac.patch # Make valapack honor VALAC env var - https://gitlab.gnome.org/GNOME/gnome-builder/merge_requests/109
+	"${FILESDIR}"/${PV}-fix-docs-option.patch # Fix USE=doc to work without USE=gtk-doc
+	"${FILESDIR}"/${PV}-fix-tests-schemadir.patch # Fix tests GSETTINGS_SCHEMA_DIR handling (or tests fail on fresh install) - https://gitlab.gnome.org/GNOME/gnome-builder/merge_requests/111
+)
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable_tracing=false
+		-Denable_profiling=false # not passing -pg to CFLAGS
+		-Dwith_channel=other
+		-Dwith_editorconfig=true # needs libpcre
+		$(meson_use webkit with_webkit)
+		$(meson_use vala with_vapi)
+		$(meson_use doc with_help)
+		$(meson_use gtk-doc with_docs)
+
+		$(meson_use clang with_clang)
+		$(meson_use devhelp with_devhelp)
+		-Dwith_deviced=false
+		-Dwith_flatpak=false
+		$(meson_use git with_git)
+		$(meson_use webkit with_html_preview)
+		-Dwith_spellcheck=false # TODO: requires enchant-2
+		$(meson_use sysprof with_sysprof)
+		$(meson_use vala with_vala_pack)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+src_test() {
+	# FIXME: this should be handled at meson level upstream like epiphany does
+	find "${S}" -name '*.gschema.xml' -exec cp {} "${BUILD_DIR}/data/gsettings" \; || die
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${BUILD_DIR}/data/gsettings" || die
+
+	virtx meson_src_test
+}
diff --git a/dev-util/gnome-builder/metadata.xml b/dev-util/gnome-builder/metadata.xml
index 78c212429a5c..4eb8fba905da 100644
--- a/dev-util/gnome-builder/metadata.xml
+++ b/dev-util/gnome-builder/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 <use>
 	<flag name="clang">Provide integration with <pkg>sys-devel/clang</pkg> for best possible C/C++ autocompletion, semantic highlighting, symbol resolving, and diagnostics support</flag>
+	<flag name="devhelp">Provide API docs browsing and integration via <pkg>dev-util/devhelp</pkg></flag>
 	<flag name="git">Provide support for the Git version control system via <pkg>dev-libs/libgit2-glib</pkg>
 		(such as setup of Git for New Project, direct cloning for Open Project and changed lines indicators in the editor gutter)</flag>
 	<flag name="sysprof">Provide an integrated profiler via <pkg>dev-util/sysprof</pkg></flag>
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
index ba264a7796b5..5cabdcdaea7b 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,5 +1,3 @@
-DIST gource-0.48.tar.gz 873333 BLAKE2B 95b876b486f0215f7516cb2bb940dd00771f67659cb2d10ad23e9da0732a51e3f2030d8f7599a8be901f0211bf1c484964f1fb66696be01c990a7b99d1123084 SHA512 5b638cac9b464c0d8f0df87ae0115c36d314cce9cd0ce269b05e0a635ff6f23e62d06d0def484b796267299041e4de675cb13a0381b19d9144bbdc1d3b7f1b16
 DIST gource-0.49.tar.gz 874349 BLAKE2B b7d24f415944921deb7df33be4e9918291f5df6dd4813bf98727894e0192b881a583a1dacec2d6e8f2d1a0d6b644bc3b735ef8d7c0b7882d77bcd80913fe08c5 SHA512 cb3482dd06cf38bd775f2ac4b8f3bee78e480dd51e37527024df6e59d6e613290297d65e167a21364aa6251eff78a50ecc8a5fd3772a6e9a4ad22ca21b4b615e
-EBUILD gource-0.48.ebuild 1060 BLAKE2B 5b3e6c4c560bdbef5c052b275b31c28f05bf2fb37bcfba7000efc24fc88b0987d03c22fbbb59e063a4314fc61f0758936a42cea0fe651bdef27ecc0f7d37bed5 SHA512 a2b87b1e273fe48737aefebbbef8f0c01616dc1b74eb430149c21bf0f51f94290944f8b2c7c325e27a0b00100ab06e4e8c71a1ac8ba49ff6bf0bf7d66356d660
-EBUILD gource-0.49.ebuild 1062 BLAKE2B cc5904ad53ef11df22c22b5547a6fa3b07234c640aca6c96de1e7fe9c7ac44ac053c8955c62bf91bb92345952cbf7c5aaa4dc46ca6f0ff0ec65720718830d8de SHA512 6709d71956fcbb491e279f7180c166e871ef7fca7bfe96fa84b54b83df2480ed69fa14881dd779d6f8515b2c9f4cd78b401584116356968811a17c7dc7e6c985
+EBUILD gource-0.49.ebuild 1060 BLAKE2B 5b3e6c4c560bdbef5c052b275b31c28f05bf2fb37bcfba7000efc24fc88b0987d03c22fbbb59e063a4314fc61f0758936a42cea0fe651bdef27ecc0f7d37bed5 SHA512 a2b87b1e273fe48737aefebbbef8f0c01616dc1b74eb430149c21bf0f51f94290944f8b2c7c325e27a0b00100ab06e4e8c71a1ac8ba49ff6bf0bf7d66356d660
 MISC metadata.xml 353 BLAKE2B 86c28b45e78dacf7183e323130cd947f36f88278cbfca6d5e50d52268f309394d934836ca6a150af8297a153025c1be7756ba7cbc5ac7088bf2fff763f3b85d9 SHA512 d203593d1819671dc81ede02a2c7fdfc81f69b9d66a6587fd096ea89ca3274adba144f06244792f2044f8c8bfc788fbebbc6eca20a7cd9b5da18f3c1fb392729
diff --git a/dev-util/gource/gource-0.48.ebuild b/dev-util/gource/gource-0.48.ebuild
deleted file mode 100644
index 34639205e93e..000000000000
--- a/dev-util/gource/gource-0.48.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="A software version control visualization tool"
-HOMEPAGE="http://gource.io/"
-SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.46:=[threads(+)]
-	>=media-libs/glew-1.5:0=
-	>=media-libs/libpng-1.2:0=
-	media-libs/libsdl2[video,opengl,X]
-	media-libs/sdl2-image[jpeg,png]
-	dev-libs/libpcre:3
-	dev-libs/tinyxml
-	media-libs/freetype:2
-	media-libs/mesa
-	virtual/glu:0
-"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/freefont
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=media-libs/glm-0.9.3
-"
-
-DOCS=( README ChangeLog THANKS )
-
-src_configure() {
-	# fix bug #386525
-	# this enables gource to be compiled against dev-libs/tinyxml[stl]
-	if has_version dev-libs/tinyxml[stl]; then
-		append-cppflags -DTIXML_USE_STL;
-	fi
-
-	econf \
-		--enable-ttf-font-dir=/usr/share/fonts/freefont/ \
-		--with-tinyxml
-}
diff --git a/dev-util/gource/gource-0.49.ebuild b/dev-util/gource/gource-0.49.ebuild
index cd54b4eb2266..34639205e93e 100644
--- a/dev-util/gource/gource-0.49.ebuild
+++ b/dev-util/gource/gource-0.49.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
index c03e4e69dd29..c145f6902e73 100644
--- a/dev-util/gperf/Manifest
+++ b/dev-util/gperf/Manifest
@@ -1,5 +1,5 @@
 DIST gperf-3.0.4.tar.gz 983500 BLAKE2B b83bb45fb88143f2847405efd769472c5b3ea9277af88568bf8860ae653563ff3c23a9705651eac50949fdfad3efd957856f712f7810b21cc6dd32dcf40adb12 SHA512 24a65ac93c9d640670b015a76378eb7e0f167bec685d03f7dc68005d5a6d693d98b2189f7a0ab5bb9e5dc700de7d417c215230f9dbe062ba119240a8da535dad
 DIST gperf-3.1.tar.gz 1215925 BLAKE2B bc4c54ade3f7dce484714d77cb5759dcc02b7a607d7b1aff6bdbcd06ee4c83e9449038a7217d5f25bcbef058ba56e1fce9383b9599de005154e5a9b566ac9c69 SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4
-EBUILD gperf-3.0.4.ebuild 755 BLAKE2B 9ce77ac7852ef68d13f526b34cd8294dbd50d281ea6e73cf70d3e0da899b10d4868edad16894ab868df44e9ebd1ceaef68716b776b470a208820dd55913b03df SHA512 a3780b8647c196f856564753935978d8a80fa0849dbf804fd8822c83b64087376ab80376ecfd22102898fb7339974e4e4ce4090b91e8c7b8055d4a3159978950
-EBUILD gperf-3.1.ebuild 735 BLAKE2B 07f60246d0036ce533c2be9c93760ae3ddb02dc57c0024bd187094102b04ee35249fa5be009271c580332feaae26c5cb5d78477ab1b37be4c2fcfd4c7692e696 SHA512 6564a4551b4244733839ddb117d2be2ba3a2cfe64279763ad2312d3c1009da0be3a7be1ce46a5b32f9798be39f34fefd8bd0503776474f884f2934e62f5e4ba6
+EBUILD gperf-3.0.4.ebuild 744 BLAKE2B 69c5df156acb2113d3daf39bba3f2b0c1405f8c756652a407740ce184959badf9195642517d4cc7924985cc05d4da35223d54a749d1d39f9c7d8f927f863c24e SHA512 58a8925be516b002495b70878ab9db28f36a9ab470e9cd40b4868261781889d4b0336b79b30edddeac34b0756aa67afccf681e78b7581d8721dd85929e2d709f
+EBUILD gperf-3.1.ebuild 724 BLAKE2B 50394ca3f6667440ef6ec4e6167d6f3b2c2b76e4736a6e003b9ca6b508a6f9d9676d93f1b435d7ca434bf8c1d189ed1e6382c9d5238f28c4e521df26ebb8289d SHA512 bd085403d3098b8cfa3bf7fe25c5229e87d7d86755fe6c19d3578e53ac6c8bbcdf6ad2462b9726671cfbae358fa0091622ffd3e8fb3dcdebfbcee68c456b28f4
 MISC metadata.xml 219 BLAKE2B 0f485ab3a0acbd2d5cf0a8b2014662a56862057721a4bc34494c2dca52f97bba8d54994461ef33bc965d3470d3e733fec71ed60e9aa4f1b5c565c048d60865d8 SHA512 a1cca99a7d8d8ea9893e7147264184a1605ddbd61ba07971df5a2bd54d6d74ecec39145faa2b303132a31db8fa61484b9224a2748bff4da638b63f930bd394df
diff --git a/dev-util/gperf/gperf-3.0.4.ebuild b/dev-util/gperf/gperf-3.0.4.ebuild
index f10a26e67e5e..41cf1f3dde3a 100644
--- a/dev-util/gperf/gperf-3.0.4.ebuild
+++ b/dev-util/gperf/gperf-3.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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=""
 
 src_prepare() {
diff --git a/dev-util/gperf/gperf-3.1.ebuild b/dev-util/gperf/gperf-3.1.ebuild
index 9e400c03fb58..b0aef66a47fb 100644
--- a/dev-util/gperf/gperf-3.1.ebuild
+++ b/dev-util/gperf/gperf-3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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=""
 
 src_prepare() {
diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index 06d30f1db9f8..26a05714bb1e 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,5 +1,5 @@
 DIST gtk+-2.24.31.tar.xz 12805344 BLAKE2B f516f9970a95afa21ae5dbe9f0cafd3c57c5cd27af0c6740a0f7f4367eb8032719e39e533bf89db72dddba7485ee499da9c2370707f51bbc4a7af2d4fb7c1309 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-EBUILD gtk-builder-convert-2.24.31-r1.ebuild 1154 BLAKE2B 6f23d8b14d7b86023a5db01e36951d7fa222b690bf3d225f042254fd68e039995f0243a6edf085a2f83420be2204b35888e7eca81243f127b3bf8f167f230a61 SHA512 1b2d8ee90718a47e79b1063efe19e2ba35a4595a3f253a7d6061379b6fcecfdbbd1dd98cca2d08b5eddb1a52abc7a6002edb19398ce9e925aeb41775f828aa76
-EBUILD gtk-builder-convert-2.24.32.ebuild 1155 BLAKE2B 334bb76485d6f2e8c99da8998589de8e7af051ab5f1b9ef943d0586f893177178819b288e4f429b563606c6ca4c6acf57504c2d09e598990d3a16ef5b2f253bf SHA512 33f90c14014d062b6768beaad4f7eb8b068fd9eb60ffe3dcee2fe1f556f8c516b141896e30269638df318452dd1d642126713a56687583b1a1b4f4df5e9756e0
+EBUILD gtk-builder-convert-2.24.31-r1.ebuild 1143 BLAKE2B 312226957ba27d49f769307beccf1da2a7298a781d11a9cb0e5bdf49dd1052e37b3b1fbec5a85112ef583b72e9b604e78e8b1ebcc75b0a6a7c220062f0126519 SHA512 a5280de2fe70f0b77febf86f32d66e1cefd7949d7d97054ef5533ab8959e4f73556cd8fe6bc0735337c0280cf8eab16ccc81020f0e7a16c2f6cd2ee1c3039ddc
+EBUILD gtk-builder-convert-2.24.32.ebuild 1144 BLAKE2B 4ad87705cfa462a7d3ad4c7fa1265212fa0384d51d35480f4f3ec0760e65854bb9b6abd1ce6d21e9c026480f4148a10d0b7ee4a9e8cf05efc901be2c83803ad4 SHA512 b2a81ffb79ee9964e347f9366d9a81142503cdeb3406c90d22e57b1b47168651f5679a2bb0ee72722f884bc56e98ce64b3ba7f2078c89990beb0093494694ee0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild
index 9fce626aeb6e..88f84ddcce5f 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~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 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
index 48d1c1e234db..343a7787a024 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~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 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
index 383f73f9b2a3..31d6dcc03636 100644
--- a/dev-util/gtk-doc-am/Manifest
+++ b/dev-util/gtk-doc-am/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
-EBUILD gtk-doc-am-1.25-r1.ebuild 1256 BLAKE2B 2882c5fcc53a55dd662f98b1113f68d9a5e46bb932cfaee4e752cdf16ee4d442db4898d2cc3574d2e7297e624edaeb1f189eb292dfb9add20e4e2cd0ca145dc2 SHA512 1182846602f295e36ee5995d33434d83eee8d68ea19eaa34fa0b26047b5f66cbf704ed7a9cb574a08482b48894ef818756a09d3679dfcbfa867c00a575e8f1ae
+EBUILD gtk-doc-am-1.25-r1.ebuild 1245 BLAKE2B c2121ec311790a8e478ec48a6173092abebcfc2ed9fbfef2d6dcbcf8488951b02a46dc6d3838458a1e290d6d2228aef4f324d7a610dc8a482a5c856b0cd47f17 SHA512 5faeb256d16f6fd8f20d22081901dd7d7cff1786570d8fe79505acacbd179f3262b45ac6e0a3b1cf515fbdae3c7feb598ef3f69059b6b4c6fb4542c5cbf12328
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
index 0c69ec3a3bd6..b3f0c9cbb083 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.25-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.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"
 
 RDEPEND=">=dev-lang/perl-5.18"
 DEPEND="${RDEPEND}
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index b18deb91e757..486e72b26dde 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-update-icon-cache-3.22.19.tar.xz 367224 BLAKE2B be3fb3785776052eed0f102e9665628aec1bec93953de1cdb795af8db458cedd07fa717abee4dc9e6d8c4c8f45209371ac130fa29e8a77622290524b771b5c89 SHA512 3ca12d38781a716c1b3f8584089e2c038aa18584c5e1b4c41098173f73f839cabdbb0e8b25b1c69a8b9b9f016b9c3c8594c4b26c2463cea278754f13afb7c795
-EBUILD gtk-update-icon-cache-3.22.19.ebuild 966 BLAKE2B f403203df0c0774818f3e00c23122fb1fe466aaffc59a083d56cb2b614afb6157fdc6c4067406409c597a5fde7e506e92419bfa171ece0108490468f3a9a32c2 SHA512 f08a2be5aeb4f835c9ba482b0af79717d5d0c505d4782fdfe461b82237e67a52958e68b10936cc70f6cec18982b0386f64c37e91610c611bec9424baf81feab1
+EBUILD gtk-update-icon-cache-3.22.19.ebuild 955 BLAKE2B a9cc7e17975fe5369821e464a9e258b68e305386f662b0357e73d0c3f06fffda03a6bc7a54acc7058ddd1e63e86c07782ac0d5661c168ab3c59b302d9478814c SHA512 3996827447bb70e5869886eb7585b55e8f528489293390d872b0661e8fae47dc099022d23b048764604d8b2e69f191768a57a4bef307d0b83841b5e6ffb38eb2
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
index 58130e916b64..6e1516fcfe7c 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 IUSE=""
 
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/hadolint/Manifest b/dev-util/hadolint/Manifest
index 2ddad267c5fd..a31e05a7f0b0 100644
--- a/dev-util/hadolint/Manifest
+++ b/dev-util/hadolint/Manifest
@@ -1,7 +1,9 @@
 DIST hadolint-1.10.2.tar.gz 39009 BLAKE2B 84552ce978d6f53b6e2e769da402585777ce7ef5bd7b66cc538b4f22d73a54b0d07246c1d68b9628f9e2d17d9db2bb472e1902cf017f13344b9277b27658b652 SHA512 2104cb588bdb9620d6a5831ab0f38e6fbd45ab19ba6dbd38e6ced43995f2dd6509d7f9d0180d59a828bbe8de46738f7ff2f3ba9859d9ac4a04b1ba9015071fd9
 DIST hadolint-1.10.4.tar.gz 39126 BLAKE2B afec4a6308ac19d31207ad9cc89f3d75c24ae1bc7d09e89c9437863e117ffaf0041df7a110cb0264a4b76a67ff6c2901fdfb372a5ca7660a806f059db95cf572 SHA512 ca0dad6f64247a514b562cacd5744ba9b5ab87353144b8075bbcfbfbe8893228f08bd45b6c9885c2be1f3a3a12c4afbe4d8f6afa0031405b5958836a8b415021
+DIST hadolint-1.12.0.tar.gz 39932 BLAKE2B 1d7f7acaf5a8ebacb9b0555e60a31e2bf70474045b33f1a8fefded796c455d9ab6587acdcfdfddf23b78585cf69cd4f609320c4ac39f956bfff62322595f026b SHA512 306eeebc357352d50c48b30d424ed50e0b89deff059a61b78ae0f7493c0ac2099bf32caaf84cdb2620ff6abecb69d3e6d61ad9e5223c42cce73923cb1da376c6
 DIST hadolint-1.7.4.tar.gz 35187 BLAKE2B e40892f739d7714f62b322d1d3bb6d5cb285e9e6f3bc9c35d21a8d0eef837f32966b6292ce3e20ff461e2775777b2bf6192676ab76d32a558a8242dfe12c697d SHA512 ad92d1f6a1efee2b853613ec078396847e7ee2c525d6069d3cf1708d1af229133eff35e0dee6f0680433a2c6781839beeda02f8cebb52e360c622e6b05ac5925
 EBUILD hadolint-1.10.2.ebuild 1137 BLAKE2B 3bdb1e21534531126433c77f9e14644d714e9803e6a11b39c0553c1354a523e3f18316e8a21b610fe18604471557f779825ca4b0b27cd3e4d46f9747c4680305 SHA512 9aae19d11f1b502599a8c4279729da7d63b50dbf7877e95eb2dccb32640edeae7c78d484bbfd4605dacbbbc24d0c4ceff7a485c898d570a64efb0da17806e148
 EBUILD hadolint-1.10.4.ebuild 1137 BLAKE2B b5fb51af0ca3137c7666aab77ed9fb911f1d3aca892c0dfed7cb9039685566c90a5abf1855034e5ffa841a59320d3b570303c9d0fc80093ad0a8a702c4443cca SHA512 bf97efd4f7d4316e958a8904f372919e1e6dfb3d404074869a94d5ee22ad203705c4ef13280540639d0c078bb7aebd67b5149ce0e87e0dd9977181c82ba8bda5
+EBUILD hadolint-1.12.0.ebuild 1164 BLAKE2B dc3096d62e52a798b0371f5e0b9492f2d142ab65b267cebb6ef18d8e2f1587b227ad1bdcc82eee53fa0630165f09b48cf5038299d12fc2c6ca46156b78908f74 SHA512 8e6ed7a8e3cac87ce38312bf495bfb7382e6a01aa1e9233d7a9d61f656af92b88b29cd0fe9471c0a146f2c4fd57f3d70433d76770b07855e4b499369b4077c9f
 EBUILD hadolint-1.7.4.ebuild 1137 BLAKE2B 67e11fc0f94683b2382fe875c4b3626531bb3d8d2c054e04da76b1cf9734ee63f7936332fb1ac53af2e8ee6fca0bce4c6ee6c88beb53f8d2ec2a0b0efdef70f0 SHA512 b3feca48b6a4342417513789c7aefd02f5ef3676e467a4889a639a7279c90aa1ef2336d5d1f4c3a84c05c12a85b66e42cd811a69eb382a613599a8f6a549ba4b
 MISC metadata.xml 364 BLAKE2B 960f838518131ef8088bd574862e5ee91f7d57f7b6925718a1249d46ffcb84a70200a160915284073e24b54fd8fdbc3a479cac5d91c03d5ddeb1b55c570f995f SHA512 2d359c79cbc3ed17c447453c06cf92026edbbcd3da98108b560b25c9d69b8f576a9645ddeef02e05c3e492729a9c7a78746a69aac319213b32d5037c2be23247
diff --git a/dev-util/hadolint/hadolint-1.12.0.ebuild b/dev-util/hadolint/hadolint-1.12.0.ebuild
new file mode 100644
index 000000000000..eff49ab1f047
--- /dev/null
+++ b/dev-util/hadolint/hadolint-1.12.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Dockerfile linter, validate inline bash, written in Haskell"
+HOMEPAGE="https://github.com/hadolint/hadolint"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/gitrev-1.3.1:=[profile?]
+	>=dev-haskell/language-docker-6.0.4:=[profile?] <dev-haskell/language-docker-7:=[profile?]
+	>=dev-haskell/megaparsec-6.4:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/optparse-applicative-0.14.0:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/void:=[profile?]
+	dev-haskell/yaml:=[profile?]
+	>=dev-lang/ghc-8.0.2:=
+	>=dev-util/shellcheck-0.5.0:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.2.0
+	test? ( dev-haskell/hspec
+		>=dev-haskell/hunit-1.2 )
+"
+
+src_prepare() {
+	default
+	sed -i -e "s/-static//" ${PN}.cabal || die
+}
diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
index c7826f0ebd9d..473c131dfadc 100644
--- a/dev-util/imediff2/Manifest
+++ b/dev-util/imediff2/Manifest
@@ -1,4 +1,4 @@
 AUX 1.1.2-python-3.patch 4553 BLAKE2B bc16393f3c7071017255e8f188456e77d89a2ab2d605d6d99882aef4c65c7e5270a9348cf278a98d5ff7527423e899feffbb93b00f12a8c6e9a7b131acb86eba SHA512 fa5065572eb7fdbf38e3d7785ae92bddaeae8eadd9dbd006f5691c8647087df7529015750b66ea7618dd3306fcda80083c8dc2d2f019787137095db5b2c1a4d7
 DIST imediff2_1.1.2.orig.tar.gz 17974 BLAKE2B f83b6ab652b1dd044587e75e4e7551a8132e1860b14f0d85d37f35383bd161a672860162e93554cf4db844d6a4700fa1876a30874c50fcb8442b4190a9b19185 SHA512 54d196d67107283bc3339eba30acb1c60972f256a268e86da397e0bdafa05220facc7979638a6a917b0c2dc7171edc3aa6b188295c9f40e9debf87a63731e748
-EBUILD imediff2-1.1.2-r5.ebuild 793 BLAKE2B 1230315898373dc6f6db842619f7950998ee522d9e5c6d4d1dff3d1fb0daa85ae3a8b2ec0a7d21335255fa0754462e37a34bc3b715def6d7e93e72e9c20179a0 SHA512 5766f6f41b8e9bc0fa77b00c5a88e91bceba472424e297b6a6b47b201f7d12a0bf3bad6a5ab218001078b8761d6f47abe2a29956d4c63182030336643fd9e8ce
+EBUILD imediff2-1.1.2-r5.ebuild 795 BLAKE2B 3c6f2482c2f857f7f2a7573cae424a6734bce8dfe040fb1f703e53f16ca2d8fa4e0ca10ba3d940354f24c1239ba08121a22a4f82e2e381001572438fe089c245 SHA512 e0620c658dbc04bb965e78763ec0865a8197368406f4bb155a283d45f1eeab8781548cc216c53cd6e3c9f3b508e1a19dca4fec2161d427b545e09358a3b16067
 MISC metadata.xml 357 BLAKE2B fd7b99a53b06a9ed310039486dd9c631d70ae5af05b47b42009e92b6134e52ee13e520066b8170f70b000a8eca1ca6c3c670478e393a4e36f3fe6c21187f090e SHA512 2c36e9355ac79bb027b25c63e0487299cfdf226217ea891349c4665107f6e7fb2931e56386ff1d88f16ad9e573041fc94658f61e8658d234b04bfa49c5fe902b
diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
index 52fad5519ff5..6e8fc59be1fe 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="ncurses"
 
 inherit python-single-r1 eapi7-ver
 
-MY_P=${PN}_$(ver_rs 3 -)
+MY_P="${PN}_$(ver_rs 3 -)"
 
 DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
 HOMEPAGE="https://elonen.iki.fi/code/imediff/"
@@ -16,14 +16,14 @@ SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
 
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index 1e52cb5d94c7..ab1ce7779d20 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -3,7 +3,9 @@ AUX indent-2.2.11-linguas.patch 185 BLAKE2B cb63a2846640ad4b5801481ceef537024135
 AUX indent-2.2.11-segfault.patch 369 BLAKE2B 210e2b5b1b46aa15418d6a30ae79ab423a68d8a6e7c528905afe48b2bd72fb013ce6dcade1d9580e7a38b2df2da2f6932b380bc96d0913ecbd7fced3db5686a5 SHA512 342600d476849d936d022e54ea0b6b244a956b11b99cc94dc9084f224d42ea2829640cde7a98e43efd0ee1fd88eb7147ba960af8075d290cd14a9d549abec022
 AUX indent-2.2.11-texi2html-5.patch 2666 BLAKE2B a92ecd54bead00609c45f3193b3c0228ccd6b37c6c6682325a1445296a6d5593a357ed51050fe2cb2d04a76b1665ed199b0ffd6d07c45b0774805452078c83cd SHA512 0356443bf7f9fd066113ddb7f59b8126f4b32f7dd8be9fa661ecfd4436ed0652d9229ac867365486f04bc7cb3623e3e8792549de4678f03e4f2bd582e4ee2d67
 DIST indent-2.2.11.tar.gz 778563 BLAKE2B 8fe0f245fb852613587da8355a4aa8962e09e1614faf61cf7cea62d6922054547d0739cd1373298af08e4e0cca8d5f4bfc654e03d859c0fe560d0ddb0f63a298 SHA512 f5670e5edc76b9d599ef9e8cc498e13ac15e10eb6a8d674e1612918c4b67ffb15c94d73b9590434e0cdea6ead4b8d1f5bcda1c2f3838acbdeb4d732a0bea89be
+DIST indent-2.2.12.tar.xz 620280 BLAKE2B c3414ebe58d75b74356b5c37234639dc34998b73e45a4c28ee20ab2932c523b528d577c45c32db88f2ee4aed58d1dceeda2fe68b8975d211dc0dad4a3a20f7c7 SHA512 dbe73bd3729074825f9f5b4241a4c539ad32069df56511963417caf0351ff9ec5edd77e9580338301c8abf89ab9c0592bc7e82c14eec7450c496259d7e9045dd
 DIST indent_2.2.11-5.debian.tar.xz 6540 BLAKE2B c4d0805f39e1af503bcfcc49a8e9e679fb0df1021de9952af5a80c81f0c36c70e8dd6609b7e7ec5e36596f974d9c9ac31a7cad831a431cd9401758981d46a7ec SHA512 f89f04bb3b9772c5428ef6df939b5cbe92761f3a39869020dad4f98a5e48c57c34de526803141258c9d55ba6edaedf05127009530aa09b1a54cfa15c8a421a31
 EBUILD indent-2.2.11-r1.ebuild 1218 BLAKE2B 7127d515b0f633c6b071a2fbff01d78fff8fa8af5c501511b4e8e74c6b0dba57a2416ed5c7846d4c5d95037ed0f029d25ab9cdc31b70614302f1aef0c3fdd49e SHA512 5e229883fe09c8168f88834f98d92caa1d4460c8be8f91541d3824973b45d1723c989bc81bb66832d996916b414db488ecce814315ab471cc8f8778cec8a38d1
 EBUILD indent-2.2.11_p5.ebuild 1382 BLAKE2B 47c045271db8ee765f5516b8b333c81d6bfbe1847c06904244759aaadd730f3bd94c6101df1d8607a3f8f2ab309be4a143a1478700f5d558df921d9524de35ea SHA512 a2db1fd8937a8608d588304731244824d437d3bf90053897c02dec1defdf7f913dfd9c34600b124d7d93b3b3009c7649065726b1f0c1450a339b9baba8e8208d
+EBUILD indent-2.2.12.ebuild 1016 BLAKE2B 449af66ffb2d117641fae135dff36edec7df7e5d609840c845a783d86221c983acfcb3dc9744d8b2516d076a7ab048b3f6be1a2a8aaf8b4c2f4b58f568290c44 SHA512 cae021586fcdf6f377926e9889d3fee4cf4b1e4131ee60d9dcc0fdf4bbe51afd48529a8f2196a621d4299ff29e26c8399590ffe78c08a00cbf098e981748940d
 MISC metadata.xml 371 BLAKE2B f331934c0c8063b13ae4e4290894da6faa7e6f135d1684b7a621b4199b13304496866e7eea31a158a2a0f36ae29da184bca16020425799a6542dd6d213e1b36c SHA512 c3859c430b4d976869789476e59c66bd2967802748abc9a3f53395d170114c21ca11e81c6046fa160ad31d422188dc92f63c9df947ac75ef31bcb1965a7f5dd8
diff --git a/dev-util/indent/indent-2.2.12.ebuild b/dev-util/indent/indent-2.2.12.ebuild
new file mode 100644
index 000000000000..a8d9e29f1f6b
--- /dev/null
+++ b/dev-util/indent/indent-2.2.12.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Indent program source files"
+HOMEPAGE="https://www.gnu.org/software/indent/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="nls"
+
+DEPEND="
+	nls? ( sys-devel/gettext )
+	app-text/texi2html
+"
+RDEPEND="
+	nls? ( virtual/libintl )
+"
+
+src_prepare() {
+	default
+
+	sed -i -e '/AM_CFLAGS/s:-Werror::g' src/Makefile.{am,in} || die
+}
+
+src_configure() {
+	strip-linguas -i po/
+
+	gl_cv_cc_vis_werror=no econf $(use_enable nls)
+}
+
+src_test() {
+	emake -C regression/
+}
+
+src_install() {
+	# htmldir as set in configure is ignored in doc/Makefile*
+	emake DESTDIR="${D}" htmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
+	dodoc AUTHORS NEWS README.md ChangeLog ChangeLog-1990 ChangeLog-1998 ChangeLog-2001
+}
diff --git a/dev-util/intltool/Manifest b/dev-util/intltool/Manifest
index 4198263ec722..c0117bd7a370 100644
--- a/dev-util/intltool/Manifest
+++ b/dev-util/intltool/Manifest
@@ -2,5 +2,5 @@ AUX intltool-0.50.2-absolute-paths.patch 1798 BLAKE2B 9648c96b7f4a65a19e6e62ee5d
 AUX intltool-0.51.0-perl-5.22.patch 2184 BLAKE2B 8655ee9b830828a9a0fa8841b02f1c3d213331b11bae8724d5a6767b0c3cf157959e8efdc4fb62d4d4c2ca07c712ef8ac391463304ebdfd745c0e5891d7f3aa9 SHA512 ca125f5284bba789139d9733c79c077074cbeee7e263ce98953868590e50d32d80b94935eec7965f1c2817388e0fd8e1d5c87a9faac7936c9ee7e8d0b5758177
 AUX intltool-0.51.0-perl-5.26.patch 586 BLAKE2B bc79617f7cd22794a06c93a63a3fa9ef2e3337c8b1488207ed08e11e340a726f3979703450b580bee2f5b482366843f44fc0e4d710da2eb4fa4f98b60e3b2eaf SHA512 86fe1b795118975f1930535d9bb7d01564852546fb234bddadbc4a5ac66ccf6a43c9944ede1ea72dc6c4296dc8db3dfff4ebd1989dce57e623689be444c8e591
 DIST intltool-0.51.0.tar.gz 162286 BLAKE2B 98fe40e4d669fdf65a777152ddee0a9656412b9cf5d1e682d1b4b7bd666f3e5aa623a50481b6df47e16a935550836c66c666229b0bb7ef143f7cde6893b97a69 SHA512 4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf
-EBUILD intltool-0.51.0-r2.ebuild 997 BLAKE2B a9bff97f430cbdec2805e1be36eb7d3e4ea2007e8f57601807571056852c6f8f95beaed8d002fbffeaecb5064f6a9e593d74bcd46dd9b0e49ef7e7146e806c01 SHA512 19cd0a94029c03cc8a4b9d59a57908c139c5a8f8409244a1ba67605fbb7764d8d245cb2588754ccf2a2e60829b6af8accbe8035279c1e8721b361bed00eab22c
+EBUILD intltool-0.51.0-r2.ebuild 986 BLAKE2B c562efc9afed95c32c807a7d1b19909ed2adcf875cc5830f8448f4f856d271612dc11547b52c433c140474f08aaeeeeb0f3c60e27a71f2abb4a5accb1c591c62 SHA512 dc022589000feed6fd2c65532efb5a2605c571b09e8043c0412db6e2c8521bf1b34bc1d586ea87e3fbe8158ce19f0dbae234455289f10c93a5acc89ead2b8a08
 MISC metadata.xml 304 BLAKE2B 87e449f29a87153e258fe194afc64202ff133f6a8bdf333cee64d907246348f504133bc8195e005039647deb28680f5762068770bb09126328aa9d9b7e76bde9 SHA512 e9f0bede4c5ab13dda61ae7ea0f5d39988373388f78a05b08f4099204154160ab0d88d21989a8bf8249aa98448744969643e118883c418968c9030a6919a9727
diff --git a/dev-util/intltool/intltool-0.51.0-r2.ebuild b/dev-util/intltool/intltool-0.51.0-r2.ebuild
index ed23a567ce19..95ce37120b5a 100644
--- a/dev-util/intltool/intltool-0.51.0-r2.ebuild
+++ b/dev-util/intltool/intltool-0.51.0-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 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=""
 
 DEPEND="
diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest
index 8250f2fc315e..52a82f37d794 100644
--- a/dev-util/itstool/Manifest
+++ b/dev-util/itstool/Manifest
@@ -1,3 +1,3 @@
 DIST itstool-2.0.2.tar.bz2 96748 BLAKE2B 7eb8f52c233878a35c01b7eea51c46f9700e9de827d38df41bb3ea78ca4ef284ab59c423aaf9876fceef023cb9d13d2d50c9ab57caff9e5fad217363412cf472 SHA512 b7915c4d463fe5969e282029c2080730c78e18d2d5878da53c6a370f471056b51a7b3f3c08417b801212ba674f55548a112a12a9d81634f60d1e52a8a47a4aa2
-EBUILD itstool-2.0.2.ebuild 859 BLAKE2B 9d60ef92779de81e0662417880af27bfa31a8a9478a463ecfdccf66b21571dca51e6c35bbf5783d43ca843b058cd78dae9b67c1792231aad28d2b4d539b0c72b SHA512 71847839b23ebfdc42496969d5fc3db84d36de69a66d36a34a0846871a9a6d2cee481e36bdf3ca5e7aefbad7f9f44e5be36bc3afe6b413fb7699972792b9a5da
+EBUILD itstool-2.0.2.ebuild 848 BLAKE2B 81efc7aa6ec3323a55a0853dec499efdf6dff5ce3b4572b14697cd3c9e603b0033a6402a24ab5cf42e29d31073566874dbdcbef5423d4ead3431ca9a6a82fbbd SHA512 c070244c794533e160301e05b0cb1183ce35d15a2f6eae4170fa15513eb068a34f90cb6b2d3c1a2476ae9e2be7c04e7c60a1a4d650f1764dfb7bd30b62364f3a
 MISC metadata.xml 525 BLAKE2B a7e426bd9dd273bed10ad74315547eb758df04ceb7ee6ef66f643ba23e60ad8b9c80aa344688e4af7a16fd699a500cf7ceb9d24eb94a930eebf1637e09919a5f SHA512 ad9928fa0359257e3418c0fb6bba6c416fc4505911f35e97377ef7c1426e228b34312fc3156e98f3657974f1156ee2bdc58bbb4b51903bb40b10c97b0714b39b
diff --git a/dev-util/itstool/itstool-2.0.2.ebuild b/dev-util/itstool/itstool-2.0.2.ebuild
index adf8ad6b64c8..b772c25854d7 100644
--- a/dev-util/itstool/itstool-2.0.2.ebuild
+++ b/dev-util/itstool/itstool-2.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
 # files in /usr/share/itstool/its are HPND/as-is || GPL-3
 LICENSE="GPL-3+ || ( HPND GPL-3+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-linux"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index c3262e506fd2..eb39580124ea 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,5 @@
 DIST kdevelop-5.2.3.tar.xz 6643364 BLAKE2B a08d5cc786a603b3e23d1d9bf9d362a35f2280436072df239ff6becbd9f0ecc370b35a8e95d3443475218eb5a27e044d76f3d34cd41f082fc65650ce05c499f7 SHA512 5a7f514f24725ab1dbb33d63fd365159c3a8831c400aeef4f1e463acc60d81e9db1a23d320b5be215597884fbf0cc6ec8aed4f69e1fd60f68328b5a052b39c3d
 DIST kdevelop-5.2.4.tar.xz 6647172 BLAKE2B c3dc301cf16bdef95000aa6cb3ebe615054f49ad29bc67870c31d329cf7bd4df81dad330eb26dd28c19627b2040f62522d755afa4450bb125872350d1f8039e1 SHA512 1c64b4f56452e8c926c5bcea5a9d8368fa62926d1ec507d289d8cb47275d478898d56fdf083fc24e291aaf4738cc5b7ddfd239e6993848e862bc4d83e270558b
 EBUILD kdevelop-5.2.3.ebuild 3882 BLAKE2B dbf9df8aecef1077e2d9e5c6f466e5313da26cbc76e69f958a7d5f555ae4086f8e9c9c850fd9a124e24a70f52223e3e0e3232c56f2be30fed422786139bf35a3 SHA512 88b0714d803633c796cc643d2731a90e45b9065cd0ac57813c6a31c298a4580141ca33dbd491ba2f4b604ffc2497c734a6ab87b92fd3856c4ff1798aa4156b20
-EBUILD kdevelop-5.2.4.ebuild 3858 BLAKE2B 9f0082d4c036dcdb6c9656f3238df1cec85f0b2c47f9dda1858d74da54d45c05bac366fd22a11d4bf3a0bd9995c8842159d90b51c4dee0545e19af60c9695c87 SHA512 f76f6cd3e1a3db04bbd33244cf19c590542f8476130a79fa99c3adcf2d9e07b59f9986c078a5d3f4cd5b63ec121d6cb6c03124214273c43bbc2fd56c6e0b0572
+EBUILD kdevelop-5.2.4.ebuild 3699 BLAKE2B 9d899cad0e65c6ec2becb727f2edcbcaa53021c33491f21a71f0829d356166e8fb2fc71cd65228642fe5041b8ae6fc6d5ec7adddc0cfffa9cf16d658af4e0c63 SHA512 43281a4d9b0a25e12d0316e330c8af8b946dc31cac7302664dc1fb0bae3832a4a08e50e9780f3d17950c38536aafcd7c6894b45ca26a98761818f69293e13785
 MISC metadata.xml 794 BLAKE2B 5436f574309cfb4c014322f1d4c37edd68a6a7e77bfe5ea81e189f1440c4cced6310e01bc65923bb144d62d32349b2f862af18b307b621e347b3a076dc8a8862 SHA512 fdc3da939f866f065c7811ea70ac8a005a01455bd60db64f5f3107276de49d2d5e28c60650ad530636fb5e4a51a3acd69ef30ea5f1c895e9ddf410b5eb287f6a
diff --git a/dev-util/kdevelop/kdevelop-5.2.4.ebuild b/dev-util/kdevelop/kdevelop-5.2.4.ebuild
index 361ca0737b8f..f07d8b229fdc 100644
--- a/dev-util/kdevelop/kdevelop-5.2.4.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.2.4.ebuild
@@ -12,11 +12,9 @@ inherit kde5
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
 LICENSE="GPL-2 LGPL-2"
-IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage"
+IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit"
 [[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 
-REQUIRED_USE="test? ( welcomepage )"
-
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kbookmarks)
@@ -49,7 +47,7 @@ COMMON_DEPEND="
 	$(add_frameworks_dep threadweaver)
 	$(add_kdeapps_dep libkomparediff2)
 	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtdeclarative 'widgets')
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qthelp)
 	$(add_qt_dep qtnetwork)
@@ -74,7 +72,6 @@ COMMON_DEPEND="
 	)
 	webkit? ( $(add_qt_dep qtwebkit) )
 	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-	welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
@@ -109,7 +106,6 @@ src_configure() {
 		$(cmake-utils_use_find_package reviewboard KF5Purpose)
 		$(cmake-utils_use_find_package subversion SubversionLibrary)
 		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
 	)
 
 	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
diff --git a/dev-util/kyua/Manifest b/dev-util/kyua/Manifest
index aa822c298cd4..11b4da7d5ed3 100644
--- a/dev-util/kyua/Manifest
+++ b/dev-util/kyua/Manifest
@@ -1,3 +1,3 @@
 DIST kyua-0.13.tar.gz 663776 BLAKE2B 5bb6b2a7723567395baeace0b70085a631856ac98ddb304bb5300f26bc89a1a1add589486cd08f1569ca9c7534fd5071a62cdcbb519a10d59221df63c0aef932 SHA512 80ecf4fd888d4759122f3c1d1d5b06a19135e06f7bca1ef8458c7a5e78c1b6baff54969c863c93f11c40611ca256fc0334402531397b16788fb3ec701dd278ae
-EBUILD kyua-0.13-r1.ebuild 535 BLAKE2B da2b48adf0b79edb4bb6315879f03cb154062cb01034068293c68667b625c0bb630d1b91e6cef3ef290f8eea35cf3709a7b37d63fd9e2db59f08e1998fe8a016 SHA512 605cd2f43edeaebe995585d46ad77f83ed3d592b80479986b5d22d3535229d4c64aadce6f4d7d77cb055029939aaca55e6685a66490a4a5f4e163553d65c2937
+EBUILD kyua-0.13-r2.ebuild 611 BLAKE2B 4bb3dfc83b81b806a466a551ebebcb2e58471cfe81d1091273271f616feca6424ea7bb3426cc3dbe9fcef790f6e41ac5f24292b21860d54045d37ad2e7533c28 SHA512 45c8f2555acf066585d47b06298d8a9d41f6986cf2246df189c38e037dc94270ac5774bb8cb3f7505637727dac7b6d948b1997937e78b0fefbb724d928572417
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-util/kyua/kyua-0.13-r1.ebuild b/dev-util/kyua/kyua-0.13-r2.ebuild
index 54f077c90561..ef98722f052e 100644
--- a/dev-util/kyua/kyua-0.13-r1.ebuild
+++ b/dev-util/kyua/kyua-0.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,9 +17,15 @@ RESTRICT="test"
 
 RDEPEND="
 	dev-db/sqlite:3
+	dev-libs/atf
 	dev-lua/lutok
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( dev-libs/atf )
 "
+
+src_install() {
+	default
+	rm -r "${ED%/}"/usr/tests || die
+}
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index f17fdf82bba5..db25520fa0d5 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -3,9 +3,9 @@ DIST lttng-ust-2.6.5.tar.bz2 619053 BLAKE2B babe2d0b8df6ca1d1942415d613a05d77471
 DIST lttng-ust-2.7.1.tar.bz2 643906 BLAKE2B 2ef4be03ce3b2bcc8e781c2b6e798ee00bb85d7f7039ad34fc49b3bfda46142d65fc98d19fefefb3e375e6f0de95292a1e15de25318b2da62b51d9fb017b43a1 SHA512 80ba4b79df2a0ba0606a31145a427c8c5b30e2a4ace20f9e4602738ace99fe88146569de549288ff33c809a606b6973c17c3effcf9699b5dca3383b8da5b10ee
 DIST lttng-ust-2.7.4.tar.bz2 648002 BLAKE2B aaacf4da1c1ff7c4909d9a8ba17b3d108175e8669dfcba151e2e73d094fa68096a0ec2c0bbaf89bec8370566e9b25147a0bbe7bfb0965b0e9fd70704e7a226df SHA512 f3164fd72724065d23b2b21aaa037b6e90f4eeb9dad75f16af4766374cd8a0a7a6eb2c815d93c17950a1048c5a32e6b334fa31b3d4b0f8314e352a9ddc8d4395
 DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
-EBUILD lttng-ust-2.10.1.ebuild 682 BLAKE2B 2aad3681948a4f92d4ed100ec22eabe662cef16e071702eb9cb8133368835df593418f542baa6d516a4ea29d8bce149a63af8e9c1bd7b0191e9049619fcc1853 SHA512 7c6cfedeeae033bbb5448c3bbf1e78ae88a068269c510fd45f052bcda34ab9ebf4661368bbb9a5fdacfd7c9e33daa0ae7f1dd7bb119eb67e2f90d86c6276efaa
+EBUILD lttng-ust-2.10.1.ebuild 688 BLAKE2B 381ee0fcee4f34f43ec83c472d864d8ce182a1436c18a5487ec99b987a9d497581c212d55ac3155164c66e3f05db020cd345f0948a696c7aff33a120b41a5065 SHA512 42ed193d0cba1717002e3cfed7850c6bdc8e39cc7bde1250c052ea2bd65c297f7a30a31497934f25c14ae5ae037e6fa1fa3c35f62037cd9a6173992f90e61bd5
 EBUILD lttng-ust-2.6.5.ebuild 634 BLAKE2B 226de182ce8f0f60ca1ddc385e22b12fc915baca73bfebae55dc54b61e583ac5f5af8239f3e3ba5c4403f4253872cac2981a4b2916a6924d490e3836c0edf3be SHA512 610deadc2813386c71b3449fec096c0793be2e08315085e25d10331b55153bbeeecfd371eb9ba900117c8ff18841085d72a870dd61a96ff821b6284491262a05
 EBUILD lttng-ust-2.7.1.ebuild 632 BLAKE2B f7a3577e36025dd620dc9a29f8e35f90a4d4baa3fd3d214013a81987c73c366fe6f8e0c8fd764a3614706a5bf9c64f77920e72f8f6d0868cea1093d4e0142fe6 SHA512 7848f28030dd7ede00ed14d0924af46d589d549dbd73d5afb83b0a06fd2600ddd01c2e32eebe5ed7aa243225d63fbc1648e2d66f38794c0f85a4e6e9fdadabe7
 EBUILD lttng-ust-2.7.4.ebuild 634 BLAKE2B 226de182ce8f0f60ca1ddc385e22b12fc915baca73bfebae55dc54b61e583ac5f5af8239f3e3ba5c4403f4253872cac2981a4b2916a6924d490e3836c0edf3be SHA512 610deadc2813386c71b3449fec096c0793be2e08315085e25d10331b55153bbeeecfd371eb9ba900117c8ff18841085d72a870dd61a96ff821b6284491262a05
-EBUILD lttng-ust-2.8.1.ebuild 654 BLAKE2B 393b99838aaaf1e4a1167ed9134fe9495baed769acf8635eccd1bbc1f27e7194898bd7ffa65d9ff1e52400402d57c76a3a17e2ad78e9cfca8780f3c33d4b6cad SHA512 eb547d731bb9d44c1a5a825338de23020b596b3baa34c08dcfa6f613f76defade60612ed0f76bff2d17a27dbdf7191796415eed860dbe2d76a65ff2d53888434
+EBUILD lttng-ust-2.8.1.ebuild 660 BLAKE2B 1e23aacfd12926352eede5fcfc3dc3f1b0f4629671f5153159306ec6f08f9fc5be7b82df946e43660d2826f51013f0a97753b58853c18f112549839984ea611d SHA512 6fc29c3ffacb7783b09919607611a86a73a9fe6033f051befe2390b8aeea6e6f0f4ee33a2afc2f32a419245e02960794285176110e7f90bb8814aa97405e4614
 MISC metadata.xml 639 BLAKE2B ad4de0ba5be85b4ff9392746a483348d0ff3b365a50d7be270df6408e41f408069d905e458057af8a32a48d43fd2987c9a66e118a6ec044d7d72e23c16846484 SHA512 4887f60d12b32ff0b08ce5457fa2e56fd76aab443df0fc0a610ddcab02c3a85c7a6dc196ac58a725f7dc268c6b8aadbdddfef78c415bbb640f7b1bc0bda7577f
diff --git a/dev-util/lttng-ust/lttng-ust-2.10.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.10.1.ebuild
index 1a0e55bb0ad0..2ccf9da9a9ae 100644
--- a/dev-util/lttng-ust/lttng-ust-2.10.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="examples"
 
 DEPEND="dev-libs/userspace-rcu"
diff --git a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
index 91e4fc222950..162cd0f3a50b 100644
--- a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples"
 
 DEPEND="dev-libs/userspace-rcu"
diff --git a/dev-util/molecule-plugins/Manifest b/dev-util/molecule-plugins/Manifest
index dc3ff611bc4a..2ecd5587080e 100644
--- a/dev-util/molecule-plugins/Manifest
+++ b/dev-util/molecule-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST molecule-plugins-1.0.2.tar.bz2 17428 BLAKE2B 60fac83a501bd8f0c05588dcace522c59093cd0fcebcc87d86c8b8301f775d4cb6367e2d83c3146b1514e53f800dd2a34185d48575636c401724dc4e471b230a SHA512 65b75c23f3c662812be2ab4fe0c92bd99aba48da6e05aad6175ba3fe1cd8106d9085ed53f27c738ef6af1b327ac8ac872ef7c3c48728366b510b7a82bb90c866
-EBUILD molecule-plugins-1.0.2-r1.ebuild 689 BLAKE2B 7ad76bb2095f639d2a4ca6a9129f6160310c14dd04bba605846f9a9adae94f7bab433c19cf6535a98dcdc255f80be912f7c6db50a38b194b9ae78026f3fe368c SHA512 aeebf6736c4727ea0c6e50d3fb86e504805cca32dbbba93c299474f69341dfed6b42eb2058f28eab4b756fcce83088ffc85cea886690024fb8e08846d411e650
+DIST molecule-plugins-1.0.3.tar.bz2 17662 BLAKE2B 6bbbd484ec7fc8441bfccc8c716475e9bf831804a79a0add1dedd428f2dadbbd1a3025966db25619c34364f2a0b6873946c121f1df6fd3a2dc041a3a7341565a SHA512 e00bb7ed9a19452f0363e3453b56a86c22b2f96b843798ad20c6c61a87acf72a389158bb7c8b1b09cbcdfbcbb4b081996c47b6327d790b72c98a13270ce4cb6c
+EBUILD molecule-plugins-1.0.3.ebuild 689 BLAKE2B 7a6ae7ef0d22d3f38e262e9d8adcd2b364d0d6dd04294f1b8c8479faaabd9f07c4c01f9cc9690aec58e0fcc34c631e3a5e23b4460dc3994eac717d6df0a2a313 SHA512 36371f37a01f87b25d0b407c251e87bc151cd6d759add9f933a68e18544007ecd10616c6c4fd0850a7146e9852d4f6caebda1e82b1df6a59224ee53c94b9ad44
 MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174
diff --git a/dev-util/molecule-plugins/molecule-plugins-1.0.2-r1.ebuild b/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
index 746d3b7fc28e..c06bd99700c7 100644
--- a/dev-util/molecule-plugins/molecule-plugins-1.0.2-r1.ebuild
+++ b/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 6a49fc90d1a8..5375956f9d50 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -16,7 +16,7 @@ EBUILD perf-3.12.ebuild 5006 BLAKE2B 7eb7939628a49ca9dadf7c4a223184b5e4da478fef6
 EBUILD perf-3.13.1-r1.ebuild 5128 BLAKE2B e34cc28ba57866db83fcf9ab639e95306582c66fd7ce427543b19528d72fa78757721efc0ac1b23c6435973766fa4619e5f6448bfb21a6c50cc01cca2a2c3859 SHA512 f7ce04b5f4a4db657dfeb6b59d70c15cfb012ce661a62620773607ee93d5becfea56912dd9fae88db47a9f42ade6ce0ed0d0ba67a3fc37b086eda0e9e87118ab
 EBUILD perf-3.15.5.ebuild 5143 BLAKE2B 694b1eaa11dde8aa29ab0ac812479869e9e45e47f02cf9201e78a5d6bcb4c18d645ae4bc8e584237ab738a1739f971a2ae62faf950d8bbe9845f02ad878aab84 SHA512 9a56717e87b9bf6bfa27f3d953e41af18c55e92020fbcc14fd01f43835e542bf1c7adb195387400c955706f5ca8a69090e41d6edfb728717910cd19b801d6dfc
 EBUILD perf-4.1.5-r1.ebuild 5269 BLAKE2B 859aff4b3f86bb85187c7a0a7a85cd423ec8ceed0a2c9bba55c711b466216017ed796b976a1b16a03c8aae7292f31b8329e37ee55810c868caa246aa39c38d17 SHA512 1aa7d9fad71cbaf1a28976cfe7dbf74d7e04b4a00f81e5d7e0b96cced0a051bcf9846122caa66bb1466790ef5b7dcea71a1b291b2300056b1846ce4e5531b165
-EBUILD perf-4.14.33.ebuild 4950 BLAKE2B f4b86b4fc45dbbaada34a9cbf463dd68675ea74ab93794891eba66e20869e931c653d5e20e6cbf41df035d49a2b5aa298eb08829f2819c0055221d134e2cd353 SHA512 a4a6323f62c46cfcf1141a41025609f8eb990978ca9a3f77be65f1c5913a84a733ad3c16d8e65fea8728064d15308a3d99f20a859364dcd3b3eef58747fec2ef
+EBUILD perf-4.14.33.ebuild 4957 BLAKE2B 178c3e4dee18e132719f42cf83a209ac866dde793d69a3df3fd1a20585974dbc5a538d3d4dc5638fb20ff19ffae7eaf5a84d44b0b7f9b90ddf50a6794a57e71f SHA512 1c2346b9fd9c507185556e984b4976c55727290717d982b0fd2258e5d2d8dee015a62773de672afc9b7283afcec3820a20244911f44b5496c4bf53f78f34f695
 EBUILD perf-4.4.4.ebuild 5040 BLAKE2B fd6ff983115568989077d1d626b29121b452a11552d982b85a992cb6016b41e7beb7750008c8b87833f6dded0f6f2281275bffe7ad9c61dc773ec69a6f7fa33f SHA512 f39e5397d269f879dbaa62b4cfacebba27dd2f26feb17d70b5b4f60fcf256438c2920df340c27abb45f24404b21ace1c5bab982c7e4a93c2befa382762e76967
 EBUILD perf-4.9.13.ebuild 4925 BLAKE2B 919acbb8b5bc86a8cc0de41f963e87a85f16d7ba3fee026adab0c29ac5a46c8846fd102592576f0efdebb379080bf1580babfb0bc23729ea386ae3cc7ba3d634 SHA512 750501145fd525bf5e973edb7f4645cf0cd94c3449ae859ffcc33896e8963db8e573248893441de971248af2842fa18df9222704b5b92880a356e8656776a597
 MISC metadata.xml 1093 BLAKE2B c10db12ae6c05c68b06dba1112b3c899dd40d2d35f8ff8f2bc840c38e712571256b1ac49d90983b4df6af5806fc93b59bbb86e6d851d197539e776d60da0d7da SHA512 5c83c9c871c23eda63760d4b33b549849236d1f79edf4a69bbf2803987cd6db9c3f5dd8abdd216abacce91c93a589a9487e911d9ee1f57a9fec761f7e39beeef
diff --git a/dev-util/perf/perf-4.14.33.ebuild b/dev-util/perf/perf-4.14.33.ebuild
index 609530402717..dc982eb33d6c 100644
--- a/dev-util/perf/perf-4.14.33.ebuild
+++ b/dev-util/perf/perf-4.14.33.ebuild
@@ -37,7 +37,7 @@ SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 81adac1e8224..55beea2ddb84 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -3,9 +3,9 @@ AUX pkgconfig-0.28-strip_system_library_dirs_reliably.patch 777 BLAKE2B fab15ae7
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 DIST pkg-config-0.29.1.tar.gz 2013454 BLAKE2B 5f33022b2df83de1c9202e090ea9be926d1f2b796152969d46ad45772ceb792c3f2bb95714cf1def28393b32db1b4052c3fdfe9f71076d130a57172987c04d0e SHA512 d2963355929d7aae0fbadad445d67b5c6762934fc4963a10a4b72ae90f7f6df4e6a38694884b924ff37eedaf636b49f3f521fe4eb3009e0322a402f330f1b4c2
 DIST pkg-config-0.29.2.tar.gz 2016830 BLAKE2B e8f0420033524ad768cac3c82138546e4cd76c47f5835b7b98662ab01eaf3feef08f495a69c04980d51b57935567ab1d465ef4e1d0529735ad0031c828585324 SHA512 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75
-EBUILD pkgconfig-0.28-r2.ebuild 2917 BLAKE2B ae95639874d906788ce1e3511b965f03e64b545e9097d71efca5a2e430ef59e660a164581ca383f87d408d60a36728697ca5b14dd641ada7163a14932eb6c8e1 SHA512 3524f45c92d629a2f615f273897fd792ce760fc47046eeffbebe5f0e619f9d812202da73d54c60d5d142523c409175d4143cdfb8991c27b5e42c6d0ba17edfbc
-EBUILD pkgconfig-0.28-r3.ebuild 3440 BLAKE2B 2a83430e96362e930f23f71b18cf239e846aed65ae2868bddc05e0c5b40150e63142139a87b046e77fd67dec5284afc2b0208ed48cd4a1bb8a21fb09d75b2c8c SHA512 b9f615b244ff8774453aa4a8de547a66e71e34f3cf084f71c8ed27a4761e74a34b6d90a9170b3a1a6d62c5e3392e5204153ea739af5f48818df1eaddcc426506
-EBUILD pkgconfig-0.29.1.ebuild 3804 BLAKE2B 0d62c078eaf5fbd0d2419b20c7f97dc088d45ef1df519fdbc36842bc5d753cf7af43475fc1b5e7c2683bd1c4f99cae10be6ceb4e80a5d851afe538cd377d6ad8 SHA512 35b977a6aeb63d11aed3cd746affb36a24e9a6bca0751cb7bb5e3eb08c92315ceead1adbcb204a3ec19f5f3f923d1f8b46e0be87c94c5eb98a1992178ed66beb
-EBUILD pkgconfig-0.29.2.ebuild 3791 BLAKE2B 14a5e7f9d94063d68b36512641745c742bffaf996ef170a6c4b2fa73f3fdeb32c1edd4a5d0f56d7362635af2a80496b1fd930e66859afd40f267fe18e816a24f SHA512 33ea45c748eafd8468d9000ab03d67548041310ffd54f1eec1925e8b0d7af15fa6303d11d315a0c970b0678702fc277cb698275dfb220278be8ff4843f5be274
-EBUILD pkgconfig-9999.ebuild 3804 BLAKE2B 0d62c078eaf5fbd0d2419b20c7f97dc088d45ef1df519fdbc36842bc5d753cf7af43475fc1b5e7c2683bd1c4f99cae10be6ceb4e80a5d851afe538cd377d6ad8 SHA512 35b977a6aeb63d11aed3cd746affb36a24e9a6bca0751cb7bb5e3eb08c92315ceead1adbcb204a3ec19f5f3f923d1f8b46e0be87c94c5eb98a1992178ed66beb
+EBUILD pkgconfig-0.28-r2.ebuild 2906 BLAKE2B e34421f1501a31d6effe56e22b2ebfafacf6661c295369aac744f4bcdfbc404d032bdf3648c15b28f8ce0b6774190c4b601c30b53f5874d36d986957376763d7 SHA512 977205c37301a9743edaf47ad980756a77539a02e1f3d28c3e6d4f0968ee664194d87aae043e70245d22c8b7dac3d37aa85c008d20ff4a0e7fc737aadb7c30fc
+EBUILD pkgconfig-0.28-r3.ebuild 3429 BLAKE2B ceb0cf3a8abe4a51707d28275d95d53ea09ae15b0a1ede4c0ec47f4ce6f71689b2062e74f98b66c5e09e3f7d52e64b64a9427265b87df89561f37f4263d20a40 SHA512 dceb6e8aecbfd99f71d2cb92a734bd4b8ae109d185b8418463337dfb64da4c41c7cbb1499e8805fb1fa388cfac9c54afc66979b80f4182ab7c1e00ed7236cd32
+EBUILD pkgconfig-0.29.1.ebuild 3793 BLAKE2B 140d9135253a3542fe128c344485508a7d85ed2351137a5c3266cd07cd4eb6d8f96324a3278258dc5d22f6ae44640f39879dab84c1341bf3369c66a220d09b2f SHA512 7fb87709af38ca0a857295b3822c8e3bbb81a82ff9644da3a9f800b46ad2cb24edb825246fcf2ce2bf04f6c019a7099493032f84497a0fbdfa79953e1ae2a1df
+EBUILD pkgconfig-0.29.2.ebuild 3780 BLAKE2B 93b4e7f4bc2cb353e255271f6dc4173b198ee2155b9d63fa769319b93bf3b6d6ff46ce695745bec6bf04ed68836a680143b2b3f275eecbc4d2db463b5e4e9b54 SHA512 3a269594fd9451cbbaec5ac9c17c9624a8b7aabe552b3c1b023726822d58f28917a241c21e9bcf42a3f7a6e15f0f86733cbecbd9d03a348080aaa38ab409b6a7
+EBUILD pkgconfig-9999.ebuild 3793 BLAKE2B 140d9135253a3542fe128c344485508a7d85ed2351137a5c3266cd07cd4eb6d8f96324a3278258dc5d22f6ae44640f39879dab84c1341bf3369c66a220d09b2f SHA512 7fb87709af38ca0a857295b3822c8e3bbb81a82ff9644da3a9f800b46ad2cb24edb825246fcf2ce2bf04f6c019a7099493032f84497a0fbdfa79953e1ae2a1df
 MISC metadata.xml 325 BLAKE2B af0abf473903faa5ce1e6d1918fa87b558b99b82d95c7f95ecb596684f7f55ee365a10e943752d1f3c8b6b1684ac4e0985329b89a6f19de2c926bcc0c3127382 SHA512 0db9510bbe132efa03acbbb4fb31407188edd83a6ac5c1d84316fa682db9399879957e8cd4447c1cbde01638f6d220f9a30a17611cd31e35769e71e5d38287a4
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
index 9fa7fb11e9de..e5f4e5588ea0 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
 	inherit autotools git-2
 else
-	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"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
index c94ca03db9bd..f6d6a5400168 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	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"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
index c5d3bf7ec72e..8b33f74cedf0 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	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"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
index 3600aca2b077..bc08d1a581fe 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	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"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
index c5d3bf7ec72e..8b33f74cedf0 100644
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
 	inherit autotools git-r3
 else
-	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"
 	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 3c225e0ad302..d5ea05b6ff81 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -4,11 +4,13 @@ DIST re2c-0.16.tar.gz 4892417 BLAKE2B e1160d3f6ebd63d42a22c112d83a31fcd7bb0d5ab2
 DIST re2c-1.0.1.tar.gz 5758988 BLAKE2B e02d8ce5f82441d33ec055d582e797d33a4b1a5244d37477b5c93117c735790a6a24e1b9e1456a6d4182c3282b59955838b625216cf47abfcc8c4fb5eacc953e SHA512 ab3b652d8f97b0d1be4c7561ce65e28870ab8976f8a31d74a6629b43d2057bfa608c7f393d5e5d59d26f991552a60e6274f554ef58752bdfcfeba330578f1299
 DIST re2c-1.0.2.tar.gz 5805526 BLAKE2B 931e7b00f57cf8c3e49e540496906208e5a5b73f87427c095e9f5744594007b5d536bf8a2920c3fb509f57bc0ba608ca80a6780ae8af033fdfe7bb3c26292007 SHA512 9d85933ae874cb9240175ce7210d3808173bafe246c67b9c333578846239b7bcef074287f26040b5a048bcd98db8d0393035c417918b80db1f74098695a77176
 DIST re2c-1.0.3.tar.gz 5806555 BLAKE2B 98664998a52e9f3198ac6d19e8c8af8db716414e42aa89b05750cb8a2054d53d0b13fa499ca004eecc294cef2756554c3e08c8167055d38d266be86f0684b83d SHA512 7b2a43828da872a957af88fb0a226e1936a45c8a1020ba1f6544b588aaa61dff8df40e84f9053c30ac8e17c41164e70627d57f5d3721a34b2aba7b1dbf25b6ae
+DIST re2c-1.1.1.tar.gz 5907416 BLAKE2B da2544573de0dbca94db8a8e2112de5549ffbbad91bdba187e95c9d8dd36537e099dbc2871b54d62630d91928cdaf384ab069e5e1624f8ff749c2e2743cff766 SHA512 a6fe73611103588043748340976f0e6d07169a6546cb80627c0ccd2ceac83f362dbbf371530361d893537fd95deb19503b2c73c41ed40efe7787210d6c757397
 DIST re2c-1.1.tar.gz 5901198 BLAKE2B eacfbd19a6b32c1779d0d0bf45ed7b4159e0ebb000817911ac3daf4595a841efb2fe7810aaede404e95a85af9df66568be1845f96e229d66e381d0ff6f1e2d89 SHA512 a39a42977f271cbd4f245c5252cba52636519c052d61e080c607556f778e0a35709f832466c2be0467af09b1623faab25616ffc957e90c0f1f6af78decb97209
 EBUILD re2c-0.13.5-r1.ebuild 712 BLAKE2B 7dccc9fa372c83c421eb1ee12ceeac59765c37d8f8df2ee8d1a81671e4a2d05739863f5f9c32e42f61912b5cdcbfb17f29c0b3dcb3d667c2815c0dcec3b3b353 SHA512 446a7fe4ff39783c7172ae3110200e896955cf36bb2fa26133a671adc6394ca4efb92f012b074e3cf2dd392d27b4ee6bfbf43a86755b4b6edebb8fe77e395f86
 EBUILD re2c-0.16.ebuild 754 BLAKE2B 28913bde66f2630596b289eab49f003eb727f7beb56e45cdbea3ee664b210f0df9aeeda19119d6bd6155e6488fb4dab84e120cd56038dbcf57753169c9bd7950 SHA512 a869252b8c140ead837f6c3eb2fd6b46ef199480ed2e67acf684b9bc1d5fb858e2bed875d8d6eee7b246c3f0e73fa5522a53b11983af98b374b31cc55c8d539b
 EBUILD re2c-1.0.1.ebuild 763 BLAKE2B 590b767074a8478ef7f3bd01f2c050ce868ff2b4795f2ff3762b917d45d6976ff29ebbd7da914d76e6ba56cb3e70e352f53b48ef4374743e8ec482fdba24b786 SHA512 ded3ef724bc5624a00994a80739483e7a21278bb45f7d54001e060b71d591c44cca59e7202e1af5f36ec84b39003c97f7f9161d735a8ba67925d29bdb65253a7
 EBUILD re2c-1.0.2.ebuild 769 BLAKE2B 90d97ac18d6faf57040988b9aa1f5fd50c726359012a1d3f6f16155cb29c2ea3202aad01ad7f9fdd5c0e97b9d956ef998549f1e86ce84636993825b22b48593d SHA512 2845c30b034de806ec2339ad15e9a966349006db475d614c0399988cc1f6fee866f37e6d5c671d73414c11a14c28b7e56645b8cdebf1f785f47c15c5ca225d86
-EBUILD re2c-1.0.3.ebuild 782 BLAKE2B b20b14e780a6bdf3f9a09d7b21f67b9d797d403d176b5b25bab866600614a7e0bccc5ce043acee34ca3db5a32f32f47240750c3c91d8c0ea1b00ef48a67affd7 SHA512 829c3ff138da03fd1867869509533a24b964add4594c6115b2df2a042825ac164a3117afff3f2b03f34fa6c10df0e4db42d07ceca52e6489598f2a009dc61bc3
+EBUILD re2c-1.0.3.ebuild 775 BLAKE2B d900c12cca0e29783c9bf9b43e471f172202956298da33087e6adeba353852736cadc4b3db219c1fd21162b501538df8142b54cb766b26c5f98a10159daf3e9c SHA512 2f2dc833a2687ee2141fd3578a1247c324509341c426c89b8a7900cc03458d5d15025c81e2ea66267c642837acb0d88b0796684bf122652b0ac17072f2e2f38a
 EBUILD re2c-1.1-r1.ebuild 828 BLAKE2B 77af82ac7fe4bb64d21edb1bffea6b9709a50a6d0fbbd17ee930f2a9f224f03adf1dfc2909812f95d0bb5f981e990eef44165f672b81313ee2a9c38f30e7d12e SHA512 a8cfe105c87aa5e5e499e0f9443702bad00bc57a849a817a4b5e5cac294111dd3278deca9e4a415e73be303ad59c7c154f9dbe1e2ac2a35b4183bfea86309a58
+EBUILD re2c-1.1.1.ebuild 782 BLAKE2B b20b14e780a6bdf3f9a09d7b21f67b9d797d403d176b5b25bab866600614a7e0bccc5ce043acee34ca3db5a32f32f47240750c3c91d8c0ea1b00ef48a67affd7 SHA512 829c3ff138da03fd1867869509533a24b964add4594c6115b2df2a042825ac164a3117afff3f2b03f34fa6c10df0e4db42d07ceca52e6489598f2a009dc61bc3
 MISC metadata.xml 423 BLAKE2B 69ad12e8bd8cd2356e36736ab276efa0aadc2755f784fa4e7fe23ae4d4e7a27a06c8fcd4ee727f87847a7fdaf136d12e811a20345183d261d2b649724818f9f3 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9
diff --git a/dev-util/re2c/re2c-1.0.3.ebuild b/dev-util/re2c/re2c-1.0.3.ebuild
index bd4ecbe5865e..1e586786f0e1 100644
--- a/dev-util/re2c/re2c-1.0.3.ebuild
+++ b/dev-util/re2c/re2c-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-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 ~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 ~x64-solaris ~x86-solaris"
 
 src_prepare() {
 	default
diff --git a/dev-util/re2c/re2c-1.1.1.ebuild b/dev-util/re2c/re2c-1.1.1.ebuild
new file mode 100644
index 000000000000..bd4ecbe5865e
--- /dev/null
+++ b/dev-util/re2c/re2c-1.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.org/"
+SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+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 ~x64-solaris ~x86-solaris"
+
+src_prepare() {
+	default
+	export ac_cv_path_BISON="no"
+}
+
+src_install() {
+	default
+
+	docompress -x /usr/share/doc/${PF}/{examples,paper}
+	dodoc -r README CHANGELOG examples
+	docinto paper
+	dodoc doc/loplas.ps doc/tdfa/tdfa.pdf
+}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index e8a49aa7a91a..849edf2c145f 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,9 +1,6 @@
 AUX scons-2.5.1-respect-path.patch 1351 BLAKE2B e7bb7662394d6f5c6354b1616f5d4f36d65da8404916aea72c95bae5cfd9e1e3fb4286dc912ae55ba8c0863599223d68b3935ce18f5144f77006e6244e97f7f4 SHA512 6cc0d3b6dd711804f90af9b275e08071e6b0bb370e59aa5caadf3e192e096708f90b373de6ffba2ddaaffce0e2b5013df06f4e9259452bfcca8adcfa6b485618
 AUX scons-3.0.1-env-passthrough.patch 1507 BLAKE2B 9e21e0b14a3b6c95e2c501b5d264915a10c4c5908de98719c9a73c37f5f7de32824dce6df32a0884c4aeb53658d05cda5dbb9c6102ecd6307c085719d4e568c2 SHA512 07fa387b9ad50cd1e92495a414973acddac8c062827858b44867ff1da0560c1493d29992fe4ac2c6de8eb37ab218967df9a6d9ffa2cb26be772324a637fadbcb
 AUX scons-3.0.1-respect-cc-etc-r1.patch 3470 BLAKE2B 4302f7f6448541ba76aa1e66a51535603b4ea7a4c47cf9ed59c23d559f32668604a2b7250ef1d7e6c40e34c93d02ac4858bee1f3b7196c8eda05c4cb8fd464b0 SHA512 6154b22c677176d8644a392ad68d63da04a2f3616c6861471b7ea397f4542aba63ee30b1f14e2ad2f183ef78e3ccaf8ddea8c712b46f18da44881b20ea8c1497
-DIST scons-2.4.1-user.html 1110981 BLAKE2B 3c2c7c3bb283e18e63b5dfe64928c2821ceb74ac6d5f4c4fc08f0ceb98ef25f6114308d02d65be0ee8231e367556bdce0f76f1f37bb9d3c1ab813a653fda2f54 SHA512 e73caa3daedb5da419a417dbec73a3958da162311e9ad09a7d5e9d6989686b24cf5c1b34fdb1d547a43de1da36e99566e6c367fde05af032a2d1000a7e12270c
-DIST scons-2.4.1-user.pdf 2527773 BLAKE2B 16c9a90fd57af7552f8d05fcf018ed99b76d29c148169dee4fd610aa40e439448f5a7a6e8ba8d72830a605a26141927f5dcd1643f99a1bfe9433d87350e96569 SHA512 d53d41e51096d1923e168054d335da1498e9ca338e39aef7985967f839656d368b65a8b979dac701ca1c529deeff4a79f402f058d23ef4e658f849ce0784eb45
-DIST scons-2.4.1.tar.gz 638990 BLAKE2B 44084dd396d8cbe63da59aed706cda7342bbe51dd4f78bd324ad6ce822ae45b9da1099400e1dfeafdb2e4e8f1906e88be423598cc2c2915a1544f37285b31297 SHA512 bd0830719dfc0c2e8620ec767ee6342af74a170cd895acda2995761eafe52e1efa9471626fcaedb0dd9a779ef9bb9b4306bd6cd3c2a5bd7bd2500018b40653e0
 DIST scons-2.5.1-user.html 1112180 BLAKE2B 93df42b296d1be6ffcb73143c5ec9f46225e3e9d07154cf8f703d5f624d2996d85569ff302093a7a73dc0001cfeddf49ee9e57d9a1939d3c6b4689f8773e3ede SHA512 5be58a6bba4b92fc51f0b271fd7e08b820dda10775aaa40a012c0e54d485e02ebf6d0d0be379bd90980a9b496e86a951c8760a4a90107fb3b8f422e874e46046
 DIST scons-2.5.1-user.pdf 2522755 BLAKE2B 0dbf4ec98cd1dfb4889595762fdf57c2988a6784d75f8c3ac53e79d686b745ae4dd7b674ce34d61255c798e203fb6de93eaaf936a4842b27990350fa73b6bd46 SHA512 0bd7f67a1355ec33125bef87ce1bc352bda5b0befd9809673a427851c843191d74930b4ca9add705152393521f81d926595d173b0101013da216217dc5b64397
 DIST scons-2.5.1.tar.gz 620909 BLAKE2B 021e02583dab06a859e46d164be79dcaa49a1a383c5d3fb9baa64afabb793e049b7ebefff1bbbcc8be1f364ca5c64e1a9c7ef937c32407853e39f4d84a91e51d SHA512 0e39f7f22a6c4ecc13edcd843b050754da5ded5371b3a8b406395f7b53dd280f95f804707eec271f8de3624d06f5b4ba3cc788dc4eb891cad224a163544f51b9
@@ -11,10 +8,9 @@ DIST scons-3.0.1-user.html 1121915 BLAKE2B 0ee57d112ba6269a488335e9354723c645e4b
 DIST scons-3.0.1-user.pdf 2541376 BLAKE2B 43895501bf8b4a7eda12c5b3b076e6a71e949727224c279ef77671f7d4094245d37b9d8aeca6daa7d043c5513cc0c83e82a06f8a50bb4add4f0d750fce416bac SHA512 9fab1915c96cd32908cbbf123dfb8c97be99ec45df0461fa68ac47706f6bfc51d7ab970a43630e5414b01a8b9d27409e356b57c134478cec13f1bcbd97f615e7
 DIST scons-3.0.1.gh.tar.gz 5481813 BLAKE2B 750668bf034ff48f635db0395fc4fc950a7148c315099738da4d96f346d025b7dd3849e376d566e5f55793ee0b901ad8a4d7ff661068420f085ab76404ca244c SHA512 092a5d88191e4c9deee2e14371745fad1c3beee746f55256729444ad56a141a28f45ebeef4b2a7ec37344048ff16864d85b978855c0285a14b7c6f46f91158ac
 DIST scons-3.0.1.tar.gz 634815 BLAKE2B f5bacec048969d592697bc3dfb44678c25a92982f7ba81f9951e73532e8b9ac0906fe72c979d7818db5ab9b2c6dd380df21d323e47ea4cc0db646d6eed4b7d94 SHA512 b7be40ba507366cc678f31b910553cadaf59781c3a91833a34acbd29d9cad0cda38f6753034bf92c3af55d1e0c2f72aba5d81f1ec67205d0345b005d286f7084
-EBUILD scons-2.4.1.ebuild 1703 BLAKE2B 1fffba6edc3540869ce1af6c0a2e199614886610a464031395dd72e8f1311b703a398d9abb56eae9a67d4654529ec2fe06b8465f00fe83c442e251875dc53317 SHA512 69f7b513981e51bf547aad20f31af7ee98b77bb11bc10257499f92ea32d4a664cf83d77cabea81a56b068f2c18a40503567611e7ba78b987d4c6de1d52648b90
-EBUILD scons-2.5.1.ebuild 1602 BLAKE2B 4bdc43e095e80121469c7576b9261449c3da77d4fd03e8cec6a876313411d772a395077c0c313a6915b298c4c8bd78f50577ef652608a5abde18fff43c36d3ed SHA512 73e837984bbe9238e7cb88d48ba313c0227df7f69335d4238be0e223103dd324bdd44c6d8895a6f923cea2a4bfde86561a8c15c47b96a2372731df66b7304358
-EBUILD scons-3.0.1-r1.ebuild 1967 BLAKE2B ae9dfc2809576dfa427c386d3943a15d39710f6401ea86ecc99f68420b11b07df817873b801df0a1802f0f51d973ee90bf7af2eceb79faabe39c70aa7972011b SHA512 58e7761c68debf79f1740f02800e94271b7339981696870411b8179b4e4e0156d8921b08c758f31ebf085da89fd4f0e880472787835ac2bc464c50a17df9a3c6
-EBUILD scons-3.0.1-r100.ebuild 2078 BLAKE2B 44634da960c7a30c9a0b8923cf163ea0be4ce31308d9b57d6705dc9baacd8661d62b317ad622f058cdfaae29728d781708df22021038281b83e9e9f0dda1db71 SHA512 f34c403ac05b2f42f3e1de1dd4ab3a3e22c3377f68ac0781da2a04280123cd218c912f5ff784876139b78cd93fe9b0dabd8d3304a4f3341f01645459a154f766
-EBUILD scons-3.0.1-r3.ebuild 2066 BLAKE2B 177a52afb4171023de660f6afdc0d895f5cc499b619c2d427354f8c99282eece6567c6b08c66b8dc9f644ca2b7d1ae216471c289c1030dbd0becd875c972108e SHA512 b88dd6016af45be90e31c761b276cb354bca00e28b3939bbe7f2b0a704620f46e71fc5b58dcc5553e10565413501c22d5c6e19d9a67cc99d267bd474493206e0
+EBUILD scons-2.5.1.ebuild 1591 BLAKE2B 5a370c069a841b45cb9d7ec214c66312f5b3f9febcb953fd466662c5e70b866a1f48c70adacc7d9a43f11bcb8c07cb7d18a7f3dde80843460812742d982b108a SHA512 a08e399a4b43143f13b13d4731e839039dbc1b53482078b990d67f06c65a481f4eca889616fb5fccbc9fccd6c1703f307af5b8a010466039ec149eca5c7fa309
+EBUILD scons-3.0.1-r1.ebuild 1956 BLAKE2B 755a5cc59f7c791246113db9fca9ca453e890b6a44f8f6d7683e11ca8d204b3889a8e7fd024cf142b8629a3127b13ebe3c2c75f47cb18621bae552216d8849ce SHA512 6a3132dc13e48512c65e863fd7dc04e64b910fddc39debd6b73bcc3fad1ea82e9c662286a729c0643e02f5a906a793701e5b770a42be27ec504df9244052ec09
+EBUILD scons-3.0.1-r100.ebuild 2067 BLAKE2B dda32803f5b3d437cda566e7ba6c82ae175e8fecaf5314d557a3541269cf4cd3ec40b8ce684851579b1398f27b05d0afb8e1603c1b0687800ef09cdd0389641d SHA512 3a9c18f5fd65b8f18a1fe64f708b52201ccb42d9da5fedcb8ba12ea319856849f6e17c4b062d68556f1a033d11c0bdb31109c1dea0072b0d7c028b8fe0453312
+EBUILD scons-3.0.1-r3.ebuild 2055 BLAKE2B cb8d960fa29ac78b63c8a206738b849340dc5c767ad025142d2b2d6886f9e34560ed2d7ab776b761665ca3b960fb4b577ce6bdfbf0497bddf2d6b8231924dc90 SHA512 c0bff0c0657432ab736bd25eb46cbd5662f006d42602281c66a2b4032e776e8c630dac727c271766fb2ed1cd27f4ca7952e653ee09e81209fb6df2a97d0c0ad9
 EBUILD scons-3.0.1.ebuild 1738 BLAKE2B eb1430c2c64fe79b36cf776b1df482726982e7b871393e5f1e829e2e5e02c21a1db129248121435b97bd8288f4aed5cbde3a0f167041d8a0c26fe86575903062 SHA512 1454bc63720c78d58362ae72d311d3fd4b81ef8b01900cb36f6cda2aab235d06a4fb6c2631927ac4efcee0fc761c6a672a925bda248a7def5d49b43529d042d8
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-2.4.1.ebuild b/dev-util/scons/scons-2.4.1.ebuild
deleted file mode 100644
index 68b9b393ddfa..000000000000
--- a/dev-util/scons/scons-2.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
-
-LICENSE="MIT"
-SLOT="0"
-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"
-IUSE="doc"
-
-#PATCHES=(  )
-
-python_prepare_all() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=361061
-	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
-	# and make sure the build system doesn't "force" /usr/local/ :(
-	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--standard-lib \
-		--no-version-script \
-		--install-data "${EPREFIX}"/usr/share
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Build system does not use build_scripts properly.
-	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
-	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
-}
diff --git a/dev-util/scons/scons-2.5.1.ebuild b/dev-util/scons/scons-2.5.1.ebuild
index 4b85748576e4..bb60b4875ce3 100644
--- a/dev-util/scons/scons-2.5.1.ebuild
+++ b/dev-util/scons/scons-2.5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 #PATCHES=(  )
diff --git a/dev-util/scons/scons-3.0.1-r1.ebuild b/dev-util/scons/scons-3.0.1-r1.ebuild
index 212863e12920..777e651c9dfe 100644
--- a/dev-util/scons/scons-3.0.1-r1.ebuild
+++ b/dev-util/scons/scons-3.0.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 S=${WORKDIR}/${P}/src
diff --git a/dev-util/scons/scons-3.0.1-r100.ebuild b/dev-util/scons/scons-3.0.1-r100.ebuild
index 93ab8b574de7..0eedf0cbe6de 100644
--- a/dev-util/scons/scons-3.0.1-r100.ebuild
+++ b/dev-util/scons/scons-3.0.1-r100.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 S=${WORKDIR}/${P}/src
diff --git a/dev-util/scons/scons-3.0.1-r3.ebuild b/dev-util/scons/scons-3.0.1-r3.ebuild
index eaa2ef2426d0..286ff3abba41 100644
--- a/dev-util/scons/scons-3.0.1-r3.ebuild
+++ b/dev-util/scons/scons-3.0.1-r3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 S=${WORKDIR}/${P}/src
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index 952168e89d5a..5e6d75fe72aa 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -3,5 +3,5 @@ DIST ShellCheck-0.4.7.tar.gz 126593 BLAKE2B cbb925c4760a3744381dbee293d5e28ce429
 DIST ShellCheck-0.5.0.tar.gz 133265 BLAKE2B 703e3d994e6302d7bc6124ae064cbc5893c5119918a9a9b6cbda2c0415600b95545146061230b2e6ab07b6b2383a86b9bd3f153643c30c3f765a3424a1cd4bc0 SHA512 3b4b097f507c8910f5da1a739138511b9c30c156667c0887447043a7d0c3c371768953d7039803356f28e863266d3a34b5b1689889f3e524a3768e4d3223ce7c
 EBUILD shellcheck-0.4.6.ebuild 859 BLAKE2B 666e8057d0e035efe735dfb76c6c58f24dc8a8a651752646a843f096bcf8ffd3bb2b89b7f50d7b954b2b73ec7ddf46f808ea9f96dfed9fa1cb6efd9694afd093 SHA512 6bbeb59349d018d45f9606683c723809a84aae507b9bae3b913ef53c163314dfbd30cf6632b18839266089551f4f4b8bb29356850c72d5577f0bed2cc251d022
 EBUILD shellcheck-0.4.7.ebuild 861 BLAKE2B 36567203b1e8cf28594109bf34de03f9d8030e5c5829e7bd16921639f55a774b74d46f75e9876e457b09efbf935f6cc947cd89072d7fff83892f85c738973c6d SHA512 adafc1f025ee6f3c2c04626873d5ce06099f2130ab977dcf6b2b38e6610553ad9ee9c30888b3ceff45a59b70192cb13c6a03470932bf56f6bbddc666a5d9643f
-EBUILD shellcheck-0.5.0-r1.ebuild 927 BLAKE2B 4e5db22c897b8628936f52afbfb75afdcd0edc5e086ea0dd5ad4bb8501d8cf22ea0c2ea5a625d9a20fc75a163128691dae0c8b651401afcec45ef9577d492761 SHA512 2876aede3abc1575b557bdfc35aaa5c765b096037ab2fea0ef9dd3627bb36fcafa08933ea8ffd9772220490261d33d52d9f7295b5464ae9cd12c46f40c47955e
+EBUILD shellcheck-0.5.0-r1.ebuild 926 BLAKE2B 87532d0d1a95dafc036ebeccd92c3fee9aa48b37dc6eaf60ddab0b2afa4a046006ee861c7d972c2e8127740161ff596fa06c972f41fce4a47a2a4caec2608a6e SHA512 2b3e2d8f164c29091f28247a0db505e12ee81cef2d3295df17c4431606601fa82c9ed3389592732a284ff68f7bedb2f41b6d1bc19b19cc6d16369df6630e09fa
 MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
diff --git a/dev-util/shellcheck/shellcheck-0.5.0-r1.ebuild b/dev-util/shellcheck/shellcheck-0.5.0-r1.ebuild
index 24d151f97a70..a02cf03bfded 100644
--- a/dev-util/shellcheck/shellcheck-0.5.0-r1.ebuild
+++ b/dev-util/shellcheck/shellcheck-0.5.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-haskell/aeson:=[profile?]
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 52c521b7e259..1e04a00748b6 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,8 +1,8 @@
 DIST strace-4.20.tar.xz 1132460 BLAKE2B 2e0e3080008ed1d5fd87572df740af8c62ebba44e0ece3c6b5ab581f246e79d8074a7fc2d0857abe158a055042fccbd880e11c9567beca1aeddc23f92d763c2d SHA512 869b3b9c48401619073a021e20e80cce37d8884f615bdb52dac9e6a2903df11507d7a0cb0ccad75bcc03d8dfafead0e68d14267e663503e94849079c9a2ebd4c
 DIST strace-4.23.tar.xz 1379128 BLAKE2B e1b680774172ba65190acc201a00f36ff608eb5a8239f8a6665b9f0eebfb7715eb3469d45c2333e4fac9a498ad3b448b1f39716b92cab91b035bc1e4125382eb SHA512 b54df972dc86e27668784ea4619e8c55230816b249e0a7fcca99a37b7f9ec37710742aca08c9e39b508522accb654a83c98207bab9ccac1197bb8e73e51ab116
 DIST strace-4.24.tar.xz 1398252 BLAKE2B ca83adfb3ccd23a55976c2950ce5911203e1ad911147649127e49d815e4899b5fd72459c371c15aea701d0d30e994d0eca2b32aad240fccc4e8d1cecb3f97558 SHA512 69cbf8b2c32c7ea90ebe5955bc71b454316a3494ae6975203fe61ce1f42ec539438cec5ba8ee7f529f89661d964b4aa53656712706aacff6bf018304b7a09813
-EBUILD strace-4.20.ebuild 1938 BLAKE2B c5ac6fcf26c6d6543fb58624114f3e034d32df958b1a98a57abcdb1a07d2a994c5c3e8794b3f43ab4862605bc0190d2717abe57599333dcd7610a5dd2721d5be SHA512 d6d66f647dde209d9677016bcc231f2edfcc0cdf83875b2df1c063e4b3a7921783e522fd5708655de97127fb17e2ddb877acefbececae6348bffecfdbc7c3b8f
-EBUILD strace-4.23-r1.ebuild 2277 BLAKE2B 0d14908ceda437cf5fc4c2883fb343fcddfb7191c729f72ce99d5b2f4eb41a18c55aadefc6f72510dd3992d6d7efbba6547b2dbc59037fdd6d40a681aa2a9b3a SHA512 917bb1f3c8c015f768d32899a724c5dda2a23d05c8de5c38cfdcc452c3b1b58aed5f7d8bbbf76834e419b23727b4d3b65c6e5fa7b6ea1c1c1537565a5b867296
-EBUILD strace-4.24.ebuild 2277 BLAKE2B 0d14908ceda437cf5fc4c2883fb343fcddfb7191c729f72ce99d5b2f4eb41a18c55aadefc6f72510dd3992d6d7efbba6547b2dbc59037fdd6d40a681aa2a9b3a SHA512 917bb1f3c8c015f768d32899a724c5dda2a23d05c8de5c38cfdcc452c3b1b58aed5f7d8bbbf76834e419b23727b4d3b65c6e5fa7b6ea1c1c1537565a5b867296
-EBUILD strace-9999.ebuild 2283 BLAKE2B cf962151854597584f0fae1b649379c2ae6b7f448acc11042c56750ce401670f32ade92d142a2124c69a027d8147b8a5610877c5e3928826fec66447329a5b8f SHA512 0d200822ace7b03abbee2b03d2c997c129877400eea8828c4bc27d22e6b2131be04e5ae822241e633410059c531c67b5fff2bb8232d8a08a5585a40dea0e243c
+EBUILD strace-4.20.ebuild 1927 BLAKE2B d296e1d01f08feef4712decf394dd451dd6fefdeb1bf5b4111c72e4a8c7651a119c176eb9ac0dcb65c7ecfc20ef6f434e4d50c7b44d862451a7afa9977797078 SHA512 55caeb0aee455a8925846313b768ebf7da341be986c9cbad396e469fee9939db3d813d91279eb9d62b9424da28bba9e1e39c4c06dc4f46fa984f30399e0130a4
+EBUILD strace-4.23-r1.ebuild 2266 BLAKE2B a68da655172bba2180cc259bae15a13f535ebfa46a4050980158bbb700b6c91466b802c07a3a40ad4e426c88111ce7a3d30b59e392917bcbfde44cd96c864125 SHA512 9471fc12e8ea0ea45a82f64d99098eb6d082b9b8b5ee95c681f2e29703cc8bbd3598f37364b776714691bf86a71589ad21fa9e2b091513860d0580ac6e3c64dd
+EBUILD strace-4.24.ebuild 2266 BLAKE2B a68da655172bba2180cc259bae15a13f535ebfa46a4050980158bbb700b6c91466b802c07a3a40ad4e426c88111ce7a3d30b59e392917bcbfde44cd96c864125 SHA512 9471fc12e8ea0ea45a82f64d99098eb6d082b9b8b5ee95c681f2e29703cc8bbd3598f37364b776714691bf86a71589ad21fa9e2b091513860d0580ac6e3c64dd
+EBUILD strace-9999.ebuild 2272 BLAKE2B e1f86bbddaacfe0d7c531dd871cd9f0f365d3f02dfce6dee388a4f89b0a5de0963695358ce3716b8c1bba366cd7fa5bff9261524d53975d540be2ad85244139e SHA512 372028d8e3ec29deabee8834187c3730d5fd671caad95246ea09d96030295dd21a4d1085acd6488e8219f0b44a2ef140e46390052eca150031883b233e9f559d
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/strace-4.20.ebuild b/dev-util/strace/strace-4.20.ebuild
index 4093a8fe8f0c..8e84ee120bc5 100644
--- a/dev-util/strace/strace-4.20.ebuild
+++ b/dev-util/strace/strace-4.20.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/strace/strace-4.23-r1.ebuild b/dev-util/strace/strace-4.23-r1.ebuild
index a16ee1f785c0..058032a5025f 100644
--- a/dev-util/strace/strace-4.23-r1.ebuild
+++ b/dev-util/strace/strace-4.23-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/strace/strace-4.24.ebuild b/dev-util/strace/strace-4.24.ebuild
index a16ee1f785c0..058032a5025f 100644
--- a/dev-util/strace/strace-4.24.ebuild
+++ b/dev-util/strace/strace-4.24.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index bac8d4b752b0..cf9b88390846 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index dc378924a613..84e75674e9e0 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,7 +1,3 @@
-DIST sysdig-0.22.1.tar.gz 825171 BLAKE2B aa4836ed0be30fb3d8318b151c3f60586daaea15974558e7d81ba2da6d9c511bedc67fe8bc518697b6a268ea93bd112f64ae5772ef75c10d8b57d06e1468ff13 SHA512 e9f5ca594dc31832b4ea365a624208f5319add1480cfe9fb3d0e960757229fbe6ce46b906a390a667147ae1a7c0a31fd7ffeb9a1a0b376376530d4f60f397453
-DIST sysdig-0.23.0.tar.gz 829716 BLAKE2B d507d28ef606e4ccd96fec1fa735bf305ceb2b2d0292b872309d877c7492def92b7305866316977f0e12325f3b8ae180a1633c8d969b1761eb2197b5250f4d43 SHA512 e6ad3f5bba1ad7307a7e0769b1a9a0c20659fff5bcc06b741cb9ce23428d4de38b5acf32a37d10bb1b41e839cc3a86b89075bde577c3f200e9fa5b4bad33a77d
 DIST sysdig-0.23.1.tar.gz 830420 BLAKE2B 31a8c4cd8b570a308c81b4df53494cff2619d05724e509634671968025ebee0e46c5e59a7c877e6d9f1f1eba86a8a27a0cd9c5b66e75723ec8eec66c6782d4c0 SHA512 059a564a5d31381efae4bc50d2b83f83a1d051f1cfb9fa6bfb75a341305149073a6eb3b9a3ce4da12fa293e75b71f8b30c9021ac8d4c4a2f59a40e35a5ffd482
-EBUILD sysdig-0.22.1.ebuild 1881 BLAKE2B 13b91e07489dc8dd42a88fdccffe3f122f59a8b6256bca5b1559f95d9b3bbd34e1a6248dc1b98e241bd146103798bdfa2967230a88326ae1cdae4117892d492a SHA512 db667f8017f3f11ff462d79725c092c68e63adc87e970346831d93945ac2e5fdcaa8e97b7ac8d59a159e52d1a290b74554fee27b5e46569f57326c6c40c6a39f
-EBUILD sysdig-0.23.0.ebuild 1881 BLAKE2B 13b91e07489dc8dd42a88fdccffe3f122f59a8b6256bca5b1559f95d9b3bbd34e1a6248dc1b98e241bd146103798bdfa2967230a88326ae1cdae4117892d492a SHA512 db667f8017f3f11ff462d79725c092c68e63adc87e970346831d93945ac2e5fdcaa8e97b7ac8d59a159e52d1a290b74554fee27b5e46569f57326c6c40c6a39f
 EBUILD sysdig-0.23.1.ebuild 1881 BLAKE2B 13b91e07489dc8dd42a88fdccffe3f122f59a8b6256bca5b1559f95d9b3bbd34e1a6248dc1b98e241bd146103798bdfa2967230a88326ae1cdae4117892d492a SHA512 db667f8017f3f11ff462d79725c092c68e63adc87e970346831d93945ac2e5fdcaa8e97b7ac8d59a159e52d1a290b74554fee27b5e46569f57326c6c40c6a39f
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/sysdig-0.22.1.ebuild b/dev-util/sysdig/sysdig-0.22.1.ebuild
deleted file mode 100644
index e366e6626308..000000000000
--- a/dev-util/sysdig/sysdig-0.22.1.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"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-
-	if use modules; then
-		cmake-utils_src_make configure_driver
-
-		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	linux-mod_src_install
-
-	# remove sources
-	rm -r "${ED%/}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED%/}"/usr/etc || die
-}
diff --git a/dev-util/sysdig/sysdig-0.23.0.ebuild b/dev-util/sysdig/sysdig-0.23.0.ebuild
deleted file mode 100644
index e366e6626308..000000000000
--- a/dev-util/sysdig/sysdig-0.23.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"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-
-	if use modules; then
-		cmake-utils_src_make configure_driver
-
-		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	linux-mod_src_install
-
-	# remove sources
-	rm -r "${ED%/}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED%/}"/usr/etc || die
-}
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index db18987678ba..e797581127cb 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,5 +1,8 @@
+AUX 3.28.1-fix-nosystemd-build.patch 1336 BLAKE2B f6292baad803ceca64be6a3b32793ecc4c1f99a946f247af7e79ef3ec421657230a7c473b219e9286a385c5ca25826aa192275ad1a3e1b78f2badb45a97e2c80 SHA512 d9a5c46b778835ba15c349e8458cb2dc6d950f1ad3008d0d089b5bb2235b15c4e461f9bbeb54a76085f59bf53873e671cdfcbf09c5f6f9c99251abef236b2aa1
 DIST sysprof-3.24.1.tar.xz 595920 BLAKE2B 90582eab3fc12a0169c151ce0fad20b839841f77a31e5858f8d660f9b0f2630396bec3b239dd88baa3f6e3dd936bdd6d63a652e491a1d32f966a755f9099f160 SHA512 5d323bcb9923c511065132711963dc8856c4d837b4d7ccfae5cc5794be5ac8ad1dc42504025469199f4bfd6a6fad4d8f49b7b21cab6f0c9a954820182e75c7d0
 DIST sysprof-3.26.1.tar.xz 609076 BLAKE2B fd10ce27b224100558ff5bb9c75cfffcb76b2331d2c4056bd73a9ace1ea155e61d705240acf6fefa805fba2333f6d439369d5b1cc16e0c537ab9fed408bf6d85 SHA512 ee03360e4971cd91129bac3cc9d2cf292d29aafe1cdacd078e404ee15c3ff02bcd0c0159502605c00eb2abd3a46917cf70458ad05e48b594eeb2835ead55c34c
+DIST sysprof-3.28.1.tar.xz 380720 BLAKE2B 0a3b93659e421b717230bff6e90d20b28f8abc8491fddb51bc3f106b6cd8b038254e1fd0260c6eee2c2b83d77765be43f394d49bd34c054c36d6427ef419fefa SHA512 ca75c279bcb8cb37bffdba51d5b3481c3ece104847b64c0b8cb534468c9350a96c7224bf261ef892817e53aff2cff90a2b808f5db5a9afd6230721664b83809b
 EBUILD sysprof-3.24.1.ebuild 1762 BLAKE2B 2af5ed24c22b41c66be0e4526b8e1627f1215320444c23559e6e553125700e31df955ec542b9ee04ec9a12a0bd4a669eb23cd4fbf96de6fb8d3562cb2c258c2b SHA512 24b82366648690bd9a4a03e04dc14e88d23c177c75dcca745a816213cf018ea4a959bb733da54ae0b1cbe85706df63cfc79140744716300a457c348eeb57982b
 EBUILD sysprof-3.26.1.ebuild 1764 BLAKE2B c3afd518bfb3a05f88c51a4f2f43834ddacaf6ce62701a4ec828623d3adb733a59b4d67f5952f740a72ff261e6a27464bd521fdc941cf83386d1c583c28e8453 SHA512 6c627f3dfb0f5bf32576489b6a03be94c54faf192df73be2fc39fc5bccb98e2c19a99f5d303e1b663e28d2df5348a411d40f633b259f1244e9b63857293db2e3
+EBUILD sysprof-3.28.1.ebuild 2125 BLAKE2B 3b0c90203488837b33015d2048cbd066bf7b0800f1135f04c810885c6d336ee9bab33b0e7e7730e01681a4cea77101b87865e9c85a5c51a85496d408519f80ff SHA512 02a7727f8a58712bf3fc9c91c41a0a5ddedeaa513c69ab9d5a0c5487c10d9afcaa8cbc35065b5d477378c71a919bafbebfe5fc1ce9cba1ed64e072f130c902f8
 MISC metadata.xml 842 BLAKE2B a36dfd049b5a5307006e5189a46fff5b6de8f16fbb8fcaffa8d737895e9864974478c00007b452c350b673fdc735e809ace65fb31d9a7e21c4d4905d9e1d3574 SHA512 cf90f7e7b64c02bb8ca0ec210959c39e004b0c4f6707b2c489ef2a566fd8d62961b902c00deec95f2f762c55d142f5d706a944553cd8e37bcce3d62c9eff8a9d
diff --git a/dev-util/sysprof/files/3.28.1-fix-nosystemd-build.patch b/dev-util/sysprof/files/3.28.1-fix-nosystemd-build.patch
new file mode 100644
index 000000000000..c83a951d846a
--- /dev/null
+++ b/dev-util/sysprof/files/3.28.1-fix-nosystemd-build.patch
@@ -0,0 +1,51 @@
+From 28c28eb11ac1696ce08c9c90e8a7a7759bc5c50b Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Tue, 28 Aug 2018 12:22:57 -0700
+Subject: [PATCH] kernel-symbol: respect ENABLE_POLKIT setting
+
+This fixes the compilation when we have sysprofd fully disabled.
+That is not an ideal configuration, but keeping it working
+ensures that some of the code is easy copy/paste'able in the
+future for some situations.
+---
+ lib/symbols/sp-kernel-symbol.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/lib/symbols/sp-kernel-symbol.c b/lib/symbols/sp-kernel-symbol.c
+index 8eb8087..14e026f 100644
+--- a/lib/symbols/sp-kernel-symbol.c
++++ b/lib/symbols/sp-kernel-symbol.c
+@@ -18,8 +18,13 @@
+ 
+ #define G_LOG_DOMAIN "sp-kernel-symbol"
+ 
++#include "config.h"
++
+ #include <gio/gio.h>
+-#include <polkit/polkit.h>
++
++#ifdef ENABLE_POLKIT
++# include <polkit/polkit.h>
++#endif
+ 
+ #include "sp-kallsyms.h"
+ 
+@@ -87,6 +92,7 @@ type_is_ignored (guint8 type)
+ static gboolean
+ authorize_proxy (GDBusConnection *conn)
+ {
++#ifdef ENABLE_POLKIT
+   PolkitSubject *subject = NULL;
+   GPermission *permission = NULL;
+   const gchar *name;
+@@ -113,6 +119,7 @@ authorize_proxy (GDBusConnection *conn)
+ failure:
+   g_clear_object (&subject);
+   g_clear_object (&permission);
++#endif
+ 
+   return FALSE;
+ }
+-- 
+2.17.0
+
diff --git a/dev-util/sysprof/sysprof-3.28.1.ebuild b/dev-util/sysprof/sysprof-3.28.1.ebuild
new file mode 100644
index 000000000000..f6664d0b9fb6
--- /dev/null
+++ b/dev-util/sysprof/sysprof-3.28.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="System-wide Linux Profiler"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk systemd"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	sys-auth/polkit
+	gtk? ( >=x11-libs/gtk+-3.22.0:3 )
+	systemd? ( >=sys-apps/systemd-222 )
+"
+# libxml2 required for glib-compile-resources; appstream-glib for appdata.xml translations
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.6
+	>=sys-kernel/linux-headers-2.6.32
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PV}-fix-nosystemd-build.patch )
+
+src_configure() {
+	# -Dwith_sysprofd=host currently unavailable from ebuild
+	local emesonargs=(
+		$(meson_use gtk enable_gtk)
+		-Dwith_sysprofd=$(usex systemd bundled none)
+		-Dsystemdunitdir=$(systemd_get_systemunitdir)
+		# -Ddebugdir
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+
+	elog "On many systems, especially amd64, it is typical that with a modern"
+	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
+	elog "debugging is still possible thanks to gcc4/gdb location list feature."
+	elog "However sysprof is not able to construct call trees if frame pointers"
+	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
+	elog "for the libraries and applications involved in the profiling. That"
+	elog "means a CPU register is used for the frame pointer instead of other"
+	elog "purposes, which means a very minimal performance loss when there is"
+	elog "register pressure."
+	if ! use systemd; then
+		elog ""
+		elog "Without systemd, sysprof may not function when launched as a regular user,"
+		elog "thus suboptimal running from root account may be necessary."
+		if use gtk; then
+			elog "Under wayland, that limits the recording usage to sysprof-cli utility."
+		fi
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index cb00ec01168d..9345ef0ead46 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,3 +1,5 @@
+AUX valgrind-3.13.0-accept-read-only-PT_LOAD-segments-and-rodata.patch 3765 BLAKE2B afce6e0e939040a76213733a4e3cb1ac0a26841fc9101d9fb8d74875861d8e5fb51f1813b2e377d15ea53a36166743c32550f00d1021bf4882fd8e2c4b43a127 SHA512 08c7db66502538f2dfa795b12dcbdfef6dc1f379da93af61f4a54fa48016be98a079c7ba4cc000d2972a2a1863ea01ce3d7c643ff993dfc3bc96d874b097473e
+AUX valgrind-3.13.0-ignore-further-mappings-after-read-all-debuginfo.patch 3340 BLAKE2B 344519d755c875acfd70eb7fd475057eacb1321401bafeffb2f632e1edfb01e88db9fef2cf6541db0cae9a7d11cd2d2eb1f00429561a22f96621242c696c9112 SHA512 28bc64b5157738302aee97cbaf0b57ca6f17166de1e63167fe879560f493510b2db17478847519731004f72f87904e0647f593a53d88aa8638b1e1738310954d
 AUX valgrind-3.13.0-test-fixes.patch 929 BLAKE2B cf0316cc3637785bfa57cd2277ad7669ab968b28424bdcf56c47219c90d00915f51293bfc90f5319785752bcebbde7b011dbac964f9538ac2f4208ec7709047f SHA512 1cff77e987e2d20ce1563c96d76431c60c142c42afa978e32d3a8c8dda17d0f3c1ba29fe3d0fcf0e7445fa5ca9558690ecdaad259fb9d23f435dcdc0baa9175d
 AUX valgrind-3.13.0-xml-socket.patch 934 BLAKE2B 151db92f36623a27a6798eb0e559211613fb70e6847985446f4d3cd2a31f9930377e66efc46ae86116f8bcec855cfef2640111bce543ecd3a3e92914f0fa04cb SHA512 a250d6c395a6a02f3898ca94edab92785a720024ce0555c0b48cfe6c96c3bfcc088c5c67242019cb7d89f68066cffde18efe2c74f9b7f8e068b012173c3ec189
 AUX valgrind-3.7.0-fno-stack-protector.patch 554 BLAKE2B cd87e1bbf86b82face9dbbaddbbbb2773c6f1223e725898dfd5d0ae9078948642c4f2b9deca2bded676230bcfa20d39071f69e640a64dc254759115971374a82 SHA512 4f9573fd68a0e1e209518fb4100c27b697ccd28e7a39abaa921f1949cd87ffb79a6784d2d1f6e006d68a08c7217cee77cba378c18aab48b87a3824eedb53ed5e
@@ -7,6 +9,7 @@ DIST valgrind-3.13.0.tar.bz2 14723076 BLAKE2B cdf92087575cc851d316e2136081441f52
 EBUILD valgrind-3.12.0.ebuild 2854 BLAKE2B 07c651acb3854432137f09513f991cb549b6192a704a26ed9626816f8650acfca0179c7064e772e59058a7657b1c0407a87753ec30b2209cf47aa04d68d908ca SHA512 a65f3ccca3a33e2bbae7d2616b2fa13a6a3913e927f601f8ef52172981f72c03219ccad126a801719688cb6106dea18c56ac0e14de194e065bffa744151ab457
 EBUILD valgrind-3.13.0-r1.ebuild 3428 BLAKE2B 96f18609fe79c997b4d344ecf59be9356aafd5ed7bc4e03b028f06e3e938ee1f00440289f7918ab935ccc42fa2bea2d316bb1d96c43ef40a85374b12e0b5683c SHA512 aa0fe6e76e52d25c6b05a30c46de96aabf539f7166bd369b21b93522d52e01d9fc50c77769170021038b0ec60911cd07bf5afccca86e35ad49828e401ed4d61e
 EBUILD valgrind-3.13.0-r2.ebuild 3879 BLAKE2B 03709383d7167d639ec5f3d461b0990c1d240a5260f5f4533a7dc79ca3b789ae9cfb7f749a11be2dfb410cadf7364ffd13515c63ee3673fee3fcb4d07b8a4b25 SHA512 c2f81be414f2d5d2853350b1e1652f5cc03578962d3a8ed5a31462defe970b1a5b7f4820f02fb76e4a7494ec5377af35149c0c22c9378619e2705247f490268b
+EBUILD valgrind-3.13.0-r3.ebuild 4121 BLAKE2B 0770974a05e87ad0ffec0516521d5954196b0a5ffc62ce2aae925bbe29a2acd076cac3d5751bf92535ce59f554ae51403849b1b7fb4c6f71ade7fcbe0c333554 SHA512 1f0921aba9cdd3a192fdc3ae5a77da773c7c9e485acbb38c9ac8de6208496d44d10edc01126e8488e17231c45cf8a769d3226ab18d8436e7857497a3b07dd2f8
 EBUILD valgrind-3.13.0.ebuild 2854 BLAKE2B 8228042c5f24ce771f07f3b44c94a26dec805e7ce03ecd545a7b7caee1c3a41f93deeed2b298a99b9560614e64b54961e4df3c8d902984b34ed0b2e005568107 SHA512 771bf52c0436aa15175df29d10e3f191e5e9511a50dd466ef6a102c7b13d677ad84adf387b7edb99b6cdce1f38f644adbdc3a40bdaacabb22168f2aa07302fcc
 EBUILD valgrind-9999.ebuild 3675 BLAKE2B 4405fa37a59f844c3ab8f5ca933408834a7986b4534542f7276214ed9616912f9df22b62f3bd2dcaa8693acaf0c19f09489d67ea8825bc8d2ee6e5d387aca10b SHA512 408fb2dd9e8676dcf117298f03dcedd5dd54f8eb33d75c04f6f890817a82a9035b7387d4a075ef7bebc52c2008ae99c7831eb0e9e7553eae449ccc3f6160a3fa
 MISC metadata.xml 1139 BLAKE2B fef548fc43861a5c031c4db6fcd5a446cb3a33b030916a118de1d99e78fc893991cd20f06d545d7731668e4ad859ded8e8b980e35e383ba27ecb96b704757a95 SHA512 f3ee37b8e5f408c01d5f6308644305fcb945df008e5f708dbde95f73a1e7988f53799e28bd72f75bd5e01765414a0e11b8045f671e723beb46d90a50f5dd1846
diff --git a/dev-util/valgrind/files/valgrind-3.13.0-accept-read-only-PT_LOAD-segments-and-rodata.patch b/dev-util/valgrind/files/valgrind-3.13.0-accept-read-only-PT_LOAD-segments-and-rodata.patch
new file mode 100644
index 000000000000..41f73b43f351
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.13.0-accept-read-only-PT_LOAD-segments-and-rodata.patch
@@ -0,0 +1,95 @@
+See https://bugs.gentoo.org/664882
+
+From 64aa729bfae71561505a40c12755bd6b55bb3061 Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mark@klomp.org>
+Date: Thu, 12 Jul 2018 13:56:00 +0200
+Subject: [PATCH] Accept read-only PT_LOAD segments and .rodata.
+
+The new binutils ld -z separate-code option creates multiple read-only
+PT_LOAD segments and might place .rodata in a non-executable segment.
+
+Allow and keep track of separate read-only segments and allow a readonly
+page with .rodata section.
+
+Based on patches from Tom Hughes <tom@compton.nu> and
+H.J. Lu <hjl.tools@gmail.com>.
+
+https://bugs.kde.org/show_bug.cgi?id=395682
+---
+ coregrind/m_debuginfo/debuginfo.c |  2 --
+ coregrind/m_debuginfo/readelf.c   | 34 +++++++++++++++++++++++--------
+ 3 files changed, 27 insertions(+), 10 deletions(-)
+
+--- a/coregrind/m_debuginfo/debuginfo.c
++++ b/coregrind/m_debuginfo/debuginfo.c
+@@ -957,9 +957,7 @@
+ #    error "Unknown platform"
+ #  endif
+ 
+-#  if defined(VGP_x86_darwin) && DARWIN_VERS >= DARWIN_10_7
+    is_ro_map = seg->hasR && !seg->hasW && !seg->hasX;
+-#  endif
+ 
+ #  if defined(VGO_solaris)
+    is_rx_map = seg->hasR && seg->hasX && !seg->hasW;
+--- a/coregrind/m_debuginfo/readelf.c
++++ b/coregrind/m_debuginfo/readelf.c
+@@ -1785,7 +1785,7 @@
+                Bool loaded = False;
+                for (j = 0; j < VG_(sizeXA)(di->fsm.maps); j++) {
+                   const DebugInfoMapping* map = VG_(indexXA)(di->fsm.maps, j);
+-                  if (   (map->rx || map->rw)
++                  if (   (map->rx || map->rw || map->ro)
+                       && map->size > 0 /* stay sane */
+                       && a_phdr.p_offset >= map->foff
+                       && a_phdr.p_offset <  map->foff + map->size
+@@ -1816,6 +1816,16 @@
+                            i, (UWord)item.bias);
+                         loaded = True;
+                      }
++                     if (map->ro
++                         && (a_phdr.p_flags & (PF_R | PF_W | PF_X))
++                            == PF_R) {
++                        item.exec = False;
++                        VG_(addToXA)(svma_ranges, &item);
++                        TRACE_SYMTAB(
++                           "PT_LOAD[%ld]:   acquired as ro, bias 0x%lx\n",
++                           i, (UWord)item.bias);
++                        loaded = True;
++                     }
+                   }
+                }
+                if (!loaded) {
+@@ -2083,17 +2093,25 @@
+          }
+       }
+ 
+-      /* Accept .rodata where mapped as rx (data), even if zero-sized */
++      /* Accept .rodata where mapped as rx or rw (data), even if zero-sized */
+       if (0 == VG_(strcmp)(name, ".rodata")) {
+-         if (inrx && !di->rodata_present) {
+-            di->rodata_present = True;
++         if (!di->rodata_present) {
+             di->rodata_svma = svma;
+-            di->rodata_avma = svma + inrx->bias;
++            di->rodata_avma = svma;
+             di->rodata_size = size;
+-            di->rodata_bias = inrx->bias;
+             di->rodata_debug_svma = svma;
+-            di->rodata_debug_bias = inrx->bias;
+-                                    /* NB was 'inrw' prior to r11794 */
++            if (inrx) {
++               di->rodata_avma += inrx->bias;
++               di->rodata_bias = inrx->bias;
++               di->rodata_debug_bias = inrx->bias;
++            } else if (inrw) {
++               di->rodata_avma += inrw->bias;
++               di->rodata_bias = inrw->bias;
++               di->rodata_debug_bias = inrw->bias;
++            } else {
++               BAD(".rodata");
++            }
++            di->rodata_present = True;
+             TRACE_SYMTAB("acquiring .rodata svma = %#lx .. %#lx\n",
+                          di->rodata_svma,
+                          di->rodata_svma + di->rodata_size - 1);
diff --git a/dev-util/valgrind/files/valgrind-3.13.0-ignore-further-mappings-after-read-all-debuginfo.patch b/dev-util/valgrind/files/valgrind-3.13.0-ignore-further-mappings-after-read-all-debuginfo.patch
new file mode 100644
index 000000000000..5b47512c1553
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.13.0-ignore-further-mappings-after-read-all-debuginfo.patch
@@ -0,0 +1,70 @@
+Follow up for valgrind-3.13.0-accept-read-only-PT_LOAD-segments-and-rodata.patch.
+
+From e752326cc050803c3bcfde1f8606bead66ff9642 Mon Sep 17 00:00:00 2001
+From: Julian Seward <jseward@acm.org>
+Date: Tue, 14 Aug 2018 10:13:46 +0200
+Subject: [PATCH] VG_(di_notify_mmap): once we've read debuginfo for an object,
+ ignore all further mappings.  n-i-bz.
+
+Once we've read debuginfo for an object, ignore all further mappings.  If we
+don't do that, applications that mmap in their own objects to inspect them for
+whatever reason, will cause "irrelevant" mappings to be recorded in the
+object's fsm.maps table.  This can lead to serious problems later on.
+
+This has become necessary because 64aa729bfae71561505a40c12755bd6b55bb3061 of
+Thu Jul 12 2018 (the fix for bug 395682) started recording readonly segments
+in the fsm.maps table, where before they were ignored.
+---
+ coregrind/m_debuginfo/debuginfo.c | 29 ++++++++++++++++++++++++++++-
+ 1 file changed, 28 insertions(+), 1 deletion(-)
+
+diff --git a/coregrind/m_debuginfo/debuginfo.c b/coregrind/m_debuginfo/debuginfo.c
+index c36d498..55c05cb 100644
+--- a/coregrind/m_debuginfo/debuginfo.c
++++ b/coregrind/m_debuginfo/debuginfo.c
+@@ -1200,6 +1200,32 @@ ULong VG_(di_notify_mmap)( Addr a, Bool allow_SkFileV, Int use_fd )
+    di = find_or_create_DebugInfo_for( filename );
+    vg_assert(di);
+ 
++   /* Ignore all mappings for this filename once we've read debuginfo for it.
++      This avoids the confusion of picking up "irrelevant" mappings in
++      applications which mmap their objects outside of ld.so, for example
++      Firefox's Gecko profiler.
++
++      What happens in that case is: the application maps the object "ro" for
++      whatever reason.  We record the mapping di->fsm.maps.  The application
++      later unmaps the object.  However, the mapping is not removed from
++      di->fsm.maps.  Later, when some other (unrelated) object is mapped (via
++      ld.so) into that address space, we first unload any debuginfo that has a
++      mapping intersecting that area.  That means we will end up incorrectly
++      unloading debuginfo for the object with the "irrelevant" mappings.  This
++      causes various problems, not least because it can unload the debuginfo
++      for libc.so and so cause malloc intercepts to become un-intercepted.
++
++      This fix assumes that all mappings made once we've read debuginfo for
++      an object are irrelevant.  I think that's OK, but need to check with
++      mjw/thh.  */
++   if (di->have_dinfo) {
++      if (debug)
++         VG_(printf)("di_notify_mmap-4x: "
++                     "ignoring mapping because we already read debuginfo "
++                     "for DebugInfo* %p\n", di);
++      return 0;
++   }
++
+    if (debug)
+       VG_(printf)("di_notify_mmap-4: "
+                   "noting details in DebugInfo* at %p\n", di);
+@@ -1220,7 +1246,8 @@ ULong VG_(di_notify_mmap)( Addr a, Bool allow_SkFileV, Int use_fd )
+    di->fsm.have_ro_map |= is_ro_map;
+ 
+    /* So, finally, are we in an accept state? */
+-   if (di->fsm.have_rx_map && di->fsm.have_rw_map && !di->have_dinfo) {
++   vg_assert(!di->have_dinfo);
++   if (di->fsm.have_rx_map && di->fsm.have_rw_map) {
+       /* Ok, so, finally, we found what we need, and we haven't
+          already read debuginfo for this object.  So let's do so now.
+          Yee-ha! */
+-- 
+2.9.3
+
diff --git a/dev-util/valgrind/valgrind-3.13.0-r3.ebuild b/dev-util/valgrind/valgrind-3.13.0-r3.ebuild
new file mode 100644
index 000000000000..4c963a7314dd
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.13.0-r3.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="mpi"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://sourceware.org/git/${PN}.git/"
+	inherit git-r3
+else
+	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+	# Don't force multiarch stuff on OSX, bug #306467
+	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
+
+	# Respect CFLAGS, LDFLAGS
+	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+	# Fix test failures on glibc-2.26
+	eapply "${FILESDIR}"/${P}-test-fixes.patch
+
+	# Fix --xml-socket command line option (qt-creator), bug #641790
+	eapply "${FILESDIR}"/${P}-xml-socket.patch
+
+	# Fix reading debug info from binaries built with -z separate-code, bug #664882
+	eapply "${FILESDIR}"/${P}-accept-read-only-PT_LOAD-segments-and-rodata.patch
+	eapply "${FILESDIR}"/${P}-ignore-further-mappings-after-read-all-debuginfo.patch
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# upstream doesn't support this, but we don't build with
+		# Sun/Oracle ld, we have a GNU toolchain, so get some things
+		# working the Linux/GNU way
+		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
+			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
+		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
+	fi
+
+	# Allow users to test their own patches
+	eapply_user
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	# Respect ar, bug #468114
+	tc-export AR
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
+	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
+	# -fstack-protector-strong See -fstack-protector (bug #620402)
+	# -m64 -mx32			for multilib-portage, bug #398825
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fstack-protector
+	filter-flags -fstack-protector-all
+	filter-flags -fstack-protector-strong
+	filter-flags -m64 -mx32
+	replace-flags -ggdb3 -ggdb2
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf+=("--enable-only64bit")
+	fi
+
+	# Force bitness on darwin, bug #306467
+	use x86-macos && myconf+=("--enable-only32bit")
+	use x64-macos && myconf+=("--enable-only64bit")
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf+=("--without-mpicc")
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		# Otherwise FAQ.txt won't exist:
+		emake -C docs FAQ.txt
+		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
+	fi
+
+	dodoc FAQ.txt
+
+	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names on shared libraries, can't turn them into bundles,
+		# as dyld won't load them any more then, bug #306467
+		local l
+		for l in "${ED}"/usr/lib/valgrind/*.so ; do
+			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "To fix this you can add splitdebug to FEATURES in make.conf"
+	elog "and remerge glibc.  See:"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index d7e748752a9a..79349c02400f 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,5 @@
 DIST vulkan-tools-1.1.77.0.tar.gz 330131 BLAKE2B 3190c59745f6068fc00871f7c7c889ec2e429095d5090b0b02e1d3bbdd8613147febbbe4da3f1d48690a34577bff21bf5fd90bed77a621d0716e1b10dd9e8207 SHA512 e569e1d6da651a9f3c4669de0d4ebd301528036e283ea46049abdabca6b1b993f07e48643f91b29a38859a44770e55c8222058cf1f2a0dfd4838c37f801ba725
 EBUILD vulkan-tools-1.1.77.0-r1.ebuild 2419 BLAKE2B c9c634e4d3af512986c20b1c8e871c7f811f35b2fbb41244cb9bf52d57a16babfb07eebca75c281f54d95bad665df02c85baf2e0d9821c77e4571efeac7b5eef SHA512 e859d13744108b459b2e1434c57e2de8c0838e1eea46978f4afee607c3f9d601b49f0b09df27abcfce580ea08e19760b54f696d8299abef450b27c4d064e885d
-EBUILD vulkan-tools-9999.ebuild 2419 BLAKE2B c9c634e4d3af512986c20b1c8e871c7f811f35b2fbb41244cb9bf52d57a16babfb07eebca75c281f54d95bad665df02c85baf2e0d9821c77e4571efeac7b5eef SHA512 e859d13744108b459b2e1434c57e2de8c0838e1eea46978f4afee607c3f9d601b49f0b09df27abcfce580ea08e19760b54f696d8299abef450b27c4d064e885d
+EBUILD vulkan-tools-1.1.77.0-r2.ebuild 2668 BLAKE2B d3f677d402b723cdc7ccdda4d33500656a68c1fa83b8bef6a17e8ea2ebc78bc9aaca066beb3f03b756c365a9e791ea723753bd78702b34a6cb02f2792e6f3c46 SHA512 0ad2d536ce9d84a54d52722c8a82dac94d237c0df576e8aed3e2b7910bc226084c421b054806829436c0a6b5d4b4349a112c4e49390b9293be048661483d5b93
+EBUILD vulkan-tools-9999.ebuild 2800 BLAKE2B dc878a77db0055768c025df077d50988d0dc97766595e7e95108c22e1c1604effb7a8d2d56be6271a8ac60468fd2d5532ef8b0f6767901a2128d07d5bbb4500d SHA512 acd8008c137cfbc5a9398862739d6868ddc0079baffe77a605fdea532100e81892292e14c224bee3879a60de8f5d9e210feabad6a564176809b7a43ee4071798
 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild
new file mode 100644
index 000000000000..76c30998e49b
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	EGIT_COMMIT="384fff68c802a10b5d7f4f352a4bb43b3efe5f23"
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+cube +vulkaninfo X wayland"
+
+# Old packaging will cause file collisions
+RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
+DEPEND="${PYTHON_DEPS}
+	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
+	dev-util/vulkan-headers
+	media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	   )"
+
+# Vulkaninfo does not support wayland
+REQUIRED_USE="|| ( X wayland )
+			  vulkaninfo? ( X )"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=()
+
+	if use vulkaninfo; then
+		MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
+	fi
+
+	if use cube; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/vulkancube
+			/usr/bin/vulkancubecpp
+		)
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_VULKANINFO=$(usex vulkaninfo)
+		-DBUILD_WSI_MIR_SUPPORT=False
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DGLSLANG_INSTALL_DIR="/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
+	)
+
+	# Upstream only supports one window system at a time
+	# If X is set at all, even if wayland is set, use X
+	#
+	# If -cube and/or -vulkaninfo is set, the flags we set
+	# are ignored, so we don't need to consider that
+	if use X; then
+		mycmakeargs+=(
+			-DCUBE_WSI_SELECTION="XCB"
+			-DVULKANINFO_WSI_SELECTION="XCB"
+		)
+	fi
+
+	if ! use X && use wayland; then
+		mycmakeargs+=(
+			-DCUBE_WSI_SELECTION="WAYLAND"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	if use cube; then
+		mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
+		mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
+	fi
+}
+
+pkg_postinst() {
+	einfo "The cube and cubepp demos have been renamed to"
+	einfo "vulkancube and vulkancubecpp to prevent collisions"
+}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 6fa37cabcccd..3fce8b8e6862 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -40,6 +40,29 @@ DEPEND="${PYTHON_DEPS}
 REQUIRED_USE="|| ( X wayland )
 			  vulkaninfo? ( X )"
 
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/vulkancube
+	/usr/bin/vulkancubecpp
+	/usr/bin/vulkaninfo
+)
+
+pkg_setup() {
+	   MULTILIB_CHOST_TOOLS=()
+
+	   if use vulkaninfo; then
+			   MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
+	   fi
+
+	   if use cube; then
+			   MULTILIB_CHOST_TOOLS+=(
+					   /usr/bin/vulkancube
+					   /usr/bin/vulkancubecpp
+			   )
+	   fi
+
+	   python-any-r1_pkg_setup
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=True
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-util
parent	12bb627384ddfd47382b9f1b6464481a58d01ebb (diff)