gentoo resync : 29.06.2020

117 files changed, 1496 insertions, 726 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 8b17e3526818..a479280aa999 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index de5392525e08..943535efea14 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -27,4 +27,4 @@ EBUILD android-sdk-update-manager-22.ebuild 3131 BLAKE2B e62927b86f4840cd333bacc
 EBUILD android-sdk-update-manager-23-r1.ebuild 3311 BLAKE2B 4f25cb3fc06c5f4ca34ea133974aad91a17d5f696007dde500eaf85da6ce8f8e4a29033a83f6cdf9e3768d6e63f000e1cdc8aedd302b8388b0b3b3ae1f1f17f1 SHA512 23af7109d479d4a8b041f26828c3c302b11d5e5c4cfc3c158355727c4882faa403cd950c1d532c0952c8580ac1e61a86bb4172b3ed139b22767c2f21ad0b45fb
 EBUILD android-sdk-update-manager-23.ebuild 3305 BLAKE2B a4cf54975b768d49ad116f36ce8e9e3b39045357da70bfe1f44ddd7a517ecec4e5cabca082116c5ead2ded35fae758e39b46ec06ff1721fb132059b9971ebff8 SHA512 b2e5272a3d742d73118642d98b4706086a878a0227a5fdce4cbbd473af28cc04b39189d230e43bf3e9ac32866ab2f7a35eb7014071762f63497f2d37f205162f
 EBUILD android-sdk-update-manager-24.4.1.ebuild 3353 BLAKE2B 05e979a96b88dba1be33559d2b8eb48eb6aec5cfc8a02b53416f809f31e8c7f043e6fafc0b2ca8ae8767656c624757f7f4357433de4e41756fdadc067793fa3e SHA512 7d04b34c7d6364106ff48ec5c79c5d3a4a4bf6f01511a5dbfd18e8ef6331002c0054ff98b86c0f039c27013d4bd755a4623f38a7b7d6c0653dd5015e9cc91423
-MISC metadata.xml 214 BLAKE2B 48fe26dc32218c5f83cecefd288be1d07314b03aa871c0c322ff125643f0a42598d39b0bf2fb46daf63f3f39df78b869dd4398ab4671dd0f57d62060ce148a2c SHA512 2d699278683037614d2dc6595d6ae71ca4eb3a5b22506ccb0926d932f00bde85c1759caf8c0b1729cd949e652fca33c8ced0e7ac6e65af144f0f66eb064ceed3
+MISC metadata.xml 174 BLAKE2B 1738b3b33ef242919964fb6a498f2215dbd528720bd193469bb20020fbedda0e9102ef85539fa9d2c3924bf2e6c0dd560671134200481054111467ba8e88fcb1 SHA512 281aa8b74dd6915f9856e5e70db000388f8b04bd5393871e67b57cec316374c6986124202dfdf4855ba57dd60f1e2cfc323a1f2cc4c6fbe0f634f67f8fb40b17
diff --git a/dev-util/android-sdk-update-manager/metadata.xml b/dev-util/android-sdk-update-manager/metadata.xml
index e97c89c421c2..942e57aad12a 100644
--- a/dev-util/android-sdk-update-manager/metadata.xml
+++ b/dev-util/android-sdk-update-manager/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>rich0@gentoo.org</email>
-</maintainer>
+        <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index 2fb284809e72..15fc10f2580e 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,5 +1,5 @@
 DIST anjuta-3.28.0.tar.xz 6382736 BLAKE2B 8872736d80d0a09d35706ef69c0de56c84b9abf025f9552ae4b21b0b51c3ab8ad93f07dd1564601422890e92155cc7be80bae8de77106035621a54316608832b SHA512 c8de0b0debf0a511d6c50fe2582077a33c04290a045cce637c05c15df984cc3e8ee942c0c3a75bfd01c48e6c302d5424565c4e54fe6eb118c87a3590563505ef
 DIST anjuta-3.34.0.tar.xz 6420472 BLAKE2B a5e10ea3bb60499e54def8d1b78603b0c809167ad03a3e11f9dbd031514f1a7cb566d9c7694be23fe3165e617fbfc3d1e6ce36f7dc8c0672044f26390aed6d5a SHA512 9d5a4c23751893ff7e21cd55c1f112f27b53fe2ea5ac645c63e2da627efce202b88696e3e5d860ad75a5c13c88a9082775d74f4482208161b5e63d56c4004d57
 EBUILD anjuta-3.28.0-r1.ebuild 3936 BLAKE2B 683893d06cd59787db3911c2d68a3c8be2534ba4c387da7afa8a482f430d28305c0a5154bb7ed4bdf71b0697ca3cb2103245477eee828277172f167c7e9493ff SHA512 8ea1f8e247fd3b6bb7b89a246338f84a11a8950569144337f1ba398159cdd64632b2e9b7566bed8fcecb05fe61a9569caadf45cfad5a24a7cf7cb263f8ee5868
-EBUILD anjuta-3.34.0.ebuild 4575 BLAKE2B 02f49bcdfad667ebab69d78d1b66b6c29b8f26c486f20c3ff03d6db92d753fb9f813e04565bb10b119d2d622735d5c6eb9dc6eee361fdf9fd97a514ceeb74eaa SHA512 97ddc950d519bcd8048ba8e4e431a02222404484662c77c36b3629f4fe683865317127455dd3d36be85045a5dab44115f588ead011aa3ad41d1e7b3d50e60e7f
+EBUILD anjuta-3.34.0.ebuild 4574 BLAKE2B dc37c5fd31f27d36611df232e6dac0b704ec1a87d2c672946bd370a6e91bc6b44eeffc00ebbab856f73e2f44341449580409f1a12a4c65f5ea4d0d80898a58c7 SHA512 e7f48224566c0fd7e9ff11afd2a41dbc40d2f327a2f7ee58dd86f7fd0ce852b163986a62b13f5f68629c75f55e0310120ac235925bc8530973289577cf5d12dc
 MISC metadata.xml 562 BLAKE2B 928b16bacff2417a1b50749486d2dcd656184b6cd7bce6f17e534d253ab2e1af854e18bf40f3188714e973b9c49f1b2691d031bdaef0ec73d9a4844c05b99218 SHA512 c452f34b8489e3faeb8c272282233341e22c958f04d750d54e07c487895aab8b03f4df096e1f07fdb7686a0295c770cb1fcf38fdca01f71730e991148013d82f
diff --git a/dev-util/anjuta/anjuta-3.34.0.ebuild b/dev-util/anjuta/anjuta-3.34.0.ebuild
index e8778c511513..8ea2a7e3db66 100644
--- a/dev-util/anjuta/anjuta-3.34.0.ebuild
+++ b/dev-util/anjuta/anjuta-3.34.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 IUSE="debug devhelp glade +introspection subversion terminal test vala"
 RESTRICT="!test? ( test )"
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index b96b6ae30bf2..a13010d1f7f2 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -9,7 +9,7 @@ DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f9
 DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71
 DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d
 DIST libbpf-0.0.8.tar.gz 262519 BLAKE2B 2a3620c97834cc23e716476b6966c1c65c1c82064b3ba1ae4ab4906ae362a777d9aa7ae40620f9a259fe969a5a897e97c14d97f627f39c47fa28c89abb1efa9a SHA512 1074fb52b7a158e4e2713c4c7083528ccf2d99b899853078f230234ba112071bfa66e174d8800d36516e26d5bf06da44d100a5b2f866d267f62c9308f431220c
-DIST libbpf-0.0.9.tar.gz 273706 BLAKE2B 54dc77a8e415c24e6394877fc9ad54daca78a4e4f4779607e977708e8b88b6d7bb5854b618a808b1758529b9fdd574fc85f5969791a88b9a124cc42b63f7a161 SHA512 597ac41ab1727c48f2c53c9626b482ae7abd558b4c7d237e33206e3292295d5e5c2f56d31063d30caedccdc3fd289c040f718ff9aaaf210920f1b9c4c772660d
+DIST libbpf-0.0.9.tar.gz 273726 BLAKE2B 1277ce5b9dab9037e287910c43a71ee33cd6607d7cbe59d40c6930bf49407e04fcdfa6f4795f98202930fd564c1569c2feef0bca73294334f00abd601a288ed0 SHA512 d54bbdee6f7ea83ffef3fd0abe07f71644bcf83e5cf4a307fb4e03d885503617f1af2d324cc869f0f01a92bcb58836780a4802ac4db83b9f037ea196edc1131a
 EBUILD bcc-0.11.0.ebuild 1862 BLAKE2B ed50015774cd375e2bbbf7a5be10ddc53c7864314fbb839027952860e25fafd5bcace7a42936ee316db1e18c13082be994a9b1084d94468f8293b1b780dcb978 SHA512 9701b5a605c19d4fe78ccb68477be41aac1b9fbc9990932e25d28b8e074cc528746893dc7fd70d919366d3b94e83d2b45cf806da94e793b683d07f8611b4d09c
 EBUILD bcc-0.12.0-r1.ebuild 1886 BLAKE2B f3879a2437abbfc99b87ad1a3a5c1b8b600a9e0213be90ee17ecba036b76798529de61b159dd7af7ce56000e071d44923f2707d366383c5f6ed228fb78b10858 SHA512 492110b8a4dd64c30bf8d8f5af5dce183976ee31d3ee5652efe61e7734c779b8a08d9334fdb2c4c0aa4a90df71a5a1d5374677eb9c9566ce534ee760b135caf5
 EBUILD bcc-0.13.0.ebuild 1925 BLAKE2B 4cf4fcfd74ca4a941be56ec92c003be585b81105dc0986e0a63cdcafbb0a9c22f7803aded42ff0214338312463019f6ba7938775dcd6538afd80d85a92b0d523 SHA512 69e3e78d7f6ead73c007e821f5ea2a6e3f5244cf716703b763427bb49e89f5012ec0327fdf142dee93b6c9091c572985a8cc3738b6b238e19e9ceef0a4a9e0d6
diff --git a/dev-util/bnfc/Manifest b/dev-util/bnfc/Manifest
index 0a0b0a261bb5..e84348be171a 100644
--- a/dev-util/bnfc/Manifest
+++ b/dev-util/bnfc/Manifest
@@ -2,7 +2,5 @@ AUX bnfc-2.8-alex-3.1.6.patch 207 BLAKE2B 3e14851866c8ae0dda9245dd1dc920bc4554eb
 AUX bnfc-2.8.1-ghc84-p2.patch 4144 BLAKE2B 19ac2a0e8edcbad7d441c248625904aa0021fc64e97d3f7ebcf3e0d1bdf693b442062a5126af1162404de59a022e8f573d7127c223209993755e99e60285eda8 SHA512 4a21d805f24d9f4729a2b95af04333651639324f7ec26996627007ffb5dc8657cb175b228e95e9356c2b47e70ac49576f58b024891c0ce6ddf299b4ee9299548
 AUX bnfc-2.8.1-ghc84.patch 986 BLAKE2B bf7ecd64654f04d701a2b7ec9dfc969cbf4a1bd51db7e6d31512c2cd7bfbaed83ae37a93bec7ce667cae2a98369086accf5d76dab84ae02df4af6d87703531bf SHA512 615ac9cf9b7eff19f675b4cb44e9a3b9d9acc53c827c57c2b556fb76c9c37832f8d137609df64c469eed0b298c0b9dbe01b1ba9cb8d5a1b3088fadadfe27af49
 DIST BNFC-2.8.1.tar.gz 225015 BLAKE2B 973f7a5ebc5fb995bf0014621ba7bfebe0d6adbb35bd276b3f7ec56e3fe1ab08c3811d27a2d58a73ca52ac4bf9ba35fba3d172a82684b1ef999a2fdd6dc4ece9 SHA512 d5ea9b4129a4f71c2d66cda2f859a2c39be6d4400cddbd5a5303b5b408f4cf03ce7a92825224f4674c6cc48bec07429c447b9b39fc4e6d144c922bf1b0829561
-DIST BNFC-2.8.tar.gz 183591 BLAKE2B cc14079bba767d85ae59a05057cba7db11bc7fcc39e28c29a5151e1ffae1c5b712351085eaa8affe79a36cac66e79df26335d48cfc24fbf41dff018727aa8dd6 SHA512 358700360dbfbeacf3276150856415e08e1498c6af27254302d406e5407b7b4f84ac0dcf9dcf8391128ac9d77a17a928c2427961ec8c3ffdb9af8d169145cafb
 EBUILD bnfc-2.8.1.ebuild 815 BLAKE2B 543658d36f34aa2d2e28eee8a953c35f53bceb1258d46ab950b0355b46cca9b61f7a7656978c49f91964dff38d5c2521ae14f3f38ebf049a823620f755c636f6 SHA512 c88a93a1294a99f20c8313cd70810a423e9236f46b72253614605ff3b8effdfd445fd759ee36b4451eafb4969dd82e5d53ac938643b75daf5d98f64be787d802
-EBUILD bnfc-2.8.ebuild 906 BLAKE2B 8d6c7e91b6f3fb2f10e4f85427f2af5eb414debea79eec8f2e210de9a39f600c9ceeff57a1985a77f00a79e3bf76370227d59329636d0a971d2f7b09c93f5a3b SHA512 12de94e7cf2fee3494d9aa5fccd0e819f746bd8213cc595f387198be769464e3b355efdb7bcd224b4be551bd52479b0ed2abfe4e18c8e3a80ce402a6bcf47d16
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-util/bnfc/bnfc-2.8.ebuild b/dev-util/bnfc/bnfc-2.8.ebuild
deleted file mode 100644
index af500808e92f..000000000000
--- a/dev-util/bnfc/bnfc-2.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="BNFC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A compiler front-end generator"
-HOMEPAGE="http://bnfc.digitalgrammars.com/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND="dev-haskell/mtl:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.8
-	dev-haskell/happy
-	test? ( >=dev-haskell/doctest-0.8
-		dev-haskell/hspec
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/temporary )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-alex-3.1.6.patch
-}
diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest
index 1c7c7338f755..c3a35510ff1c 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-badges-2.8.0.tar.gz 3935 BLAKE2B d5cf4dff1ebcb752b3b82377912d0a6e811d7def94dcf9e6f339a810d67b7eafcc699f4abdf32618aa71f231165e31be57be1834c9d0a8bf40012e66c7f19245 SHA512 2653393de1fa3c6e98d744144190e7f7999cc1955f67467c70609ae6531f5b5f05adc4bc84cce9092deda374103266e24397080998c3d62635bf44dcb8650609
+DIST buildbot-badges-2.8.2.tar.gz 3982 BLAKE2B d2320979c3c8530089ddad3c9c57e9f77576da8979b5834ab7f4e6766c5d210c822e7ab582103e897591db0efc63139dc7cb9f9d834bf81ae199dd25929c6b49 SHA512 e2f6ca0178428db90812633c9af47e8f5c40220f506e62745a150a5572a95f99d3a4115621c29b8188b4b5d48aa3b0bac1862b6c5793cd87a4971798a5aae28a
 EBUILD buildbot-badges-2.8.0.ebuild 934 BLAKE2B d0dcd4eeb7fae46b19a851c03585212352793045f54fa289a48fb085318dcfdfaa75984e8d04e32b1b783b7823f1010db7d00a5af35231ac1b098ecda2dd9e23 SHA512 c4302329a9cbbb3d2be9a353bf8c477ae3b39d7a575bf1fe6d955751e20ddb4e5d1ed82de394c552ddb6015a7066b33db0747bcd4dbcae54a9963994e5f93467
+EBUILD buildbot-badges-2.8.2.ebuild 934 BLAKE2B d0dcd4eeb7fae46b19a851c03585212352793045f54fa289a48fb085318dcfdfaa75984e8d04e32b1b783b7823f1010db7d00a5af35231ac1b098ecda2dd9e23 SHA512 c4302329a9cbbb3d2be9a353bf8c477ae3b39d7a575bf1fe6d955751e20ddb4e5d1ed82de394c552ddb6015a7066b33db0747bcd4dbcae54a9963994e5f93467
 MISC metadata.xml 761 BLAKE2B 5e3b300c2266a8f89672880260926a73744b83141b265f5a6e5ab11f9e2256165762d4371255d58a97c704479f281e160cb42e74269f35d4d623b2937fe8ff05 SHA512 72b794413f121ae9246da5fdf07b730c72949d84cac8fb881dabe31ef283d283afd83b62bcd71de7a6f92f247d07fb5d134f9945273032e2f21469bf9a030f73
diff --git a/dev-util/buildbot-badges/buildbot-badges-2.8.2.ebuild b/dev-util/buildbot-badges/buildbot-badges-2.8.2.ebuild
new file mode 100644
index 000000000000..c59f1ad4227a
--- /dev/null
+++ b/dev-util/buildbot-badges/buildbot-badges-2.8.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+	dev-python/cairocffi[${PYTHON_USEDEP}]
+	media-gfx/cairosvg[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	dev-python/klein[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index d05927420bb7..1f0803cba861 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-console-view-2.7.0.tar.gz 17939 BLAKE2B 1ea1848f0276bb7ef4adaf63dbe290ad5769689b15898682deed61e9797eb4945047dd26d492b118b75314621bf2777b77e992f1a3129e413c01c17b27b680c1 SHA512 22875fc4c3440892147db7c6ef1eba165a29f4ccd3583827394d0195c72dc8ec3d31940587e4da1f0133def074c72f87bc23bb210189a0e0d028c0be52368107
 DIST buildbot-console-view-2.8.0.tar.gz 18022 BLAKE2B 455ca2a1caed7d55a26d4b176cddf1a571f411dab191eda890698aa1d5150539c620ae90b2d1c5ab70cd47589466ca4534e2da1d1e73ab388761319f81434b39 SHA512 9344021b774f5cecf39384cff869ec0c9778630ec0015d654218ad03d83a18849e1b144dae74f7c85296efac6bbc767f387a1aa4b5271f3996c7e1b177f3b735
+DIST buildbot-console-view-2.8.2.tar.gz 17575 BLAKE2B e036429dd40fdfdadd65a10d4f6fc025b00d9a61153aecd4f31e0c6c133ba1e546b1c810254ec1fb83913cd4434db223c3cd782481ef5785ec48162a2f111682 SHA512 dbec358933865aa79ad86754ef454d89fa369fc64f3df54eb079c0f1ebadb027131d4bd7ac14dd29a16d34aa416e21f90cbecc873944a7ab8ef7da637e20c999
 EBUILD buildbot-console-view-2.7.0.ebuild 970 BLAKE2B 82003d6ab74edb27984e6a909be96c232d59c32807989ed535c51b50ccc3b46ec9c2c3a3f0ab423d88028035a1a47680a673ec27af5e167cde4b0ac4fed6a12c SHA512 c11fdbd0be9e12e6eb11f24d9bd79d93c6a7f6745e8d29b854c06e864753bf633a850aa0b7e09b196f64a7ae4895d67ef0242173d261a87271e55c24f64f7cf5
 EBUILD buildbot-console-view-2.8.0.ebuild 756 BLAKE2B 4efd6cf5e862092bc00e10f8951ba7cd54c9c5619908cb164f20e8b70f8eed9f4dff0a95d1368fc3c8fe7b383bafd1ea5454608939d7d31c1ad6503091795706 SHA512 bc65b167fc41c9869292a7665f14ce5045eb79d7c48115fde3fbce653c45e8e23ed6afe85eabb96e0ae5c7bef4c4729f02c7610001645c31fcbf7dab34520884
+EBUILD buildbot-console-view-2.8.2.ebuild 756 BLAKE2B 4efd6cf5e862092bc00e10f8951ba7cd54c9c5619908cb164f20e8b70f8eed9f4dff0a95d1368fc3c8fe7b383bafd1ea5454608939d7d31c1ad6503091795706 SHA512 bc65b167fc41c9869292a7665f14ce5045eb79d7c48115fde3fbce653c45e8e23ed6afe85eabb96e0ae5c7bef4c4729f02c7610001645c31fcbf7dab34520884
 MISC metadata.xml 660 BLAKE2B dd64f91ba93d64ffa1d1aec035eddab0863d2332664ae9292d54ddb394c3d406ca4f5c55cc4da7e0163563623d27602dbc51656e100e587797653b4fdd01f5b2 SHA512 975022375960d255342c24364513b4352e6eb6ec34ef8f16f8a7c08a978969202660516957eea8f61e4afe13622dec826ad8a5f69673d0cabffb9f52e91e0992
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-2.8.2.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-2.8.2.ebuild
new file mode 100644
index 000000000000..461db8d8fd20
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-2.8.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index ba24891079ad..04b94304c77a 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-grid-view-2.7.0.tar.gz 13342 BLAKE2B f37d7466d346c2db4083bdf0226f405fd48dec73306a91a24d77e38ef4f254bfd3a7b64604a5518f4fce5cd83c00ac4788626e06167cc6fc72f1dd4f31ab16b7 SHA512 a2ffa0ada87a2672b8839516bcf571ab8d884c953459b567fd87c8dbe1c65bdccc862d2bcfd4148f91959b1a942afabdacf98f37f2a0374393b57fe8c09aee04
 DIST buildbot-grid-view-2.8.0.tar.gz 13399 BLAKE2B bfecb49fb3f6b0a9b6147625f6214f2b4c3dd76ebb2698af3e49526d0a6a1241ddf519fa8d612c37e5f12f8c11f673db2a2aa4558bd503834ea3f167d880f631 SHA512 2466130b2227de378a005c0cd6086de3d58c96339bd4f662b3da78ee275cc24dad82388b5f7798a20bb921d76e01a69802dca14feff6213677a89a279e93245f
+DIST buildbot-grid-view-2.8.2.tar.gz 13373 BLAKE2B 0a7a73011655e9a57574575943a3560c395ca4358c0f2169def8413a60f8381644512a227b54f016b23e6dcd18641d1ea7a3295f6c0a983c6f3caa9ab1dda60d SHA512 9b136d96f5a38f0d28f6c37db6269e039eca0cff5bbc7d75d43346566ba2e9f7924e453098f4777792429a7a9bbbb5e02c34a9b81e131d40dc3e339f4dd377f1
 EBUILD buildbot-grid-view-2.7.0.ebuild 971 BLAKE2B 4718358889543a5c5080e754545927975ed1ca5b507671e79669c24b42b369f19b2ec9517765886ff5e6acb3644a8adaead1466fbf8e9d02c2bf8f4522555b3d SHA512 393978409823602087a1ea8cc8fbea175eaf17ab21d6958d4ecfc5b41312390bf376899ae92eec450dc04f946bd52a4718fa1a7cd399fe9913e36b3cf56095df
 EBUILD buildbot-grid-view-2.8.0.ebuild 757 BLAKE2B 19309fc37c0f499a196327984a3154e26e289d94dfa3ef194eb8e8901a895411f85a069850995209fed20b55971d5fef2001b409d7e6f58ee58cc3b507ec81ce SHA512 6c34f80ba22ab5c3d33d3b99a9fe4292ae0313a8ebb99bf660c73a228de78c3dde3288c68005f52f5b497c69c04c27f160db8c6550b49609dd9a6b2a8b9d0da9
+EBUILD buildbot-grid-view-2.8.2.ebuild 757 BLAKE2B 19309fc37c0f499a196327984a3154e26e289d94dfa3ef194eb8e8901a895411f85a069850995209fed20b55971d5fef2001b409d7e6f58ee58cc3b507ec81ce SHA512 6c34f80ba22ab5c3d33d3b99a9fe4292ae0313a8ebb99bf660c73a228de78c3dde3288c68005f52f5b497c69c04c27f160db8c6550b49609dd9a6b2a8b9d0da9
 MISC metadata.xml 639 BLAKE2B 563a20f38d4d1476b8833f8e858110adfcf70f9abbe589e5538eac0289ce0d232d5359a111d710b371030342571bab3298e3a2425bc360cecc11d0c976653835 SHA512 5f1f6e27005ff78eb008f4e9a74cac6fb58dc0b73155fa52325b2771f8723691755e5123382a33beb427a4a33c1832f796b56fc94eaafc7eb91c7042546e964d
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.2.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.2.ebuild
new file mode 100644
index 000000000000..d598731012b9
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index cb63f3d0dd3b..0b497330671c 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-pkg-2.7.0.tar.gz 4754 BLAKE2B 568c59e9ba60fb2a221794ea7cba44d0a1fb1f4e41368dfcc9199208733fdacb8052a90b64368e8cf5bd906c02ff2d4fddd65dfe4ea117566f176924d4dec621 SHA512 9a6b67dbee28ed352671c2da3b14a416761f49bee2e77cf7f55936cbd4556e5509a420c13c7d4d88756e01de8e1268e08b43fa48ac0cf6a00dbff8566042a33b
 DIST buildbot-pkg-2.8.0.tar.gz 4768 BLAKE2B c07e7a46681319ebf2d5bdc1a2228218d9b48378cb877277b1e9c88285f4ac4246eea4cea8018d652b8beba01587ccd9c5e25464645f283ba7e8400c7a8efbe4 SHA512 962b1b8c56d15ad3b40148d2802630b34f808d7699747e8c97c9a5f48c7b4cdf6762c4994da4fb1a495ae9fa9fa1e1ee2d5076b4eaeb593f9c2090d2329c03cc
+DIST buildbot-pkg-2.8.2.tar.gz 4736 BLAKE2B afbd5213b51240845f8becfcc727dc3280aa1510dd62305a5e029099da4f8e7cbbf749365baba568a2205354205e97dbdbff78a1740e464164e0c2bbc3148194 SHA512 611b5600df181adfbbe203947c36ad64a99c10c6c63c0f4e65ffd2ae4551f2d879559007b59302434cd1a2ae915a2a7125afb90f6c896110ebf514212434a2a7
 EBUILD buildbot-pkg-2.7.0.ebuild 870 BLAKE2B 4e53bd1ed3e5d0700da2d572dd291212076bc0f647ad1713a04e30816e137790ad918b615670230da705edeae4c99e442096690ca29a11e99776438d401561cb SHA512 f7dcf812c9fd1c2ed17999c7309852c25dd6d85d8a5f9122196d2a346feb6c5e1a196cbec4a9f5cda3efe2b6f0ddc18fd425eb50dea3f74ac67eb7249fcf2de1
 EBUILD buildbot-pkg-2.8.0.ebuild 697 BLAKE2B 180e58c11212eb4959cf774e6b573374d8ef435d10b08e3968479a0d78deac119ed09603fc3f3cc7d097792ba8c4504841d8efc8d54d83df6490c4cf45d1d193 SHA512 ba6850ef6aa66485dc2c1f32b599f17662c93e84e7213ee929946a2d0db4bced437bcf7333860da0089969234743367158c4628ae72e88ad04f0d0e383d6efa7
+EBUILD buildbot-pkg-2.8.2.ebuild 697 BLAKE2B 180e58c11212eb4959cf774e6b573374d8ef435d10b08e3968479a0d78deac119ed09603fc3f3cc7d097792ba8c4504841d8efc8d54d83df6490c4cf45d1d193 SHA512 ba6850ef6aa66485dc2c1f32b599f17662c93e84e7213ee929946a2d0db4bced437bcf7333860da0089969234743367158c4628ae72e88ad04f0d0e383d6efa7
 MISC metadata.xml 1198 BLAKE2B 3b336db0b25b79b1baa060ec52c8451732cb3d7a099c3cf148bc5db4c68276dd72e684b2aa82c50e4eb7aa0fc6b0d88a7e0e2d8a4ab15e423904b19f0102a664 SHA512 c85c49f440cb6fbbc0ddf0d522949d9132e71abac4ace66c93893fb29ccd70b240482f8a33176849889521e082913ed71225e8a4fe663d2602c8d5da3db3b95f
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-2.8.2.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-2.8.2.ebuild
new file mode 100644
index 000000000000..24f94f8cc0d5
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-2.8.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 8536f3785f6c..ad9af55c9402 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-waterfall-view-2.7.0.tar.gz 191009 BLAKE2B 1730bc7caef0aa405ea0adf0585ec50f94b162286daa14755b6070af22d417a9a1b756ade226ac9950d7c0f9eed96c22817ba71cce5b6bb9a344c4dbed989c09 SHA512 7327766532062dc5dd09b210914af9d0e1ecffa6a0d94917cfff93274627f5896552fe191003f1895208702f83670f202b4fc735d0d9161c9efa3419dc46b12b
 DIST buildbot-waterfall-view-2.8.0.tar.gz 190508 BLAKE2B 3f406648c44d4717872056a5e4c048bcf50b9c2865427052a920c530ab3da1dfb622513fc12676d60a0553408310a233b591591b447ebe990bae539209fbffe6 SHA512 93b455fcfdb28e32267b77c6a379e59de063bcbd244225cab589b16e688d31184505de0645330ae8d3033014df124f3fb5803d3f0f2b6c941c49727716c820c0
+DIST buildbot-waterfall-view-2.8.2.tar.gz 190551 BLAKE2B 9db81d1cf17357a57c34eb8f3b1e4412635c4804708d3d99646a68293af52594952884f96f7d528c6a87302c3563a8d4f4411ed410da2fe1043b4439d4113d73 SHA512 e252874745a623c1ec8fefcfb10c742a783ec677f172d20ef8165687ec5981f4df09092096f7922381e886f4ea7ba4c795997ad8ff8fd58fd6aa40d8bc057b00
 EBUILD buildbot-waterfall-view-2.7.0.ebuild 950 BLAKE2B 421a2f6c248e518597353a533280a75a21f64d5272b76cfcb9c5d4ff4af2e604397b6fe52febc5871f972fd972842d490d38a3664ef395a072ba6d5396bb6e83 SHA512 5c78349930dd79ea931e126014a8f12f2c5eb013be1926e5bfdb1ce01aa994c1a64cef98d6254852d9921b65b9a253be3aacc480e4a512b1ff04a31edae72828
 EBUILD buildbot-waterfall-view-2.8.0.ebuild 737 BLAKE2B 2605c7faef8d318b3102ce2db0d28697146778a1015cdd6ec2f733e454b60c4d4af6b57d91efc3250344e62a459b77fcbb24f3e700e4b49c3fc914ed91aed7c3 SHA512 86800c7957c85078d5437df0b2d14bd46a02a1c89f5e6a7b1051bf0cc4a1b30ddcb575a818b6d95b3b6c97fe37c9f7e1d401e85be48ee6820cb45266ef5a7ab1
+EBUILD buildbot-waterfall-view-2.8.2.ebuild 737 BLAKE2B 2605c7faef8d318b3102ce2db0d28697146778a1015cdd6ec2f733e454b60c4d4af6b57d91efc3250344e62a459b77fcbb24f3e700e4b49c3fc914ed91aed7c3 SHA512 86800c7957c85078d5437df0b2d14bd46a02a1c89f5e6a7b1051bf0cc4a1b30ddcb575a818b6d95b3b6c97fe37c9f7e1d401e85be48ee6820cb45266ef5a7ab1
 MISC metadata.xml 680 BLAKE2B 47bfc9bb17933438a0c3ec478c1dad7da7f398cde2133ab96c472d0665e563f4d5c8d09ba04bcdccf820603cf3dcc18086b1e217aa86f7ae4d8067178922020b SHA512 266fd7fb76a1373c9342b438487d73a319209f320097981041bae9cf3892dc9d091fd253532457328a3f6f52ec37b0a0e6cd1119c6800de42bf19d7fc6054133
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.ebuild
new file mode 100644
index 000000000000..8e4b9cc0d871
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+	KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 59e8c07ad904..e5dfb63989a3 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -3,7 +3,9 @@ AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701c
 AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e328a2a20bb0b075d5fa0007cc6ad63ecf600eee49251de14c4abb41f70ca813a9429dbce251509121157da9b9 SHA512 8eae575cb001b4750cd2033f9cb82d3985ad9bc2a4bc20ff0e4aaa0cbd05bacf8d6d885ec08112da15e0ccf8fd895006eed39b0b9a4bcaee86911b5180fab0f2
 DIST buildbot-worker-2.7.0.tar.gz 101075 BLAKE2B 2ee82434f565bef111685712b9b4dd7b0c522de59eefe3eda672827e4bcffae8288c5b9842221b52aa7d5907eeadd4bc5c635382b8c6c4e82977b3c139afdd4b SHA512 bdfce0a7b222fdddbf7830f90c1775e2bded7080e5053b114b7c136b3e114f6c8b26ee4ad802fce66514524e29e863a2f1a4366758c59ebbc6eeadb4b0a271db
 DIST buildbot-worker-2.8.0.tar.gz 102605 BLAKE2B 4cd6d8755803d7649acaf1b45e6632a7a9bddd8a58590a8caa73f686584fedf62d98911a9e148e5a6f34c99b8551cd80c2acbd03fc4f892300cad89a4f68e0b8 SHA512 62f3a72ed7d7ca724b667528e55673c20382ed95abc898dc43e43c5e09bc1d8116eeb2791145097a9b9f7ab2d38a90d974dfbbf5697d8c045a630632ece8512e
+DIST buildbot-worker-2.8.2.tar.gz 101707 BLAKE2B 451dff979c6934bf6dd4e1579abbe18e9cf43551c906bd516c788a6a5f6170650a5468927bec0a8d4ab242e5886247406b2e098e1908a8d9b5777744982c7be6 SHA512 0628825ac023a66cd249dc6b42ff2f3ad3b5c0cb97561fd332ce4775abaa5368a8b7b636115259ab4aa842c811178c9b641ef4453b06167315eb81117ffef815
 EBUILD buildbot-worker-2.7.0.ebuild 4824 BLAKE2B 89494ddf6d8a70d022bea3ee54ea7366cdceb698daa31225ce47b68ae07b3f0546b2607f7c53e7123cf0272c210d94fccd351010a0fb018510dd25fc9006baf5 SHA512 3ba8a04299340a2e372e2455f0e80edd81067281131f9f1673f803ff740ab7cb423ce3c24929bdcc6bbf03e87e99bedcad3f1127cb9bcfd046047dd82e83700e
 EBUILD buildbot-worker-2.8.0.ebuild 4614 BLAKE2B c42112272244fb8a1da208eaa6e3583d98b4465bfa39c2240012eeb4243fd6a5edf59321a54bc72f0918d353a43c0d89062fdeb523b7a5bc9078c6ef86475d80 SHA512 b655a8a68739e287f2f2e4a19ad22f3567801982342d491d0c75e949d0d7671869b0b624d8cf2c1d2f4003eb3a97938d893654c780939de6256f7706556b5bee
+EBUILD buildbot-worker-2.8.2.ebuild 4614 BLAKE2B c42112272244fb8a1da208eaa6e3583d98b4465bfa39c2240012eeb4243fd6a5edf59321a54bc72f0918d353a43c0d89062fdeb523b7a5bc9078c6ef86475d80 SHA512 b655a8a68739e287f2f2e4a19ad22f3567801982342d491d0c75e949d0d7671869b0b624d8cf2c1d2f4003eb3a97938d893654c780939de6256f7706556b5bee
 EBUILD buildbot-worker-9999.ebuild 4619 BLAKE2B a88900d63e3fb4e3b51e31b4736cacd7bc8f60a3aa7f27f6bd6200e9fa788147ad4073d5aea22ec55cc1a54148f87dda3de5f0953cac31f3152fba10d8399012 SHA512 79bdf14db42b15492932d100ee01c3bf043f7ad01dc72d35d68152d95601359aaee73b8661ada31d490218f5081465b7dac5c649aa2a704373e9bbe18426fa3f
 MISC metadata.xml 480 BLAKE2B 5ee99e9a87b5449742a0066a5c720137406a952a63f81574bb7d5cc94f235ee54c1fae5bd13e320e7b017d5005cc45a009360351c987609fe208089ed464cacb SHA512 95b7d71c74d693b93e2d0ff8943d97ffb2d9ea9fb2090bdb5fd8948444237ad20c571b97aa16f0ea5d20cf76e4d8e0392df276a0d1ba39b5263a72c57da3dea0
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild
new file mode 100644
index 000000000000..3bd934a50342
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
+
+MY_V="${PV/_p/.post}"
+MY_P="${PN}-${MY_V}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	!<dev-util/buildbot-1.0.0
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
+		to support starting buildbot_worker through Gentoo's init system. To use this,
+		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+		Set up your build worker following the documentation, make sure the
+		resulting directories are owned by the \"buildbot\" user and point
+		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
+		The scripts can	run as a different user if desired."
+}
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/buildbot-worker.1
+
+	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
+	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
+
+	dodir /var/lib/buildbot_worker
+	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
+		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
+		ewarn "    rc-update add buildbot_worker.myinstance default"
+		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildbot_worker@myinstance.service"
+		ewarn "    systemctl enable buildbot_worker.target"
+		ewarn "    systemctl start buildbot_worker.target"
+	fi
+}
+
+pkg_config() {
+	local buildworker_path="/var/lib/buildbot_worker"
+	local log_path="/var/log/buildbot_worker"
+
+	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildworker_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	if [[ ! -d "${instance_path}" ]]; then
+		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
+	fi
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
+	einfo "To change the default settings edit the buildbot.tac file in this directory."
+}
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 379ef7c13230..b0948e8f6e9f 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-wsgi-dashboards-2.7.0.tar.gz 5573 BLAKE2B e50576da2a86c3f63435c6ca721c0756e1bbe004e82a750d4f0a03799cde4b6c8db7a5199842ce46a835614ccfb588b4eca20035988f54c7d1b6dc9c43f31823 SHA512 018a103fd53f6c3fdca418a46d8576c6b1fd35c05b1cd2ef2dc2c8d30540fbf1528501369246c49d64cfc2d795bcb528fb672f0536a0239f64b87616c50c18c9
 DIST buildbot-wsgi-dashboards-2.8.0.tar.gz 5576 BLAKE2B cad5d728ab7811b6e5f0750dd4e74ad25ac92c72a8e5f58beed0c19ba38de1599f5f5977c087acfbf2a138e41aa927ded54fd7ff9f1719de46560e814bb3320a SHA512 98217a351b0d441ab346d385b8b72333d100c33f40812f2c248a893a31e9ca157cc9e19048ed5a6e49283bdd9dd15ddbf5f16fd9e47ec5a63fedc959a93f1a33
+DIST buildbot-wsgi-dashboards-2.8.2.tar.gz 5566 BLAKE2B 487b816862366acae9e55c39cb440a21c8e5c438299c43e2d6fad049ff946ece5ab647390955fbbad403ad1d7c0a2707a7612129442dc398cc7210d831aa49ef SHA512 2b75a61331aa457b3f168e1955b8905f95d11008ab6bee611ac92488f988cb0cf73fbf92321e594ac0a6e5ae03b82dfa05daab5a0647ae636a96922c0f4e8eff
 EBUILD buildbot-wsgi-dashboards-2.7.0.ebuild 997 BLAKE2B aea4b3352b6a2800846f11d2b2aae38d45cb7900bac975e2eff8dbee47b840fc235da2f6985c1d5396ce7a0a8a99726a09d26b9d357e26e844f410bb8eab4701 SHA512 1e12927a4530ceb2528f84c094e12a2761a5b94df7c3002d2b58cb1a358e4261dbd8480f1c5480866567da8a4b142c54cee26b493404570ab0a44ea697336cdb
 EBUILD buildbot-wsgi-dashboards-2.8.0.ebuild 783 BLAKE2B e86d4cd37741844a6a73194d8dbf87940cc4002db9d29f1d533d9be8f085e051d625369ae2ca4139c70e23e7feceff253c34a3cb659b18138546ac9fba5d6f59 SHA512 2341b355fb3868fc0f488c9a8b378e67b0e9ffcfa973628f235686467623f50c57d1e554f3781ea476a77dcf580bc3399e53d110cd39bd9a364ed83fc1c39884
+EBUILD buildbot-wsgi-dashboards-2.8.2.ebuild 783 BLAKE2B e86d4cd37741844a6a73194d8dbf87940cc4002db9d29f1d533d9be8f085e051d625369ae2ca4139c70e23e7feceff253c34a3cb659b18138546ac9fba5d6f59 SHA512 2341b355fb3868fc0f488c9a8b378e67b0e9ffcfa973628f235686467623f50c57d1e554f3781ea476a77dcf580bc3399e53d110cd39bd9a364ed83fc1c39884
 MISC metadata.xml 679 BLAKE2B 9ce30ea17fc3c2fa7f7c4fba8ad2f521bdf828662683893a8b6e8fc43f4c1ce8fcd8afdb1bc237153751eeb5d134df683b1abe9f0bf7a70f1b6c98517640d3b9 SHA512 47cebf0aa635cee9157445057c21b2d1272b222291874371791656823f75b20f59772ebae2eb1dd8230752808878f284879127650f7130e2b9820ce60fc6d92b
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.ebuild
new file mode 100644
index 000000000000..f124a0ef5c54
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 07eac37f87fa..2aa5d10b9bcc 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,5 +1,7 @@
 DIST buildbot-www-2.7.0.tar.gz 3173804 BLAKE2B ac51e6b8c6860dfd98647cacd5a300099bee19b64bb796e8643fab149c96604bb63a565a25eea51dbdc458128cd4c431efbf46069f2ee0adf5f835992d860e5f SHA512 530c2e3926dbec743b9dbc3ed38ba32c421ee265dc5ff48618748a547b0e8da4d7064e6afa379a8187ec189f8031c1e24b99576d276bc5eab4ad1c6a5bc27a84
 DIST buildbot-www-2.8.0.tar.gz 3174211 BLAKE2B 32463f0456ba3fbc5eefd067bcffc4021e1b1dbe95d3a68b1a52c1657317c883a49c6b5baa0696f1bc90c7a519406eb6a4b0797e9c48f28d021cbd4480d80ff9 SHA512 916fe250f14bcc2cfdfe6d54d426c523b6a093e13ec60be65b93e3dcad2bf919d091b9b4ecd797e0d616c8bb6cd02974ee9d66931031d8e614740bb9f816fb16
+DIST buildbot-www-2.8.2.tar.gz 3172352 BLAKE2B 8ead9e9eb046bf773bd70d312ae612dced839b263b02d300f600d066fcf21ef98a7884fef36c494bdc8eb26129d5bf7897c319256f0fe6ef8e1515dc8507a26e SHA512 22d0ccb3e5b3badeb5a59db18dd7b0b925fe84936c1be1773437e899122df95bc9b0a4205a0c87182cf6be4ca4275ab20cb86a4da6098c9d9c73927cb9b3c784
 EBUILD buildbot-www-2.7.0.ebuild 898 BLAKE2B 208e8a8b89a9373a60e34502f08b81b6cd3a3bf93b5fa96b23eeb31b54ffe2a7b68cc22a57400d05688af492658d3141718b4e71a4bc355cf75998d13a22c5f5 SHA512 003cfc4e9a053e4ad986adceba39272293f67a8852658988a0987cf919206e672de274e8aad439b40163cf64480df5bd47e1bfaadb2b849901907a9d38350c54
 EBUILD buildbot-www-2.8.0.ebuild 684 BLAKE2B 039407715092e067fdbce4aa6ec39c384e359947513c1013b2ad85bc50150d2cbbc56936fe1296f15a3187a1df48349c821adbe77ca61d233dfd64b281f363b0 SHA512 22bd07189fb594572729155b7cb57e4d3cd95a81d7b29526835f2434dd7845491c2b9e68c403d0a53b597b31152492ace54a5e71330f3104772a44a2db440fa0
+EBUILD buildbot-www-2.8.2.ebuild 684 BLAKE2B 039407715092e067fdbce4aa6ec39c384e359947513c1013b2ad85bc50150d2cbbc56936fe1296f15a3187a1df48349c821adbe77ca61d233dfd64b281f363b0 SHA512 22bd07189fb594572729155b7cb57e4d3cd95a81d7b29526835f2434dd7845491c2b9e68c403d0a53b597b31152492ace54a5e71330f3104772a44a2db440fa0
 MISC metadata.xml 666 BLAKE2B 2fc8d01c607e9f1fc0de5d151e0256fd7adbc1572d2497126012b0792967dbafe2522b269232a72c5208a5c0a6b9eddb9094afdde5d99d4b27995ad506c08f03 SHA512 1d00795d602f0df5e1dac771d38dc068e80edd098add25231bafb11d0f8d2ce783e884e41c3b0eba1a52fc2dac26a62f4c1c29603e20d6cb0af7c6977f437907
diff --git a/dev-util/buildbot-www/buildbot-www-2.8.2.ebuild b/dev-util/buildbot-www/buildbot-www-2.8.2.ebuild
new file mode 100644
index 000000000000..c5f7aebcb28c
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-2.8.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+DEPEND="
+	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 58009c161898..14aa89c15d2b 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -10,7 +10,9 @@ AUX pypugjs.patch 3631 BLAKE2B 168c865da59c947a00f4025108ff9fdedba55a9ce3a588e7f
 DIST buildbot-2.7.0.tar.gz 3175050 BLAKE2B 0a41eccaa4ca8df6396455049e8c09a1b2fe6cde3072da7fd3715f2769015944e8880f41dbe6750dd7b26bd863fb82f8e8d8c6540f9e1bf3ea4378f11adc973d SHA512 9946fe0b1591d51e5136d9458526918e872174afee79b5f1c333823ef1d2ddae66f017e9b57e26a2451da7ca7672720f32544c606ce5652d0825fae563779669
 DIST buildbot-2.8.0-fakedb.tar.xz 16204 BLAKE2B 741676e2c9117b1ab174ce49747bdfcd07766ad3e471e308398dff476f167fd231b7772c2f02002cbafb27e2ef535242d84d5aa84f4bc8942d4d216b2d5bf1f6 SHA512 c2b00d8621b3a1e521f6c17e902ae331b606dda3d319187895f26629dbdaf50caefc5d49fb150fb780e682ae431515c7ded4950d62448e8a73b8efba821c0fa1
 DIST buildbot-2.8.0.tar.gz 3162882 BLAKE2B 19789f1fe9f572c978a1843a98cd01d752a614d89eb29f2de9db750808d1f96d7893b39d703f37cc0e81e022267c08603c86d59a5902d65194e236f7170d6b30 SHA512 18af8fe1bda6f7014f514bfd112ccf9837194c0e42cbdabaaa6c6202660670964421feff3e92e9dca4cf960f69a4bde9b3666287b54ef7e912284a0471dcc2b6
+DIST buildbot-2.8.2.tar.gz 3181035 BLAKE2B 40a3e424cc03c982549f25993a4abd2fe04bdc089ad22288af4d25724972f9f3541ef32549d2761c808845df44a972b00cf631adfc564bf4852c4b6b6ab14404 SHA512 7d7f15becc7fc1803ae4e9f1906d547c89dfe1efaa51e8fda0674a3d9b060bafbaae4cb671ec844750313247edb73f17c9014c545bce58070df0ca322a0fd9a2
 EBUILD buildbot-2.7.0.ebuild 6974 BLAKE2B 0a847a75805dd0342a55f46640c4f01f9982eefa2cc1aeb00b15c85a5bad0a958761bcc9f508f03545be943e51e2896493c590c69f50e64691480b1916413ff2 SHA512 1e63016e5593a2135c92b2072181fb714d16bc383d88d9fc9513c30ab5a60af6b2bf6d94b2f5c25bfeba31b119ff4e45ab7f5291d950fa373a03e4c1caf6f315
 EBUILD buildbot-2.8.0.ebuild 7458 BLAKE2B 5c5c805eb70bb4eccd7f7283951a6e0c39d0bec01b79866ff8bebcee043ce086faae455feffc722a82373390092edb3a79a0cbc522111fb2b160aec0fdce13f7 SHA512 36ce0b760b6b7705fb8ea1149c1580529bfce1ae1d9ea07ece8b8aa642439f3726ddf79f35e9494b531b533bf0fe98e82d018409f658ba696efb54ea73e91754
+EBUILD buildbot-2.8.2.ebuild 7414 BLAKE2B 8d4647eb94f2adc5492b562943f060087e665594a50b0e0d05d2fe2eeef49f0ae56dd250e65301735d0623c4b88f6b00981507d236e8a23f33f9f5b64d5e616c SHA512 f814f7c19ac342706467fce52c11c51f694bf9dc2c7ffcdbde0d69da8e74eb7683b81f71eabdbec4aaf504016b423ffd7ae9cb126f543657313ce50c1d59a966
 EBUILD buildbot-9999.ebuild 7329 BLAKE2B f53e6293558eae28a68340d8a44bcff355f0498396f350548d6362bd87098da7b0e8279fa9e241ac99a4021b6963264e1905fab3c12e6d00f9124755e256c878 SHA512 e7de2a20e0c287e3646ed1161f34272319ac676e2c90649310dff28a46d026dca2c4ed8dc727ee6d876c925c2586afab8aec261496070602cb9a9c59e61bac2e
 MISC metadata.xml 1359 BLAKE2B 33a6b0f21ad4255f28bc527fb18a384889eb34b2ddc5df5cfa03cc4b1960712b91c787706b95913154300b8e82a5879703dd90d0bf4d796cd6b8bb2a7c4b71cd SHA512 ded6f9cd25bef2df1431b71d5ffc9f0aa3efe9d2f7433cee7800fc27e1f6f76ad64cda9bbc4d3eb3fe0f44dbd7414c75b029f78307925dab5ed06df3d52d86e7
diff --git a/dev-util/buildbot/buildbot-2.8.2.ebuild b/dev-util/buildbot/buildbot-2.8.2.ebuild
new file mode 100644
index 000000000000..3a8aa883913f
--- /dev/null
+++ b/dev-util/buildbot/buildbot-2.8.2.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit readme.gentoo-r1 systemd distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
+
+IUSE="crypt doc docker examples irc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		<dev-python/idna-2.9[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+	)
+	irc? (
+		dev-python/txrequests[${PYTHON_USEDEP}]
+	)
+	docker? (
+		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-2.1.0[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+		dev-python/pyenchant[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/pypugjs[${PYTHON_USEDEP}]
+		dev-python/txrequests[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+		crypt? (
+			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
+			>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+			<dev-python/idna-2.9[${PYTHON_USEDEP}]
+			dev-python/service_identity[${PYTHON_USEDEP}]
+		)
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+distutils_enable_tests setup.py
+
+PATCHES=(
+		"${FILESDIR}/pypugjs-2.8.0.patch"
+)
+
+pkg_setup() {
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+		to support starting buildbot through Gentoo's init system. To use this,
+		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+		The scripts can	run as a different user if desired."
+}
+
+src_compile() {
+	distutils-r1_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd docs > /dev/null
+		#'man' target is currently broken
+		emake html
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildbot.1
+
+	if use doc; then
+		HTML_DOCS=( docs/_build/html/ )
+		# TODO: install man pages
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r docs/examples
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+	systemd_dounit "${FILESDIR}/buildmaster.target"
+	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
+	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
+		ewarn "    rc-update add buildmaster.myinstance default"
+		ewarn "    /etc/init.d/buildmaster.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildmaster@myinstance.service"
+		ewarn "    systemctl enable buildmaster.target"
+		ewarn "    systemctl start buildmaster.target"
+		elog
+		elog "Upstream recommends the following when upgrading:"
+		elog "Each time you install a new version of Buildbot, you should run the"
+		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+		elog "This will add files and fix (or at least detect) incompatibilities between"
+		elog "your old config and the new code."
+	fi
+	elog
+	elog "In order to create a new instance of buildmaster, execute:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config() {
+	local buildmaster_path="/var/lib/buildmaster"
+	local log_path="/var/log/buildmaster"
+
+	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildmaster_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	local buildbot="/usr/bin/buildbot"
+	if [[ ! -d "${buildmaster_path}" ]]; then
+		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
+	fi
+	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildmaster instance at ${instance_path}."
+	einfo "To change the default settings edit the master.cfg file in this directory."
+}
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index 4b1da95ed914..85c8bfe7547f 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -1,10 +1,5 @@
 AUX bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch 1780 BLAKE2B 3dabdb99730f9581bd44d5c5ff9930aa57887e830db3226a37f9ba788e46b17e64ceb35f75476872936cc07c42cbda2241fd03a2d3fbb1ab5c3d2a59ece99811 SHA512 b5765864998fb4a65632657630faf499a7ece40e51c396e0055c574f524fef998f226f2bfca00b15b26ee20066ff4fef6627e6d0a94ff3cc9a5bb1b43b493588
 AUX bustle-0.4.7-gtk-0.13.patch 6428 BLAKE2B 20eea89172dbd4ef029ec598be9556721d8a5503aaf6cf1cefa3003e166dd12e1d1be3e41152ba530a49bf8bdd746495797887bb4c3ba9c91df965b3cd54c529 SHA512 49103d8b1019be025f52c2999dbbe34232a0133797a3e4ccc1e82e8ce61da71953c5b9084cdefc6f7cbba19c78032de1fcbd146f695abd07497ce867e5b03aff
-DIST bustle-0.4.0-tests.tar.gz 8340 BLAKE2B 0c0cf10a87c1fea6100828139e9781ff867e6b67490df99f403a7dc6d9665c3973e37c9e8e408549937750b262ff30aadf36658aec56f2f043f1381ac437dbd5 SHA512 c7685496f3a84c1615752ae9aad22202bfe703147441581abe599a5e5055cdef54f27b4e0d01603b23a83a4b42b0595b5538c5b4d65a522a9e76b8d187ae54b1
-DIST bustle-0.4.2.tar.gz 95707 BLAKE2B 12d8c08c7a3f71684831bc27c027db33902cc727d216801448e67ed18b717796038390ee7c63f2faea6e26ad677e618c51f9ad1353d3f54bd334d49fff621b7c SHA512 8a6c1860cb655fc9bd7d42d130d87416c74b988b81749ec8cc1c25cacd3dd4516f59f5cb5954b473c3f6ac32b11853e9bc8881708962144067a0325845dd8562
-DIST bustle-0.4.7.tar.gz 114231 BLAKE2B b783f4363171cab96463519806d18113012da3bdb9040a2394f5ad9cc1c7cfab7030b99ee71f1a5bd4bcd6906ef53f2fbc1eb8c504f3b4a526a9d55e27f2f6ab SHA512 c9b93ffda797a87342f5ba506db3c892bff8084fa0ec5897d676bef5e8367507970ae3e09555cda9b4de0c7b175dc396f2ccfb394d224e64225c0e7ded2164fd
 DIST bustle-0.5.4.tar.gz 122720 BLAKE2B b5a2315919644ab5c7712f9e9bde1bdea226b4e8898981f7150558bde648a5c7965be6ad8484c09727665292e5fe3f0cb545544dbb27f2a2553e513910289620 SHA512 56eaeef831fb5929d57a008ae71d8409048ce5d12eaada98830ef742baf3479264203465d77591cb338374096eac2dc2b68b44f075b2761f16df63fad54b91fd
-EBUILD bustle-0.4.2-r1.ebuild 1561 BLAKE2B 751abf9ca416371fd796a7dd362777780d3b92671d598b5a9da4f15583cad8b02fd9e2133e5a0bb1d89582ff09c36ab6a0698bd027983a6ff579eaac05da5dc9 SHA512 663114e86e31457b71880735a4d82a4cd587b05723b56779cb21c102a21ab405b925c873273fd57517a51fc3a4e47afedb452aaf63a0edf099d1fe4484bba67c
-EBUILD bustle-0.4.7-r1.ebuild 1512 BLAKE2B 210fd9295693ce97923fab2dfabb187c1e6a1b2b6927fd6249f728ed93d54bffa70e8dc06991aa3e63c7694b175816fab9421a0d32c0720bebb0cf69c49c8222 SHA512 60530014106fa0283cf54ecdd6cc26702e6dd9c05777d8ecbb75c61ce200f0c41cfd5540ffd46ed1f9f7233362abb8a0820aee0e70541e4030ebed3966c21f68
 EBUILD bustle-0.5.4.ebuild 1635 BLAKE2B 4e3e075dc2d7ca51a77112a26c86e975681d35f6ba41b5cf2d3b2d074b1d2d5be59f2bb63c713dfa5fbe5c8f6145c87388159060995897062e37de910d00e348 SHA512 f8b263727d6c917fa5a76f6f4462c07310181bac753763ffb44f5633fbdf7b63580f99eae5268e5f29c83df048ae5dfb37bd5aa49984bd6fefcd95e8f9b84af2
 MISC metadata.xml 502 BLAKE2B 3ab482910acd7936501b8c519d2da5c286d493a04afc6d5302989ca5662a4f166d84142489789cd5f5ea4071b5a5e54bc9d0586e6e6fe273f3f2f6f4c44149b8 SHA512 834e9820081006344e30580673ccb789750d1af67807f908b21fc5fe0cf1b8554b32b446aa592c52a1dd26e4d36f2f91c3cff569b8c4797ded9c5c6ea1bfa65d
diff --git a/dev-util/bustle/bustle-0.4.2-r1.ebuild b/dev-util/bustle/bustle-0.4.2-r1.ebuild
deleted file mode 100644
index 18e9dda482c3..000000000000
--- a/dev-util/bustle/bustle-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit base haskell-cabal toolchain-funcs
-
-DESCRIPTION="Draw pretty sequence diagrams of D-Bus traffic"
-HOMEPAGE="http://willthompson.co.uk/bustle/"
-SRC_URI="http://willthompson.co.uk/${PN}/releases/${PV}/${P}.tar.gz https://dev.gentoo.org/~slyfox/bustle-0.4.0-tests.tar.gz"
-
-LICENSE="LGPL-2 GPL-2" # bustle-dbus-monitor.c is GPL-2, rest is LGPL-2
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-		net-libs/libpcap
-		sys-apps/dbus
-		x11-libs/cairo
-		x11-libs/pango
-		gnome-base/libglade:2.0"
-DEPEND="${RDEPEND}
-		test? ( dev-haskell/hunit
-			dev-haskell/quickcheck
-			dev-haskell/test-framework
-			dev-haskell/test-framework-hunit
-		)
-		>=dev-haskell/cabal-1.8
-		dev-haskell/cairo:0
-		>=dev-haskell/dbus-0.10
-		dev-haskell/glib:0
-		>=dev-haskell/gtk-0.12.3:2
-		dev-haskell/mtl
-		dev-haskell/pango:0
-		dev-haskell/parsec
-		dev-haskell/pcap
-		dev-haskell/text
-		>=dev-lang/ghc-6.10.4"
-
-PATCHES=("${FILESDIR}"/${P}-restrict-gtk2hs-deps-to-gtkplus2.patch)
-
-src_compile() {
-	# compile haskell part
-	cabal_src_compile || die "could not build haskell parts"
-
-	# compile C part
-	emake \
-		"CC=$(tc-getCC)" \
-		"CFLAGS=${CFLAGS}" \
-		"CPPFLAGS=${CPPFLAGS}" \
-		"LDFLAGS=${LDFLAGS}"
-}
-
-src_install() {
-	# install haskell part
-	cabal_src_install || die "could not install haskell parts"
-
-	dobin "${S}"/dist/build/bustle-pcap
-
-	dodoc README HACKING NEWS
-}
diff --git a/dev-util/bustle/bustle-0.4.7-r1.ebuild b/dev-util/bustle/bustle-0.4.7-r1.ebuild
deleted file mode 100644
index 1161ffd6eefd..000000000000
--- a/dev-util/bustle/bustle-0.4.7-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal toolchain-funcs
-
-DESCRIPTION="Draw pretty sequence diagrams of D-Bus traffic"
-HOMEPAGE="http://hackage.haskell.org/package/bustle"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	net-libs/libpcap
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/pango
-	gnome-base/libglade:2.0"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	dev-haskell/cairo
-	>=dev-haskell/dbus-0.10
-	dev-haskell/glib
-	>=dev-haskell/gtk-0.13
-	>=dev-haskell/hgettext-0.1.5
-	dev-haskell/mtl
-	>=dev-haskell/pango-0.13
-	dev-haskell/parsec
-	dev-haskell/pcap
-	dev-haskell/setlocale
-	dev-haskell/text
-	>=dev-lang/ghc-6.12.1
-	virtual/pkgconfig
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gtk-0.13.patch
-}
-
-src_compile() {
-	# compile haskell part
-	cabal_src_compile || die "could not build haskell parts"
-
-	# compile C part
-	emake \
-		"CC=$(tc-getCC)" \
-		"CFLAGS=${CFLAGS}" \
-		"CPPFLAGS=${CPPFLAGS}" \
-		"LDFLAGS=${LDFLAGS}"
-}
-
-src_install() {
-	# install haskell part
-	cabal_src_install || die "could not install haskell parts"
-
-	dobin "${S}"/dist/build/bustle-pcap
-	doman bustle-pcap.1
-	dodoc README HACKING NEWS
-}
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 8d2a6d94afbb..2f521b809957 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -3,6 +3,7 @@ DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538
 DIST cbindgen-0.14.2.crate 165699 BLAKE2B c0964a66b3ef57a6eccaef83c7cd8a500605be0cb5bb0f571b5d35a2f924613fec3b4ee77190b74203057488c2402c6a11680ddbf395dca00baa5e69bf18210b SHA512 d3ab0a4c217c9047bc3ada7911d4ae1bdfc09092835f78d232bb56ef0d9a499df43e358532dfb828a04df61a0cacccd7e57214cd15f466791eb1b8edd9f92ed0
+DIST cbindgen-0.14.3.crate 165874 BLAKE2B 0155bccbacc70a2f8173117dde46c3bb48e07d0a0616b53ea56cade436cb6da1aa7106a82bf4ac55954cafbea1790f9200bdd3132032d3306ec755be0bb2f05c SHA512 abce798aff93260c28b0717df5fd25cf24b3eb89c9d05df4832d06169ec30db8e1c17a300f88087c6fbd4414a6aae6788e162dde838aac01c499afcb145c8461
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
@@ -37,4 +38,5 @@ DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cbindgen-0.14.2.ebuild 965 BLAKE2B 311220957f3598f4396f909942f788ee38e319825cef2fec927a83863f4c3b3b8aa83b78842e57d61e429e722baf4ae03ffa9f40ab65f543e1f31737c97bffe0 SHA512 64e24aa2e6714fd5d44011131f6b775e1daa7a1ca5a23a28f680a7edcfef3b28d99980ff39f072951ca49d1c71452f2066dc5449b199f7fc20612636dbfb42e4
+EBUILD cbindgen-0.14.3.ebuild 968 BLAKE2B 63506fd9c6e73f304b8e0179b7f6057a8673d58f9aba66b15fa6f23369abecb72cceb37d019661f9e2ebd23db2af909e195c5d6bb9392ed6f4d14f3c872a16b6 SHA512 9e07009c498cbc1731d437a54da5a50f278eb915b65381685911dce66de9debe4aa2f04676cb9fa4ef7ae35ac08d0724fac2cd3cdd1d82b325be5a02efe51d31
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.14.3.ebuild b/dev-util/cbindgen/cbindgen-0.14.3.ebuild
new file mode 100644
index 000000000000..1a72d3a19dcf
--- /dev/null
+++ b/dev-util/cbindgen/cbindgen-0.14.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CRATES="
+ansi_term-0.11.0
+atty-0.2.13
+bitflags-1.2.1
+c2-chacha-0.2.3
+cbindgen-0.14.3
+cfg-if-0.1.10
+clap-2.33.0
+getrandom-0.1.13
+heck-0.3.1
+itoa-0.4.4
+libc-0.2.66
+log-0.4.8
+ppv-lite86-0.2.6
+proc-macro2-1.0.6
+quote-1.0.2
+rand-0.7.2
+rand_chacha-0.2.1
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.56
+remove_dir_all-0.5.2
+ryu-1.0.2
+serde-1.0.104
+serde_derive-1.0.104
+serde_json-1.0.44
+strsim-0.8.0
+syn-1.0.11
+tempfile-3.1.0
+textwrap-0.11.0
+toml-0.5.5
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
+unicode-xid-0.2.0
+vec_map-0.8.1
+wasi-0.7.0
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A tool for generating C bindings to Rust code"
+HOMEPAGE="https://github.com/eqrion/cbindgen/"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+LICENSE="MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index d39c67d5ef8c..e76e739a93ee 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,7 +1,10 @@
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
+AUX ccache-3.7.10-objdump.patch 392 BLAKE2B 6c15a165aff5b2633b0c3571f8f89a3480d5608b006f9f3c0a80117d5c94039fc3e631d0f54c870df1904ac5c855d11007fb73178be8df7001be4f414d103ede SHA512 94f291d44a64ed9aff04da39467751aaf84262fd987c63e53213cbdedbaf30c36ff0aa0902e73418846153e8cdf5a912b021adf7c122bea9698cb296faa9ebf6
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
+DIST ccache-3.7.10.tar.xz 353792 BLAKE2B d7c06ee55a79afb4b72cdc20ec3d6413a5417301c63a0c822a4f82e6b9542c7a9cdf9f1bbd60a4698c335fdddfadcb9d674bff02c6dad1c2df9932212fdf6477 SHA512 64b0d42af7fd2dfdda65668b04dbd16807a22324e336e61f6c6a91c00110fb535c7ac9062a9c14c924a7ddaf42247f69a43d83dd0fd187ce3b0737158b5bb8fc
 DIST ccache-3.7.7.tar.xz 351592 BLAKE2B 0b211cb77ceb42b7ee5dfcde98d9f53bf222cf18b8d38a7cf6fc9631c5e1c79ca82e6d0a0dbacfe2d5f61b2acefebe202e06fc3b8035f0f25a5f9954554a18cd SHA512 f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816
 DIST ccache-3.7.9.tar.xz 352948 BLAKE2B 791491c3f9da58f06bb0a58e411d9a7b3e39e460102793ef736820913d43d488ce7daffba572c21f507ea78d8da04edc3aaa47eb1a0fbec8cb35461a60b770e9 SHA512 5d39baeb66265451b0e9cef250f6d9c5f6869cd87e27c108c9a50bef80050122ed4280ff662a81bba8d1d1311f2004bcaf9ada6b783a42eedc67ca01ebc48bb4
+EBUILD ccache-3.7.10.ebuild 1531 BLAKE2B d1583ac3d2283f44e9feacef08092cf7852ebbbccf35ac82df08f48be3046aa0c89bbb7084d0b77b31c135e350c7f5528bab63c9663db5fc1918ff7d71199a18 SHA512 c1f7d9466122f2c77925cf885c7ef08c596589e7cf005416f169bd9b65eb387448d32fafebc7908d4c15bb3fd5a10b24e48fc45db0b48dcfcf1a70d52f5042d8
 EBUILD ccache-3.7.7-r1.ebuild 2204 BLAKE2B 168006b6402a929a5c4367d98fafcfac1f6bb0a4ae11c2aa495cc6c326a7ff21cedc81204451ffa592b1b6f04150aa7923f0eff851ad502496bc101641f7ae0c SHA512 f60bdfe797f15da5ce90a784029dce92971bd15b90e91d1503ff2da78d8ef6d57a9b98ffa75c1f9565f4e5a71bc09e0be58946a0613d3fe2fdbb20d1797c8ccf
 EBUILD ccache-3.7.9.ebuild 1419 BLAKE2B 6f248e8069578a8fd82ff7c425978c3656d45943e77c611d663cb3d63ca3ac526cba14d410dc3a3a5f46a140733d8fefc0b7580504b9008fc97c963c47669ce9 SHA512 c218ae20057eebf4242b51c5b3fa4dd6e3e9bc43428d4ecdff197773c80a6967c81e3df246c298c89cb028dff9caeba6c190e897bc60cc772445d43519444c0e
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.10.ebuild b/dev-util/ccache/ccache-3.7.10.ebuild
new file mode 100644
index 000000000000..900d8f39d692
--- /dev/null
+++ b/dev-util/ccache/ccache-3.7.10.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+DEPEND="app-arch/xz-utils
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+="
+	test? ( dev-libs/elfutils )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${P}-objdump.patch
+)
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+
+	# mainly used in tests
+	tc-export OBJDUMP
+}
+
+src_configure() {
+	econf --without-bundled-zlib
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	emake check V=1
+}
+
+src_install() {
+	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+	default
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT:-/} == / ]]; then
+		eselect compiler-shadow update ccache
+	fi
+}
diff --git a/dev-util/ccache/files/ccache-3.7.10-objdump.patch b/dev-util/ccache/files/ccache-3.7.10-objdump.patch
new file mode 100644
index 000000000000..bad334a5c546
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.7.10-objdump.patch
@@ -0,0 +1,15 @@
+Allow ${CHOST}-objdump (or any other override)
+--- a/test/suites/debug_prefix_map.bash
++++ b/test/suites/debug_prefix_map.bash
+@@ -24,9 +24,9 @@ objdump_cmd() {
+     if $HOST_OS_APPLE; then
+         xcrun dwarfdump -r0 $1
+     elif $HOST_OS_FREEBSD; then
+-        objdump -W $1
++        ${OBJDUMP-objdump} -W $1
+     else
+-        objdump -g $1
++        ${OBJDUMP-objdump} -g $1
+     fi
+ }
+ 
diff --git a/dev-util/chroot-wrapper/Manifest b/dev-util/chroot-wrapper/Manifest
new file mode 100644
index 000000000000..c85f6df9ab54
--- /dev/null
+++ b/dev-util/chroot-wrapper/Manifest
@@ -0,0 +1,3 @@
+DIST chroot-wrapper-0.9.1.tar.gz 12166 BLAKE2B 526c4c5630d603e726b27782433a19c67582afdae29e5775a34a5bc0e7ccff78523ad548f4645394863b1742e4f71a3755b1c371979470933eaa99a301623020 SHA512 c558f4abd14b083f4553cacd418de548cce1d73d46706485c57dc23fd3c8d7130933d50408a78bf621b39bbd9dc77dfbd1dbe5677e371dee5bf7840bc0fa645a
+EBUILD chroot-wrapper-0.9.1.ebuild 570 BLAKE2B baa678734074096c7f9bdc6bb2e0785233b93f81cb798a5a6bd30243b1fec1cbceb08315831422f83d065e212f7a3d07d9d7dd2542849195156db773408e7368 SHA512 1aacef74db849d5ee582e0a6044680af2f7959fbddd9f09ee215bf9a9f50552f388245fb27a9ed76c4a2ada8289d63d9d82d2f51d5fc1b1772fe8bde42bf7920
+MISC metadata.xml 249 BLAKE2B 51ba583d3f040316570785a91020f260c7eacf5a322cc4b905648f547f06f413976d1834f7f010db5b6183aad6d6503f9bccb21e74508b5a5af1a5d96e82c805 SHA512 276a98a5eb50222440ab5bba11bfc895a0f89be2c2f2e561214b97b6138fe7c4341f6ca1fcb29bc03fa5a89844ede7f82a942c20ed649ce3e7da459a1b2481d5
diff --git a/dev-util/chroot-wrapper/chroot-wrapper-0.9.1.ebuild b/dev-util/chroot-wrapper/chroot-wrapper-0.9.1.ebuild
new file mode 100644
index 000000000000..d5e93afab40d
--- /dev/null
+++ b/dev-util/chroot-wrapper/chroot-wrapper-0.9.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info
+
+DESCRIPTION="Wrapper for chroot to set up some bind mounts, namespaces, and control groups"
+HOMEPAGE="https://github.com/chutz/chroot-wrapper"
+SRC_URI="https://github.com/chutz/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=app-shells/bash-5.0
+	sys-apps/util-linux
+	sys-apps/coreutils
+"
+
+CONFIG_CHECK="
+	~TMPFS
+	~IPC_NS
+	~UTS_NS
+"
+
+src_install() {
+	newsbin src/chroot-wrapper chr
+}
diff --git a/dev-util/chroot-wrapper/metadata.xml b/dev-util/chroot-wrapper/metadata.xml
new file mode 100644
index 000000000000..126b9ca42a25
--- /dev/null
+++ b/dev-util/chroot-wrapper/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Patrick McLean</name>
+		<email>chutzpah@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/cucumber-cucumber-expressions/Manifest b/dev-util/cucumber-cucumber-expressions/Manifest
index 6707edd05772..fe66312b878d 100644
--- a/dev-util/cucumber-cucumber-expressions/Manifest
+++ b/dev-util/cucumber-cucumber-expressions/Manifest
@@ -1,3 +1,5 @@
 DIST cucumber-cucumber-expressions-10.2.0.gem 22528 BLAKE2B beff2fb2229154f8bec7942be4679b876243f65621747482669041aafed099e27ca78f2696d67a39b0b05b3139a6eb1b0bc8da4a045724892a9e0656ee98dcc8 SHA512 9996bc084d10a56f7efe70220b4a0496fb540e4f288c1819be458d6e9e58443749dfb5e1ba6c6bfd36a95a8de51067cf27285ad175ebc9e0404233fdd4bfdba2
+DIST cucumber-cucumber-expressions-10.2.1.gem 23040 BLAKE2B 590f54eff3054a9d0e7e80732912b41fd314041578c0f4758a6fb0e175b7177f849dfdcd2eb32be5ab9ca4fbb282121c5ef0e2b18a0e66f287ade71acaff9cd3 SHA512 6f3ce32b70150d029febfa97d5bea5acbe7a59e588fa1f0b9961c6c64ca667a53514e2eaa6bf1160de916cc094f82aa341b03273f05fc54019bdb4e0940a3d02
 EBUILD cucumber-cucumber-expressions-10.2.0.ebuild 482 BLAKE2B 38b52c2ab5403e58f9b53d7922ec0e4b5013436490ff84bf424709f497f98fa8b916b194fb3ac0a070cca1e17ad2d6d10f4623b4d000e863e1849268bf190ccf SHA512 8d1885a702f9536a3f0c25977f7d34ca22285e849f5a2d34ae1704fab8b8c8b430065386ebc6778bb3b82c73574cfaad49198ea3d746f708b3426f67b7e5f3f6
+EBUILD cucumber-cucumber-expressions-10.2.1.ebuild 475 BLAKE2B 200a330f113a55b51d98ad04636633b38a369ad76fdd2b20d11fc609b904f40a3bb6ffc107877ec670843aebc9e5f065574916a6d5374754e480a9cff84097df SHA512 fbcc950bcb316eecfffbcdd4addc9a64a7c3c280bab6eb56bae67e5a6ba0973ccef92beeba9653c7310de441488776ef70fbd87852e4dba88c5ca663ec3f6ae1
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.2.1.ebuild b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.2.1.ebuild
new file mode 100644
index 000000000000..10db2f04fa4f
--- /dev/null
+++ b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.2.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a simpler alternative to Regular Expressions"
+HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 6ce0cfc98b14..0a289d0c4c3b 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,5 +1,7 @@
 DIST cucumber-rails-1.8.0.gem 43008 BLAKE2B ac2fbc89ea952add031429b281986de37b3a8511e398b34d49435c70221b3c454589c51acd5b1fcecdf0285a8e446d4c2c0e0a77216eb78f8fa222086fb6db36 SHA512 757f50719309418353cf1e6b42902ce6166806d2e2a9cd1a27842ffde3d8ce61af97de12f4ffa9e31a50693cc8c40ece9a74e5ec91973096e77860b56034d439
 DIST cucumber-rails-2.0.0.gem 41984 BLAKE2B e6dd46d1957478ede25ff226d7423d54fa6aa187f398483815fd9504b23308aca01d5336b62eca152e5384fbf23328d0cd1cd6d1200cd61dc4319508353a7b59 SHA512 d48472b4c6694c612a46ade99fa20add1ee1699cbcd14ddb91c0dcadab25c0f4c18c2f22f713ed8a00dcf765d583d4f46b7e9c99b0f94f0521296e3e4846ed95
+DIST cucumber-rails-2.1.0.gem 42496 BLAKE2B 7e2862ddb006becd6e74374e2075c9ac7aadc62600985c9742af76c90ede6a1506d714d7dd82ad364c2f70ce102f424471fadf9431253aee7937c2d9ee2e591e SHA512 43b7f09ec5829c4ce86579c5840830f6a3effb956cefa661ed66362bd2f71c1ebd97f90414198c8120df25803b309af94a6ab529f8ed48ecc7994e33cf49d26a
 EBUILD cucumber-rails-1.8.0.ebuild 1184 BLAKE2B 418d8325a0cd90834c31ef87e86d3fb7a7a8b6602fb73546e4c8b9cc86c492e6556055d5ef8bb2fdac12b97f9cd6b53594cf45e4892f8b356a209aaf57c3688c SHA512 fa921b40e01409ab7f3da2b5dc9b781059a2c8d05f6ef9d4e94360005f58e601d99423aae349af78c23ec17e390728f716375ac80784b2065e5c23d5f4ee91e8
 EBUILD cucumber-rails-2.0.0-r1.ebuild 1221 BLAKE2B c23a7bb31a02af2f57ddfa1820eae96c175ccd87bf7d15f74de8d0d824a6ae678b99bf1ea2bfbc8ac6f332f908418fa9ffd38739997ebb553495fcce5c0fec26 SHA512 8cc97442c6650b734bc458dcc972e6391994269a5ee03dea633548edae0b15e5e6782c06372b576d0673086bc852bbbf737235c9ec7ae3356ededf7a826e09b5
+EBUILD cucumber-rails-2.1.0.ebuild 1208 BLAKE2B ef4ed22a7df3bbdc445893f3a28d8be3b7bad1c1fdb7bbe4464c236d4c8da717c1be26ce65d1c03b6bd4ea75263421650c56509bcd8cd8d92c78b281e18e6f2b SHA512 890e64004bf2b4f84c11f3555e1246a0dfe4efe5c71ab9c660e289d9cf277acccabb0942290d2a197d6963c06917c97609c4ee663c86c5492bd2c70599f31609
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.1.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.1.0.ebuild
new file mode 100644
index 000000000000..22e786917fea
--- /dev/null
+++ b/dev-util/cucumber-rails/cucumber-rails-2.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+# There are also cucumber features. They require a Rails project with
+# factory girl which we don't have packaged yet.
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios for Rails"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+# Restrict tests since Appraisal is now mandatory to manage different
+# rails versions, even for the specs.
+RESTRICT="test"
+#ruby_add_bdepend "
+#	test? (
+#		>=dev-ruby/ammeter-0.2.2
+#		>=dev-ruby/rspec-rails-2.7.0:2
+#	)"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-3.0.2 <dev-util/cucumber-5
+	>=dev-ruby/nokogiri-1.8
+	>=dev-ruby/capybara-2.12:* <dev-ruby/capybara-4:*
+	>=dev-ruby/rails-4.2:* <dev-ruby/rails-7:*
+	>=dev-ruby/mime-types-2.0:* <dev-ruby/mime-types-4:*"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 38cef08b0a99..50eaf0930252 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -6,5 +6,5 @@ DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05
 EBUILD debootstrap-1.0.115.ebuild 1168 BLAKE2B 9a61918f4a713360d63fa16b54abfb0bf6570b7551763a05652c190d1f1fb1256d154b16d99f82c6a6067adecea19e9ad6560fdba9caccd1a7d1076b6178bc8d SHA512 532a18dd5662d3f40b26941e8211090de602c655ea557d998431092aeec77f3e41c65919a265a1c367a5f269da5cf9ab354d86824c00a11b3175a804acdcbaf2
 EBUILD debootstrap-1.0.116.ebuild 1175 BLAKE2B cccd238e7c0069376c7e3265113d1f18a0e307c8812e0e74da55b38dadeb3bdd57aaaa5c8203856053b1333198d8ed803fbeefc45e923ccd1556b23d1bf44721 SHA512 59a8f2bc22d53358247c82784f8461c7908ce65bd74ba119f7e840aa599fb9c5cc7ca0d4772a5bff8b47b14d866431c7e2d05b94743007691f4ccc02d7dd5225
 EBUILD debootstrap-1.0.117.ebuild 1175 BLAKE2B cccd238e7c0069376c7e3265113d1f18a0e307c8812e0e74da55b38dadeb3bdd57aaaa5c8203856053b1333198d8ed803fbeefc45e923ccd1556b23d1bf44721 SHA512 59a8f2bc22d53358247c82784f8461c7908ce65bd74ba119f7e840aa599fb9c5cc7ca0d4772a5bff8b47b14d866431c7e2d05b94743007691f4ccc02d7dd5225
-EBUILD debootstrap-1.0.123.ebuild 1194 BLAKE2B 93d11f54b4432c91f748c0211c962cb509aadc7b84c1613db70303f4ee4eb5ef2355eea4c5c9a62659aafc250dad0cb64a6eb094499f41c84287e3f625babef3 SHA512 94e5dcc182f32647c89d4dbc7ae96cc0d57bdae380cd5e4b1a40a5461a7a5adc979b6ac52af94c520b37b415c7c20e817ea13d3a133180813b364cd28ea0f59f
+EBUILD debootstrap-1.0.123.ebuild 1201 BLAKE2B 878a39bc4220fc8c46fde54cd64f6459749f064b164fb0ed2b08b3e79b70bcf77fea79e9d8604a43c23515cbeb7353eb6d1d78ceae23fea4931ac54aa24d39c2 SHA512 8b659771742077fa67d4d9e66ccdaea2ca93a3ea6934ad37f83c4b74815d13469e38c275f865b3b195e8d09c87c9f8d28e3b6205a3569f653f232afd88760c11
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.123.ebuild b/dev-util/debootstrap/debootstrap-1.0.123.ebuild
index 8ac0c3265c7f..5149fd9864e5 100644
--- a/dev-util/debootstrap/debootstrap-1.0.123.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.123.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
index ba3a3aa61cca..d7b2e33f0116 100644
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@@ -1,5 +1,5 @@
 DIST dejagnu-1.6.2.tar.gz 525879 BLAKE2B 1a4cf8bea350d7fca8983fe9f5f77756746e9ef81a06e2bc733a9fa32f54e3c791f28d80ab563306df4082f2d5f9f30b87f1380b57b15213bf401783e5384dde SHA512 ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042
 DIST dejagnu-1.6.tar.gz 523969 BLAKE2B 1cc9498aacd681570cd8d8834cd2fe0594bb49e6664cfe934b824dba0bd4a6766f977de6a1dc4596095a11d68844873f5687000423f4928f0432981023d26451 SHA512 a494dd5cde8d275b397116049c93e183f5f1731d63660ee8d2f4263b099fc5be7fbddde927fab3ccd5f000c43d50242f94bbb4d95497b915ea53be418bc145bc
-EBUILD dejagnu-1.6.2.ebuild 509 BLAKE2B 556079a425d5f7d5b875baf02c79950c1ef1ff8d0d030b4a18055d1d9c9c56583989fcc2e3d01bdbe3c01bae2c125e0e77455717f4d514a6b1284ea936568195 SHA512 9e371c5da0a0d8c9bdaab698bc2ff17e3bd815bcab7470351084f9a1e0edf84670e6488d5e9088db8229872737e542779bd3d14988d4f648e7aa2342ea7d2812
+EBUILD dejagnu-1.6.2.ebuild 501 BLAKE2B 5d08fbd32e0c747dd713db5df09d624e4405b27cbfcca94b9eb5f0276296866f27dcc03bb603b69a2cc718b2b1718c66afe15a38a1e691993a1b3bb954f486a4 SHA512 0d628d8b0c4fc49c37a40dc76b8394b09956a97e26af1fbfc5df896e7d94ada825f3a5a09333562a5585a7ed2172b7d9c6868a4fca594b7352d8b9ee66fabd46
 EBUILD dejagnu-1.6.ebuild 716 BLAKE2B 9c340eb716f73cb9d7387867dbe330dd6673f9e4ce0140ee3446e6acc01f960e8c589281480b22c99744c60c9e378b1b0c83cdded35844c758f306f31a882b5d SHA512 28faea8246eb42c74e33d65036234643b4fdf647ffbe57d10bb3c5225721afbf35de20a7f2dc9ef621a7861d8965dfb437c5b6b9f6c622fec633ea06e58780cf
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-util/dejagnu/dejagnu-1.6.2.ebuild b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
index fc736f0e1e48..c38a0a001a68 100644
--- a/dev-util/dejagnu/dejagnu-1.6.2.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/tcl
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 1f0fb20b4944..62b64b38c129 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,4 +1,6 @@
 AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3
 DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
+DIST desktop-file-utils-0.26.tar.xz 83132 BLAKE2B fdbe5427a0278ebe4a9b1bc15a148ecdc3f54b54058b355ae4f9a962fb1c4ec309d24a075973caf8f187a1c74b013e9bed0a7c3668bf888274e77fac9e077ec8 SHA512 5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831
 EBUILD desktop-file-utils-0.24.ebuild 1287 BLAKE2B 7ac58a5fc22f86c48162d3ef0c5f5471031a36294d8e9a68c1bc6643db4bcabb51e0ad581115e18df0e97c1b119d9c0b65737c617f6cdd3dbb984c7c90e81fd5 SHA512 09ee0891f66b52b89f6f45e909c579408cb36f0e8e535636444ab82424cb1c93f89d9cebf48c141f8bd9322c362e3948a5bc6cc3d0e844d1d8d8cb758f129870
+EBUILD desktop-file-utils-0.26.ebuild 1168 BLAKE2B c08a06d6431c05bc1372593d4d1e4ecdfbb55febd338a60904fb21682534118183e31338f1be5425cff31aeced160c4551f4bc4e9874abe77da3a1e2cb370c05 SHA512 81cd3af901129f6e1f78f2fa140244e8e684e65230954a7871ef195f845eaceb4ad5a977a755a092f45c3b29c1b017113b44ae1a8c949fee63964072207ae861
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26.ebuild
new file mode 100644
index 000000000000..c25251a74beb
--- /dev/null
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.26.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit elisp-common meson
+
+DESCRIPTION="Command line utilities to work with desktop menu entries"
+HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils"
+SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="emacs"
+
+RDEPEND=">=dev-libs/glib-2.12:2
+	emacs? ( >=app-editors/emacs-23.1:* )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+src_compile() {
+	meson_src_compile
+	use emacs && elisp-compile misc/desktop-entry-mode.el
+}
+
+src_install() {
+	meson_src_install
+	if use emacs; then
+		elisp-install ${PN} misc/*.el misc/*.elc || die
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 82fe74174c92..a6764fd8ed95 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -3,5 +3,5 @@ AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb
 DIST devhelp-3.30.1.tar.xz 317956 BLAKE2B 8646fb97f0649bc166c8a21472f4c638f37bdfdc9e34b7214f0e5bd32c1c78664cc320f978fb27e313de54e88cf31685596f4bf7f43235ae96345292db6a9fc1 SHA512 f6f028948edd4c6954eaeeb026bf69c11284d725925d354ef42ecc67275cdcac66e8d3657d95d50926350543489b2bb2fa3a194d99d01494bedac60d3a2b4bbc
 DIST devhelp-3.34.0.tar.xz 288352 BLAKE2B 26c8c05c161e5607492fc26f012280468ed247ad4c166013e9df5fc1c76d59f98034a157cb58be9554ec65f46520b7d0d2ba78de00134570e84ca5a5ba0dc504 SHA512 34ed48ed323827b01f7d32e186da856c788ddfe37d6836082a81e6c8e4cd7bfc2265309cc3b298a0aea542b85e9261987d47a5a4396d865ec7e4cc13a9d05814
 EBUILD devhelp-3.30.1.ebuild 1812 BLAKE2B c91d39303521e9713889b705880ccf73844d384ef862ac44bc27da7dd89642330a53f1895c987c130d9a045f338f7a2e21556f71a1c52f74fd662c451bd91387 SHA512 7bbf8b15ed05ba91002737ade2f2bafd818c20a94237f7816e538aa9f5103d18968be82f1105e333e1b4cb50c8024c72e832775431aff18e892dd369dae54f1e
-EBUILD devhelp-3.34.0.ebuild 1787 BLAKE2B c12b19b022f1f5d1fb6d383a8d7e1a0362d8c1ef4925bde40b981071c95a9dc9ed0116f38866956973ecf5182e22177e0430faa6d4a609513c33b4420c043113 SHA512 d7bf74e684d8040bc06ac35bbe37f3230a4c8847045b6a18f8750ea4fb4632123cd6812323e5b282faadd13b3fa6e07ea31db2b9ef34ecabeac960a210b69867
+EBUILD devhelp-3.34.0.ebuild 1786 BLAKE2B 3312e9c7f12f38533dcea1b92905706b91867590534785c3849358a823d641c5ebaea14f9c9606a1630c357ce41fe94702ce8e3e5de342704c530910d3175083 SHA512 6ad7df312d6346a50f1461d0d40c31760e34501d657c3a1959326c64ef32c714435dfe46f7c2853511f4a72448451c724f8beeb3326fbb767c51ad84f05a18d1
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.34.0.ebuild b/dev-util/devhelp/devhelp-3.34.0.ebuild
index f3b8ff316281..75ad41f460cd 100644
--- a/dev-util/devhelp/devhelp-3.34.0.ebuild
+++ b/dev-util/devhelp/devhelp-3.34.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-3+"
 SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="gedit gtk-doc +introspection"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index c7f2406308b3..1a22aa6eef45 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,3 @@
-DIST diffoscope-148.tar.gz 1570459 BLAKE2B 007900cd798b3371f3b779a35a2d12fc52222d2df3c1430ac091992550161ffe2be43efc6e4837173221bb75e72f9ca59afacbaad65420d0ad7310b80b924998 SHA512 e3012c97133e44009295fd3647012cf0e51e449b0e2b506be40169d8c444fc04654b0bf3ba92dcb0ec2ac85bab4577b75e986ce0e41e18ca69718004265f6117
-EBUILD diffoscope-148.ebuild 2161 BLAKE2B 9ef4a812c5fec5a923b0b796814052c00842cd36a447832fe65aed32c341454538ddccce2baac0b038d8bf02cbed98a2023eeba33e8a7868f34a882331098c34 SHA512 e508fee8307b2e634ec33877124156fcb8afd43307747b1f61e18ecfeaac00c1140c1906ef87015f3b76f70ac5679c28fed47539e52ce0adc29c6257ad6deacb
+DIST diffoscope-149.tar.gz 1570458 BLAKE2B 8182822f01805277937bf6993094a2ad2e32fde47a67a01a071691487582c22f9be9e299701ad2feda85ce79d5952747348e3180b22e60878d01f28f6e8a9ff5 SHA512 557f0edcd5620a097668108a223f3f58338890eaeb096982c398f1182e26219027c4d62dab688a19743be1167d0affa9dbd6b7b7440fcf86a7f55ade7e3be288
+EBUILD diffoscope-149.ebuild 2161 BLAKE2B 9ef4a812c5fec5a923b0b796814052c00842cd36a447832fe65aed32c341454538ddccce2baac0b038d8bf02cbed98a2023eeba33e8a7868f34a882331098c34 SHA512 e508fee8307b2e634ec33877124156fcb8afd43307747b1f61e18ecfeaac00c1140c1906ef87015f3b76f70ac5679c28fed47539e52ce0adc29c6257ad6deacb
 MISC metadata.xml 2137 BLAKE2B 6ff55f85ebf3f769c10c3e17a69900918abe142e491b7b8460bed8fe6a036763a743324bf1a10e7a3772761b38c9632ff1352e9c6677ef691f81acc29dc321e9 SHA512 e782e12dc91d86612768a2e0c498f54a9728691a76008ee1e6cdbc4d8719c2593344f6c37786982abb0de7b85d743d7614652a2e8c9cd9fef053c3a32e1e484c
diff --git a/dev-util/diffoscope/diffoscope-148.ebuild b/dev-util/diffoscope/diffoscope-149.ebuild
index 63058ee2f20a..63058ee2f20a 100644
--- a/dev-util/diffoscope/diffoscope-148.ebuild
+++ b/dev-util/diffoscope/diffoscope-149.ebuild
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 981ce2fc7189..e9bbd360acf8 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -4,6 +4,8 @@ DIST gnome-builder-3.34.1-patchset.tar.xz 44680 BLAKE2B 91e91ac8d0fcf6b54d32ce9f
 DIST gnome-builder-3.34.1.tar.xz 11974748 BLAKE2B c34a31c50b327d02632ff18d48ad59f925306901e8874e0c7811b9258c56027403de0d9dc1877c696d96037bdfcdcc27f56f59a41d232e47b330382b1dbf67e9 SHA512 886c732f20563818dcf1deb96d4277fe96a9499b999cfbc7a64286e816e9a36bb978932d36a1e764b54c2d36891b7546fa058f51e036b0fa101c0872f4ce51d8
 DIST gnome-builder-3.36.0-patchset.tar.xz 136856 BLAKE2B a482f371313af4ef6a0881968846c4543d169b6bd36942ae4b72d493012d73c9705e4a7acc8f7dfc1e8cbcdeb2445b4e225f39c3a9a219e24b90be773c0768c1 SHA512 ebaec56950e0e45ba2851b13d4e1518163a291dca207bba25efe12eaaa3cd69e9bae06d2f4e5b9e9852a4305fc3933764ec9a882843f84ce58bd2246991d16fd
 DIST gnome-builder-3.36.0.tar.xz 12015980 BLAKE2B 1724c7b17e58fea08cd22894eb260236419f215c1b68d396359ce40432e8a0c08d0ead2b70e888cbb767f78362d4253395b98821fb1d1ff9a07d5881df88c8e3 SHA512 ccd6ca916ed6ad10b69e5573482e2ea48cf4227d858605825ab56989840ebbf5a6dfafc915a1f8df3a1061b37c80adfbd03fc9d616c67e08a5032069b11aa4a6
+DIST gnome-builder-3.36.1.tar.xz 12026976 BLAKE2B d833665bb71b1549fe789d05dbd89db588ae4cc7187e532f38f3bd9e779bccab644d9f9bfc4c84bd484ac678bcf8594e4aa4edff29ea8c87c5c557fc3e422a4f SHA512 284da6e5a9e766cb6f6122f1134c779cde8406b006728ae1fff3518020ef4b96239aa5037cd2d35cfe4728ea088d61c4eeabc39ea753a16208fdaba7b04e63c2
 EBUILD gnome-builder-3.34.1-r1.ebuild 7372 BLAKE2B a60c1261ab7251f3a0cfff69538f0f92bb8a197d2624e3aa62703b9e6b808e3c0793a048a61ff0b409c51c1f6467ca0f5df7d513a825103bbb4c71263fb0bd2b SHA512 e1fcba969d1a9ab368775a80cc7a0ebe35e76a11cd78d49509a2837ab5efd045f9cf1e058397ab943bcdce4eb99e71baea8d2c72f398baeca8500f40dca28bca
 EBUILD gnome-builder-3.36.0.ebuild 6904 BLAKE2B 53f8cc1b0aa6fb85a0fa208b45c68c932c264c477c256c095fdab539567a1ca5db7bc1ed81a97be58c59551902c64b0792165d0cd180b521a5bae62fb8d7d6ef SHA512 eb9469f65d67b9e582ee341a137bc1eceef75c9b37898e0d1c3c47012227f63af0bdae7f57192705fcdfb009d751f522e5e4f89752d72ef75fafd16296a98033
+EBUILD gnome-builder-3.36.1.ebuild 6735 BLAKE2B 3d58eef4f5c068bed48860140cf49ea6f8a787c185bfa63a4e4442787f76466c28b5a060e80e9ea1365330b7e96cc3d181fb392d299712d7d4259507ec426627 SHA512 7d52277f74434fb4ffc2d60e2e45576bd26811c3d6a1e821d96c944f748113f5efae1a1fc49fb213952263b7973532383df45089d734bf3169d5b2ed83d859f8
 MISC metadata.xml 1085 BLAKE2B 0b2bdcfec562b85e54880c819a0345c2aedf4f8b1c0bc34b7b4e3e8551697dcbb3ed93da1e016f3a164bb677459e8d628ba943252e51e842152282c3757f0232 SHA512 58890d32c2d04d63eaae8489ea68054ffc50df5bf9970af6b159b2dfbc99b8ed2d2db80aa29907463c137caf5eb8aa129c1470d1e19ccbf398ff8789f7f63987
diff --git a/dev-util/gnome-builder/gnome-builder-3.36.1.ebuild b/dev-util/gnome-builder/gnome-builder-3.36.1.ebuild
new file mode 100644
index 000000000000..b524cba0fea4
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-3.36.1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 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 ~x86"
+IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test"
+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 then sorted by file path.
+# 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: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and git plugin enabled
+# 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
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+RDEPEND="
+	>=dev-libs/libdazzle-3.33.90[introspection]
+	>=dev-libs/glib-2.61.2:2
+	>=x11-libs/gtk+-3.22.26:3[introspection]
+	>=x11-libs/gtksourceview-4.0.0:4[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.19.91
+	>=x11-libs/pango-1.38.0
+	>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/template-glib-3.28.0[introspection]
+	>=x11-libs/vte-0.40.2:2.91[introspection]
+	>=net-libs/webkit-gtk-2.12.0:4=[introspection]
+	>=dev-libs/libxml2-2.9.0
+	git? ( dev-libs/libgit2[ssh,threads]
+		>=dev-libs/libgit2-glib-0.28.0.1[ssh]
+	)
+	dev-libs/libpcre:3
+	dev-libs/libpcre2
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	devhelp? ( >=dev-util/devhelp-3.25.1:= )
+	glade? ( >=dev-util/glade-3.22.0:3.10 )
+	spell? ( >=app-text/gspell-1.8:0=
+		app-text/enchant:2 )
+	>=dev-util/sysprof-capture-3.33.1:3
+	sysprof? ( >=dev-util/sysprof-3.33.4:0/3[gtk] )
+"
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# 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 validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? ( $(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	') )
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus )
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=dev-util/meson-0.49.2
+	>=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
+# stylelint for stylesheet (CSS and co) linting
+# gvls for vala language-server integration
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dtcmalloc=false
+		-Dchannel=other
+
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+
+		-Dnetwork_tests=false
+		$(meson_use clang plugin_clang)
+		$(meson_use devhelp plugin_devhelp)
+		-Dplugin_deviced=false
+		-Dplugin_editorconfig=true # needs libpcre
+		-Dplugin_flatpak=false
+		$(meson_use git plugin_git)
+		$(meson_use glade plugin_glade)
+		-Dplugin_podman=false
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use sysprof plugin_sysprof)
+		-Dplugin_update_manager=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	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_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 68ee19632c16..baa81bd5e3cf 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,5 +1,5 @@
 DIST gtk-update-icon-cache-3.24.16.tar.bz2 91713 BLAKE2B 883c1437ecbff8cdec545fb3a59270569de32f59c48cb7e2401332a2547ccf41487ff2778e382815695eca34cf88baddc955acf8b2b7b7ab1edf06dec5be8683 SHA512 53bdaa8d29e1c343cf9e5d0acddd852d1a3d43a9c03e8e7c186245f5ab536742b39bd7c76b9fee3a2b5342ab573be621d59f7282f41b08097061c8f5df158c06
 DIST gtk-update-icon-cache-3.24.20.tar.bz2 91769 BLAKE2B 4fb1d4e06117924377e2e3f28f733ffd4f929414e6e36855a4486d6aa2a63f3a37cf5710c8dffdb6c32470c24861070a3160b8373dfa10a3831d098446f5701f SHA512 2ba23145e3cd46d3cd7129c68355c6918a271688935b828be110049e6a912879d25f88a8105c8dd1484de8b0c89d220bb6e8f4282aaf083602ad88e2cef9a54e
 EBUILD gtk-update-icon-cache-3.24.16.ebuild 894 BLAKE2B c3534d66ac52481507d5a722eba0b98eb780cc18be33e18e336228def9d67d0a41a067507e83d3cfddac74c57fe2d33f26f1caeca77565f64a1a6197e0c664df SHA512 a3173194e30215c653e2d10fc7e864c2a9f70a35f0bd0d8e3e72d5eed8e8f98552de249bd5c4ff59320fd4bd0be7aac90896434ec7b70a44de12e3c1afb899dc
-EBUILD gtk-update-icon-cache-3.24.20.ebuild 903 BLAKE2B ee0545f00fea8535537acbdcefb75666308de4370e36e89aa1ddae46dd81442ea3f01db5ae511e1ce459aea94d4bd756811888072de25c678f219d922a520d94 SHA512 972dd1ab10307c5d4d60a0333bbd06fcb84847566ed3fe9395064074230fd93afccfd38eb9872bb9f110960135a064bf09a50b34888265c05e92c8a39fe0f35e
+EBUILD gtk-update-icon-cache-3.24.20.ebuild 898 BLAKE2B e4bc664c4d25bdcab3ad69907f2284dcda7bdb32352178a9bc1a07142567bba578b76a11dc945801746263b4fe91f6a945f25f98ea34ff17f7fe314cc90b9995 SHA512 208835d78c7d045e6cebff5a074407f885b5a6976159275dd1928e4259eeeef3b7bc65e874090653b1ff8753567deedaa89b4ad44b78e406e9e4575a663ba5e8
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
index 4c02aa74fa1a..7b31970bdef4 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-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 sparc x86 ~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/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 5348b03df305..4cbe85c27ac6 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,6 +1,4 @@
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-DIST intel-graphics-compiler-1.0.3826.tar.gz 6007014 BLAKE2B fc09d6443818403bca803f3f78fbb9ee9a25ab674372585b880e038227712f8114ca2b17d6b219149f54f9f5856b973d3500f6537027660d1c657d61992f9e9b SHA512 e4f06d6b8d2a7161f80956a8e9cbf23aa7293a31781405bc17ee512d27ca4114facc6bb0fa7f47fde3a37aa79ce288a98aef8b74c4e572e73d70bb50c21f6fbb
 DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733 SHA512 8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110
-EBUILD intel-graphics-compiler-1.0.3826.ebuild 1594 BLAKE2B e3a96e480f23b0ce4761cae5734c22ba4e835d9cd6f4225ac0a7539a7038443e0b4d25f6b2eadb0b40de4d275bd03fe1d1945f9e591883f8a37ec6f72db457fc SHA512 1b132608d543afc632148941dce4e50f63ce86a558a798201b2cf5dca7fc1a9f5ba7c3ba8f5dab67d51c2c369f1d844eb10b4d76702f4b7ed4a2cf1cbea1468f
 EBUILD intel-graphics-compiler-1.0.4111.ebuild 1595 BLAKE2B f096bc2bde19be56e368a11e2174f9aef4a412595dd96fa7736ea67d1293aa5325f894c84eb3b12c93a8a9f96230f934f07750202dfdaac56bbcbb9b3bc4b3d8 SHA512 74a2e5639030e4dcd4601005be37846f289ba25c13bbb452769659660a73f36f1e6dfdcd1c432639383f15c9f33cb4990e3446d8b469a47363918cdc1f28e791
 MISC metadata.xml 340 BLAKE2B 6c0e5d932084dffd300a1dc70b29eb0871dfe2187ed8591a5a2f8cba001bf681e908c58a6f9471f7b08842ff538365258305da91004ed63ff97314a07fda529f SHA512 d24016b4ae0ffb05be475f86bb8d72ab4a85475655f409b8826dcd69726e048aa048e321f26ac36f2f52aec40abbfa66a95354a711332df94dc3e57e6c396a0c
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3826.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3826.ebuild
deleted file mode 100644
index ecb03772f069..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3826.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib flag-o-matic llvm
-
-DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-LLVM_MAX_SLOT=9
-
-COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
-	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
-)
-
-S="${WORKDIR}"/${PN}-igc-${PV}
-
-multilib_src_configure() {
-	# Select the same slot as the best opencl-clang
-	local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
-	einfo "Selecting $ocl_clang_ver"
-	local llvm_slot=$(ver_cut 5 $ocl_clang_ver)
-	# opencl-clang brings the right slot as dep
-	has_version -d sys-devel/llvm:$llvm_slot || die "LLVM slot matching $ocl_clang_ver not found ($llvm_slot)"
-	einfo "Selecting LLVM SLOT $llvm_slot: $(best_version -d sys-devel/llvm:$llvm_slot)"
-
-	# Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
-	# IGC uses this definition causes problems for some users (see Bug #718824).
-	use debug || append-cppflags -DNDEBUG
-
-	local mycmakeargs=(
-		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${llvm_slot})/$(get_libdir)
-		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
-		-DIGC_PREFERRED_LLVM_VERSION=${llvm_slot}
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/intel-ocl-sdk/Manifest b/dev-util/intel-ocl-sdk/Manifest
index 0e64985d837c..9394e0e7c58d 100644
--- a/dev-util/intel-ocl-sdk/Manifest
+++ b/dev-util/intel-ocl-sdk/Manifest
@@ -2,5 +2,5 @@ DIST intel_sdk_for_ocl_applications_2012_x64.tgz 28302946 BLAKE2B 991fe387c3bb0c
 DIST intel_sdk_for_ocl_applications_2014_ubuntu_4.4.0.117_x64.tgz 105808431 BLAKE2B 58b9bdf1979c070757beff7abaa2b16d43993e7dd4aeda05843facd556f25f3c695a6b2de4745890ce6b7b1a5cee1113b62ffae4059aad49a462d28d6d3461c3 SHA512 c0f65bf4d9b894f11076995744d32aef983e01b40472028e411c7be6b9117ef8b260b9abe46d6e936333aca525f98f81aaca2ab3e093ccefb09f525a3646d7e9
 EBUILD intel-ocl-sdk-2.0.31360.ebuild 1449 BLAKE2B cb0cc8870171f8eae58ce7acd3af4642c65836c71ae6ece4a58b7319e02b6e734c45c4acbc206048652b5145c3d41393f310e44652a6fa9757b9382d13115bd6 SHA512 63850e50ca33eb422e5ec9d401672188db6749fd70df2b6f99f6f09c8192c08655cc3726def1c35ff93486d9a6dfcddb656faa5cc7aa90a211538aac9aba7059
 EBUILD intel-ocl-sdk-4.4.0.117-r1.ebuild 2194 BLAKE2B 807b3d15f16547aa78f8391836cd2128dc838f4d8be70137e6f4831c3c41cf08ed372d05b866f3328b3582b7323c5a812ec8e1d4358c9f94fcfd417f3135c82f SHA512 d0f5af13de03b73ebc1aa35f7ac64f18b72087eee83e2f4911b375ce8d5140a0c492a776bfb86018a43a5c60a5252d744e6b2dbc1fc70d0c95b48b24858d4908
-EBUILD intel-ocl-sdk-4.4.0.117-r2.ebuild 2132 BLAKE2B 55650a4285aa867f3fd52396a122eed5cc29d155f2b6c65ed15a7a63f659f442e30318cbfae5c53af30d3d9e377205e8d65d7f04f00751198141fede738fdb4f SHA512 3e519c09f8e9ef63198f0de62ce1a323cb0282e4d757a2e34ed2544b72731267fbf45cf524990cef68b475e3043f27bba80a4b36843f2c33e5cbcfe723e9adb8
+EBUILD intel-ocl-sdk-4.4.0.117-r2.ebuild 2131 BLAKE2B 1d4c5b22e3cad945b429433b11ebad627ddf9e893f2d75ffa07b985b3fe757511e77e2c2aa5ba26f2f4738a9c97886d847d2e1e31a73abf6bad63aab5266bda7 SHA512 8d1bc5ca60546f2936225c4e746780eed603c1f663f0e13d926d9e76821c125cb7cabd794bf0f87705571026e2340ccf259ceb10a002c6eb7a209c242c0628bb
 MISC metadata.xml 670 BLAKE2B c3c011abaeab5730cfdc09bc89715eed709910246767fbe5b3c406189911e85ce4f2870740be95f6d1ecb9a0a3d9abeb932774de05742d275c77f1634c1754e9 SHA512 2ef3994dd0dc9ce67b02ea1d5bf5326a8dcbbe21c6a6c452376551cb803825c4cbb721b226c128bfb758b5fb6faf1d04f25c2be2929961888244f861543a78f6
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild
index 0d0b0d0a8d3c..9eaedd6076e3 100644
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_app
 LICENSE="Intel-SDP"
 SLOT="0"
 IUSE="android +system-tbb system-clang +system-boost"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 RESTRICT="bindist mirror"
 
 RDEPEND=">=virtual/opencl-3
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index bcedaf98371d..2c27f332b6ad 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,10 +3,8 @@ AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe08687
 AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
-DIST jenkins-bin-2.222.4.war 66239216 BLAKE2B 0272f91b4460ac9f9cd0235df59f55e3135f593d8098d35aae4db6571e171d3c38c6b3e0ac0ae2f7825a3ac3e56c8e76cc4e15e28743cd2aa007395921eb7100 SHA512 8f82d8c69807c46eb0f0638d59777f10e1017b197a1d88295882e6b8aef6376609ed9da625691eafca786ed0a7314e7ab2abb000a39dcfb6da2d250bbd5e0c76
-DIST jenkins-bin-2.228.war 66137156 BLAKE2B acd1414745f0ffe12ca3025149d5ef8dcdebe6415e54e18f71eb4ef05bb578279409fbf5605763d86144726a82057ba796ea8ce3b79301ea33ddfed1f03ad9f4 SHA512 899c5838cc46f87020c18b0863b8f160c22b0422e7adec1bfd48dce5f06264b5e33ec8411bf9133e28fa8723daeeb5d2cd14a92c261d82e2b2b804d0b1c21250
 DIST jenkins-bin-2.235.1.war 66437256 BLAKE2B 900f5616db3e4e1913e9e07f1d40951fdb0a467e2acd93441a52fed7d9f5961103c46b34627e0add76da11a3e4787535d0a47e5eee20a474f65c14b03fefe9a4 SHA512 1be1f1845de87316107469b9b7c4d0e1e6b0f014f495981f2ecc2ce3acbfd820275c187c61b3f9664ad2a61312e4504171c45edf05e1711bbf61554c5f3fd653
-EBUILD jenkins-bin-2.222.4.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
-EBUILD jenkins-bin-2.228.ebuild 1098 BLAKE2B 0bfaac37afbe842e4e1a5572a0f56a77b4bc5915be4cb9a79cd7a56105562e8877c9686a2963c347c2feb06dea8e4aad271bcda9a9e50f17433485f189d39981 SHA512 381e5dd3c921892b0df7497fa6028ced0df8c84a2a0731142c01023cf2d63d60233f24f19e62d40699c606ea162210f54641b6742ad63d6a6c99bd29b24c0835
+DIST jenkins-bin-2.242.war 67003152 BLAKE2B cc20efde5196ed66af3cfb0b52404e35bf3954422734278ce2c3bfad5402c0f005579a1c406e519e8e04b28e3d0f26cff2d4fb5a40c2b722dd3a93d54cf86cb4 SHA512 22e138d4c3291b2885b9cb9db51e5dedcca13ca93a2fb8b11bd1dc81da981e9404717ff791fa2a1d9dd4530fb806e8cf9c79931cdb968723f02177fc00321f92
 EBUILD jenkins-bin-2.235.1.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
+EBUILD jenkins-bin-2.242.ebuild 1098 BLAKE2B 0bfaac37afbe842e4e1a5572a0f56a77b4bc5915be4cb9a79cd7a56105562e8877c9686a2963c347c2feb06dea8e4aad271bcda9a9e50f17433485f189d39981 SHA512 381e5dd3c921892b0df7497fa6028ced0df8c84a2a0731142c01023cf2d63d60233f24f19e62d40699c606ea162210f54641b6742ad63d6a6c99bd29b24c0835
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.222.4.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.222.4.ebuild
deleted file mode 100644
index 8ab8d5db213a..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.222.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.228.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.242.ebuild
index e3e0cd1a4eda..e3e0cd1a4eda 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.228.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.242.ebuild
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 8b1bf54b94ff..86c8ab8b9201 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,3 @@
-DIST kdev-php-5.4.6.tar.xz 1046776 BLAKE2B b69539971ed666c7887e1aed0998da59c887000c785e965d2220e829e485f46c28e12e04b3c084681dd2a96dae1d4d5fa73bd2501359de8960f8bca0e64a1968 SHA512 6711dd9034054ce2bfd684d7fabb3349436a4a8ae0924b8a6ae56a8b39aa83d4501fec389cb73d3c4c20abcfcf8c5f7dd04f63e059b987adc7991806c7eee252
 DIST kdev-php-5.5.2.tar.xz 1060684 BLAKE2B 682b9f0aa479849966e125e789bd53c4747b050a8d6be287082ffaa3ea496d9b29e80070c96869ae546ab37cfb996922f9ce715c4c7de66f97b1a083f2ed1ace SHA512 5f92f2183af50ddc27c36065eb927d26b01b9f350e2ec8c3cf4136b1ab7c7933d77512669d71ae6bbf6c0fdf044987773427f37bd5bd96a9cf143038147e7709
-EBUILD kdevelop-php-5.4.6.ebuild 1237 BLAKE2B ae25bed02dd98e93b441ceb983dd48dfee27823b2f02b689fa4b1b232823998b7e0768c601dcf3f61b63f1ce66ed1b20e00138f494dca5afef3a393a9a09ad65 SHA512 256e896c11d6ce4d63debb844328371497fdb989dfc1c0c8051f481dd8c5a495f0daa6cf053e38eba87ec412c9e5a27744b7b065de07bbe0037042c764991425
-EBUILD kdevelop-php-5.5.2.ebuild 1239 BLAKE2B 6526b2b49468286947a82f4b9162a78c703156adc092d072d13942358ef06291fcc099d88bff7ebecf2a824f534d259bdd7ab34550e6a958ade58cd759087a11 SHA512 378dac28bdb17e0a93465bd2b2ed66f91eabdf98ed09899786207d455d261d26de2ce0f4b2c5ef771dd97ee0424d716cb786ed00f5760440dac48db91ee6608b
+EBUILD kdevelop-php-5.5.2.ebuild 1237 BLAKE2B a4870331cffa24769de5a8399cd2b90d76721e2c64b81a693164a04b28b51b5593deef87e5a1fcbd92fda9c8501dbcfaf38f8d5c60db36ede9d20d747c1810d9 SHA512 25fb5fa92f563a0b420eb1cf268cd79bdf56e33f482de93034f3f91fc9376ed426bc9beea36d1a82fb496ee998a5b9c1a4aac01eec7a7b4fccd5c1934d9d3c9b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.4.6.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.4.6.ebuild
deleted file mode 100644
index 085316c767e6..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-5.4.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_HANDBOOK_DIR="docs"
-ECM_TEST="true"
-KDE_ORG_NAME="kdev-php"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="PHP plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-IUSE=""
-
-BDEPEND="
-	test? ( dev-util/kdevelop:5[test] )
-"
-DEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-util/kdevelop-pg-qt:5
-	dev-util/kdevelop:5=
-"
-RDEPEND="${DEPEND}"
-
-# remaining tests fail for some, bug 668530
-RESTRICT+=" test"
-
-src_test() {
-	# tests hang, bug 667922
-	local myctestargs=(
-		-E "(completionbenchmark|duchain_multiplefiles)"
-	)
-	ecm_src_test
-}
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild
index dc3b73a1d4d4..c6c31a235060 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="PHP plugin for KDevelop"
 HOMEPAGE="https://www.kdevelop.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 76f0db35d199..8890dd347ddf 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,3 @@
-DIST kdev-python-5.4.6.tar.xz 1072228 BLAKE2B 199b8f1b0f6a4f072f2fdafa25b2653cfe855c10d601f3be7f47db84140aea84987cf1ae5f0ae19e08af5b3092cfab16aac0704f20ed46c6d872345482a663f3 SHA512 116b5649f59c2ec46aba083f9e0edebfb481c86d7677ce08fe69e161e344addbd6b4f9c955ebc2866ea118d3139377c59315c46b9e7defec119a47ff50bdd2ac
 DIST kdev-python-5.5.2.tar.xz 1076188 BLAKE2B 87ab49aef61459268c947cee543bc8eb0b8729f3e4f798c1de4b06b8db6c3d5920c23c2b9ca4e4645edc323b15392d418058a314f164f803e2f65eb8fd2d9ecb SHA512 2558e4ad7485abe8473b703a3d80a1faea9e4152eb7be314ea8c3d46c841f457983206b1bc55f454496b81a468a2f8718086e1b0db3e9e880c50011407e7866e
-EBUILD kdevelop-python-5.4.6.ebuild 1248 BLAKE2B 3c8f35f9469adeee5814470cbb1d48a8c2c5481e1621d3c8e81281771cb2e5ff0e74d1366ad4d5ad2f1b1f1870e35e3aef6b7a092160ed3d53beb7f4b772a7cb SHA512 ee6ae3311298a2a3e5ba52ce377265ce58e7fd927471821f55ec5e4ce5efeb6d0ab58701955c82a4c46fd09e9c754862917de0c6268e1d0fe00f1a5ff68b45cd
-EBUILD kdevelop-python-5.5.2.ebuild 1250 BLAKE2B dafd8b490d526fd076d91ec16dfd94fad989036b1e937bb8ac6fb8bd559044ebfde9dbd4787e3d44e3e58acfad7507baa75cce1f00b8d44c82cbabf5585929e7 SHA512 b6cb5a50cb1b4239b27aba1fc5936f6dea6a5cbe9835f770d436963b225b2a0e69cbae323d860f9479dac61a2a4141d252f95d9842dfd2ac1b98564e001be1c9
+EBUILD kdevelop-python-5.5.2.ebuild 1248 BLAKE2B 87a2468e90fe316b7ae048b260dd546af28c8020a5ec0d151f2880d82e5928ef0d70e1a9f27e6eefb61320c526fefef3afbd5a4d99fc8441f0f98decad76819b SHA512 27e09b1304f54c736c676416f512e13deaf36d55cea2aa972997ad4e6e06cf633478bf7401c48ff796a15aff5179a7faee4f019d491074f33f05488e88b89791
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.6.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.6.ebuild
deleted file mode 100644
index ed59051526ef..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-5.4.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{6,7,8} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Python plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-util/kdevelop:5=
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycodestyle[${PYTHON_MULTI_USEDEP}]
-	')
-"
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild
index 37e1f1fdb0f2..4d844c56f1fd 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Python plugin for KDevelop"
 HOMEPAGE="https://www.kdevelop.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2" # TODO: CHECK
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index a78e7e1fc748..314b3c57b030 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,3 @@
-DIST kdevelop-5.4.6.tar.xz 7011868 BLAKE2B f8dc80e88592aaff6c2cc90667006a235cb4930aa6249558ee69feee8180b012b3ca6ad39bf553743a3b35bdd2c40754dd1f6081d3630566cad1d71ec75e42f2 SHA512 bcc7ee982f48982c63dbe8ac3dcfc9bdb4dda855d0d8b82740e12a616eaca71fe9e2f4a39626d70ce28d09c5f805a462ade06829f04db682fde72a2594ea4234
 DIST kdevelop-5.5.2.tar.xz 7049088 BLAKE2B 93df5c982b8e141a5027b5eeddce55a4c4b915fa5f6b36b71c0125820ffb6692db1dfe3243b4b0333be01658f0d44a0767d9e63ad549a6bc54b0e19c42c215fc SHA512 d4e0b3369ed4762beea18e43275c75b801fa4efd8265734a6b676e579f17408dc5ace4aae1b8f7eccbc70e88f6d80ecaecfc4d2c633f77f80ad0b9d066995ca2
-EBUILD kdevelop-5.4.6.ebuild 4182 BLAKE2B 62d749e681d2ae1c04696116c07eb61febb5a8ba5037a940922ddd7af14152d286d975941adfca671e403ab6bc443c9c35e7f5a289095feeea414f9454c7b64a SHA512 805bc1f19cc1f7e83fcba44599a6c785a3dd6fdf2f283501f44e37e39643c649a3d82c35142d3108db428219cfe388966e60534b52062c82960734901f55ed85
-EBUILD kdevelop-5.5.2.ebuild 4361 BLAKE2B a27a2360ed1c627321a10e67fb0fa502c00277c00c6f008799e61b732651610b12c9a0fc16e6db311d0be5e0134f138e157d16e824bbabe442e6abd0be8aaa8b SHA512 bf02f90de84c5ffb66b3ba1767e5eb5efcac047c8cbcb90638a4e3368772dc290ee3a21593f9cb956aeeefb1caf4d9bf35c2155c7172d9ed15e92fc9f8ae161c
+EBUILD kdevelop-5.5.2.ebuild 4359 BLAKE2B 966aa4775d2bc00c8bdd88b90fce198ebc72b2b5d13f043739d71f7b602dca401686b14f251528fe03c76f6e80fd190242c3629bd30324cfd71f1bef9ee394dc SHA512 e105de2cd8514c35ccf551a6dccbeb10cd72b4e46892b9f8fc6ff534cd850914d3fde9a5b428e02b0185d160e4e5000c6258bb6a63bf9c42e3fb89de60812cf9
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.4.6.ebuild b/dev-util/kdevelop/kdevelop-5.4.6.ebuild
deleted file mode 100644
index aed3f2eb6593..000000000000
--- a/dev-util/kdevelop/kdevelop-5.4.6.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KDE_APPS_MINIMAL=19.04.3
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5/54" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
-IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
-
-COMMON_DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=kde-apps/libkomparediff2-${KDE_APPS_MINIMAL}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qthelp-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qttest-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	dev-libs/grantlee:5
-	>=dev-util/astyle-3.1:=
-	>=sys-devel/clang-3.8.0:=
-	gdbui? ( >=kde-plasma/libksysguard-5.16.5:5 )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		>=kde-frameworks/krunner-${KFMIN}:5
-		>=kde-frameworks/plasma-${KFMIN}:5
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kapptemplate-${KDE_APPS_MINIMAL}:5
-	>=kde-apps/kio-extras-${KDE_APPS_MINIMAL}:5
-	>=dev-qt/qdbus-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	dev-util/ninja
-	>=sys-devel/gdb-7.0[python]
-	reviewboard? ( >=kde-apps/ktp-accounts-kcm-${KDE_APPS_MINIMAL}:5 )
-	!dev-util/kdevelop-clang-tidy
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake_use_find_package plasma KF5Plasma)
-		$(cmake_use_find_package hex OktetaKastenControllers)
-		$(cmake_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake_use_find_package reviewboard KF5Purpose)
-		$(cmake_use_find_package subversion SubversionLibrary)
-		$(cmake_use_find_package !webkit Qt5WebEngineWidgets)
-	)
-
-	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		elog "For konsole view, please install kde-apps/konsole"
-	fi
-
-	if ! has_version "dev-util/cppcheck" ; then
-		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
-	fi
-
-	if ! has_version "dev-util/heaptrack[qt5]" ; then
-		elog "For heap memory profiling support, please install dev-util/heaptrack"
-	fi
-
-	if ! has_version "dev-util/clazy" ; then
-		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
-	fi
-}
diff --git a/dev-util/kdevelop/kdevelop-5.5.2.ebuild b/dev-util/kdevelop/kdevelop-5.5.2.ebuild
index 8318287c0609..18f5ab2c9edd 100644
--- a/dev-util/kdevelop/kdevelop-5.5.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.5.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and mu
 HOMEPAGE="https://www.kdevelop.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 652e907b2393..850d08fb1520 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,9 +4,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lldb-10.0.0.ebuild 2481 BLAKE2B eec1740e4eb28b77a1416b27ce0ab11f95d6d2e81ae6b8aaca04647bda9124422ffe9d414aa5c5f9410b616e473f2609c21201289955b6fe595e9d082b5519c9 SHA512 dfbe98bde465360bcd86ba6ca49c26693430c4ef08e556826af0fe992c57934f397963b6babf106be6594bcfc22f94b0a2a554026af94a7eab286bf916a58282
-EBUILD lldb-10.0.1.9999.ebuild 2541 BLAKE2B bd2c91bb4ef638e1ea8386b0a5baf93587ea8a923e09c6ac9a3e8d59c584ac8112399ae391a5bbd003dcc8de28ab5eb441c903972f82335bb9e084b155f8319e SHA512 5baabcc77fa5cd3076a69aa8d72ee912f55cb55c455d9ab5bf800af05ba73ed2c75f17daa1444b9fc81dc30b16e4e2c9e7e52a1b9974bc03cec271f6f1bc56ba
-EBUILD lldb-10.0.1_rc1.ebuild 2541 BLAKE2B bd2c91bb4ef638e1ea8386b0a5baf93587ea8a923e09c6ac9a3e8d59c584ac8112399ae391a5bbd003dcc8de28ab5eb441c903972f82335bb9e084b155f8319e SHA512 5baabcc77fa5cd3076a69aa8d72ee912f55cb55c455d9ab5bf800af05ba73ed2c75f17daa1444b9fc81dc30b16e4e2c9e7e52a1b9974bc03cec271f6f1bc56ba
-EBUILD lldb-11.0.0.9999.ebuild 2541 BLAKE2B bd2c91bb4ef638e1ea8386b0a5baf93587ea8a923e09c6ac9a3e8d59c584ac8112399ae391a5bbd003dcc8de28ab5eb441c903972f82335bb9e084b155f8319e SHA512 5baabcc77fa5cd3076a69aa8d72ee912f55cb55c455d9ab5bf800af05ba73ed2c75f17daa1444b9fc81dc30b16e4e2c9e7e52a1b9974bc03cec271f6f1bc56ba
+EBUILD lldb-10.0.1.9999.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
+EBUILD lldb-10.0.1_rc1.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
+EBUILD lldb-11.0.0.9999.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
 EBUILD lldb-8.0.1-r1.ebuild 3161 BLAKE2B 02f7f7c7461fed05baa15f6621ed8c32f669182395356a30e407582e74a63cf99b0d3b9c03031a976ea0b7734d3c61c64019b463ef68f315ae936ce679ceec77 SHA512 0a28c0147d2c37dc13dec96401f2d6e670db601735343c9befef24bf9626476a0effe715161703e4250066128c78b97b3f5e1ba5d6e67392b6cdacc0dd42dbfe
 EBUILD lldb-9.0.1-r1.ebuild 2391 BLAKE2B c0e73cf6e7c6fc153855681daa373618baffa2d45bd290855633d957464e99d86112918eec8aa0b43a975750e8ccd87fbffe2594b0110ac406eab8579c654f72 SHA512 8edadff2f01c15b75d894e30546a00826f140a81bc0ebfb5fb214eb5d133d8390b18a3075746fe94f061b36fcea9fb981ecd6de3d0567f73736c388af62c6320
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-10.0.1.9999.ebuild b/dev-util/lldb/lldb-10.0.1.9999.ebuild
index ecdb75359b11..2dfe01834ca3 100644
--- a/dev-util/lldb/lldb-10.0.1.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.1.9999.ebuild
@@ -4,8 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-single-r1 \
-	toolchain-funcs
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
@@ -43,21 +42,11 @@ BDEPEND="
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-single-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DLLDB_ENABLE_CURSES=$(usex ncurses)
@@ -87,7 +76,7 @@ src_configure() {
 
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	cmake_src_configure
diff --git a/dev-util/lldb/lldb-10.0.1_rc1.ebuild b/dev-util/lldb/lldb-10.0.1_rc1.ebuild
index ecdb75359b11..2dfe01834ca3 100644
--- a/dev-util/lldb/lldb-10.0.1_rc1.ebuild
+++ b/dev-util/lldb/lldb-10.0.1_rc1.ebuild
@@ -4,8 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-single-r1 \
-	toolchain-funcs
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
@@ -43,21 +42,11 @@ BDEPEND="
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-single-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DLLDB_ENABLE_CURSES=$(usex ncurses)
@@ -87,7 +76,7 @@ src_configure() {
 
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	cmake_src_configure
diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild b/dev-util/lldb/lldb-11.0.0.9999.ebuild
index ecdb75359b11..2dfe01834ca3 100644
--- a/dev-util/lldb/lldb-11.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-11.0.0.9999.ebuild
@@ -4,8 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-single-r1 \
-	toolchain-funcs
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
@@ -43,21 +42,11 @@ BDEPEND="
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-single-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DLLDB_ENABLE_CURSES=$(usex ncurses)
@@ -87,7 +76,7 @@ src_configure() {
 
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	cmake_src_configure
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 3e5e518878ef..238553d6b42c 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -1,3 +1,4 @@
+AUX ltrace-0.7.3-CXX-for-tests.patch 255 BLAKE2B cd213eff103c4efa9a96a28a333825b32b43333b07a6e25ccbf5a216ba12a0fa1e38f5a1b4644ca19f9eec0df0cddb8fae95a92e5e44af497aacc448a2eb58c6 SHA512 02ecca05ff34739c234f9b3a2331b10f2bb62289c2698095a4276fdb76d3494e1657c7551a5933876bf5b722db3a1c62dd839db7768ebd69c897b4a109bd5cc5
 AUX ltrace-0.7.3-alpha-protos.patch 541 BLAKE2B 727e9acb2c12cfda3d5c15903bda8bff9e8f8823a03daa3031d4cb022b9735026e14d9e6d756c568a92401f546589aa94b099c27d6fa1555d365b0d00ce041a2 SHA512 32738dd0688c861961703a5e5c0e14324218f3ecdfdbcef0977522e2de1c9d77fc0fa1a3ea0d2074190293bf360cf8b5adfa16c67a002a1df38e37c70c024595
 AUX ltrace-0.7.3-ia64-pid_t.patch 184 BLAKE2B 4d739f7ad6474541cec166cc1262637edbf30b32ef3335ac92e834bd611472de5473801ad307b7ba56eec0657bbcceea48d7fe17517663c6389d0843e9a9d5bc SHA512 1029f86f3b3e33eebcdbafa6dc56e2ece2a33234a6b7a0b05e4bb87424829c5f512e019e6c6a962e639a9cfeac56edea3d0ac250fc31489755e68d2181ce254f
 AUX ltrace-0.7.3-ia64.patch 1538 BLAKE2B 2a407d2e19e74ddf22da1371cf72585cec5c630d00670798c6c8e9b3991d3aac641784bceeda544b49e76ae572c487bc5455de4239aa967e25318625e0307e0f SHA512 c6e7576047aa06eca67a80ecaa008854a2e312b1d38693cc802a6b6be6f671003716c6a0d3268fb3f076f3311fb27c228f55220bcb2432afd0210542020764ad
@@ -8,7 +9,8 @@ AUX ltrace-0.7.3-no-error.h.patch 885 BLAKE2B a893550c62e4a479405f8dd3e4c41c01d0
 AUX ltrace-0.7.3-pid_t.patch 179 BLAKE2B 7782ab18e9ec8233ed4d60aed339175e1a30f6f3f589d8a7e9eeaa228918cfba6b00528790cf2908adc785c28231e208b96a7c76fd0daa914f9ce6bdb91b01ba SHA512 87e5f49c89dcdd3218547bcd57f0ae05253d4756abb4d4981d78501a6b1de2d5389987fd90d59fe41348a0ad2b56b62a8e087e9092533e12f2cdcd800abfa8db
 AUX ltrace-0.7.3-print-test-pie.patch 774 BLAKE2B e67bedbd0ea2470007390634fe588ee7cd074cff4b90f57fe821f6124d4aee9e2cb8f60b46b7007659d5a29d929cf579c38d858c31b8667ba50f64d579909c81 SHA512 9f407805719f21838fa3d2c48aaa96025fb4785a28b5b4e50b2593093067ed6cb406dbb662e0178e84e9db101b4cfa12867127cd212abf6417130e7cb4c21002
 AUX ltrace-0.7.3-test-protos.patch 2551 BLAKE2B 48998f9db4875b8e2af6727b51fc8666cc4f10cbc55bbc4bf32a2b54f1f1032f7c7f07c5196ffff53e23183010eb68df862b4fceaab56d30a580eeaadeeb6f17 SHA512 4652b3f920ad3669d2e6076775b9a598bd999a0fa5319c490f580d93c63f53bd0e3db61cf7a61c5db3a436789802b8fa9646f84ee76e8f37f4f3afb827b84f34
+AUX ltrace-0.7.3-tuple-tests.patch 460 BLAKE2B f8beacb8468f7842603e6abd1aeace86ad52cd9347fab1fb7ee243bfc1b536b42d91405380354476bc68c033687216561f6512e82bedca6e525407e79dcab2dd SHA512 07a1808ea6a9564c891ce0caec9cbb0e55975a171c46a6bb3358a9e16f217cd4bbd4b3c39a0e278b34e9c542199e13afdbe817bc2ba26390e879edbda71bf993
 DIST ltrace_0.7.3-4.debian.tar.gz 11373 BLAKE2B 3004bef4e0181e28606e1c50dcc2265d9869e51bf11288185da46f7a77a0aaffb41af75f84baa7d094f9f752071c9e8f53c565982a955e3250a7fc721c529b20 SHA512 67a868c95703ca9cd8407905e3be416e3a66920f41d9deb78fadb71719d7d3f1a3f67ffcb575acff4bf7e4715102f3a6b0f67c6adb74f37ee66c398c132ff04b
 DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
-EBUILD ltrace-0.7.3_p4-r1.ebuild 1725 BLAKE2B 5b7a5b9f7aaeb0e0132ba550f35bee99ad18ea794e1242ce657049dad5346f1af9e51efb5492fa362b4aeb4d99f91ba15d518a972bc30b0d53bbc2fab18ec733 SHA512 eb2f6ca133e89b75a4ea1073a9cea10fc5b345861fc836c202aafa188669db062c77be99202af588a432f77aa1200500d5abc007a459b9b275f1a90f4b65ddcb
+EBUILD ltrace-0.7.3_p4-r1.ebuild 1817 BLAKE2B 9dc0e9cdcf0b311522e3eb466a0d3bd1a1c60c8625ed61bcd645a67de3b3745de8579bc5bd58fffa90c0210217c1a460175d7c08bd675dd8095e78c215033a3e SHA512 68a303ef5f31fee2ee4c1585dd8e2ec12c047566eaa2389660fb2dd54b7017991a8dc2dc5c763a9ad6bed8016a7253d3c4079d96bfd637568fdc17752312cc2b
 MISC metadata.xml 357 BLAKE2B 393847ec554b92576d20a2e88b3f89b86d93ad51107161c0e5fe198415ad6f8d941418d89b438237f52c6e2cef942b449e8112f5619e219058a7f797a6b261dc SHA512 fff13f831e3d3994abc654ab5c5cb97e14cbec653d42074300cf81b22da05e5318a55ae4b28198fdc7aa8169464385939f5a889ca5ba86c45aa39dfe24772a95
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-CXX-for-tests.patch b/dev-util/ltrace/files/ltrace-0.7.3-CXX-for-tests.patch
new file mode 100644
index 000000000000..06db36c46818
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-CXX-for-tests.patch
@@ -0,0 +1,11 @@
+Testsuite uses CXX to trace mangled symbols.
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,6 +53,7 @@ AC_SUBST(HOST_CPU)
+ 
+ # Checks for programs.
+ AC_PROG_CC
++AC_PROG_CXX
+ LT_INIT
+ # libtool-2:  LT_INIT()
+ AM_INIT_AUTOMAKE([foreign no-exeext dist-bzip2])
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-tuple-tests.patch b/dev-util/ltrace/files/ltrace-0.7.3-tuple-tests.patch
new file mode 100644
index 000000000000..9abeb28b4883
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-tuple-tests.patch
@@ -0,0 +1,12 @@
+Use $CC instead of gcc in testsuite.
+--- a/testsuite/Makefile.am
++++ b/testsuite/Makefile.am
+@@ -39,6 +39,8 @@ env.exp: Makefile
+ 	rm -f env.exp
+ 	echo set libelf_LD_LIBRARY_PATH '"$(libelf_LD_LIBRARY_PATH)"' >> $@
+ 	echo set libunwind_LD_LIBRARY_PATH '"$(libunwind_LD_LIBRARY_PATH)"' >> $@
++	echo set CC_FOR_TARGET '"$(CC)"' >> $@
++	echo set CXX_FOR_TARGET '"$(CXX)"' >> $@
+ 
+ CLEANFILES = *.o *.so *.log *.sum *.ltrace site.bak setval.tmp site.exp env.exp
+ 
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
index 0f327a431cd5..bf48fa668be1 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
@@ -45,6 +45,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.7.3-no-error.h-2.patch #713428
 	"${FILESDIR}"/${PN}-0.7.3-no-REG_NOERROR.patch #713428
 	"${FILESDIR}"/${PN}-0.7.3-pid_t.patch #713428
+	"${FILESDIR}"/${PN}-0.7.3-tuple-tests.patch
+	"${FILESDIR}"/${PN}-0.7.3-CXX-for-tests.patch
 )
 
 src_prepare() {
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 5099181736b8..0325ed210f52 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -14,17 +14,17 @@ DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1
 DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
 DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
-EBUILD nvidia-cuda-toolkit-10.0.130.ebuild 3382 BLAKE2B cae51723741ab8df744632928215d37054ae752afe32f259cbb84c194c33a5abefb023253c49a9574fd4ffbbed44fb25c4f4bced6b7ac6cae7a10d9d5dbd0d73 SHA512 845c15e77c776515718b13d4ed9c8871abef20d5ebb7438d1df0deb73958ad35e131dfdb647defc4751b62ca7768cb4867bb6e1dab8acc320fb10379249dde07
-EBUILD nvidia-cuda-toolkit-10.1.105-r2.ebuild 3887 BLAKE2B c0f464d8cd2c52be80d7c7535a6ca7ab3e06ddcba52306f7f1227dda01cd8868e03eb9777989dd88f6287ff96feb6551767d814750bc0c9c7d99d575452d0ca0 SHA512 3c34d7d9f3d027d3fbfc4c8a69bb44811ade1591a6632a726062c091cae36bf63e300ee074cb4d4ea7a2a42ef732e03246e5a9a34537af37046a343b6f03e50b
-EBUILD nvidia-cuda-toolkit-10.1.168-r1.ebuild 3887 BLAKE2B e9df76e5cc921a5708a489fd657ccf742afcec6e09044ef9d92dc357d30c9ab8ae256c81ce2746354ae8d785b5cc74e695ecef83e0b41b52efafc0109c621dab SHA512 669f163ea20031634a9d706208b50b15e436c25145eab353ae805b92eb416d23e4fa4ac50160c854b35e8ad85b5cb0ecad7ee295b5bb5581b9a11d5d79b3ef94
-EBUILD nvidia-cuda-toolkit-10.1.243-r2.ebuild 4200 BLAKE2B 5406dabc6b45409da171afb0847087918adb5a2556be1d97e9ef7ce4a262f4ddc7ea19275e4c8e9615aa85dc718a0fc87bacbf9b38b0ce5d8e9116eec9611999 SHA512 719b3aa8ddbcfe91dc5cf69005425a9ce34f4b558da78a2623e149226fd9b1a519f23f532a025712f142117a30734faac85dad958df4d23dd53d92e921083ac7
-EBUILD nvidia-cuda-toolkit-10.2.89-r1.ebuild 3954 BLAKE2B 2fc75574df2c7aa5ea30dc8b7b52091990e6a533fdb50eac36709a334fa04a3718e76eee34512abf20997734a3594afc89db497f697b934fbcef1475443b3a38 SHA512 07f439585a77fefc4975f3dd01ab9b0181eb01611311d7cbcca023969df773b500d27d39c4dca4ff06d072bfb3a20178f0c91053d4471dd298431fe19a9cc9fc
-EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3864 BLAKE2B bd57f3d666603b50a9ec67893aac970f5e6dcb97942e49556e21ca5c95993654b5c604003e02cb449d8df472ae84ebb5bae1160574a0988c012601bb3357ce25 SHA512 f8f1a2dd806c389b89e04d117e4459dcf062e11896acf43bfa9e2c6b58ae0b0b2b7f3747bb4be04d24766970362a6bd8ea6503e124080a7f8cbe56782aa18801
-EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3890 BLAKE2B f2d0faa2ef9cab8a89c5cab111052c06a4d2a672024e2d257418f1b29de943f553b09e3de5b09fc8d44b121a73a9e0951a7112479ceb582eddf853afc7d82b1b SHA512 2ffb2135346f3bf514f35b8d65b160547b2c304dda77d170798c53f7e38497129f311df48d91b5b82e6341d6d0e0e43c88ab0bb6545296c8642e37005ae013f9
-EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3401 BLAKE2B eb2092bd784b30de4b74e761fe35e142bfb209463e898e803d3874d8137324969feef03db6a8bcbc71205c32dcab7eecdbdd91223a1de12ff969e1d49efa7d82 SHA512 3d19df13a3797af8fb7ec69311dbc733e62d6909fb94fab1aada02914cb9fb63a6be986d53f27133d7da8e33743419b96029991e26eae30663fab684653c3fce
-EBUILD nvidia-cuda-toolkit-8.0.44.ebuild 3342 BLAKE2B 0eab1f64b07bad73e97179997a8d11a64580289c0ca7f3e6460b2828615d3410831c22a50c8aee3ce9a9ef09dce030e32209ff3ea69989bb23cb9e5e4668eaae SHA512 612c8f48974d578c1b41cb3563b6e436cdd95e444e44e3dfaa44f08345cafa3d8875c2e9a910102c4ff49a2af240476559055928474480734f79217522b5d480
-EBUILD nvidia-cuda-toolkit-8.0.61.ebuild 3397 BLAKE2B dd77c3dea5fb0c938a1c7936f98c2e5fa143a6b2ac129f00cca3841062b89c12485df3cfd2890779ac549a798ac4f8da01445a17e2ead261792ea660d55d73f6 SHA512 e44c46cdc82386d414b4fc90169ec50cc572c0c8082b481901b6ed4f620c6c6398041ce485236e019c797e285c8ba41aea9d93a936e4aaadc7013bb77638766a
-EBUILD nvidia-cuda-toolkit-9.0.176.ebuild 3404 BLAKE2B 91d2ac0d318ba093b2b42ff1d4e14b512ab3c627e3018e1b620d3b18b32245325f216d785ae288300a9a092bb34e943230964ae8ae579dd78a30592cd86de9d6 SHA512 40010b7425d2b149fa05ee747f388cf02d2ec08b122ae490db4c28ddf42743b88cb73ee3873846c6cf192a8f38dd051ff8a611dc46e96bf023d75ed2b42613ed
-EBUILD nvidia-cuda-toolkit-9.1.85.ebuild 3380 BLAKE2B dd8b080e917b5d5f53debb7c87c652aab2bc58ffcddd50926bb26d387ace61e8e23123d79c2558ddf975626897c5984586ad61d6cce64f10cf1c5d64fae44235 SHA512 43de5a8255dbfd6601f708715f49a71ef86ecf4835d5062f7dd38e190374e0a62b644d24e323363a842ccc313c1f593a1f2b7ba08d71389ed7afa97968966889
-EBUILD nvidia-cuda-toolkit-9.2.88.ebuild 3382 BLAKE2B b8ddd4bad562e88ef49344669a8a3d6c7a121c356a5249ae7f1f6534cac4123416c818cc3d790afa2a8be5f5b2d34aa66267f5863d74bd5c1bf195de66b1716a SHA512 b87b444a0cf549c05022b2ca46523f8e4fc011f4f921bec7e91601331d296144a06b5f85e3b25ce904c8af9a1fbcaea761d0a29c11aea4f3a52fc9a0e7dbae45
+EBUILD nvidia-cuda-toolkit-10.0.130.ebuild 3420 BLAKE2B 5a3f19022476d35310212ca6950f0a57555caa8ea0af9e670f096eec342454b730323a856b129c20315ee9bd17f6576e4c132a7c8009ea0b999e532c35ce2949 SHA512 4d3a56c7b2319ee3fb00caccf21d7c173429f1e59a64be6c08a6eb35235e9eca4d9dc3f12e12ff6fb0d14d455fcc1c53220f7c356612a1b89c03cc9db92288d9
+EBUILD nvidia-cuda-toolkit-10.1.105-r3.ebuild 3925 BLAKE2B 6a5bef41d998a705c8abc75f4f19d5866063cf28f346c33833b698b3a55e942435c159d4c4a64314bbe78370f062c2f09db4becc28bd0059750ee1fb41eb314a SHA512 21cd3cdc06e4ca31cd3d4e279226c849849eb39f515612fcf2ea20110e333ff962960f3f6f4a8efa3344d58db8e6c241a8f74fb6d8e305ba045b4a6537856c2a
+EBUILD nvidia-cuda-toolkit-10.1.168-r2.ebuild 3925 BLAKE2B e43bab5926ca7649293281a6a964b93ee639da955519e616fe82b0d607c52874fa153f622496259d3848146ea08b4d447002714b10382ea417be26effe255746 SHA512 379e6ab18e78e5f66fdc9976556e3edc9b8937de57a7e582567e6237cfd5e412637ce0127e84504bb2b750f40062112488bd8a29faf0b8940a8f04d6e68ea1ee
+EBUILD nvidia-cuda-toolkit-10.1.243-r3.ebuild 4238 BLAKE2B 07fdf4e6eb0ac919a73b0f9d72e7859446f6c9a4f2500430537e79d8cb6f512659c2a56624bec7d7913723f9e6000ecf83746da30e745a43f7631a17648aecbb SHA512 3a5e9a96999c0f23b05f2b3c7452b0f662985e7e3a0ae94cf0619ffd12c96387d540fc2fa58ba2e69933f6fc046387668b06003a1e9d6efec127254ec3043d34
+EBUILD nvidia-cuda-toolkit-10.2.89-r2.ebuild 3992 BLAKE2B 858d1b4db64e393f061a36c3e8f22dfa83bb2e4d083ca5d987eb80b1e74ed2fb51923ecc49a4e32f52291d6ef84e1d82ab257bb345d11225e92be1368b5f4f9d SHA512 047735e7b92f12a7152b950c88d8c6b09da7772a31f4b133c8af5c8295f55d81b312b796b481dd7f6ae6767d3f2632a280533c6bcd5a22ec705dfcbd3933a94b
+EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3902 BLAKE2B fb559c6ca55638853cede289104f9528bc939f10c20b9c67d168caf6cc3962c06e56f25961a17acfef4c143a95648efbc7d37f2362ef4af3f40d9d289ef88dcf SHA512 c810885c9fd7747d61078fedcefe4180da8aaa4ee7fa8822908f7d8dc649fd488781ea570f9f078c6a91ac7949cef3f112e8fe8a6bca3bb0d662abbe0ba755e9
+EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3928 BLAKE2B a3cc31983db891d496f5172bce661a5f1fd77a10afe0fb4ea1e243121530fc5560257c5846cc240da52986c7e6157feaace7047d0c675d0653144f5a42263a21 SHA512 9705c2ee7e76b5a66b20e08ca84c4ff998405a0816bbdd2e3d56eed21115ca154219d079943966525c71460baafdaf2858e2c7c6e08c44eff45db1be4d8c1f0f
+EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3439 BLAKE2B d1f61624448cdcd69db1a592d6fa4a78004fa8021b591efaa64dcd46263a2803f4983782b87ec9a3a89834e4ed99ab26f7dd706dee2a631887b1ac96b2080d4d SHA512 0c191cb31f5349a7a09c88c1d06e52ce025421a61a2c2bfc925a058b33f855585ccf20d538943c8e7f4d77fd1bb926d16fed76efa467e0a4380ba4b7f93f2c7f
+EBUILD nvidia-cuda-toolkit-8.0.44.ebuild 3380 BLAKE2B b24971d859d08a3011f36751551b91fce3a39424bcbdd0dcdffa4eaa6a3f396f80397ea30e7233c28f2d04c6f22ad62d84ad25277e3d4840714e3b1c6fc4d77c SHA512 8779c0a248e9e6fe16e6eacd739f995c0d07f4d0d973487fe9c8faa64840df1df29ab925aaf940eb763e487f4e26869205dea93be7cf6ab31a240d33151783f5
+EBUILD nvidia-cuda-toolkit-8.0.61.ebuild 3435 BLAKE2B f404d22f374dad343031ed38a7223069e4e10c3b7f93122f415803bc3f6ec868f92bbcd3104b1e43899f77d990f429befcee77846e92c20830586b6e8c665e04 SHA512 1fa6bea7b82dd4264608ef3e73f589061617bd05c7c15e343a0f548c5f37845ea85ffdc4fe6151e7e798781beaeea015309f2cb42170a4991ca0db8f98ab6756
+EBUILD nvidia-cuda-toolkit-9.0.176.ebuild 3442 BLAKE2B da89d56a1c4e12b9048f3251464a21aa10b287c294f16e9e03d5182f4f7684efb05ab3c6f7fb0e1b7b326899405ce79f407468f00f04a5b12cfb6a4fcc4ceaca SHA512 469619f9ba3dac697353d0761b47e169833571bc20e3b7f59c124df3bc0237a9d1e8eaca74ffafa0fe615bbc0950cd829b358b10bf6939cd0236f7f37d22f6ff
+EBUILD nvidia-cuda-toolkit-9.1.85.ebuild 3418 BLAKE2B 27debd5814eb6814fbffdc2241015663643c5028d6144426bb530705f974383153c3a5a0480e8c3a837fb157811a44dfd3800c58a9e30ba919c91623b32d21a7 SHA512 4972987db01a4826a86386313caa11d27a6f3e7a5c0e87096a7a299a7a83314a10170e9d8f22c3d5dcda29c7ef000824226def568a968ebe668d437193d4f952
+EBUILD nvidia-cuda-toolkit-9.2.88.ebuild 3420 BLAKE2B c0b4f78b1a1947b8414ab2dd163365b189edf15b49465c24f104b424bc11b9b92bd36c633226f5b1a4c01b84721247e58b4501952f96f60531ed42b1eebff3f8 SHA512 c9e5bf620e9d29495d623c70a574e5f1847eef4464820229a77c6ceb25b150be5c8d0c2612193b2ba5fd1642d60d8d0a619f679825355cd7bd42cbaea03f1620
 MISC metadata.xml 456 BLAKE2B 9c2baf84429d6969aad82a907a25acb5080bcfb3a5eb996f235ad05ed6ef5345df1c268bee9398c105f5926184f6179f46f98b396397266eef82ee9f6e7db470 SHA512 7745eb56d4a3a9a7d01e3143e807f2018d288c00bcc6c3bd0624c989d4e15ac5521dc087553cd643ff04392c1ac9964578fe03d05947eb2ed4cae21bceb9c67c
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild
index b2be76e7a5c0..580358a10731 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild
@@ -48,6 +48,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r3.ebuild
index f22b3bd5b0b0..529ba9f63de0 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r3.ebuild
@@ -43,6 +43,7 @@ pkg_setup() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168-r2.ebuild
index e40b358d6b8f..d9a0f446a8af 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168-r2.ebuild
@@ -43,6 +43,7 @@ pkg_setup() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r3.ebuild
index c1a8bda01427..89bdb3d3e566 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r3.ebuild
@@ -50,6 +50,7 @@ pkg_setup() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r2.ebuild
index ec0e6d2771ac..d33d713b5b09 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89-r2.ebuild
@@ -50,6 +50,7 @@ pkg_setup() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
index ec8e3bd4b4d0..b69c486109c1 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
@@ -59,6 +59,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
index f77869c14a8f..3ff03afa853d 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.19-r1.ebuild
@@ -59,6 +59,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild
index 3e361539e954..ee137a344a15 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-7.5.18-r2.ebuild
@@ -48,6 +48,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild
index 7156950eadbe..94cf8df882e9 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.44.ebuild
@@ -48,6 +48,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61.ebuild
index 6f903e84532f..419681eb64a4 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-8.0.61.ebuild
@@ -49,6 +49,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild
index 990b4999eb84..e56db8e3b47d 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild
@@ -49,6 +49,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild
index db75e1170292..532275f52c64 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.1.85.ebuild
@@ -48,6 +48,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4"
 
 	sed \
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild
index 335e9fc12a0d..12f63c702db5 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.2.88.ebuild
@@ -48,6 +48,7 @@ src_unpack() {
 src_prepare() {
 	local cuda_supported_gcc
 
+	# ATTENTION: change requires revbump
 	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3"
 
 	sed \
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 66a136e7f9ec..674888738924 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,3 +1,4 @@
+AUX binutils-2.34.patch 5670 BLAKE2B 20cf23c45d94d9c71f5fb5c432e832d8db53f6428b7f2849ad3f5854de36e371addd0883174eed4537b66367dbbf842ca557ae7842561a9f643769191929964a SHA512 be14f319c3e1c7486534e91e1dfb88c853148d58435ccf2ecef5e8ec690f20adea1edc48f3b6c88e900382d2dc342319ee28172150682bf1cf2a3e6fea9a1f4b
 DIST oprofile-1.3.0.tar.gz 1547258 BLAKE2B d8777e41856dc2f082570a1542609bd730fd7076000443f2e17c77eaf75df7a7a772ebb49d82ee657f563797858cecb4c23b130b0174d154c54d5619b8528ad1 SHA512 02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba
-EBUILD oprofile-1.3.0.ebuild 1598 BLAKE2B 061dfaba66945c51667d21f529a14fbaeaccc8acda4ca9b84271c826450317420fd35589f678a662315c80101d474f40ca89f570159468608d92c29138f732a9 SHA512 4705fc1db66537f6630ac525ed844a87dff2d89f712d92ecfe77b0235a5dcd921218a2ac6b4ff1011fb212d5c72cd058cdc54eb978898a9b25150a82a7335c96
+EBUILD oprofile-1.3.0.ebuild 1710 BLAKE2B f8e293e267d697ac5032aa086dcee205a86709b2c26b9ae730e105cd5b2045aec0550c6672ff8fc300c203d53b5d1bae26cdf1a310cd0226f60a58aaf38bbdcb SHA512 b0e87f0a90f21f35cdc9dd21b32d0a93e3bb26ec7517a28669ae5b7086a3d597c1a64f6ca117cec1625cdf239a191c4b028388ca7f3e5ff24fbbf695a55e1234
 MISC metadata.xml 423 BLAKE2B f94e15abeacab93798df7566bd1dc4d8e820aa57ddd71c2e5bfcf0c983bce5961a7c8bffb4f0ebdd92785002745314feece144e29000dd38f29426d2b35b8897 SHA512 01f96b806fca3e20eb84908a1cd77edbe11291be0098aff2e4d20f0fbf86ea0ef9972c7148c791bc826152a109d16903781cc2f2f367a2ac8b8fb7e5efee378a
diff --git a/dev-util/oprofile/files/binutils-2.34.patch b/dev-util/oprofile/files/binutils-2.34.patch
new file mode 100644
index 000000000000..6337191a21d4
--- /dev/null
+++ b/dev-util/oprofile/files/binutils-2.34.patch
@@ -0,0 +1,157 @@
+commit 377610414fb6cd7ac30e4485d9d6482fcf29aca6
+Author: William Cohen <wcohen@redhat.com>
+Date:   Wed Mar 18 21:19:16 2020 -0400
+
+    Macro wrappers to handle the binutils 2.34 api changes
+    
+    Changes in binutils 2.34 API prevented oprofile from compiling with
+    it.  This patch tests for the changes in the binutils API during
+    configuration and selects the appropiate wrappers to allow oprofile to
+    compile.  This allows oprofile to compile with both older and newer
+    versions of binutils.
+
+diff --git a/configure.ac b/configure.ac
+index ac2fd35e..df032a78 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -224,6 +224,26 @@ if test "$host_cpu" = "powerpc64le" -o "$host_cpu" = "powerpc64"; then
+ fi
+ AC_SUBST(PFM_LIB)
+ 
++HAVE_BINUTILS_234='1'
++AC_MSG_CHECKING([whether binutils 2.34 is being used])
++rm -f test-for-BINUTILS
++AC_LANG_CONFTEST(
++	[AC_LANG_PROGRAM([[#include <bfd.h>]],
++		[[asection * sect;
++		bfd_size_type buildid_sect_size = bfd_section_size(sect);
++		return 0;]])
++	])
++$CC conftest.$ac_ext $CFLAGS $LDFLAGS $LIBS $PERF_EVENT_FLAGS -o test-for-BINUTILS  > /dev/null 2>&1
++if test -f test-for-BINUTILS; then
++	echo "yes"
++	HAVE_BINUTILS_234='1'
++else
++	echo "no"
++	HAVE_BINUTILS_234='0'
++fi
++AC_DEFINE_UNQUOTED(HAVE_BINUTILS_234, $HAVE_BINUTILS_234, [Using binutils 2.34])
++rm -f test-for-BINUTILS*
++
+ AC_ARG_WITH(java,
+ [  --with-java=java-home        Path to Java home directory (default is "no"; "yes" will use /usr as Java home)],
+ JAVA_HOMEDIR=$with_java, [with_java=no])
+diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp
+index fa904839..cd0f4f71 100644
+--- a/libutil++/bfd_support.cpp
++++ b/libutil++/bfd_support.cpp
+@@ -19,6 +19,7 @@
+ #include "locate_images.h"
+ #include "op_libiberty.h"
+ #include "op_exception.h"
++#include "op_bfd_wrappers.h"
+ 
+ #include <unistd.h>
+ #include <errno.h>
+@@ -137,7 +138,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * build_id)
+ 		}
+ 	}
+ 
+-	bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect);
++	bfd_size_type buildid_sect_size = op_bfd_section_size(ibfd, sect);
+ 	char * contents = (char *) xmalloc(buildid_sect_size);
+ 	errno = 0;
+ 	if (!bfd_get_section_contents(ibfd, sect,
+@@ -188,7 +189,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, unsigned long & crc32)
+ 	if (sect == NULL)
+ 		return false;
+ 	
+-	bfd_size_type debuglink_size = bfd_section_size(ibfd, sect);  
++	bfd_size_type debuglink_size = op_bfd_section_size(ibfd, sect);
+ 	char * contents = (char *) xmalloc(debuglink_size);
+ 	cverb << vbfd
+ 	      << ".gnu_debuglink section has size " << debuglink_size << endl;
+@@ -346,7 +347,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol ** syms,
+ 	// first restrict the search on a sensible range of vma, 16 is
+ 	// an intuitive value based on epilog code look
+ 	size_t max_search = 16;
+-	size_t section_size = bfd_section_size(abfd, section);
++	size_t section_size = op_bfd_section_size(abfd, section);
+ 	if (pc + max_search > section_size)
+ 		max_search = section_size - pc;
+ 
+@@ -819,10 +820,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol const & sym,
+ 	else
+ 		pc = (sym.value() + offset) - sym.filepos();
+ 
+-	if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
++	if ((op_bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
+ 		goto fail;
+ 
+-	if (pc >= bfd_section_size(abfd, section))
++	if (pc >= op_bfd_section_size(abfd, section))
+ 		goto fail;
+ 
+ 	ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename,
+diff --git a/libutil/op_bfd_wrappers.h b/libutil/op_bfd_wrappers.h
+new file mode 100644
+index 00000000..b229cc12
+--- /dev/null
++++ b/libutil/op_bfd_wrappers.h
+@@ -0,0 +1,28 @@
++/**
++ * @file op_bfd_wrappers.h
++ * Wrappers to hide API changes in binutils 2.34
++ *
++ * @remark Copyright 2020 OProfile authors
++ * @remark Read the file COPYING
++ *
++ * @author William Cohen
++ */
++
++#ifndef OP_BFD_WRAPPERS_H
++#define OP_BFD_WRAPPERS_H
++
++#if HAVE_BINUTILS_234
++#define op_bfd_section_size(ibfd, sec) bfd_section_size(sec)
++#define op_bfd_get_section_flags(abfd, sec) bfd_section_flags(sec)
++#define op_bfd_set_section_flags(abfd, sec, flags) bfd_set_section_flags(sec, flags)
++#define op_bfd_set_section_vma(abfd, sec, vma) bfd_set_section_vma(sec, vma)
++#define op_bfd_set_section_size(abfd, sec, size) bfd_set_section_size(sec, size)
++#else
++#define op_bfd_section_size(ibfd, sec) bfd_section_size(ibfd, sec)
++#define op_bfd_get_section_flags(abfd, sec) bfd_get_section_flags(abfd, sec)
++#define op_bfd_set_section_flags(abfd, sec, flags) bfd_set_section_flags(abfd, sec, flags)
++#define op_bfd_set_section_vma(abfd, sec, vma) bfd_set_section_vma(abfd, sec, vma)
++#define op_bfd_set_section_size(abfd, sec, size) bfd_set_section_size(abfd, sec, size)
++#endif
++
++#endif /* !OP_BFD_WRAPPERS_H */
+diff --git a/opjitconv/create_bfd.c b/opjitconv/create_bfd.c
+index 48db143b..da1e6d29 100644
+--- a/opjitconv/create_bfd.c
++++ b/opjitconv/create_bfd.c
+@@ -16,6 +16,7 @@
+ 
+ #include "opjitconv.h"
+ #include "op_libiberty.h"
++#include "op_bfd_wrappers.h"
+ 
+ #include <bfd.h>
+ #include <assert.h>
+@@ -86,12 +87,12 @@ asection * create_section(bfd * abfd, char const * section_name,
+ 		bfd_perror("bfd_make_section");
+ 		goto error;
+ 	}
+-	bfd_set_section_vma(abfd, section, vma);
+-	if (bfd_set_section_size(abfd, section, size) == FALSE) {
++	op_bfd_set_section_vma(abfd, section, vma);
++	if (op_bfd_set_section_size(abfd, section, size) == FALSE) {
+ 		bfd_perror("bfd_set_section_size");
+ 		goto error;
+ 	}
+-	if (bfd_set_section_flags(abfd, section, flags) == FALSE) {
++	if (op_bfd_set_section_flags(abfd, section, flags) == FALSE) {
+ 		bfd_perror("bfd_set_section_flags");
+ 		goto error;
+ 	}
diff --git a/dev-util/oprofile/oprofile-1.3.0.ebuild b/dev-util/oprofile/oprofile-1.3.0.ebuild
index 826af1f43b98..da8d69f7b576 100644
--- a/dev-util/oprofile/oprofile-1.3.0.ebuild
+++ b/dev-util/oprofile/oprofile-1.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit java-pkg-opt-2 linux-info user
+inherit autotools java-pkg-opt-2 linux-info user
 
 DESCRIPTION="A transparent low-overhead system-wide profiler"
 HOMEPAGE="http://oprofile.sourceforge.net"
@@ -39,6 +39,12 @@ pkg_setup() {
 	use java && java-pkg_init
 }
 
+src_prepare() {
+	eapply "${FILESDIR}/binutils-2.34.patch"
+	java-pkg-opt-2_src_prepare
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--disable-werror \
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index c984390fbb69..a4a2e4940a00 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,6 +1,6 @@
 DIST ostree-2018.9.tar.xz 1951732 BLAKE2B c6fba1321fe21bff569fe1dadd1aa649f23059a35dc906c3a0b7dcca29f7acbe8338e19541d8f7d854452bf6a6b1ac293d4350c7056a9b13b9ed1eacf358d4b3 SHA512 407b6b67add54e80a55fc35f08bde56561009db93ec202a10dd1ec1e66bd32b439c1d66c759e4e173e44fce6fbc2c162cae928a477c9d7abafbf007ed8f7bfb5
 DIST ostree-2019.5.tar.xz 1972452 BLAKE2B a8b015118855b8b0097f535ac074aeffc599c3f6f654967043e8e4de339d2a51e85ad1b4b3f3b22e18d39235e6ad9c1973334a2c4fc9b5c694f2ff40d68ae703 SHA512 27150802ed9af16e698ed163f6ad235f0f99a1410df52b4b1e266585fe665880c0b9490bf245b5593cb277007b7229d808be7403dd964c58aded6e567349c912
 EBUILD ostree-2018.9-r1.ebuild 3497 BLAKE2B b4a027cf64a64083caec1a5c48538d73194366a1e46e4ded6aff322c7007eb5a13b2247295ce59ab5b40e54ffdce3201646ec250778a0247845e1a9e0ecb4b55 SHA512 46a2e9cb4e2d962fb5fb330a7412d9c651c13fc965e800c6d92cb8cc15a4b98b8843e5b6d37d791b7235402a11a192909ac621070c30bd559878039d537375ff
-EBUILD ostree-2018.9.ebuild 3265 BLAKE2B 046872e6bb85337738b2e32eaefa649040d07d391e76d6840d296d9fcf2f231f4b246bcd26f601a4c216b613caed7bceee86328b53f945b1c0bf500c01076bde SHA512 f66e58ddfbe73dac33c1bde4e6538b3a5fba47b3532b36baa0569b6fba87a7c37954d46e73bf3c76005ead855c064af333fff77619cb08c014d3180c5f723c3a
-EBUILD ostree-2019.5.ebuild 2220 BLAKE2B 38b9a5e4181699dfa99f274d29ace6e7e0970a5c5f1f3a2f8e345633e68707ac38830b0023640deb113c79e3dade0d2b24f4b724deef9ddce62926780860db53 SHA512 77751f604a7377404f9eb73ed227ef14f724c775d6420ddab0967c6b8e1f448f57037ed947af6f93813e4e819d1b1458613942b7aa6086e8b64822d6491de6f9
+EBUILD ostree-2018.9.ebuild 3266 BLAKE2B b433adf09f65abdc163f517b97731790a7c2ef9570dc14cedfba8ffd151990c9a3cee2977ff17862228d3547e831c0aecc80446068f4787ca1f0d704d921a56b SHA512 cfc839b02b9007498d7b3ded28c651bc52c1015c4b7fc3e5e3cc7f4a0ef072d15a55fc962b76282e331ef26c99700457317d216cb37f4a48fcb30ce73adc350f
+EBUILD ostree-2019.5.ebuild 2220 BLAKE2B c56fbde79b750df4de06f3ed175ad15011070c9b36bacc7bad3d2efc676b485c3c72b5b138e69ef0bf1f43293ef23f71699d5b9609a94d1a8aef4a267c81a3ef SHA512 829b080ab7ec39f2de945ef3c0ae23bdba3b17b544e2556809e4a25537e454ff5eee26674068eab80e8c326688020d26ba43c01f2059fc4aaaee67538d929ded
 MISC metadata.xml 1889 BLAKE2B 58b5a7ce03d273da942cc88468ccc1e8758c2f1e3004a0424567f56e5e6fb589f457e50a1edc759e77b9177aa9472441f68911c8cc5ed39c2c4d5b8b56839521 SHA512 697a3f44a7df7b1e7425afedece72693c77821a6c55a3d5bf735a724ccb1a6655dfabd4262b3136b7af0856eeaf8404adb0c203826f0f8422035c6d66ebb11d4
diff --git a/dev-util/ostree/ostree-2018.9.ebuild b/dev-util/ostree/ostree-2018.9.ebuild
index c7c0813520bb..6f86406b9deb 100644
--- a/dev-util/ostree/ostree-2018.9.ebuild
+++ b/dev-util/ostree/ostree-2018.9.ebuild
@@ -22,7 +22,7 @@ COMMON_DEPEND="
 	dev-libs/libgpg-error:=
 	dev-libs/openssl:0=
 	sys-apps/util-linux:=
-	sys-fs/fuse:=
+	sys-fs/fuse:0=
 	sys-libs/zlib:=
 
 	archive? ( app-arch/libarchive:= )
diff --git a/dev-util/ostree/ostree-2019.5.ebuild b/dev-util/ostree/ostree-2019.5.ebuild
index f8d2fec39755..68c74d15f958 100644
--- a/dev-util/ostree/ostree-2019.5.ebuild
+++ b/dev-util/ostree/ostree-2019.5.ebuild
@@ -32,7 +32,7 @@ COMMON_DEPEND="
 	ssl? (
 		gnutls? ( net-libs/gnutls )
 		!gnutls? ( dev-libs/openssl:0= ) )
-	>=sys-fs/fuse-2.9.2:*
+	>=sys-fs/fuse-2.9.2:0
 	sys-libs/zlib
 	libmount? ( sys-apps/util-linux )
 	selinux? ( sys-libs/libselinux )
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index dc9bf8eedcde..6ff0a4ca808d 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -1,5 +1,5 @@
 AUX rebar-erlang23.diff 602 BLAKE2B 761b7e35408487698b27b0169989937305e9c7db14b49f5cbd411f4cfe19525a82e50d3c105f38d1fedc75f4c51d264fbf4a4a496b9bbce826b994241073fea3 SHA512 5f57f199dcd5544dec48119feeb288c2d6f5f0a45307b09489a37702609f6e79db08982764bd07f898c7858d45d8c154e314fab131b70996c95a1473561ba8c4
 DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
-EBUILD rebar-2.6.4-r1.ebuild 675 BLAKE2B df8993a85ef3dd529f3e0c22c5c56df96b9ae0dc46efdb7778d385f07197c566e4ecc5978a02e74b2b7b990d000c46cee5779449976d5a94ff489a47add8dd74 SHA512 fe8e12f494869b1a9561e28e2c061cb147b81df3ac74ccd96130398832ee75e6cef46600313cfd277f6e62e6156f71fc20608c81a1db6a154de7f4de6ea80eee
+EBUILD rebar-2.6.4-r1.ebuild 671 BLAKE2B e2634bb01418f81f97c9d30a91083efb2ed87416b7e42a48e83acd5f07956ce14e8fed23f782bbba6437139da730c2cdabe7d0c523a447966b43c6e2dabf8033 SHA512 95cd7d605d4a3fe6940be8fe90d42db7b413bd0b1983a4ed44cd511308244e64e88d49a70306c9262556a1717402c41e42849c7420f1e958dfc300ce631eb382
 EBUILD rebar-2.6.4.ebuild 624 BLAKE2B d634bc46b48270d5c5a4b1c2d3680102d61a469ed8d904faea392a257c161295a2175a26afffaf367b3b2feba3b5268805af142f9cb685a29d6b6945c22ad983 SHA512 08a934a6d39eb91cba297036d22f40f0b6024e05c46630a4096f58cbee55928aeabee71ed0cb3c46a7db0791b7d62ddc6f6306a06756d00987439b0f7b7c4914
 MISC metadata.xml 248 BLAKE2B 404382bd4b92d22cc627b066d14310ac5f538e3bcac366e8cddb43c871c13d4efade2036bb49f5e8ac3c7511f28e6eae58a1e350bc48ef8b9f2031b460c741c1 SHA512 c6b32cd3a892084eff028d3afb657fef0e0921e6636628cfc2d81b7bada9d0c7d03005f8c8ed1ffddc7d491bd6725c771506dd3da20dc5a60619efaccf0974aa
diff --git a/dev-util/rebar/rebar-2.6.4-r1.ebuild b/dev-util/rebar/rebar-2.6.4-r1.ebuild
index c38856039c16..30174d040b6a 100644
--- a/dev-util/rebar/rebar-2.6.4-r1.ebuild
+++ b/dev-util/rebar/rebar-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/erlang:="
diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest
index 0cacf716a6f4..8c4a5094975d 100644
--- a/dev-util/rt-tests/Manifest
+++ b/dev-util/rt-tests/Manifest
@@ -1,4 +1,4 @@
 AUX rt-tests-1.8-musl.patch 10834 BLAKE2B 54bc0e20a9bc7c251985b8e21c94b0e6261345d02a23dc510ee6a303843ea88aa13750680adb3954d63561246dfb26e6427adf2bc2012f9161357d0fae207b83 SHA512 196b0d1d19aeab83710edddcaec7064d4e4770cd514f8b8a61b23980932b793d044cfb4d69c91e61c4ee912eb24cd3a87ee8da05612c1ee02e2a5885f32bb9e5
 DIST rt-tests-1.8.tar.xz 105820 BLAKE2B 478ac14732393f718e6be818b82b24b1e53d2f293140012bc17fd1c9242bd885b4d70dca3c7f3187e9ba22334e5f83d9ad1993ab9f70079e1765b918deab4411 SHA512 41c0b18e84d1f76de22a4ab239d43ac678b8c8419b508c96204bef346734122b9a42df51fcea97b1e0675bd25ed1e262730236ec0cb189732d5810122e96aa39
-EBUILD rt-tests-1.8.ebuild 847 BLAKE2B c55213743b396727a0626ccc80617f6b62722ba93fb9c0245981b896a02bbf1fe757e0f22a6d783b4e58ab95328526b1505916014491d764ed844b005589b88a SHA512 b36dab246f8eb4477183e7c1ffb5f65f997f5c2bcc9b7bddd3c301f3da1e5b65166b83a7fcb42fb28315446f28e0a8f2f79eab7ed62fced4e8ac88c100caedfd
+EBUILD rt-tests-1.8.ebuild 923 BLAKE2B cf4dacc192b38ffac20e7dda97a4f775e71ae9c4a602b6fef39a7ecdf99be7395ece533d2f901c08de91ece2edf7e4791f8755159032aeb6b588bd599bbc6874 SHA512 18609c388c6d6d87700b5e308911f797ff85fdcf3e91983d14a9acecef66fceb2ee543b4015ae2b0b640115f890a17ed3cedcbca45a058c3cb3b5166b263af28
 MISC metadata.xml 718 BLAKE2B e09ef2dd4bd98df6e36e684105242e579fd86dfa28fd02f6b04ea78f91dc2089485a54497edb0a9a1b3c36fe5033eb1e98b626735b82d2a765150812f724bb93 SHA512 8b7eb83545e11f2f5786f0e5fbc47ce15fbb9a364ad9fcf51a7c47e8a05e70d3d0c48c2f69b5f6abd4b839514bc2575a66a43202204340137ec3d8a9f41564e1
diff --git a/dev-util/rt-tests/rt-tests-1.8.ebuild b/dev-util/rt-tests/rt-tests-1.8.ebuild
index 994e2f56115f..f94e433d66c0 100644
--- a/dev-util/rt-tests/rt-tests-1.8.ebuild
+++ b/dev-util/rt-tests/rt-tests-1.8.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..8} )
 
-inherit python-single-r1
+inherit python-single-r1 toolchain-funcs
 
 DESCRIPTION="A collection of latency testing tools for the linux(-rt) kernel"
 HOMEPAGE="https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/about/"
@@ -27,6 +27,10 @@ src_prepare() {
 	use elibc_musl && eapply "${FILESDIR}/${P}-musl.patch"
 }
 
+src_compile() {
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)"
+}
+
 src_install() {
 	emake prefix=/usr DESTDIR="${D}" MAN_COMPRESSION=none install
 	python_fix_shebang "${ED}"
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index 51613238efba..eacc35661fdc 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -1,5 +1,3 @@
-DIST ShellCheck-0.7.0.tar.gz 163027 BLAKE2B 2d6348f21cb9598c0133cc1548f43727d56155883db83c38483b581b3565c67d5bf9d5333b6c39569dac1f07b19b21db1d62d83e675bb4aa9735725879aaf6e2 SHA512 88a0cb2a2879f597b832979fd934ee63e0f1ca256e5f9e7c51667744d09848817fdbe3988898f49226fc52ec27d92c314a9075995c3110ee10b24468cb60c657
 DIST ShellCheck-0.7.1.tar.gz 163288 BLAKE2B efc8c56348ba924baf660ae16d84e023cdd1a5ef8b355b492844ca41aeb3242eb1e5862bea7f12c69fa43cce285a44afaf95125816f62fbe316d9bdca467b1ae SHA512 fc84bd67e30af1378a92c1e378693a2c181e9567d53f2590e76aedb9f607276b90abd2ac83818c36524bd77a480df347af5a0879a925a846f35440ab207fad8a
-EBUILD shellcheck-0.7.0.ebuild 925 BLAKE2B d1dd5dcf799243cfbf7aabf519ee605386dd4593eb58f061bb31ffaac0a7918d84bf0682414e746ac562a15774ac11e0dab287bd39b71da1594168f41ff8b6b8 SHA512 dffb168c017cf90df2e1b428a7e77b8c5d2850fd7372b027da64c68feb384c1179698a14bce07abbbf94ee35d6c0ca072f1d0f8752a4378bdbd48860ee2568b6
 EBUILD shellcheck-0.7.1.ebuild 849 BLAKE2B 2365d8fc4a090efeae8d407a4f9bcba47446276bcbfd3e3ec8cca544766651593b5d0ef7963f2f59e520393fe5027331fc0b9dc1679e61b755b208c320610b08 SHA512 b3e2ccb90f1405940aa7a373ba92de9d0329826ba5ed7f7b85c3ff0ec57b4ac1f50a1944fd14c6c5b32666df425c72470795833adec930f83f27905c6fa0d74b
 MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
diff --git a/dev-util/shellcheck/shellcheck-0.7.0.ebuild b/dev-util/shellcheck/shellcheck-0.7.0.ebuild
deleted file mode 100644
index 572de9c65f0b..000000000000
--- a/dev-util/shellcheck/shellcheck-0.7.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ShellCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Shell script analysis tool"
-HOMEPAGE="https://www.shellcheck.net/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/diff-0.2.0:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	>=dev-haskell/parsec-3.0:=[profile?]
-	>=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?]
-	dev-haskell/regex-tdfa:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0 <dev-haskell/cabal-2.5
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	cabal_src_install
-	doman "${PN}.1"
-}
diff --git a/dev-util/shelltestrunner/Manifest b/dev-util/shelltestrunner/Manifest
index 25ac29f30c9c..c534b091f3e6 100644
--- a/dev-util/shelltestrunner/Manifest
+++ b/dev-util/shelltestrunner/Manifest
@@ -1,5 +1,3 @@
-DIST shelltestrunner-1.3.5.tar.gz 21428 BLAKE2B af7573a16159baf5dbcbedc10a454b1f09875031cc9d619b287aeaf507744a2a1dc5cde8ea509949097b5364b5b9ac9438705e58d2d08647e5fa6c4eccceec37 SHA512 f0cc03c41fe176ddfd0e498121f5ebafda721b93e9a84f320b445bf797022545e1046ffb3814e2eaac72f0975a2a11fb1de5e0a007c5700de028e57ee66fa093
 DIST shelltestrunner-1.9.tar.gz 39538 BLAKE2B 45dc5acbfd35d65a818938382e62eacc7aa3798e8f0ab9cdd4d4a358f470de9854bedbd2335bae6b4195ea05b2305de84e0b13c86206ac0e53039726fbc59354 SHA512 bdb5476e30189f0997f3a9505d954a828475a5d95e1220dc9ed342e96100f4dfa0cfadc1afd9a5758223cf1a659d1f77d7d0a0533c32bd80b325c9a7ad48178d
-EBUILD shelltestrunner-1.3.5-r1.ebuild 1196 BLAKE2B f560c4f4094152431de55a6878fff2f9a70bda9e74f22d0c9d4c965ee34d5a12dd80b0c5765481291abac07e763c068ede1cbe9af3660a527faa52d32c517df0 SHA512 bc939c9ca6c8e545a6781e1d23bbdf426bff73198d4838b1ea24a5d3c4a48ad733a273f69063b413eae43b727d711dcf2f686acf8da536ecbaf95a2858dc9409
 EBUILD shelltestrunner-1.9.ebuild 1424 BLAKE2B 7a8585896b41fe1680bd82550aca07c0e44b75f0f8ccd4e15d72848c6ed46d1fcf0441253b799ec6dbc80e9e35d99189f07fcdbe40eb18a3632eca22b184e1c2 SHA512 7771d6a5ae08f580506a249185f991dc0ee8b1af80e5985eae77f2a7d33053189e8de88a1c2f427d849353bc1776dcd78476e57e5595b20395c60c903fef357d
 MISC metadata.xml 635 BLAKE2B d6582231d4828a390bf96dd9c75dfebc87ef599a2e659f281bee36ac2a1ca3cd73702e38518e47343753766caf772180f19c97b1805f236993d4486d2f15ea2a SHA512 a398308f38fffe954bdcb052e6b22997442c2a303896790c643e3e95cc38976f2d5b8fb9d08a713411fd5ec0aca2d2904a5a388276d69ad132e8780115bac6f8
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild
deleted file mode 100644
index d51ce4d5631f..000000000000
--- a/dev-util/shelltestrunner/shelltestrunner-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A tool for testing command-line programs"
-HOMEPAGE="http://joyful.com/shelltestrunner"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cmdargs-0.7:= <dev-haskell/cmdargs-0.11:=
-	>=dev-haskell/diff-0.2.0:= <dev-haskell/diff-0.4:=
-	>=dev-haskell/filemanip-0.3:= <dev-haskell/filemanip-0.4:=
-	dev-haskell/hunit:=
-	<dev-haskell/parsec-3.2:=
-	>=dev-haskell/pretty-show-1.6.5:=
-	>=dev-haskell/regex-tdfa-1.1:= <dev-haskell/regex-tdfa-1.3:=
-	dev-haskell/safe:=
-	>=dev-haskell/test-framework-0.3.2:= <dev-haskell/test-framework-0.9:=
-	>=dev-haskell/test-framework-hunit-0.2:= <dev-haskell/test-framework-hunit-0.4:=
-	>=dev-haskell/utf8-string-0.3.5:= <dev-haskell/utf8-string-1.1:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_prepare() {
-	cabal_chdeps \
-		'HUnit                            < 1.3' 'HUnit' \
-		'process                          < 1.3' 'process'
-}
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index e68eb60ae373..5e8a1b7d055f 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,5 +1,5 @@
 DIST source-highlight-3.1.8.tar.gz 1648351 BLAKE2B 1ce1590c86f7aed9d27bb21bce6b0869828b28068d71404410e080b85f6354eb6f520cec8c81d1e9170dd90b158dc4536e5287a04bf2d271fa26354fb853ea32 SHA512 00a49ab180460750614b38be9a569478d1d34d01f601ebc7452a4fee8475a19faf9bb9fb2f256c6b40d43fbc3d34962a77ba8b9833483345c4e4a42faad6976c
 DIST source-highlight-3.1.9.tar.gz 1717234 BLAKE2B 6eb40b2274df0772c4a241504e5db5dfdaac600549e0b11aba726f7b4d5ab600c3849a8815bc782ad1bb1f99b69766527645dd202731bde4b2466c663842c47c SHA512 d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195
 EBUILD source-highlight-3.1.8.ebuild 1389 BLAKE2B 57af29c1e8206f9851eeb8c9c3bc4a38bde9e8d7584afac23de65e757c3d5f02b5e37b58488cddb9082e0c2ffdb7c074b510ace4ab1104557852a05b1d9950dd SHA512 f01ae5c89cec2611909a5fd60c0a63520d840b3c6d48ad6a358e45e96cb93528392e0ce496e70d6e13e8da1c56adca0d35053e4d9d8f241a62a19e2472ddffc2
-EBUILD source-highlight-3.1.9.ebuild 1406 BLAKE2B 11d538bd779af48b3ee317b266f5dc88a99adaa3d956a5360388d897427e0ed46e377152b63a17345c00ad09148b3bbd79adb31b8d8fee775aa8f6417fd8c5fd SHA512 0f15dece013549a5a1d179465e237de7d85e1af516fdd4d2833e2a21d1131cb7346b3f069df2edaf035640590a2529342f5f57455e773e6108b7c331a5a4943d
+EBUILD source-highlight-3.1.9.ebuild 1399 BLAKE2B b6713101735506d5f085067fcf6af4fadfc70afa515e03b24e65bc3a0c4302b9cd95bde25d4407dbcfd6b49dcefae24b44e7da18f31abf74dece4ecfa2c9a195 SHA512 ddc297ad181adea42bb8a11f8512a5c83e8329fe26e24d9a277f057334e720fd5904b2c427b12103b502e7c028639ac04dd2659aa239997aa02bb5ae222e6c6f
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/dev-util/source-highlight/source-highlight-3.1.9.ebuild b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
index 79dc0516a190..205374a14a52 100644
--- a/dev-util/source-highlight/source-highlight-3.1.9.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
 SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"
 
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index fa3a8cda4908..1413f3916a33 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -3,6 +3,6 @@ DIST umockdev-0.11.3.tar.xz 753152 BLAKE2B 9f78d160a653ba2c56e97d1b331dfeecd4dd8
 DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
 DIST umockdev-0.9.4.tar.xz 754856 BLAKE2B 92182ee856e9432f02cf3a739c7af6f2220394eb4dd81ef6e2949380d124f70d9e34c3d3e49053af43794dd0f2ce0feed8be7366df2c9a06bebee9c52d24ba53 SHA512 c291d3f40a0ab366f14021aa0960852de049f4299a0207d93cec28d5961f3bc7f89448add6f7b35c1262d805d1d638837d4d5e6b734879ffb5910da50019e1cd
 EBUILD umockdev-0.11.3.ebuild 1008 BLAKE2B 2c759f19cab5a3386d0c0fd5226e08d82c903577e7923ee2fd5ed035de80aaee3d2414d20fd9b5aee6d031ec46b999d39818d58bdf5e70ca61ea6973f149df08 SHA512 c59bc1154a73886962f992517da4b4585c8ac8ce99642cebe815d5a691240b1efc2ed323002c2bbd2ecbc752cc24341d2e367987f9eecc46f0a24f6ff79e9b79
-EBUILD umockdev-0.12.1.ebuild 1196 BLAKE2B a5fad4a1391a63b280495c7668724c286c51693a3a6e785bb608ec975a3fc0717cd2c1814fc7cd7513b9e465ab9da3aebc975bcf52ee5a2fec7cd932f62e6af9 SHA512 74f84a5bf5d3b3516d7753f8cc0cea4ce2d99899d9aac29a301b9dba6f1737f9b368cd29efde5f71dd06825a2508abb39aa78a0ef11fe8eeaaf98dc30ec08531
+EBUILD umockdev-0.12.1.ebuild 1195 BLAKE2B 96364a0cbac6f75dbc5368b3e31092bced2d3abf726a882c8ca21132f032c6e627913709bb2b1875d873f3144de3f25c6845730d1d8cbcbb2f23f5143a397491 SHA512 0b687886638645c816b8442011cc3eff3b452629804a0f665a1b516deac6b8e8b524a4364df854367bf4815c2e7362547a1403d91afe356ea04fbf012bd03ae7
 EBUILD umockdev-0.9.4.ebuild 717 BLAKE2B d68eec4ddf6087fb9f0768c487595bc0617f6b746b9cd4002b8dd95a25579de89eb582703defaef005c0087c87dba0ccae28a03a9e6ccc414c393d28b9780e19 SHA512 555af33316a54fa0e7ec4c6211a0b1322b9e762b47084fe4698638c7feb95b0f1c025e80d4fcf5c3f8a09ab526f25db38b440c722beb62089b13fae3c60a0b23
 MISC metadata.xml 388 BLAKE2B 5140e5be03021c8b50516cddf6a51b8715a1e110e13519313cd3e30b2317874cec5c56eea5168d47496a2055635b87effcc66dac54a66a482818da15b540186d SHA512 ca1c14fa200681d916d6d4539fa9ee8c64d6894d7b78870abfc4ad03446a30703f0fe862a11c5838e26719ae66e0bc944fe0ca75f0f89195128d4e8856b6cd78
diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
index 105da8e53ea0..6f0275625128 100644
--- a/dev-util/umockdev/umockdev-0.12.1.ebuild
+++ b/dev-util/umockdev/umockdev-0.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+introspection static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 6689be387134..852cebc56a2a 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -3,8 +3,10 @@ AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2
 DIST valgrind-3.14.0.tar.bz2 16602858 BLAKE2B 00d601593388180cc874cf2f0c78e79f705f145e45ea82996117cb91ba881e7888ef241fb7e45927f82f99666d76ed35cb5d451e9a3ef123c04a0dff233b2269 SHA512 68e548c42df31dc2b883a403e0faff7480c49b3054841870f5d2f742141ba199eca5d83c96bbf283115f0633f2bdb0860161d422f98e3ec720ec65760d250f97
 DIST valgrind-3.15.0.tar.bz2 20241437 BLAKE2B a1bd46d46b3cd9f963773d011e7c74bf5e09e59be13afe38229a3c66a89eeb416498faed67d6ec21489b630b55ac73cc212e17ba515884f8b6374849a60e3720 SHA512 5695d1355226fb63b0c80809ed43bb077b6eed4d427792d9d7ed944c38b557a84fe3c783517b921e32f161228e10e4625bea0550faa4685872bb4454450cfa7f
 DIST valgrind-3.16.0.tar.bz2 16267317 BLAKE2B 4ab7a248bc46a772a03fecdab4658b059e65dc328f422f51d23d116d658b8fcfe1dc4b3b26b43ca7bd824169b169506f67cd14a1db2b767b5b5a34c949687d25 SHA512 6c82a0121e0ffde79f84943ea0f5791159ad3e37a490c1a18ff23f41cd4de62b62110e9c4d48b95b06d542f2a6d638492ecaeba9fed48f7e909e959aa4b4856d
+DIST valgrind-3.16.1.tar.bz2 16262776 BLAKE2B 1c333c26827f7a8356869e8758da9dd6a7444642ac4f6377c84fdab8349b9cee1e9bf2cf2eb86043c4feffab342dd97da20e76d7566d0296189e6ea8483a8c65 SHA512 2a4173efe1b6facdd2f5c5ee8ed006704168eba1813736fccc8191d60363afd96197512cf42037e65f18d4ddd49adc74a54c47210df216fba3c46bf68ef0f950
 EBUILD valgrind-3.14.0.ebuild 3682 BLAKE2B b5c775610622d2aa48db013dfe9cfc6d8db508b825df2cc3f7759de9d0467161cb7d5eb8c18aee8532ebf04a9aebfa3663b88661bc4d3d747916997a71d1904f SHA512 8fddf0b86912858fcd60ba23e301934dbd256efbbd8f08ba9972167cd04ab512f5f759acd3dd2a7c12e45428bb25ebb3674bd60b84cc6ab1dac38f492f9a8952
 EBUILD valgrind-3.15.0.ebuild 3761 BLAKE2B 0f839a8e208e33a879331b3791668987d51bac4bc8e9cff2eb03172736a3b9a8b24a256c01065d688f3a43845e4d915e6c68c61f68c4599f3bb7298cd5e82fbe SHA512 77bd2fce8757ef1b7e9f940c24aa184551781dfe139acfca63c92fa643e018e34b746b70e4f5f55a1a5738e4988beab986d5932711cb7c97d1e48e0daf85f72c
 EBUILD valgrind-3.16.0.ebuild 3766 BLAKE2B 820536cd71c55c9fa35f77b014d7a5c5936fc845773b1523ef79c9c6e47d632e1633e2f60cd378b33610c396d57ca71241517de1817aad86402836376b954320 SHA512 454562b3e6725accb06c4d06450eb2e30cc5e4819932ad227d5b6f8b58b0b9b9d8f9966ac1c2294e8f7dc05a0f75bc29eb31c7084c27c3259d47306246481e26
+EBUILD valgrind-3.16.1.ebuild 3766 BLAKE2B 820536cd71c55c9fa35f77b014d7a5c5936fc845773b1523ef79c9c6e47d632e1633e2f60cd378b33610c396d57ca71241517de1817aad86402836376b954320 SHA512 454562b3e6725accb06c4d06450eb2e30cc5e4819932ad227d5b6f8b58b0b9b9d8f9966ac1c2294e8f7dc05a0f75bc29eb31c7084c27c3259d47306246481e26
 EBUILD valgrind-9999.ebuild 3753 BLAKE2B 546a516d9a909f44e1c8dc20ace9025826335e2910e3652e1c7592804765fd4d679f6422276399c7629e2b711236181958dfe435198b8ebd8327b6f637cd67fd SHA512 64831f5594eee66cb5ed5a1afbc44708cf0f334e05b22e46c4675f35528628f5bb6f89981de420bcae568b18dee4767150a6465f75f1451cdd128bf297dd04bd
 MISC metadata.xml 1027 BLAKE2B df13361ec401ce5e0bfa11e51378c432405bd296a874d8c71c26c9cbdf0171689e4b3134b5e05672dfc22bbcd6e2b6c74b96c47367725c209990d3e1fcc65e7b SHA512 da5bcaf596f2adaa552cc3b7296891b40be0bafec8a12695076ce8fbe660b8aabe70508eb02ab3fb66b0d9dd0c0c8615f430c1ee0ce3f3579732ea2406c8a778
diff --git a/dev-util/valgrind/valgrind-3.16.1.ebuild b/dev-util/valgrind/valgrind-3.16.1.ebuild
new file mode 100644
index 000000000000..33873a0e69c3
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.16.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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="https://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
+
+	eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.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/xdelta/Manifest b/dev-util/xdelta/Manifest
index b1b2e475e803..32eca5e926cc 100644
--- a/dev-util/xdelta/Manifest
+++ b/dev-util/xdelta/Manifest
@@ -4,7 +4,7 @@ AUX xdelta-1.1.4-pkgconfig.patch 2551 BLAKE2B 606dd386fbfb768c931e2c08b5508f6bc3
 DIST xdelta-1.1.4.tar.gz 423529 BLAKE2B b565f82ba0504118b74127096939e5699ea312be5c6c8a345abfcf0fb01b45e759abe595b33619b2714671e2f0307d603366a1f7a6b1fb5a786378716a51df6b SHA512 eef45f7977e9a7f490b881f33ab8a948cc5eff9300ea850cc30062905c8e883c104961f075f56f7ce8e385142c35de168aef1e0b8169bda66786ea4bee33168b
 DIST xdelta3-3.0.11.tar.gz 683605 BLAKE2B bc33c9d6a3bb21bc52d72bba54f5e2b1058ea8d7cd7474aaf6dbdc27e165e0fbea644c584402f5bbc8ace7cd6a3aefae18588a659418f93eb041168545363bf4 SHA512 41c48e28f92ad50a737cf0acac150fe17d1132e9a652c482d751c8c4e745c6922d576a183eeabae343a1a238ed8c53353e537977628c86eb599ab3d1c01e7c52
 DIST xdelta3-3.1.0.tar.gz 727607 BLAKE2B 1dd7846dad0414071a8af172fc3b73a0321fc9c841786563fe92ebe5c53d80d3eb07cc553cb5a9813432d9df5aae51d5b4a4c32a8c06a34dace5868297b5a68b SHA512 848c90a28018ec3c541ec43be59ea90328142c4705d3b59907fd89e8f6ac2758e288b1a1112fea601884c50ef7f6cf2c1634f539a76bea65a2741d3bb0e9b990
-EBUILD xdelta-1.1.4-r2.ebuild 717 BLAKE2B cb71ff2580f5e8053922eef0e7049f6088e524b6deeb06fb6762ea1bc61e1815f1010c22386d8ecc43785ed829660e459da226ab4f139c0259f3c5eacfa70286 SHA512 9426f88e3d7bcdc9c9572662f2c8b29a5466f9295b649cb72b195cc6994f57dbaa86891e51a2880c983678f0b033731f5e152da5eab969f624f3aa4e520ba963
+EBUILD xdelta-1.1.4-r3.ebuild 826 BLAKE2B f343b7544101220c0b46001ee153aa46dffcd80d6277fc987864b5cc9d421a3aa4cf24bfe2539e0f885ea04c83f6ac14930e6bcaa60eebb5e72f9326dfc8b1c7 SHA512 3b1432ada0657927ca43abfc466de768758bdea5f6673bfe2d038a2b5646f635c65d12b2531f633f5d22b31ff1b20b7a4e2b9dd5fa8a2dccc6c79ec3b22b1633
 EBUILD xdelta-3.0.11.ebuild 839 BLAKE2B d6d4f4d5c9ff3f7d1c59aeab589969a7325eaf1181e3f6576c14dff9632cb26c930e890b7ff8b5e2ccdde018bff17577de30415a020f6677b49b77256e254115 SHA512 a5b275381ef15e9907052214debb03900ede767a8b14130d9028a8376902ae21ffe7919af64544fbf20478873feedd976c67f2939ea542f8a562aa8008e3893b
 EBUILD xdelta-3.1.0.ebuild 1146 BLAKE2B 214a9cd0019516af48e204567cba7d68cd370896622ffbf2e86c518ef3ac66d2900174a6fa34034e9788dafaf8d20816120e594f157470839ef6394c5433c9c3 SHA512 1e767dc1456bb84b68866d511423d916fbf1593a68d3a34ec3c863769f37442390f4a96388848e653997ae8cd81b1e12d81926580dc7fd9ee64728ed3ed7b6ce
 MISC metadata.xml 381 BLAKE2B 1e67843f342c5d64a78b0ec5f6b20cb6c091f020be78355e83cc5ab8d53312fa97e025d9f819e73fd0c4fe936d15bf87600835bcf2d9040ba67dc740d270d2cf SHA512 2c439c35f726e18396d3a0f2e923cf2f2d0eb7a9798907fd0f039dddcc9fdbac95d6e89d113fc8a937ceb260c90901e0657ecdea2f0bf423ca9456627b2912d3
diff --git a/dev-util/xdelta/xdelta-1.1.4-r2.ebuild b/dev-util/xdelta/xdelta-1.1.4-r3.ebuild
index 2a2f44f7aaad..13f4fe56b9fc 100644
--- a/dev-util/xdelta/xdelta-1.1.4-r2.ebuild
+++ b/dev-util/xdelta/xdelta-1.1.4-r3.ebuild
@@ -12,12 +12,11 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
 
 RDEPEND=">=dev-libs/glib-2
 	>=sys-libs/zlib-1.1.4:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	eapply_user
@@ -30,5 +29,12 @@ src_prepare() {
 
 src_configure() {
 	tc-export CC
+	econf --disable-static
+}
+
+src_install() {
 	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index d5679c61c297..c2a69363b789 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,3 +1,5 @@
 DIST xfce4-dev-tools-4.14.0.tar.bz2 292275 BLAKE2B 18f28394ded038a7bcf0e754ebb359464358df245903a0c4441df2845e57c9059de6e6775a90c0e6c3cde4936a847ddf26ae88ff61fe7612fc2626b00f1d56a7 SHA512 e22b139ff7516ec0e510f882cc6a9e8e8b2b7bd41093c8e67e5ef11eb6c2c2848637513369d652f7238f10b5005c5483a938d3348020b48a4c1fadadd6d635f8
+DIST xfce4-dev-tools-4.15.0.tar.bz2 336453 BLAKE2B 9072d86b4b1645e72c04f26b5609162f50aac9d90ad007d2f629bb1ec67d242f3addea4bdd6f129f3336658b04f0eaecbd039154dfd98ccb87a85840b502d11f SHA512 125c8a7d594b17ce822dc5f57f5c700e69ee6208b06931cb0fefcbd1aa70281f388a9eebe8b451ffb55f16682070f9119a43b148f97adcdfd2278b4901910425
 EBUILD xfce4-dev-tools-4.14.0.ebuild 579 BLAKE2B 366d376277ef62122256194b0d4dfdd747e30e82097009b8c41d83473497f5b285b2b75b4584d2293236a17c9efc1ef152a331a398a7f1e67b68dc904c55eb58 SHA512 68fadca9308eb50c5c2be9f50847df966457518cebe86263c21d2f4b8aa64bc5b0f7146f25c16df281924c643ce4de2f38e2fe8db8efb155dde8b3dd9771363e
+EBUILD xfce4-dev-tools-4.15.0.ebuild 584 BLAKE2B 6b2f6fcd2f8ed91d4a09138a3ea90c1ecb1e5cf8236dc7e16bbf4889d0aabb9a08d822b7cca7b0888ee586837e41a5c055d71836cb2255ac82c99af875a58cf7 SHA512 35e950fba2c4de9b286afa8d9af5560c8c1ec72c8df70ab2fafc67015005bee23f5e7b59e79e8d631e668cb1ceb423106c4a1fddfdbd39e8e7741e6fb9fe1c9e
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.0.ebuild
new file mode 100644
index 000000000000..665633a8f721
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
+HOMEPAGE="https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.42"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"